summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2013-06-11 07:16:42 +0000
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2013-06-11 07:16:42 +0000
commit16f5234d435ee57b65043533f8fa2b105fb15a77 (patch)
treec6f95d84c6a1cb89ced5353230a98e1f61a6938e
parent2dc6458ede8c0039e308c994e50acb3b8de2d1ae (diff)
Cleanups and version bumpmame0149
-rw-r--r--hash/ep64_cart.xml2
-rw-r--r--src/emu/cpu/rsp/rsp.h2
-rw-r--r--src/emu/debug/dvbpoints.c34
-rw-r--r--src/emu/debug/dvbpoints.h4
-rw-r--r--src/emu/dislot.c2
-rw-r--r--src/emu/emu.mak20
-rw-r--r--src/emu/machine.c26
-rw-r--r--src/emu/machine/7200fifo.c14
-rw-r--r--src/emu/machine/7200fifo.h8
-rw-r--r--src/emu/machine/adc1038.h2
-rw-r--r--src/emu/machine/adc1213x.h6
-rw-r--r--src/emu/machine/ay31015.c15
-rw-r--r--src/emu/machine/ay31015.h38
-rw-r--r--src/emu/machine/com8116.c6
-rw-r--r--src/emu/machine/generic.c2
-rw-r--r--src/emu/machine/idectrl.c14
-rw-r--r--src/emu/machine/idectrl.h2
-rw-r--r--src/emu/machine/idehd.c2
-rw-r--r--src/emu/machine/im6402.c2
-rw-r--r--src/emu/machine/machine.mak364
-rw-r--r--src/emu/machine/mb14241.h4
-rw-r--r--src/emu/machine/mc68901.c2
-rw-r--r--src/emu/machine/mm58274c.c97
-rw-r--r--src/emu/machine/mm58274c.h12
-rw-r--r--src/emu/machine/pit8253.c43
-rw-r--r--src/emu/machine/pit8253.h30
-rw-r--r--src/emu/machine/rf5c296.c2
-rw-r--r--src/emu/machine/rp5h01.c6
-rw-r--r--src/emu/machine/rp5h01.h2
-rw-r--r--src/emu/machine/serflash.c29
-rw-r--r--src/emu/machine/serflash.h10
-rw-r--r--src/emu/machine/tms6100.c6
-rw-r--r--src/emu/machine/tms6100.h6
-rw-r--r--src/emu/machine/z80dart.c10
-rw-r--r--src/emu/machine/z80dart.h24
-rw-r--r--src/emu/memory.h34
-rw-r--r--src/emu/sound/msm5205.c20
-rw-r--r--src/emu/sound/sp0256.c78
-rw-r--r--src/emu/sound/sp0256.h16
-rw-r--r--src/emu/sound/speaker.c28
-rw-r--r--src/emu/sound/speaker.h12
-rw-r--r--src/emu/sound/ymf271.c12
-rw-r--r--src/emu/sound/ymz280b.c2
-rw-r--r--src/emu/video/cdp1861.c6
-rw-r--r--src/emu/video/cdp1862.c6
-rw-r--r--src/emu/video/huc6270.h2
-rw-r--r--src/emu/video/msm6255.c4
-rw-r--r--src/emu/video/tms9927.c19
-rw-r--r--src/emu/video/tms9927.h8
-rw-r--r--src/emu/video/upd7227.c14
-rw-r--r--src/emu/video/upd7227.h24
-rw-r--r--src/emu/video/video.mak178
-rw-r--r--src/lib/formats/bml3_dsk.c2
-rw-r--r--src/lib/formats/td0_dsk.c2
-rw-r--r--src/mame/audio/flower.c2
-rw-r--r--src/mame/audio/geebee.c88
-rw-r--r--src/mame/audio/redbaron.h4
-rw-r--r--src/mame/audio/snes_snd.c16
-rw-r--r--src/mame/audio/snes_snd.h18
-rw-r--r--src/mame/audio/warpwarp.c120
-rw-r--r--src/mame/audio/warpwarp.h20
-rw-r--r--src/mame/drivers/8080bw.c8
-rw-r--r--src/mame/drivers/alpha68k.c10
-rw-r--r--src/mame/drivers/ambush.c10
-rw-r--r--src/mame/drivers/asteroid.c2
-rw-r--r--src/mame/drivers/btime.c4
-rw-r--r--src/mame/drivers/ddealer.c88
-rw-r--r--src/mame/drivers/decocass.c26
-rw-r--r--src/mame/drivers/firebeat.c320
-rw-r--r--src/mame/drivers/fruitpc.c32
-rw-r--r--src/mame/drivers/galaxold.c14
-rw-r--r--src/mame/drivers/galdrvr.c4
-rw-r--r--src/mame/drivers/gaplus.c10
-rw-r--r--src/mame/drivers/jpmsru.c2
-rw-r--r--src/mame/drivers/mappy.c30
-rw-r--r--src/mame/drivers/maygayep.c2
-rw-r--r--src/mame/drivers/mazerbla.c2
-rw-r--r--src/mame/drivers/mil4000.c16
-rw-r--r--src/mame/drivers/mpu4.c20
-rw-r--r--src/mame/drivers/mpu4hw.c8
-rw-r--r--src/mame/drivers/proconn.c26
-rw-r--r--src/mame/drivers/qix.c2
-rw-r--r--src/mame/drivers/quakeat.c2
-rw-r--r--src/mame/drivers/savquest.c30
-rw-r--r--src/mame/drivers/seibuspi.c12
-rw-r--r--src/mame/drivers/speedbal.c5
-rw-r--r--src/mame/drivers/statriv2.c2
-rw-r--r--src/mame/drivers/stuntair.c2
-rw-r--r--src/mame/drivers/taito_f3.c2
-rw-r--r--src/mame/drivers/tempest.c4
-rw-r--r--src/mame/drivers/zn.c8
-rw-r--r--src/mame/includes/bzone.h6
-rw-r--r--src/mame/includes/dkong.h4
-rw-r--r--src/mame/includes/exidy440.h2
-rw-r--r--src/mame/includes/flower.h6
-rw-r--r--src/mame/includes/galaxold.h2
-rw-r--r--src/mame/includes/gaplus.h10
-rw-r--r--src/mame/includes/mappy.h6
-rw-r--r--src/mame/includes/nmk16.h2
-rw-r--r--src/mame/includes/pgm.h6
-rw-r--r--src/mame/includes/playch10.h2
-rw-r--r--src/mame/includes/powerins.h2
-rw-r--r--src/mame/includes/seibuspi.h2
-rw-r--r--src/mame/includes/snowbros.h2
-rw-r--r--src/mame/includes/speedbal.h2
-rw-r--r--src/mame/includes/taito_b.h2
-rw-r--r--src/mame/includes/taitoair.h2
-rw-r--r--src/mame/includes/toypop.h4
-rw-r--r--src/mame/includes/vertigo.h2
-rw-r--r--src/mame/includes/vsnes.h2
-rw-r--r--src/mame/includes/warpwarp.h4
-rw-r--r--src/mame/layout/speedbal.lay6
-rw-r--r--src/mame/machine/mathbox.h4
-rw-r--r--src/mame/machine/midikbd.h2
-rw-r--r--src/mame/machine/mpeg573.c10
-rw-r--r--src/mame/machine/mpeg573.h4
-rw-r--r--src/mame/machine/namcoio.c4
-rw-r--r--src/mame/machine/namcoio.h12
-rw-r--r--src/mame/machine/naomig1.c2
-rw-r--r--src/mame/machine/nmk112.c3
-rw-r--r--src/mame/machine/nmk112.h6
-rw-r--r--src/mame/machine/pgmprot5.c146
-rw-r--r--src/mame/machine/taitoio.c6
-rw-r--r--src/mame/machine/taitoio.h8
-rw-r--r--src/mame/mame.lst38
-rw-r--r--src/mame/video/kan_pand.c4
-rw-r--r--src/mame/video/kan_pand.h16
-rw-r--r--src/mame/video/powervr2.c22
-rw-r--r--src/mame/video/powervr2.h24
-rw-r--r--src/mame/video/seibuspi.c2
-rw-r--r--src/mess/audio/dave.c42
-rw-r--r--src/mess/audio/dave.h30
-rw-r--r--src/mess/audio/mac.c8
-rw-r--r--src/mess/audio/mea8000.c11
-rw-r--r--src/mess/audio/mea8000.h24
-rw-r--r--src/mess/audio/upd1771.c56
-rw-r--r--src/mess/audio/upd1771.h10
-rw-r--r--src/mess/drivers/a7000.c4
-rw-r--r--src/mess/drivers/abc80.c2
-rw-r--r--src/mess/drivers/altos5.c6
-rw-r--r--src/mess/drivers/applix.c1
-rw-r--r--src/mess/drivers/argo.c4
-rw-r--r--src/mess/drivers/attache.c121
-rw-r--r--src/mess/drivers/bml3.c86
-rw-r--r--src/mess/drivers/chessmst.c2
-rw-r--r--src/mess/drivers/concept.c12
-rw-r--r--src/mess/drivers/cortex.c2
-rw-r--r--src/mess/drivers/ep64.c72
-rw-r--r--src/mess/drivers/gba.c12
-rw-r--r--src/mess/drivers/hx20.c240
-rw-r--r--src/mess/drivers/intv.c4
-rw-r--r--src/mess/drivers/juicebox.c2
-rw-r--r--src/mess/drivers/pasogo.c40
-rw-r--r--src/mess/drivers/pc.c6
-rw-r--r--src/mess/drivers/pc1512.c2
-rw-r--r--src/mess/drivers/pes.c2
-rw-r--r--src/mess/drivers/pet.c2
-rw-r--r--src/mess/drivers/pv1000.c22
-rw-r--r--src/mess/drivers/ql.c24
-rw-r--r--src/mess/drivers/qx10.c16
-rw-r--r--src/mess/drivers/samcoupe.c2
-rw-r--r--src/mess/drivers/scv.c6
-rw-r--r--src/mess/drivers/sdk86.c8
-rw-r--r--src/mess/drivers/sg1000.c2
-rw-r--r--src/mess/drivers/snes.c30
-rw-r--r--src/mess/drivers/softbox.c106
-rw-r--r--src/mess/drivers/superslave.c22
-rw-r--r--src/mess/drivers/tec1.c2
-rw-r--r--src/mess/drivers/victor9k.c92
-rw-r--r--src/mess/drivers/vip.c2
-rw-r--r--src/mess/drivers/vk100.c4
-rw-r--r--src/mess/drivers/vt100.c4
-rw-r--r--src/mess/includes/abc1600.h4
-rw-r--r--src/mess/includes/bw12.h4
-rw-r--r--src/mess/includes/ep64.h54
-rw-r--r--src/mess/includes/gba.h2
-rw-r--r--src/mess/includes/hx20.h80
-rw-r--r--src/mess/includes/mac.h4
-rw-r--r--src/mess/includes/pc1512.h2
-rw-r--r--src/mess/includes/sg1000.h4
-rw-r--r--src/mess/includes/sms.h14
-rw-r--r--src/mess/includes/superslave.h36
-rw-r--r--src/mess/includes/tandy2k.h2
-rw-r--r--src/mess/includes/v1050.h2
-rw-r--r--src/mess/includes/victor9k.h6
-rw-r--r--src/mess/includes/vixen.h2
-rw-r--r--src/mess/includes/wangpc.h2
-rw-r--r--src/mess/machine/abc99.c8
-rw-r--r--src/mess/machine/abc99.h2
-rw-r--r--src/mess/machine/abckb.h2
-rw-r--r--src/mess/machine/apollo.c4
-rw-r--r--src/mess/machine/bbc.c6
-rw-r--r--src/mess/machine/concept.c37
-rw-r--r--src/mess/machine/concept_exp.c119
-rw-r--r--src/mess/machine/concept_exp.h12
-rw-r--r--src/mess/machine/ds1315.c2
-rw-r--r--src/mess/machine/ds1315.h2
-rw-r--r--src/mess/machine/ep64_exdos.c26
-rw-r--r--src/mess/machine/ep64_exdos.h2
-rw-r--r--src/mess/machine/ep64exp.h4
-rw-r--r--src/mess/machine/gba_rom.c79
-rw-r--r--src/mess/machine/gba_rom.h26
-rw-r--r--src/mess/machine/gba_slot.c25
-rw-r--r--src/mess/machine/gba_slot.h8
-rw-r--r--src/mess/machine/intv.c18
-rw-r--r--src/mess/machine/mboard.c4
-rw-r--r--src/mess/machine/mc68328.c37
-rw-r--r--src/mess/machine/mc68328.h78
-rw-r--r--src/mess/machine/md_rom.c2
-rw-r--r--src/mess/machine/md_rom.h8
-rw-r--r--src/mess/machine/msx.c2
-rw-r--r--src/mess/machine/pce.c6
-rw-r--r--src/mess/machine/pce_cd.c192
-rw-r--r--src/mess/machine/pce_cd.h10
-rw-r--r--src/mess/machine/pce_rom.c7
-rw-r--r--src/mess/machine/pce_rom.h8
-rw-r--r--src/mess/machine/pce_slot.c29
-rw-r--r--src/mess/machine/pce_slot.h2
-rw-r--r--src/mess/machine/s3c44b0.c34
-rw-r--r--src/mess/machine/s3c44b0.h6
-rw-r--r--src/mess/machine/sega8_rom.c153
-rw-r--r--src/mess/machine/sega8_rom.h74
-rw-r--r--src/mess/machine/sega8_slot.c122
-rw-r--r--src/mess/machine/sega8_slot.h20
-rw-r--r--src/mess/machine/sms.c74
-rw-r--r--src/mess/machine/sns_sa1.c11
-rw-r--r--src/mess/machine/sns_sdd1.c2
-rw-r--r--src/mess/machine/sns_sgb.c85
-rw-r--r--src/mess/machine/sns_sgb.h4
-rw-r--r--src/mess/machine/sns_spc7110.c8
-rw-r--r--src/mess/machine/sns_spc7110.h10
-rw-r--r--src/mess/machine/softbox.h2
-rw-r--r--src/mess/machine/upd71071.c2
-rw-r--r--src/mess/machine/victor9kb.h3
-rw-r--r--src/mess/machine/vp575.c10
-rw-r--r--src/mess/machine/wangpc_mcc.c2
-rw-r--r--src/mess/machine/zx8302.h4
-rw-r--r--src/mess/video/gba.c129
-rw-r--r--src/mess/video/gf4500.c3
-rw-r--r--src/mess/video/gf4500.h10
-rw-r--r--src/mess/video/newport.c8
-rw-r--r--src/mess/video/newport.h18
-rw-r--r--src/mess/video/nick.c48
-rw-r--r--src/mess/video/nick.h16
-rw-r--r--src/mess/video/stic.c230
-rw-r--r--src/mess/video/stic.h16
-rw-r--r--src/mess/video/vic4567.c76
-rw-r--r--src/mess/video/vic4567.h46
-rw-r--r--src/mess/video/vtvideo.c118
-rw-r--r--src/mess/video/vtvideo.h8
-rw-r--r--src/osd/sdl/debugqt.c24
-rw-r--r--src/osd/sdl/debugqtdasmwindow.c4
-rw-r--r--src/osd/sdl/debugqtmainwindow.c32
-rw-r--r--src/osd/windows/d3dhlsl.c1
-rw-r--r--src/osd/windows/d3dhlsl.h12
-rw-r--r--src/osd/windows/debugwin.c2
-rw-r--r--src/osd/windows/window.c1
-rw-r--r--src/osd/windows/windows.mak30
-rw-r--r--src/osd/windows/winmain.c26
-rw-r--r--src/tools/jedutil.c400
-rw-r--r--src/version.c2
261 files changed, 3320 insertions, 3371 deletions
diff --git a/hash/ep64_cart.xml b/hash/ep64_cart.xml
index acf26e4787a..63000c8074e 100644
--- a/hash/ep64_cart.xml
+++ b/hash/ep64_cart.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
<softwarelist name="ep64_cart" description="Enterprise Sixty Four cartridges">
-
+
<software name="basic">
<description>BASIC (v2.1)</description>
<year>198?</year>
diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h
index 00369a2ac1e..eb3a03e036c 100644
--- a/src/emu/cpu/rsp/rsp.h
+++ b/src/emu/cpu/rsp/rsp.h
@@ -16,7 +16,7 @@
#ifndef __RSP_H__
#define __RSP_H__
-#define USE_SIMD (0)
+#define USE_SIMD (0)
#if USE_SIMD
#include <tmmintrin.h>
diff --git a/src/emu/debug/dvbpoints.c b/src/emu/debug/dvbpoints.c
index 298ce2ee67b..99094a11d4c 100644
--- a/src/emu/debug/dvbpoints.c
+++ b/src/emu/debug/dvbpoints.c
@@ -2,7 +2,7 @@
dvpoints.c
- Breakpoint debugger view.
+ Breakpoint debugger view.
****************************************************************************
@@ -131,15 +131,15 @@ void debug_view_breakpoints::view_click(const int button, const debug_view_xy& p
void debug_view_breakpoints::pad_astring_to_length(astring& str, int len)
{
- int diff = len - str.len();
- if (diff > 0)
- {
- astring buffer;
- buffer.expand(diff);
- for (int i = 0; i < diff; i++)
- buffer.catprintf(" ");
- str.catprintf("%s", buffer.cstr());
- }
+ int diff = len - str.len();
+ if (diff > 0)
+ {
+ astring buffer;
+ buffer.expand(diff);
+ for (int i = 0; i < diff; i++)
+ buffer.catprintf(" ");
+ str.catprintf("%s", buffer.cstr());
+ }
}
//-------------------------------------------------
@@ -162,7 +162,7 @@ void debug_view_breakpoints::view_update()
for (device_debug::breakpoint *bp = debugInterface.breakpoint_first(); bp != NULL; bp = bp->next())
numBPs++;
bpList = new device_debug::breakpoint*[numBPs];
-
+
// Collect
int i = 1;
for (device_debug::breakpoint *bp = debugInterface.breakpoint_first(); bp != NULL; bp = bp->next())
@@ -176,7 +176,7 @@ void debug_view_breakpoints::view_update()
for (int row = 0; row < m_visible.y; row++)
{
UINT32 effrow = m_topleft.y + row;
-
+
// Header
if (effrow == 0)
{
@@ -195,8 +195,8 @@ void debug_view_breakpoints::view_update()
if (bpi < numBPs && bpi >= 0)
{
device_debug::breakpoint* bp = bpList[bpi];
-
- astring buffer;
+
+ astring buffer;
buffer.printf("%x", bp->index());
pad_astring_to_length(buffer, 5);
buffer.catprintf("%c", bp->enabled() ? 'X' : 'O');
@@ -213,7 +213,7 @@ void debug_view_breakpoints::view_update()
buffer.catprintf("%s", bp->action());
pad_astring_to_length(buffer, 60);
}
-
+
for (int i = 0; i < m_visible.x; i++)
{
dest->byte = (i < buffer.len()) ? buffer[i] : ' ';
@@ -222,7 +222,7 @@ void debug_view_breakpoints::view_update()
}
continue;
}
-
+
// Fill the remaining vertical space
for (int i = 0; i < m_visible.x; i++)
{
@@ -231,6 +231,6 @@ void debug_view_breakpoints::view_update()
dest++;
}
}
-
+
delete bpList;
}
diff --git a/src/emu/debug/dvbpoints.h b/src/emu/debug/dvbpoints.h
index 36e5c398d7e..be57027c186 100644
--- a/src/emu/debug/dvbpoints.h
+++ b/src/emu/debug/dvbpoints.h
@@ -2,7 +2,7 @@
dvpoints.h
- Breakpoint debugger view.
+ Breakpoint debugger view.
****************************************************************************
@@ -77,7 +77,7 @@ private:
// internal helpers
void enumerate_sources();
bool recompute(offs_t pc, int startline, int lines);
- void pad_astring_to_length(astring& str, int len);
+ void pad_astring_to_length(astring& str, int len);
// internal state
};
diff --git a/src/emu/dislot.c b/src/emu/dislot.c
index 8d61cc85c42..47ecf4896c5 100644
--- a/src/emu/dislot.c
+++ b/src/emu/dislot.c
@@ -43,7 +43,7 @@ device_card_options *device_slot_interface::static_alloc_card_options(device_t &
return options;
}
-
+
void device_slot_interface::static_set_card_machine_config(device_t &device, const char *card, const machine_config_constructor machine_config)
{
static_alloc_card_options(device, card)->m_machine_config = machine_config;
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 903d9493cc6..cce6388a9d3 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -135,20 +135,20 @@ EMUSOUNDOBJS = \
$(EMUOBJ)/sound/flt_vol.o \
$(EMUOBJ)/sound/flt_rc.o \
$(EMUOBJ)/sound/wavwrite.o \
- $(EMUOBJ)/sound/samples.o \
+ $(EMUOBJ)/sound/samples.o \
EMUDRIVEROBJS = \
$(EMUDRIVERS)/empty.o \
$(EMUDRIVERS)/testcpu.o \
-
+
EMUMACHINEOBJS = \
- $(EMUMACHINE)/generic.o \
- $(EMUMACHINE)/ram.o \
- $(EMUMACHINE)/nvram.o \
+ $(EMUMACHINE)/generic.o \
+ $(EMUMACHINE)/ram.o \
+ $(EMUMACHINE)/nvram.o \
$(EMUMACHINE)/laserdsc.o \
$(EMUMACHINE)/net_lib.o \
$(EMUMACHINE)/netlist.o \
-
+
EMUIMAGEDEVOBJS = \
$(EMUIMAGEDEV)/bitbngr.o \
$(EMUIMAGEDEV)/cartslot.o \
@@ -165,10 +165,10 @@ EMUIMAGEDEVOBJS = \
EMUVIDEOOBJS = \
- $(EMUVIDEO)/generic.o \
- $(EMUVIDEO)/resnet.o \
- $(EMUVIDEO)/rgbutil.o \
- $(EMUVIDEO)/vector.o \
+ $(EMUVIDEO)/generic.o \
+ $(EMUVIDEO)/resnet.o \
+ $(EMUVIDEO)/rgbutil.o \
+ $(EMUVIDEO)/vector.o \
LIBEMUOBJS = $(EMUOBJS) $(EMUSOUNDOBJS) $(EMUDRIVEROBJS) $(EMUMACHINEOBJS) $(EMUIMAGEDEVOBJS) $(EMUVIDEOOBJS)
diff --git a/src/emu/machine.c b/src/emu/machine.c
index b04c0019321..9bc88a08981 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -559,16 +559,16 @@ astring running_machine::get_statename(const char *option)
statename_str.cpy("%g");
else
statename_str.cpy(option);
-
+
// strip any extension in the provided statename
int index = statename_str.rchr(0, '.');
if (index != -1)
statename_str.substr(0, index);
-
+
// handle %d in the template (for image devices)
astring statename_dev("%d_");
int pos = statename_str.find(0, statename_dev);
-
+
if (pos != -1)
{
// if more %d are found, revert to default and ignore them all
@@ -578,12 +578,12 @@ astring running_machine::get_statename(const char *option)
else
{
int name_found = 0;
-
+
// find length of the device name
int end1 = statename_str.find(pos + 3, "/");
int end2 = statename_str.find(pos + 3, "%");
int end = -1;
-
+
if ((end1 != -1) && (end2 != -1))
end = MIN(end1, end2);
else if (end1 != -1)
@@ -592,15 +592,15 @@ astring running_machine::get_statename(const char *option)
end = end2;
else
end = statename_str.len();
-
+
if (end - pos < 3)
fatalerror("Something very wrong is going on!!!\n");
-
+
// copy the device name to an astring
astring devname_str;
devname_str.cpysubstr(statename_str, pos + 3, end - pos - 3);
//printf("check template: %s\n", devname_str.cstr());
-
+
// verify that there is such a device for this system
image_interface_iterator iter(root_device());
for (device_image_interface *image = iter.first(); image != NULL; image = iter.next())
@@ -608,30 +608,30 @@ astring running_machine::get_statename(const char *option)
// get the device name
astring tempdevname(image->brief_instance_name());
//printf("check device: %s\n", tempdevname.cstr());
-
+
if (devname_str.cmp(tempdevname) == 0)
{
// verify that such a device has an image mounted
if (image->basename_noext() != NULL)
{
astring filename(image->basename_noext());
-
+
// setup snapname and remove the %d_
statename_str.replace(0, devname_str, filename);
statename_str.del(pos, 3);
//printf("check image: %s\n", filename.cstr());
-
+
name_found = 1;
}
}
}
-
+
// or fallback to default
if (name_found == 0)
statename_str.cpy("%g");
}
}
-
+
// substitute path and gamename up front
statename_str.replace(0, "/", PATH_SEPARATOR);
statename_str.replace(0, "%g", basename());
diff --git a/src/emu/machine/7200fifo.c b/src/emu/machine/7200fifo.c
index da998e575ac..6913479d4fc 100644
--- a/src/emu/machine/7200fifo.c
+++ b/src/emu/machine/7200fifo.c
@@ -41,7 +41,7 @@ void fifo7200_device::device_start()
m_ef_handler.resolve();
m_ff_handler.resolve();
m_hf_handler.resolve();
-
+
// state save
save_item(NAME(m_read_ptr));
save_item(NAME(m_write_ptr));
@@ -60,11 +60,11 @@ void fifo7200_device::device_reset()
memset(m_buffer, 0, m_ram_size * sizeof(UINT16));
m_read_ptr = 0;
m_write_ptr = 0;
-
+
m_ef = 1;
m_ff = 0;
m_hf = 0;
-
+
if (!m_ef_handler.isnull()) m_ef_handler(m_ef);
if (!m_ff_handler.isnull()) m_ff_handler(m_ff);
if (!m_hf_handler.isnull()) m_hf_handler(m_hf);
@@ -82,7 +82,7 @@ void fifo7200_device::fifo_write(UINT16 data)
m_buffer[m_write_ptr] = data & 0x1ff;
m_write_ptr = (m_write_ptr + 1) % m_ram_size;
-
+
// update flags
if (m_ef)
{
@@ -110,7 +110,7 @@ UINT16 fifo7200_device::fifo_read()
logerror("IDT7200 %s fifo_read underflow!\n", tag());
return 0x1ff;
}
-
+
UINT16 ret = m_buffer[m_read_ptr];
m_read_ptr = (m_read_ptr + 1) % m_ram_size;
@@ -126,12 +126,12 @@ UINT16 fifo7200_device::fifo_read()
m_ef = 1;
if (!m_ef_handler.isnull()) m_ef_handler(m_ef);
}
-
+
else if (((m_read_ptr + m_ram_size / 2) % m_ram_size) == m_write_ptr)
{
m_hf = 0;
if (!m_hf_handler.isnull()) m_hf_handler(m_hf);
}
-
+
return ret;
}
diff --git a/src/emu/machine/7200fifo.h b/src/emu/machine/7200fifo.h
index 189bc3a9b06..d54ee274e4a 100644
--- a/src/emu/machine/7200fifo.h
+++ b/src/emu/machine/7200fifo.h
@@ -93,7 +93,7 @@ public:
DECLARE_READ_LINE_MEMBER( ef_r ) { return m_ef; }
DECLARE_READ_LINE_MEMBER( ff_r ) { return m_ff; }
DECLARE_READ_LINE_MEMBER( hf_r ) { return m_hf; }
-
+
// normal configuration
DECLARE_WRITE16_MEMBER( data_word_w ) { fifo_write(data); }
DECLARE_READ16_MEMBER( data_word_r ) { return (UINT16)fifo_read(); }
@@ -113,14 +113,14 @@ private:
UINT16* m_buffer;
int m_ram_size;
-
+
int m_read_ptr;
int m_write_ptr;
-
+
int m_ef; // empty flag
int m_ff; // full flag
int m_hf; // half-full flag
-
+
devcb2_write_line m_ef_handler;
devcb2_write_line m_ff_handler;
devcb2_write_line m_hf_handler;
diff --git a/src/emu/machine/adc1038.h b/src/emu/machine/adc1038.h
index 06ab61e3e7a..67156c85f67 100644
--- a/src/emu/machine/adc1038.h
+++ b/src/emu/machine/adc1038.h
@@ -47,7 +47,7 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
adc1038_input_read_func m_input_callback_r_func;
private:
diff --git a/src/emu/machine/adc1213x.h b/src/emu/machine/adc1213x.h
index aa2209884fa..f7b7ca7f20b 100644
--- a/src/emu/machine/adc1213x.h
+++ b/src/emu/machine/adc1213x.h
@@ -40,17 +40,17 @@ public:
DECLARE_WRITE8_MEMBER( conv_w );
DECLARE_READ8_MEMBER( do_r );
DECLARE_READ8_MEMBER( eoc_r );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
void convert(int channel, int bits16, int lsbfirst);
adc1213x_input_convert_func m_input_callback_r_func;
-
+
private:
// internal state
int m_cycle;
diff --git a/src/emu/machine/ay31015.c b/src/emu/machine/ay31015.c
index f1713feae73..037e9381609 100644
--- a/src/emu/machine/ay31015.c
+++ b/src/emu/machine/ay31015.c
@@ -122,7 +122,7 @@ void ay31015_device::device_config_complete()
const ay31015_config *intf = reinterpret_cast<const ay31015_config *>(static_config());
if (intf != NULL)
*static_cast<ay31015_config *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -143,13 +143,13 @@ void ay31015_device::device_start()
m_read_si.resolve(read_si_cb, *this);
m_write_so.resolve(write_so_cb, *this);
m_status_changed.resolve(status_changed_cb, *this);
-
+
m_tx_clock = transmitter_clock;
m_rx_clock = receiver_clock;
-
+
m_rx_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ay31015_device::rx_process),this));
m_tx_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ay31015_device::tx_process),this));
-
+
update_rx_timer();
update_tx_timer();
@@ -184,7 +184,7 @@ void ay31015_device::device_reset()
{
m_control_reg = 0;
m_rx_data = 0;
-
+
internal_reset();
}
@@ -566,12 +566,12 @@ void ay51013_device::internal_reset()
{
/* total pulses = 16 * data-bits */
UINT8 t1;
-
+
if (m_control_reg & CONTROL_NB2)
t1 = (m_control_reg & CONTROL_NB1) ? 8 : 7;
else
t1 = (m_control_reg & CONTROL_NB1) ? 6 : 5;
-
+
m_total_pulses = t1 << 4; /* total clock pulses to load a byte */
m_second_stop_bit = ((m_control_reg & CONTROL_TSB) ? 16 : 0); /* 2nd stop bit */
if ((t1 == 5) && (m_second_stop_bit == 16))
@@ -730,4 +730,3 @@ void ay31015_device::set_transmit_data( UINT8 data )
update_status_pins();
}
}
-
diff --git a/src/emu/machine/ay31015.h b/src/emu/machine/ay31015.h
index e3f7b36990f..b82c7dd124e 100644
--- a/src/emu/machine/ay31015.h
+++ b/src/emu/machine/ay31015.h
@@ -74,32 +74,32 @@ public:
ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
~ay31015_device() {}
-
+
/* Set an input pin */
void set_input_pin( ay31015_input_pin_t pin, int data );
-
-
+
+
/* Get an output pin */
int get_output_pin( ay31015_output_pin_t pin );
-
-
+
+
/* Set a new transmitter clock (new_clock is in Hz) */
void set_transmitter_clock( double new_clock );
-
-
+
+
/* Set a new receiver clock (new_clock is in Hz) */
void set_receiver_clock( double new_clock );
-
-
+
+
/* Reead the received data */
/* The received data is available on RD8-RD1 (pins 5-12) */
UINT8 get_received_data();
-
-
+
+
/* Set the transmitter buffer */
/* The data to transmit is set on DB1-DB8 (pins 26-33) */
void set_transmit_data( UINT8 data );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -120,13 +120,13 @@ protected:
TIMER_CALLBACK_MEMBER(tx_process);
int m_pins[41];
-
+
UINT8 m_control_reg;
UINT8 m_status_reg;
UINT16 m_second_stop_bit; // 0, 8, 16
UINT16 m_total_pulses; // bits * 16
UINT8 m_internal_sample;
-
+
state_t m_rx_state;
UINT8 m_rx_data; // byte being received
UINT8 m_rx_buffer; // received byte waiting to be accepted by computer
@@ -135,7 +135,7 @@ protected:
UINT16 m_rx_pulses; // total pulses left
double m_rx_clock;
emu_timer *m_rx_timer;
-
+
state_t m_tx_state;
UINT8 m_tx_data; // byte being sent
UINT8 m_tx_buffer; // next byte to send
@@ -143,7 +143,7 @@ protected:
UINT16 m_tx_pulses; // total pulses left
double m_tx_clock;
emu_timer *m_tx_timer;
-
+
devcb_resolved_read8 m_read_si; /* SI - pin 20 - This will be called whenever the SI pin is sampled. Optional */
devcb_resolved_write8 m_write_so; /* SO - pin 25 - This will be called whenever data is put on the SO pin. Optional */
devcb_resolved_write8 m_status_changed; /* This will be called whenever one of the status pins may have changed. Optional */
@@ -153,14 +153,14 @@ class ay51013_device : public ay31015_device
{
public:
ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
protected:
virtual void internal_reset();
};
-extern const device_type AY31015; // For AY-3-1014A, AY-3-1015(D) and HD6402 variants
-extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 variants
+extern const device_type AY31015; // For AY-3-1014A, AY-3-1015(D) and HD6402 variants
+extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 variants
diff --git a/src/emu/machine/com8116.c b/src/emu/machine/com8116.c
index d2a9c0aa171..9471fccdac8 100644
--- a/src/emu/machine/com8116.c
+++ b/src/emu/machine/com8116.c
@@ -48,9 +48,9 @@ const int com8116_device::divisors_32X_5_0688MHz[] =
com8116_device::com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, COM8116, "COM8116", tag, owner, clock),
- m_write_fx4(*this),
- m_write_fr(*this),
- m_write_ft(*this)
+ m_write_fx4(*this),
+ m_write_fr(*this),
+ m_write_ft(*this)
{
}
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index 62adfbfe379..2739c3959fc 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -301,7 +301,7 @@ static astring &nvram_filename(astring &result, device_t &device)
running_machine &machine = device.machine();
// start with either basename or basename_biosnum
- result.cpy(machine.basename());
+ result.cpy(machine.basename());
if (device.machine().root_device().system_bios() != 0 && device.machine().root_device().default_bios() != device.machine().root_device().system_bios())
result.catprintf("_%d", device.machine().root_device().system_bios() - 1);
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 363c0151ba1..4753ad6e72f 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -97,7 +97,7 @@ void ide_controller_device::set_irq(int state)
LOG(("IDE interrupt assert\n"));
else
LOG(("IDE interrupt clear\n"));
-
+
/* signal an interrupt */
m_irq_handler(state);
interrupt_pending = state;
@@ -885,7 +885,7 @@ READ8_MEMBER( ide_controller_device::read_via_config )
break;
}
-// printf( "read via config %04x %04x %04x\n", offset, result, mem_mask );
+// printf( "read via config %04x %04x %04x\n", offset, result, mem_mask );
return result;
}
@@ -1009,7 +1009,7 @@ READ16_MEMBER( ide_controller_device::read_cs0 )
break;
}
-// printf( "read cs0 %04x %04x %04x\n", offset, result, mem_mask );
+// printf( "read cs0 %04x %04x %04x\n", offset, result, mem_mask );
/* return the result */
return result;
@@ -1071,7 +1071,7 @@ READ16_MEMBER( ide_controller_device::read_cs1 )
break;
}
-// printf( "read cs1 %04x %04x %04x\n", offset, result, mem_mask );
+// printf( "read cs1 %04x %04x %04x\n", offset, result, mem_mask );
/* return the result */
return result;
@@ -1086,7 +1086,7 @@ READ16_MEMBER( ide_controller_device::read_cs1 )
WRITE8_MEMBER( ide_controller_device::write_via_config )
{
-// printf( "write via config %04x %04x %04x\n", offset, data, mem_mask );
+// printf( "write via config %04x %04x %04x\n", offset, data, mem_mask );
/* logit */
LOG(("%s:IDE via config write to %X = %08X, mem_mask=%d\n", machine().describe_context(), offset, data, mem_mask));
@@ -1139,7 +1139,7 @@ void ide_controller_device::write_dma( UINT16 data )
WRITE16_MEMBER( ide_controller_device::write_cs0 )
{
-// printf( "write cs0 %04x %04x %04x\n", offset, data, mem_mask );
+// printf( "write cs0 %04x %04x %04x\n", offset, data, mem_mask );
switch (offset)
{
@@ -1229,7 +1229,7 @@ WRITE16_MEMBER( ide_controller_device::write_cs1_pc )
WRITE16_MEMBER( ide_controller_device::write_cs1 )
{
-// printf( "write cs1 %04x %04x %04x\n", offset, data, mem_mask );
+// printf( "write cs1 %04x %04x %04x\n", offset, data, mem_mask );
/* logit */
LOG(("%s:IDE cs1 write to %X = %08X, mem_mask=%d\n", machine().describe_context(), offset, data, mem_mask));
diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h
index 38ba0f33818..9aedae570c4 100644
--- a/src/emu/machine/idectrl.h
+++ b/src/emu/machine/idectrl.h
@@ -100,7 +100,7 @@ public:
DECLARE_READ16_MEMBER(read_cs1_pc);
DECLARE_WRITE16_MEMBER(write_cs0_pc);
DECLARE_WRITE16_MEMBER(write_cs1_pc);
-
+
virtual void set_irq(int state);
virtual void set_dmarq(int state);
void read_sector_done();
diff --git a/src/emu/machine/idehd.c b/src/emu/machine/idehd.c
index d2932a151e6..cf3542e4bc9 100644
--- a/src/emu/machine/idehd.c
+++ b/src/emu/machine/idehd.c
@@ -239,7 +239,7 @@ ide_hdd_device::ide_hdd_device(const machine_config &mconfig, device_type type,
void ide_hdd_device::device_start()
{
-// save_item(NAME(features));
+// save_item(NAME(features));
save_item(NAME(cur_cylinder));
save_item(NAME(cur_sector));
diff --git a/src/emu/machine/im6402.c b/src/emu/machine/im6402.c
index a6b81c1fe2c..2dcd019e8da 100644
--- a/src/emu/machine/im6402.c
+++ b/src/emu/machine/im6402.c
@@ -278,7 +278,7 @@ WRITE8_MEMBER( im6402_device::write )
}
else
{
- set_tbre(CLEAR_LINE);
+ set_tbre(CLEAR_LINE);
}
}
diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak
index 1f189c40f99..cf110df826e 100644
--- a/src/emu/machine/machine.mak
+++ b/src/emu/machine/machine.mak
@@ -15,7 +15,7 @@ MACHINEOBJ = $(EMUOBJ)/machine
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter NCR53C7XX,$(MACHINES)),)
@@ -24,7 +24,7 @@ MACHINEOBJS += $(MACHINEOBJ)/53c7xx.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter LSI53C810,$(MACHINES)),)
@@ -33,7 +33,7 @@ MACHINEOBJS += $(MACHINEOBJ)/53c810.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter 6522VIA,$(MACHINES)),)
@@ -41,7 +41,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6522via.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TPI6525,$(MACHINES)),)
@@ -49,7 +49,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6525tpi.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter 6526CIA,$(MACHINES)),)
@@ -57,7 +57,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6526cia.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter RIOT6532,$(MACHINES)),)
@@ -65,7 +65,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6532riot.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter 6821PIA,$(MACHINES)),)
@@ -73,7 +73,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6821pia.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter 6840PTM,$(MACHINES)),)
@@ -81,7 +81,7 @@ MACHINEOBJS += $(MACHINEOBJ)/6840ptm.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter ACIA6850,$(MACHINES)),)
@@ -89,16 +89,16 @@ MACHINEOBJS += $(MACHINEOBJ)/6850acia.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter 68681,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/68681.o
+MACHINEOBJS += $(MACHINEOBJ)/68681.o
MACHINEOBJS += $(MACHINEOBJ)/n68681.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter 7200FIFO,$(MACHINES)),)
@@ -106,55 +106,55 @@ MACHINEOBJS += $(MACHINEOBJ)/7200fifo.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TTL74123,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/74123.o
+MACHINEOBJS += $(MACHINEOBJ)/74123.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TTL74145,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/74145.o
+MACHINEOBJS += $(MACHINEOBJ)/74145.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TTL74148,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/74148.o
+MACHINEOBJS += $(MACHINEOBJ)/74148.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TTL74153,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/74153.o
+MACHINEOBJS += $(MACHINEOBJ)/74153.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TTL74181,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/74181.o
+MACHINEOBJS += $(MACHINEOBJ)/74181.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TTL7474,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/7474.o
+MACHINEOBJS += $(MACHINEOBJ)/7474.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter KBDC8042,$(MACHINES)),)
@@ -162,7 +162,7 @@ MACHINEOBJS += $(MACHINEOBJ)/8042kbdc.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8257,$(MACHINES)),)
@@ -170,7 +170,7 @@ MACHINEOBJS += $(MACHINEOBJ)/8257dma.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter AAKARTDEV,$(MACHINES)),)
@@ -178,7 +178,7 @@ MACHINEOBJS += $(MACHINEOBJ)/aakart.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter ADC0808,$(MACHINES)),)
@@ -186,7 +186,7 @@ MACHINEOBJS += $(MACHINEOBJ)/adc0808.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter ADC083X,$(MACHINES)),)
@@ -194,7 +194,7 @@ MACHINEOBJS += $(MACHINEOBJ)/adc083x.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter ADC1038,$(MACHINES)),)
@@ -202,7 +202,7 @@ MACHINEOBJS += $(MACHINEOBJ)/adc1038.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter ADC1213X,$(MACHINES)),)
@@ -210,7 +210,7 @@ MACHINEOBJS += $(MACHINEOBJ)/adc1213x.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter AM53CF96,$(MACHINES)),)
@@ -218,7 +218,7 @@ MACHINEOBJS += $(MACHINEOBJ)/am53cf96.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter AM9517A,$(MACHINES)),)
@@ -226,7 +226,7 @@ MACHINEOBJS += $(MACHINEOBJ)/am9517a.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter AMIGAFDC,$(MACHINES)),)
@@ -234,7 +234,7 @@ MACHINEOBJS += $(MACHINEOBJ)/amigafdc.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter AT28C16,$(MACHINES)),)
@@ -242,7 +242,7 @@ MACHINEOBJS += $(MACHINEOBJ)/at28c16.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter AT29040,$(MACHINES)),)
@@ -250,7 +250,7 @@ MACHINEOBJS += $(MACHINEOBJ)/at29040a.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter AT45DBXX,$(MACHINES)),)
@@ -258,7 +258,7 @@ MACHINEOBJS += $(MACHINEOBJ)/at45dbxx.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter ATAFLASH,$(MACHINES)),)
@@ -268,7 +268,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ataflash.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter AY31015,$(MACHINES)),)
@@ -276,7 +276,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ay31015.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter BANKDEV,$(MACHINES)),)
@@ -284,7 +284,7 @@ MACHINEOBJS += $(MACHINEOBJ)/bankdev.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter CDP1852,$(MACHINES)),)
@@ -292,7 +292,7 @@ MACHINEOBJS += $(MACHINEOBJ)/cdp1852.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter CDP1871,$(MACHINES)),)
@@ -300,7 +300,7 @@ MACHINEOBJS += $(MACHINEOBJ)/cdp1871.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter COM8116,$(MACHINES)),)
@@ -308,15 +308,15 @@ MACHINEOBJS += $(MACHINEOBJ)/com8116.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter CR589,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/cr589.o
+MACHINEOBJS += $(MACHINEOBJ)/cr589.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter CTRONICS,$(MACHINES)),)
@@ -324,7 +324,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ctronics.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter DS1302,$(MACHINES)),)
@@ -332,7 +332,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ds1302.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter DS2401,$(MACHINES)),)
@@ -340,7 +340,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ds2401.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter DS2404,$(MACHINES)),)
@@ -348,7 +348,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ds2404.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter DS75160A,$(MACHINES)),)
@@ -356,7 +356,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ds75160a.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter DS75161A,$(MACHINES)),)
@@ -364,15 +364,15 @@ MACHINEOBJS += $(MACHINEOBJ)/ds75161a.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter E0516,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/e0516.o
+MACHINEOBJS += $(MACHINEOBJ)/e0516.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter EEPROMDEV,$(MACHINES)),)
@@ -380,7 +380,7 @@ MACHINEOBJS += $(MACHINEOBJ)/eeprom.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter ER2055,$(MACHINES)),)
@@ -388,7 +388,7 @@ MACHINEOBJS += $(MACHINEOBJ)/er2055.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter ER59256,$(MACHINES)),)
@@ -396,15 +396,15 @@ MACHINEOBJS += $(MACHINEOBJ)/er59256.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter F3853,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/f3853.o
+MACHINEOBJS += $(MACHINEOBJ)/f3853.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I2CMEM,$(MACHINES)),)
@@ -412,72 +412,72 @@ MACHINEOBJS += $(MACHINEOBJ)/i2cmem.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8155,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/i8155.o
+MACHINEOBJS += $(MACHINEOBJ)/i8155.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8212,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/i8212.o
+MACHINEOBJS += $(MACHINEOBJ)/i8212.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8214,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/i8214.o
+MACHINEOBJS += $(MACHINEOBJ)/i8214.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8243,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/i8243.o
+MACHINEOBJS += $(MACHINEOBJ)/i8243.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8251,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/i8251.o
+MACHINEOBJS += $(MACHINEOBJ)/i8251.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8279,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/i8279.o
+MACHINEOBJS += $(MACHINEOBJ)/i8279.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8355,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/i8355.o
+MACHINEOBJS += $(MACHINEOBJ)/i8355.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter IDE,$(MACHINES)),)
MACHINEOBJS += $(MACHINEOBJ)/idectrl.o
-MACHINEOBJS += $(MACHINEOBJ)/idehd.o
+MACHINEOBJS += $(MACHINEOBJ)/idehd.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter IM6402,$(MACHINES)),)
@@ -485,7 +485,7 @@ MACHINEOBJS += $(MACHINEOBJ)/im6402.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter INS8154,$(MACHINES)),)
@@ -493,7 +493,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ins8154.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter INS8250,$(MACHINES)),)
@@ -501,7 +501,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ins8250.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter INTELFLASH,$(MACHINES)),)
@@ -509,7 +509,7 @@ MACHINEOBJS += $(MACHINEOBJ)/intelfsh.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter JVS,$(MACHINES)),)
@@ -518,7 +518,7 @@ MACHINEOBJS += $(MACHINEOBJ)/jvshost.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter K033906,$(MACHINES)),)
@@ -526,7 +526,7 @@ MACHINEOBJS += $(MACHINEOBJ)/k033906.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter K053252,$(MACHINES)),)
@@ -534,7 +534,7 @@ MACHINEOBJS += $(MACHINEOBJ)/k053252.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter K056230,$(MACHINES)),)
@@ -542,7 +542,7 @@ MACHINEOBJS += $(MACHINEOBJ)/k056230.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter LATCH8,$(MACHINES)),)
@@ -550,7 +550,7 @@ MACHINEOBJS += $(MACHINEOBJ)/latch8.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter LC89510,$(MACHINES)),)
@@ -558,7 +558,7 @@ MACHINEOBJS += $(MACHINEOBJ)/lc89510.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter LDPR8210,$(MACHINES)),)
@@ -566,7 +566,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ldpr8210.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter LDSTUB,$(MACHINES)),)
@@ -574,7 +574,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ldstub.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter LDV1000,$(MACHINES)),)
@@ -584,7 +584,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ldv1000.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter LDVP931,$(MACHINES)),)
@@ -592,7 +592,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ldvp931.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter LINFLASH,$(MACHINES)),)
@@ -600,7 +600,7 @@ MACHINEOBJS += $(MACHINEOBJ)/linflash.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter M6M80011AP,$(MACHINES)),)
@@ -608,7 +608,7 @@ MACHINEOBJS += $(MACHINEOBJ)/m6m80011ap.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MATSUCD,$(MACHINES)),)
@@ -616,7 +616,7 @@ MACHINEOBJS += $(MACHINEOBJ)/matsucd.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MB14241,$(MACHINES)),)
@@ -624,7 +624,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mb14241.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MB3773,$(MACHINES)),)
@@ -632,7 +632,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mb3773.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MB87078,$(MACHINES)),)
@@ -640,7 +640,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mb87078.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MB89371,$(MACHINES)),)
@@ -648,7 +648,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mb89371.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MC146818,$(MACHINES)),)
@@ -656,7 +656,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc146818.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MC2661,$(MACHINES)),)
@@ -664,7 +664,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc2661.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MC6843,$(MACHINES)),)
@@ -672,7 +672,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc6843.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MC6846,$(MACHINES)),)
@@ -680,7 +680,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc6846.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MC6852,$(MACHINES)),)
@@ -688,7 +688,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc6852.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MC6854,$(MACHINES)),)
@@ -696,7 +696,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc6854.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MC68901,$(MACHINES)),)
@@ -704,7 +704,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mc68901.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MCCS1850,$(MACHINES)),)
@@ -712,7 +712,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mccs1850.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MCF5206E,$(MACHINES)),)
@@ -720,7 +720,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mcf5206e.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MICROTOUCH,$(MACHINES)),)
@@ -728,7 +728,7 @@ MACHINEOBJS += $(MACHINEOBJ)/microtch.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MM58274C,$(MACHINES)),)
@@ -736,7 +736,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mm58274c.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MM74C922,$(MACHINES)),)
@@ -744,7 +744,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mm74c922.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MOS6526,$(MACHINES)),)
@@ -752,7 +752,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mos6526.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MOS6529,$(MACHINES)),)
@@ -760,7 +760,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mos6529.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MIOT6530,$(MACHINES)),)
@@ -768,7 +768,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mos6530.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MOS6551,$(MACHINES)),)
@@ -776,7 +776,7 @@ MACHINEOBJS += $(MACHINEOBJ)/mos6551.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MSM5832,$(MACHINES)),)
@@ -784,7 +784,7 @@ MACHINEOBJS += $(MACHINEOBJ)/msm5832.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MSM58321,$(MACHINES)),)
@@ -792,7 +792,7 @@ MACHINEOBJS += $(MACHINEOBJ)/msm58321.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MSM6242,$(MACHINES)),)
@@ -800,7 +800,7 @@ MACHINEOBJS += $(MACHINEOBJ)/msm6242.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter NCR539x,$(MACHINES)),)
@@ -809,7 +809,7 @@ MACHINEOBJS += $(MACHINEOBJ)/ncr539x.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter NMC9306,$(MACHINES)),)
@@ -817,7 +817,7 @@ MACHINEOBJS += $(MACHINEOBJ)/nmc9306.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter NSCSI,$(MACHINES)),)
@@ -827,7 +827,7 @@ MACHINEOBJS += $(MACHINEOBJ)/nscsi_hd.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter PCF8593,$(MACHINES)),)
@@ -835,15 +835,15 @@ MACHINEOBJS += $(MACHINEOBJ)/pcf8593.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter PCI,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/pci.o
+MACHINEOBJS += $(MACHINEOBJ)/pci.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter PCKEYBRD,$(MACHINES)),)
@@ -851,7 +851,7 @@ MACHINEOBJS += $(MACHINEOBJ)/pckeybrd.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter PD4990A_OLD,$(MACHINES)),)
@@ -859,7 +859,7 @@ MACHINEOBJS += $(MACHINEOBJ)/pd4990a.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter PIC8259,$(MACHINES)),)
@@ -867,7 +867,7 @@ MACHINEOBJS += $(MACHINEOBJ)/pic8259.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter PIT8253,$(MACHINES)),)
@@ -875,15 +875,15 @@ MACHINEOBJS += $(MACHINEOBJ)/pit8253.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter PLA,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/pla.o
+MACHINEOBJS += $(MACHINEOBJ)/pla.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter RF5C296,$(MACHINES)),)
@@ -892,7 +892,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rf5c296.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter ROC10937,$(MACHINES)),)
@@ -900,7 +900,7 @@ MACHINEOBJS += $(MACHINEOBJ)/roc10937.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter RP5C01,$(MACHINES)),)
@@ -908,7 +908,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rp5c01.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter RP5C15,$(MACHINES)),)
@@ -916,7 +916,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rp5c15.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter RP5H01,$(MACHINES)),)
@@ -924,7 +924,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rp5h01.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter RTC4543,$(MACHINES)),)
@@ -932,7 +932,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rtc4543.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter RTC65271,$(MACHINES)),)
@@ -940,7 +940,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rtc65271.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter RTC9701,$(MACHINES)),)
@@ -948,7 +948,7 @@ MACHINEOBJS += $(MACHINEOBJ)/rtc9701.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter S3520CF,$(MACHINES)),)
@@ -956,7 +956,7 @@ MACHINEOBJS += $(MACHINEOBJ)/s3520cf.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter S3C2400,$(MACHINES)),)
@@ -964,7 +964,7 @@ MACHINEOBJS += $(MACHINEOBJ)/s3c2400.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter S3C2410,$(MACHINES)),)
@@ -972,7 +972,7 @@ MACHINEOBJS += $(MACHINEOBJ)/s3c2410.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter S3C2440,$(MACHINES)),)
@@ -980,7 +980,7 @@ MACHINEOBJS += $(MACHINEOBJ)/s3c2440.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SATURN,$(MACHINES)),)
@@ -988,7 +988,7 @@ MACHINEOBJS += $(MACHINEOBJ)/saturn.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SCSI,$(MACHINES)),)
@@ -1001,7 +1001,7 @@ MACHINEOBJS += $(MACHINEOBJ)/scsihle.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SCUDSP,$(MACHINES)),)
@@ -1009,7 +1009,7 @@ MACHINEOBJS += $(MACHINEOBJ)/scudsp.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SEIBU_COP,$(MACHINES)),)
@@ -1017,7 +1017,7 @@ MACHINEOBJS += $(MACHINEOBJ)/seibu_cop.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SERFLASH,$(MACHINES)),)
@@ -1025,7 +1025,7 @@ MACHINEOBJS += $(MACHINEOBJ)/serflash.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SMC91C9X,$(MACHINES)),)
@@ -1033,23 +1033,23 @@ MACHINEOBJS += $(MACHINEOBJ)/smc91c9x.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SMPC,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/smpc.o
+MACHINEOBJS += $(MACHINEOBJ)/smpc.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter STVCD,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/stvcd.o
+MACHINEOBJS += $(MACHINEOBJ)/stvcd.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TC0091LVC,$(MACHINES)),)
@@ -1057,7 +1057,7 @@ MACHINEOBJS += $(MACHINEOBJ)/tc009xlvc.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TIMEKPR,$(MACHINES)),)
@@ -1065,7 +1065,7 @@ MACHINEOBJS += $(MACHINEOBJ)/timekpr.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TMP68301,$(MACHINES)),)
@@ -1073,7 +1073,7 @@ MACHINEOBJS += $(MACHINEOBJ)/tmp68301.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TMS6100,$(MACHINES)),)
@@ -1081,7 +1081,7 @@ MACHINEOBJS += $(MACHINEOBJ)/tms6100.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TMS9901,$(MACHINES)),)
@@ -1089,7 +1089,7 @@ MACHINEOBJS += $(MACHINEOBJ)/tms9901.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TMS9902,$(MACHINES)),)
@@ -1097,7 +1097,7 @@ MACHINEOBJS += $(MACHINEOBJ)/tms9902.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter UPD1990A,$(MACHINES)),)
@@ -1105,7 +1105,7 @@ MACHINEOBJS += $(MACHINEOBJ)/upd1990a.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter UPD4701,$(MACHINES)),)
@@ -1113,7 +1113,7 @@ MACHINEOBJS += $(MACHINEOBJ)/upd4701.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter UPD7002,$(MACHINES)),)
@@ -1121,7 +1121,7 @@ MACHINEOBJS += $(MACHINEOBJ)/upd7002.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter UPD765,$(MACHINES)),)
@@ -1129,15 +1129,15 @@ MACHINEOBJS += $(MACHINEOBJ)/upd765.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter V3021,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/v3021.o
+MACHINEOBJS += $(MACHINEOBJ)/v3021.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter WD_FDC,$(MACHINES)),)
@@ -1146,7 +1146,7 @@ MACHINEOBJS += $(MACHINEOBJ)/fdc_pll.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter WD11C00_17,$(MACHINES)),)
@@ -1154,7 +1154,7 @@ MACHINEOBJS += $(MACHINEOBJ)/wd11c00_17.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter WD17XX,$(MACHINES)),)
@@ -1162,7 +1162,7 @@ MACHINEOBJS += $(MACHINEOBJ)/wd17xx.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter WD2010,$(MACHINES)),)
@@ -1170,7 +1170,7 @@ MACHINEOBJS += $(MACHINEOBJ)/wd2010.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter WD33C93,$(MACHINES)),)
@@ -1179,15 +1179,15 @@ MACHINEOBJS += $(MACHINEOBJ)/wd33c93.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter X2212,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/x2212.o
+MACHINEOBJS += $(MACHINEOBJ)/x2212.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter X76F041,$(MACHINES)),)
@@ -1196,7 +1196,7 @@ MACHINEOBJS += $(MACHINEOBJ)/x76f041.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter X76F100,$(MACHINES)),)
@@ -1205,7 +1205,7 @@ MACHINEOBJS += $(MACHINEOBJ)/x76f100.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter Z80CTC,$(MACHINES)),)
@@ -1213,7 +1213,7 @@ MACHINEOBJS += $(MACHINEOBJ)/z80ctc.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter Z80DART,$(MACHINES)),)
@@ -1221,7 +1221,7 @@ MACHINEOBJS += $(MACHINEOBJ)/z80dart.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter Z80DMA,$(MACHINES)),)
@@ -1229,7 +1229,7 @@ MACHINEOBJS += $(MACHINEOBJ)/z80dma.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter Z80PIO,$(MACHINES)),)
@@ -1237,7 +1237,7 @@ MACHINEOBJS += $(MACHINEOBJ)/z80pio.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter Z80SIO,$(MACHINES)),)
@@ -1245,7 +1245,7 @@ MACHINEOBJS += $(MACHINEOBJ)/z80sio.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter Z80STI,$(MACHINES)),)
@@ -1253,15 +1253,15 @@ MACHINEOBJS += $(MACHINEOBJ)/z80sti.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter Z8536,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/z8536.o
+MACHINEOBJS += $(MACHINEOBJ)/z8536.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SECFLASH,$(MACHINES)),)
@@ -1269,7 +1269,7 @@ MACHINEOBJS += $(MACHINEOBJ)/secflash.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter PCCARD,$(MACHINES)),)
@@ -1277,11 +1277,11 @@ MACHINEOBJS += $(MACHINEOBJ)/pccard.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8255,$(MACHINES)),)
-MACHINEOBJS += $(MACHINEOBJ)/i8255.o
+MACHINEOBJS += $(MACHINEOBJ)/i8255.o
endif
$(MACHINEOBJ)/s3c2400.o: $(MACHINESRC)/s3c24xx.c
diff --git a/src/emu/machine/mb14241.h b/src/emu/machine/mb14241.h
index 7b876c0252e..43afabfe2bb 100644
--- a/src/emu/machine/mb14241.h
+++ b/src/emu/machine/mb14241.h
@@ -12,7 +12,7 @@ class mb14241_device : public device_t
{
public:
mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
DECLARE_WRITE8_MEMBER ( shift_count_w );
DECLARE_WRITE8_MEMBER ( shift_data_w );
DECLARE_READ8_MEMBER( shift_result_r );
@@ -25,7 +25,7 @@ protected:
private:
// internal state
-
+
UINT16 m_shift_data; /* 15 bits only */
UINT8 m_shift_count; /* 3 bits */
};
diff --git a/src/emu/machine/mc68901.c b/src/emu/machine/mc68901.c
index 1b920973179..d0b6558c55c 100644
--- a/src/emu/machine/mc68901.c
+++ b/src/emu/machine/mc68901.c
@@ -1232,7 +1232,7 @@ void mc68901_device::register_w(offs_t offset, UINT8 data)
if (data & UCR_PARITY_EVEN)
{
if (LOG) logerror("MC68901 '%s' Parity : Even\n", tag());
-
+
parity_code = SERIAL_PARITY_EVEN;
}
else
diff --git a/src/emu/machine/mm58274c.c b/src/emu/machine/mm58274c.c
index 0bbefe91095..56e94eecad1 100644
--- a/src/emu/machine/mm58274c.c
+++ b/src/emu/machine/mm58274c.c
@@ -99,7 +99,7 @@ void mm58274c_device::device_start()
save_item(NAME(m_minutes2));
save_item(NAME(m_seconds1));
save_item(NAME(m_seconds2));
- save_item(NAME(m_tenths));
+ save_item(NAME(m_tenths));
}
//-------------------------------------------------
@@ -109,14 +109,14 @@ void mm58274c_device::device_start()
void mm58274c_device::device_reset()
{
system_time systime;
-
+
/* get the current date/time from the core */
machine().current_datetime(systime);
-
+
m_clk_set = systime.local_time.year & 3 << 2;
if (m_mode24)
m_clk_set |= clk_set_24;
-
+
/* The clock count starts on 1st January 1900 */
m_wday = 1 + ((systime.local_time.weekday - m_day1) % 7);
m_years1 = (systime.local_time.year / 10) % 10;
@@ -175,75 +175,75 @@ READ8_MEMBER( mm58274c_device::read )
reply = m_status;
m_status = 0;
break;
-
+
case 0x01: /* Tenths of Seconds */
reply = m_tenths;
break;
-
+
case 0x02: /* Units Seconds */
reply = m_seconds2;
break;
-
+
case 0x03: /* Tens Seconds */
reply = m_seconds1;
break;
-
+
case 0x04: /* Units Minutes */
reply = m_minutes2;
break;
-
+
case 0x05: /* Tens Minutes */
reply = m_minutes1;
break;
-
+
case 0x06: /* Units Hours */
reply = m_hours2;
break;
-
+
case 0x07: /* Tens Hours */
reply = m_hours1;
break;
-
+
case 0x08: /* Units Days */
reply = m_days2;
break;
-
+
case 0x09: /* Tens Days */
reply = m_days1;
break;
-
+
case 0x0a: /* Units Months */
reply = m_months2;
break;
-
+
case 0x0b: /* Tens Months */
reply = m_months1;
break;
-
+
case 0x0c: /* Units Years */
reply = m_years2;
break;
-
+
case 0x0d: /* Tens Years */
reply = m_years1;
break;
-
+
case 0x0e: /* Day of Week */
reply = m_wday;
break;
-
+
case 0x0f: /* Clock Setting & Interrupt Registers */
- if (m_control & ctl_intsel) /* interrupt register */
+ if (m_control & ctl_intsel) /* interrupt register */
reply = m_int_ctl;
- else /* clock setting register */
+ else /* clock setting register */
{
- if (m_clk_set & clk_set_24) /* 24-hour mode */
+ if (m_clk_set & clk_set_24) /* 24-hour mode */
reply = m_clk_set & ~clk_set_pm;
- else /* 12-hour mode */
+ else /* 12-hour mode */
reply = m_clk_set;
}
break;
-
+
default:
reply = 0;
break;
@@ -261,90 +261,90 @@ WRITE8_MEMBER( mm58274c_device::write )
switch (offset)
{
case 0x00: /* Control Register (test mode and interrupt not emulated) */
- if ((!(m_control & ctl_intstop)) && (data & ctl_intstop)) /* interrupt stop */
+ if ((!(m_control & ctl_intstop)) && (data & ctl_intstop)) /* interrupt stop */
m_interrupt_timer->enable(0);
- else if ((m_control & ctl_intstop) && (!(data & ctl_intstop))) /* interrupt run */
+ else if ((m_control & ctl_intstop) && (!(data & ctl_intstop))) /* interrupt run */
{
attotime period = interrupt_period_table(m_int_ctl & int_ctl_dly);
-
+
m_interrupt_timer->adjust(period, 0, m_int_ctl & int_ctl_rpt ? period : attotime::zero);
}
- if (data & ctl_clkstop) /* stopping the clock clears the tenth counter */
+ if (data & ctl_clkstop) /* stopping the clock clears the tenth counter */
m_tenths = 0;
m_control = data;
break;
-
+
case 0x01: /* Tenths of Seconds: cannot be written */
break;
-
+
case 0x02: /* Units Seconds */
m_seconds2 = data;
break;
-
+
case 0x03: /* Tens Seconds */
m_seconds1 = data;
break;
-
+
case 0x04: /* Units Minutes */
m_minutes2 = data;
break;
-
+
case 0x05: /* Tens Minutes */
m_minutes1 = data;
break;
-
+
case 0x06: /* Units Hours */
m_hours2 = data;
break;
-
+
case 0x07: /* Tens Hours */
m_hours1 = data;
break;
-
+
case 0x08: /* Units Days */
m_days2 = data;
break;
-
+
case 0x09: /* Tens Days */
m_days1 = data;
break;
-
+
case 0x0a: /* Units Months */
m_months2 = data;
break;
-
+
case 0x0b: /* Tens Months */
m_months1 = data;
break;
-
+
case 0x0c: /* Units Years */
m_years2 = data;
break;
-
+
case 0x0d: /* Tens Years */
m_years1 = data;
break;
-
+
case 0x0e: /* Day of Week */
m_wday = data;
break;
-
+
case 0x0f: /* Clock Setting & Interrupt Registers */
- if (m_control & ctl_intsel) /* interrupt register (not emulated) */
+ if (m_control & ctl_intsel) /* interrupt register (not emulated) */
{
m_int_ctl = data;
- if (!(m_control & ctl_intstop)) /* interrupt run */
+ if (!(m_control & ctl_intstop)) /* interrupt run */
{
attotime period = interrupt_period_table(m_int_ctl & int_ctl_dly);
-
+
m_interrupt_timer->adjust(period, 0, m_int_ctl & int_ctl_rpt ? period : attotime::zero);
}
}
- else /* clock setting register */
+ else /* clock setting register */
{
m_clk_set = data;
#if 0
- if (m_clk_set & clk_set_24) /* 24-hour mode */
+ if (m_clk_set & clk_set_24) /* 24-hour mode */
m_clk_set &= ~clk_set_pm;
#endif
}
@@ -482,4 +482,3 @@ TIMER_CALLBACK_MEMBER(mm58274c_device::rtc_increment_cb)
}
}
}
-
diff --git a/src/emu/machine/mm58274c.h b/src/emu/machine/mm58274c.h
index 02d24c4b726..8f1a28b619f 100644
--- a/src/emu/machine/mm58274c.h
+++ b/src/emu/machine/mm58274c.h
@@ -26,7 +26,7 @@ class mm58274c_device : public device_t,
public:
mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~mm58274c_device() {}
-
+
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
@@ -42,14 +42,14 @@ protected:
private:
// internal state
attotime interrupt_period_table(int val);
-
+
int m_status; /* status register (*read* from address 0 = control register) */
int m_control; /* control register (*write* to address 0) */
-
+
int m_clk_set; /* clock setting register */
int m_int_ctl; /* interrupt control register */
-
-
+
+
int m_wday; /* day of the week (1-7 (1=day1 as set in init)) */
int m_years1; /* years (BCD: 0-99) */
int m_years2;
@@ -64,7 +64,7 @@ private:
int m_seconds1; /* seconds (BCD : 0-59) */
int m_seconds2;
int m_tenths; /* tenths of second (BCD : 0-9) */
-
+
emu_timer *m_increment_rtc;
emu_timer *m_interrupt_timer;
};
diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c
index ac47cddf7a7..5c5dd6cb006 100644
--- a/src/emu/machine/pit8253.c
+++ b/src/emu/machine/pit8253.c
@@ -75,24 +75,24 @@ void pit8253_device::device_config_complete()
// device_start - device-specific startup
//-------------------------------------------------
-void pit8253_device::common_start( int device_type )
+void pit8253_device::common_start( int device_type )
{
m_device_type = device_type;
-
+
/* register for state saving */
for (int timerno = 0; timerno < PIT8253_MAX_TIMER; timerno++)
{
pit8253_timer *timer = get_timer(timerno);
-
+
/* initialize timer */
timer->clockin = m_intf_timer[timerno].clockin;
timer->updatetimer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pit8253_device::update_timer_cb),this));
timer->updatetimer->adjust(attotime::never, timerno);
-
+
/* resolve callbacks */
timer->in_gate_func.resolve(m_intf_timer[timerno].in_gate_func, *this);
timer->out_out_func.resolve(m_intf_timer[timerno].out_out_func, *this);
-
+
/* set up state save values */
save_item(NAME(timer->clockin), timerno);
save_item(NAME(timer->control), timerno);
@@ -144,20 +144,20 @@ void pit8253_device::device_reset()
timer->rmsb = timer->wmsb = 0;
timer->count = timer->value = timer->latch = 0;
timer->lowcount = 0;
-
+
if (!timer->in_gate_func.isnull())
timer->gate = timer->in_gate_func();
else
timer->gate = 1;
-
+
timer->output = 2; /* output is undetermined */
timer->latched_count = 0;
timer->latched_status = 0;
timer->null_count = 1;
timer->cycles_to_output = CYCLES_NEVER;
-
+
timer->last_updated = machine().time();
-
+
update(timer);
}
}
@@ -311,7 +311,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles)
LOG2(("pit8253: simulate2(): simulating %d cycles for %d in mode %d, bcd = %d, phase = %d, gate = %d, output %d, value = 0x%04x\n",
(int)elapsed_cycles, timer->index, mode, bcd, timer->phase, pit8253_gate(timer), timer->output, timer->value));
- switch (mode)
+ switch (mode)
{
case 0:
/* Mode 0: (Interrupt on Terminal Count)
@@ -342,7 +342,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles)
if (elapsed_cycles >= 0 && timer->phase == 1)
{
/* Counter load cycle */
- if (elapsed_cycles > 0)
+ if (elapsed_cycles > 0)
{
--elapsed_cycles;
timer->phase = 2;
@@ -406,7 +406,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles)
if (elapsed_cycles >= 0 && timer->phase == 1)
{
/* Counter load cycle, output goes low */
- if (elapsed_cycles > 0)
+ if (elapsed_cycles > 0)
{
--elapsed_cycles;
timer->phase = 2;
@@ -472,7 +472,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles)
{
if (elapsed_cycles >= 0 && timer->phase == 1)
{
- if (elapsed_cycles > 0)
+ if (elapsed_cycles > 0)
{
--elapsed_cycles;
timer->phase = 2;
@@ -552,7 +552,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles)
{
if (elapsed_cycles >= 0 && timer->phase == 1)
{
- if (elapsed_cycles > 0)
+ if (elapsed_cycles > 0)
{
--elapsed_cycles;
timer->phase = 2;
@@ -560,7 +560,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles)
load_counter_value(timer);
}
- if (elapsed_cycles > 0)
+ if (elapsed_cycles > 0)
{
adjusted_value = adjusted_count(bcd, timer->value);
@@ -635,7 +635,7 @@ void pit8253_device::simulate2(pit8253_timer *timer, INT64 elapsed_cycles)
{
if (elapsed_cycles >= 0 && timer->phase == 1)
{
- if (elapsed_cycles > 0)
+ if (elapsed_cycles > 0)
{
--elapsed_cycles;
timer->phase = 2;
@@ -799,12 +799,12 @@ READ8_MEMBER( pit8253_device::read )
timer->rmsb = 1 - timer->rmsb;
--timer->latched_count;
}
- else
+ else
{
value = masked_value(timer);
/* Read back current count */
- switch(CTRL_ACCESS(timer->control))
+ switch(CTRL_ACCESS(timer->control))
{
case 0:
default:
@@ -892,7 +892,7 @@ void pit8253_device::readback(pit8253_timer *timer, int command)
if (timer->latched_count == 0)
{
value = masked_value(timer);
- switch(CTRL_ACCESS(timer->control))
+ switch(CTRL_ACCESS(timer->control))
{
case 0:
/* This should never happen */
@@ -928,7 +928,7 @@ WRITE8_MEMBER( pit8253_device::write )
LOG2(("pit8253: write(): offset=%d data=0x%02x\n", offset, data));
- if (timer == NULL)
+ if (timer == NULL)
{
/* Write to mode control register */
timer = get_timer((data >> 6) & 3);
@@ -982,7 +982,7 @@ WRITE8_MEMBER( pit8253_device::write )
if (machine().time() > timer->last_updated && timer->clockin != 0)
middle_of_a_cycle = 1;
- switch(CTRL_ACCESS(timer->control))
+ switch(CTRL_ACCESS(timer->control))
{
case 0:
/* This should never happen */
@@ -1124,4 +1124,3 @@ void pit8253_device::set_clock_signal(int timerno, int state)
WRITE_LINE_MEMBER( pit8253_device::clk0_w ) { set_clock_signal(0, state); }
WRITE_LINE_MEMBER( pit8253_device::clk1_w ) { set_clock_signal(1, state); }
WRITE_LINE_MEMBER( pit8253_device::clk2_w ) { set_clock_signal(2, state); }
-
diff --git a/src/emu/machine/pit8253.h b/src/emu/machine/pit8253.h
index 68aa25ad113..e8ef8bc2b9e 100644
--- a/src/emu/machine/pit8253.h
+++ b/src/emu/machine/pit8253.h
@@ -29,7 +29,7 @@
/* device types */
-enum
+enum
{
TYPE_PIT8253 = 0,
TYPE_PIT8254
@@ -52,14 +52,14 @@ struct pit8253_timer
int index; /* index number of the timer */
double clockin; /* input clock frequency in Hz */
int clock; /* clock signal when clockin is 0 */
-
+
devcb_resolved_read_line in_gate_func; /* callback for gate input */
devcb_resolved_write_line out_out_func; /* callback function for when output changes */
-
+
attotime last_updated; /* time when last updated */
-
+
emu_timer *updatetimer; /* MAME timer to process updates */
-
+
UINT16 value; /* current counter value ("CE" in Intel docs) */
UINT16 latch; /* latched counter value ("OL" in Intel docs) */
UINT16 count; /* new counter value ("CR" in Intel docs) */
@@ -69,13 +69,13 @@ struct pit8253_timer
INT32 rmsb; /* 1 = Next read is MSB of 16-bit value */
INT32 wmsb; /* 1 = Next write is MSB of 16-bit value */
INT32 output; /* 0 = low, 1 = high */
-
+
INT32 gate; /* gate input (0 = low, 1 = high) */
INT32 latched_count; /* number of bytes of count latched */
INT32 latched_status; /* 1 = status latched (8254 only) */
INT32 null_count; /* 1 = mode control or count written, 0 = count loaded */
INT32 phase; /* see phase definition tables in simulate2(), below */
-
+
UINT32 cycles_to_output; /* cycles until output callback called */
};
@@ -90,20 +90,20 @@ public:
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
-
+
WRITE_LINE_MEMBER(clk0_w);
WRITE_LINE_MEMBER(clk1_w);
WRITE_LINE_MEMBER(clk2_w);
-
+
WRITE_LINE_MEMBER(gate0_w);
WRITE_LINE_MEMBER(gate1_w);
WRITE_LINE_MEMBER(gate2_w);
-
-
+
+
/* In the 8253/8254 the CLKx input lines can be attached to a regular clock
signal. Another option is to use the output from one timer as the input
clock to another timer.
-
+
The functions below should supply both functionalities. If the signal is
a regular clock signal, use the pit8253_set_clockin function. If the
CLKx input signal is the output of the different source, set the new_clockin
@@ -113,14 +113,14 @@ public:
int get_output(int timer);
void set_clockin(int timer, double new_clockin);
-
+
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
// internal state
void common_start(int device_type);
pit8253_timer *get_timer(int which);
@@ -138,7 +138,7 @@ protected:
void set_clock_signal(int timerno, int state);
TIMER_CALLBACK_MEMBER(update_timer_cb);
-
+
int m_device_type;
pit8253_timer m_timers[PIT8253_MAX_TIMER];
diff --git a/src/emu/machine/rf5c296.c b/src/emu/machine/rf5c296.c
index 6e303c1812a..3b530a97669 100644
--- a/src/emu/machine/rf5c296.c
+++ b/src/emu/machine/rf5c296.c
@@ -89,7 +89,7 @@ READ16_MEMBER(rf5c296_device::io_r)
case 0x3e1:
data = reg_r(m_rf5c296_reg);
break;
-
+
default:
data = m_pccard->read_memory(space, offset, mem_mask);
break;
diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c
index 631a9e805db..b368b005be0 100644
--- a/src/emu/machine/rp5h01.c
+++ b/src/emu/machine/rp5h01.c
@@ -3,8 +3,8 @@
RP5H01
TODO:
- - follow the datasheet better (all dumps presumably needs to be redone
- from scratch?)
+ - follow the datasheet better (all dumps presumably needs to be redone
+ from scratch?)
***************************************************************************/
@@ -187,5 +187,3 @@ READ8_MEMBER( rp5h01_device::data_r )
/* return the data */
return (m_data[byte] >> bit) & 1;
}
-
-
diff --git a/src/emu/machine/rp5h01.h b/src/emu/machine/rp5h01.h
index 9aaa31c4f12..3800b8e311f 100644
--- a/src/emu/machine/rp5h01.h
+++ b/src/emu/machine/rp5h01.h
@@ -27,7 +27,7 @@ class rp5h01_device : public device_t
{
public:
rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
DECLARE_WRITE8_MEMBER( enable_w ); /* /CE */
DECLARE_WRITE8_MEMBER( reset_w ); /* RESET */
DECLARE_WRITE8_MEMBER( cs_w ); /* CS */
diff --git a/src/emu/machine/serflash.c b/src/emu/machine/serflash.c
index 9de0d2d8de7..5653e58f4f0 100644
--- a/src/emu/machine/serflash.c
+++ b/src/emu/machine/serflash.c
@@ -46,7 +46,7 @@ void serflash_device::device_reset()
{
m_flash_enab = 0;
flash_hard_reset(machine());
-
+
m_last_flash_cmd = 0x00;
m_flash_addr_seq = 0;
m_flash_addr = 0;
@@ -61,7 +61,6 @@ void serflash_device::device_reset()
void serflash_device::nvram_default()
{
-
}
@@ -98,7 +97,6 @@ void serflash_device::nvram_read(emu_file &file)
void serflash_device::nvram_write(emu_file &file)
{
-
if (m_length % FLASH_PAGE_SIZE) return; // region size must be multiple of flash page size
int size = m_length /= FLASH_PAGE_SIZE;
@@ -167,7 +165,7 @@ WRITE8_MEMBER( serflash_device::flash_cmd_w )
switch (data)
{
- case 0x00: // READ
+ case 0x00: // READ
m_flash_addr_seq = 0;
break;
@@ -175,21 +173,21 @@ WRITE8_MEMBER( serflash_device::flash_cmd_w )
m_flash_addr_seq = 0;
break;
- case 0x70: // READ STATUS
+ case 0x70: // READ STATUS
flash_change_state( space.machine(), STATE_READ_STATUS );
break;
- case 0x80: // PAGE / CACHE PROGRAM
+ case 0x80: // PAGE / CACHE PROGRAM
m_flash_addr_seq = 0;
// this actually seems to be set with the next 2 writes?
m_flash_page_addr = 0;
break;
- case 0x90: // READ ID
+ case 0x90: // READ ID
flash_change_state( space.machine(), STATE_READ_ID );
break;
- case 0xff: // RESET
+ case 0xff: // RESET
flash_change_state( space.machine(), STATE_IDLE );
break;
@@ -203,11 +201,9 @@ WRITE8_MEMBER( serflash_device::flash_cmd_w )
{
switch (m_flash_cmd_prev)
{
- case 0x00: // READ
+ case 0x00: // READ
if (data == 0x30)
{
-
-
memcpy(m_flash_page_data, m_region + m_flash_row * FLASH_PAGE_SIZE, FLASH_PAGE_SIZE);
m_flash_page_addr = m_flash_col;
m_flash_page_index = m_flash_row;
@@ -306,16 +302,16 @@ READ8_MEMBER( serflash_device::flash_io_r )
switch( m_flash_read_seq++ )
{
case 0:
- data = 0xEC; // Manufacturer
+ data = 0xEC; // Manufacturer
break;
case 1:
- data = 0xF1; // Device
+ data = 0xF1; // Device
break;
case 2:
- data = 0x00; // XX
+ data = 0x00; // XX
break;
case 3:
- data = 0x15; // Flags
+ data = 0x15; // Flags
m_flash_read_seq = 0;
break;
}
@@ -342,7 +338,7 @@ READ8_MEMBER( serflash_device::flash_io_r )
default:
{
- // logerror("%08x FLASH: unknown read in state %s\n",0x00/*m_maincpu->pc()*/, m_flash_state_name[m_flash_state]);
+ // logerror("%08x FLASH: unknown read in state %s\n",0x00/*m_maincpu->pc()*/, m_flash_state_name[m_flash_state]);
}
}
@@ -412,4 +408,3 @@ WRITE8_MEMBER(serflash_device::n3d_flash_addr_w)
logerror("set flash block to %08x\n", m_flash_addr);
}
}
-
diff --git a/src/emu/machine/serflash.h b/src/emu/machine/serflash.h
index 13fbb02a26e..e4045a78582 100644
--- a/src/emu/machine/serflash.h
+++ b/src/emu/machine/serflash.h
@@ -6,7 +6,7 @@
#define __SERFLASH_H__
-#define FLASH_PAGE_SIZE (2048+64)
+#define FLASH_PAGE_SIZE (2048+64)
@@ -18,16 +18,15 @@
//**************************************************************************
#define MCFG_SERFLASH_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, SERFLASH, 0) \
-
+ MCFG_DEVICE_ADD(_tag, SERFLASH, 0)
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
class serflash_device;
-typedef enum { STATE_IDLE = 0, STATE_READ, STATE_READ_ID, STATE_READ_STATUS, STATE_BLOCK_ERASE, STATE_PAGE_PROGRAM } flash_state_t;
-//const char *m_flash_state_name[] = { "IDLE", "READ", "READ_ID", "READ_STATUS", "BLOCK ERASE", "PAGE PROGRAM" };
+typedef enum { STATE_IDLE = 0, STATE_READ, STATE_READ_ID, STATE_READ_STATUS, STATE_BLOCK_ERASE, STATE_PAGE_PROGRAM } flash_state_t;
+//const char *m_flash_state_name[] = { "IDLE", "READ", "READ_ID", "READ_STATUS", "BLOCK ERASE", "PAGE PROGRAM" };
// custom initialization for default state
typedef device_delegate<void (serflash_device &, void *, size_t)> serflash_init_delegate;
@@ -105,4 +104,3 @@ extern const device_type SERFLASH;
#endif
-
diff --git a/src/emu/machine/tms6100.c b/src/emu/machine/tms6100.c
index 1d64aa73717..9fd5bf7c77e 100644
--- a/src/emu/machine/tms6100.c
+++ b/src/emu/machine/tms6100.c
@@ -85,14 +85,14 @@ tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, d
: device_t(mconfig, TMS6100, "TMS6100", tag, owner, clock)
{
}
-
+
const device_type M58819 = &device_creator<m58819_device>;
m58819_device::m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms6100_device(mconfig, M58819, "M58819", tag, owner, clock)
{
}
-
+
//-------------------------------------------------
// device_config_complete - perform any
// operations now that the configuration is
@@ -231,5 +231,3 @@ READ_LINE_MEMBER(tms6100_device::tms6100_data_r)
{
return m_data;
}
-
-
diff --git a/src/emu/machine/tms6100.h b/src/emu/machine/tms6100.h
index a6a13da2340..edfb348c6b1 100644
--- a/src/emu/machine/tms6100.h
+++ b/src/emu/machine/tms6100.h
@@ -10,7 +10,7 @@ class tms6100_device : public device_t
public:
tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
-
+
DECLARE_WRITE_LINE_MEMBER( tms6100_m0_w );
DECLARE_WRITE_LINE_MEMBER( tms6100_m1_w );
DECLARE_WRITE_LINE_MEMBER( tms6100_romclock_w );
@@ -34,8 +34,8 @@ private:
UINT8 m_tms_clock;
UINT8 m_data;
UINT8 m_state;
-
- const UINT8 *m_rom;
+
+ const UINT8 *m_rom;
};
diff --git a/src/emu/machine/z80dart.c b/src/emu/machine/z80dart.c
index 066a65922aa..1b032422f57 100644
--- a/src/emu/machine/z80dart.c
+++ b/src/emu/machine/z80dart.c
@@ -20,8 +20,8 @@
TODO:
- - devcb2
- - i8274 DMA scheme
+ - devcb2
+ - i8274 DMA scheme
- break detection
- wr0 reset tx interrupt pending
- wait/ready
@@ -494,7 +494,7 @@ z80dart_channel::z80dart_channel(const machine_config &mconfig, const char *tag,
{
m_rx_data_fifo[i] = 0;
m_rx_error_fifo[i] = 0;
- }
+ }
}
@@ -929,7 +929,7 @@ void z80dart_channel::control_write(UINT8 data)
LOG(("Z80DART \"%s\" Channel %c : Parity %s\n", m_owner->tag(), 'A' + m_index, (data & WR4_PARITY_EVEN) ? "Even" : "Odd"));
LOG(("Z80DART \"%s\" Channel %c : Stop Bits %f\n", m_owner->tag(), 'A' + m_index, get_stop_bits()));
LOG(("Z80DART \"%s\" Channel %c : Clock Mode %uX\n", m_owner->tag(), 'A' + m_index, get_clock_mode()));
-
+
update_serial();
break;
@@ -1279,7 +1279,7 @@ void z80dart_channel::update_serial()
{
if (m_wr[1] & WR4_PARITY_EVEN)
parity_code = SERIAL_PARITY_EVEN;
- else
+ else
parity_code = SERIAL_PARITY_ODD;
}
diff --git a/src/emu/machine/z80dart.h b/src/emu/machine/z80dart.h
index 63dc7665795..820f78ac2b3 100644
--- a/src/emu/machine/z80dart.h
+++ b/src/emu/machine/z80dart.h
@@ -360,18 +360,18 @@ protected:
enum
{
- WR2_DATA_XFER_INT = 0x00, // not supported
- WR2_DATA_XFER_DMA_INT = 0x01, // not supported
- WR2_DATA_XFER_DMA = 0x02, // not supported
- WR2_DATA_XFER_ILLEGAL = 0x03, // not supported
- WR2_DATA_XFER_MASK = 0x03, // not supported
- WR2_PRIORITY = 0x04, // not supported
- WR2_MODE_8085_1 = 0x00, // not supported
- WR2_MODE_8085_2 = 0x08, // not supported
- WR2_MODE_8086_8088 = 0x10, // not supported
- WR2_MODE_ILLEGAL = 0x18, // not supported
- WR2_MODE_MASK = 0x18, // not supported
- WR2_VECTORED_INT = 0x20, // not supported
+ WR2_DATA_XFER_INT = 0x00, // not supported
+ WR2_DATA_XFER_DMA_INT = 0x01, // not supported
+ WR2_DATA_XFER_DMA = 0x02, // not supported
+ WR2_DATA_XFER_ILLEGAL = 0x03, // not supported
+ WR2_DATA_XFER_MASK = 0x03, // not supported
+ WR2_PRIORITY = 0x04, // not supported
+ WR2_MODE_8085_1 = 0x00, // not supported
+ WR2_MODE_8085_2 = 0x08, // not supported
+ WR2_MODE_8086_8088 = 0x10, // not supported
+ WR2_MODE_ILLEGAL = 0x18, // not supported
+ WR2_MODE_MASK = 0x18, // not supported
+ WR2_VECTORED_INT = 0x20, // not supported
WR2_PIN10_SYNDETB_RTSB = 0x80 // not supported
};
diff --git a/src/emu/memory.h b/src/emu/memory.h
index 3fa84a7eaa6..20142a02d6e 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -937,23 +937,23 @@ private:
// device delegate macros
-#define READ8_DELEGATE(_class, _member) read8_delegate(FUNC(_class::_member), this)
-#define WRITE8_DELEGATE(_class, _member) write8_delegate(FUNC(_class::_member), this)
-#define READ16_DELEGATE(_class, _member) read16_delegate(FUNC(_class::_member), this)
-#define WRITE16_DELEGATE(_class, _member) write16_delegate(FUNC(_class::_member), this)
-#define READ32_DELEGATE(_class, _member) read32_delegate(FUNC(_class::_member), this)
-#define WRITE32_DELEGATE(_class, _member) write32_delegate(FUNC(_class::_member), this)
-#define READ64_DELEGATE(_class, _member) read64_delegate(FUNC(_class::_member), this)
-#define WRITE64_DELEGATE(_class, _member) write64_delegate(FUNC(_class::_member), this)
-
-#define READ8_DEVICE_DELEGATE(_device, _class, _member) read8_delegate(FUNC(_class::_member), (_class *)_device)
-#define WRITE8_DEVICE_DELEGATE(_device, _class, _member) write8_delegate(FUNC(_class::_member), (_class *)_device)
-#define READ16_DEVICE_DELEGATE(_device, _class, _member) read16_delegate(FUNC(_class::_member), (_class *)_device)
-#define WRITE16_DEVICE_DELEGATE(_device, _class, _member) write16_delegate(FUNC(_class::_member), (_class *)_device)
-#define READ32_DEVICE_DELEGATE(_device, _class, _member) read32_delegate(FUNC(_class::_member), (_class *)_device)
-#define WRITE32_DEVICE_DELEGATE(_device, _class, _member) write32_delegate(FUNC(_class::_member), (_class *)_device)
-#define READ64_DEVICE_DELEGATE(_device, _class, _member) read64_delegate(FUNC(_class::_member), (_class *)_device)
-#define WRITE64_DEVICE_DELEGATE(_device, _class, _member) write64_delegate(FUNC(_class::_member), (_class *)_device)
+#define READ8_DELEGATE(_class, _member) read8_delegate(FUNC(_class::_member), this)
+#define WRITE8_DELEGATE(_class, _member) write8_delegate(FUNC(_class::_member), this)
+#define READ16_DELEGATE(_class, _member) read16_delegate(FUNC(_class::_member), this)
+#define WRITE16_DELEGATE(_class, _member) write16_delegate(FUNC(_class::_member), this)
+#define READ32_DELEGATE(_class, _member) read32_delegate(FUNC(_class::_member), this)
+#define WRITE32_DELEGATE(_class, _member) write32_delegate(FUNC(_class::_member), this)
+#define READ64_DELEGATE(_class, _member) read64_delegate(FUNC(_class::_member), this)
+#define WRITE64_DELEGATE(_class, _member) write64_delegate(FUNC(_class::_member), this)
+
+#define READ8_DEVICE_DELEGATE(_device, _class, _member) read8_delegate(FUNC(_class::_member), (_class *)_device)
+#define WRITE8_DEVICE_DELEGATE(_device, _class, _member) write8_delegate(FUNC(_class::_member), (_class *)_device)
+#define READ16_DEVICE_DELEGATE(_device, _class, _member) read16_delegate(FUNC(_class::_member), (_class *)_device)
+#define WRITE16_DEVICE_DELEGATE(_device, _class, _member) write16_delegate(FUNC(_class::_member), (_class *)_device)
+#define READ32_DEVICE_DELEGATE(_device, _class, _member) read32_delegate(FUNC(_class::_member), (_class *)_device)
+#define WRITE32_DEVICE_DELEGATE(_device, _class, _member) write32_delegate(FUNC(_class::_member), (_class *)_device)
+#define READ64_DEVICE_DELEGATE(_device, _class, _member) read64_delegate(FUNC(_class::_member), (_class *)_device)
+#define WRITE64_DEVICE_DELEGATE(_device, _class, _member) write64_delegate(FUNC(_class::_member), (_class *)_device)
// helper macro for merging data with the memory mask
diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c
index 46868fe2726..ce8a60b7a0a 100644
--- a/src/emu/sound/msm5205.c
+++ b/src/emu/sound/msm5205.c
@@ -85,14 +85,14 @@ void msm5205_device::device_config_complete()
const msm5205_interface *intf = reinterpret_cast<const msm5205_interface *>(static_config());
if (intf != NULL)
*static_cast<msm5205_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
memset(&m_vclk_cb, 0, sizeof(m_vclk_cb));
m_select = 0;
}
-
+
}
//-------------------------------------------------
@@ -103,14 +103,14 @@ void msm5205_device::device_start()
{
m_mod_clock = clock();
m_vclk_callback.resolve(m_vclk_cb, *this);
-
+
/* compute the difference tables */
compute_tables();
-
+
/* stream system initialize */
m_stream = machine().sound().stream_alloc(*this, 0, 1, clock(), this);
m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(msm5205_device::vclk_callback), this));
-
+
/* register for save states */
save_item(NAME(m_mod_clock));
save_item(NAME(m_data));
@@ -127,14 +127,14 @@ void msm5205_device::device_start()
//-------------------------------------------------
void msm5205_device::device_reset()
-{
+{
/* initialize work */
m_data = 0;
m_vclk = 0;
m_reset = 0;
m_signal = 0;
m_step = 0;
-
+
/* timer and bitwidth set */
playmode_w(m_select);
}
@@ -189,7 +189,7 @@ TIMER_CALLBACK_MEMBER( msm5205_device::vclk_callback )
int new_signal;
/* callback user handler and latch next data */
- if (!m_vclk_callback.isnull())
+ if (!m_vclk_callback.isnull())
m_vclk_callback(1);
/* reset check at last hiedge of VCLK */
@@ -237,7 +237,7 @@ void msm5205_device::vclk_w(int vclk)
if (m_vclk != vclk)
{
m_vclk = vclk;
- if (!vclk)
+ if (!vclk)
vclk_callback(this, 0);
}
}
@@ -325,7 +325,7 @@ void msm5205_device::change_clock_w(INT32 clock)
void msm5205_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
stream_sample_t *buffer = outputs[0];
-
+
/* if this voice is active */
if(m_signal)
{
diff --git a/src/emu/sound/sp0256.c b/src/emu/sound/sp0256.c
index 739f570fe72..7fc7a95e705 100644
--- a/src/emu/sound/sp0256.c
+++ b/src/emu/sound/sp0256.c
@@ -27,7 +27,7 @@
the sp0256_start() call.
If the memory map contents is modified during execution (accross of ROM
- bank switching) the bitrevbuff() call must be called after the section
+ bank switching) the bitrevbuff() call must be called after the section
of ROM is modified.
*/
@@ -112,14 +112,14 @@ void sp0256_device::device_config_complete()
const sp0256_interface *intf = reinterpret_cast<const sp0256_interface *>(static_config());
if (intf != NULL)
*static_cast<sp0256_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
memset(&m_lrq_cb, 0, sizeof(m_lrq_cb));
memset(&m_sby_cb, 0, sizeof(m_sby_cb));
}
-
+
}
//-------------------------------------------------
@@ -132,14 +132,14 @@ void sp0256_device::device_start()
m_sby.resolve(m_sby_cb, *this);
m_drq(1);
m_sby(1);
-
+
m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() / CLOCK_DIVIDER, this);
-
+
/* -------------------------------------------------------------------- */
/* Configure our internal variables. */
/* -------------------------------------------------------------------- */
m_filt.rng = 1;
-
+
/* -------------------------------------------------------------------- */
/* Allocate a scratch buffer for generating ~10kHz samples. */
/* -------------------------------------------------------------------- */
@@ -147,7 +147,7 @@ void sp0256_device::device_start()
save_pointer(NAME(m_scratch), SCBUF_SIZE);
m_sc_head = m_sc_tail = 0;
-
+
/* -------------------------------------------------------------------- */
/* Set up the microsequencer's initial state. */
/* -------------------------------------------------------------------- */
@@ -156,7 +156,7 @@ void sp0256_device::device_start()
m_lrq = 0x8000;
m_page = 0x1000 << 3;
m_silent = 1;
-
+
/* -------------------------------------------------------------------- */
/* Setup the ROM. */
/* -------------------------------------------------------------------- */
@@ -165,7 +165,7 @@ void sp0256_device::device_start()
// see http://forums.bannister.org/ubbthreads.php?ubb=showflat&Number=72385#Post72385
// TODO: because of this, check if the bitrev functions are even used anywhere else
// bitrevbuff(m_rom, 0, 0xffff);
-
+
m_lrq_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(sp0256_device::set_lrq_timer_proc),this));
// save device variables
@@ -208,7 +208,7 @@ void sp0256_device::device_reset()
{
// reset FIFO and SP0256
m_fifo_head = m_fifo_tail = m_fifo_bitp = 0;
-
+
memset(&m_filt, 0, sizeof(m_filt));
m_halted = 1;
m_filt.rpt = -1;
@@ -223,7 +223,7 @@ void sp0256_device::device_reset()
m_silent = 1;
m_drq(1);
SET_SBY(1)
-
+
m_lrq = 0;
m_lrq_timer->adjust(attotime::from_ticks(50, m_clock));
}
@@ -1196,7 +1196,7 @@ WRITE8_MEMBER( sp0256_device::ald_w )
LOG(("sp0256: Droped ALD write\n"));
return;
}
-
+
/* ---------------------------------------------------------------- */
/* Set LRQ to "busy" and load the 8 LSBs of the data into the ALD */
/* reg. We take the command address, and multiply by 2 bytes to */
@@ -1206,7 +1206,7 @@ WRITE8_MEMBER( sp0256_device::ald_w )
m_ald = (0xff & data) << 4;
m_drq(0);
SET_SBY(0)
-
+
return;
}
@@ -1214,13 +1214,13 @@ READ_LINE_MEMBER( sp0256_device::lrq_r )
{
// force stream update
m_stream->update();
-
+
return m_lrq == 0x8000;
}
READ_LINE_MEMBER( sp0256_device::sby_r )
{
- // TODO: force stream update??
+ // TODO: force stream update??
return m_sby_line;
}
@@ -1234,7 +1234,7 @@ READ16_MEMBER( sp0256_device::spb640_r )
{
return m_lrq;
}
-
+
/* -------------------------------------------------------------------- */
/* Offset 1 returns the SPB640 FIFO full status on bit 15. */
/* -------------------------------------------------------------------- */
@@ -1242,7 +1242,7 @@ READ16_MEMBER( sp0256_device::spb640_r )
{
return (m_fifo_head - m_fifo_tail) >= 64 ? 0x8000 : 0;
}
-
+
/* -------------------------------------------------------------------- */
/* Just return 255 for all other addresses in our range. */
/* -------------------------------------------------------------------- */
@@ -1256,20 +1256,20 @@ WRITE16_MEMBER( sp0256_device::spb640_w )
ald_w(space, 0, data & 0xff);
return;
}
-
+
if (offset == 1)
{
/* ---------------------------------------------------------------- */
/* If Bit 10 is set, reset the FIFO, and SP0256. */
/* ---------------------------------------------------------------- */
-
+
if (data & 0x400)
{
m_fifo_head = m_fifo_tail = m_fifo_bitp = 0;
device_reset();
return;
}
-
+
/* ---------------------------------------------------------------- */
/* If the FIFO is full, drop the data. */
/* ---------------------------------------------------------------- */
@@ -1278,16 +1278,16 @@ WRITE16_MEMBER( sp0256_device::spb640_w )
LOG(("spb640: Dropped FIFO write\n"));
return;
}
-
+
/* ---------------------------------------------------------------- */
/* FIFO up the lower 10 bits of the data. */
/* ---------------------------------------------------------------- */
-
+
LOG(("spb640: WR_FIFO %.3X %d.%d %d\n", data & 0x3ff,
- m_fifo_tail, m_fifo_bitp, m_fifo_head));
-
+ m_fifo_tail, m_fifo_bitp, m_fifo_head));
+
m_fifo[m_fifo_head++ & 63] = data & 0x3ff;
-
+
return;
}
}
@@ -1313,31 +1313,31 @@ void sp0256_device::sound_stream_update(sound_stream &stream, stream_sample_t **
stream_sample_t *output = outputs[0];
int output_index = 0;
int length, did_samp/*, old_idx*/;
-
+
while (output_index < samples)
{
/* ---------------------------------------------------------------- */
/* First, drain as much of our scratch buffer as we can into the */
/* sound buffer. */
/* ---------------------------------------------------------------- */
-
+
while (m_sc_tail != m_sc_head)
{
output[output_index++] = m_scratch[m_sc_tail++ & SCBUF_MASK];
m_sc_tail &= SCBUF_MASK;
-
+
if (output_index > samples)
break;
}
-
+
/* ---------------------------------------------------------------- */
/* If output outputs is full, then we're done. */
/* ---------------------------------------------------------------- */
if (output_index > samples)
break;
-
+
length = samples - output_index;
-
+
/* ---------------------------------------------------------------- */
/* Process the current set of filter coefficients as long as the */
/* repeat count holds up and we have room in our scratch buffer. */
@@ -1347,26 +1347,26 @@ void sp0256_device::sound_stream_update(sound_stream &stream, stream_sample_t **
if (length > 0) do
{
int do_samp;
-
+
/* ------------------------------------------------------------ */
/* If our repeat count expired, emulate the microsequencer. */
/* ------------------------------------------------------------ */
if (m_filt.rpt <= 0)
micro();
-
+
/* ------------------------------------------------------------ */
/* Do as many samples as we can. */
/* ------------------------------------------------------------ */
do_samp = length - did_samp;
if (m_sc_head + do_samp - m_sc_tail > SCBUF_SIZE)
do_samp = m_sc_tail + SCBUF_SIZE - m_sc_head;
-
+
if (do_samp == 0) break;
-
+
if (m_silent && m_filt.rpt <= 0)
{
int y = m_sc_head;
-
+
for (int x = 0; x < do_samp; x++)
m_scratch[y++ & SCBUF_MASK] = 0;
m_sc_head += do_samp;
@@ -1375,11 +1375,11 @@ void sp0256_device::sound_stream_update(sound_stream &stream, stream_sample_t **
else
{
did_samp += lpc12_update(&m_filt, do_samp,
- m_scratch, &m_sc_head);
+ m_scratch, &m_sc_head);
}
-
+
m_sc_head &= SCBUF_MASK;
-
+
} while (m_filt.rpt >= 0 && length > did_samp);
}
}
diff --git a/src/emu/sound/sp0256.h b/src/emu/sound/sp0256.h
index 91e7d89a0db..b6cd977ef6d 100644
--- a/src/emu/sound/sp0256.h
+++ b/src/emu/sound/sp0256.h
@@ -81,11 +81,11 @@ public:
DECLARE_READ_LINE_MEMBER(sby_r);
DECLARE_READ16_MEMBER(spb640_r);
DECLARE_WRITE16_MEMBER(spb640_w);
-
+
TIMER_CALLBACK_MEMBER(set_lrq_timer_proc);
void set_clock(int clock);
void bitrevbuff(UINT8 *buffer, unsigned int start, unsigned int length);
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -97,20 +97,20 @@ protected:
private:
UINT32 getb(int len);
void micro();
-
+
sound_stream *m_stream; /* MAME core sound stream */
devcb_resolved_write_line m_drq; /* Data request callback */
devcb_resolved_write_line m_sby; /* Standby callback */
int m_sby_line; /* Standby line state */
int m_cur_len; /* Fullness of current sound buffer. */
-
+
int m_silent; /* Flag: SP0256 is silent. */
-
+
INT16 *m_scratch; /* Scratch buffer for audio. */
UINT32 m_sc_head; /* Head pointer into scratch circular buf */
UINT32 m_sc_tail; /* Tail pointer into scratch circular buf */
-
+
struct lpc12_t m_filt; /* 12-pole filter */
int m_lrq; /* Load ReQuest. == 0 if we can accept a load */
int m_ald; /* Address LoaD. < 0 if no command pending. */
@@ -120,12 +120,12 @@ private:
int m_halted; /* True when CPU is halted. */
UINT32 m_mode; /* Mode register. */
UINT32 m_page; /* Page set by SETPAGE */
-
+
UINT32 m_fifo_head; /* FIFO head pointer (where new data goes). */
UINT32 m_fifo_tail; /* FIFO tail pointer (where data comes from). */
UINT32 m_fifo_bitp; /* FIFO bit-pointer (for partial decles). */
UINT16 m_fifo[64]; /* The 64-decle FIFO. */
-
+
UINT8 *m_rom; /* 64K ROM. */
emu_timer *m_lrq_timer;
diff --git a/src/emu/sound/speaker.c b/src/emu/sound/speaker.c
index 0a6783960c5..146843687ad 100644
--- a/src/emu/sound/speaker.c
+++ b/src/emu/sound/speaker.c
@@ -99,7 +99,7 @@ void speaker_sound_device::device_config_complete()
const speaker_interface *intf = reinterpret_cast<const speaker_interface *>(static_config());
if (intf != NULL)
*static_cast<speaker_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -116,7 +116,7 @@ void speaker_sound_device::device_start()
{
int i;
double x;
-
+
m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate(), this);
m_level = 0;
@@ -137,7 +137,7 @@ void speaker_sound_device::device_start()
/* Note: To avoid time drift due to floating point inaccuracies,
* it is good if the speaker time synchronizes itself with the stream timing regularly.
*/
-
+
/* Compute filter kernel; */
/* (Done for each device though the data is shared...
* No problem really, but should be done as part of system init if I knew how)
@@ -157,8 +157,8 @@ void speaker_sound_device::device_start()
#define FILTER_STEP (M_PI / 2 / RATE_MULTIPLIER)
/* Distribute symmetrically on x axis; center has x=0 if length is odd */
for (i = 0, x = (0.5 - FILTER_LENGTH / 2.) * FILTER_STEP;
- i < FILTER_LENGTH;
- i++, x += FILTER_STEP)
+ i < FILTER_LENGTH;
+ i++, x += FILTER_STEP)
{
if (x == 0)
m_ampl[i] = 1;
@@ -180,7 +180,7 @@ void speaker_sound_device::device_start()
save_item(NAME(m_channel_last_sample_time));
save_item(NAME(m_interm_sample_index));
save_item(NAME(m_last_update_time));
-
+
machine().save().register_postload(save_prepost_delegate(FUNC(speaker_sound_device::speaker_postload), this));
}
@@ -201,35 +201,35 @@ void speaker_sound_device::sound_stream_update(sound_stream &stream, stream_samp
int volume = m_levels[m_level];
double filtered_volume;
attotime sampled_time = attotime::zero;
-
+
if (samples > 0)
{
/* Prepare to update time state */
sampled_time = attotime(0, m_channel_sample_period);
if (samples > 1)
sampled_time *= samples;
-
+
/* Note: since the stream is in the process of being updated,
* stream->sample_time() will return the time before the update! (MAME 0.130)
* Avoid using it here in order to avoid a subtle dependence on the stream implementation.
*/
}
-
+
if (samples-- > 0)
{
/* Note that first interm. sample may be composed... */
filtered_volume = update_interm_samples_get_filtered_volume(volume);
-
+
/* Composite volume is now quantized to the stream resolution */
*buffer++ = (stream_sample_t)filtered_volume;
-
+
/* Any additional samples will be homogeneous, however may need filtering across samples: */
while (samples-- > 0)
{
filtered_volume = update_interm_samples_get_filtered_volume(volume);
*buffer++ = (stream_sample_t)filtered_volume;
}
-
+
/* Update the time state */
m_channel_last_sample_time += sampled_time;
m_channel_next_sample_time = m_channel_last_sample_time + attotime(0, m_channel_sample_period);
@@ -289,7 +289,7 @@ void speaker_sound_device::level_w(int new_level)
/* Finally update speaker state before returning */
m_level = new_level;
-
+
}
@@ -394,5 +394,3 @@ double speaker_sound_device::get_filtered_volume()
return filtered_volume;
}
-
-
diff --git a/src/emu/sound/speaker.h b/src/emu/sound/speaker.h
index d90f3c50316..6adda328ca8 100644
--- a/src/emu/sound/speaker.h
+++ b/src/emu/sound/speaker.h
@@ -12,7 +12,7 @@
#define __SOUND_SPEAKER_H__
// Length of anti-aliasing filter kernel, measured in number of intermediate samples
-enum
+enum
{
FILTER_LENGTH = 64
};
@@ -48,21 +48,21 @@ private:
// Updates the composed volume array according to time
void update_interm_samples(attotime time, int volume);
-
+
// Updates the composed volume array and returns final filtered volume of next stream sample
double update_interm_samples_get_filtered_volume(int volume);
-
+
void finalize_interm_sample(int volume);
void init_next_interm_sample();
inline double make_fraction(attotime a, attotime b, double timediv);
double get_filtered_volume();
-
+
// Kernel (pulse response) for filtering across samples (while we avoid fancy filtering within samples)
double m_ampl[FILTER_LENGTH];
-
+
sound_stream *m_channel;
int m_level;
-
+
/* The volume of a composed sample grows incrementally each time the speaker is over-sampled.
* That is in effect a basic average filter.
* Another filter can and will be applied to the array of composed samples.
diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c
index c1148d10d84..2c32a50b7ad 100644
--- a/src/emu/sound/ymf271.c
+++ b/src/emu/sound/ymf271.c
@@ -1136,7 +1136,7 @@ void ymf271_device::write_register(int slotnum, int reg, int data)
slot->ch3_level = data & 0xf;
break;
}
-
+
default:
break;
}
@@ -1318,7 +1318,7 @@ void ymf271_device::device_timer(emu_timer &timer, device_timer_id id, int param
if (!m_irq_handler.isnull())
m_irq_handler(1);
}
-
+
// reload timer
m_timA->adjust(attotime::from_hz(m_clock) * (384 * 4 * (256 - m_timerA)), 0);
break;
@@ -1334,7 +1334,7 @@ void ymf271_device::device_timer(emu_timer &timer, device_timer_id id, int param
if (!m_irq_handler.isnull())
m_irq_handler(1);
}
-
+
// reload timer
m_timB->adjust(attotime::from_hz(m_clock) * (384 * 16 * (256 - m_timerB)), 0);
break;
@@ -1447,7 +1447,7 @@ void ymf271_device::ymf271_write_timer(int data)
if (!m_ext_rw && !m_ext_write_handler.isnull())
m_ext_write_handler(m_ext_address, data);
break;
-
+
default:
break;
}
@@ -1737,11 +1737,11 @@ void ymf271_device::device_reset()
m_slots[i].active = 0;
m_slots[i].volume = 0;
}
-
+
// reset timers and IRQ
m_timA->reset();
m_timB->reset();
-
+
m_irqstate = 0;
m_status = 0;
m_enable = 0;
diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c
index 0e8dc68be71..2edc86b200e 100644
--- a/src/emu/sound/ymz280b.c
+++ b/src/emu/sound/ymz280b.c
@@ -17,7 +17,7 @@
8-bit PCM, 16-bit PCM ...... 0.172 to 88.2kHz in 512 steps
256 steps total level and 16 steps panpot can be set
Voice signal is output in stereo 16-bit 2's complement MSB-first format
-
+
TODO:
- Is memory handling 100% correct? At the moment, Konami firebeat.c is the only
hardware currently emulated that uses external handlers.
diff --git a/src/emu/video/cdp1861.c b/src/emu/video/cdp1861.c
index 356eb9d316d..f9e6420c6a5 100644
--- a/src/emu/video/cdp1861.c
+++ b/src/emu/video/cdp1861.c
@@ -41,9 +41,9 @@ const device_type CDP1861 = &device_creator<cdp1861_device>;
cdp1861_device::cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CDP1861, "CDP1861", tag, owner, clock),
- m_write_irq(*this),
- m_write_dma_out(*this),
- m_write_efx(*this)
+ m_write_irq(*this),
+ m_write_dma_out(*this),
+ m_write_efx(*this)
{
}
diff --git a/src/emu/video/cdp1862.c b/src/emu/video/cdp1862.c
index 0851dd0c91c..9370f09dc93 100644
--- a/src/emu/video/cdp1862.c
+++ b/src/emu/video/cdp1862.c
@@ -78,9 +78,9 @@ inline void cdp1862_device::initialize_palette()
cdp1862_device::cdp1862_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CDP1862, "CDP1862", tag, owner, clock),
- m_read_rd(*this),
- m_read_bd(*this),
- m_read_gd(*this)
+ m_read_rd(*this),
+ m_read_bd(*this),
+ m_read_gd(*this)
{
}
diff --git a/src/emu/video/huc6270.h b/src/emu/video/huc6270.h
index 3ca51391d0d..6f385daf9c1 100644
--- a/src/emu/video/huc6270.h
+++ b/src/emu/video/huc6270.h
@@ -67,7 +67,7 @@ private:
HUC6270_VDW,
HUC6270_VCR
};
-
+
enum huc6270_h_state {
HUC6270_HDS,
HUC6270_HDW,
diff --git a/src/emu/video/msm6255.c b/src/emu/video/msm6255.c
index b8e607ce0b1..c8180244d15 100644
--- a/src/emu/video/msm6255.c
+++ b/src/emu/video/msm6255.c
@@ -198,7 +198,7 @@ READ8_MEMBER( msm6255_device::ir_r )
//-------------------------------------------------
-// ir_w -
+// ir_w -
//-------------------------------------------------
WRITE8_MEMBER( msm6255_device::ir_w )
@@ -257,7 +257,7 @@ READ8_MEMBER( msm6255_device::dr_r )
//-------------------------------------------------
-// dr_w -
+// dr_w -
//-------------------------------------------------
WRITE8_MEMBER( msm6255_device::dr_w )
diff --git a/src/emu/video/tms9927.c b/src/emu/video/tms9927.c
index 5ad9f301ebc..8f68236dfb0 100644
--- a/src/emu/video/tms9927.c
+++ b/src/emu/video/tms9927.c
@@ -85,14 +85,14 @@ void tms9927_device::device_start()
{
assert(clock() > 0);
assert(m_hpixels_per_column > 0);
-
+
/* copy the initial parameters */
m_clock = clock();
-
+
/* get the screen device */
m_screen = downcast<screen_device *>(machine().device(m_screen_tag));
assert(m_screen != NULL);
-
+
/* get the self-load PROM */
if (m_selfload_region != NULL)
{
@@ -102,7 +102,7 @@ void tms9927_device::device_start()
/* register for state saving */
machine().save().register_postload(save_prepost_delegate(FUNC(tms9927_device::state_postload), this));
-
+
save_item(NAME(m_reg));
save_item(NAME(m_start_datarow));
save_item(NAME(m_reset));
@@ -123,11 +123,11 @@ void tms9927_device::device_reset()
void tms9927_device::device_stop()
{
mame_printf_debug("TMS9937: Final params: (%d, %d, %d, %d, %d, %d, %d)\n",
- m_clock,
- m_total_hpix,
- 0, m_visible_hpix,
- m_total_vpix,
- 0, m_visible_vpix);
+ m_clock,
+ m_total_hpix,
+ 0, m_visible_hpix,
+ m_total_vpix,
+ 0, m_visible_vpix);
}
@@ -300,4 +300,3 @@ void tms9927_device::recompute_parameters(int postload)
m_screen->configure(m_total_hpix, m_total_vpix, visarea, refresh);
}
-
diff --git a/src/emu/video/tms9927.h b/src/emu/video/tms9927.h
index 8ff3dfa0ed2..94ba9919eee 100644
--- a/src/emu/video/tms9927.h
+++ b/src/emu/video/tms9927.h
@@ -33,7 +33,7 @@ public:
int screen_reset();
int upscroll_offset();
int cursor_bounds(rectangle &bounds);
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -46,17 +46,17 @@ private:
void state_postload();
void recompute_parameters(int postload);
void generic_access(address_space &space, offs_t offset);
-
+
// internal state
screen_device *m_screen;
const UINT8 *m_selfload;
-
+
/* live state */
UINT32 m_clock;
UINT8 m_reg[9];
UINT8 m_start_datarow;
UINT8 m_reset;
-
+
/* derived state; no need to save */
UINT8 m_valid_config;
UINT16 m_total_hpix, m_total_vpix;
diff --git a/src/emu/video/upd7227.c b/src/emu/video/upd7227.c
index 04a3c11f02f..0b3c3f37a17 100644
--- a/src/emu/video/upd7227.c
+++ b/src/emu/video/upd7227.c
@@ -44,13 +44,13 @@ ADDRESS_MAP_END
upd7227_device::upd7227_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD7227, "uPD7227", tag, owner, clock),
- device_memory_interface(mconfig, *this),
- m_space_config("videoram", ENDIANNESS_BIG, 8, 7, 0, *ADDRESS_MAP_NAME(upd7227_map)),
- m_cs(1),
- m_cd(1),
- m_sck(1),
- m_si(1),
- m_so(1)
+ device_memory_interface(mconfig, *this),
+ m_space_config("videoram", ENDIANNESS_BIG, 8, 7, 0, *ADDRESS_MAP_NAME(upd7227_map)),
+ m_cs(1),
+ m_cd(1),
+ m_sck(1),
+ m_si(1),
+ m_so(1)
{
}
diff --git a/src/emu/video/upd7227.h b/src/emu/video/upd7227.h
index b55301c3a76..ca1507948a4 100644
--- a/src/emu/video/upd7227.h
+++ b/src/emu/video/upd7227.h
@@ -63,18 +63,18 @@ protected:
private:
enum
{
- CMD_SMM = 0x18,
- CMD_SFF = 0x10,
- CMD_LDPI = 0x80,
- CMD_SWM = 0x64,
- CMD_SRM = 0x60,
- CMD_SANDM = 0x6c,
- CMD_SORM = 0x68,
- CMD_SCM = 0x72,
- CMD_BSET = 0x40,
- CMD_BRESET = 0x20,
- CMD_DISP_ON = 0x09,
- CMD_DISP_OFF = 0x08
+ CMD_SMM = 0x18,
+ CMD_SFF = 0x10,
+ CMD_LDPI = 0x80,
+ CMD_SWM = 0x64,
+ CMD_SRM = 0x60,
+ CMD_SANDM = 0x6c,
+ CMD_SORM = 0x68,
+ CMD_SCM = 0x72,
+ CMD_BSET = 0x40,
+ CMD_BRESET = 0x20,
+ CMD_DISP_ON = 0x09,
+ CMD_DISP_OFF = 0x08
};
int m_sx;
diff --git a/src/emu/video/video.mak b/src/emu/video/video.mak
index fed2f29d056..880582e46f0 100644
--- a/src/emu/video/video.mak
+++ b/src/emu/video/video.mak
@@ -15,15 +15,15 @@ VIDEOOBJ = $(EMUOBJ)/video
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SEGA315_5124,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/315_5124.o
+VIDEOOBJS+= $(VIDEOOBJ)/315_5124.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter BUFSPRITE,$(VIDEOS)),)
@@ -31,47 +31,47 @@ VIDEOOBJS+= $(VIDEOOBJ)/bufsprite.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter CDP1861,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/cdp1861.o
+VIDEOOBJS+= $(VIDEOOBJ)/cdp1861.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter CDP1862,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/cdp1862.o
+VIDEOOBJS+= $(VIDEOOBJ)/cdp1862.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter CRT9007,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/crt9007.o
+VIDEOOBJS+= $(VIDEOOBJ)/crt9007.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter CRT9021,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/crt9021.o
+VIDEOOBJS+= $(VIDEOOBJ)/crt9021.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter CRT9212,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/crt9212.o
+VIDEOOBJS+= $(VIDEOOBJ)/crt9212.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter DL1416,$(VIDEOS)),)
@@ -79,7 +79,7 @@ VIDEOOBJS+= $(VIDEOOBJ)/dl1416.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter DM9368,$(VIDEOS)),)
@@ -87,225 +87,225 @@ VIDEOOBJS+= $(VIDEOOBJ)/dm9368.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter EF9340_1,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/ef9340_1.o
+VIDEOOBJS+= $(VIDEOOBJ)/ef9340_1.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter H63484,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/h63484.o
+VIDEOOBJS+= $(VIDEOOBJ)/h63484.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HD44102,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/hd44102.o
+VIDEOOBJS+= $(VIDEOOBJ)/hd44102.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HD44352,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/hd44352.o
+VIDEOOBJS+= $(VIDEOOBJ)/hd44352.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HD44780,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/hd44780.o
+VIDEOOBJS+= $(VIDEOOBJ)/hd44780.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HD61830,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/hd61830.o
+VIDEOOBJS+= $(VIDEOOBJ)/hd61830.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HD63484,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/hd63484.o
+VIDEOOBJS+= $(VIDEOOBJ)/hd63484.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HD66421,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/hd66421.o
+VIDEOOBJS+= $(VIDEOOBJ)/hd66421.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HUC6202,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/huc6202.o
+VIDEOOBJS+= $(VIDEOOBJ)/huc6202.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HUC6260,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/huc6260.o
+VIDEOOBJS+= $(VIDEOOBJ)/huc6260.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HUC6261,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/huc6261.o
+VIDEOOBJS+= $(VIDEOOBJ)/huc6261.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HUC6270,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/huc6270.o
+VIDEOOBJS+= $(VIDEOOBJ)/huc6270.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter HUC6272,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/huc6272.o
+VIDEOOBJS+= $(VIDEOOBJ)/huc6272.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8244,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/i8244.o
+VIDEOOBJS+= $(VIDEOOBJ)/i8244.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter I8275,$(VIDEOS)),)
VIDEOOBJS+= $(VIDEOOBJ)/i8275.o \
- $(VIDEOOBJ)/i8275x.o
+ $(VIDEOOBJ)/i8275x.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
-ifneq ($(filter K053250,$(VIDEOS)),)
+ifneq ($(filter K053250,$(VIDEOS)),)
VIDEOOBJS+= $(VIDEOOBJ)/k053250.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter M50458,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/m50458.o
+VIDEOOBJS+= $(VIDEOOBJ)/m50458.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MB90082,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/mb90082.o
+VIDEOOBJS+= $(VIDEOOBJ)/mb90082.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MC6845,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/mc6845.o
+VIDEOOBJS+= $(VIDEOOBJ)/mc6845.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MC6847,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/mc6847.o
+VIDEOOBJS+= $(VIDEOOBJ)/mc6847.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter MSM6255,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/msm6255.o
+VIDEOOBJS+= $(VIDEOOBJ)/msm6255.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter PC_CGA,$(VIDEOS)),)
VIDEOOBJS+= $(VIDEOOBJ)/pc_cga.o \
- $(VIDEOOBJ)/cgapal.o
+ $(VIDEOOBJ)/cgapal.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
-ifneq ($(filter PC_VGA,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/pc_vga.o
+ifneq ($(filter PC_VGA,$(VIDEOS)),)
+VIDEOOBJS+= $(VIDEOOBJ)/pc_vga.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter POLY,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/poly.o
+VIDEOOBJS+= $(VIDEOOBJ)/poly.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter PSX,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/psx.o
+VIDEOOBJS+= $(VIDEOOBJ)/psx.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter RAMDAC,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/ramdac.o
+VIDEOOBJS+= $(VIDEOOBJ)/ramdac.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter S2636,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/s2636.o
+VIDEOOBJS+= $(VIDEOOBJ)/s2636.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SAA5050,$(VIDEOS)),)
@@ -313,14 +313,14 @@ VIDEOOBJS+= $(VIDEOOBJ)/saa5050.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter SED1330,$(VIDEOS)),)
VIDEOOBJS+= $(VIDEOOBJ)/sed1330.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter STVVDP,$(VIDEOS)),)
@@ -329,39 +329,39 @@ VIDEOOBJS+= $(VIDEOOBJ)/stvvdp1.o \
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TLC34076,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/tlc34076.o
+VIDEOOBJS+= $(VIDEOOBJ)/tlc34076.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TMS34061,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/tms34061.o
+VIDEOOBJS+= $(VIDEOOBJ)/tms34061.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TMS3556,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/tms3556.o
+VIDEOOBJS+= $(VIDEOOBJ)/tms3556.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TMS9927,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/tms9927.o
+VIDEOOBJS+= $(VIDEOOBJ)/tms9927.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter TMS9928A,$(VIDEOS)),)
@@ -369,7 +369,7 @@ VIDEOOBJS+= $(VIDEOOBJ)/tms9928a.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter UPD3301,$(VIDEOS)),)
@@ -377,15 +377,15 @@ VIDEOOBJS+= $(VIDEOOBJ)/upd3301.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter UPD7220,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/upd7220.o
+VIDEOOBJS+= $(VIDEOOBJ)/upd7220.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter UPD7227,$(VIDEOS)),)
@@ -393,15 +393,15 @@ VIDEOOBJS+= $(VIDEOOBJ)/upd7227.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter V9938,$(VIDEOS)),)
-VIDEOOBJS+= $(VIDEOOBJ)/v9938.o
+VIDEOOBJS+= $(VIDEOOBJ)/v9938.o
endif
#-------------------------------------------------
-#
+#
#-------------------------------------------------
ifneq ($(filter VOODOO,$(VIDEOS)),)
diff --git a/src/lib/formats/bml3_dsk.c b/src/lib/formats/bml3_dsk.c
index 502476472d9..e445824ab05 100644
--- a/src/lib/formats/bml3_dsk.c
+++ b/src/lib/formats/bml3_dsk.c
@@ -36,7 +36,7 @@ static FLOPPY_CONSTRUCT(bml3_dsk_construct)
LEGACY_FLOPPY_OPTIONS_START( bml3 )
- LEGACY_FLOPPY_OPTION( bml3_dsk, "bm3", "BML3 floppy disk image", bml3_dsk_identify, bml3_dsk_construct, NULL,
+ LEGACY_FLOPPY_OPTION( bml3_dsk, "bm3", "BML3 floppy disk image", bml3_dsk_identify, bml3_dsk_construct, NULL,
HEADS([2])
TRACKS([40])
SECTORS([16])
diff --git a/src/lib/formats/td0_dsk.c b/src/lib/formats/td0_dsk.c
index 064e98a1b6c..383d67f5f28 100644
--- a/src/lib/formats/td0_dsk.c
+++ b/src/lib/formats/td0_dsk.c
@@ -1022,5 +1022,3 @@ bool td0_format::supports_save() const
}
const floppy_format_type FLOPPY_TD0_FORMAT = &floppy_image_format_creator<td0_format>;
-
-
diff --git a/src/mame/audio/flower.c b/src/mame/audio/flower.c
index 037172a0e5e..b8959469385 100644
--- a/src/mame/audio/flower.c
+++ b/src/mame/audio/flower.c
@@ -140,7 +140,7 @@ void flower_sound_device::device_timer(emu_timer &timer, device_timer_id id, int
for (voice = m_channel_list; voice < m_last_channel; voice++)
voice->ecount += (voice->ecount < (1<<22));
break;
-
+
default:
assert_always(FALSE, "Unknown id in flower_sound_device::device_timer");
}
diff --git a/src/mame/audio/geebee.c b/src/mame/audio/geebee.c
index 4b2c00ab14c..0baca804bf0 100644
--- a/src/mame/audio/geebee.c
+++ b/src/mame/audio/geebee.c
@@ -12,7 +12,7 @@
const device_type GEEBEE = &device_creator<geebee_sound_device>;
-
+
geebee_sound_device::geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GEEBEE, "Gee Bee Custom", tag, owner, clock),
device_sound_interface(mconfig, *this),
@@ -26,17 +26,17 @@ geebee_sound_device::geebee_sound_device(const machine_config &mconfig, const ch
m_vcount(0)
{
}
-
+
//-------------------------------------------------
// device_config_complete - perform any
// operations now that the configuration is
// complete
//-------------------------------------------------
-
+
void geebee_sound_device::device_config_complete()
{
}
-
+
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
@@ -60,7 +60,7 @@ void geebee_sound_device::device_start()
save_item(NAME(m_noise));
save_item(NAME(m_vcount));
}
-
+
void geebee_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
switch (id)
@@ -69,7 +69,7 @@ void geebee_sound_device::device_timer(emu_timer &timer, device_timer_id id, int
if (--m_volume < 0)
m_volume = 0;
break;
-
+
default:
assert_always(FALSE, "Unknown id in geebee_device::device_timer");
}
@@ -81,11 +81,11 @@ WRITE8_MEMBER( geebee_sound_device::sound_w )
m_sound_latch = data;
m_volume = 0x7fff; /* set volume */
m_noise = 0x0000; /* reset noise shifter */
- /* faster decay enabled? */
+ /* faster decay enabled? */
if( m_sound_latch & 8 )
- {
- /*
- * R24 is 10k, Rb is 0, C57 is 1uF
+ {
+ /*
+ * R24 is 10k, Rb is 0, C57 is 1uF
* charge time t1 = 0.693 * (R24 + Rb) * C57 -> 0.22176s
* discharge time t2 = 0.693 * (Rb) * C57 -> 0
* Then C33 is only charged via D6 (1N914), not discharged!
@@ -114,52 +114,52 @@ WRITE8_MEMBER( geebee_sound_device::sound_w )
//-------------------------------------------------
void geebee_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
- {
- stream_sample_t *buffer = outputs[0];
-
- while (samples--)
- {
+ {
+ stream_sample_t *buffer = outputs[0];
+
+ while (samples--)
+ {
*buffer++ = m_sound_signal;
- /* 1V = HSYNC = 18.432MHz / 3 / 2 / 384 = 8000Hz */
- {
+ /* 1V = HSYNC = 18.432MHz / 3 / 2 / 384 = 8000Hz */
+ {
m_vcount++;
- /* noise clocked with raising edge of 2V */
+ /* noise clocked with raising edge of 2V */
if ((m_vcount & 3) == 2)
- {
- /* bit0 = bit0 ^ !bit10 */
+ {
+ /* bit0 = bit0 ^ !bit10 */
if ((m_noise & 1) == ((m_noise >> 10) & 1))
m_noise = ((m_noise << 1) & 0xfffe) | 1;
- else
+ else
m_noise = (m_noise << 1) & 0xfffe;
- }
+ }
switch (m_sound_latch & 7)
- {
- case 0: /* 4V */
+ {
+ case 0: /* 4V */
m_sound_signal = (m_vcount & 0x04) ? m_decay[m_volume] : 0;
- break;
- case 1: /* 8V */
+ break;
+ case 1: /* 8V */
m_sound_signal = (m_vcount & 0x08) ? m_decay[m_volume] : 0;
- break;
- case 2: /* 16V */
+ break;
+ case 2: /* 16V */
m_sound_signal = (m_vcount & 0x10) ? m_decay[m_volume] : 0;
- break;
- case 3: /* 32V */
+ break;
+ case 3: /* 32V */
m_sound_signal = (m_vcount & 0x20) ? m_decay[m_volume] : 0;
- break;
- case 4: /* TONE1 */
+ break;
+ case 4: /* TONE1 */
m_sound_signal = !(m_vcount & 0x01) && !(m_vcount & 0x10) ? m_decay[m_volume] : 0;
- break;
- case 5: /* TONE2 */
+ break;
+ case 5: /* TONE2 */
m_sound_signal = !(m_vcount & 0x02) && !(m_vcount & 0x20) ? m_decay[m_volume] : 0;
- break;
- case 6: /* TONE3 */
+ break;
+ case 6: /* TONE3 */
m_sound_signal = !(m_vcount & 0x04) && !(m_vcount & 0x40) ? m_decay[m_volume] : 0;
- break;
- default: /* NOISE */
- /* QH of 74164 #4V */
+ break;
+ default: /* NOISE */
+ /* QH of 74164 #4V */
m_sound_signal = (m_noise & 0x8000) ? m_decay[m_volume] : 0;
- }
-
- }
- }
-} \ No newline at end of file
+ }
+
+ }
+ }
+}
diff --git a/src/mame/audio/redbaron.h b/src/mame/audio/redbaron.h
index eda9c43ea78..35d90b70bcc 100644
--- a/src/mame/audio/redbaron.h
+++ b/src/mame/audio/redbaron.h
@@ -9,9 +9,9 @@ class redbaron_sound_device : public device_t,
{
public:
redbaron_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
DECLARE_WRITE8_MEMBER( sounds_w );
-
+
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/mame/audio/snes_snd.c b/src/mame/audio/snes_snd.c
index dd55d6db4a9..93d8c97f09f 100644
--- a/src/mame/audio/snes_snd.c
+++ b/src/mame/audio/snes_snd.c
@@ -176,12 +176,12 @@ void snes_sound_device::device_config_complete()
void snes_sound_device::device_start()
{
m_channel = machine().sound().stream_alloc(*this, 0, 2, 32000, this);
-
+
m_ram = auto_alloc_array_clear(machine(), UINT8, SNES_SPCRAM_SIZE);
-
+
/* put IPL image at the top of RAM */
memcpy(m_ipl_region, machine().root_device().memregion("sound_ipl")->base(), 64);
-
+
/* Initialize the timers */
m_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(snes_sound_device::spc_timer),this));
m_timer[0]->adjust(attotime::from_hz(8000), 0, attotime::from_hz(8000));
@@ -192,7 +192,7 @@ void snes_sound_device::device_start()
m_timer[2] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(snes_sound_device::spc_timer),this));
m_timer[2]->adjust(attotime::from_hz(64000), 2, attotime::from_hz(64000));
m_timer[2]->enable(false);
-
+
state_register();
save_pointer(NAME(m_ram), SNES_SPCRAM_SIZE);
}
@@ -205,14 +205,14 @@ void snes_sound_device::device_reset()
{
/* default to ROM visible */
m_ram[0xf1] = 0x80;
-
+
/* Sort out the ports */
for (int i = 0; i < 4; i++)
{
m_port_in[i] = 0;
m_port_out[i] = 0;
}
-
+
dsp_reset();
}
@@ -1242,12 +1242,12 @@ void snes_sound_device::state_register()
void snes_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
short mix[2];
-
+
for (int i = 0; i < samples; i++)
{
mix[0] = mix[1] = 0;
dsp_update(mix);
-
+
/* Update the buffers */
outputs[0][i] = (stream_sample_t)mix[0];
outputs[1][i] = (stream_sample_t)mix[1];
diff --git a/src/mame/audio/snes_snd.h b/src/mame/audio/snes_snd.h
index a2920aefa28..09c371ef128 100644
--- a/src/mame/audio/snes_snd.h
+++ b/src/mame/audio/snes_snd.h
@@ -73,8 +73,8 @@ public:
DECLARE_WRITE8_MEMBER( spc_io_w );
DECLARE_WRITE8_MEMBER( spc_ram_w );
DECLARE_WRITE8_MEMBER( spc_port_in );
-
-// UINT8 *spc_get_ram() { return m_ram; }
+
+// UINT8 *spc_get_ram() { return m_ram; }
protected:
// device-level overrides
@@ -86,7 +86,7 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
private:
-
+
DECLARE_READ8_MEMBER(dsp_io_r);
DECLARE_WRITE8_MEMBER(dsp_io_w);
TIMER_CALLBACK_MEMBER(spc_timer);
@@ -94,21 +94,21 @@ private:
void dsp_update(short *sound_ptr);
int advance_envelope(int v);
void state_register();
-
+
// internal state
UINT8 *m_ram;
sound_stream *m_channel;
UINT8 m_dsp_regs[256]; /* DSP registers */
UINT8 m_ipl_region[64]; /* SPC top 64 bytes */
-
+
int m_keyed_on;
int m_keys; /* 8-bits for 8 voices */
voice_state_type m_voice_state[8];
-
+
/* Noise stuff */
int m_noise_cnt;
int m_noise_lev;
-
+
/* These are for the FIR echo filter */
#ifndef NO_ECHO
short m_fir_lbuf[8];
@@ -116,12 +116,12 @@ private:
int m_fir_ptr;
int m_echo_ptr;
#endif
-
+
/* timers */
emu_timer *m_timer[3];
UINT8 m_enabled[3];
UINT16 m_counter[3];
-
+
/* IO ports */
UINT8 m_port_in[4]; /* SPC input ports */
UINT8 m_port_out[4]; /* SPC output ports */
diff --git a/src/mame/audio/warpwarp.c b/src/mame/audio/warpwarp.c
index dc1f2acb17f..7f84f171266 100644
--- a/src/mame/audio/warpwarp.c
+++ b/src/mame/audio/warpwarp.c
@@ -15,7 +15,7 @@
const device_type WARPWARP = &device_creator<warpwarp_sound_device>;
-
+
warpwarp_sound_device::warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, WARPWARP, "Warp Warp Custom", tag, owner, clock),
device_sound_interface(mconfig, *this),
@@ -43,11 +43,11 @@ warpwarp_sound_device::warpwarp_sound_device(const machine_config &mconfig, cons
// operations now that the configuration is
// complete
//-------------------------------------------------
-
+
void warpwarp_sound_device::device_config_complete()
{
}
-
+
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
@@ -77,38 +77,38 @@ void warpwarp_sound_device::device_start()
save_item(NAME(m_mcarry));
save_item(NAME(m_mcount));
}
-
+
void warpwarp_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
switch (id)
{
- case TIMER_SOUND_VOLUME_DECAY:
+ case TIMER_SOUND_VOLUME_DECAY:
if (--m_sound_volume < 0)
m_sound_volume = 0;
break;
-
+
case TIMER_MUSIC_VOLUME_DECAY:
if (--m_music_volume < 0)
m_music_volume = 0;
break;
-
+
default:
assert_always(FALSE, "Unknown id in warpwarp_sound_device::device_timer");
}
}
-
+
WRITE8_MEMBER( warpwarp_sound_device::sound_w )
{
m_channel->update();
m_sound_latch = data & 0x0f;
m_sound_volume = 0x7fff; /* set sound_volume */
m_noise = 0x0000; /* reset noise shifter */
-
- /* faster decay enabled? */
+
+ /* faster decay enabled? */
if( m_sound_latch & 8 )
- {
- /*
- * R85(?) is 10k, Rb is 0, C92 is 1uF
+ {
+ /*
+ * R85(?) is 10k, Rb is 0, C92 is 1uF
* charge time t1 = 0.693 * (R24 + Rb) * C57 -> 0.22176s
* discharge time t2 = 0.693 * (Rb) * C57 -> 0
* C90(?) is only charged via D17 (1N914), no discharge!
@@ -139,17 +139,17 @@ WRITE8_MEMBER( warpwarp_sound_device::music1_w )
m_channel->update();
m_music1_latch = data & 0x3f;
}
-
+
WRITE8_MEMBER( warpwarp_sound_device::music2_w )
{
m_channel->update();
m_music2_latch = data & 0x3f;
m_music_volume = 0x7fff;
- /* fast decay enabled? */
+ /* fast decay enabled? */
if( m_music2_latch & 0x10 )
- {
- /*
- * Ra (R83?) is 10k, Rb is 0, C92 is 1uF
+ {
+ /*
+ * Ra (R83?) is 10k, Rb is 0, C92 is 1uF
* charge time t1 = 0.693 * (Ra + Rb) * C -> 0.22176s
* discharge time is (nearly) zero, because Rb is zero
* C95(?) is only charged via D17, not discharged!
@@ -180,11 +180,11 @@ WRITE8_MEMBER( warpwarp_sound_device::music2_w )
//-------------------------------------------------
void warpwarp_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
- {
- stream_sample_t *buffer = outputs[0];
-
- while (samples--)
- {
+ {
+ stream_sample_t *buffer = outputs[0];
+
+ while (samples--)
+ {
*buffer++ = (m_sound_signal + m_music_signal) / 2;
/*
@@ -198,65 +198,65 @@ void warpwarp_sound_device::sound_stream_update(sound_stream &stream, stream_sam
* ...
* 48 = 64 steps -> 3000 Hz
* ...
- * 63 = 4 steps -> 48 kHz
- */
+ * 63 = 4 steps -> 48 kHz
+ */
m_mcarry -= CLOCK_16H / (4 * (64 - m_music1_latch));
while( m_mcarry < 0 )
- {
+ {
m_mcarry += CLOCK_16H;
m_mcount++;
m_music_signal = (m_mcount & ~m_music2_latch & 15) ? m_decay[m_music_volume] : 0;
- /* override by noise gate? */
+ /* override by noise gate? */
if( (m_music2_latch & 32) && (m_noise & 0x8000) )
m_music_signal = m_decay[m_music_volume];
- }
-
- /* clock 1V = 8kHz */
+ }
+
+ /* clock 1V = 8kHz */
m_vcarry -= CLOCK_1V;
while (m_vcarry < 0)
- {
+ {
m_vcarry += CLOCK_16H;
m_vcount++;
-
- /* noise is clocked with raising edge of 2V */
+
+ /* noise is clocked with raising edge of 2V */
if ((m_vcount & 3) == 2)
- {
- /* bit0 = bit0 ^ !bit10 */
+ {
+ /* bit0 = bit0 ^ !bit10 */
if ((m_noise & 1) == ((m_noise >> 10) & 1))
m_noise = (m_noise << 1) | 1;
- else
+ else
m_noise = m_noise << 1;
- }
-
+ }
+
switch (m_sound_latch & 7)
- {
- case 0: /* 4V */
+ {
+ case 0: /* 4V */
m_sound_signal = (m_vcount & 0x04) ? m_decay[m_sound_volume] : 0;
- break;
- case 1: /* 8V */
+ break;
+ case 1: /* 8V */
m_sound_signal = (m_vcount & 0x08) ? m_decay[m_sound_volume] : 0;
- break;
- case 2: /* 16V */
+ break;
+ case 2: /* 16V */
m_sound_signal = (m_vcount & 0x10) ? m_decay[m_sound_volume] : 0;
- break;
- case 3: /* 32V */
+ break;
+ case 3: /* 32V */
m_sound_signal = (m_vcount & 0x20) ? m_decay[m_sound_volume] : 0;
- break;
- case 4: /* TONE1 */
+ break;
+ case 4: /* TONE1 */
m_sound_signal = !(m_vcount & 0x01) && !(m_vcount & 0x10) ? m_decay[m_sound_volume] : 0;
- break;
- case 5: /* TONE2 */
+ break;
+ case 5: /* TONE2 */
m_sound_signal = !(m_vcount & 0x02) && !(m_vcount & 0x20) ? m_decay[m_sound_volume] : 0;
- break;
- case 6: /* TONE3 */
+ break;
+ case 6: /* TONE3 */
m_sound_signal = !(m_vcount & 0x04) && !(m_vcount & 0x40) ? m_decay[m_sound_volume] : 0;
- break;
- default: /* NOISE */
- /* QH of 74164 #4V */
+ break;
+ default: /* NOISE */
+ /* QH of 74164 #4V */
m_sound_signal = (m_noise & 0x8000) ? m_decay[m_sound_volume] : 0;
- }
-
- }
- }
-} \ No newline at end of file
+ }
+
+ }
+ }
+}
diff --git a/src/mame/audio/warpwarp.h b/src/mame/audio/warpwarp.h
index a76aea0dc4f..dcfd2726c0d 100644
--- a/src/mame/audio/warpwarp.h
+++ b/src/mame/audio/warpwarp.h
@@ -3,14 +3,14 @@ class geebee_sound_device : public device_t,
{
public:
geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
enum
{
TIMER_VOLUME_DECAY
};
-
+
DECLARE_WRITE8_MEMBER( sound_w );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -18,9 +18,9 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
-
+
private:
// internal state
UINT16 *m_decay;
@@ -49,8 +49,8 @@ public:
TIMER_SOUND_VOLUME_DECAY,
TIMER_MUSIC_VOLUME_DECAY
};
-
-
+
+
DECLARE_WRITE8_MEMBER( sound_w );
DECLARE_WRITE8_MEMBER( music1_w );
DECLARE_WRITE8_MEMBER( music2_w );
@@ -59,12 +59,12 @@ protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
-
+
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
-
+
private:
// internal state
INT16 *m_decay;
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 48d887cd411..9a4f84338ac 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -3023,9 +3023,9 @@ INPUT_PORTS_END
Attack Force, by E.G.S., Italy
Not much information is available for this game.
It may have had an amber monitor?
-
+
XTAL 20MHz
-
+
TODO: sound
*****************************************************/
@@ -3073,7 +3073,7 @@ DRIVER_INIT_MEMBER(_8080bw_state,attackfc)
UINT8 *rom = memregion("maincpu")->base();
UINT32 len = memregion("maincpu")->bytes();
UINT8 *buffer = auto_alloc_array(machine(), UINT8, len);
-
+
// swap a8/a9
for (int i = 0; i < len; i++)
buffer[BITSWAP16(i, 15,14,13,12,11,10,8,9, 7,6,5,4,3,2,1,0)] = rom[i];
@@ -4554,7 +4554,7 @@ ROM_START( attackfc )
ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
ROM_LOAD( "30a.bin", 0x0000, 0x0400, CRC(c12e3386) SHA1(72b1d3d67a83edf0be0b0c37ef6dcffba450f16f) )
ROM_LOAD( "36a.bin", 0x0400, 0x0400, CRC(6738dcb9) SHA1(e4c68553fc3f2d3db3d251b9cb325e2409d9c02a) )
- ROM_LOAD( "31a.bin", 0x0800, 0x0400, CRC(787a4658) SHA1(5be3143bdba6a32256603be94400034a8ea1fda6) )
+ ROM_LOAD( "31a.bin", 0x0800, 0x0400, CRC(787a4658) SHA1(5be3143bdba6a32256603be94400034a8ea1fda6) )
ROM_LOAD( "37a.bin", 0x0c00, 0x0400, CRC(ad6bfbbe) SHA1(5f5437b6c8e7dfe9649b25040862f8a51d8c43ed) )
ROM_LOAD( "32a.bin", 0x1000, 0x0400, CRC(cbe0a711) SHA1(6e5f4214a4b48b70464005f4263c9b1ec3cbbeb1) )
ROM_LOAD( "33a.bin", 0x1800, 0x0400, CRC(53147393) SHA1(57e078f1734e382e8a46be09c133daab30c75681) )
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index a36b31aea7c..e63ddbb770c 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -2751,15 +2751,15 @@ ROM_END
ROM_START( skysoldrbl )
ROM_REGION( 0x80000, "maincpu", 0 )
- ROM_LOAD16_BYTE( "g.bin", 0x00000, 0x10000, CRC(4d3273e9) SHA1(7ddaba59114180fe371d2326fc49d6274e58f5c9) ) //different from other set
- ROM_LOAD16_BYTE( "c.bin", 0x00001, 0x10000, CRC(86c7af62) SHA1(4092558f3c11130e917d06b8d43f8f00815e4148) ) //different from other set
+ ROM_LOAD16_BYTE( "g.bin", 0x00000, 0x10000, CRC(4d3273e9) SHA1(7ddaba59114180fe371d2326fc49d6274e58f5c9) ) //different from other set
+ ROM_LOAD16_BYTE( "c.bin", 0x00001, 0x10000, CRC(86c7af62) SHA1(4092558f3c11130e917d06b8d43f8f00815e4148) ) //different from other set
ROM_LOAD16_BYTE( "e.bin", 0x20000, 0x10000, CRC(03115b75) SHA1(e36f2eab0198bf6b5b419aacc593b3790b479e81) )
ROM_LOAD16_BYTE( "a.bin", 0x20001, 0x10000, CRC(7aa103c7) SHA1(1907b92a3769089e01af36f74e0ff30e7a8f178c) )
ROM_LOAD16_BYTE( "h-gtop.bin", 0x40000, 0x10000, CRC(f41dfeab) SHA1(1b4f68c0f55e89a9dcd0fae8fb26074b97b5303a) )
ROM_LOAD16_BYTE( "d-ctop.bin", 0x40001, 0x10000, CRC(56560a3c) SHA1(c57c33d3935c23d56ae256981e4c3dcd80fb86a2) )
ROM_LOAD16_BYTE( "f-etop.bin", 0x60000, 0x10000, CRC(60a52583) SHA1(975d309ba55730c87cb5ea786c4d2d82358a1b73) )
ROM_LOAD16_BYTE( "b-atop.bin", 0x60001, 0x10000, CRC(028fd31b) SHA1(feb18a7217c107bb5f8e5c5ec5bc4173e977286b) )
-
+
ROM_REGION( 0x80000, "audiocpu", 0 ) /* Sound CPU */
ROM_LOAD( "33.ic11", 0x00000, 0x08000, CRC(b711fad4) SHA1(0a9515cb36b8d03ee5f7e0669a9948571b4ec34e) )
ROM_CONTINUE( 0x18000, 0x08000 )
@@ -2781,7 +2781,7 @@ ROM_START( skysoldrbl )
ROM_LOAD( "30.ic43", 0x040000, 0x10000, CRC(9eb10d3d) SHA1(ba1445e2c166f72a67295d595990efbdd3460736) )
ROM_LOAD( "31.ic44", 0x050000, 0x10000, CRC(6b6c4e56) SHA1(1af79c5931be2eb1421172e6e7877a97681fdb84) )
ROM_LOAD( "32.ic45", 0x060000, 0x10000, CRC(fdf55eca) SHA1(0c61ab8fc60c69c4d3fa976976f42bda63c06549) )
- ROM_LOAD( "29.ic42", 0x070000, 0x10000, CRC(cf888369) SHA1(d1ef5b2c81bbf4e039cc6cfee8339700a1dbb4ca) ) //different from other set (is one of them bad?)
+ ROM_LOAD( "29.ic42", 0x070000, 0x10000, CRC(cf888369) SHA1(d1ef5b2c81bbf4e039cc6cfee8339700a1dbb4ca) ) //different from other set (is one of them bad?)
ROM_LOAD( "18.ica1", 0x080000, 0x10000, CRC(08419273) SHA1(0ded4b60b0ce17a922fb7170f992c4f6c75be895) )
ROM_LOAD( "17.ic30", 0x090000, 0x10000, CRC(6258a61b) SHA1(d56a9f1dfa02dc59935f03b86a134076e3039bf4) )
ROM_LOAD( "20.ica3", 0x0a0000, 0x10000, CRC(5e716c62) SHA1(9427cd1578221ee48f4a8d8a24a232cb9e9b2206) )
@@ -3377,7 +3377,7 @@ GAME( 1987, btlfield, timesold, alpha68k_II, btlfield, alpha68k_state, btlfi
GAME( 1987, btlfieldb, timesold, btlfieldb, btlfieldb, alpha68k_state,btlfieldb,ROT90, "bootleg", "Battle Field (bootleg)", GAME_SUPPORTS_SAVE )
GAME( 1988, skysoldr, 0, alpha68k_II, skysoldr, alpha68k_state, skysoldr, ROT90, "Alpha Denshi Co. (SNK of America/Romstar license)", "Sky Soldiers (US)", GAME_SUPPORTS_SAVE )
-GAME( 1988, skysoldrbl,skysoldr, alpha68k_II, skysoldr, alpha68k_state, skysoldr, ROT90, "bootleg", "Sky Soldiers (bootleg)", GAME_SUPPORTS_SAVE )
+GAME( 1988, skysoldrbl,skysoldr, alpha68k_II, skysoldr, alpha68k_state, skysoldr, ROT90, "bootleg", "Sky Soldiers (bootleg)", GAME_SUPPORTS_SAVE )
GAME( 1988, goldmedl, 0, alpha68k_II_gm, goldmedl, alpha68k_state, goldmedl, ROT0, "SNK", "Gold Medalist (set 1)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index 25d197e62fa..2bca6a7a60e 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -286,14 +286,14 @@ ROM_END
ROM_START( ambushh )
ROM_REGION( 0x10000, "maincpu", 0 )
- /* displays an M ("Mal" is Bad in Spanish) next to ROM 1 during the test, why is internal checksum wrong (0x02 instead of 0x00) ?
+ /* displays an M ("Mal" is Bad in Spanish) next to ROM 1 during the test, why is internal checksum wrong (0x02 instead of 0x00) ?
I think the ROM has been hacked(?)
*/
ROM_LOAD( "a1_hack.i7", 0x0000, 0x2000, CRC(a7cd149d) SHA1(470ebe60bc23a7908fb96caef8074d65f8c57625) )
- // 1A6D: 0C -> 00
- // 1A75: 18 -> 0D
- // 1A76: D5 -> 18
- // 1A77: 00 -> D6
+ // 1A6D: 0C -> 00
+ // 1A75: 18 -> 0D
+ // 1A76: D5 -> 18
+ // 1A77: 00 -> D6
ROM_LOAD( "a2.g7", 0x2000, 0x2000, CRC(8328d88a) SHA1(690f0af10a0550566b67ee570f849b2764448d15) )
ROM_LOAD( "a3.f7", 0x4000, 0x2000, CRC(8db57ab5) SHA1(5cc7d7ebdfc91fb8d9ed52836d70c1de68001402) )
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 64f59095f94..b343bab4c14 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -392,7 +392,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( aerolitos )
PORT_INCLUDE( asteroid )
-
+
PORT_MODIFY("DSW1") // this bootleg was for the Spanish market, so set it to Spanish by default
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Language ) ) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING ( 0x00, DEF_STR( English ) )
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 6eef6a1b828..738c023d4e2 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -900,9 +900,9 @@ static INPUT_PORTS_START( bnj )
INPUT_PORTS_END
static INPUT_PORTS_START( caractn2 ) /* 2/3 Lives Dip changes in this set */
- PORT_INCLUDE( bnj )
+ PORT_INCLUDE( bnj )
- PORT_MODIFY("DSW2")
+ PORT_MODIFY("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("7D:1")
PORT_DIPSETTING( 0x01, "2" )
PORT_DIPSETTING( 0x00, "3" )
diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c
index af92f0d6f23..644bf39f986 100644
--- a/src/mame/drivers/ddealer.c
+++ b/src/mame/drivers/ddealer.c
@@ -1,65 +1,65 @@
/*********************************************************************************************************
- Double Dealer (c)NMK 1991
+ Double Dealer (c)NMK 1991
- driver by Angelo Salese & David Haywood, based on early work by Tomasz Slanina
+ driver by Angelo Salese & David Haywood, based on early work by Tomasz Slanina
- Appears to be a down-grade of the nmk16 HW
+ Appears to be a down-grade of the nmk16 HW
- TODO:
- -When you use the "gun card" the game gives "minus" points,but points are always added,inaccurate protection?
- -Understand better the video emulation and convert it to tilemaps;
- -A Double Dealer manual is needed for the coinage settings and coin/credit simulation;
- -Decap + emulate MCU, required if the random number generation is going to be accurate;
+ TODO:
+ -When you use the "gun card" the game gives "minus" points,but points are always added,inaccurate protection?
+ -Understand better the video emulation and convert it to tilemaps;
+ -A Double Dealer manual is needed for the coinage settings and coin/credit simulation;
+ -Decap + emulate MCU, required if the random number generation is going to be accurate;
==========================================================================================================
- --
+ --
- pcb marked GD91071
+ pcb marked GD91071
- 68000P10
- YM2203C
- 91071-3 (Mask ROM)
- NMK-110 8131 ( Mitsubishi M50747 MCU ?)
- NMK 901
- NMK 902
- NMK 903 x2
- 82S135N ("5")
- 82S129N ("6")
- xtals 16.000 MHz and 6.000 MHz
- DSW x2
+ 68000P10
+ YM2203C
+ 91071-3 (Mask ROM)
+ NMK-110 8131 ( Mitsubishi M50747 MCU ?)
+ NMK 901
+ NMK 902
+ NMK 903 x2
+ 82S135N ("5")
+ 82S129N ("6")
+ xtals 16.000 MHz and 6.000 MHz
+ DSW x2
- --
+ --
- Few words about protection:
+ Few words about protection:
- - Work RAM at $fe000 - $fffff is shared with MCU . Maybe whole $f0000-$fffff is shared ...
- - After boot, game writes random-looking data to work RAM:
+ - Work RAM at $fe000 - $fffff is shared with MCU . Maybe whole $f0000-$fffff is shared ...
+ - After boot, game writes random-looking data to work RAM:
- 00052C: 33FC 1234 000F E086 move.w #$1234, $fe086.l
- 000534: 33FC 5678 000F E164 move.w #$5678, $fe164.l
- 00053C: 33FC 9CA3 000F E62E move.w #$9ca3, $fe62e.l
- 000544: 33FC ABA2 000F E734 move.w #$aba2, $fe734.l
- 00054C: 33FC B891 000F E828 move.w #$b891, $fe828.l
- 000554: 33FC C760 000F E950 move.w #$c760, $fe950.l
- 00055C: 33FC D45F 000F EA7C move.w #$d45f, $fea7c.l
- 000564: 33FC E32E 000F ED4A move.w #$e32e, $fed4a.l
+ 00052C: 33FC 1234 000F E086 move.w #$1234, $fe086.l
+ 000534: 33FC 5678 000F E164 move.w #$5678, $fe164.l
+ 00053C: 33FC 9CA3 000F E62E move.w #$9ca3, $fe62e.l
+ 000544: 33FC ABA2 000F E734 move.w #$aba2, $fe734.l
+ 00054C: 33FC B891 000F E828 move.w #$b891, $fe828.l
+ 000554: 33FC C760 000F E950 move.w #$c760, $fe950.l
+ 00055C: 33FC D45F 000F EA7C move.w #$d45f, $fea7c.l
+ 000564: 33FC E32E 000F ED4A move.w #$e32e, $fed4a.l
- Some (or maybe all ?) of above enables random generator at $fe010 - $fe017
+ Some (or maybe all ?) of above enables random generator at $fe010 - $fe017
- - There's also MCU response (write/read/test) test just after these writes.
- (probably data used in the check depends on above writes). It's similar to
- jalmah.c tests, but num of responses is different, and shared ram is
- used to communicate with MCU
+ - There's also MCU response (write/read/test) test just after these writes.
+ (probably data used in the check depends on above writes). It's similar to
+ jalmah.c tests, but num of responses is different, and shared ram is
+ used to communicate with MCU
- - After last check (or maybe durning tests ... no idea)
- MCU writes $4ef900000604 (jmp $604) to $fe000 and game jumps to this address.
+ - After last check (or maybe durning tests ... no idea)
+ MCU writes $4ef900000604 (jmp $604) to $fe000 and game jumps to this address.
- - code at $604 writes $20.w to $fe018 and $1.w to $fe01e.
- As result shared ram $fe000 - $fe007 is cleared.
+ - code at $604 writes $20.w to $fe018 and $1.w to $fe01e.
+ As result shared ram $fe000 - $fe007 is cleared.
- Also many, many other reads/writes from/to shared mem.
- Few checks every interrupt:
+ Also many, many other reads/writes from/to shared mem.
+ Few checks every interrupt:
interrupt, lvl1
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index f04cc4d2255..e9dc4f446a1 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -1657,16 +1657,16 @@ DRIVER_INIT_MEMBER(decocass_state,cdsteljn)
/* 11 */ GAME( 1981, clocknch, decocass, clocknch, clocknch, decocass_state, decocass, ROT270, "Data East Corporation", "Lock'n'Chase (DECO Cassette)", 0 )
/* 12 */ // 1981.08 Flash Boy/DECO Kid
/* 13 */ GAME( 1981, cprogolf, decocass, cprogolf, cprogolf, decocass_state, decocass, ROT270, "Data East Corporation", "Tournament Pro Golf (DECO Cassette)", 0 )
- GAME( 1981, cprogolfj, cprogolf, cprogolfj,cprogolf, decocass_state, decocass, ROT270, "Data East Corporation", "Tournament Pro Golf (DECO Cassette, Japan)", 0 )
+ GAME( 1981, cprogolfj, cprogolf, cprogolfj,cprogolf, decocass_state, decocass, ROT270, "Data East Corporation", "Tournament Pro Golf (DECO Cassette, Japan)", 0 )
/* 14 */ GAME( 1981, cdsteljn, decocass, cdsteljn, cdsteljn, decocass_state, cdsteljn, ROT270, "Data East Corporation", "DS Telejan (DECO Cassette, Japan)", 0 )
/* 15 */ GAME( 1981, cluckypo, decocass, cluckypo, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Lucky Poker (DECO Cassette)", 0 )
/* 16 */ GAME( 1981, ctisland, decocass, ctisland, decocass, decocass_state, decocrom, ROT270, "Data East Corporation", "Treasure Island (DECO Cassette, set 1)", 0 )
- GAME( 1981, ctisland2, ctisland, ctisland, decocass, decocass_state, decocrom, ROT270, "Data East Corporation", "Treasure Island (DECO Cassette, set 2)", 0 )
- GAME( 1981, ctisland3, ctisland, ctisland, decocass, decocass_state, decocrom, ROT270, "Data East Corporation", "Treasure Island (DECO Cassette, set 3)", GAME_NOT_WORKING ) /* Different Bitswap? */
+ GAME( 1981, ctisland2, ctisland, ctisland, decocass, decocass_state, decocrom, ROT270, "Data East Corporation", "Treasure Island (DECO Cassette, set 2)", 0 )
+ GAME( 1981, ctisland3, ctisland, ctisland, decocass, decocass_state, decocrom, ROT270, "Data East Corporation", "Treasure Island (DECO Cassette, set 3)", GAME_NOT_WORKING ) /* Different Bitswap? */
/* 17 */ // 1981.10 Bobbitto
/* 18 */ GAME( 1982, cexplore, decocass, cexplore, cexplore, decocass_state, decocass, ROT270, "Data East Corporation", "Explorer (DECO Cassette)", GAME_NOT_WORKING )
/* 19 */ GAME( 1982, cdiscon1, decocass, cdiscon1, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Disco No.1 (DECO Cassette)", 0 )
- GAME( 1982, csweetht, cdiscon1, cdiscon1, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Sweet Heart (DECO Cassette)", 0 )
+ GAME( 1982, csweetht, cdiscon1, cdiscon1, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Sweet Heart (DECO Cassette)", 0 )
/* 20 */ GAME( 1982, ctornado, decocass, ctornado, ctornado, decocass_state, decocass, ROT270, "Data East Corporation", "Tornado (DECO Cassette)", 0 )
/* 21 */ GAME( 1982, cmissnx, decocass, cmissnx, cmissnx, decocass_state, decocass, ROT270, "Data East Corporation", "Mission-X (DECO Cassette)", 0 )
/* 22 */ GAME( 1982, cptennis, decocass, cptennis, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Pro Tennis (DECO Cassette)", 0 )
@@ -1675,28 +1675,28 @@ DRIVER_INIT_MEMBER(decocass_state,cdsteljn)
/* 25 */ GAME( 1982, cadanglr, decocass, cfishing, cfishing, decocass_state, decocass, ROT270, "Data East Corporation", "Angler Dangler (DECO Cassette)", 0 )
/* 25 */ GAME( 1982, cfishing, cadanglr, cfishing, cfishing, decocass_state, decocass, ROT270, "Data East Corporation", "Fishing (DECO Cassette)", 0 )
/* 26 */ GAME( 1983, cbtime, decocass, cbtime, cbtime, decocass_state, decocass, ROT270, "Data East Corporation", "Burger Time (DECO Cassette)", 0 )
- GAME( 1982, chamburger,cbtime, cbtime, cbtime, decocass_state, decocass, ROT270, "Data East Corporation", "Hamburger (DECO Cassette, Japan)", 0 )
+ GAME( 1982, chamburger,cbtime, cbtime, cbtime, decocass_state, decocass, ROT270, "Data East Corporation", "Hamburger (DECO Cassette, Japan)", 0 )
/* 27 */ GAME( 1982, cburnrub, decocass, cburnrub, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Burnin' Rubber (DECO Cassette, set 1)", 0 )
- GAME( 1982, cburnrub2, cburnrub, cburnrub, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Burnin' Rubber (DECO Cassette, set 2)", 0 )
- GAME( 1982, cbnj, cburnrub, cburnrub, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Bump 'n' Jump (DECO Cassette)", 0 )
+ GAME( 1982, cburnrub2, cburnrub, cburnrub, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Burnin' Rubber (DECO Cassette, set 2)", 0 )
+ GAME( 1982, cbnj, cburnrub, cburnrub, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Bump 'n' Jump (DECO Cassette)", 0 )
/* 28 */ GAME( 1983, cgraplop, decocass, cgraplop, cgraplop, decocass_state, decocass, ROT270, "Data East Corporation", "Cluster Buster (DECO Cassette)", 0 )
- GAME( 1983, cgraplop2, cgraplop, cgraplop2,cgraplop, decocass_state, decocass, ROT270, "Data East Corporation", "Graplop (no title screen) (DECO Cassette)", 0 ) // a version with title screen exists, see reference videos
+ GAME( 1983, cgraplop2, cgraplop, cgraplop2,cgraplop, decocass_state, decocass, ROT270, "Data East Corporation", "Graplop (no title screen) (DECO Cassette)", 0 ) // a version with title screen exists, see reference videos
/* 29 */ GAME( 1983, clapapa, decocass, clapapa, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Rootin' Tootin' / La-Pa-Pa (DECO Cassette)" , 0) /* Displays 'La-Pa-Pa during attract */
- GAME( 1983, clapapa2, clapapa, clapapa, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Rootin' Tootin' (DECO Cassette)" , 0) /* Displays 'Rootin' Tootin' during attract */
+ GAME( 1983, clapapa2, clapapa, clapapa, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Rootin' Tootin' (DECO Cassette)" , 0) /* Displays 'Rootin' Tootin' during attract */
/* 30 */ GAME( 1983, cskater, decocass, cskater, cskater, decocass_state, decocass, ROT270, "Data East Corporation", "Skater (DECO Cassette, Japan)", 0 )
/* 31 */ GAME( 1983, cprobowl, decocass, cprobowl, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Pro Bowling (DECO Cassette)", 0 )
/* 32 */ GAME( 1983, cnightst, decocass, cnightst, cnightst, decocass_state, decocass, ROT270, "Data East Corporation", "Night Star (DECO Cassette, set 1)", 0 )
- GAME( 1983, cnightst2, cnightst, cnightst, cnightst, decocass_state, decocass, ROT270, "Data East Corporation", "Night Star (DECO Cassette, set 2)", 0 )
+ GAME( 1983, cnightst2, cnightst, cnightst, cnightst, decocass_state, decocass, ROT270, "Data East Corporation", "Night Star (DECO Cassette, set 2)", 0 )
/* 33 */ GAME( 1983, cpsoccer, decocass, cpsoccer, cpsoccer, decocass_state, decocass, ROT270, "Data East Corporation", "Pro Soccer (DECO Cassette)", 0 )
- GAME( 1983, cpsoccerj, cpsoccer, cpsoccer, cpsoccer, decocass_state, decocass, ROT270, "Data East Corporation", "Pro Soccer (DECO Cassette, Japan)", 0 )
+ GAME( 1983, cpsoccerj, cpsoccer, cpsoccer, cpsoccer, decocass_state, decocass, ROT270, "Data East Corporation", "Pro Soccer (DECO Cassette, Japan)", 0 )
/* 34 */ GAME( 1983, csdtenis, decocass, csdtenis, csdtenis, decocass_state, decocass, ROT270, "Data East Corporation", "Super Doubles Tennis (DECO Cassette, Japan)", GAME_WRONG_COLORS )
/* 35 */ GAME( 1985, cflyball, decocass, cflyball, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Flying Ball (DECO Cassette)", 0 )
/* 36 */ // 1984.04 Genesis/Boomer Rang'r
/* 37 */ GAME( 1983, czeroize, decocass, czeroize, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Zeroize (DECO Cassette)", 0 )
/* 38 */ GAME( 1984, cscrtry, decocass, type4, cscrtry, decocass_state, decocass, ROT270, "Data East Corporation", "Scrum Try (DECO Cassette, set 1)", 0 )
- GAME( 1984, cscrtry2, cscrtry, type4, cscrtry, decocass_state, decocass, ROT270, "Data East Corporation", "Scrum Try (DECO Cassette, set 2)", 0 )
+ GAME( 1984, cscrtry2, cscrtry, type4, cscrtry, decocass_state, decocass, ROT270, "Data East Corporation", "Scrum Try (DECO Cassette, set 2)", 0 )
/* 39 */ GAME( 1984, cppicf, decocass, cppicf, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Peter Pepper's Ice Cream Factory (DECO Cassette, set 1)", 0 )
- GAME( 1984, cppicf2, cppicf, cppicf, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Peter Pepper's Ice Cream Factory (DECO Cassette, set 2)", 0 )
+ GAME( 1984, cppicf2, cppicf, cppicf, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "Peter Pepper's Ice Cream Factory (DECO Cassette, set 2)", 0 )
/* 40 */ GAME( 1984, cfghtice, decocass, cfghtice, cfghtice, decocass_state, decocass, ROT270, "Data East Corporation", "Fighting Ice Hockey (DECO Cassette)", 0 )
/* 41 */ GAME( 1984, coozumou, decocass, type4, cscrtry, decocass_state, decocass, ROT270, "Data East Corporation", "Oozumou - The Grand Sumo (DECO Cassette, Japan)", 0 )
/* 42 */ // 1984.08 Hellow Gateball // not a typo, this is official spelling
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index 0106e69a66a..7b1897345bb 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -193,7 +193,7 @@ public:
UINT8 m_extend_board_irq_enable;
UINT8 m_extend_board_irq_active;
-// emu_timer *m_keyboard_timer;
+// emu_timer *m_keyboard_timer;
GCU_REGS m_gcu[2];
int m_tick;
int m_layer;
@@ -209,7 +209,7 @@ public:
UINT8 m_temp_data[64*1024];
int m_cab_data_ptr;
const int * m_cur_cab_data;
-// int m_keyboard_state[2];
+// int m_keyboard_state[2];
UINT8 m_spu_shared_ram[0x400];
IBUTTON m_ibutton;
int m_ibutton_state;
@@ -239,8 +239,8 @@ public:
DECLARE_WRITE32_MEMBER(atapi_command_w);
DECLARE_READ32_MEMBER(atapi_control_r);
DECLARE_WRITE32_MEMBER(atapi_control_w);
-// DECLARE_READ32_MEMBER(comm_uart_r);
-// DECLARE_WRITE32_MEMBER(comm_uart_w);
+// DECLARE_READ32_MEMBER(comm_uart_r);
+// DECLARE_WRITE32_MEMBER(comm_uart_w);
DECLARE_READ32_MEMBER(cabinet_r);
DECLARE_READ32_MEMBER(keyboard_wheel_r);
DECLARE_READ8_MEMBER(midi_uart_r);
@@ -257,7 +257,7 @@ public:
DECLARE_READ32_MEMBER(ppc_spu_share_r);
DECLARE_WRITE32_MEMBER(ppc_spu_share_w);
DECLARE_READ16_MEMBER(spu_unk_r);
-// TIMER_CALLBACK_MEMBER(keyboard_timer_callback);
+// TIMER_CALLBACK_MEMBER(keyboard_timer_callback);
void gcu_draw_object(bitmap_ind16 &bitmap, const rectangle &cliprect, int chip, UINT32 *cmd);
void gcu_fill_rect(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32 *cmd);
void gcu_draw_character(bitmap_ind16 &bitmap, const rectangle &cliprect, int chip, UINT32 *cmd);
@@ -1404,52 +1404,52 @@ WRITE32_MEMBER(firebeat_state::atapi_control_w )
/*
READ32_MEMBER(firebeat_state::comm_uart_r )
{
- UINT32 r = 0;
+ UINT32 r = 0;
- if (ACCESSING_BITS_24_31)
- {
- r |= pc16552d_0_r(space, (offset*4)+0) << 24;
- }
- if (ACCESSING_BITS_16_23)
- {
- r |= pc16552d_0_r(space, (offset*4)+1) << 16;
- }
- if (ACCESSING_BITS_8_15)
- {
- r |= pc16552d_0_r(space, (offset*4)+2) << 8;
- }
- if (ACCESSING_BITS_0_7)
- {
- r |= pc16552d_0_r(space, (offset*4)+3) << 0;
- }
+ if (ACCESSING_BITS_24_31)
+ {
+ r |= pc16552d_0_r(space, (offset*4)+0) << 24;
+ }
+ if (ACCESSING_BITS_16_23)
+ {
+ r |= pc16552d_0_r(space, (offset*4)+1) << 16;
+ }
+ if (ACCESSING_BITS_8_15)
+ {
+ r |= pc16552d_0_r(space, (offset*4)+2) << 8;
+ }
+ if (ACCESSING_BITS_0_7)
+ {
+ r |= pc16552d_0_r(space, (offset*4)+3) << 0;
+ }
- return r;
+ return r;
}
WRITE32_MEMBER(firebeat_state::comm_uart_w )
{
- if (ACCESSING_BITS_24_31)
- {
- pc16552d_0_w(space, (offset*4)+0, (data >> 24) & 0xff);
- }
- if (ACCESSING_BITS_16_23)
- {
- pc16552d_0_w(space, (offset*4)+1, (data >> 16) & 0xff);
- }
- if (ACCESSING_BITS_8_15)
- {
- pc16552d_0_w(space, (offset*4)+2, (data >> 8) & 0xff);
- }
- if (ACCESSING_BITS_0_7)
- {
- pc16552d_0_w(space, (offset*4)+3, (data >> 0) & 0xff);
- }
+ if (ACCESSING_BITS_24_31)
+ {
+ pc16552d_0_w(space, (offset*4)+0, (data >> 24) & 0xff);
+ }
+ if (ACCESSING_BITS_16_23)
+ {
+ pc16552d_0_w(space, (offset*4)+1, (data >> 16) & 0xff);
+ }
+ if (ACCESSING_BITS_8_15)
+ {
+ pc16552d_0_w(space, (offset*4)+2, (data >> 8) & 0xff);
+ }
+ if (ACCESSING_BITS_0_7)
+ {
+ pc16552d_0_w(space, (offset*4)+3, (data >> 0) & 0xff);
+ }
}
static void comm_uart_irq_callback(running_machine &machine, int channel, int value)
{
- // TODO
- //m_maincpu->set_input_line(INPUT_LINE_IRQ2, ASSERT_LINE);
+ // TODO
+ //m_maincpu->set_input_line(INPUT_LINE_IRQ2, ASSERT_LINE);
}
*/
static const ins8250_interface firebeat_com0_interface =
@@ -1569,74 +1569,74 @@ static const ins8250_interface firebeat_midi1_interface =
/*
static const int keyboard_notes[24] =
{
- 0x3c, // C1
- 0x3d, // C1#
- 0x3e, // D1
- 0x3f, // D1#
- 0x40, // E1
- 0x41, // F1
- 0x42, // F1#
- 0x43, // G1
- 0x44, // G1#
- 0x45, // A1
- 0x46, // A1#
- 0x47, // B1
- 0x48, // C2
- 0x49, // C2#
- 0x4a, // D2
- 0x4b, // D2#
- 0x4c, // E2
- 0x4d, // F2
- 0x4e, // F2#
- 0x4f, // G2
- 0x50, // G2#
- 0x51, // A2
- 0x52, // A2#
- 0x53, // B2
+ 0x3c, // C1
+ 0x3d, // C1#
+ 0x3e, // D1
+ 0x3f, // D1#
+ 0x40, // E1
+ 0x41, // F1
+ 0x42, // F1#
+ 0x43, // G1
+ 0x44, // G1#
+ 0x45, // A1
+ 0x46, // A1#
+ 0x47, // B1
+ 0x48, // C2
+ 0x49, // C2#
+ 0x4a, // D2
+ 0x4b, // D2#
+ 0x4c, // E2
+ 0x4d, // F2
+ 0x4e, // F2#
+ 0x4f, // G2
+ 0x50, // G2#
+ 0x51, // A2
+ 0x52, // A2#
+ 0x53, // B2
};
TIMER_CALLBACK_MEMBER(firebeat_state::keyboard_timer_callback)
{
- static const int kb_uart_channel[2] = { 1, 0 };
- static const char *const keynames[] = { "KEYBOARD_P1", "KEYBOARD_P2" };
- int keyboard;
- int i;
-
- for (keyboard=0; keyboard < 2; keyboard++)
- {
- UINT32 kbstate = ioport(keynames[keyboard])->read();
- int uart_channel = kb_uart_channel[keyboard];
-
- if (kbstate != m_keyboard_state[keyboard])
- {
- for (i=0; i < 24; i++)
- {
- int kbnote = keyboard_notes[i];
-
- if ((m_keyboard_state[keyboard] & (1 << i)) != 0 && (kbstate & (1 << i)) == 0)
- {
- // key was on, now off -> send Note Off message
- pc16552d_rx_data(machine(), 1, uart_channel, 0x80);
- pc16552d_rx_data(machine(), 1, uart_channel, kbnote);
- pc16552d_rx_data(machine(), 1, uart_channel, 0x7f);
- }
- else if ((m_keyboard_state[keyboard] & (1 << i)) == 0 && (kbstate & (1 << i)) != 0)
- {
- // key was off, now on -> send Note On message
- pc16552d_rx_data(machine(), 1, uart_channel, 0x90);
- pc16552d_rx_data(machine(), 1, uart_channel, kbnote);
- pc16552d_rx_data(machine(), 1, uart_channel, 0x7f);
- }
- }
- }
- else
- {
- // no messages, send Active Sense message instead
- pc16552d_rx_data(machine(), 1, uart_channel, 0xfe);
- }
-
- m_keyboard_state[keyboard] = kbstate;
- }
+ static const int kb_uart_channel[2] = { 1, 0 };
+ static const char *const keynames[] = { "KEYBOARD_P1", "KEYBOARD_P2" };
+ int keyboard;
+ int i;
+
+ for (keyboard=0; keyboard < 2; keyboard++)
+ {
+ UINT32 kbstate = ioport(keynames[keyboard])->read();
+ int uart_channel = kb_uart_channel[keyboard];
+
+ if (kbstate != m_keyboard_state[keyboard])
+ {
+ for (i=0; i < 24; i++)
+ {
+ int kbnote = keyboard_notes[i];
+
+ if ((m_keyboard_state[keyboard] & (1 << i)) != 0 && (kbstate & (1 << i)) == 0)
+ {
+ // key was on, now off -> send Note Off message
+ pc16552d_rx_data(machine(), 1, uart_channel, 0x80);
+ pc16552d_rx_data(machine(), 1, uart_channel, kbnote);
+ pc16552d_rx_data(machine(), 1, uart_channel, 0x7f);
+ }
+ else if ((m_keyboard_state[keyboard] & (1 << i)) == 0 && (kbstate & (1 << i)) != 0)
+ {
+ // key was off, now on -> send Note On message
+ pc16552d_rx_data(machine(), 1, uart_channel, 0x90);
+ pc16552d_rx_data(machine(), 1, uart_channel, kbnote);
+ pc16552d_rx_data(machine(), 1, uart_channel, 0x7f);
+ }
+ }
+ }
+ else
+ {
+ // no messages, send Active Sense message instead
+ pc16552d_rx_data(machine(), 1, uart_channel, 0xfe);
+ }
+
+ m_keyboard_state[keyboard] = kbstate;
+ }
}
*/
// Extend board IRQs
@@ -1984,57 +1984,57 @@ static INPUT_PORTS_START(kbm)
PORT_BIT( 0xff, 0x80, IPT_PADDLE_V ) PORT_MINMAX(0xff, 0x00) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
/*
- PORT_START("KEYBOARD_P1")
- PORT_BIT( 0x000001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C1") PORT_CODE(KEYCODE_Q)
- PORT_BIT( 0x000002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C1#") PORT_CODE(KEYCODE_W)
- PORT_BIT( 0x000004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 D1") PORT_CODE(KEYCODE_E)
- PORT_BIT( 0x000008, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 D1#") PORT_CODE(KEYCODE_R)
- PORT_BIT( 0x000010, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 E1") PORT_CODE(KEYCODE_T)
- PORT_BIT( 0x000020, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 F1") PORT_CODE(KEYCODE_Y)
- PORT_BIT( 0x000040, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 F1#") PORT_CODE(KEYCODE_U)
- PORT_BIT( 0x000080, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 G1") PORT_CODE(KEYCODE_I)
- PORT_BIT( 0x000100, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 G1#") PORT_CODE(KEYCODE_O)
- PORT_BIT( 0x000200, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 A1") PORT_CODE(KEYCODE_A)
- PORT_BIT( 0x000400, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 A1#") PORT_CODE(KEYCODE_S)
- PORT_BIT( 0x000800, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 B1") PORT_CODE(KEYCODE_D)
- PORT_BIT( 0x001000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C2") PORT_CODE(KEYCODE_F)
- PORT_BIT( 0x002000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C2#") PORT_CODE(KEYCODE_G)
- PORT_BIT( 0x004000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 D2") PORT_CODE(KEYCODE_H)
- PORT_BIT( 0x008000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 D2#") PORT_CODE(KEYCODE_J)
- PORT_BIT( 0x010000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 E2") PORT_CODE(KEYCODE_K)
- PORT_BIT( 0x020000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 F2") PORT_CODE(KEYCODE_L)
- PORT_BIT( 0x040000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 F2#") PORT_CODE(KEYCODE_Z)
- PORT_BIT( 0x080000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 G2") PORT_CODE(KEYCODE_X)
- PORT_BIT( 0x100000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 G2#") PORT_CODE(KEYCODE_C)
- PORT_BIT( 0x200000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 A2") PORT_CODE(KEYCODE_V)
- PORT_BIT( 0x400000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 A2#") PORT_CODE(KEYCODE_B)
- PORT_BIT( 0x800000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 B2") PORT_CODE(KEYCODE_N)
-
- PORT_START("KEYBOARD_P2")
- PORT_BIT( 0x000001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 C1") PORT_CODE(KEYCODE_Q)
- PORT_BIT( 0x000002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 C1#") PORT_CODE(KEYCODE_W)
- PORT_BIT( 0x000004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 D1") PORT_CODE(KEYCODE_E)
- PORT_BIT( 0x000008, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 D1#") PORT_CODE(KEYCODE_R)
- PORT_BIT( 0x000010, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 E1") PORT_CODE(KEYCODE_T)
- PORT_BIT( 0x000020, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 F1") PORT_CODE(KEYCODE_Y)
- PORT_BIT( 0x000040, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 F1#") PORT_CODE(KEYCODE_U)
- PORT_BIT( 0x000080, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 G1") PORT_CODE(KEYCODE_I)
- PORT_BIT( 0x000100, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 G1#") PORT_CODE(KEYCODE_O)
- PORT_BIT( 0x000200, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 A1") PORT_CODE(KEYCODE_A)
- PORT_BIT( 0x000400, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 A1#") PORT_CODE(KEYCODE_S)
- PORT_BIT( 0x000800, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 B1") PORT_CODE(KEYCODE_D)
- PORT_BIT( 0x001000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 C2") PORT_CODE(KEYCODE_F)
- PORT_BIT( 0x002000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 C2#") PORT_CODE(KEYCODE_G)
- PORT_BIT( 0x004000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 D2") PORT_CODE(KEYCODE_H)
- PORT_BIT( 0x008000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 D2#") PORT_CODE(KEYCODE_J)
- PORT_BIT( 0x010000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 E2") PORT_CODE(KEYCODE_K)
- PORT_BIT( 0x020000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 F2") PORT_CODE(KEYCODE_L)
- PORT_BIT( 0x040000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 F2#") PORT_CODE(KEYCODE_Z)
- PORT_BIT( 0x080000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 G2") PORT_CODE(KEYCODE_X)
- PORT_BIT( 0x100000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 G2#") PORT_CODE(KEYCODE_C)
- PORT_BIT( 0x200000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 A2") PORT_CODE(KEYCODE_V)
- PORT_BIT( 0x400000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 A2#") PORT_CODE(KEYCODE_B)
- PORT_BIT( 0x800000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 B2") PORT_CODE(KEYCODE_N)
+ PORT_START("KEYBOARD_P1")
+ PORT_BIT( 0x000001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C1") PORT_CODE(KEYCODE_Q)
+ PORT_BIT( 0x000002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C1#") PORT_CODE(KEYCODE_W)
+ PORT_BIT( 0x000004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 D1") PORT_CODE(KEYCODE_E)
+ PORT_BIT( 0x000008, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 D1#") PORT_CODE(KEYCODE_R)
+ PORT_BIT( 0x000010, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 E1") PORT_CODE(KEYCODE_T)
+ PORT_BIT( 0x000020, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 F1") PORT_CODE(KEYCODE_Y)
+ PORT_BIT( 0x000040, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 F1#") PORT_CODE(KEYCODE_U)
+ PORT_BIT( 0x000080, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 G1") PORT_CODE(KEYCODE_I)
+ PORT_BIT( 0x000100, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 G1#") PORT_CODE(KEYCODE_O)
+ PORT_BIT( 0x000200, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 A1") PORT_CODE(KEYCODE_A)
+ PORT_BIT( 0x000400, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 A1#") PORT_CODE(KEYCODE_S)
+ PORT_BIT( 0x000800, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 B1") PORT_CODE(KEYCODE_D)
+ PORT_BIT( 0x001000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C2") PORT_CODE(KEYCODE_F)
+ PORT_BIT( 0x002000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C2#") PORT_CODE(KEYCODE_G)
+ PORT_BIT( 0x004000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 D2") PORT_CODE(KEYCODE_H)
+ PORT_BIT( 0x008000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 D2#") PORT_CODE(KEYCODE_J)
+ PORT_BIT( 0x010000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 E2") PORT_CODE(KEYCODE_K)
+ PORT_BIT( 0x020000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 F2") PORT_CODE(KEYCODE_L)
+ PORT_BIT( 0x040000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 F2#") PORT_CODE(KEYCODE_Z)
+ PORT_BIT( 0x080000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 G2") PORT_CODE(KEYCODE_X)
+ PORT_BIT( 0x100000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 G2#") PORT_CODE(KEYCODE_C)
+ PORT_BIT( 0x200000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 A2") PORT_CODE(KEYCODE_V)
+ PORT_BIT( 0x400000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 A2#") PORT_CODE(KEYCODE_B)
+ PORT_BIT( 0x800000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 B2") PORT_CODE(KEYCODE_N)
+
+ PORT_START("KEYBOARD_P2")
+ PORT_BIT( 0x000001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 C1") PORT_CODE(KEYCODE_Q)
+ PORT_BIT( 0x000002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 C1#") PORT_CODE(KEYCODE_W)
+ PORT_BIT( 0x000004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 D1") PORT_CODE(KEYCODE_E)
+ PORT_BIT( 0x000008, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 D1#") PORT_CODE(KEYCODE_R)
+ PORT_BIT( 0x000010, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 E1") PORT_CODE(KEYCODE_T)
+ PORT_BIT( 0x000020, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 F1") PORT_CODE(KEYCODE_Y)
+ PORT_BIT( 0x000040, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 F1#") PORT_CODE(KEYCODE_U)
+ PORT_BIT( 0x000080, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 G1") PORT_CODE(KEYCODE_I)
+ PORT_BIT( 0x000100, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 G1#") PORT_CODE(KEYCODE_O)
+ PORT_BIT( 0x000200, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 A1") PORT_CODE(KEYCODE_A)
+ PORT_BIT( 0x000400, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 A1#") PORT_CODE(KEYCODE_S)
+ PORT_BIT( 0x000800, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 B1") PORT_CODE(KEYCODE_D)
+ PORT_BIT( 0x001000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 C2") PORT_CODE(KEYCODE_F)
+ PORT_BIT( 0x002000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 C2#") PORT_CODE(KEYCODE_G)
+ PORT_BIT( 0x004000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 D2") PORT_CODE(KEYCODE_H)
+ PORT_BIT( 0x008000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 D2#") PORT_CODE(KEYCODE_J)
+ PORT_BIT( 0x010000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 E2") PORT_CODE(KEYCODE_K)
+ PORT_BIT( 0x020000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 F2") PORT_CODE(KEYCODE_L)
+ PORT_BIT( 0x040000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 F2#") PORT_CODE(KEYCODE_Z)
+ PORT_BIT( 0x080000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 G2") PORT_CODE(KEYCODE_X)
+ PORT_BIT( 0x100000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 G2#") PORT_CODE(KEYCODE_C)
+ PORT_BIT( 0x200000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 A2") PORT_CODE(KEYCODE_V)
+ PORT_BIT( 0x400000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 A2#") PORT_CODE(KEYCODE_B)
+ PORT_BIT( 0x800000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 B2") PORT_CODE(KEYCODE_N)
*/
INPUT_PORTS_END
@@ -2355,8 +2355,8 @@ void firebeat_state::init_firebeat()
atapi_init();
-// pc16552d_init(machine(), 0, 19660800, comm_uart_irq_callback, 0); // Network UART
-// pc16552d_init(machine(), 1, 24000000, midi_uart_irq_callback, 0); // MIDI UART
+// pc16552d_init(machine(), 0, 19660800, comm_uart_irq_callback, 0); // Network UART
+// pc16552d_init(machine(), 1, 24000000, midi_uart_irq_callback, 0); // MIDI UART
m_extend_board_irq_enable = 0x3f;
m_extend_board_irq_active = 0x00;
@@ -2387,8 +2387,8 @@ DRIVER_INIT_MEMBER(firebeat_state,ppd)
void firebeat_state::init_keyboard()
{
// set keyboard timer
-// m_keyboard_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(firebeat_state::keyboard_timer_callback),this));
-// m_keyboard_timer->adjust(attotime::from_msec(10), 0, attotime::from_msec(10));
+// m_keyboard_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(firebeat_state::keyboard_timer_callback),this));
+// m_keyboard_timer->adjust(attotime::from_msec(10), 0, attotime::from_msec(10));
}
DRIVER_INIT_MEMBER(firebeat_state,kbm)
diff --git a/src/mame/drivers/fruitpc.c b/src/mame/drivers/fruitpc.c
index a20d3dd7988..566d6799187 100644
--- a/src/mame/drivers/fruitpc.c
+++ b/src/mame/drivers/fruitpc.c
@@ -84,21 +84,21 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( fruitpc )
PORT_START("pc_keyboard_0")
-// PORT_BIT ( 0x0001, 0x0000, IPT_UNUSED ) /* unused scancode 0 */
-// AT_KEYB_HELPER( 0x0002, "Esc", KEYCODE_Q ) /* Esc 01 81 */
+// PORT_BIT ( 0x0001, 0x0000, IPT_UNUSED ) /* unused scancode 0 */
+// AT_KEYB_HELPER( 0x0002, "Esc", KEYCODE_Q ) /* Esc 01 81 */
PORT_START("pc_keyboard_1")
-// AT_KEYB_HELPER( 0x0010, "T", KEYCODE_T ) /* T 14 94 */
-// AT_KEYB_HELPER( 0x0020, "Y", KEYCODE_Y ) /* Y 15 95 */
-// AT_KEYB_HELPER( 0x0100, "O", KEYCODE_O ) /* O 18 98 */
-// AT_KEYB_HELPER( 0x1000, "Enter", KEYCODE_ENTER ) /* Enter 1C 9C */
+// AT_KEYB_HELPER( 0x0010, "T", KEYCODE_T ) /* T 14 94 */
+// AT_KEYB_HELPER( 0x0020, "Y", KEYCODE_Y ) /* Y 15 95 */
+// AT_KEYB_HELPER( 0x0100, "O", KEYCODE_O ) /* O 18 98 */
+// AT_KEYB_HELPER( 0x1000, "Enter", KEYCODE_ENTER ) /* Enter 1C 9C */
PORT_START("pc_keyboard_2")
PORT_START("pc_keyboard_3")
-// AT_KEYB_HELPER( 0x0001, "B", KEYCODE_B ) /* B 30 B0 */
-// AT_KEYB_HELPER( 0x0002, "N", KEYCODE_N ) /* N 31 B1 */
-// AT_KEYB_HELPER( 0x0800, "F1", KEYCODE_S ) /* F1 3B BB */
+// AT_KEYB_HELPER( 0x0001, "B", KEYCODE_B ) /* B 30 B0 */
+// AT_KEYB_HELPER( 0x0002, "N", KEYCODE_N ) /* N 31 B1 */
+// AT_KEYB_HELPER( 0x0800, "F1", KEYCODE_S ) /* F1 3B BB */
// AT_KEYB_HELPER( 0x8000, "F5", KEYCODE_F5 )
PORT_START("pc_keyboard_4")
@@ -107,13 +107,13 @@ static INPUT_PORTS_START( fruitpc )
PORT_START("pc_keyboard_5")
PORT_START("pc_keyboard_6")
-// AT_KEYB_HELPER( 0x0040, "(MF2)Cursor Up", KEYCODE_UP ) /* Up 67 e7 */
-// AT_KEYB_HELPER( 0x0080, "(MF2)Page Up", KEYCODE_PGUP ) /* Page Up 68 e8 */
-// AT_KEYB_HELPER( 0x0100, "(MF2)Cursor Left", KEYCODE_LEFT ) /* Left 69 e9 */
-// AT_KEYB_HELPER( 0x0200, "(MF2)Cursor Right", KEYCODE_RIGHT ) /* Right 6a ea */
-// AT_KEYB_HELPER( 0x0800, "(MF2)Cursor Down", KEYCODE_DOWN ) /* Down 6c ec */
-// AT_KEYB_HELPER( 0x1000, "(MF2)Page Down", KEYCODE_PGDN ) /* Page Down 6d ed */
-// AT_KEYB_HELPER( 0x4000, "Del", KEYCODE_A ) /* Delete 6f ef */
+// AT_KEYB_HELPER( 0x0040, "(MF2)Cursor Up", KEYCODE_UP ) /* Up 67 e7 */
+// AT_KEYB_HELPER( 0x0080, "(MF2)Page Up", KEYCODE_PGUP ) /* Page Up 68 e8 */
+// AT_KEYB_HELPER( 0x0100, "(MF2)Cursor Left", KEYCODE_LEFT ) /* Left 69 e9 */
+// AT_KEYB_HELPER( 0x0200, "(MF2)Cursor Right", KEYCODE_RIGHT ) /* Right 6a ea */
+// AT_KEYB_HELPER( 0x0800, "(MF2)Cursor Down", KEYCODE_DOWN ) /* Down 6c ec */
+// AT_KEYB_HELPER( 0x1000, "(MF2)Page Down", KEYCODE_PGDN ) /* Page Down 6d ed */
+// AT_KEYB_HELPER( 0x4000, "Del", KEYCODE_A ) /* Delete 6f ef */
PORT_START("pc_keyboard_7")
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index 88ec09b2594..723c9024a0a 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -637,7 +637,7 @@ static ADDRESS_MAP_START( scrambler_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x6805, 0x6805) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_shoot_enable_w)
AM_RANGE(0x6806, 0x6807) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_vol_w)
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("IN2") AM_WRITE(galaxold_nmi_enable_w)
-// AM_RANGE(0x7001, 0x7001)
+// AM_RANGE(0x7001, 0x7001)
AM_RANGE(0x7002, 0x7002) AM_WRITE(galaxold_coin_counter_w)
AM_RANGE(0x7003, 0x7003) AM_WRITE(scrambold_background_enable_w)
AM_RANGE(0x7004, 0x7004) AM_WRITE(galaxold_stars_enable_w)
@@ -645,13 +645,13 @@ static ADDRESS_MAP_START( scrambler_map, AS_PROGRAM, 8, galaxold_state )
AM_RANGE(0x7007, 0x7007) AM_WRITE(galaxold_flip_screen_y_w)
AM_RANGE(0x7800, 0x7800) AM_READ(watchdog_reset_r)
AM_RANGE(0x7800, 0x7800) AM_DEVWRITE_LEGACY(GAL_AUDIO, galaxian_pitch_w)
-// AM_RANGE(0x8102, 0x8102) AM_READ(scramblb_protection_1_r)
+// AM_RANGE(0x8102, 0x8102) AM_READ(scramblb_protection_1_r)
AM_RANGE(0x8202, 0x8202) AM_READ(scrambler_protection_2_r)
ADDRESS_MAP_END
WRITE8_MEMBER( galaxold_state::guttang_rombank_w )
{
-// printf("rombank %02x\n",data);
+// printf("rombank %02x\n",data);
if (data&1)
{
UINT8 *rom = memregion("maincpu")->base();
@@ -2104,7 +2104,7 @@ static INPUT_PORTS_START( guttangt )
PORT_DIPNAME( 0x40, 0x40, "IN1:7" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "IN1:8" )
+ PORT_DIPNAME( 0x80, 0x80, "IN1:8" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2130,7 +2130,7 @@ static INPUT_PORTS_START( guttangt )
PORT_DIPNAME( 0x40, 0x40, "IN2:7" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "IN2:8" )
+ PORT_DIPNAME( 0x80, 0x80, "IN2:8" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
@@ -2368,7 +2368,7 @@ static MACHINE_CONFIG_DERIVED( guttang, galaxian )
/* video hardware */
MCFG_PALETTE_LENGTH(32+2+64+1) /* 32 for the characters, 2 for the bullets, 64 for the stars, 1 for background */
-// MCFG_PALETTE_INIT_OVERRIDE(galaxold_state,scrambold)
+// MCFG_PALETTE_INIT_OVERRIDE(galaxold_state,scrambold)
MCFG_VIDEO_START_OVERRIDE(galaxold_state,mooncrst)
MACHINE_CONFIG_END
@@ -3282,7 +3282,7 @@ ROM_START( guttangt )
ROM_REGION( 0x2000, "gfx1", 0 )
ROM_LOAD( "gg9-2732.rom", 0x0000, 0x1000, CRC(be6bf522) SHA1(23a09409b7de4bfdb970e4ff23d89a2439a0aee5) )
ROM_LOAD( "gg10-2732.rom", 0x1000, 0x1000, CRC(b04c34c5) SHA1(a37db70ce67d64daa5f0c41cce1136d1c9d8c175) )
-
+
ROM_REGION( 0x0020, "proms", 0 ) // no PROM was present..
ROM_LOAD( "mmi6331.6l", 0x0000, 0x0020, BAD_DUMP CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) )
ROM_END
diff --git a/src/mame/drivers/galdrvr.c b/src/mame/drivers/galdrvr.c
index a325b2a5d64..11f3f34d46d 100644
--- a/src/mame/drivers/galdrvr.c
+++ b/src/mame/drivers/galdrvr.c
@@ -46,7 +46,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( galaxianbl )
PORT_INCLUDE(galaxian)
-
+
PORT_MODIFY("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, DEF_STR(None) )
@@ -5075,7 +5075,7 @@ ROM_START( mooncrsl ) // similar to above
ROM_LOAD( "07.bin", 0x3000, 0x0800, CRC(8e9ac0fc) SHA1(ddc11ad20ecbd954098becf7d7a1bbe6cddeda1b) )
ROM_LOAD( "08.bin", 0x3800, 0x0800, CRC(020a8e2f) SHA1(b64438cb043252565d8a4f3f58f4a4f78a276ba2) )
- ROM_REGION( 0x2000, "gfx1", 0 ) // not present in this set
+ ROM_REGION( 0x2000, "gfx1", 0 ) // not present in this set
ROM_LOAD( "mcs_b", 0x0000, 0x0800, CRC(fb0f1f81) SHA1(38a6679a8b69bc1870a0e67e692131c42f9535c8) )
ROM_LOAD( "mcs_d", 0x0800, 0x0800, CRC(13932a15) SHA1(b8885c555c6ad7021be55c6925a0a0872c1b6abd) )
ROM_LOAD( "mcs_a", 0x1000, 0x0800, CRC(631ebb5a) SHA1(5bc9493afa76c55858b8c8849524cbc77dc838fc) )
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index 49a90fb0ba1..975af49cc92 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -272,10 +272,10 @@ INTERRUPT_GEN_MEMBER(gaplus_state::gapluso_vblank_main_irq)
{
if(m_main_irq_mask)
m_maincpu->set_input_line(0, ASSERT_LINE);
-
+
if (!m_namco58xx->read_reset_line()) /* give the cpu a tiny bit of time to write the command before processing it */
timer_set(attotime::from_usec(50), TIMER_NAMCOIO_RUN, 1);
-
+
if (!m_namco56xx->read_reset_line()) /* give the cpu a tiny bit of time to write the command before processing it */
timer_set(attotime::from_usec(50), TIMER_NAMCOIO_RUN, 0);
}
@@ -960,15 +960,15 @@ ROM_END
DRIVER_INIT_MEMBER(gaplus_state,gaplus)
{
UINT8 *rom;
-
+
rom = memregion("gfx1")->base();
for (int i = 0;i < 0x2000;i++)
rom[i + 0x2000] = rom[i] >> 4;
-
+
rom = memregion("gfx2")->base() + 0x6000;
for (int i = 0;i < 0x2000;i++)
rom[i + 0x2000] = rom[i] << 4;
-
+
m_type = GAME_GAPLUS;
}
diff --git a/src/mame/drivers/jpmsru.c b/src/mame/drivers/jpmsru.c
index 44562248d3d..138456eba93 100644
--- a/src/mame/drivers/jpmsru.c
+++ b/src/mame/drivers/jpmsru.c
@@ -182,7 +182,7 @@ GAME(198?, j_nuddup ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "J
GAME(198?, j_nuddup2,j_nuddup ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM","Nudge Double Up (JPM SRU, set 2)", GAME_IS_SKELETON_MECHANICAL )
-GAME(198?, j_unk ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM?","Unknown SRU Game (JPM?)", GAME_IS_SKELETON_MECHANICAL )
+GAME(198?, j_unk ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM?","Unknown SRU Game (JPM?)", GAME_IS_SKELETON_MECHANICAL )
// this one is different again?
GAME(198?, j_plus2 ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM","Plus 2 (JPM)", GAME_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index d551d50b59d..1bb35eedb76 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -578,7 +578,7 @@ TODO:
void mappy_state::common_latch_w(UINT32 offset)
{
int bit = offset & 1;
-
+
switch (offset & 0x0e)
{
case 0x00: /* INT ON 2 */
@@ -586,27 +586,27 @@ void mappy_state::common_latch_w(UINT32 offset)
if (!bit)
m_subcpu->set_input_line(0, CLEAR_LINE);
break;
-
+
case 0x02: /* INT ON */
m_main_irq_mask = bit;
if (!bit)
m_maincpu->set_input_line(0, CLEAR_LINE);
break;
-
+
case 0x04: /* n.c. */
break;
-
+
case 0x06: /* SOUND ON */
mappy_sound_enable(machine().device("namco"), bit);
break;
-
+
case 0x0a: /* SUB RESET */
m_subcpu->set_input_line(INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE);
break;
-
+
case 0x0c: /* n.c. */
break;
-
+
case 0x0e: /* n.c. */
break;
}
@@ -638,7 +638,7 @@ WRITE8_MEMBER(mappy_state::superpac_latch_w)
default:
common_latch_w(offset);
- break;
+ break;
}
}
@@ -662,10 +662,10 @@ WRITE8_MEMBER(mappy_state::phozon_latch_w)
case 0x0c:
m_subcpu2->set_input_line(INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE);
break;
-
+
default:
common_latch_w(offset);
- break;
+ break;
}
}
@@ -697,10 +697,10 @@ WRITE8_MEMBER(mappy_state::mappy_latch_w)
break;
}
break;
-
+
default:
common_latch_w(offset);
- break;
+ break;
}
}
@@ -1714,7 +1714,7 @@ static MACHINE_CONFIG_FRAGMENT( superpac_common )
MCFG_WATCHDOG_VBLANK_INIT(8)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
- /* synchronization of the CPUs */
+ /* synchronization of the CPUs */
MCFG_MACHINE_START_OVERRIDE(mappy_state,mappy)
MCFG_MACHINE_RESET_OVERRIDE(mappy_state,superpac)
@@ -1792,7 +1792,7 @@ static MACHINE_CONFIG_START( phozon, mappy_state )
MCFG_WATCHDOG_VBLANK_INIT(8)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
- /* synchronization of the CPUs */
+ /* synchronization of the CPUs */
MCFG_MACHINE_START_OVERRIDE(mappy_state,mappy)
MCFG_MACHINE_RESET_OVERRIDE(mappy_state,phozon)
@@ -1832,7 +1832,7 @@ static MACHINE_CONFIG_FRAGMENT( mappy_common )
MCFG_WATCHDOG_VBLANK_INIT(8)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
- /* synchronization of the CPUs */
+ /* synchronization of the CPUs */
MCFG_MACHINE_START_OVERRIDE(mappy_state,mappy)
MCFG_MACHINE_RESET_OVERRIDE(mappy_state,mappy)
diff --git a/src/mame/drivers/maygayep.c b/src/mame/drivers/maygayep.c
index ac9faab35ef..0b82cb18a8e 100644
--- a/src/mame/drivers/maygayep.c
+++ b/src/mame/drivers/maygayep.c
@@ -6604,7 +6604,7 @@ ROM_END
#define EP_TREAS_SOUND \
ROM_REGION( 0x100000, "ymz", 0 ) \
- ROM_LOAD( "treas1_6.s0", 0x000000, 0x080000, CRC(df792dc0) SHA1(96647eb579a3a60f1a4a2bea53d7a13030838437) )
+ ROM_LOAD( "treas1_6.s0", 0x000000, 0x080000, CRC(df792dc0) SHA1(96647eb579a3a60f1a4a2bea53d7a13030838437) )
ROM_START( ep_treas )
ROM_REGION( 0x080000, "maincpu", 0 )
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 3b9110ec34f..41b4df6c143 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -20,7 +20,7 @@ ZPU-2000 - main cpu board
- four 'test button' style switches
- one 4Mhz xtal @A1
- this same board is shared with cliff hanger (clifhgr.c)
-
+
CFB-1000 - video/subcpu board
- this board has a sub-cpu on it and four roms (six sockets for roms, two empty)
- the roms go in sockets "ROM0"@G8, "ROM2"@K8, "ROM3"@K10, "ROM4"@K11
diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c
index 0fbf6969945..61a542251ad 100644
--- a/src/mame/drivers/mil4000.c
+++ b/src/mame/drivers/mil4000.c
@@ -502,7 +502,7 @@ ROM_END
Sound: 1x U6295 (U53)
- RAM: 2x 6116.
+ RAM: 2x 6116.
2x 6264 (prg RAM)
2x 62256 (near battery)
@@ -518,27 +518,27 @@ ROM_END
*/
ROM_START( top21 )
- ROM_REGION( 0x100000, "maincpu", 0 ) // 68000 code
+ ROM_REGION( 0x100000, "maincpu", 0 ) // 68000 code
ROM_LOAD16_BYTE( "odd_1-2.u75", 0x000001, 0x80000, CRC(ce4f2a74) SHA1(f9a9043da924ddba16f49d6856dbcfd8f066c824) )
ROM_LOAD16_BYTE( "even_1-2.u76", 0x000000, 0x80000, CRC(8d645456) SHA1(06c59816f259168f15503b276fc28c947e17cc60) )
- ROM_COPY( "maincpu", 0x080000, 0x00000, 0x80000 ) // copying the second halves to the right offset
+ ROM_COPY( "maincpu", 0x080000, 0x00000, 0x80000 ) // copying the second halves to the right offset
ROM_REGION( 0xa0000, "gfx1", 0 )
ROM_LOAD( "36.u36", 0x000000, 0x20000, CRC(071883f7) SHA1(16b5c251975394bb94c0d32277912ea99280c21c) )
- ROM_LOAD( "35.u35", 0x020000, 0x20000, CRC(cdc8cc44) SHA1(ce703e7f050465b1bc07800eb84eb7f127ebbddb) ) // double size. 2nd half empty
+ ROM_LOAD( "35.u35", 0x020000, 0x20000, CRC(cdc8cc44) SHA1(ce703e7f050465b1bc07800eb84eb7f127ebbddb) ) // double size. 2nd half empty
ROM_IGNORE( 0x20000)
ROM_LOAD( "34.u34", 0x040000, 0x20000, CRC(bdbe7360) SHA1(3038f66d57a43afea9d6c05908bfb50167a881c2) )
ROM_LOAD( "33.u33", 0x060000, 0x20000, CRC(670584b0) SHA1(23772404b5e5066828c59d9baa03b732a80db676) )
ROM_LOAD( "32.u32", 0x080000, 0x20000, CRC(c5bc3950) SHA1(aebaae91ade0c221ba14186fde78206996cdec30) )
- ROM_REGION( 0x80000, "oki", 0 ) // 6295 samples (first half empty)
+ ROM_REGION( 0x80000, "oki", 0 ) // 6295 samples (first half empty)
ROM_LOAD( "audio.u64", 0x00000, 0x80000, CRC(4f70a9bc) SHA1(83f0664eadf923ed45e3e18bfcefafb85163c4a0) )
- ROM_COPY( "oki", 0x40000, 0x00000, 0x40000 ) // copying the second half to the right offset
+ ROM_COPY( "oki", 0x40000, 0x00000, 0x40000 ) // copying the second half to the right offset
- ROM_REGION( 0x4000, "mcu", 0 ) // MCU code
+ ROM_REGION( 0x4000, "mcu", 0 ) // MCU code
ROM_LOAD( "pic16c65b_top21.u60", 0x0000, 0x4000, NO_DUMP )
- ROM_REGION( 0x10000, "nvram", 0 ) // default NVRAM (2x 62256)
+ ROM_REGION( 0x10000, "nvram", 0 ) // default NVRAM (2x 62256)
ROM_LOAD( "top21_nvram.bin", 0x00000, 0x10000, CRC(638726ce) SHA1(c55c77df5fbddfb19acf50f1b4467c63c818d5e7) )
ROM_END
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 38169cd07f0..17f8ce392ef 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -1885,27 +1885,27 @@ ROM_END
/*
Coinworld data
-Error Number Cause of alarm Comments
-11 1 GBP coin in These alarms go off when a coin is jammed in the mech, or if the Mars anti-strimming alarm is activated.
+Error Number Cause of alarm Comments
+11 1 GBP coin in These alarms go off when a coin is jammed in the mech, or if the Mars anti-strimming alarm is activated.
12 50p coin in The machine will lock up for a short amount of time, whilst sounding as alarm tone.
13 20p coin in Error 15 can be caused by having DIL switch 6 in the wrong position for your coin mech loom.
14 10p coin in
15 5p coin in
-16 2 GBP coin in
+16 2 GBP coin in
21 Reel 1 alarm The faulty reel will flash. Nothing more will happen until the machine is reset
22 Reel 2 alarm
-23 Reel 3 alarm
-42 Ram Cleared The RAM is cleared when the machine is turned on for the first time, or when the price of play is changed. The alarm
+23 Reel 3 alarm
+42 Ram Cleared The RAM is cleared when the machine is turned on for the first time, or when the price of play is changed. The alarm
clears after a short time
-51 Checksum error The machine will lock up completely if the eprom has failed, or if the security chip is missing or has failed
+51 Checksum error The machine will lock up completely if the eprom has failed, or if the security chip is missing or has failed
54 Security chip fail
61 Cash in meter failure The machine will not run if the cash in, or cash out meters are not connected properly.
-62 Cash out meter failure
-71 Datapack error If the machine is in protocol mode, and a datapack is not connected, then the machine alarms. It will reset after a
+62 Cash out meter failure
+71 Datapack error If the machine is in protocol mode, and a datapack is not connected, then the machine alarms. It will reset after a
time, and have another go at transmitting the data
-72 Sound card fail If the sound card is missing, or the wrong sound eprom is fitted, the machine alarms on power on. The machine will then
+72 Sound card fail If the sound card is missing, or the wrong sound eprom is fitted, the machine alarms on power on. The machine will then
operate in silence.
-99 Payout tubes empty If one of the tubes runs dry, the machine will attempt to compensate by paying from the other tube. If this runs dry
+99 Payout tubes empty If one of the tubes runs dry, the machine will attempt to compensate by paying from the other tube. If this runs dry
as well, the machine will lock up, requiring a refill before games can continue. The alarm tone is a softer, more friendly one.
*/
diff --git a/src/mame/drivers/mpu4hw.c b/src/mame/drivers/mpu4hw.c
index 9c424f463d5..a6bde3283e0 100644
--- a/src/mame/drivers/mpu4hw.c
+++ b/src/mame/drivers/mpu4hw.c
@@ -1801,7 +1801,7 @@ INPUT_PORTS_START( mpu4_cw )
PORT_DIPNAME( 0x0C, 0x00, "Jackpot" ) PORT_DIPLOCATION("DIL1:03,04")
PORT_DIPSETTING( 0x04, "15 GBP" )
PORT_DIPSETTING( 0x00, "10 GBP" )
- PORT_DIPSETTING( 0x08, "5 GBP" )
+ PORT_DIPSETTING( 0x08, "5 GBP" )
PORT_DIPNAME( 0x10, 0x00, "Hold Mode" ) PORT_DIPLOCATION("DIL1:05")
PORT_DIPSETTING( 0x00, "Show Hints" )
PORT_DIPSETTING( 0x10, "Auto Hold" )
@@ -1813,18 +1813,18 @@ INPUT_PORTS_START( mpu4_cw )
PORT_DIPSETTING( 0x40, "Fat motor" )
PORT_DIPNAME( 0x80, 0x00, "Payout Tube" ) PORT_DIPLOCATION("DIL1:05")
PORT_DIPSETTING( 0x00, "20p" )
- PORT_DIPSETTING( 0x80, "10p" )
+ PORT_DIPSETTING( 0x80, "10p" )
PORT_MODIFY("DIL2")
PORT_DIPNAME( 0x07, 0x00, "Stake Setting" )
PORT_DIPSETTING( 0x00, "Not fitted / 5p" )
PORT_DIPSETTING( 0x01, "10p" )
PORT_DIPSETTING( 0x02, "20p" )
- PORT_DIPSETTING( 0x03, "25p" )
+ PORT_DIPSETTING( 0x03, "25p" )
PORT_DIPSETTING( 0x04, "30p" )
PORT_BIT(0xE0, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END
-
+
INPUT_PORTS_START( mpu4jackpot8tkn )
PORT_INCLUDE( mpu4 )
diff --git a/src/mame/drivers/proconn.c b/src/mame/drivers/proconn.c
index a66d209b5d5..bc59912cda1 100644
--- a/src/mame/drivers/proconn.c
+++ b/src/mame/drivers/proconn.c
@@ -5,20 +5,20 @@
what's the difference between the platforms, sound hardware?
Some early Proconn hardware was used for Maygay stuff, so this may be a bit of a mix.
-
+
Error codes:
-
- ERROR 1 EPROM FAILED
- ERROR 3 RAM CORRUPTION DETECTED (common on PC90 boards)
- ERROR 10 RAM FAILURE
- ERROR 20 METERS DISCONNECTED
- ERROR 21 CASH IN METER FAIL
- ERROR 22 CASH OUT METER FAIL
- ERROR 25 REFILL METER FAIL
- ERROR 30 REEL 1 FAIL
- ERROR 31 REEL 2 FAIL
- ERROR 32 REEL 3 FAIL
- ERROR 99 SECURITY CARD MISSING OR FAILED, OR INCORRECT FOR PROGRAM
+
+ ERROR 1 EPROM FAILED
+ ERROR 3 RAM CORRUPTION DETECTED (common on PC90 boards)
+ ERROR 10 RAM FAILURE
+ ERROR 20 METERS DISCONNECTED
+ ERROR 21 CASH IN METER FAIL
+ ERROR 22 CASH OUT METER FAIL
+ ERROR 25 REFILL METER FAIL
+ ERROR 30 REEL 1 FAIL
+ ERROR 31 REEL 2 FAIL
+ ERROR 32 REEL 3 FAIL
+ ERROR 99 SECURITY CARD MISSING OR FAILED, OR INCORRECT FOR PROGRAM
*/
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index 59f1b4115d6..5924344b530 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -31,7 +31,7 @@
The kram3 set used to be playable with the implementation in the MAME M6809
CPU core, encrypting only the first byte in 10 xx and 11 xx opcodes.
This should get a cleaner implementation. Until then, kram3 is broken on purpose.
-
+
According to the QIX and Kram schematics, these games should be using 68A90Es.
The 6809E has a 'Last Instruction Cycle' pin that is likely tied in with the encryption:
"LIC is HIGH during the last cycle of every instruction and its transition from
diff --git a/src/mame/drivers/quakeat.c b/src/mame/drivers/quakeat.c
index 20ac096a7ee..bb7abce1373 100644
--- a/src/mame/drivers/quakeat.c
+++ b/src/mame/drivers/quakeat.c
@@ -92,7 +92,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( quake_io, AS_IO, 32, quakeat_state )
AM_IMPORT_FROM(pcat32_io_common)
AM_RANGE(0x00e8, 0x00eb) AM_NOP
-// AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE16("ide", ide_controller_device, read_cs0_pc, write_cs0_pc, 0xffffffff)
+// AM_RANGE(0x01f0, 0x01f7) AM_DEVREADWRITE16("ide", ide_controller_device, read_cs0_pc, write_cs0_pc, 0xffffffff)
AM_RANGE(0x0300, 0x03af) AM_NOP
AM_RANGE(0x03b0, 0x03df) AM_NOP
// AM_RANGE(0x0278, 0x027b) AM_WRITE(pnp_config_w)
diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c
index 19cf3b8026b..cf9090ccdb7 100644
--- a/src/mame/drivers/savquest.c
+++ b/src/mame/drivers/savquest.c
@@ -423,24 +423,24 @@ WRITE32_MEMBER(savquest_state::parallel_port_w)
*/
if ((data8 == 0x94)
- || (data8 == 0x9e)
- || (data8 == 0xa4)
- || (data8 == 0xb2)
- || (data8 == 0xbe)
- || (data8 == 0xd0)
- )
+ || (data8 == 0x9e)
+ || (data8 == 0xa4)
+ || (data8 == 0xb2)
+ || (data8 == 0xbe)
+ || (data8 == 0xd0)
+ )
{
return;
}
if ((data8 == 0x8a)
- || (data8 == 0x8e)
- || (data8 == 0xca)
- || (data8 == 0xd2)
- || (data8 == 0xe2)
- || (data8 == 0xf0)
- || (data8 == 0xfc)
- )
+ || (data8 == 0x8e)
+ || (data8 == 0xca)
+ || (data8 == 0xd2)
+ || (data8 == 0xe2)
+ || (data8 == 0xf0)
+ || (data8 == 0xfc)
+ )
{
/* someone with access to the actual dongle could dump the true values
I've never seen it so I just determined the relevant bits instead
@@ -509,8 +509,8 @@ WRITE32_MEMBER(savquest_state::parallel_port_w)
}
if ((m_haspstate == HASPSTATE_PASSBEG)
- && (data8 & 1)
- )
+ && (data8 & 1)
+ )
{
m_hasp_tmppass[m_hasp_passind] = data8;
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 5693f0de306..f3bb80cdd1f 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -30,7 +30,7 @@
This code is also in the main PRG ROM at offset 0x1ffffc, even on single
board games. Known regions are:
-
+
0x01 Japan
0x10 US
0x20 Taiwan
@@ -951,8 +951,8 @@ WRITE32_MEMBER(seibuspi_state::ejsakura_input_select_w)
static ADDRESS_MAP_START( base_map, AS_PROGRAM, 32, seibuspi_state )
-// AM_RANGE(0x00000104, 0x00000107) AM_WRITENOP // ?
-// AM_RANGE(0x00000108, 0x0000010b) AM_WRITENOP // ?
+// AM_RANGE(0x00000104, 0x00000107) AM_WRITENOP // ?
+// AM_RANGE(0x00000108, 0x0000010b) AM_WRITENOP // ?
AM_RANGE(0x00000000, 0x000003ff) AM_RAM
AM_RANGE(0x00000414, 0x00000417) AM_WRITENOP // bg gfx decryption key, see machine/seibuspi.c
AM_RANGE(0x00000418, 0x0000041b) AM_READWRITE(spi_layer_bank_r, spi_layer_bank_w)
@@ -1059,7 +1059,7 @@ WRITE8_MEMBER(seibuspi_state::z80_bank_w)
m_z80_lastbank = bank;
membank("bank1")->set_entry(bank);
}
-
+
// d3: watchdog?
}
@@ -1067,7 +1067,7 @@ WRITE8_MEMBER(seibuspi_state::spi_coin_w)
{
coin_counter_w(machine(), 0, data & 1);
coin_counter_w(machine(), 1, data & 2);
-
+
// coin latch used by single boards
if (data)
m_sb_coin_latch = 0xa0 | data;
@@ -1903,7 +1903,7 @@ static MACHINE_CONFIG_DERIVED( sxx2f, sxx2e )
MCFG_DEVICE_REMOVE("ds2404")
MCFG_EEPROM_ADD("eeprom", eeprom_intf)
-
+
// Z80 is Z84C0006PCS instead of Z84C0008PEC
// clock is unknown, possibly slower than 7.159MHz
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index aa041f87fdf..33426f89634 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -80,7 +80,7 @@ WRITE8_MEMBER(speedbal_state::leds_output_block)
{
if (!m_leds_start)
return;
-
+
m_leds_start = false;
// Each hypothetical led block has 3 7seg leds.
@@ -362,11 +362,10 @@ DRIVER_INIT_MEMBER(speedbal_state,musicbal)
for (int i=0;i<0x8000;i++)
{
-
// some bits are ^ 0x05
/*if ((i&0x30) == 0x00)
{
- if ((( i & 0x0f ) > 0x08) && (( i & 0x0f ) < 0x0f)) MUSICBALL_XOR05
+ if ((( i & 0x0f ) > 0x08) && (( i & 0x0f ) < 0x0f)) MUSICBALL_XOR05
}
*/
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index c6ccc11d603..ad499d9ccd0 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -85,7 +85,7 @@ public:
m_tms(*this, "tms"),
m_videoram(*this, "videoram"),
m_question_offset(*this, "question_offset")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<tms9927_device> m_tms;
diff --git a/src/mame/drivers/stuntair.c b/src/mame/drivers/stuntair.c
index fe407896255..1db703b82a3 100644
--- a/src/mame/drivers/stuntair.c
+++ b/src/mame/drivers/stuntair.c
@@ -149,7 +149,7 @@ PALETTE_INIT( stuntair )
int b = (data&0xc0)>>6;
int g = (data&0x38)>>3;
int r = (data&0x07)>>0;
-
+
palette_set_color(machine,i,MAKE_RGB(r<<5,g<<5,b<<6));
}
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index b4945634204..d9b37cd0fba 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -1,7 +1,7 @@
/***************************************************************************
Taito F3 Package System (aka F3 Cybercore System)
-
+
Emulation by Bryan McPhail, mish@tendril.co.uk/mish@mame.net
Thanks to Ian Schmidt and Stiletto for sound information!
Major thanks to Aaron Giles for sound info, figuring out the 68K/ES5505
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index dcde67990d0..92a052cd355 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -288,11 +288,11 @@ public:
tempest_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
- m_mathbox(*this, "mathbox") { }
+ m_mathbox(*this, "mathbox") { }
required_device<cpu_device> m_maincpu;
required_device<mathbox_device> m_mathbox;
-
+
UINT8 m_player_select;
DECLARE_WRITE8_MEMBER(wdclr_w);
DECLARE_WRITE8_MEMBER(tempest_led_w);
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index 01ed37083ed..c04374a0cab 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -2132,7 +2132,7 @@ static ADDRESS_MAP_START(coh1001l_map, AS_PROGRAM, 32, zn_state)
AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("bankedroms")
AM_RANGE(0x1fb00000, 0x1fb00003) AM_WRITE16(coh1001l_latch_w, 0x0000ffff)
AM_RANGE(0x1fb00000, 0x1fb00003) AM_WRITE8(coh1001l_bank_w, 0x00ff0000)
-
+
AM_IMPORT_FROM(zn_map)
ADDRESS_MAP_END
@@ -2368,7 +2368,7 @@ WRITE8_MEMBER(zn_state::coh1002m_bank_w)
static ADDRESS_MAP_START(coh1002m_map, AS_PROGRAM, 32, zn_state)
AM_RANGE(0x1f000000, 0x1f7fffff) AM_ROMBANK("bankedroms")
AM_RANGE(0x1fb00004, 0x1fb00007) AM_WRITE8(coh1002m_bank_w, 0x00ff0000)
-
+
AM_IMPORT_FROM(zn_map)
ADDRESS_MAP_END
@@ -2394,7 +2394,7 @@ static ADDRESS_MAP_START(coh1002msnd_map, AS_PROGRAM, 32, zn_state)
AM_RANGE(0x1fb00000, 0x1fb00003) AM_DEVREAD8("cbaj_fifo2", fifo7200_device, data_byte_r, 0x000000ff)
AM_RANGE(0x1fb00000, 0x1fb00003) AM_DEVWRITE8("cbaj_fifo1", fifo7200_device, data_byte_w, 0x000000ff)
AM_RANGE(0x1fb00000, 0x1fb00003) AM_READ8(cbaj_sound_main_status_r, 0xff000000)
-
+
AM_IMPORT_FROM(coh1002m_map)
ADDRESS_MAP_END
@@ -2426,7 +2426,7 @@ static MACHINE_CONFIG_DERIVED( coh1002msnd, coh1002m )
MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8)
MCFG_CPU_PROGRAM_MAP(cbaj_z80_map)
MCFG_CPU_IO_MAP(cbaj_z80_port_map)
-
+
MCFG_FIFO7200_ADD("cbaj_fifo1", 0x400) // LH540202
MCFG_FIFO7200_ADD("cbaj_fifo2", 0x400) // "
diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h
index 9e64bfa609c..735e200c4eb 100644
--- a/src/mame/includes/bzone.h
+++ b/src/mame/includes/bzone.h
@@ -21,7 +21,7 @@ public:
m_discrete(*this, "discrete"),
m_redbaronsound(*this, "custom")
{ }
-
+
required_device<cpu_device> m_maincpu;
required_device<mathbox_device> m_mathbox;
optional_device<discrete_device> m_discrete;
@@ -45,7 +45,3 @@ public:
/*----------- defined in audio/bzone.c -----------*/
MACHINE_CONFIG_EXTERN( bzone_audio );
-
-
-
-
diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h
index f8241fb3268..c5e73c7a67a 100644
--- a/src/mame/includes/dkong.h
+++ b/src/mame/includes/dkong.h
@@ -104,11 +104,11 @@ public:
device_t *m_dev_vp2; /* virtual port 2 */
device_t *m_dev_6h;
optional_device<discrete_device> m_discrete;
-
+
/* memory pointers */
required_shared_ptr<UINT8> m_video_ram;
required_shared_ptr<UINT8> m_sprite_ram;
-
+
/* machine states */
UINT8 m_hardware_type;
UINT8 m_nmi_mask;
diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h
index 90ea6705b46..da5d60fc2e4 100644
--- a/src/mame/includes/exidy440.h
+++ b/src/mame/includes/exidy440.h
@@ -1,6 +1,6 @@
/*************************************************************************
- Exidy 440 hardware
+ Exidy 440 hardware
*************************************************************************/
diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h
index 6b636a5b765..9fc57ace276 100644
--- a/src/mame/includes/flower.h
+++ b/src/mame/includes/flower.h
@@ -78,7 +78,7 @@ public:
{
TIMER_CLOCK_EFFECT
};
-
+
DECLARE_WRITE8_MEMBER( sound1_w );
DECLARE_WRITE8_MEMBER( sound2_w );
@@ -87,7 +87,7 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
// sound stream update overrides
@@ -96,7 +96,7 @@ protected:
private:
void make_mixer_table(int voices, int gain);
void show_soundregs();
-
+
// internal state
emu_timer *m_effect_timer;
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index 541ea35702a..8f4c2b9774e 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -129,7 +129,7 @@ public:
DECLARE_WRITE8_MEMBER(rockclim_scroll_w);
DECLARE_WRITE8_MEMBER(guttang_rombank_w);
-
+
DECLARE_READ8_MEMBER(rockclim_videoram_r);
DECLARE_WRITE8_MEMBER(dambustr_bg_split_line_w);
diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h
index 7655a40069d..bb3a0b6d441 100644
--- a/src/mame/includes/gaplus.h
+++ b/src/mame/includes/gaplus.h
@@ -16,14 +16,14 @@ public:
{
TIMER_NAMCOIO_RUN
};
-
+
enum
{
GAME_GAPLUS = 0,
GAME_GAPLUSD,
GAME_GALAGA3
};
-
+
gaplus_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
@@ -33,7 +33,7 @@ public:
m_customio_3(*this,"customio_3"),
m_videoram(*this,"videoram"),
m_spriteram(*this,"spriteram") { }
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
required_device<cpu_device> m_subcpu2;
@@ -45,7 +45,7 @@ public:
namco56xx_device *m_namco56xx;
int m_type;
-
+
tilemap_t *m_bg_tilemap;
UINT8 m_starfield_control[4];
int m_total_stars;
@@ -86,7 +86,7 @@ public:
void starfield_init();
void starfield_render(bitmap_ind16 &bitmap);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
-
+
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h
index 3c03b0c4ba9..15cd3fe827b 100644
--- a/src/mame/includes/mappy.h
+++ b/src/mame/includes/mappy.h
@@ -26,7 +26,7 @@ public:
GAME_DIGDUG2,
GAME_MOTOS
};
-
+
mappy_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
@@ -38,7 +38,7 @@ public:
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_spriteram;
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
optional_device<cpu_device> m_subcpu2;
@@ -49,7 +49,7 @@ public:
namco58xx_device *m_namco58xx_1;
namco58xx_device *m_namco58xx_2;
namco59xx_device *m_namco59xx;
-
+
// per-game variable to distinguish between the various IO chip config
int m_type;
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
index e4d5efa5b7e..0db4036da6f 100644
--- a/src/mame/includes/nmk16.h
+++ b/src/mame/includes/nmk16.h
@@ -192,5 +192,5 @@ public:
void decode_tdragonb();
void decode_ssmissin();
DECLARE_WRITE_LINE_MEMBER(ym2203_irqhandler);
-
+
};
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index a65b4369390..f06153cdd43 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -400,9 +400,9 @@ public:
const UINT8 (*m_drgw2_source_data)[0xec];
- UINT16 m_drgw2_prot_hold;
- UINT16 m_drgw2_prot_hilo;
- UINT16 m_drgw2_prot_hilo_select;
+ UINT16 m_drgw2_prot_hold;
+ UINT16 m_drgw2_prot_hilo;
+ UINT16 m_drgw2_prot_hilo_select;
int m_drgw2_cmd;
int m_drgw2_ptr;
diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h
index 19cdd27796a..0948be471dd 100644
--- a/src/mame/includes/playch10.h
+++ b/src/mame/includes/playch10.h
@@ -21,7 +21,7 @@ public:
required_device<cpu_device> m_maincpu;
optional_device<rp5h01_device> m_rp5h01;
-
+
required_shared_ptr<UINT8> m_ram_8w;
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_timedata;
diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h
index dd232e9a19a..042b561f28f 100644
--- a/src/mame/includes/powerins.h
+++ b/src/mame/includes/powerins.h
@@ -14,7 +14,7 @@ public:
m_spriteram(*this, "spriteram")
{ }
-
+
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_soundcpu;
optional_device<nmk112_device> m_nmk112;
diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h
index 27759e246cb..38ff4747e0f 100644
--- a/src/mame/includes/seibuspi.h
+++ b/src/mame/includes/seibuspi.h
@@ -1,7 +1,7 @@
/***************************************************************************
Seibu SPI hardware
-
+
***************************************************************************/
#include "machine/intelfsh.h"
diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h
index fd29b9c31b2..8c8700804da 100644
--- a/src/mame/includes/snowbros.h
+++ b/src/mame/includes/snowbros.h
@@ -25,7 +25,7 @@ public:
int m_sb3_music;
UINT8 m_semicom_prot_offset;
UINT8 *m_spriteram;
-
+
DECLARE_WRITE16_MEMBER(snowbros_flipscreen_w);
DECLARE_WRITE16_MEMBER(snowbros_irq4_ack_w);
DECLARE_WRITE16_MEMBER(snowbros_irq3_ack_w);
diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h
index 23100382f11..44a2e92885a 100644
--- a/src/mame/includes/speedbal.h
+++ b/src/mame/includes/speedbal.h
@@ -16,7 +16,7 @@ public:
bool m_leds_start;
UINT32 m_leds_shiftreg;
-
+
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h
index 50dd6a38c48..8974af42687 100644
--- a/src/mame/includes/taito_b.h
+++ b/src/mame/includes/taito_b.h
@@ -28,7 +28,7 @@ public:
m_tc0180vcu(*this, "tc0180vcu"),
m_tc0640fio(*this, "tc0640fio"),
m_tc0220ioc(*this, "tc0220ioc"),
- m_tc0510nio(*this, "tc0510nio") { }
+ m_tc0510nio(*this, "tc0510nio") { }
/* memory pointers */
required_shared_ptr<UINT16> m_spriteram;
diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h
index 59290b8fc40..7a9e749a5e7 100644
--- a/src/mame/includes/taitoair.h
+++ b/src/mame/includes/taitoair.h
@@ -44,7 +44,7 @@ public:
required_shared_ptr<UINT16> m_paletteram;
required_shared_ptr<UINT16> m_gradram;
required_shared_ptr<UINT16> m_backregs;
-
+
/* video-related */
taitoair_poly m_q;
diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h
index 84b2e0347f2..affd6912d3b 100644
--- a/src/mame/includes/toypop.h
+++ b/src/mame/includes/toypop.h
@@ -25,14 +25,14 @@ public:
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_m68000_sharedram;
required_shared_ptr<UINT16> m_bg_image;
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<cpu_device> m_subcpu;
required_device<namco58xx_device> m_namco58xx;
required_device<namco56xx_device> m_namco56xx_1;
required_device<namco56xx_device> m_namco56xx_2;
-
+
tilemap_t *m_bg_tilemap;
int m_bitmapflip;
diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h
index fd5c6efcf21..91a114395f2 100644
--- a/src/mame/includes/vertigo.h
+++ b/src/mame/includes/vertigo.h
@@ -89,7 +89,7 @@ public:
vertigo_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
- m_audiocpu(*this, "audiocpu"),
+ m_audiocpu(*this, "audiocpu"),
m_pit(*this, "pit8254"),
m_vectorram(*this, "vectorram")
{ }
diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h
index 08159a1eab3..07af9b6629c 100644
--- a/src/mame/includes/vsnes.h
+++ b/src/mame/includes/vsnes.h
@@ -11,7 +11,7 @@ public:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_subcpu;
-
+
required_shared_ptr<UINT8> m_work_ram;
optional_shared_ptr<UINT8> m_work_ram_1;
int m_coin;
diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h
index dfaf7c70cf6..c0b5177f513 100644
--- a/src/mame/includes/warpwarp.h
+++ b/src/mame/includes/warpwarp.h
@@ -8,10 +8,10 @@ public:
m_maincpu(*this, "maincpu"),
m_warpwarp_sound(*this, "warpwarp_custom"),
m_geebee_sound(*this, "geebee_custom"),
- m_geebee_videoram(*this, "geebee_videoram"),
+ m_geebee_videoram(*this, "geebee_videoram"),
m_videoram(*this, "videoram")
{ }
-
+
required_device<cpu_device> m_maincpu;
optional_device<warpwarp_sound_device> m_warpwarp_sound;
optional_device<geebee_sound_device> m_geebee_sound;
diff --git a/src/mame/layout/speedbal.lay b/src/mame/layout/speedbal.lay
index 72d054894dc..e1310d0a76b 100644
--- a/src/mame/layout/speedbal.lay
+++ b/src/mame/layout/speedbal.lay
@@ -75,10 +75,10 @@
<bezel name="digit10" element="digit">
<bounds left="10" top="-20" right="20" bottom="-8" />
</bezel>
- <bezel name="digit20" element="digit">
+ <bezel name="digit20" element="digit">
<bounds left="20" top="-20" right="30" bottom="-8" />
</bezel>
- <bezel name="digit30" element="digit">
+ <bezel name="digit30" element="digit">
<bounds left="30" top="-20" right="40" bottom="-8" />
</bezel>
<bezel name="digit40" element="digit">
@@ -193,5 +193,5 @@
</view>
-
+
</mamelayout>
diff --git a/src/mame/machine/mathbox.h b/src/mame/machine/mathbox.h
index de6bdc2e06a..120ce4ad3b1 100644
--- a/src/mame/machine/mathbox.h
+++ b/src/mame/machine/mathbox.h
@@ -11,14 +11,14 @@
#define MCFG_MATHBOX_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, MATHBOX, 0)
-
+
/* ----- device interface ----- */
class mathbox_device : public device_t
{
public:
mathbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
DECLARE_WRITE8_MEMBER( go_w );
DECLARE_READ8_MEMBER( status_r );
DECLARE_READ8_MEMBER( lo_r );
diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h
index ddaa3bec9de..0ff858d161c 100644
--- a/src/mame/machine/midikbd.h
+++ b/src/mame/machine/midikbd.h
@@ -8,7 +8,7 @@
devcb = &midi_keyboard_device::static_set_tx_callback(*device, DEVCB2_##_devcb);
class midi_keyboard_device : public device_t,
- public device_serial_interface
+ public device_serial_interface
{
public:
midi_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
diff --git a/src/mame/machine/mpeg573.c b/src/mame/machine/mpeg573.c
index 2da520ebcde..5a1c13a9641 100644
--- a/src/mame/machine/mpeg573.c
+++ b/src/mame/machine/mpeg573.c
@@ -42,10 +42,10 @@ static MACHINE_CONFIG_FRAGMENT( mpeg573 )
MACHINE_CONFIG_END
mpeg573_device::mpeg573_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, MPEG573, "Konami 573 digital audio board", tag, owner, clock, "mpeg573", __FILE__),
+ : device_t(mconfig, MPEG573, "Konami 573 digital audio board", tag, owner, clock, "mpeg573", __FILE__),
mas3507d(*this, "mpeg"),
digital_id(*this, "digital_id"),
- output_cb(*this)
+ output_cb(*this)
{
}
@@ -156,9 +156,9 @@ WRITE16_MEMBER(mpeg573_device::mas_i2c_w)
WRITE16_MEMBER(mpeg573_device::mpeg_ctrl_w)
{
logerror("FPGA MPEG control %c%c%c\n",
- data & 0x8000 ? '#' : '.',
- data & 0x4000 ? '#' : '.',
- data & 0x2000 ? '#' : '.');
+ data & 0x8000 ? '#' : '.',
+ data & 0x4000 ? '#' : '.',
+ data & 0x2000 ? '#' : '.');
}
WRITE16_MEMBER(mpeg573_device::ram_write_adr_high_w)
diff --git a/src/mame/machine/mpeg573.h b/src/mame/machine/mpeg573.h
index e5588527e78..2dd511dc0aa 100644
--- a/src/mame/machine/mpeg573.h
+++ b/src/mame/machine/mpeg573.h
@@ -4,11 +4,11 @@
#include "sound/mas3507d.h"
#include "machine/ds2401.h"
-#define MCFG_MPEG573_ADD(_tag, _clock, _output_cb ) \
+#define MCFG_MPEG573_ADD(_tag, _clock, _output_cb ) \
MCFG_DEVICE_ADD(_tag, MPEG573, _clock) \
downcast<mpeg573_device *>(device)->set_output_cb(DEVCB2_##_output_cb);
-#define MCFG_MPEG573_OUTPUT_CALLBACK( _output_cb ) \
+#define MCFG_MPEG573_OUTPUT_CALLBACK( _output_cb ) \
downcast<mpeg573_device *>(device)->set_output_cb(DEVCB2_##_output_cb);
class mpeg573_device : public device_t
diff --git a/src/mame/machine/namcoio.c b/src/mame/machine/namcoio.c
index 818ce2c22d2..e2dff126b66 100644
--- a/src/mame/machine/namcoio.c
+++ b/src/mame/machine/namcoio.c
@@ -141,7 +141,7 @@ namco59xx_device::namco59xx_device(const machine_config &mconfig, const char *ta
: namcoio_device(mconfig, NAMCO59XX, "Namco 59xx", tag, owner, clock, "59xx")
{
m_device_type = TYPE_NAMCO59XX;
-}
+}
//-------------------------------------------------
// device_config_complete - perform any
@@ -155,7 +155,7 @@ void namcoio_device::device_config_complete()
const namcoio_interface *intf = reinterpret_cast<const namcoio_interface *>(static_config());
if (intf != NULL)
*static_cast<namcoio_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h
index 0de53ac93ad..ed763d82732 100644
--- a/src/mame/machine/namcoio.h
+++ b/src/mame/machine/namcoio.h
@@ -17,7 +17,7 @@ class namcoio_device : public device_t,
public:
namcoio_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -29,15 +29,15 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
int m_device_type;
-
+
enum {
TYPE_NAMCO56XX,
TYPE_NAMCO58XX,
TYPE_NAMCO59XX,
};
-
+
// internal state
UINT8 m_ram[16];
@@ -51,11 +51,11 @@ protected:
INT32 m_coins_per_cred[2];
INT32 m_creds_per_coin[2];
INT32 m_in_count;
-
+
void handle_coins( int swap );
virtual void customio_run() {}
-
+
private:
};
diff --git a/src/mame/machine/naomig1.c b/src/mame/machine/naomig1.c
index a60704274a6..0056ba06e44 100644
--- a/src/mame/machine/naomig1.c
+++ b/src/mame/machine/naomig1.c
@@ -25,7 +25,7 @@ ADDRESS_MAP_END
naomi_g1_device::naomi_g1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, name, tag, owner, clock),
- irq_cb(*this)
+ irq_cb(*this)
{
}
diff --git a/src/mame/machine/nmk112.c b/src/mame/machine/nmk112.c
index 8fb0a61e68e..5239c8987b2 100644
--- a/src/mame/machine/nmk112.c
+++ b/src/mame/machine/nmk112.c
@@ -30,7 +30,6 @@ nmk112_device::nmk112_device(const machine_config &mconfig, const char *tag, dev
void nmk112_device::device_config_complete()
{
-
}
//-------------------------------------------------
@@ -40,7 +39,7 @@ void nmk112_device::device_config_complete()
void nmk112_device::device_start()
{
const nmk112_interface *intf = (const nmk112_interface *)static_config();
-
+
if (intf->rgn0 == NULL)
{
m_rom0 = NULL;
diff --git a/src/mame/machine/nmk112.h b/src/mame/machine/nmk112.h
index ee19919c2ed..9660c196278 100644
--- a/src/mame/machine/nmk112.h
+++ b/src/mame/machine/nmk112.h
@@ -32,13 +32,13 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
private:
void do_bankswitch( int offset, int data );
void postload_bankswitch();
-
+
// internal state
-
+
/* which chips have their sample address table divided into pages */
UINT8 m_page_mask;
diff --git a/src/mame/machine/pgmprot5.c b/src/mame/machine/pgmprot5.c
index e008beb9cc9..db7aa4df1ae 100644
--- a/src/mame/machine/pgmprot5.c
+++ b/src/mame/machine/pgmprot5.c
@@ -44,62 +44,62 @@ void pgm_012_025_state::pgm_drgw2_decrypt()
// All tables all xored by 'warning' information at $1354ee (drgw2)
static const UINT8 drgw2_source_data[0x08][0xec] =
{
- { 0, }, // Region 0, not used
- { // Region 1, $13A886
- 0x67, 0x51, 0xF3, 0x19, 0xA0, 0x11, 0xB1, 0x11, 0xB0, 0xEE, 0xE3, 0xF6, 0xBE, 0x81, 0x35, 0xE3,
- 0xFB, 0xE6, 0xEF, 0xDF, 0x61, 0x01, 0xFA, 0x22, 0x5D, 0x43, 0x01, 0xA5, 0x3B, 0x17, 0xD4, 0x74,
- 0xF0, 0xF4, 0xF3, 0x43, 0xB5, 0x19, 0x04, 0xD5, 0x84, 0xCE, 0x87, 0xFE, 0x35, 0x3E, 0xC4, 0x3C,
- 0xC7, 0x85, 0x2A, 0x33, 0x00, 0x86, 0xD0, 0x4D, 0x65, 0x4B, 0xF9, 0xE9, 0xC0, 0xBA, 0xAA, 0x77,
- 0x9E, 0x66, 0xF6, 0x0F, 0x4F, 0x3A, 0xB6, 0xF1, 0x64, 0x9A, 0xE9, 0x25, 0x1A, 0x5F, 0x22, 0xA3,
- 0xA2, 0xBF, 0x4B, 0x77, 0x3F, 0x34, 0xC9, 0x6E, 0xDB, 0x12, 0x5C, 0x33, 0xA5, 0x8B, 0x6C, 0xB1,
- 0x74, 0xC8, 0x40, 0x4E, 0x2F, 0xE7, 0x46, 0xAE, 0x99, 0xFC, 0xB0, 0x55, 0x54, 0xDF, 0xA7, 0xA1,
- 0x0F, 0x5E, 0x49, 0xCF, 0x56, 0x3C, 0x90, 0x2B, 0xAC, 0x65, 0x6E, 0xDB, 0x58, 0x3E, 0xC9, 0x00,
- 0xAE, 0x53, 0x4D, 0x92, 0xFA, 0x40, 0xB2, 0x6B, 0x65, 0x4B, 0x90, 0x8A, 0x0C, 0xE2, 0xA5, 0x9A,
- 0xD0, 0x20, 0x29, 0x55, 0xA4, 0x44, 0xAC, 0x51, 0x87, 0x54, 0x53, 0x34, 0x24, 0x4B, 0x81, 0x67,
- 0x34, 0x4C, 0x5F, 0x31, 0x4E, 0xF2, 0xF1, 0x19, 0x18, 0x1C, 0x34, 0x38, 0xE1, 0x81, 0x17, 0xCF,
- 0x24, 0xB9, 0x9A, 0xCB, 0x34, 0x51, 0x50, 0x59, 0x44, 0xB1, 0x0B, 0x50, 0x95, 0x6C, 0x48, 0x7E,
- 0x14, 0xA4, 0xC6, 0xD9, 0xD3, 0xA5, 0xD6, 0xD0, 0xC5, 0x97, 0xF0, 0x45, 0xD0, 0x98, 0x51, 0x91,
- 0x9F, 0xA3, 0x43, 0x51, 0x05, 0x90, 0xEE, 0xCA, 0x7E, 0x5F, 0x72, 0x53, 0xB1, 0xD3, 0xAF, 0x36,
+ { 0, }, // Region 0, not used
+ { // Region 1, $13A886
+ 0x67, 0x51, 0xF3, 0x19, 0xA0, 0x11, 0xB1, 0x11, 0xB0, 0xEE, 0xE3, 0xF6, 0xBE, 0x81, 0x35, 0xE3,
+ 0xFB, 0xE6, 0xEF, 0xDF, 0x61, 0x01, 0xFA, 0x22, 0x5D, 0x43, 0x01, 0xA5, 0x3B, 0x17, 0xD4, 0x74,
+ 0xF0, 0xF4, 0xF3, 0x43, 0xB5, 0x19, 0x04, 0xD5, 0x84, 0xCE, 0x87, 0xFE, 0x35, 0x3E, 0xC4, 0x3C,
+ 0xC7, 0x85, 0x2A, 0x33, 0x00, 0x86, 0xD0, 0x4D, 0x65, 0x4B, 0xF9, 0xE9, 0xC0, 0xBA, 0xAA, 0x77,
+ 0x9E, 0x66, 0xF6, 0x0F, 0x4F, 0x3A, 0xB6, 0xF1, 0x64, 0x9A, 0xE9, 0x25, 0x1A, 0x5F, 0x22, 0xA3,
+ 0xA2, 0xBF, 0x4B, 0x77, 0x3F, 0x34, 0xC9, 0x6E, 0xDB, 0x12, 0x5C, 0x33, 0xA5, 0x8B, 0x6C, 0xB1,
+ 0x74, 0xC8, 0x40, 0x4E, 0x2F, 0xE7, 0x46, 0xAE, 0x99, 0xFC, 0xB0, 0x55, 0x54, 0xDF, 0xA7, 0xA1,
+ 0x0F, 0x5E, 0x49, 0xCF, 0x56, 0x3C, 0x90, 0x2B, 0xAC, 0x65, 0x6E, 0xDB, 0x58, 0x3E, 0xC9, 0x00,
+ 0xAE, 0x53, 0x4D, 0x92, 0xFA, 0x40, 0xB2, 0x6B, 0x65, 0x4B, 0x90, 0x8A, 0x0C, 0xE2, 0xA5, 0x9A,
+ 0xD0, 0x20, 0x29, 0x55, 0xA4, 0x44, 0xAC, 0x51, 0x87, 0x54, 0x53, 0x34, 0x24, 0x4B, 0x81, 0x67,
+ 0x34, 0x4C, 0x5F, 0x31, 0x4E, 0xF2, 0xF1, 0x19, 0x18, 0x1C, 0x34, 0x38, 0xE1, 0x81, 0x17, 0xCF,
+ 0x24, 0xB9, 0x9A, 0xCB, 0x34, 0x51, 0x50, 0x59, 0x44, 0xB1, 0x0B, 0x50, 0x95, 0x6C, 0x48, 0x7E,
+ 0x14, 0xA4, 0xC6, 0xD9, 0xD3, 0xA5, 0xD6, 0xD0, 0xC5, 0x97, 0xF0, 0x45, 0xD0, 0x98, 0x51, 0x91,
+ 0x9F, 0xA3, 0x43, 0x51, 0x05, 0x90, 0xEE, 0xCA, 0x7E, 0x5F, 0x72, 0x53, 0xB1, 0xD3, 0xAF, 0x36,
0x08, 0x75, 0xB0, 0x9B, 0xE0, 0x0D, 0x43, 0x88, 0xAA, 0x27, 0x44, 0x11
},
- { 0, }, // Region 2, not used
- { 0, }, // Region 3, not used
- { 0, }, // Region 4, not used
- { // Region 5, $13ab42 (drgw2c)
- 0x7F, 0x41, 0xF3, 0x39, 0xA0, 0x11, 0xA1, 0x11, 0xB0, 0xA2, 0x4C, 0x23, 0x13, 0xE9, 0x25, 0x3D,
- 0x0F, 0x72, 0x3A, 0x9D, 0xB5, 0x96, 0xD1, 0xDA, 0x07, 0x29, 0x41, 0x9A, 0xAD, 0x70, 0xBA, 0x46,
- 0x63, 0x2B, 0x7F, 0x3D, 0xBE, 0x40, 0xAD, 0xD4, 0x4C, 0x73, 0x27, 0x58, 0xA7, 0x65, 0xDC, 0xD6,
- 0xFD, 0xDE, 0xB5, 0x6E, 0xD6, 0x6C, 0x75, 0x1A, 0x32, 0x45, 0xD5, 0xE3, 0x6A, 0x14, 0x6D, 0x80,
- 0x84, 0x15, 0xAF, 0xCC, 0x7B, 0x61, 0x51, 0x82, 0x40, 0x53, 0x7F, 0x38, 0xA0, 0xD6, 0x8F, 0x61,
- 0x79, 0x19, 0xE5, 0x99, 0x84, 0xD8, 0x78, 0x27, 0x3F, 0x16, 0x97, 0x78, 0x4F, 0x7B, 0x0C, 0xA6,
- 0x37, 0xDB, 0xC6, 0x0C, 0x24, 0xB4, 0xC7, 0x94, 0x9D, 0x92, 0xD2, 0x3B, 0xD5, 0x11, 0x6F, 0x0A,
- 0xDB, 0x76, 0x66, 0xE7, 0xCD, 0x18, 0x2B, 0x66, 0xD8, 0x41, 0x40, 0x58, 0xA2, 0x01, 0x1E, 0x6D,
- 0x44, 0x75, 0xE7, 0x19, 0x4F, 0xB2, 0xE8, 0xC4, 0x96, 0x77, 0x62, 0x02, 0xC9, 0xDC, 0x59, 0xF3,
- 0x43, 0x8D, 0xC8, 0xFE, 0x9E, 0x2A, 0xBA, 0x32, 0x3B, 0x62, 0xE3, 0x92, 0x6E, 0xC2, 0x08, 0x4D,
- 0x51, 0xCD, 0xF9, 0x3A, 0x3E, 0xC9, 0x50, 0x27, 0x21, 0x25, 0x97, 0xD7, 0x0E, 0xF8, 0x39, 0x38,
- 0xF5, 0x86, 0x94, 0x93, 0xBF, 0xEB, 0x18, 0xA8, 0xFC, 0x24, 0xF5, 0xF9, 0x99, 0x20, 0x3D, 0xCD,
- 0x2C, 0x94, 0x25, 0x79, 0x28, 0x77, 0x8F, 0x2F, 0x10, 0x69, 0x86, 0x30, 0x43, 0x01, 0xD7, 0x9A,
- 0x17, 0xE3, 0x47, 0x37, 0xBD, 0x62, 0x75, 0x42, 0x78, 0xF4, 0x2B, 0x57, 0x4C, 0x0A, 0xDB, 0x53,
+ { 0, }, // Region 2, not used
+ { 0, }, // Region 3, not used
+ { 0, }, // Region 4, not used
+ { // Region 5, $13ab42 (drgw2c)
+ 0x7F, 0x41, 0xF3, 0x39, 0xA0, 0x11, 0xA1, 0x11, 0xB0, 0xA2, 0x4C, 0x23, 0x13, 0xE9, 0x25, 0x3D,
+ 0x0F, 0x72, 0x3A, 0x9D, 0xB5, 0x96, 0xD1, 0xDA, 0x07, 0x29, 0x41, 0x9A, 0xAD, 0x70, 0xBA, 0x46,
+ 0x63, 0x2B, 0x7F, 0x3D, 0xBE, 0x40, 0xAD, 0xD4, 0x4C, 0x73, 0x27, 0x58, 0xA7, 0x65, 0xDC, 0xD6,
+ 0xFD, 0xDE, 0xB5, 0x6E, 0xD6, 0x6C, 0x75, 0x1A, 0x32, 0x45, 0xD5, 0xE3, 0x6A, 0x14, 0x6D, 0x80,
+ 0x84, 0x15, 0xAF, 0xCC, 0x7B, 0x61, 0x51, 0x82, 0x40, 0x53, 0x7F, 0x38, 0xA0, 0xD6, 0x8F, 0x61,
+ 0x79, 0x19, 0xE5, 0x99, 0x84, 0xD8, 0x78, 0x27, 0x3F, 0x16, 0x97, 0x78, 0x4F, 0x7B, 0x0C, 0xA6,
+ 0x37, 0xDB, 0xC6, 0x0C, 0x24, 0xB4, 0xC7, 0x94, 0x9D, 0x92, 0xD2, 0x3B, 0xD5, 0x11, 0x6F, 0x0A,
+ 0xDB, 0x76, 0x66, 0xE7, 0xCD, 0x18, 0x2B, 0x66, 0xD8, 0x41, 0x40, 0x58, 0xA2, 0x01, 0x1E, 0x6D,
+ 0x44, 0x75, 0xE7, 0x19, 0x4F, 0xB2, 0xE8, 0xC4, 0x96, 0x77, 0x62, 0x02, 0xC9, 0xDC, 0x59, 0xF3,
+ 0x43, 0x8D, 0xC8, 0xFE, 0x9E, 0x2A, 0xBA, 0x32, 0x3B, 0x62, 0xE3, 0x92, 0x6E, 0xC2, 0x08, 0x4D,
+ 0x51, 0xCD, 0xF9, 0x3A, 0x3E, 0xC9, 0x50, 0x27, 0x21, 0x25, 0x97, 0xD7, 0x0E, 0xF8, 0x39, 0x38,
+ 0xF5, 0x86, 0x94, 0x93, 0xBF, 0xEB, 0x18, 0xA8, 0xFC, 0x24, 0xF5, 0xF9, 0x99, 0x20, 0x3D, 0xCD,
+ 0x2C, 0x94, 0x25, 0x79, 0x28, 0x77, 0x8F, 0x2F, 0x10, 0x69, 0x86, 0x30, 0x43, 0x01, 0xD7, 0x9A,
+ 0x17, 0xE3, 0x47, 0x37, 0xBD, 0x62, 0x75, 0x42, 0x78, 0xF4, 0x2B, 0x57, 0x4C, 0x0A, 0xDB, 0x53,
0x4D, 0xA1, 0x0A, 0xD6, 0x3A, 0x16, 0x15, 0xAA, 0x2C, 0x6C, 0x39, 0x42
},
- { // Region 6, $13ab42 (drgw2), $13ab2e (dw2v100x)
- 0x12, 0x09, 0xF3, 0x29, 0xA0, 0x11, 0xA0, 0x11, 0xB0, 0xD5, 0x66, 0xA1, 0x28, 0x4A, 0x21, 0xC0,
- 0xD3, 0x9B, 0x86, 0x80, 0x57, 0x6F, 0x41, 0xC2, 0xE4, 0x2F, 0x0B, 0x91, 0xBD, 0x3A, 0x7A, 0xBA,
- 0x00, 0xE5, 0x35, 0x02, 0x74, 0x7D, 0x8B, 0x21, 0x57, 0x10, 0x0F, 0xAE, 0x44, 0xBB, 0xE2, 0x37,
- 0x18, 0x7B, 0x52, 0x3D, 0x8C, 0x59, 0x9E, 0x20, 0x1F, 0x0A, 0xCC, 0x1C, 0x8E, 0x6A, 0xD7, 0x95,
- 0x2B, 0x34, 0xB0, 0x82, 0x6D, 0xFD, 0x25, 0x33, 0xAA, 0x3B, 0x2B, 0x70, 0x15, 0x87, 0x31, 0x5D,
- 0xBB, 0x29, 0x19, 0x95, 0xD5, 0x8E, 0x24, 0x28, 0x5E, 0xD0, 0x20, 0x83, 0x46, 0x4A, 0x21, 0x70,
- 0x5B, 0xCD, 0xAE, 0x7B, 0x61, 0xA1, 0xFA, 0xF4, 0x2B, 0x84, 0x15, 0x6E, 0x36, 0x5D, 0x1B, 0x24,
- 0x0F, 0x09, 0x3A, 0x61, 0x38, 0x0F, 0x18, 0x35, 0x11, 0x38, 0xB4, 0xBD, 0xEE, 0xF7, 0xEC, 0x0F,
- 0x1D, 0xB7, 0x48, 0x01, 0xAA, 0x09, 0x8F, 0x61, 0xB5, 0x0F, 0x1D, 0x26, 0x39, 0x2E, 0x8C, 0xD6,
- 0x26, 0x5C, 0x3D, 0x23, 0x63, 0xE9, 0x6B, 0x97, 0xB4, 0x9F, 0x7B, 0xB6, 0xBA, 0xA0, 0x7C, 0xC6,
- 0x25, 0xA1, 0x73, 0x36, 0x67, 0x7F, 0x74, 0x1E, 0x1D, 0xDA, 0x70, 0xBF, 0xA5, 0x63, 0x35, 0x39,
- 0x24, 0x8C, 0x9F, 0x85, 0x16, 0xD8, 0x50, 0x95, 0x71, 0xC0, 0xF6, 0x1E, 0x6D, 0x80, 0xED, 0x15,
- 0xEB, 0x63, 0xE9, 0x1B, 0xF6, 0x78, 0x31, 0xC6, 0x5C, 0xDD, 0x19, 0xBD, 0xDF, 0xA7, 0xEC, 0x50,
- 0x22, 0xAD, 0xBB, 0xF6, 0xEB, 0xD6, 0xA3, 0x20, 0xC9, 0xE6, 0x9F, 0xCB, 0xF2, 0x97, 0xB9, 0x54,
+ { // Region 6, $13ab42 (drgw2), $13ab2e (dw2v100x)
+ 0x12, 0x09, 0xF3, 0x29, 0xA0, 0x11, 0xA0, 0x11, 0xB0, 0xD5, 0x66, 0xA1, 0x28, 0x4A, 0x21, 0xC0,
+ 0xD3, 0x9B, 0x86, 0x80, 0x57, 0x6F, 0x41, 0xC2, 0xE4, 0x2F, 0x0B, 0x91, 0xBD, 0x3A, 0x7A, 0xBA,
+ 0x00, 0xE5, 0x35, 0x02, 0x74, 0x7D, 0x8B, 0x21, 0x57, 0x10, 0x0F, 0xAE, 0x44, 0xBB, 0xE2, 0x37,
+ 0x18, 0x7B, 0x52, 0x3D, 0x8C, 0x59, 0x9E, 0x20, 0x1F, 0x0A, 0xCC, 0x1C, 0x8E, 0x6A, 0xD7, 0x95,
+ 0x2B, 0x34, 0xB0, 0x82, 0x6D, 0xFD, 0x25, 0x33, 0xAA, 0x3B, 0x2B, 0x70, 0x15, 0x87, 0x31, 0x5D,
+ 0xBB, 0x29, 0x19, 0x95, 0xD5, 0x8E, 0x24, 0x28, 0x5E, 0xD0, 0x20, 0x83, 0x46, 0x4A, 0x21, 0x70,
+ 0x5B, 0xCD, 0xAE, 0x7B, 0x61, 0xA1, 0xFA, 0xF4, 0x2B, 0x84, 0x15, 0x6E, 0x36, 0x5D, 0x1B, 0x24,
+ 0x0F, 0x09, 0x3A, 0x61, 0x38, 0x0F, 0x18, 0x35, 0x11, 0x38, 0xB4, 0xBD, 0xEE, 0xF7, 0xEC, 0x0F,
+ 0x1D, 0xB7, 0x48, 0x01, 0xAA, 0x09, 0x8F, 0x61, 0xB5, 0x0F, 0x1D, 0x26, 0x39, 0x2E, 0x8C, 0xD6,
+ 0x26, 0x5C, 0x3D, 0x23, 0x63, 0xE9, 0x6B, 0x97, 0xB4, 0x9F, 0x7B, 0xB6, 0xBA, 0xA0, 0x7C, 0xC6,
+ 0x25, 0xA1, 0x73, 0x36, 0x67, 0x7F, 0x74, 0x1E, 0x1D, 0xDA, 0x70, 0xBF, 0xA5, 0x63, 0x35, 0x39,
+ 0x24, 0x8C, 0x9F, 0x85, 0x16, 0xD8, 0x50, 0x95, 0x71, 0xC0, 0xF6, 0x1E, 0x6D, 0x80, 0xED, 0x15,
+ 0xEB, 0x63, 0xE9, 0x1B, 0xF6, 0x78, 0x31, 0xC6, 0x5C, 0xDD, 0x19, 0xBD, 0xDF, 0xA7, 0xEC, 0x50,
+ 0x22, 0xAD, 0xBB, 0xF6, 0xEB, 0xD6, 0xA3, 0x20, 0xC9, 0xE6, 0x9F, 0xCB, 0xF2, 0x97, 0xB9, 0x54,
0x12, 0x66, 0xA6, 0xBE, 0x4A, 0x12, 0x43, 0xEC, 0x00, 0xEA, 0x49, 0x02
},
- { 0, } // Region 7, not used
+ { 0, } // Region 7, not used
};
void pgm_012_025_state::drgw2_protection_calculate_hold(int y, int z)
@@ -142,7 +142,7 @@ READ16_MEMBER(pgm_012_025_state::drgw2_d80000_protection_r )
{
switch (m_drgw2_cmd)
{
- case 0x05:
+ case 0x05:
{
switch (m_drgw2_ptr)
{
@@ -169,15 +169,15 @@ READ16_MEMBER(pgm_012_025_state::drgw2_d80000_protection_r )
drgw2_protection_calculate_hilo();
return 0;
- // case 0x13: // Read to $80eeb8
- // case 0x1f: // Read to $80eeb8
- // case 0xf4: // Read to $80eeb8
- // case 0xf6: // Read to $80eeb8
- // case 0xf8: // Read to $80eeb8
- // return 0;
-
- // default:
- // logerror("%06x: warning, reading with igs003_reg = %02x\n", space.device().safe_pc(), m_drgw2_cmd);
+ // case 0x13: // Read to $80eeb8
+ // case 0x1f: // Read to $80eeb8
+ // case 0xf4: // Read to $80eeb8
+ // case 0xf6: // Read to $80eeb8
+ // case 0xf8: // Read to $80eeb8
+ // return 0;
+
+ // default:
+ // logerror("%06x: warning, reading with igs003_reg = %02x\n", space.device().safe_pc(), m_drgw2_cmd);
}
return 0;
@@ -205,20 +205,20 @@ WRITE16_MEMBER(pgm_012_025_state::drgw2_d80000_protection_w )
drgw2_protection_calculate_hold(m_drgw2_cmd & 0x0f, data & 0xff);
break;
- // case 0x08: // Used only on init..
- // case 0x09:
- // case 0x0a:
- // case 0x0b:
- // case 0x0c:
- // break;
+ // case 0x08: // Used only on init..
+ // case 0x09:
+ // case 0x0a:
+ // case 0x0b:
+ // case 0x0c:
+ // break;
- // case 0x15: // ????
- // case 0x17:
- // case 0xf2:
- // break;
+ // case 0x15: // ????
+ // case 0x17:
+ // case 0xf2:
+ // break;
- // default:
- // logerror("%06x: warning, writing to igs003_reg %02x = %02x\n", space.device().safe_pc(), m_drgw2_cmd, data);
+ // default:
+ // logerror("%06x: warning, writing to igs003_reg %02x = %02x\n", space.device().safe_pc(), m_drgw2_cmd, data);
}
}
@@ -250,7 +250,7 @@ void pgm_012_025_state::drgw2_common_init()
static ADDRESS_MAP_START( drgw2_mem, AS_PROGRAM, 16, pgm_012_025_state )
AM_IMPORT_FROM(pgm_mem)
AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK("bank1") /* Game ROM */
- AM_RANGE(0xd00000, 0xd00fff) AM_NOP // Written, but never read back? Related to the protection device?
+ AM_RANGE(0xd00000, 0xd00fff) AM_NOP // Written, but never read back? Related to the protection device?
AM_RANGE(0xd80000, 0xd80003) AM_READWRITE(drgw2_d80000_protection_r, drgw2_d80000_protection_w)
ADDRESS_MAP_END
diff --git a/src/mame/machine/taitoio.c b/src/mame/machine/taitoio.c
index 57e17cf368d..703316db221 100644
--- a/src/mame/machine/taitoio.c
+++ b/src/mame/machine/taitoio.c
@@ -71,7 +71,7 @@ void tc0220ioc_device::device_config_complete()
const tc0220ioc_interface *intf = reinterpret_cast<const tc0220ioc_interface *>(static_config());
if (intf != NULL)
*static_cast<tc0220ioc_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -216,7 +216,7 @@ void tc0510nio_device::device_config_complete()
const tc0510nio_interface *intf = reinterpret_cast<const tc0510nio_interface *>(static_config());
if (intf != NULL)
*static_cast<tc0510nio_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -362,7 +362,7 @@ void tc0640fio_device::device_config_complete()
const tc0640fio_interface *intf = reinterpret_cast<const tc0640fio_interface *>(static_config());
if (intf != NULL)
*static_cast<tc0640fio_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
diff --git a/src/mame/machine/taitoio.h b/src/mame/machine/taitoio.h
index ebd794cbceb..42e65278151 100644
--- a/src/mame/machine/taitoio.h
+++ b/src/mame/machine/taitoio.h
@@ -48,14 +48,14 @@ class tc0220ioc_device : public device_t,
public:
tc0220ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~tc0220ioc_device() {}
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( port_r );
DECLARE_WRITE8_MEMBER( port_w );
DECLARE_READ8_MEMBER( portreg_r );
DECLARE_WRITE8_MEMBER( portreg_w );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -115,7 +115,7 @@ class tc0640fio_device : public device_t,
public:
tc0640fio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~tc0640fio_device() {}
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ16_MEMBER( halfword_r );
@@ -159,5 +159,5 @@ extern const device_type TC0640FIO;
MCFG_DEVICE_ADD(_tag, TC0640FIO, 0) \
MCFG_DEVICE_CONFIG(_interface)
-
+
#endif /* __TAITOIO_H__ */
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index b9dbb7e5304..292ff8adec8 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -173,7 +173,7 @@ swarm // hack
zerotime // hack
starfght // hack
galaxbsf // hack
-galaxianbl // bootleg
+galaxianbl // bootleg
kamakazi3 // Video Games (UK) Ltd., hack or bootleg?
tst_galx // Galaxian Test ROM
gmgalax // bootleg
@@ -186,7 +186,7 @@ gteikokb // bootleg
gteikob2 // bootleg
galemp // (c) Taito do Brasil
asideral // bootleg
-pajaroes // bootleg
+pajaroes // bootleg
spacbatt // bootleg
spacbat2 // bootleg
spacempr // bootleg
@@ -246,7 +246,7 @@ eagle2 // [1980] Centuri
eagle3 // [1980] Centuri
spctbird // (c) Fortrek
mooncptc // bootleg (Petaco S.A.)
-mooncrsl // bootleg (Laguna S.A.)
+mooncrsl // bootleg (Laguna S.A.)
fantastc // (c) Taito (Brazil) - rewrite of Galaga
timefgtr // (c) Taito (Brazil) - rewrite of Time Pilot
kong // (c) Taito (Brazil) - rewrite of Donkey Kong
@@ -300,11 +300,11 @@ scramblebf // bootleg
scramblebb // bootleg?
scramblb // bootleg
scramb2 // bootleg
-scrambler // bootleg
+scrambler // bootleg
explorer // bootleg
strfbomb // bootleg
-scrambp // bootleg (Billport S.A.)
-scrampt // bootleg (Petaco S.A.)
+scrambp // bootleg (Billport S.A.)
+scrampt // bootleg (Petaco S.A.)
atlantis // (c) 1981 Comsoft
atlantis2 // (c) 1981 Comsoft
theend // (c) 1980 Konami
@@ -412,7 +412,7 @@ cclimberj // (c) 1980 Nichibutsu
ccboot // bootleg
ccboot2 // bootleg
ccbootmr // Model Racing bootleg
-cclimbroper // Operamatic bootleg
+cclimbroper // Operamatic bootleg
ckong // (c) 1981 (Kyoei)
ckongo // bootleg (Orca)
ckongalc // bootleg (Alca)
@@ -680,7 +680,7 @@ vautourz // bootleg
griffon // bootleg (Videotron)
nextfase // bootleg
phoenixs // bootleg (Sonic)
-avefenix //
+avefenix //
pleiads // (c) 1981 Tehkan
pleiadsb2 // bootleg
pleiadbl // bootleg
@@ -1493,7 +1493,7 @@ yosakdona // (c) 1979 Yosaku To Donbei
spceking // (c) 1978 Leijac Corporation (Konami)
spcewars // (c) 1978 Sanritsu
astropal // (c) 19?? Sidam
-attackfc // (c) 1979? E.G.S.
+attackfc // (c) 1979? E.G.S.
cosmo // TDS & Mints
darthvdr // bootleg
ultrainv
@@ -2751,7 +2751,7 @@ startrkd // bootleg
mayday // bootleg
maydaya // bootleg
maydayb // bootleg
-batlzone // bootleg?
+batlzone // bootleg?
colony7 // (c) 1981 Taito
colony7a // (c) 1981 Taito
jin // Falcon bootleg/hack
@@ -4086,7 +4086,7 @@ brdrline // (c) 1980 Sega
starrkr // (c) 1981 Sega
brdrlins // Sidam bootleg
brdrlinb // Karateco bootleg
-brdrlinet // (c) 1981 Sega
+brdrlinet // (c) 1981 Sega
digger // 684-691 no copyright notice
pulsar // 790-805 (c) 1981 Sega
heiankyo // (c) [1979?] Denki Onkyo
@@ -5463,7 +5463,7 @@ csweetht // 19 Sweet Heart
ctornado // 20 1982.05 Tornado
cmissnx // 21 1982.04 Mission-X/Zoar
cptennis // 22 1982.06 Pro Tennis
-cprogolf18 // 23 1982.?? 18 Hole Pro Golf
+cprogolf18 // 23 1982.?? 18 Hole Pro Golf
// 24 1982.07 Tsumego Kaisyou
cadanglr // 25 1982.10 Angler Dangler
cfishing // 25 1982.10 Fishing
@@ -6575,7 +6575,7 @@ asteroid // 035127-035145 (c) 1979
asteroid2 // 035127-035145 (c) 1979
asteroid1 // 035127-035145 no copyright notice
asteroidb // (bootleg)
-aerolitos // Rodmar Elec. bootleg
+aerolitos // Rodmar Elec. bootleg
asterock // Sidam bootleg (c) 1979
asterockv // Videotron bootleg(c) 1979
hyperspc // Rumiano bootleg (c) 1979
@@ -6994,7 +6994,7 @@ sasuke // [1980] Shin Nihon Kikaku (SNK)
satansat // (c) 1981 SNK
satansata // (c) 1981 SNK
zarzon // (c) 1981 Taito, gameplay says SNK
-satansatind // bootleg
+satansatind // bootleg
vanguard // (c) 1981 SNK
vanguardc // (c) 1981 SNK + Centuri
vanguardj // (c) 1981 SNK
@@ -7430,7 +7430,7 @@ timesold1 // Alpha-68K96II 'BT' (c) 1987
btlfield // Alpha-68K96II 'BT' (c) 1987
btlfieldb // bootleg
skysoldr // Alpha-68K96II 'SS' (c) 1988 SNK (Romstar with dip switch)
-skysoldrbl // bootleg
+skysoldrbl // bootleg
goldmedl // Alpha-68K96II 'GM' (c) 1988 SNK
goldmedla // Alpha-68K96II 'GM' (c) 1988 SNK
goldmedlb // Alpha-68K96II bootleg
@@ -7455,7 +7455,7 @@ tagteam // TA-0007 (c) 1983 + Data East license
ssozumo // TA-0008 (c) 1984
mystston // TA-0010 (c) 1984
myststono // TA-0010 (c) 1984
-myststonoi // PCB manufactured by Itisa
+myststonoi // PCB manufactured by Itisa
dogfgt // TA-0011 (c) 1984
dogfgtu // TA-0011 (c) 1985 Data East USA, Inc.
dogfgtj // TA-0011 (c) 1984
@@ -8899,7 +8899,7 @@ mrflea // (c) 1982
// Tecfri games
ambush // (c) 1983
-ambushh // (c) 1983
+ambushh // (c) 1983
ambushj // (c) 1983 Nippon Amuse license
ambushv // (c) 1983 Volt Electronics license
holeland // (c) 1984
@@ -8907,7 +8907,7 @@ crzrally // (c) 1985
crzrallya // (c) 1985
crzrallyg // (c) 1985
speedbal // (c) 1987
-musicbal // (c) 1987
+musicbal // (c) 1987
sauro // (c) 1987
saurop // (c) 1987
trckydoc // (c) 1987
@@ -30632,5 +30632,3 @@ bingomana
number1 // 1996 San Remo Games
gluck2 // 1992 Yung Yu / CYE
-
-
diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c
index 158913ca85b..cce45d9bbf4 100644
--- a/src/mame/video/kan_pand.c
+++ b/src/mame/video/kan_pand.c
@@ -69,7 +69,7 @@ void kaneko_pandora_device::device_config_complete()
const kaneko_pandora_interface *intf = reinterpret_cast<const kaneko_pandora_interface *>(static_config());
if (intf != NULL)
*static_cast<kaneko_pandora_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -305,4 +305,4 @@ READ16_MEMBER( kaneko_pandora_device::spriteram_LSB_r )
}
return m_spriteram[offset] | (m_spriteram[offset] << 8);
-} \ No newline at end of file
+}
diff --git a/src/mame/video/kan_pand.h b/src/mame/video/kan_pand.h
index c0ec7a5c524..47bdcdad785 100644
--- a/src/mame/video/kan_pand.h
+++ b/src/mame/video/kan_pand.h
@@ -29,29 +29,29 @@ public:
~kaneko_pandora_device() {}
DECLARE_WRITE8_MEMBER ( spriteram_w );
- DECLARE_READ8_MEMBER( spriteram_r );
+ DECLARE_READ8_MEMBER( spriteram_r );
DECLARE_WRITE16_MEMBER( spriteram_LSB_w );
DECLARE_READ16_MEMBER( spriteram_LSB_r );
void update( bitmap_ind16 &bitmap, const rectangle &cliprect );
void set_clear_bitmap( int clear );
void eof();
void set_bg_pen( int pen );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
void draw( bitmap_ind16 &bitmap, const rectangle &cliprect );
private:
// internal state
- screen_device *m_screen;
- UINT8 * m_spriteram;
- bitmap_ind16 *m_sprites_bitmap; /* bitmap to render sprites to, Pandora seems to be frame'buffered' */
- int m_clear_bitmap;
- int m_bg_pen; // might work some other way..
+ screen_device *m_screen;
+ UINT8 * m_spriteram;
+ bitmap_ind16 *m_sprites_bitmap; /* bitmap to render sprites to, Pandora seems to be frame'buffered' */
+ int m_clear_bitmap;
+ int m_bg_pen; // might work some other way..
};
extern const device_type KANEKO_PANDORA;
diff --git a/src/mame/video/powervr2.c b/src/mame/video/powervr2.c
index 5e997c8cea8..a8f3a9f9ef5 100644
--- a/src/mame/video/powervr2.c
+++ b/src/mame/video/powervr2.c
@@ -1665,15 +1665,15 @@ void powervr2_device::render_hline(bitmap_rgb32 &bitmap, texinfo *ti, int y, flo
}
void powervr2_device::render_span(bitmap_rgb32 &bitmap, texinfo *ti,
- float y0, float y1,
- float xl, float xr,
- float ul, float ur,
- float vl, float vr,
- float wl, float wr,
- float dxldy, float dxrdy,
- float duldy, float durdy,
- float dvldy, float dvrdy,
- float dwldy, float dwrdy)
+ float y0, float y1,
+ float xl, float xr,
+ float ul, float ur,
+ float vl, float vr,
+ float wl, float wr,
+ float dxldy, float dxrdy,
+ float duldy, float durdy,
+ float dvldy, float dvrdy,
+ float dwldy, float dwrdy)
{
float dy;
int yy0, yy1;
@@ -2404,7 +2404,7 @@ TIMER_CALLBACK_MEMBER(powervr2_device::endofrender_video)
}
TIMER_CALLBACK_MEMBER(powervr2_device::endofrender_tsp)
-{
+{
irq_cb(EOR_TSP_IRQ); // TSP end of render
endofrender_timer_tsp->adjust(attotime::never);
@@ -2624,7 +2624,7 @@ void powervr2_device::pvr_dma_execute(address_space &space)
powervr2_device::powervr2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, POWERVR2, "PowerVR 2", tag, owner, clock),
- irq_cb(*this)
+ irq_cb(*this)
{
}
diff --git a/src/mame/video/powervr2.h b/src/mame/video/powervr2.h
index 1b1070ecd7a..e6d001c62aa 100644
--- a/src/mame/video/powervr2.h
+++ b/src/mame/video/powervr2.h
@@ -1,7 +1,7 @@
#ifndef __POWERVR2_H__
#define __POWERVR2_H__
-#define MCFG_POWERVR2_ADD(_tag, _irq_cb) \
+#define MCFG_POWERVR2_ADD(_tag, _irq_cb) \
MCFG_DEVICE_ADD(_tag, POWERVR2, 0) \
downcast<powervr2_device *>(device)->set_irq_cb(DEVCB2_ ## _irq_cb);
@@ -107,7 +107,7 @@ public:
UINT64 *dc_texture_ram;
UINT64 *dc_framebuffer_ram;
-
+
UINT64 *pvr2_texture_ram;
UINT64 *pvr2_framebuffer_ram;
UINT64 *elan_ram;
@@ -277,15 +277,15 @@ private:
void render_hline(bitmap_rgb32 &bitmap, texinfo *ti, int y, float xl, float xr, float ul, float ur, float vl, float vr, float wl, float wr);
void render_span(bitmap_rgb32 &bitmap, texinfo *ti,
- float y0, float y1,
- float xl, float xr,
- float ul, float ur,
- float vl, float vr,
- float wl, float wr,
- float dxldy, float dxrdy,
- float duldy, float durdy,
- float dvldy, float dvrdy,
- float dwldy, float dwrdy);
+ float y0, float y1,
+ float xl, float xr,
+ float ul, float ur,
+ float vl, float vr,
+ float wl, float wr,
+ float dxldy, float dxrdy,
+ float duldy, float durdy,
+ float dvldy, float dvrdy,
+ float dwldy, float dwrdy);
void sort_vertices(const vert *v, int *i0, int *i1, int *i2);
void render_tri_sorted(bitmap_rgb32 &bitmap, texinfo *ti, const vert *v0, const vert *v1, const vert *v2);
void render_tri(bitmap_rgb32 &bitmap, texinfo *ti, const vert *v);
@@ -296,7 +296,7 @@ private:
static UINT32 dilate1(UINT32 value,int bits);
void computedilated();
void pvr_build_parameterconfig();
- void process_ta_fifo();
+ void process_ta_fifo();
void debug_paletteram();
};
diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c
index 36146d59c0d..64f6eef7072 100644
--- a/src/mame/video/seibuspi.c
+++ b/src/mame/video/seibuspi.c
@@ -1,7 +1,7 @@
/***************************************************************************
Seibu SPI hardware
-
+
Functions to emulate the video hardware
***************************************************************************/
diff --git a/src/mess/audio/dave.c b/src/mess/audio/dave.c
index f2462a8171c..ed1da446e6c 100644
--- a/src/mess/audio/dave.c
+++ b/src/mess/audio/dave.c
@@ -55,13 +55,13 @@ ADDRESS_MAP_END
dave_device::dave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, DAVE, "DAVE", tag, owner, clock, "dave", __FILE__),
- device_memory_interface(mconfig, *this),
- device_sound_interface(mconfig, *this),
- m_program_space_config("program", ENDIANNESS_LITTLE, 8, 22, 0, *ADDRESS_MAP_NAME(program_map)),
- m_io_space_config("i/o", ENDIANNESS_LITTLE, 8, 16, 0, *ADDRESS_MAP_NAME(io_map)),
- m_write_irq(*this),
- m_write_lh(*this),
- m_write_rh(*this)
+ device_memory_interface(mconfig, *this),
+ device_sound_interface(mconfig, *this),
+ m_program_space_config("program", ENDIANNESS_LITTLE, 8, 22, 0, *ADDRESS_MAP_NAME(program_map)),
+ m_io_space_config("i/o", ENDIANNESS_LITTLE, 8, 16, 0, *ADDRESS_MAP_NAME(io_map)),
+ m_write_irq(*this),
+ m_write_lh(*this),
+ m_write_rh(*this)
{
}
@@ -80,7 +80,7 @@ void dave_device::device_start()
// allocate timers
m_timer_1hz = timer_alloc(TIMER_1HZ);
m_timer_1hz->adjust(attotime::from_hz(2), 0, attotime::from_hz(2));
-
+
m_timer_50hz = timer_alloc(TIMER_50HZ);
m_timer_50hz->adjust(attotime::from_hz(2000), 0, attotime::from_hz(2000));
@@ -101,10 +101,10 @@ void dave_device::device_start()
m_count[i] = (STEP * machine().sample_rate()) / 125000;
m_level[i] = 0;
}
-
+
/* dave has 3 tone channels and 1 noise channel.
the volumes are mixed internally and output as left and right volume */
-
+
/* 3 tone channels + 1 noise channel */
m_sound_stream_var = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate(), this);
}
@@ -186,20 +186,20 @@ void dave_device::sound_stream_update(sound_stream &stream, stream_sample_t **in
int output_volumes[8];
int left_volume;
int right_volume;
-
+
//logerror("sound update!\n");
-
+
buffer1 = outputs[0];
buffer2 = outputs[1];
-
+
while (samples)
{
int vol[4];
-
+
/* vol[] keeps track of how long each square wave stays */
/* in the 1 position during the sample period. */
vol[0] = vol[1] = vol[2] = vol[3] = 0;
-
+
for (int i = 0; i < 3; i++)
{
if ((m_regs[7] & (1 << i))==0)
@@ -230,9 +230,9 @@ void dave_device::sound_stream_update(sound_stream &stream, stream_sample_t **in
vol[i] -= m_count[i];
}
}
-
+
/* update volume outputs */
-
+
/* setup output volumes for each channel */
/* channel 0 */
output_volumes[0] = ((m_level[0] & m_level_and[0]) | m_level_or[0]) & m_mame_volumes[0];
@@ -246,13 +246,13 @@ void dave_device::sound_stream_update(sound_stream &stream, stream_sample_t **in
/* channel 3 */
output_volumes[6] = ((m_level[3] & m_level_and[6]) | m_level_or[6]) & m_mame_volumes[3];
output_volumes[7] = ((m_level[3] & m_level_and[7]) | m_level_or[7]) & m_mame_volumes[7];
-
+
left_volume = (output_volumes[0] + output_volumes[2] + output_volumes[4] + output_volumes[6])>>2;
right_volume = (output_volumes[1] + output_volumes[3] + output_volumes[5] + output_volumes[7])>>2;
-
+
*(buffer1++) = left_volume;
*(buffer2++) = right_volume;
-
+
samples--;
}
}
@@ -600,7 +600,7 @@ WRITE8_MEMBER( dave_device::io_w )
//-------------------------------------------------
-// update_interrupt -
+// update_interrupt -
//-------------------------------------------------
void dave_device::update_interrupt()
diff --git a/src/mess/audio/dave.h b/src/mess/audio/dave.h
index a4bcdd79a10..78be61b75ff 100644
--- a/src/mess/audio/dave.h
+++ b/src/mess/audio/dave.h
@@ -27,12 +27,12 @@
///*************************************************************************
#define MCFG_DAVE_ADD(_tag, _clock, _irq, _program_map, _io_map) \
- MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") \
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") \
MCFG_SOUND_ADD(_tag, DAVE, _clock) \
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) \
MCFG_SOUND_ROUTE(1, "rspeaker", 0.25) \
- MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, _program_map) \
- MCFG_DEVICE_ADDRESS_MAP(AS_IO, _io_map) \
+ MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, _program_map) \
+ MCFG_DEVICE_ADDRESS_MAP(AS_IO, _io_map) \
downcast<dave_device *>(device)->set_irq_callback(DEVCB2_##_irq);
@@ -89,14 +89,14 @@ private:
enum
{
- IRQ_50HZ_DIVIDER = 0x01,
- IRQ_50HZ_LATCH = 0x02,
- IRQ_1HZ_DIVIDER = 0x04,
- IRQ_1HZ_LATCH = 0x08,
- IRQ_INT1 = 0x10,
- IRQ_INT1_LATCH = 0x20,
- IRQ_INT2 = 0x40,
- IRQ_INT2_LATCH = 0x80,
+ IRQ_50HZ_DIVIDER = 0x01,
+ IRQ_50HZ_LATCH = 0x02,
+ IRQ_1HZ_DIVIDER = 0x04,
+ IRQ_1HZ_LATCH = 0x08,
+ IRQ_INT1 = 0x10,
+ IRQ_INT1_LATCH = 0x20,
+ IRQ_INT2 = 0x40,
+ IRQ_INT2_LATCH = 0x80,
IRQ_LATCH = IRQ_INT2_LATCH | IRQ_INT1_LATCH | IRQ_1HZ_LATCH | IRQ_50HZ_LATCH
};
@@ -122,7 +122,7 @@ private:
int m_period[4];
int m_count[4];
int m_level[4];
-
+
/* these are used to force channels on/off */
/* if one of the or values is 0x0ff, this means
the volume will be forced on,else it is dependant on
@@ -131,13 +131,13 @@ private:
/* if one of the values is 0x00, this means the
volume is forced off, else it is dependant on the wave */
int m_level_and[8];
-
+
/* these are the current channel volumes in MAME form */
int m_mame_volumes[8];
-
+
/* update step */
//int m_update_step;
-
+
sound_stream *m_sound_stream_var;
};
diff --git a/src/mess/audio/mac.c b/src/mess/audio/mac.c
index be71718116d..82b064eacc3 100644
--- a/src/mess/audio/mac.c
+++ b/src/mess/audio/mac.c
@@ -82,20 +82,20 @@ void mac_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
{
INT16 last_val = 0;
stream_sample_t *buffer = outputs[0];
-
+
if ((m_mac_model == MODEL_MAC_PORTABLE) || (m_mac_model == MODEL_MAC_PB100))
{
memset(buffer, 0, samples * sizeof(*buffer));
return;
}
-
+
/* if we're not enabled, just fill with 0 */
if (machine().sample_rate() == 0)
{
memset(buffer, 0, samples * sizeof(*buffer));
return;
}
-
+
/* fill in the sample */
while (samples && m_snd_cache_len)
{
@@ -105,7 +105,7 @@ void mac_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
m_snd_cache_len--;
samples--;
}
-
+
while (samples--)
{
/* should never happen */
diff --git a/src/mess/audio/mea8000.c b/src/mess/audio/mea8000.c
index 677c62970d9..65482e5c252 100644
--- a/src/mess/audio/mea8000.c
+++ b/src/mess/audio/mea8000.c
@@ -130,7 +130,7 @@ void mea8000_device::device_config_complete()
const mea8000_interface *intf = reinterpret_cast<const mea8000_interface *>(static_config());
if (intf != NULL)
*static_cast<mea8000_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -146,9 +146,9 @@ void mea8000_device::device_start()
m_req_out.resolve(m_req_out_cb, *this);
m_dac = machine().device<dac_device>(m_channel);
-
+
init_tables();
-
+
m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mea8000_device::timer_expire),this));
save_item(NAME(m_state));
@@ -176,7 +176,7 @@ void mea8000_device::device_start()
save_item(NAME(m_last_pitch));
save_item(NAME(m_pitch));
save_item(NAME(m_noise));
-}
+}
//-------------------------------------------------
// device_reset - device-specific reset
@@ -210,7 +210,6 @@ int mea8000_device::accept_byte()
void mea8000_device::update_req()
{
-
// actually, req pulses less than 3us for each new byte,
// it goes back up if there space left in the buffer, or stays low if the
// buffer contains a complete frame and the CPU nees to wait for the next
@@ -557,7 +556,7 @@ WRITE8_MEMBER( mea8000_device::write )
else
{
/* enqueue frame byte */
- LOG(("$%04x %f: mea8000_w data %02X in frame pos %i\n", machine().firstcpu->pcbase(), machine().time().as_double(),
+ LOG(("$%04x %f: mea8000_w data %02X in frame pos %i\n", machine().firstcpu->pcbase(), machine().time().as_double(),
data, m_bufpos));
m_buf[m_bufpos] = data;
m_bufpos++;
diff --git a/src/mess/audio/mea8000.h b/src/mess/audio/mea8000.h
index 52b36ebab18..c8e5d3ae316 100644
--- a/src/mess/audio/mea8000.h
+++ b/src/mess/audio/mea8000.h
@@ -52,7 +52,7 @@ struct mea8000_interface
{
/* output channel */
const char * m_channel;
-
+
/* 1-bit 'ready' output, not negated */
devcb_write8 m_req_out_cb;
};
@@ -105,37 +105,37 @@ private:
/* state */
mea8000_state m_state; /* current state */
-
+
UINT8 m_buf[4]; /* store 4 consecutive data to form a frame info */
UINT8 m_bufpos; /* new byte to write in frame info buffer */
-
+
UINT8 m_cont; /* if no data 0=stop 1=repeat last frame */
UINT8 m_roe; /* enable req output, now unimplemented */
-
+
UINT16 m_framelength; /* in samples */
UINT16 m_framepos; /* in samples */
UINT16 m_framelog; /* log2 of framelength */
-
+
INT16 m_lastsample, m_sample; /* output samples are interpolated */
-
+
UINT32 m_phi; /* absolute phase for frequency / noise generator */
-
+
filter_t m_f[4]; /* filters */
-
+
UINT16 m_last_ampl, m_ampl; /* amplitude * 1000 */
UINT16 m_last_pitch, m_pitch; /* pitch of sawtooth signal, in Hz */
UINT8 m_noise;
-
+
emu_timer *m_timer;
-
+
devcb_resolved_write8 m_req_out;
-
+
int m_cos_table[TABLE_LEN]; /* fm => cos coefficient */
int m_exp_table[TABLE_LEN]; /* bw => exp coefficient */
int m_exp2_table[TABLE_LEN]; /* bw => 2*exp coefficient */
int m_noise_table[NOISE_LEN];
-
+
};
extern const device_type MEA8000;
diff --git a/src/mess/audio/upd1771.c b/src/mess/audio/upd1771.c
index 601e8b78f6f..ad07d815a98 100644
--- a/src/mess/audio/upd1771.c
+++ b/src/mess/audio/upd1771.c
@@ -240,7 +240,7 @@ void upd1771c_device::device_config_complete()
const upd1771_interface *intf = reinterpret_cast<const upd1771_interface *>(static_config());
if (intf != NULL)
*static_cast<upd1771_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -256,11 +256,11 @@ void upd1771c_device::device_start()
{
/* resolve callbacks */
m_ack_out_func.resolve(m_ack_callback, *this);
-
+
m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(upd1771c_device::ack_callback),this));
-
+
m_channel = machine().sound().stream_alloc(*this, 0, 1, clock() / 4, this);
-
+
save_item(NAME(m_packet));
save_item(NAME(m_index));
save_item(NAME(m_expected_bytes));
@@ -385,32 +385,32 @@ WRITE8_MEMBER( upd1771c_device::write )
m_index = 0;
//logerror( "upd1771_w: ----------------silence state reset\n");
break;
-
+
case 1:
if (m_index == 10)
{
m_state = STATE_NOISE;
m_index = 0;
-
+
m_nw_timbre = (m_packet[1] & 0xe0) >> 5;
m_nw_period = ((UINT32)m_packet[2] + 1) << 7;
m_nw_volume = m_packet[3] & 0x1f;
-
+
//very long clocked periods.. used for engine drones
m_n_period[0] = (((UINT32)m_packet[4]) + 1) << 7;
m_n_period[1] = (((UINT32)m_packet[5]) + 1) << 7;
m_n_period[2] = (((UINT32)m_packet[6]) + 1) << 7;
-
+
m_n_volume[0] = m_packet[7] & 0x1f;
m_n_volume[1] = m_packet[8] & 0x1f;
m_n_volume[2] = m_packet[9] & 0x1f;
-
+
//logerror( "upd1771_w: ----------------noise state reset\n");
}
else
m_timer->adjust(attotime::from_ticks(512, clock()));
break;
-
+
case 2:
if (m_index == 4)
{
@@ -421,18 +421,18 @@ WRITE8_MEMBER( upd1771c_device::write )
//smaller periods dont all equal to 0x20
if (m_t_period < 0x20)
m_t_period = 0x20;
-
+
m_t_volume = m_packet[3] & 0x1f;
m_state = STATE_TONE;
m_index = 0;
}
else
- m_timer->adjust(attotime::from_ticks(512, clock()));
+ m_timer->adjust(attotime::from_ticks(512, clock()));
break;
case 0x1f:
//6Khz(ish) DIGI playback
-
+
//end capture
if (m_index >= 2 && m_packet[m_index - 2] == 0xfe && m_packet[m_index - 1] == 0x00)
{
@@ -481,37 +481,37 @@ TIMER_CALLBACK_MEMBER( upd1771c_device::ack_callback )
void upd1771c_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
stream_sample_t *buffer = outputs[0];
-
+
switch (m_state)
{
case STATE_TONE:
//logerror( "upd1771_STATE_TONE samps:%d %d %d %d %d %d\n",(int)samples,
// (int)m_t_timbre,(int)m_t_offset,(int)m_t_volume,(int)m_t_period,(int)m_t_tpos);
-
+
while (--samples >= 0)
{
*buffer++ = (WAVEFORMS[m_t_timbre][m_t_tpos]) * m_t_volume * 2;
-
+
m_t_ppos++;
if (m_t_ppos >= m_t_period)
{
m_t_tpos++;
if (m_t_tpos == 32)
m_t_tpos = m_t_offset;
-
+
m_t_ppos = 0;
}
}
break;
-
+
case STATE_NOISE:
while (--samples >= 0)
{
*buffer = 0;
-
+
//"wavetable-LFSR" component
int wlfsr_val = ((int)noise_tbl[m_nw_tpos]) - 127;//data too wide
-
+
m_nw_ppos++;
if (m_nw_ppos >= m_nw_period)
{
@@ -520,7 +520,7 @@ void upd1771c_device::sound_stream_update(sound_stream &stream, stream_sample_t
m_nw_tpos = 0;
m_nw_ppos = 0;
}
-
+
//mix in each of the noise's 3 pulse components
char res[3];
for (int i = 0; i < 3; ++i)
@@ -535,16 +535,16 @@ void upd1771c_device::sound_stream_update(sound_stream &stream, stream_sample_t
}
//not quite, but close.
*buffer+= (
- (wlfsr_val * m_nw_volume) |
- (res[0] * m_n_volume[0]) |
- (res[1] * m_n_volume[1]) |
- (res[2] * m_n_volume[2])
- ) ;
-
+ (wlfsr_val * m_nw_volume) |
+ (res[0] * m_n_volume[0]) |
+ (res[1] * m_n_volume[1]) |
+ (res[2] * m_n_volume[2])
+ ) ;
+
buffer++;
}
break;
-
+
default:
//fill buffer with silence
while (--samples >= 0)
diff --git a/src/mess/audio/upd1771.h b/src/mess/audio/upd1771.h
index a798bcd9550..f8c50a7996c 100644
--- a/src/mess/audio/upd1771.h
+++ b/src/mess/audio/upd1771.h
@@ -36,7 +36,7 @@ public:
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
WRITE_LINE_MEMBER( pcm_write );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -57,10 +57,10 @@ private:
UINT8 m_packet[MAX_PACKET_SIZE];
UINT32 m_index;
UINT8 m_expected_bytes;
-
+
UINT8 m_state;//0:silence, 1 noise, 2 tone
UINT8 m_pc3;
-
+
//tone
UINT8 m_t_timbre; //[0; 7]
UINT8 m_t_offset; //[0; 32]
@@ -68,14 +68,14 @@ private:
UINT8 m_t_volume; //[0; 31]
UINT8 m_t_tpos;//timbre pos
UINT16 m_t_ppos;//period pos
-
+
//noise wavetable LFSR
UINT8 m_nw_timbre; //[0; 7]
UINT8 m_nw_volume; //[0; 31]
UINT32 m_nw_period;
UINT32 m_nw_tpos; //timbre pos
UINT32 m_nw_ppos; //period pos
-
+
//noise pulse components
UINT8 m_n_value[3]; //[0;1]
UINT16 m_n_volume[3]; //[0; 31]
diff --git a/src/mess/drivers/a7000.c b/src/mess/drivers/a7000.c
index a45cada5a40..bf559cb09c8 100644
--- a/src/mess/drivers/a7000.c
+++ b/src/mess/drivers/a7000.c
@@ -5,8 +5,8 @@
very preliminary driver by Angelo Salese,
based on work by Tomasz Slanina and Tom Walker
- TODO:
- - probably needs a full rewrite & merge with ssfindo.c
+ TODO:
+ - probably needs a full rewrite & merge with ssfindo.c
???
bp (0382827C) (second trigger)
diff --git a/src/mess/drivers/abc80.c b/src/mess/drivers/abc80.c
index 9c71b12c979..fdc8b56cf81 100644
--- a/src/mess/drivers/abc80.c
+++ b/src/mess/drivers/abc80.c
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( abc80 )
PORT_DIPUNKNOWN_DIPLOC( 0x20, IP_ACTIVE_LOW, "SW1:6" )
PORT_DIPUNKNOWN_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW1:7" )
PORT_DIPUNKNOWN_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW1:8" )
-
+
PORT_START("SW2")
PORT_DIPUNKNOWN_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:1" )
PORT_DIPUNKNOWN_DIPLOC( 0x02, IP_ACTIVE_LOW, "SW2:2" )
diff --git a/src/mess/drivers/altos5.c b/src/mess/drivers/altos5.c
index 3456234bbe5..13931f021e1 100644
--- a/src/mess/drivers/altos5.c
+++ b/src/mess/drivers/altos5.c
@@ -129,7 +129,7 @@ UINT8 altos5_state::convert(offs_t offset, bool state)
// normalise bank number (4x becomes 0x; 2x and 1x are already ok)
return data & 0x3f;
}
-
+
void altos5_state::setup_banks(UINT8 source)
{
offs_t offs,temp;
@@ -248,7 +248,7 @@ static Z80DMA_INTERFACE( dma_intf )
{
DEVCB_DRIVER_LINE_MEMBER(altos5_state, busreq_w),
DEVCB_CPU_INPUT_LINE("maincpu", INPUT_LINE_IRQ0),
- DEVCB_NULL, // BAO, not used
+ DEVCB_NULL, // BAO, not used
DEVCB_DRIVER_MEMBER(altos5_state, memory_read_byte),
DEVCB_DRIVER_MEMBER(altos5_state, memory_write_byte),
DEVCB_DRIVER_MEMBER(altos5_state, io_read_byte),
@@ -300,7 +300,7 @@ static Z80PIO_INTERFACE( pio0_intf )
d0: L = a HD is present
d1: L = a 2nd hard drive is present
d2: unused configuration input (must be H to skip HD boot)
-d3: selected floppy is single(L) or double sided(H)
+d3: selected floppy is single(L) or double sided(H)
d7: IRQ from FDC
*/
READ8_MEMBER( altos5_state::port08_r )
diff --git a/src/mess/drivers/applix.c b/src/mess/drivers/applix.c
index c030c0fe314..c14a0c6bd58 100644
--- a/src/mess/drivers/applix.c
+++ b/src/mess/drivers/applix.c
@@ -954,7 +954,6 @@ ROM_END
DRIVER_INIT_MEMBER(applix_state, applix)
{
-
floppy_connector *con = machine().device<floppy_connector>("wd1772:0");
floppy_image_device *floppy = con ? con->get_device() : 0;
if (floppy)
diff --git a/src/mess/drivers/argo.c b/src/mess/drivers/argo.c
index ca1b4788b78..80b99fe84da 100644
--- a/src/mess/drivers/argo.c
+++ b/src/mess/drivers/argo.c
@@ -35,8 +35,8 @@ public:
argo_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_p_videoram(*this, "p_videoram"){ }
+ m_maincpu(*this, "maincpu"),
+ m_p_videoram(*this, "p_videoram"){ }
required_device<cpu_device> m_maincpu;
DECLARE_WRITE8_MEMBER(argo_videoram_w);
diff --git a/src/mess/drivers/attache.c b/src/mess/drivers/attache.c
index 19971f91708..d8333a77d41 100644
--- a/src/mess/drivers/attache.c
+++ b/src/mess/drivers/attache.c
@@ -68,42 +68,42 @@ class attache_state : public driver_device
public:
attache_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this,"maincpu"),
- m_rom(*this,"boot"),
- m_ram(*this,RAM_TAG),
- m_char_rom(*this,"video"),
- m_rtc(*this,"rtc"),
- m_psg(*this,"psg"),
- m_fdc(*this,"fdc"),
- m_sio(*this,"sio"),
- m_pio(*this,"pio"),
- m_ctc(*this,"ctc"),
- m_crtc(*this,"crtc"),
- m_dma(*this, "dma"),
- m_floppy0(*this, "fdc:0:525dd"),
- m_floppy1(*this, "fdc:1:525dd"),
- m_kb_row0(*this, "row0"),
- m_kb_row1(*this, "row1"),
- m_kb_row2(*this, "row2"),
- m_kb_row3(*this, "row3"),
- m_kb_row4(*this, "row4"),
- m_kb_row5(*this, "row5"),
- m_kb_row6(*this, "row6"),
- m_kb_row7(*this, "row7"),
- m_kb_mod(*this, "modifiers"),
- m_membank1(*this, "bank1"),
- m_membank2(*this, "bank2"),
- m_membank3(*this, "bank3"),
- m_membank4(*this, "bank4"),
- m_membank5(*this, "bank5"),
- m_membank6(*this, "bank6"),
- m_membank7(*this, "bank7"),
- m_membank8(*this, "bank8"),
- m_nvram(*this, "nvram"),
- m_rom_active(true),
- m_gfx_enabled(false),
- m_kb_clock(true),
- m_kb_empty(true)
+ m_maincpu(*this,"maincpu"),
+ m_rom(*this,"boot"),
+ m_ram(*this,RAM_TAG),
+ m_char_rom(*this,"video"),
+ m_rtc(*this,"rtc"),
+ m_psg(*this,"psg"),
+ m_fdc(*this,"fdc"),
+ m_sio(*this,"sio"),
+ m_pio(*this,"pio"),
+ m_ctc(*this,"ctc"),
+ m_crtc(*this,"crtc"),
+ m_dma(*this, "dma"),
+ m_floppy0(*this, "fdc:0:525dd"),
+ m_floppy1(*this, "fdc:1:525dd"),
+ m_kb_row0(*this, "row0"),
+ m_kb_row1(*this, "row1"),
+ m_kb_row2(*this, "row2"),
+ m_kb_row3(*this, "row3"),
+ m_kb_row4(*this, "row4"),
+ m_kb_row5(*this, "row5"),
+ m_kb_row6(*this, "row6"),
+ m_kb_row7(*this, "row7"),
+ m_kb_mod(*this, "modifiers"),
+ m_membank1(*this, "bank1"),
+ m_membank2(*this, "bank2"),
+ m_membank3(*this, "bank3"),
+ m_membank4(*this, "bank4"),
+ m_membank5(*this, "bank5"),
+ m_membank6(*this, "bank6"),
+ m_membank7(*this, "bank7"),
+ m_membank8(*this, "bank8"),
+ m_nvram(*this, "nvram"),
+ m_rom_active(true),
+ m_gfx_enabled(false),
+ m_kb_clock(true),
+ m_kb_empty(true)
{ }
// PIO port B operation select
@@ -235,7 +235,7 @@ UINT32 attache_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
{
UINT8 x,y,bit,scan,data;
UINT8 dbl_mode = 0; // detemines which half of character to display when using double size attribute,
- // as it can start on either odd or even character cells.
+ // as it can start on either odd or even character cells.
// Graphics output (if enabled)
if(m_gfx_enabled)
@@ -542,31 +542,31 @@ void attache_state::operation_strobe(address_space& space, UINT8 data)
WRITE8_MEMBER(attache_state::pio_portA_w)
{
- // AO-7 = LATCH DATA OUT:
- // LO = MOTOR ON
- // L1 = GRAPHICS ENABLE
- // L2 = /EPROM ENABLE
- // L3-7 = DISPLAY BRIGHTNESS
- // AO-7 = 8910 DATA I/O:
- // AO-3 = 5832 DO-3 I/O
- // A4-7 = 5832 AO-3 OUT
- // AO-3 = 5101 DO-3 I/O
- // A4-7 = 5101 AO-3 OUT
+ // AO-7 = LATCH DATA OUT:
+ // LO = MOTOR ON
+ // L1 = GRAPHICS ENABLE
+ // L2 = /EPROM ENABLE
+ // L3-7 = DISPLAY BRIGHTNESS
+ // AO-7 = 8910 DATA I/O:
+ // AO-3 = 5832 DO-3 I/O
+ // A4-7 = 5832 AO-3 OUT
+ // AO-3 = 5101 DO-3 I/O
+ // A4-7 = 5101 AO-3 OUT
m_pio_porta = data;
}
WRITE8_MEMBER(attache_state::pio_portB_w)
{
- // BO-1 = 5101 A4-5
- // B2-4 = OPERATION SELECT
- // 0 = 8910 ADDR LOAD
- // 1 = 8910 DATA LOAD
- // 2 = 5832 WRITE
- // 3 = 5832 READ
- // 4 = 5101 WRITE
- // 5 = 5101 READ
- // 6 = LATCH LOAD
- // 7 = NO-OP
+ // BO-1 = 5101 A4-5
+ // B2-4 = OPERATION SELECT
+ // 0 = 8910 ADDR LOAD
+ // 1 = 8910 DATA LOAD
+ // 2 = 5832 WRITE
+ // 3 = 5832 READ
+ // 4 = 5101 WRITE
+ // 5 = 5101 READ
+ // 6 = LATCH LOAD
+ // 7 = NO-OP
//B5 = /'138 OPERATION STROBE
//B6 = /KEYBOARD DATA IN
//B7 = /KEYBOARD CLOCK OUT
@@ -646,8 +646,8 @@ WRITE8_MEMBER(attache_state::display_data_w)
case DISP_CHAR:
m_char_ram[(m_char_line*128)+(param & 0x7f)] = data;
break;
-// default:
-// logerror("Unimplemented display operation %02x data %02x param %02x\n",m_current_cmd,data,param);
+// default:
+// logerror("Unimplemented display operation %02x data %02x param %02x\n",m_current_cmd,data,param);
}
}
@@ -756,7 +756,6 @@ WRITE_LINE_MEMBER(attache_state::eop_w)
WRITE_LINE_MEMBER( attache_state::fdc_dack_w )
{
-
}
static ADDRESS_MAP_START( attache_map , AS_PROGRAM, 8, attache_state)
@@ -1040,7 +1039,7 @@ static MACHINE_CONFIG_START( attache, attache_state )
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64k")
-
+
MCFG_SOFTWARE_LIST_ADD("disk_list","attache")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c
index 4727a19f165..3d0f47d6cf8 100644
--- a/src/mess/drivers/bml3.c
+++ b/src/mess/drivers/bml3.c
@@ -806,49 +806,49 @@ static WRITE_LINE_DEVICE_HANDLER( bml3_fdc_intrq_w )
TIMER_DEVICE_CALLBACK_MEMBER(bml3_state::keyboard_callback)
{
static const char *const portnames[3] = { "key1","key2","key3" };
- int i,port_i,scancode,trigger = 0;
-
- if(!m_keyb_press_flag)
- {
- m_keyb_scancode = (m_keyb_scancode + 1) & 0x7F;
- scancode = m_keyb_scancode;
-
- if (scancode == 0x7F)
- {
- if (m_keyb_empty_scan == 1)
- {
- // full scan completed with no keypress
- m_keyb_press = 0;
- if (!m_keyb_counter_operation_disabled)
- trigger = !0;
- }
- if (m_keyb_empty_scan > 0)
- m_keyb_empty_scan--;
- }
- else if (scancode < 32*3)
- {
- port_i = scancode / 32;
- i = scancode % 32;
+ int i,port_i,scancode,trigger = 0;
+
+ if(!m_keyb_press_flag)
+ {
+ m_keyb_scancode = (m_keyb_scancode + 1) & 0x7F;
+ scancode = m_keyb_scancode;
+
+ if (scancode == 0x7F)
+ {
+ if (m_keyb_empty_scan == 1)
+ {
+ // full scan completed with no keypress
+ m_keyb_press = 0;
+ if (!m_keyb_counter_operation_disabled)
+ trigger = !0;
+ }
+ if (m_keyb_empty_scan > 0)
+ m_keyb_empty_scan--;
+ }
+ else if (scancode < 32*3)
+ {
+ port_i = scancode / 32;
+ i = scancode % 32;
if((ioport(portnames[port_i])->read()>>i) & 1)
{
- m_keyb_empty_scan = 2;
- trigger = !0;
- }
- }
- if (trigger)
- {
- m_keyb_press_flag = 1;
- m_keyb_press = m_keyb_scancode | 0x80;
- if (!m_keyb_interrupt_disabled)
+ m_keyb_empty_scan = 2;
+ trigger = !0;
+ }
+ }
+ if (trigger)
+ {
+ m_keyb_press_flag = 1;
+ m_keyb_press = m_keyb_scancode | 0x80;
+ if (!m_keyb_interrupt_disabled)
m_maincpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE);
- }
- /*
- else {
- // #$# ? don't need this
- m_maincpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE);
- }
- */
- }
+ }
+ /*
+ else {
+ // #$# ? don't need this
+ m_maincpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE);
+ }
+ */
+ }
}
@@ -1167,10 +1167,10 @@ static MACHINE_CONFIG_START( bml3, bml3_state )
MCFG_PIA6821_ADD("pia6821", bml3_pia_config)
MCFG_ACIA6850_ADD("acia6850", bml3_acia_if)
- /* floppy */
+ /* floppy */
// #$# not sure what wd17xx model, this is just a guess
- MCFG_WD1773_ADD("fdc", bml3_wd17xx_interface )
- MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(bml3_floppy_interface)
+ MCFG_WD1773_ADD("fdc", bml3_wd17xx_interface )
+ MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(bml3_floppy_interface)
/* Audio */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/chessmst.c b/src/mess/drivers/chessmst.c
index 8825d6cb446..f8685f3a0a9 100644
--- a/src/mess/drivers/chessmst.c
+++ b/src/mess/drivers/chessmst.c
@@ -23,7 +23,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_speaker(*this, "speaker")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
diff --git a/src/mess/drivers/concept.c b/src/mess/drivers/concept.c
index 7e714dc44b9..71402ad765a 100644
--- a/src/mess/drivers/concept.c
+++ b/src/mess/drivers/concept.c
@@ -237,8 +237,8 @@ static MACHINE_CONFIG_START( concept, concept_state )
MCFG_MOS6551_ADD(ACIA_1_TAG, XTAL_1_8432MHz, NULL)
MCFG_CONCEPT_EXP_PORT_ADD("exp1", concept_exp_devices, NULL)
- MCFG_CONCEPT_EXP_PORT_ADD("exp2", concept_exp_devices, "fdc") // Flat cable Hard Disk Controller in Slot 2
- MCFG_CONCEPT_EXP_PORT_ADD("exp3", concept_exp_devices, "hdc") // Floppy Disk Controller in Slot 3
+ MCFG_CONCEPT_EXP_PORT_ADD("exp2", concept_exp_devices, "fdc") // Flat cable Hard Disk Controller in Slot 2
+ MCFG_CONCEPT_EXP_PORT_ADD("exp3", concept_exp_devices, "hdc") // Floppy Disk Controller in Slot 3
MCFG_CONCEPT_EXP_PORT_ADD("exp4", concept_exp_devices, NULL)
// 2x RS232 ports!
@@ -249,21 +249,21 @@ ROM_START( concept )
ROM_REGION16_BE(0x100000,"maincpu",0) /* 68k rom and ram */
// concept boot ROM
- ROM_SYSTEM_BIOS(0, "lvl8", "Level 8" ) // v0?
+ ROM_SYSTEM_BIOS(0, "lvl8", "Level 8" ) // v0?
ROMX_LOAD("bootl08h", 0x010000, 0x1000, CRC(ee479f51) SHA1(b20ba18564672196076e46507020c6d69a640a2f), ROM_BIOS(1) | ROM_SKIP(1))
ROMX_LOAD("bootl08l", 0x010001, 0x1000, CRC(acaefd07) SHA1(de0c7eaacaf4c0652aa45e523cebce2b2993c437), ROM_BIOS(1) | ROM_SKIP(1))
- ROM_SYSTEM_BIOS(1, "lvl7", "Level 7" ) // v0? v1?
+ ROM_SYSTEM_BIOS(1, "lvl7", "Level 7" ) // v0? v1?
ROMX_LOAD("cc07h", 0x010000, 0x1000, CRC(455abac8) SHA1(b12e1580220242d34eafed1b486cebd89e823c8b), ROM_BIOS(2) | ROM_SKIP(1))
ROMX_LOAD("cc07l", 0x010001, 0x1000, CRC(107a3830) SHA1(0ea12ef13b0d11fcd83b306b3a1bb8014ba910c0), ROM_BIOS(2) | ROM_SKIP(1))
- ROM_SYSTEM_BIOS(2, "lvl6", "Level 6" ) // v0?
+ ROM_SYSTEM_BIOS(2, "lvl6", "Level 6" ) // v0?
ROMX_LOAD("cc06h", 0x010000, 0x1000, CRC(66b6b259) SHA1(1199a38ef3e94f695e8da6a7c80c6432da3cb80c), ROM_BIOS(3) | ROM_SKIP(1))
ROMX_LOAD("cc06l", 0x010001, 0x1000, CRC(600940d3) SHA1(c3278bf23b3b1c35ea1e3da48a05e877862a8345), ROM_BIOS(3) | ROM_SKIP(1))
#if 0
// version 1 lvl 7 release
- ROM_LOAD16_BYTE("bootl17h", 0x010000, 0x1000, CRC(6dd9718f)) // where does this come from?
+ ROM_LOAD16_BYTE("bootl17h", 0x010000, 0x1000, CRC(6dd9718f)) // where does this come from?
ROM_LOAD16_BYTE("bootl17l", 0x010001, 0x1000, CRC(107a3830))
#elif 0
// version $F lvl 8 (development version found on a floppy disk along with
diff --git a/src/mess/drivers/cortex.c b/src/mess/drivers/cortex.c
index bbcf3d8e54b..c35520fd656 100644
--- a/src/mess/drivers/cortex.c
+++ b/src/mess/drivers/cortex.c
@@ -16,7 +16,7 @@
TMS9929 - Video
TMS9911 - DMA to floppy
TMS9909 - Floppy Disk Controller
- AY-5-2376 - Keyboard controller
+ AY-5-2376 - Keyboard controller
****************************************************************************/
diff --git a/src/mess/drivers/ep64.c b/src/mess/drivers/ep64.c
index 75931e757fd..6191ad097e9 100644
--- a/src/mess/drivers/ep64.c
+++ b/src/mess/drivers/ep64.c
@@ -13,12 +13,12 @@ Enterprise Sixty Four / Enterprise One Two Eight
Enterprise Computers Ltd. 1985
MAIN PCB Layout
----------------
+---------------
DUAL
|-----------| 9V TAPE_IN/OUT RES
-|HEATSINK | DC_IN MON1 AND REMOTE SR1 PR1 CN2A CN1A |-|
+|HEATSINK | DC_IN MON1 AND REMOTE SR1 PR1 CN2A CN1A |-|
| |--||---|--||--|--| |--| |-||-||-||-||-| |----| |-----| |--| |--| |-|-|------|
-|-----------|7805 | MOD | |-| |-| |-| |-| |-| |-| |-| EXP2 --|EXTERNAL
+|-----------|7805 | MOD | |-| |-| |-| |-| |-| |-| |-| EXP2 --|EXTERNAL
|---+7805 | | 74LS06 74LS273 74LS86 74LS32 --|EXPANSION
| | |------| 74LS244 --|CONNECTOR
| |78L12 POT1 LM386 |-----| |-----| EXP1 --|
@@ -27,7 +27,7 @@ MAIN PCB Layout
| | 4.433619MHz 74LS145 POT3 LED |-----| |-----| --|
|---+ --|
| 74LS74 74LS244 74LS244 74LS245 |---------|
- | |
+ | |
| 74LS373 4164 4164 74F157 |
| |
| 16-2-103 LM339 LM324 4164 4164 74F157 EXOS.IC2 |
@@ -38,8 +38,8 @@ MAIN PCB Layout
|------------------------------------------------------------------|
Notes: (all IC's shown)
Z80A - Z80A CPU, clock input 4MHz [8/2]
- EXOS.IC2 - 32k x8-bit mask ROM usually 23256 manufactured by GI (DIP24). Contains EXOS operating
- system and built-in word processor software. A few official revisions were made and
+ EXOS.IC2 - 32k x8-bit mask ROM usually 23256 manufactured by GI (DIP24). Contains EXOS operating
+ system and built-in word processor software. A few official revisions were made and
there were a few unofficial revision made with additional capabilities and bug-fixes
ROM labelling of some official versions found....
9256DS-0019 (C)1984 INTELLIGENT SOFTWARE LTD ENTER 08-45-A GI
@@ -77,7 +77,7 @@ Notes: (all IC's shown)
MOD - Astec UM1233 TV modulator
RES - Reset push button switch
MON1 - Monitor output connector. Pinout is....
-
+
Green A1 B1 NC
Ground A2 B2 Ground
Mono Comp. Video A3 B3 Blue
@@ -85,16 +85,16 @@ Notes: (all IC's shown)
VSync A5 B5 Composite Sync
NC A6 B6 Mode Switch
Left Audio A7 B7 Right Audio
-
+
SR1 - Serial/Network connector. Pinout is....
-
+
Reference A1 B1 Ground
- A2 B2 -
RTS A3 B3 Data Out
CTS A4 B4 Data In
PR1 - Printer connector. Pinout is....
-
+
Ground A1 B1 Ground
Strobe A2 B2 Ready
Data 3 A3 B3 Data 4
@@ -104,9 +104,9 @@ Notes: (all IC's shown)
Data 0 A7 B7 Data 7
CN2A - Joystick 2 connector
- CN1A - Joystick 1 connector
+ CN1A - Joystick 1 connector
Pinout is....
-
+
Keyboard J A1 B1 Ground
Keyboard L A2 B2 Keyboard K
- A3 B3 -
@@ -116,7 +116,7 @@ Notes: (all IC's shown)
Internal Memory Expansion PCB Layout
-------------------------------------
+------------------------------------
|---------------------|
| 4164 74LS00 PL3 PL2|
@@ -138,15 +138,15 @@ Notes: (All IC's shown)
/*
- TODO:
+ TODO:
- - POST RAM errors
- - rewrite DAVE to output to discrete DAC
- - rewrite NICK
- - cassette
- - external joysticks
+ - POST RAM errors
+ - rewrite DAVE to output to discrete DAC
+ - rewrite NICK
+ - cassette
+ - external joysticks
- http://ep.homeserver.hu/Dokumentacio/Konyvek/
+ http://ep.homeserver.hu/Dokumentacio/Konyvek/
*/
@@ -191,9 +191,9 @@ READ8_MEMBER( ep64_state::rd0_r )
WRITE8_MEMBER( ep64_state::wr0_w )
{
/*
-
+
bit description
-
+
0 KEY A
1 KEY B
2 KEY C
@@ -202,7 +202,7 @@ WRITE8_MEMBER( ep64_state::wr0_w )
5 CASSETTE OUT
6 REMOTE 1
7 REMOTE 2
-
+
*/
// keyboard
@@ -228,9 +228,9 @@ WRITE8_MEMBER( ep64_state::wr0_w )
READ8_MEMBER( ep64_state::rd1_r )
{
/*
-
+
bit description
-
+
0 KBJ
1 KBK
2 KBL
@@ -239,7 +239,7 @@ READ8_MEMBER( ep64_state::rd1_r )
5 SERIAL/NET STATUS IN
6 CASSETTE IN
7 ?
-
+
*/
UINT8 data = 0;
@@ -265,18 +265,18 @@ READ8_MEMBER( ep64_state::rd1_r )
WRITE8_MEMBER( ep64_state::wr2_w )
{
/*
-
+
bit description
-
+
0 SERIAL/NET DATA OUT
1 SERIAL/NET STATUS OUT
- 2
- 3
- 4
- 5
- 6
- 7
-
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+
*/
// serial
@@ -596,7 +596,7 @@ ROM_START( ep64 )
ROM_CART_LOAD( "cart", 0x00000, 0x10000, ROM_MIRROR )
ROM_END
-#define rom_phc64 rom_ep64
+#define rom_phc64 rom_ep64
//-------------------------------------------------
diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c
index 19730b8e153..17a5012f2a4 100644
--- a/src/mess/drivers/gba.c
+++ b/src/mess/drivers/gba.c
@@ -1920,7 +1920,7 @@ static ADDRESS_MAP_START( gba_map, AS_PROGRAM, 32, gba_state )
AM_RANGE(0x05000000, 0x050003ff) AM_RAM_WRITE(gba_pram_w) AM_SHARE("gba_pram") // Palette RAM
AM_RANGE(0x06000000, 0x06017fff) AM_RAM_WRITE(gba_vram_w) AM_SHARE("gba_vram") // VRAM
AM_RANGE(0x07000000, 0x070003ff) AM_RAM_WRITE(gba_oam_w) AM_SHARE("gba_oam") // OAM
- //AM_RANGE(0x08000000, 0x0cffffff) // cart ROM + mirrors, mapped here at machine_start if a cart is present
+ //AM_RANGE(0x08000000, 0x0cffffff) // cart ROM + mirrors, mapped here at machine_start if a cart is present
AM_RANGE(0x10000000, 0xffffffff) AM_READ(gba_10000000_r) // for "Justice League Chronicles" (game bug)
ADDRESS_MAP_END
@@ -2117,7 +2117,7 @@ void gba_state::machine_start()
/* and an IRQ handling timer */
m_irq_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gba_state::handle_irq),this));
m_irq_timer->adjust(attotime::never);
-
+
// install the cart ROM into the address map, if present
m_cartslot->install_rom();
@@ -2144,7 +2144,7 @@ void gba_state::machine_start()
m_maincpu->space(AS_PROGRAM).install_read_handler(0xe000000, 0xe01ffff, read32_delegate(FUNC(gba_cart_slot_device::read_ram),(gba_cart_slot_device*)m_cartslot));
m_maincpu->space(AS_PROGRAM).install_write_handler(0xe000000, 0xe01ffff, write32_delegate(FUNC(gba_cart_slot_device::write_ram),(gba_cart_slot_device*)m_cartslot));
}
-
+
save_item(NAME(m_DISPSTAT));
save_item(NAME(m_BG2X));
save_item(NAME(m_BG2Y));
@@ -2241,9 +2241,9 @@ static SLOT_INTERFACE_START(gba_cart)
SLOT_INTERFACE_INTERNAL("gba_eeprom", GBA_ROM_EEPROM)
SLOT_INTERFACE_INTERNAL("gba_eeprom_4k", GBA_ROM_EEPROM)
SLOT_INTERFACE_INTERNAL("gba_eeprom_64k", GBA_ROM_EEPROM64)
- SLOT_INTERFACE_INTERNAL("gba_flash", GBA_ROM_FLASH) // Panasonic
- SLOT_INTERFACE_INTERNAL("gba_flash_512", GBA_ROM_FLASH) // Panasonic
- SLOT_INTERFACE_INTERNAL("gba_flash_1m", GBA_ROM_FLASH1M) // Sanyo
+ SLOT_INTERFACE_INTERNAL("gba_flash", GBA_ROM_FLASH) // Panasonic
+ SLOT_INTERFACE_INTERNAL("gba_flash_512", GBA_ROM_FLASH) // Panasonic
+ SLOT_INTERFACE_INTERNAL("gba_flash_1m", GBA_ROM_FLASH1M) // Sanyo
SLOT_INTERFACE_END
diff --git a/src/mess/drivers/hx20.c b/src/mess/drivers/hx20.c
index 68338634fd5..7a5b15fdefc 100644
--- a/src/mess/drivers/hx20.c
+++ b/src/mess/drivers/hx20.c
@@ -8,19 +8,19 @@
/*
- TODO:
-
- - m6800.c rewrite
- - keyboard interrupt
- - LCD controller
- - serial
- - SW6 read
- - RS-232
- - microcassette
- - printer
- - ROM cartridge
- - floppy TF-20
- - barcode reader
+ TODO:
+
+ - m6800.c rewrite
+ - keyboard interrupt
+ - LCD controller
+ - serial
+ - SW6 read
+ - RS-232
+ - microcassette
+ - printer
+ - ROM cartridge
+ - floppy TF-20
+ - barcode reader
*/
@@ -84,18 +84,18 @@ READ8_MEMBER( hx20_state::krtn07_r )
READ8_MEMBER( hx20_state::krtn89_r )
{
/*
-
+
bit description
-
+
0 KRTN8
1 KRTN9
- 2
- 3
- 4
- 5
+ 2
+ 3
+ 4
+ 5
6 _PWSW
7 _BUSY
-
+
*/
UINT8 data = 0xff;
@@ -120,9 +120,9 @@ READ8_MEMBER( hx20_state::krtn89_r )
WRITE8_MEMBER( hx20_state::lcd_cs_w )
{
/*
-
+
bit description
-
+
0 LCD CS bit 0
1 LCD CS bit 1
2 LCD CS bit 2
@@ -131,7 +131,7 @@ WRITE8_MEMBER( hx20_state::lcd_cs_w )
5 SERIAL POUT
6 MO1
7 MO2
-
+
*/
logerror("LCD CS %02x\n", data);
@@ -153,7 +153,7 @@ WRITE8_MEMBER( hx20_state::lcd_cs_w )
case 5: m_lcdc4->cs_w(0); break;
case 6: m_lcdc5->cs_w(0); break;
}
-
+
int cd = BIT(data, 3);
m_lcdc0->cd_w(cd);
@@ -187,18 +187,18 @@ WRITE8_MEMBER( hx20_state::lcd_data_w )
READ8_MEMBER( hx20_state::main_p1_r )
{
/*
-
+
bit description
-
+
0 RS-232 DSR
1 RS-232 CTS
- 2
+ 2
3 _INT EX
4 _PWA
5 _K.B REQUEST
6 SERIAL PIN
7 CARTRIDGE MI1 (0=ROM, 1=microcassette)
-
+
*/
UINT8 data = 0x98;
@@ -224,18 +224,18 @@ READ8_MEMBER( hx20_state::main_p1_r )
WRITE8_MEMBER( hx20_state::main_p1_w )
{
/*
-
+
bit description
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
-
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+
*/
}
@@ -247,25 +247,25 @@ WRITE8_MEMBER( hx20_state::main_p1_w )
READ8_MEMBER( hx20_state::main_p2_r )
{
/*
-
+
bit description
-
+
0 bar code reader data
- 1
+ 1
2 SLAVE P34
3 RX
- 4
- 5
- 6
- 7
-
+ 4
+ 5
+ 6
+ 7
+
*/
-
+
UINT8 data = M6801_MODE_4;
// serial
data &= ~(!m_slave_flag << 2);
-
+
if (m_slave_sio)
data |= m_slave_rx << 3;
else
@@ -282,18 +282,18 @@ READ8_MEMBER( hx20_state::main_p2_r )
WRITE8_MEMBER( hx20_state::main_p2_w )
{
/*
-
+
bit description
-
- 0
+
+ 0
1 RS-232 TXD
2 serial select (0=peripheral, 1=slave 6301)
- 3
+ 3
4 TX
- 5
- 6
- 7
-
+ 5
+ 6
+ 7
+
*/
// RS-232
@@ -316,18 +316,18 @@ WRITE8_MEMBER( hx20_state::main_p2_w )
READ8_MEMBER( hx20_state::slave_p1_r )
{
/*
-
+
bit description
-
- 0
- 1
- 2
- 3
- 4
- 5
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
6 printer reset pulse
7 printer timing pulse
-
+
*/
UINT8 data = 0;
@@ -343,18 +343,18 @@ READ8_MEMBER( hx20_state::slave_p1_r )
WRITE8_MEMBER( hx20_state::slave_p1_w )
{
/*
-
+
bit description
-
+
0 printer head 1 (1=on)
1 printer head 2
2 printer head 3
3 printer head 4
4 printer motor (0=on)
5 speaker (1=on)
- 6
- 7
-
+ 6
+ 7
+
*/
// speaker
@@ -369,20 +369,20 @@ WRITE8_MEMBER( hx20_state::slave_p1_w )
READ8_MEMBER( hx20_state::slave_p2_r )
{
/*
-
+
bit description
-
+
0 RS-232 RXD / microcassette (0=read, 1=write)
- 1
- 2
+ 1
+ 2
3 TX
- 4
- 5
- 6
- 7
-
+ 4
+ 5
+ 6
+ 7
+
*/
-
+
UINT8 data = M6801_MODE_7;
// serial
@@ -399,18 +399,18 @@ READ8_MEMBER( hx20_state::slave_p2_r )
WRITE8_MEMBER( hx20_state::slave_p2_w )
{
/*
-
+
bit description
-
- 0
+
+ 0
1 microcassette internal clock, write data
2 serial select (0=brake, 1=normal)
- 3
+ 3
4 RX
- 5
- 6
- 7
-
+ 5
+ 6
+ 7
+
*/
// serial
@@ -425,18 +425,18 @@ WRITE8_MEMBER( hx20_state::slave_p2_w )
READ8_MEMBER( hx20_state::slave_p3_r )
{
/*
-
+
bit description
-
- 0
- 1
+
+ 0
+ 1
2 external cassette read data
- 3
- 4
- 5
- 6
- 7
-
+ 3
+ 4
+ 5
+ 6
+ 7
+
*/
UINT8 data = 0;
@@ -452,18 +452,18 @@ READ8_MEMBER( hx20_state::slave_p3_r )
WRITE8_MEMBER( hx20_state::slave_p3_w )
{
/*
-
+
bit description
-
+
0 external cassette remote (0=on)
1 RS-232 RTS
- 2
+ 2
3 external cassette write data
4 slave status flag
5 bar code power (1=on)
6 RS-232 power (1=on)
7 program power (1=on)
-
+
*/
// RS-232
@@ -481,20 +481,20 @@ WRITE8_MEMBER( hx20_state::slave_p3_w )
READ8_MEMBER( hx20_state::slave_p4_r )
{
/*
-
+
bit description
-
+
0 PLUG 2
- 1
- 2
- 3
- 4
- 5
- 6
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
7 RS-232 CD
-
+
*/
-
+
UINT8 data = 0;
// RS-232
@@ -511,18 +511,18 @@ READ8_MEMBER( hx20_state::slave_p4_r )
WRITE8_MEMBER( hx20_state::slave_p4_w )
{
/*
-
+
bit description
-
- 0
+
+ 0
1 port enable always on / printer motor control (0=open, 1=brake)
2 clear shift register / microcassette power switch (1=on)
3 ROM cartridge power switch (1=on) / microcassette command
4 ROM address counter clear / clock
5 cassette/RS-232 select (0=RS-232, 1=microcassette)
6 ROM cartridge select / microcassette clock (0=counter, 1=head switch)
- 7
-
+ 7
+
*/
}
@@ -598,7 +598,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hx20 )
PORT_START("KSC0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('_')
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('\"')
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
@@ -871,7 +871,7 @@ static MACHINE_CONFIG_START( hx20, hx20_state )
MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL)
MCFG_CASSETTE_ADD(CASSETTE_TAG, default_cassette_interface)
MCFG_EPSON_SIO_ADD("sio", "tf20")
-
+
// internal ram
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("16K")
diff --git a/src/mess/drivers/intv.c b/src/mess/drivers/intv.c
index 0919ea1a2c7..87118cfed93 100644
--- a/src/mess/drivers/intv.c
+++ b/src/mess/drivers/intv.c
@@ -94,8 +94,8 @@ void intv_state::palette_init()
for (int i = 0; i < 16; i++)
{
- r = intv_colors[i * 3 + 0];
- g = intv_colors[i * 3 + 1];
+ r = intv_colors[i * 3 + 0];
+ g = intv_colors[i * 3 + 1];
b = intv_colors[i * 3 + 2];
colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b));
colortable_palette_set_color(machine().colortable, i + 16, MAKE_RGB(r, g, b));
diff --git a/src/mess/drivers/juicebox.c b/src/mess/drivers/juicebox.c
index a6c476d8f29..135f0117f82 100644
--- a/src/mess/drivers/juicebox.c
+++ b/src/mess/drivers/juicebox.c
@@ -258,7 +258,7 @@ void juicebox_state::machine_start()
address_space &space = m_maincpu->space(AS_PROGRAM);
smc_init();
-
+
space.install_readwrite_handler(0x01c00000, 0x01c0000b, 0, 0, read32_delegate(FUNC(s3c44b0_device::cpuwrap_r), &(*m_s3c44b0)), write32_delegate(FUNC(s3c44b0_device::cpuwrap_w), &(*m_s3c44b0)));
space.install_readwrite_handler(0x01d00000, 0x01d0002b, 0, 0, read32_delegate(FUNC(s3c44b0_device::uart_0_r), &(*m_s3c44b0)), write32_delegate(FUNC(s3c44b0_device::uart_0_w), &(*m_s3c44b0)));
space.install_readwrite_handler(0x01d04000, 0x01d0402b, 0, 0, read32_delegate(FUNC(s3c44b0_device::uart_1_r), &(*m_s3c44b0)), write32_delegate(FUNC(s3c44b0_device::uart_1_w), &(*m_s3c44b0)));
diff --git a/src/mess/drivers/pasogo.c b/src/mess/drivers/pasogo.c
index 4e550ad0940..f11471603e2 100644
--- a/src/mess/drivers/pasogo.c
+++ b/src/mess/drivers/pasogo.c
@@ -30,13 +30,13 @@ PT-GMAIN01D
|----------------------------|
Notes: (all ICs shown)
- VG230 - Vadem VG230 single-chip PC platform. Contains 16 MHz NEC uPD70116H V30HL CPU
- (which is a high-speed low-power 8086 variation), IBM PC/XT-compatible core
+ VG230 - Vadem VG230 single-chip PC platform. Contains 16 MHz NEC uPD70116H V30HL CPU
+ (which is a high-speed low-power 8086 variation), IBM PC/XT-compatible core
logic, LCD controller (CGA/AT&T640x400), keyboard matrix scanner, dual PCMCIA
2.1 card controller, EMS 4.0 hardware support for up to 64MB, built-in timer
PIC/DMA/UART/RTC controllers. The clock input is 32.2200MHz. An internal divider
creates a 16.11MHz clock for the V30HL CPU.
- HM514800 - Hitachi HM514800 512k x8-bit DRAM
+ HM514800 - Hitachi HM514800 512k x8-bit DRAM
MC14071 - Motorola MC14071 Quad 2-input OR gate
74HC04 - 74HC04 Hex inverter
LM2937 - Texas Instruments LM2937ES-5 voltage regulator (Max 26V input, 5V output at 500mA)
@@ -45,27 +45,27 @@ Notes: (all ICs shown)
VOL - Volume pot
CN5 - 5 pin connector for 4-way control pad (up/down/left/right/ground)
CN4 - 5 pin connector for on/off switch and 2 buttons
- CN3 - 2 pin power input from 6x AA-battery compartment (input voltage is 9V DC)
- CN2 - Flat cable connector for video out to LCD panel. When the LCD is powered on the pixels
- are blue. The LCD panel PCB has part number 97-44264-8 LMG6912RPFC LMG6910RPGR
+ CN3 - 2 pin power input from 6x AA-battery compartment (input voltage is 9V DC)
+ CN2 - Flat cable connector for video out to LCD panel. When the LCD is powered on the pixels
+ are blue. The LCD panel PCB has part number 97-44264-8 LMG6912RPFC LMG6910RPGR
and contains the following parts.....
Matsushita 53008HEB-8
Sanyo LA6324N quad operational amplifier
Hitachi BD66285BFC LCD controller IC (x3)
Hitachi BD66284BFC LCD controller IC (x4)
- The LCD flat cable has several wires but 2 of them have frequencies which measure
+ The LCD flat cable has several wires but 2 of them have frequencies which measure
69.9161Hz and 16.7798kHz. These are assumed to be VSync and HSync
CN1 - Cart slot
X1 - Marked 322. Measures 32.21732MHz so this is a common 32.22MHz OSC.
X2 - No markings. Measures 32.768kHz and used for the RTC
* - These parts are on the other side of the PCB
-
+
Carts
-----
-All of the carts are identical. Most have only one surface mounted mask ROM. Either a
-MX23C8100 (8M) or YRM0442 (4M). Some are populated with additional parts including a 62256
-32kx8 SRAM, a 3v coin battery and a MM1081N reset chip plus a few resistors/capacitors and
+All of the carts are identical. Most have only one surface mounted mask ROM. Either a
+MX23C8100 (8M) or YRM0442 (4M). Some are populated with additional parts including a 62256
+32kx8 SRAM, a 3v coin battery and a MM1081N reset chip plus a few resistors/capacitors and
a transistor. All parts are surface mounted.
PT-GMEM01B
@@ -214,15 +214,15 @@ protected:
UINT8 m_pc_spkrdata;
UINT8 m_pc_input;
- int m_ppi_portc_switch_high;
- int m_ppi_speaker;
- int m_ppi_keyboard_clear;
- UINT8 m_ppi_keyb_clock;
- UINT8 m_ppi_portb;
- UINT8 m_ppi_clock_signal;
- UINT8 m_ppi_data_signal;
- UINT8 m_ppi_shift_register;
- UINT8 m_ppi_shift_enable;
+ int m_ppi_portc_switch_high;
+ int m_ppi_speaker;
+ int m_ppi_keyboard_clear;
+ UINT8 m_ppi_keyb_clock;
+ UINT8 m_ppi_portb;
+ UINT8 m_ppi_clock_signal;
+ UINT8 m_ppi_data_signal;
+ UINT8 m_ppi_shift_register;
+ UINT8 m_ppi_shift_enable;
};
diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c
index ba3532cf510..7f96cfcb87a 100644
--- a/src/mess/drivers/pc.c
+++ b/src/mess/drivers/pc.c
@@ -1567,7 +1567,7 @@ static MACHINE_CONFIG_DERIVED( asst128, iskr1031 )
MCFG_DEVICE_REMOVE("pit8253")
MCFG_PIT8253_ADD( "pit8253", pcjr_pit8253_config )
-
+
MCFG_FLOPPY_DRIVE_ADD("fdc:0", asst128_floppies, "525ssqd", pc_state::asst128_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", asst128_floppies, "525ssqd", pc_state::asst128_formats)
@@ -2038,8 +2038,8 @@ ROM_END
ROM_START( t1000sl )
ROM_REGION(0x100000,"maincpu", 0)
- // 8076312.hu1 - most likely v01.04.00
- // 8075312.hu2
+ // 8076312.hu1 - most likely v01.04.00
+ // 8075312.hu2
// partlist says it has 1 128kbyte rom
diff --git a/src/mess/drivers/pc1512.c b/src/mess/drivers/pc1512.c
index 36e13d469af..b4151837a40 100644
--- a/src/mess/drivers/pc1512.c
+++ b/src/mess/drivers/pc1512.c
@@ -473,7 +473,7 @@ READ8_MEMBER( pc1640_state::io_r )
offs_t addr = offset & 0x3ff;
bool decoded = false;
- if ( addr <= 0x00f) { data = m_dmac->read(space, offset & 0x0f); decoded = true; }
+ if ( addr <= 0x00f) { data = m_dmac->read(space, offset & 0x0f); decoded = true; }
else if (addr >= 0x020 && addr <= 0x021) { data = m_pic->read(space, offset & 0x01); decoded = true; }
else if (addr >= 0x040 && addr <= 0x043) { data = m_pit->read(space, offset & 0x03); decoded = true; }
else if (addr >= 0x060 && addr <= 0x06f) { data = system_r(space, offset & 0x0f); decoded = true; }
diff --git a/src/mess/drivers/pes.c b/src/mess/drivers/pes.c
index ef48ff92ef3..2380b612fdd 100644
--- a/src/mess/drivers/pes.c
+++ b/src/mess/drivers/pes.c
@@ -223,7 +223,7 @@ void pes_state::machine_reset()
******************************************************************************/
/*static TIMER_CALLBACK_MEMBER(pes_state::serial_read_cb )
{
- timer_set(attotime::from_hz(10000), TIMER_OUTFIFO_READ);
+ timer_set(attotime::from_hz(10000), TIMER_OUTFIFO_READ);
}*/
DRIVER_INIT_MEMBER(pes_state,pes)
diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c
index 81d2d840d30..086399f6f87 100644
--- a/src/mess/drivers/pet.c
+++ b/src/mess/drivers/pet.c
@@ -668,7 +668,7 @@ INPUT_PORTS_START( petb )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD))
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0_PAD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD))
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c
index 0ec3e1bbc9b..d24046625c8 100644
--- a/src/mess/drivers/pv1000.c
+++ b/src/mess/drivers/pv1000.c
@@ -35,7 +35,7 @@ private:
UINT16 period;
UINT8 val;
} m_voice[4];
-
+
sound_stream *m_sh_channel;
};
@@ -95,38 +95,38 @@ WRITE8_MEMBER(pv1000_sound_device::voice_w)
/*
plgDavid's audio implementation/analysis notes:
-
+
Sound appears to be 3 50/50 pulse voices made by cutting the main clock by 1024,
then by the value of the 6bit period registers.
This creates a surprisingly accurate pitch range.
-
+
Note: the register periods are inverted.
*/
void pv1000_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
stream_sample_t *buffer = outputs[0];
-
+
while (samples > 0)
{
*buffer=0;
-
+
for (int i = 0; i < 3; i++)
{
UINT32 per = (0x3f - (m_voice[i].period & 0x3f));
-
- if (per != 0) //OFF!
+
+ if (per != 0) //OFF!
*buffer += m_voice[i].val * 8192;
-
+
m_voice[i].count++;
-
+
if (m_voice[i].count >= per)
{
m_voice[i].count = 0;
m_voice[i].val = !m_voice[i].val;
}
}
-
+
buffer++;
samples--;
}
@@ -412,7 +412,7 @@ void pv1000_state::machine_start()
m_gfxram = memregion("gfxram")->base();
save_pointer(NAME(m_gfxram), 0x400);
-
+
save_item(NAME(m_io_regs));
save_item(NAME(m_fd_data));
save_item(NAME(m_pcg_bank));
diff --git a/src/mess/drivers/ql.c b/src/mess/drivers/ql.c
index 73c52d09a30..f0596d9d6c3 100644
--- a/src/mess/drivers/ql.c
+++ b/src/mess/drivers/ql.c
@@ -144,12 +144,12 @@ READ8_MEMBER( ql_state::ipc_port2_r )
bit description
0 Serial data input (SER2 RxD, SER1 TxD)
- 1
- 2
- 3
- 4
- 5
- 6
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
7 ZX8302 serial link input/output (COMDATA)
*/
@@ -176,13 +176,13 @@ WRITE8_MEMBER( ql_state::ipc_port2_w )
bit description
- 0
+ 0
1 Speaker output
2 Interrupt output (IPL0-2)
3 Interrupt output (IPL1)
4 Serial Clear-to-Send output (SER1 CTS)
5 Serial Data Terminal Ready output (SER2 DTR)
- 6
+ 6
7 ZX8302 serial link input/output (COMDATA)
*/
@@ -1074,10 +1074,10 @@ MACHINE_CONFIG_END
//-------------------------------------------------
static MACHINE_CONFIG_DERIVED( opd, ql )
- // internal ram
- MCFG_RAM_MODIFY(RAM_TAG)
- MCFG_RAM_DEFAULT_SIZE("128K")
- MCFG_RAM_EXTRA_OPTIONS("256K")
+ // internal ram
+ MCFG_RAM_MODIFY(RAM_TAG)
+ MCFG_RAM_DEFAULT_SIZE("128K")
+ MCFG_RAM_EXTRA_OPTIONS("256K")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c
index 859310193df..b8172882f9e 100644
--- a/src/mess/drivers/qx10.c
+++ b/src/mess/drivers/qx10.c
@@ -45,7 +45,7 @@
#define MAIN_CLK 15974400
-#define RS232_TAG "rs232"
+#define RS232_TAG "rs232"
/*
Driver data
@@ -696,14 +696,14 @@ ADDRESS_MAP_END
/* TODO: shift break */
/*INPUT_CHANGED_MEMBER(qx10_state::key_stroke)
{
- if(newval && !oldval)
- {
- m_keyb.rx = (UINT8)(FPTR)(param) & 0x7f;
- m_pic_m->ir4_w(1);
- }
+ if(newval && !oldval)
+ {
+ m_keyb.rx = (UINT8)(FPTR)(param) & 0x7f;
+ m_pic_m->ir4_w(1);
+ }
- if(oldval && !newval)
- m_keyb.rx = 0;
+ if(oldval && !newval)
+ m_keyb.rx = 0;
}*/
static INPUT_PORTS_START( qx10 )
diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c
index fc7c5c9ad7e..4d0e3e99542 100644
--- a/src/mess/drivers/samcoupe.c
+++ b/src/mess/drivers/samcoupe.c
@@ -55,7 +55,7 @@
/***************************************************************************
- TIMERS
+ TIMERS
***************************************************************************/
void samcoupe_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
diff --git a/src/mess/drivers/scv.c b/src/mess/drivers/scv.c
index 94ef5505262..78b4408b8cb 100644
--- a/src/mess/drivers/scv.c
+++ b/src/mess/drivers/scv.c
@@ -71,7 +71,7 @@ protected:
ioport_port *m_key[8];
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
-
+
void scv_set_banks();
inline void plot_sprite_part( bitmap_ind16 &bitmap, UINT8 x, UINT8 y, UINT8 pat, UINT8 col, UINT8 screen_sprite_start_line );
inline void draw_sprite( bitmap_ind16 &bitmap, UINT8 x, UINT8 y, UINT8 tile_idx, UINT8 col, UINT8 left, UINT8 right, UINT8 top, UINT8 bottom, UINT8 clip_y, UINT8 screen_sprite_start_line );
@@ -421,7 +421,7 @@ void scv_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_VB:
{
int vpos = machine().primary_screen->vpos();
-
+
switch( vpos )
{
case 240:
@@ -784,7 +784,7 @@ void scv_state::machine_start()
save_item(NAME(m_porta));
save_item(NAME(m_portc));
save_item(NAME(m_cart_ram_enabled));
-
+
machine().save().register_postload(save_prepost_delegate(FUNC(scv_state::scv_postload), this));
}
diff --git a/src/mess/drivers/sdk86.c b/src/mess/drivers/sdk86.c
index 86e9ce5825c..3a907357b85 100644
--- a/src/mess/drivers/sdk86.c
+++ b/src/mess/drivers/sdk86.c
@@ -31,8 +31,8 @@ ToDo:
#include "machine/serial.h"
#include "sdk86.lh"
-#define I8251_TAG "i8251"
-#define RS232_TAG "rs232"
+#define I8251_TAG "i8251"
+#define RS232_TAG "rs232"
class sdk86_state : public driver_device
@@ -40,8 +40,8 @@ class sdk86_state : public driver_device
public:
sdk86_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
- m_maincpu(*this, "maincpu"),
- m_usart(*this, I8251_TAG)
+ m_maincpu(*this, "maincpu"),
+ m_usart(*this, I8251_TAG)
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/drivers/sg1000.c b/src/mess/drivers/sg1000.c
index 853e4810511..c0b24fc1603 100644
--- a/src/mess/drivers/sg1000.c
+++ b/src/mess/drivers/sg1000.c
@@ -741,7 +741,7 @@ void sc3000_state::machine_start()
/* register for state saving */
save_item(NAME(m_keylatch));
- if (m_cartslot && (m_cartslot->get_type() == SEGA8_BASIC_L3 || m_cartslot->get_type() == SEGA8_MUSIC_EDITOR
+ if (m_cartslot && (m_cartslot->get_type() == SEGA8_BASIC_L3 || m_cartslot->get_type() == SEGA8_MUSIC_EDITOR
|| m_cartslot->get_type() == SEGA8_DAHJEE_TYPEA || m_cartslot->get_type() == SEGA8_DAHJEE_TYPEB))
{
m_maincpu->space(AS_PROGRAM).install_read_handler(0xc000, 0xffff, 0, 0, read8_delegate(FUNC(sega8_cart_slot_device::read_ram),(sega8_cart_slot_device*)m_cartslot));
diff --git a/src/mess/drivers/snes.c b/src/mess/drivers/snes.c
index 29d0fce0ad9..86ca9c2c09e 100644
--- a/src/mess/drivers/snes.c
+++ b/src/mess/drivers/snes.c
@@ -531,7 +531,7 @@ WRITE8_MEMBER( snes_console_state::snessfx_lo_w )
READ8_MEMBER( snes_console_state::snessa1_hi_r )
{
UINT16 address = offset & 0xffff;
-
+
if (offset < 0x400000)
{
if (address < 0x2000)
@@ -539,14 +539,14 @@ READ8_MEMBER( snes_console_state::snessa1_hi_r )
else if (address < 0x6000)
{
if (address >= 0x2200 && address < 0x2400)
- return m_cartslot->chip_read(space, offset); // SA-1 Regs
+ return m_cartslot->chip_read(space, offset); // SA-1 Regs
else if (address >= 0x3000 && address < 0x3800)
- return m_cartslot->chip_read(space, offset); // Internal SA-1 RAM (2K)
+ return m_cartslot->chip_read(space, offset); // Internal SA-1 RAM (2K)
else
return snes_r_io(space, address);
}
else if (address < 0x8000)
- return m_cartslot->chip_read(space, offset); // SA-1 BWRAM
+ return m_cartslot->chip_read(space, offset); // SA-1 BWRAM
else
return m_cartslot->read_h(space, offset);
}
@@ -557,7 +557,7 @@ READ8_MEMBER( snes_console_state::snessa1_hi_r )
READ8_MEMBER( snes_console_state::snessa1_lo_r )
{
UINT16 address = offset & 0xffff;
-
+
if (offset < 0x400000)
{
if (address < 0x2000)
@@ -565,21 +565,21 @@ READ8_MEMBER( snes_console_state::snessa1_lo_r )
else if (address < 0x6000)
{
if (address >= 0x2200 && address < 0x2400)
- return m_cartslot->chip_read(space, offset); // SA-1 Regs
+ return m_cartslot->chip_read(space, offset); // SA-1 Regs
else if (address >= 0x3000 && address < 0x3800)
- return m_cartslot->chip_read(space, offset); // Internal SA-1 RAM (2K)
+ return m_cartslot->chip_read(space, offset); // Internal SA-1 RAM (2K)
else
return snes_r_io(space, address);
}
else if (address < 0x8000)
- return m_cartslot->chip_read(space, offset); // SA-1 BWRAM
+ return m_cartslot->chip_read(space, offset); // SA-1 BWRAM
else
return m_cartslot->read_l(space, offset);
}
else if (offset < 0x500000)
- return m_cartslot->chip_read(space, offset); // SA-1 BWRAM (not mirrored above!)
+ return m_cartslot->chip_read(space, offset); // SA-1 BWRAM (not mirrored above!)
else
- return snes_r_io(space, address); // nothing mapped here!
+ return snes_r_io(space, address); // nothing mapped here!
}
WRITE8_MEMBER( snes_console_state::snessa1_hi_w )
@@ -592,21 +592,21 @@ WRITE8_MEMBER( snes_console_state::snessa1_hi_w )
else if (address < 0x6000)
{
if (address >= 0x2200 && address < 0x2400)
- m_cartslot->chip_write(space, offset, data); // SA-1 Regs
+ m_cartslot->chip_write(space, offset, data); // SA-1 Regs
else if (address >= 0x3000 && address < 0x3800)
- m_cartslot->chip_write(space, offset, data); // Internal SA-1 RAM (2K)
+ m_cartslot->chip_write(space, offset, data); // Internal SA-1 RAM (2K)
else
snes_w_io(space, address, data);
}
else if (address < 0x8000)
- m_cartslot->chip_write(space, offset, data); // SA-1 BWRAM
+ m_cartslot->chip_write(space, offset, data); // SA-1 BWRAM
}
}
WRITE8_MEMBER( snes_console_state::snessa1_lo_w )
{
if (offset >= 0x400000 && offset < 0x500000)
- m_cartslot->chip_write(space, offset, data); // SA-1 BWRAM (not mirrored above!)
+ m_cartslot->chip_write(space, offset, data); // SA-1 BWRAM (not mirrored above!)
else
snessfx_hi_w(space, offset, data, 0xff);
}
@@ -886,7 +886,7 @@ WRITE8_MEMBER( snes_console_state::snesbsx_lo_w )
READ8_MEMBER( snes_console_state::snessgb_hi_r )
{
UINT16 address = offset & 0xffff;
-
+
if (offset < 0x400000)
{
if (address < 0x2000)
diff --git a/src/mess/drivers/softbox.c b/src/mess/drivers/softbox.c
index 994d803a62a..b8d232db107 100644
--- a/src/mess/drivers/softbox.c
+++ b/src/mess/drivers/softbox.c
@@ -5,81 +5,81 @@
http://mikenaberezny.com/hardware/pet-cbm/sse-softbox-z80-computer/
- Using the Corvus hard disk
- --------------------------
+ Using the Corvus hard disk
+ --------------------------
- The SoftBox distribution disk (softbox-distrib.d80) is configured for
- a CBM 8050 as CP/M drives A/B and a 10MB Corvus hard disk as drives C/D.
+ The SoftBox distribution disk (softbox-distrib.d80) is configured for
+ a CBM 8050 as CP/M drives A/B and a 10MB Corvus hard disk as drives C/D.
- Use the CHDMAN utility to create a 10MB hard disk image for the Corvus:
+ Use the CHDMAN utility to create a 10MB hard disk image for the Corvus:
- $ chdman createhd -o /path/to/corvus10mb.chd -chs 358,3,20 -ss 512
+ $ chdman createhd -o /path/to/corvus10mb.chd -chs 358,3,20 -ss 512
- Start the SoftBox emulator with the floppy and hard disk images mounted:
+ Start the SoftBox emulator with the floppy and hard disk images mounted:
- $ mess softbox -flop1 /path/to/softbox-distrib.d80 \
- -hard1 /path/to/corvus10mb.chd
+ $ mess softbox -flop1 /path/to/softbox-distrib.d80 \
+ -hard1 /path/to/corvus10mb.chd
- Before the Corvus can be used under CP/M, it must be prepared
- by running DIAG.COM and FORMAT.COM.
+ Before the Corvus can be used under CP/M, it must be prepared
+ by running DIAG.COM and FORMAT.COM.
- DIAG.COM
+ DIAG.COM
- Enter "diag" (no arguments) at the CP/M prompt to run the Corvus diagnostics
- program. This program will perform the Corvus low-level format.
+ Enter "diag" (no arguments) at the CP/M prompt to run the Corvus diagnostics
+ program. This program will perform the Corvus low-level format.
- Select option 6 (Update Controller Code) at the menu.
- Enter "corvb184.fmt" when prompted for the filename.
- Enter "y" at the confirmation prompts.
- Enter "1" for the Corvus drive number (two prompts).
- After formatting is complete, it will return to the menu.
+ Select option 6 (Update Controller Code) at the menu.
+ Enter "corvb184.fmt" when prompted for the filename.
+ Enter "y" at the confirmation prompts.
+ Enter "1" for the Corvus drive number (two prompts).
+ After formatting is complete, it will return to the menu.
- Select option 3 (Read Controller Code Version #) at the menu.
- Enter "1" for the Corvus drive number.
- It should report "V18.4AP" and then return to the menu.
+ Select option 3 (Read Controller Code Version #) at the menu.
+ Enter "1" for the Corvus drive number.
+ It should report "V18.4AP" and then return to the menu.
- Select option 9 to return to CP/M.
+ Select option 9 to return to CP/M.
- FORMAT.COM
+ FORMAT.COM
- Enter "format" (no arguments) at the CP/M prompt to run the SoftBox disk
- format program. This program will perform the CP/M filesystem format.
+ Enter "format" (no arguments) at the CP/M prompt to run the SoftBox disk
+ format program. This program will perform the CP/M filesystem format.
- Enter drive letter "c" at the prompt.
- Enter "y" to confirm the format.
- After formatting is complete, it will prompt for a drive letter again.
+ Enter drive letter "c" at the prompt.
+ Enter "y" to confirm the format.
+ After formatting is complete, it will prompt for a drive letter again.
- Enter drive letter "d" at the prompt.
- Enter "y" to confirm the format.
- After formatting is complete, it will prompt for a drive letter again.
+ Enter drive letter "d" at the prompt.
+ Enter "y" to confirm the format.
+ After formatting is complete, it will prompt for a drive letter again.
- Press RETURN to return to CP/M.
+ Press RETURN to return to CP/M.
- STAT.COM
+ STAT.COM
- After all steps are completed, drives C and D should be usable from
- CP/M. Each drive is one half of the Corvus 10MB disk. Running the
- command "stat c: dsk:" should show 4712 kilobyte drive capacity.
- Drive D should show the same information.
+ After all steps are completed, drives C and D should be usable from
+ CP/M. Each drive is one half of the Corvus 10MB disk. Running the
+ command "stat c: dsk:" should show 4712 kilobyte drive capacity.
+ Drive D should show the same information.
- Using other Corvus hard disk sizes
- ----------------------------------
+ Using other Corvus hard disk sizes
+ ----------------------------------
- The SoftBox supports 5, 10, and 20 MB hard disks. The distribution disk
- is configured for 10 MB as explained above. To use other sizes, make
- a new image with CHDMAN. See the top of src/mess/includes/corvushd.h
- for the parameters for the other drives.
+ The SoftBox supports 5, 10, and 20 MB hard disks. The distribution disk
+ is configured for 10 MB as explained above. To use other sizes, make
+ a new image with CHDMAN. See the top of src/mess/includes/corvushd.h
+ for the parameters for the other drives.
- After the image has been created and the SoftBox emulator started with
- it mounted, the SoftBox BIOS needs to be told what size Corvus hard
- disk is attached. Use the NEWSYS.COM utility to reconfigure the drive
- size. When NEWSYS prompts for a source drive, enter "a" (the drive letter
- of the CP/M distribution disk). Use option "d" (Disk drive assignment)
- to reconfigure the Corvus size. After the change has been made, use option
- "s" (Save new system) to write the configuration to the floppy (drive A) and
- option "e" (Execute new system) to restart CP/M with the configuration.
- DIAG.COM and FORMAT.COM can then be used to format the hard disk.
+ After the image has been created and the SoftBox emulator started with
+ it mounted, the SoftBox BIOS needs to be told what size Corvus hard
+ disk is attached. Use the NEWSYS.COM utility to reconfigure the drive
+ size. When NEWSYS prompts for a source drive, enter "a" (the drive letter
+ of the CP/M distribution disk). Use option "d" (Disk drive assignment)
+ to reconfigure the Corvus size. After the change has been made, use option
+ "s" (Save new system) to write the configuration to the floppy (drive A) and
+ option "e" (Execute new system) to restart CP/M with the configuration.
+ DIAG.COM and FORMAT.COM can then be used to format the hard disk.
*/
diff --git a/src/mess/drivers/superslave.c b/src/mess/drivers/superslave.c
index dd2292d2b3f..f7d971cc1d4 100644
--- a/src/mess/drivers/superslave.c
+++ b/src/mess/drivers/superslave.c
@@ -104,18 +104,18 @@ WRITE8_MEMBER( superslave_state::baud_w )
WRITE8_MEMBER( superslave_state::memctrl_w )
{
/*
-
+
bit description
-
+
0 Memory bank 0 on
1 Memory bank 1 on
- 2
- 3
+ 2
+ 3
4 Unswitched memory boundary bit 0
5 Unswitched memory boundary bit 1
6 Unswitched memory boundary bit 2
7 Unswitched memory boundary bit 3
-
+
*/
m_memctrl = data;
@@ -129,9 +129,9 @@ WRITE8_MEMBER( superslave_state::memctrl_w )
READ8_MEMBER( superslave_state::status_r)
{
/*
-
+
bit description
-
+
0 Sense Switch (0=closed)
1 Parity error (1=error)
2 Syncerr (1=error)
@@ -140,7 +140,7 @@ READ8_MEMBER( superslave_state::status_r)
5 Data Set Ready 2
6 Data Set Ready 1
7 Data Set Ready 0
-
+
*/
UINT8 data = 1;
@@ -162,9 +162,9 @@ READ8_MEMBER( superslave_state::status_r)
WRITE8_MEMBER( superslave_state::cmd_w )
{
/*
-
+
bit description
-
+
0 Prom enable (1=enabled)
1 Clear Parity (1=cleared)
2 Clear Syncerr (1=cleared)
@@ -173,7 +173,7 @@ WRITE8_MEMBER( superslave_state::cmd_w )
5 Command bit 5
6 Command bit 6
7 Command bit 7
-
+
*/
m_cmd = data;
diff --git a/src/mess/drivers/tec1.c b/src/mess/drivers/tec1.c
index 48f75571149..22a5b66a740 100644
--- a/src/mess/drivers/tec1.c
+++ b/src/mess/drivers/tec1.c
@@ -258,7 +258,7 @@ TIMER_CALLBACK_MEMBER(tec1_state::tec1_kbd_callback)
else
if (m_kbd_row == 3)
i = m_io_line3->read();
-
+
/* if previous key is still held, bail out */
if (i)
if (tec1_convert_col_to_bin(i, m_kbd_row) == m_kbd)
diff --git a/src/mess/drivers/victor9k.c b/src/mess/drivers/victor9k.c
index 49789f65e80..149f9dfbcd9 100644
--- a/src/mess/drivers/victor9k.c
+++ b/src/mess/drivers/victor9k.c
@@ -9,31 +9,31 @@
/*
- Sector format
- -------------
-
- Header sync
- Sector header (header ID, track ID, sector ID, and checksum)
- Gap 1
- Data Sync
- Data field (data sync, data ID, data bytes, and checksum)
- Gap 2
-
- Track format
- ------------
-
- ZONE LOWER HEAD UPPER HEAD SECTORS ROTATIONAL
- NUMBER TRACKS TRACKS PER TRACK PERIOD (MS)
-
- 0 0-3 unused 19 237.9
- 1 4-15 0-7 18 224.5
- 2 16-26 8-18 17 212.2
- 3 27-37 19-29 16 199.9
- 4 38-48 30-40 15 187.6
- 5 49-59 41-51 14 175.3
- 6 60-70 52-62 13 163.0
- 7 71-79 63-74 12 149.6
- 8 unused 75-79 11 144.0
+ Sector format
+ -------------
+
+ Header sync
+ Sector header (header ID, track ID, sector ID, and checksum)
+ Gap 1
+ Data Sync
+ Data field (data sync, data ID, data bytes, and checksum)
+ Gap 2
+
+ Track format
+ ------------
+
+ ZONE LOWER HEAD UPPER HEAD SECTORS ROTATIONAL
+ NUMBER TRACKS TRACKS PER TRACK PERIOD (MS)
+
+ 0 0-3 unused 19 237.9
+ 1 4-15 0-7 18 224.5
+ 2 16-26 8-18 17 212.2
+ 3 27-37 19-29 16 199.9
+ 4 38-48 30-40 15 187.6
+ 5 49-59 41-51 14 175.3
+ 6 60-70 52-62 13 163.0
+ 7 71-79 63-74 12 149.6
+ 8 unused 75-79 11 144.0
*/
@@ -67,9 +67,9 @@
READ8_MEMBER( victor9k_state::floppy_p1_r )
{
/*
-
+
bit description
-
+
0 L0MS0
1 L0MS1
2 L0MS2
@@ -78,7 +78,7 @@ READ8_MEMBER( victor9k_state::floppy_p1_r )
5 L1MS1
6 L1MS2
7 L1MS3
-
+
*/
return m_lms;
@@ -92,18 +92,18 @@ READ8_MEMBER( victor9k_state::floppy_p1_r )
READ8_MEMBER( victor9k_state::floppy_p2_r )
{
/*
-
+
bit description
-
- 0
- 1
- 2
- 3
- 4
- 5
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
6 RDY0
7 RDY1
-
+
*/
UINT8 data = 0;
@@ -122,18 +122,18 @@ READ8_MEMBER( victor9k_state::floppy_p2_r )
WRITE8_MEMBER( victor9k_state::floppy_p2_w )
{
/*
-
+
bit description
-
+
0 START0
1 STOP0
2 START1
3 STOP1
4 SEL1
5 SEL0
- 6
- 7
-
+ 6
+ 7
+
*/
if (BIT(data, 0)) m_floppy0->mon_w(0);
@@ -142,7 +142,7 @@ WRITE8_MEMBER( victor9k_state::floppy_p2_w )
if (BIT(data, 3)) m_floppy1->mon_w(1);
int sel0 = BIT(data, 5);
-
+
if (m_sel0 && !sel0)
{
m_da0 = m_da;
@@ -152,7 +152,7 @@ WRITE8_MEMBER( victor9k_state::floppy_p2_w )
m_sel0 = sel0;
int sel1 = BIT(data, 4);
-
+
if (m_sel1 && !sel1)
{
m_da1 = m_da;
@@ -1034,7 +1034,7 @@ READ8_MEMBER( victor9k_state::via6_pb_r )
// single/double sided
data |= (m_drive ? m_floppy1->twosid_r() : m_floppy0->twosid_r()) << 5;
-
+
return data;
}
@@ -1148,7 +1148,7 @@ void victor9k_state::unload0_cb(floppy_image_device *device)
void victor9k_state::ready1_cb(floppy_image_device *device, int state)
{
m_rdy1 = state;
-
+
m_via5->write_cb2(m_rdy1);
}
diff --git a/src/mess/drivers/vip.c b/src/mess/drivers/vip.c
index 8ea259ed382..dc521af8bdd 100644
--- a/src/mess/drivers/vip.c
+++ b/src/mess/drivers/vip.c
@@ -762,7 +762,7 @@ static MACHINE_CONFIG_START( vip, vip_state )
MCFG_VIP_BYTEIO_PORT_ADD(VIP_BYTEIO_PORT_TAG, vip_byteio_cards, NULL, WRITELINE(vip_state, byteio_inst_w))
MCFG_VIP_EXPANSION_SLOT_ADD(VIP_EXPANSION_SLOT_TAG, XTAL_3_52128MHz/2, vip_expansion_cards, NULL)
- MCFG_VIP_EXPANSION_SLOT_CALLBACKS(WRITELINE(vip_state, exp_int_w), WRITELINE(vip_state, exp_dma_out_w), WRITELINE(vip_state, exp_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_CALLBACKS(WRITELINE(vip_state, exp_int_w), WRITELINE(vip_state, exp_dma_out_w), WRITELINE(vip_state, exp_dma_in_w))
// devices
MCFG_QUICKLOAD_ADD("quickload", vip_state, vip, "bin,c8,c8x", 0)
diff --git a/src/mess/drivers/vk100.c b/src/mess/drivers/vk100.c
index d35e30c88f7..f3323842ceb 100644
--- a/src/mess/drivers/vk100.c
+++ b/src/mess/drivers/vk100.c
@@ -153,8 +153,8 @@ state machine and sees if the GO bit ever finishes and goes back to 0
#include "machine/serial.h"
#include "vk100.lh"
-#define RS232_TAG "rs232"
-#define COM5016T_TAG "com5016t"
+#define RS232_TAG "rs232"
+#define COM5016T_TAG "com5016t"
class vk100_state : public driver_device
{
diff --git a/src/mess/drivers/vt100.c b/src/mess/drivers/vt100.c
index 8b96385eaaf..fb13abaec9d 100644
--- a/src/mess/drivers/vt100.c
+++ b/src/mess/drivers/vt100.c
@@ -27,8 +27,8 @@
#include "video/vtvideo.h"
#include "vt100.lh"
-#define RS232_TAG "rs232"
-#define COM5016T_TAG "com5016t"
+#define RS232_TAG "rs232"
+#define COM5016T_TAG "com5016t"
class vt100_state : public driver_device
{
diff --git a/src/mess/includes/abc1600.h b/src/mess/includes/abc1600.h
index 77aa70b4fa4..6de9a606fff 100644
--- a/src/mess/includes/abc1600.h
+++ b/src/mess/includes/abc1600.h
@@ -42,8 +42,8 @@
#define BUS0X_TAG "bus0x"
#define BUS1_TAG "bus1"
#define BUS2_TAG "bus2"
-#define RS232_A_TAG "rs232a"
-#define RS232_B_TAG "rs232b"
+#define RS232_A_TAG "rs232a"
+#define RS232_B_TAG "rs232b"
diff --git a/src/mess/includes/bw12.h b/src/mess/includes/bw12.h
index cf5df7ac5f0..445526819ea 100644
--- a/src/mess/includes/bw12.h
+++ b/src/mess/includes/bw12.h
@@ -28,8 +28,8 @@
#define AY3600PRO002_TAG "ic74"
#define CENTRONICS_TAG "centronics"
#define FLOPPY_TIMER_TAG "motor_off"
-#define RS232_A_TAG "rs232a"
-#define RS232_B_TAG "rs232b"
+#define RS232_A_TAG "rs232a"
+#define RS232_B_TAG "rs232b"
#define BW12_VIDEORAM_MASK 0x7ff
#define BW12_CHARROM_MASK 0xfff
diff --git a/src/mess/includes/ep64.h b/src/mess/includes/ep64.h
index 39e522d7cbd..9a9a04dd47c 100644
--- a/src/mess/includes/ep64.h
+++ b/src/mess/includes/ep64.h
@@ -24,38 +24,38 @@
#include "video/nick.h"
#define Z80_TAG "u1"
-#define DAVE_TAG "u3"
-#define NICK_TAG "u4"
-#define CENTRONICS_TAG "centronics"
-#define RS232_TAG "rs232"
-#define CASSETTE1_TAG "cassette1"
-#define CASSETTE2_TAG "cassette2"
-#define SCREEN_TAG "screen"
+#define DAVE_TAG "u3"
+#define NICK_TAG "u4"
+#define CENTRONICS_TAG "centronics"
+#define RS232_TAG "rs232"
+#define CASSETTE1_TAG "cassette1"
+#define CASSETTE2_TAG "cassette2"
+#define SCREEN_TAG "screen"
class ep64_state : public driver_device
{
public:
ep64_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, Z80_TAG),
- m_dave(*this, DAVE_TAG),
- m_nick(*this, NICK_TAG),
- m_centronics(*this, CENTRONICS_TAG),
- m_rs232(*this, RS232_TAG),
- m_cassette1(*this, CASSETTE1_TAG),
- m_cassette2(*this, CASSETTE2_TAG),
- m_ram(*this, RAM_TAG),
- m_rom(*this, Z80_TAG),
- m_y0(*this, "Y0"),
- m_y1(*this, "Y1"),
- m_y2(*this, "Y2"),
- m_y3(*this, "Y3"),
- m_y4(*this, "Y4"),
- m_y5(*this, "Y5"),
- m_y6(*this, "Y6"),
- m_y7(*this, "Y7"),
- m_y8(*this, "Y8"),
- m_y9(*this, "Y9")
+ m_maincpu(*this, Z80_TAG),
+ m_dave(*this, DAVE_TAG),
+ m_nick(*this, NICK_TAG),
+ m_centronics(*this, CENTRONICS_TAG),
+ m_rs232(*this, RS232_TAG),
+ m_cassette1(*this, CASSETTE1_TAG),
+ m_cassette2(*this, CASSETTE2_TAG),
+ m_ram(*this, RAM_TAG),
+ m_rom(*this, Z80_TAG),
+ m_y0(*this, "Y0"),
+ m_y1(*this, "Y1"),
+ m_y2(*this, "Y2"),
+ m_y3(*this, "Y3"),
+ m_y4(*this, "Y4"),
+ m_y5(*this, "Y5"),
+ m_y6(*this, "Y6"),
+ m_y7(*this, "Y7"),
+ m_y8(*this, "Y8"),
+ m_y9(*this, "Y9")
{ }
required_device<cpu_device> m_maincpu;
@@ -80,7 +80,7 @@ public:
virtual void machine_start();
virtual void machine_reset();
-
+
DECLARE_READ8_MEMBER( rd0_r );
DECLARE_WRITE8_MEMBER( wr0_w );
DECLARE_READ8_MEMBER( rd1_r );
diff --git a/src/mess/includes/gba.h b/src/mess/includes/gba.h
index daebffeb782..05a14c78f6a 100644
--- a/src/mess/includes/gba.h
+++ b/src/mess/includes/gba.h
@@ -265,7 +265,7 @@ public:
inline void update_mask(UINT8* mask, int mode, int submode, UINT32* obj_win, UINT8 inwin0, UINT8 inwin1, UINT8 in0_mask, UINT8 in1_mask, UINT8 out_mask);
void draw_modes(int mode, int submode, int y, UINT32* line0, UINT32* line1, UINT32* line2, UINT32* line3, UINT32* lineOBJ, UINT32* lineOBJWin, UINT32* lineMix, int bpp);
-
+
protected:
required_memory_region m_region_maincpu;
required_ioport m_io_in0;
diff --git a/src/mess/includes/hx20.h b/src/mess/includes/hx20.h
index ee322551233..fb491236630 100644
--- a/src/mess/includes/hx20.h
+++ b/src/mess/includes/hx20.h
@@ -14,52 +14,52 @@
#include "sound/speaker.h"
#include "rendlay.h"
-#define HD6301V1_MAIN_TAG "8g"
-#define HD6301V1_SLAVE_TAG "6d"
-#define MC146818_TAG "6g"
-#define UPD7227_0_TAG "lcdc0"
-#define UPD7227_1_TAG "lcdc1"
-#define UPD7227_2_TAG "lcdc2"
-#define UPD7227_3_TAG "lcdc3"
-#define UPD7227_4_TAG "lcdc4"
-#define UPD7227_5_TAG "lcdc5"
-#define SPEAKER_TAG "speaker"
-#define CASSETTE_TAG "cassette"
-#define RS232_TAG "rs232"
-#define SCREEN_TAG "screen"
+#define HD6301V1_MAIN_TAG "8g"
+#define HD6301V1_SLAVE_TAG "6d"
+#define MC146818_TAG "6g"
+#define UPD7227_0_TAG "lcdc0"
+#define UPD7227_1_TAG "lcdc1"
+#define UPD7227_2_TAG "lcdc2"
+#define UPD7227_3_TAG "lcdc3"
+#define UPD7227_4_TAG "lcdc4"
+#define UPD7227_5_TAG "lcdc5"
+#define SPEAKER_TAG "speaker"
+#define CASSETTE_TAG "cassette"
+#define RS232_TAG "rs232"
+#define SCREEN_TAG "screen"
class hx20_state : public driver_device
{
public:
hx20_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, HD6301V1_MAIN_TAG),
- m_subcpu(*this, HD6301V1_SLAVE_TAG),
- m_rtc(*this, MC146818_TAG),
- m_lcdc0(*this, UPD7227_0_TAG),
- m_lcdc1(*this, UPD7227_1_TAG),
- m_lcdc2(*this, UPD7227_2_TAG),
- m_lcdc3(*this, UPD7227_3_TAG),
- m_lcdc4(*this, UPD7227_4_TAG),
- m_lcdc5(*this, UPD7227_5_TAG),
- m_speaker(*this, SPEAKER_TAG),
- m_cassette(*this, CASSETTE_TAG),
- m_rs232(*this, RS232_TAG),
- m_sio(*this, "sio"),
- m_ksc0(*this, "KSC0"),
- m_ksc1(*this, "KSC1"),
- m_ksc2(*this, "KSC2"),
- m_ksc3(*this, "KSC3"),
- m_ksc4(*this, "KSC4"),
- m_ksc5(*this, "KSC5"),
- m_ksc6(*this, "KSC6"),
- m_ksc7(*this, "KSC7"),
- m_sw6(*this, "SW6"),
- m_slave_rx(1),
- m_slave_tx(1),
- m_slave_flag(1),
- m_rtc_irq(CLEAR_LINE),
- m_kbrequest(1)
+ m_maincpu(*this, HD6301V1_MAIN_TAG),
+ m_subcpu(*this, HD6301V1_SLAVE_TAG),
+ m_rtc(*this, MC146818_TAG),
+ m_lcdc0(*this, UPD7227_0_TAG),
+ m_lcdc1(*this, UPD7227_1_TAG),
+ m_lcdc2(*this, UPD7227_2_TAG),
+ m_lcdc3(*this, UPD7227_3_TAG),
+ m_lcdc4(*this, UPD7227_4_TAG),
+ m_lcdc5(*this, UPD7227_5_TAG),
+ m_speaker(*this, SPEAKER_TAG),
+ m_cassette(*this, CASSETTE_TAG),
+ m_rs232(*this, RS232_TAG),
+ m_sio(*this, "sio"),
+ m_ksc0(*this, "KSC0"),
+ m_ksc1(*this, "KSC1"),
+ m_ksc2(*this, "KSC2"),
+ m_ksc3(*this, "KSC3"),
+ m_ksc4(*this, "KSC4"),
+ m_ksc5(*this, "KSC5"),
+ m_ksc6(*this, "KSC6"),
+ m_ksc7(*this, "KSC7"),
+ m_sw6(*this, "SW6"),
+ m_slave_rx(1),
+ m_slave_tx(1),
+ m_slave_flag(1),
+ m_rtc_irq(CLEAR_LINE),
+ m_kbrequest(1)
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/mac.h b/src/mess/includes/mac.h
index 3b73637c322..bdde2f17f0d 100644
--- a/src/mess/includes/mac.h
+++ b/src/mess/includes/mac.h
@@ -152,7 +152,7 @@ class mac_sound_device : public device_t,
public:
mac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~mac_sound_device() {}
-
+
void enable_sound(int on);
void set_sound_buffer(int buffer);
void set_volume(int volume);
@@ -167,7 +167,7 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
private:
// internal state
-
+
ram_device *m_ram;
model_t m_mac_model;
diff --git a/src/mess/includes/pc1512.h b/src/mess/includes/pc1512.h
index e7af4cd7488..20198e543fe 100644
--- a/src/mess/includes/pc1512.h
+++ b/src/mess/includes/pc1512.h
@@ -36,7 +36,7 @@
#define SPEAKER_TAG "speaker"
#define ISA_BUS_TAG "isa"
#define SCREEN_TAG "screen"
-#define RS232_TAG "rs232"
+#define RS232_TAG "rs232"
class pc1512_state : public driver_device
{
diff --git a/src/mess/includes/sg1000.h b/src/mess/includes/sg1000.h
index 5cd5ec82b5b..6a341774d4f 100644
--- a/src/mess/includes/sg1000.h
+++ b/src/mess/includes/sg1000.h
@@ -29,8 +29,8 @@
#define UPD9255_1_TAG "upd9255_1"
#define CENTRONICS_TAG "centronics"
#define TMS9918A_TAG "tms9918a"
-#define RS232_TAG "rs232"
-#define CARTSLOT_TAG "slot"
+#define RS232_TAG "rs232"
+#define CARTSLOT_TAG "slot"
INPUT_PORTS_EXTERN( sk1100 );
diff --git a/src/mess/includes/sms.h b/src/mess/includes/sms.h
index 2dafd6a0022..10bfb3088b9 100644
--- a/src/mess/includes/sms.h
+++ b/src/mess/includes/sms.h
@@ -102,7 +102,7 @@ public:
device_t *m_left_lcd;
device_t *m_right_lcd;
address_space *m_space;
-
+
UINT8 m_bios_page_count;
UINT8 m_fm_detect;
UINT8 m_ctrl_reg;
@@ -113,11 +113,11 @@ public:
UINT8 m_input_port0;
UINT8 m_input_port1;
UINT8 m_gg_sio[5];
-
+
// [0] for 0x400-0x3fff, [1] for 0x4000-0x7fff, [2] for 0x8000-0xffff, [3] for 0x0000-0x0400
int m_bank_enabled[4];
UINT8 m_bios_page[4];
-
+
// for gamegear LCD persistence hack
bitmap_rgb32 m_prev_bitmap;
@@ -168,7 +168,7 @@ public:
UINT8 m_frame_sscope_state;
// these are only used by the Store Display unit, but we keep them here temporarily to avoid the need of separate start/reset
- UINT8 m_store_control;
+ UINT8 m_store_control;
int m_current_cartridge;
sega8_cart_slot_device *m_slots[16];
sega8_card_slot_device *m_cards[16];
@@ -241,7 +241,7 @@ public:
: sms_state(mconfig, type, tag),
m_control_cpu(*this, "control")
{ }
-
+
required_device<cpu_device> m_control_cpu;
DECLARE_READ8_MEMBER(sms_store_cart_select_r);
@@ -251,13 +251,13 @@ public:
DECLARE_READ8_MEMBER(sms_store_control_r);
DECLARE_WRITE8_MEMBER(sms_store_control_w);
DECLARE_DRIVER_INIT(smssdisp);
-
+
DECLARE_READ8_MEMBER(store_read_0000);
DECLARE_READ8_MEMBER(store_read_4000);
DECLARE_READ8_MEMBER(store_read_8000);
DECLARE_READ8_MEMBER(store_cart_peek);
DECLARE_WRITE8_MEMBER(store_write_cart);
-
+
DECLARE_WRITE_LINE_MEMBER(sms_store_int_callback);
};
diff --git a/src/mess/includes/superslave.h b/src/mess/includes/superslave.h
index ae6c8aab441..eb98b59ea8d 100644
--- a/src/mess/includes/superslave.h
+++ b/src/mess/includes/superslave.h
@@ -13,12 +13,12 @@
#include "machine/z80dart.h"
#include "machine/z80pio.h"
-#define Z80_TAG "u45"
-#define Z80DART_0_TAG "u14"
-#define Z80DART_1_TAG "u30"
-#define Z80PIO_TAG "u43"
-#define AM9519_TAG "u13"
-#define BR1941_TAG "u12"
+#define Z80_TAG "u45"
+#define Z80DART_0_TAG "u14"
+#define Z80DART_1_TAG "u30"
+#define Z80PIO_TAG "u43"
+#define AM9519_TAG "u13"
+#define BR1941_TAG "u12"
#define RS232_A_TAG "rs232a"
#define RS232_B_TAG "rs232b"
#define RS232_C_TAG "rs232c"
@@ -29,18 +29,18 @@ class superslave_state : public driver_device
public:
superslave_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, Z80_TAG),
- m_dart0(*this, Z80DART_0_TAG),
- m_dart1(*this, Z80DART_1_TAG),
- m_dbrg(*this, BR1941_TAG),
- m_ram(*this, RAM_TAG),
- m_rs232a(*this, RS232_A_TAG),
- m_rs232b(*this, RS232_B_TAG),
- m_rs232c(*this, RS232_C_TAG),
- m_rs232d(*this, RS232_D_TAG),
- m_rom(*this, Z80_TAG),
- m_memctrl(0x01),
- m_cmd(0x01)
+ m_maincpu(*this, Z80_TAG),
+ m_dart0(*this, Z80DART_0_TAG),
+ m_dart1(*this, Z80DART_1_TAG),
+ m_dbrg(*this, BR1941_TAG),
+ m_ram(*this, RAM_TAG),
+ m_rs232a(*this, RS232_A_TAG),
+ m_rs232b(*this, RS232_B_TAG),
+ m_rs232c(*this, RS232_C_TAG),
+ m_rs232d(*this, RS232_D_TAG),
+ m_rom(*this, Z80_TAG),
+ m_memctrl(0x01),
+ m_cmd(0x01)
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/tandy2k.h b/src/mess/includes/tandy2k.h
index 37269840b2c..bb4f9f2a016 100644
--- a/src/mess/includes/tandy2k.h
+++ b/src/mess/includes/tandy2k.h
@@ -35,7 +35,7 @@
#define WD1010_TAG "u18"
#define WD1100_11_TAG "u12"
#define CENTRONICS_TAG "centronics"
-#define RS232_TAG "rs232"
+#define RS232_TAG "rs232"
class tandy2k_state : public driver_device
{
diff --git a/src/mess/includes/v1050.h b/src/mess/includes/v1050.h
index ad6fe0d69a3..19f7175ca7e 100644
--- a/src/mess/includes/v1050.h
+++ b/src/mess/includes/v1050.h
@@ -43,7 +43,7 @@
#define TIMER_ACK_TAG "timer_ack"
#define TIMER_RST_TAG "timer_rst"
#define SASIBUS_TAG "sasi"
-#define RS232_TAG "rs232"
+#define RS232_TAG "rs232"
#define V1050_VIDEORAM_SIZE 0x8000
#define V1050_VIDEORAM_MASK 0x7fff
diff --git a/src/mess/includes/victor9k.h b/src/mess/includes/victor9k.h
index cc1fac5ab56..81f9360e6d7 100644
--- a/src/mess/includes/victor9k.h
+++ b/src/mess/includes/victor9k.h
@@ -43,8 +43,8 @@
#define M6522_4_TAG "1f"
#define M6522_5_TAG "1k"
#define M6522_6_TAG "1h"
-#define DAC0808_0_TAG "5b"
-#define DAC0808_1_TAG "5c"
+#define DAC0808_0_TAG "5b"
+#define DAC0808_1_TAG "5c"
#define CENTRONICS_TAG "centronics"
#define RS232_A_TAG "rs232a"
#define RS232_B_TAG "rs232b"
@@ -203,7 +203,7 @@ public:
int m_rdy1;
int m_ds0;
int m_ds1;
- UINT8 m_lms; /* motor speed */
+ UINT8 m_lms; /* motor speed */
int m_st[2]; /* stepper phase */
int m_stp[2]; /* stepper enable */
int m_drive; /* selected drive */
diff --git a/src/mess/includes/vixen.h b/src/mess/includes/vixen.h
index a63461593ce..bfbca9959c3 100644
--- a/src/mess/includes/vixen.h
+++ b/src/mess/includes/vixen.h
@@ -20,7 +20,7 @@
#define P8251A_TAG "c3"
#define DISCRETE_TAG "discrete"
#define SCREEN_TAG "screen"
-#define RS232_TAG "rs232"
+#define RS232_TAG "rs232"
class vixen_state : public driver_device
{
diff --git a/src/mess/includes/wangpc.h b/src/mess/includes/wangpc.h
index c3eab3d15e9..5a75ce50f3a 100644
--- a/src/mess/includes/wangpc.h
+++ b/src/mess/includes/wangpc.h
@@ -36,7 +36,7 @@
#define SCN2661_TAG "scn2661"
#define UPD765_TAG "upd765"
#define CENTRONICS_TAG "centronics"
-#define RS232_TAG "rs232"
+#define RS232_TAG "rs232"
class wangpc_state : public driver_device
{
diff --git a/src/mess/machine/abc99.c b/src/mess/machine/abc99.c
index aa438ebcdbb..ff7dc083f19 100644
--- a/src/mess/machine/abc99.c
+++ b/src/mess/machine/abc99.c
@@ -153,10 +153,10 @@ ADDRESS_MAP_END
//-------------------------------------------------
static ADDRESS_MAP_START( abc99_z5_io, AS_IO, 8, abc99_device )
-/* AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READ(z5_p1_r)
- AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(z5_p2_w)
- AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_WRITENOP // Z2 CLK
- AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(z5_t1_r)*/
+/* AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READ(z5_p1_r)
+ AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(z5_p2_w)
+ AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_WRITENOP // Z2 CLK
+ AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(z5_t1_r)*/
ADDRESS_MAP_END
diff --git a/src/mess/machine/abc99.h b/src/mess/machine/abc99.h
index 75ae283c292..2b146a3c8e2 100644
--- a/src/mess/machine/abc99.h
+++ b/src/mess/machine/abc99.h
@@ -64,7 +64,7 @@ private:
TIMER_SERIAL,
TIMER_MOUSE
};
-
+
enum
{
LED_1 = 0,
diff --git a/src/mess/machine/abckb.h b/src/mess/machine/abckb.h
index a231d461aa5..207ca9c0a49 100644
--- a/src/mess/machine/abckb.h
+++ b/src/mess/machine/abckb.h
@@ -20,7 +20,7 @@
// MACROS / CONSTANTS
//**************************************************************************
-#define ABC_KEYBOARD_PORT_TAG "kb"
+#define ABC_KEYBOARD_PORT_TAG "kb"
diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c
index 3315635550e..bf842dae2cb 100644
--- a/src/mess/machine/apollo.c
+++ b/src/mess/machine/apollo.c
@@ -691,9 +691,9 @@ IRQ_CALLBACK_MEMBER(apollo_state::apollo_pic_acknowledge)
READ8_MEMBER( apollo_state::apollo_pic8259_get_slave_ack )
{
- MLOG1(("apollo_pic8259_get_slave_ack: offset=%x", offset));
+ MLOG1(("apollo_pic8259_get_slave_ack: offset=%x", offset));
- return offset == 3 ? m_pic8259_slave->inta_r() : 0;
+ return offset == 3 ? m_pic8259_slave->inta_r() : 0;
}
WRITE_LINE_MEMBER( apollo_state::apollo_pic8259_master_set_int_line ) {
diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c
index fe3786c5ba6..0dfbddb6406 100644
--- a/src/mess/machine/bbc.c
+++ b/src/mess/machine/bbc.c
@@ -1417,8 +1417,8 @@ TIMER_CALLBACK_MEMBER(bbc_state::bbc_tape_timer_cb)
READ_LINE_MEMBER( bbc_state::bbc_rxd_r )
-{
- return ( m_serproc_data & 0x40 ) ? m_rs232->rx() : m_rxd_cass;
+{
+ return ( m_serproc_data & 0x40 ) ? m_rs232->rx() : m_rxd_cass;
}
@@ -1429,7 +1429,7 @@ READ_LINE_MEMBER( bbc_state::bbc_dcd_r )
READ_LINE_MEMBER( bbc_state::bbc_cts_r )
-{
+{
return ( m_serproc_data & 0x40 ) ? m_rs232->cts_r() : 0;
}
diff --git a/src/mess/machine/concept.c b/src/mess/machine/concept.c
index b4272e4277c..d8656b53faa 100644
--- a/src/mess/machine/concept.c
+++ b/src/mess/machine/concept.c
@@ -58,7 +58,7 @@ void concept_state::machine_start()
/* clear keyboard interface state */
m_KeyQueueHead = m_KeyQueueLen = 0;
memset(m_KeyStateSave, 0, sizeof(m_KeyStateSave));
-
+
m_exp[0] = machine().device<concept_exp_port_device>("exp1");
m_exp[1] = machine().device<concept_exp_port_device>("exp2");
m_exp[2] = machine().device<concept_exp_port_device>("exp3");
@@ -248,10 +248,10 @@ READ16_MEMBER(concept_state::concept_io_r)
/* I/O slot regs */
switch ((offset >> 4) & 7)
{
- case 1: // IO1 registers
- case 2: // IO2 registers
- case 3: // IO3 registers
- case 4: // IO4 registers
+ case 1: // IO1 registers
+ case 2: // IO2 registers
+ case 3: // IO3 registers
+ case 4: // IO4 registers
return m_exp[((offset >> 4) & 7) - 1]->reg_r(space, offset & 0x0f);
break;
@@ -261,10 +261,10 @@ READ16_MEMBER(concept_state::concept_io_r)
}
break;
- case 1: // IO1 ROM
- case 2: // IO2 ROM
- case 3: // IO3 ROM
- case 4: // IO4 ROM
+ case 1: // IO1 ROM
+ case 2: // IO2 ROM
+ case 3: // IO3 ROM
+ case 4: // IO4 ROM
LOG(("concept_io_r: Slot ROM memory accessed for slot %d at address 0x03%4.4x\n", ((offset >> 8) & 7) - 1, offset << 1));
return m_exp[((offset >> 8) & 7) - 1]->rom_r(space, offset & 0xff);
break;
@@ -373,23 +373,23 @@ WRITE16_MEMBER(concept_state::concept_io_w)
/* I/O slot regs */
switch ((offset >> 4) & 7)
{
- case 1: // IO1 registers
- case 2: // IO2 registers
- case 3: // IO3 registers
- case 4: // IO4 registers
+ case 1: // IO1 registers
+ case 2: // IO2 registers
+ case 3: // IO3 registers
+ case 4: // IO4 registers
return m_exp[((offset >> 4) & 7) - 1]->reg_w(space, offset & 0x0f, data);
break;
- default: // ???
+ default: // ???
logerror("concept_io_w: Slot I/O memory written for unknown purpose at address 0x03%4.4x, data: 0x%4.4x\n", offset << 1, data);
break;
}
break;
- case 1: // IO1 ROM
- case 2: // IO2 ROM
- case 3: // IO3 ROM
- case 4: // IO4 ROM
+ case 1: // IO1 ROM
+ case 2: // IO2 ROM
+ case 3: // IO3 ROM
+ case 4: // IO4 ROM
LOG(("concept_io_w: Slot ROM memory written to for slot %d at address 0x03%4.4x, data: 0x%4.4x\n", ((offset >> 8) & 7) - 1, offset << 1, data));
return m_exp[((offset >> 8) & 7) - 1]->rom_w(space, offset & 0xff, data);
break;
@@ -463,4 +463,3 @@ WRITE16_MEMBER(concept_state::concept_io_w)
break;
}
}
-
diff --git a/src/mess/machine/concept_exp.c b/src/mess/machine/concept_exp.c
index 1c07300c491..94a8be1119b 100644
--- a/src/mess/machine/concept_exp.c
+++ b/src/mess/machine/concept_exp.c
@@ -1,14 +1,14 @@
/**********************************************************************
-
+
Corvus Concept expansion port emulation
-
+
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
-
-
+
+
FIXME: Concept expansion ports should just use the Apple II Bus device!
- The code below is outdated and inaccurate!
-
+ The code below is outdated and inaccurate!
+
**********************************************************************/
#include "machine/concept_exp.h"
@@ -82,7 +82,7 @@ READ8_MEMBER( concept_exp_port_device::rom_r )
{
if (m_card)
return m_card->reg_r(space, offset);
-
+
return 0;
}
@@ -139,7 +139,7 @@ enum
LS_8IN_bit = 5, // 1 if 8" floppy drive?
LS_DSKCHG_bit = 6, // 0 if disk changed, 1 if not
LS_SD_bit = 7, // 1 if single density
-
+
LS_DRQ_mask = (1 << LS_DRQ_bit),
LS_INT_mask = (1 << LS_INT_bit),
LS_SS_mask = (1 << LS_SS_bit),
@@ -156,7 +156,7 @@ enum
LC_MOTOROF_bit = 5, // 1 if motor to be turned off
LC_FLP8IN_bit = 6, // 1 to select 8", 0 for 5"1/4 (which I knew what it means)
LC_FMMFM_bit = 7, // 1 to select single density, 0 for double
-
+
LC_FLPSD1_mask = (1 << LC_FLPSD1_bit),
LC_DE0_mask = (1 << LC_DE0_bit),
LC_DE1_mask = (1 << LC_DE1_bit),
@@ -209,22 +209,22 @@ READ8_MEMBER(concept_fdc_device::reg_r)
{
switch (offset)
{
- case 0: // LOCAL STATUS REG
+ case 0: // LOCAL STATUS REG
return m_fdc_local_status;
-
- case 8: // FDC STATUS REG
+
+ case 8: // FDC STATUS REG
return wd17xx_status_r(m_wd179x, space, offset);
-
- case 9: // FDC TRACK REG
+
+ case 9: // FDC TRACK REG
return wd17xx_track_r(m_wd179x, space, offset);
-
- case 10: // FDC SECTOR REG
+
+ case 10: // FDC SECTOR REG
return wd17xx_sector_r(m_wd179x, space, offset);
-
- case 11: // FDC DATA REG
+
+ case 11: // FDC DATA REG
return wd17xx_data_r(m_wd179x, space, offset);
}
-
+
return 0;
}
@@ -234,9 +234,9 @@ WRITE8_MEMBER(concept_fdc_device::reg_w)
switch (offset)
{
- case 0: // LOCAL COMMAND REG
+ case 0: // LOCAL COMMAND REG
m_fdc_local_command = data;
-
+
wd17xx_set_side(m_wd179x, (data & LC_FLPSD1_mask) != 0);
current_drive = ((data >> LC_DE0_bit) & 1) | ((data >> (LC_DE1_bit-1)) & 2);
wd17xx_set_drive(m_wd179x, current_drive);
@@ -246,20 +246,20 @@ WRITE8_MEMBER(concept_fdc_device::reg_w)
wd17xx_dden_w(m_wd179x, BIT(data, 7));
floppy_drive_set_ready_state(floppy_get_device(machine(), current_drive), 1, 0);
break;
-
- case 8: // FDC COMMAMD REG
+
+ case 8: // FDC COMMAMD REG
wd17xx_command_w(m_wd179x, space, offset, data);
break;
-
- case 9: // FDC TRACK REG
+
+ case 9: // FDC TRACK REG
wd17xx_track_w(m_wd179x, space, offset, data);
break;
-
- case 10: // FDC SECTOR REG
+
+ case 10: // FDC SECTOR REG
wd17xx_sector_w(m_wd179x, space, offset, data);
break;
-
- case 11: // FDC DATA REG
+
+ case 11: // FDC DATA REG
wd17xx_data_w(m_wd179x, space, offset, data);
break;
}
@@ -276,42 +276,42 @@ static LEGACY_FLOPPY_OPTIONS_START(concept)
#if 1
/* SSSD 8" */
LEGACY_FLOPPY_OPTION(concept, "img", "Corvus Concept 8\" SSSD disk image", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([77])
- SECTORS([26])
- SECTOR_LENGTH([128])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([77])
+ SECTORS([26])
+ SECTOR_LENGTH([128])
+ FIRST_SECTOR_ID([1]))
#elif 0
/* SSDD 8" (according to ROMs) */
LEGACY_FLOPPY_OPTION(concept, "img", "Corvus Concept 8\" SSDD disk image", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([1])
- TRACKS([77])
- SECTORS([26])
- SECTOR_LENGTH([256])
- FIRST_SECTOR_ID([1]))
+ HEADS([1])
+ TRACKS([77])
+ SECTORS([26])
+ SECTOR_LENGTH([256])
+ FIRST_SECTOR_ID([1]))
#elif 0
/* Apple II DSDD 5"1/4 (according to ROMs) */
LEGACY_FLOPPY_OPTION(concept, "img", "Corvus Concept Apple II 5\"1/4 DSDD disk image", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([2])
- TRACKS([35])
- SECTORS([16])
- SECTOR_LENGTH([256])
- FIRST_SECTOR_ID([1]))
+ HEADS([2])
+ TRACKS([35])
+ SECTORS([16])
+ SECTOR_LENGTH([256])
+ FIRST_SECTOR_ID([1]))
#elif 0
/* actual formats found */
LEGACY_FLOPPY_OPTION(concept, "img", "Corvus Concept 5\"1/4 DSDD disk image (256-byte sectors)", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([2])
- TRACKS([80])
- SECTORS([16])
- SECTOR_LENGTH([256])
- FIRST_SECTOR_ID([1]))
+ HEADS([2])
+ TRACKS([80])
+ SECTORS([16])
+ SECTOR_LENGTH([256])
+ FIRST_SECTOR_ID([1]))
#else
LEGACY_FLOPPY_OPTION(concept, "img", "Corvus Concept 5\"1/4 DSDD disk image (512-byte sectors)", basicdsk_identify_default, basicdsk_construct_default, NULL,
- HEADS([2])
- TRACKS([80])
- SECTORS([9])
- SECTOR_LENGTH([512])
- FIRST_SECTOR_ID([1]))
+ HEADS([2])
+ TRACKS([80])
+ SECTORS([9])
+ SECTOR_LENGTH([512])
+ FIRST_SECTOR_ID([1]))
#endif
LEGACY_FLOPPY_OPTIONS_END
@@ -358,13 +358,13 @@ READ8_MEMBER(concept_hdc_device::reg_r)
{
switch (offset)
{
- case 0: // HDC Data Register
+ case 0: // HDC Data Register
return corvus_hdc_data_r(space, offset);
-
- case 1: // HDC Status Register
+
+ case 1: // HDC Status Register
return corvus_hdc_status_r(space, offset);
}
-
+
return 0;
}
@@ -373,7 +373,7 @@ WRITE8_MEMBER(concept_hdc_device::reg_w)
{
switch (offset)
{
- case 0: // HDC Data Register
+ case 0: // HDC Data Register
corvus_hdc_data_w(space, offset, data);
break;
}
@@ -396,4 +396,3 @@ machine_config_constructor concept_hdc_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME(hdc);
}
-
diff --git a/src/mess/machine/concept_exp.h b/src/mess/machine/concept_exp.h
index 4c8e22d20e2..fc9fab4be13 100644
--- a/src/mess/machine/concept_exp.h
+++ b/src/mess/machine/concept_exp.h
@@ -54,12 +54,12 @@ class concept_exp_card_device : public device_slot_card_interface
public:
// construction/destruction
concept_exp_card_device(const machine_config &mconfig, device_t &device);
-
+
DECLARE_READ8_MEMBER( reg_r ) { return 0xff; }
DECLARE_READ8_MEMBER( rom_r ) { return 0xff; }
DECLARE_WRITE8_MEMBER( reg_w ) {}
DECLARE_WRITE8_MEMBER( rom_w ) {}
-
+
protected:
};
@@ -70,19 +70,19 @@ class concept_fdc_device : public device_t,
public:
// construction/destruction
concept_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
DECLARE_READ8_MEMBER(reg_r);
DECLARE_READ8_MEMBER(rom_r);
DECLARE_WRITE8_MEMBER(reg_w);
DECLARE_WRITE_LINE_MEMBER(intrq_w);
DECLARE_WRITE_LINE_MEMBER(drq_w);
-
+
// device-level overrides
virtual void device_start();
virtual void device_reset();
virtual machine_config_constructor device_mconfig_additions() const;
-
+
protected:
device_t *m_wd179x;
@@ -96,7 +96,7 @@ class concept_hdc_device : public device_t,
public:
// construction/destruction
concept_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
DECLARE_READ8_MEMBER( reg_r );
DECLARE_READ8_MEMBER( rom_r );
DECLARE_WRITE8_MEMBER( reg_w );
diff --git a/src/mess/machine/ds1315.c b/src/mess/machine/ds1315.c
index 632fb4fc02f..f5a9d0903c5 100644
--- a/src/mess/machine/ds1315.c
+++ b/src/mess/machine/ds1315.c
@@ -216,5 +216,3 @@ void ds1315_device::input_raw_data()
We always return the host's time when asked.
*/
}
-
-
diff --git a/src/mess/machine/ds1315.h b/src/mess/machine/ds1315.h
index e7ba2c1d58a..d4ab0cfb967 100644
--- a/src/mess/machine/ds1315.h
+++ b/src/mess/machine/ds1315.h
@@ -48,7 +48,7 @@ private:
void fill_raw_data();
void input_raw_data();
-
+
int m_count;
ds1315_mode_t m_mode;
UINT8 m_raw_data[8*8];
diff --git a/src/mess/machine/ep64_exdos.c b/src/mess/machine/ep64_exdos.c
index 4c7b5be1e5f..c587419f50f 100644
--- a/src/mess/machine/ep64_exdos.c
+++ b/src/mess/machine/ep64_exdos.c
@@ -12,7 +12,7 @@
Floppy Drive Controller PCB Layout
----------------------------------
-INTELLIGENT SOFTWARE LTD DISK CONTROLLER
+INTELLIGENT SOFTWARE LTD DISK CONTROLLER
ISS1
|--------------------------------------------|
| |
@@ -54,7 +54,7 @@ This PCB plugs into the external expansion connector on the right side of the ma
// MACROS/CONSTANTS
//**************************************************************************
-#define WD1770_TAG "u1"
+#define WD1770_TAG "u1"
@@ -180,18 +180,18 @@ void ep64_exdos_device::device_reset()
READ8_MEMBER( ep64_exdos_device::read )
{
/*
-
+
bit description
-
- 0
+
+ 0
1 INTRQ
- 2
- 3
- 4
- 5
+ 2
+ 3
+ 4
+ 5
6 DCHG
7 DRQ
-
+
*/
UINT8 data = 0;
@@ -212,9 +212,9 @@ READ8_MEMBER( ep64_exdos_device::read )
WRITE8_MEMBER( ep64_exdos_device::write )
{
/*
-
+
bit description
-
+
0 SELECT 0
1 SELECT 1
2 SELECT 2
@@ -223,7 +223,7 @@ WRITE8_MEMBER( ep64_exdos_device::write )
5 _DDEN
6 DISK CHANGE RESET
7 IN USE
-
+
*/
m_floppy = NULL;
diff --git a/src/mess/machine/ep64_exdos.h b/src/mess/machine/ep64_exdos.h
index 18f1561e288..8cc83b36d5e 100644
--- a/src/mess/machine/ep64_exdos.h
+++ b/src/mess/machine/ep64_exdos.h
@@ -26,7 +26,7 @@
// ======================> ep64_exdos_device
class ep64_exdos_device : public device_t,
- public device_ep64_expansion_bus_card_interface
+ public device_ep64_expansion_bus_card_interface
{
public:
// construction/destruction
diff --git a/src/mess/machine/ep64exp.h b/src/mess/machine/ep64exp.h
index 93d60d03f32..db2e89f27bd 100644
--- a/src/mess/machine/ep64exp.h
+++ b/src/mess/machine/ep64exp.h
@@ -57,7 +57,7 @@
// MACROS / CONSTANTS
//**************************************************************************
-#define EP64_EXPANSION_BUS_TAG "exp"
+#define EP64_EXPANSION_BUS_TAG "exp"
@@ -86,7 +86,7 @@
class device_ep64_expansion_bus_card_interface;
class ep64_expansion_bus_slot_device : public device_t,
- public device_slot_interface
+ public device_slot_interface
{
friend class device_ep64_expansion_bus_card_interface;
diff --git a/src/mess/machine/gba_rom.c b/src/mess/machine/gba_rom.c
index 1d2bf5c649a..3b2c081de21 100644
--- a/src/mess/machine/gba_rom.c
+++ b/src/mess/machine/gba_rom.c
@@ -1,12 +1,12 @@
/***********************************************************************************************************
-
+
Game Boy Advance cart emulation
We support carts with several kind of Save RAM (actual SRAM, Flash RAM or EEPROM)
-
-
+
+
***********************************************************************************************************/
@@ -120,7 +120,7 @@ void gba_rom_eeprom64_device::device_start()
{
astring tempstring;
m_rom = (UINT32 *)memregion(this->subtag(tempstring, "cartridge"))->base();
-
+
// for the moment we use a custom eeprom implementation, so we alloc/save it as nvram
nvram_alloc(machine(), 0x2000);
m_eeprom = auto_alloc(machine(), gba_eeprom_device(machine(), (UINT8*)get_nvram_base(), get_nvram_size(), 14));
@@ -140,7 +140,7 @@ READ32_MEMBER(gba_rom_sram_device::read_ram)
{
if (m_nvram && offset < m_nvram_size/4)
return m_nvram[offset];
- else // this cannot actually happen...
+ else // this cannot actually happen...
return 0xffffffff;
}
@@ -168,25 +168,25 @@ machine_config_constructor gba_rom_flash_device::device_mconfig_additions() cons
READ32_MEMBER(gba_rom_flash_device::read_ram)
{
UINT32 rv = 0;
-
+
offset &= m_flash_mask;
-
- if (mem_mask & 0xff)
+
+ if (mem_mask & 0xff)
rv |= m_flash->read(offset * 4);
- if (mem_mask & 0xff00)
+ if (mem_mask & 0xff00)
rv |= m_flash->read((offset * 4) + 1) << 8;
- if (mem_mask & 0xff0000)
+ if (mem_mask & 0xff0000)
rv |= m_flash->read((offset * 4) + 2) << 16;
- if (mem_mask & 0xff000000)
+ if (mem_mask & 0xff000000)
rv |= m_flash->read((offset * 4) + 3) << 24;
-
+
return rv;
}
WRITE32_MEMBER(gba_rom_flash_device::write_ram)
{
offset &= m_flash_mask;
-
+
switch (mem_mask)
{
case 0xff:
@@ -220,18 +220,18 @@ machine_config_constructor gba_rom_flash1m_device::device_mconfig_additions() co
READ32_MEMBER(gba_rom_flash1m_device::read_ram)
{
UINT32 rv = 0;
-
+
offset &= m_flash_mask;
- if (mem_mask & 0xff)
+ if (mem_mask & 0xff)
rv |= m_flash->read(offset * 4);
- if (mem_mask & 0xff00)
+ if (mem_mask & 0xff00)
rv |= m_flash->read((offset * 4) + 1) << 8;
- if (mem_mask & 0xff0000)
+ if (mem_mask & 0xff0000)
rv |= m_flash->read((offset * 4) + 2) << 16;
- if (mem_mask & 0xff000000)
+ if (mem_mask & 0xff000000)
rv |= m_flash->read((offset * 4) + 3) << 24;
-
+
return rv;
}
@@ -262,8 +262,8 @@ WRITE32_MEMBER(gba_rom_flash1m_device::write_ram)
/*-------------------------------------------------
Carts with EEPROM
-
- TODO: can this sketchy EEPROM device be merged
+
+ TODO: can this sketchy EEPROM device be merged
with the core implementation?
-------------------------------------------------*/
@@ -288,16 +288,16 @@ gba_eeprom_device::gba_eeprom_device(running_machine &machine, UINT8 *eeprom, UI
UINT32 gba_eeprom_device::read()
{
UINT32 out;
-
+
switch (m_state)
{
case EEP_IDLE:
// printf("eeprom_r: @ %x, mask %08x (state %d) (PC=%x) = %d\n", offset, ~mem_mask, m_state, activecpu_get_pc(), 1);
return 0x00010001; // "ready"
-
+
case EEP_READFIRST:
m_count--;
-
+
if (!m_count)
{
m_count = 64;
@@ -318,19 +318,19 @@ UINT32 gba_eeprom_device::read()
m_addr++;
m_bits = 8;
}
-
+
out = (m_eep_data & 0x80) ? 1 : 0;
out |= (out<<16);
m_eep_data <<= 1;
-
+
m_bits--;
m_count--;
-
+
if (!m_count)
{
m_state = EEP_IDLE;
}
-
+
// printf("out = %08x\n", out);
// printf("eeprom_r: @ %x, mask %08x (state %d) (PC=%x) = %08x\n", offset, ~mem_mask, m_state, activecpu_get_pc(), out);
return out;
@@ -348,7 +348,7 @@ void gba_eeprom_device::write(UINT32 data)
if (data == 1)
m_state++;
break;
-
+
case EEP_COMMAND:
if (data == 1)
m_command = EEP_READFIRST;
@@ -358,7 +358,7 @@ void gba_eeprom_device::write(UINT32 data)
m_count = m_addr_bits;
m_addr = 0;
break;
-
+
case EEP_ADDR:
m_addr <<= 1;
m_addr |= (data & 1);
@@ -377,7 +377,7 @@ void gba_eeprom_device::write(UINT32 data)
}
}
break;
-
+
case EEP_AFTERADDR:
m_state = m_command;
m_count = 64;
@@ -386,13 +386,13 @@ void gba_eeprom_device::write(UINT32 data)
if (m_state == EEP_READFIRST)
m_count = 4;
break;
-
+
case EEP_WRITE:
m_eep_data <<= 1;
m_eep_data |= (data & 1);
m_bits--;
m_count--;
-
+
if (m_bits == 0)
{
mame_printf_verbose("%08x: EEPROM: %02x to %x\n", machine().device("maincpu")->safe_pc(), m_eep_data, m_addr);
@@ -404,11 +404,11 @@ void gba_eeprom_device::write(UINT32 data)
m_eep_data = 0;
m_bits = 8;
}
-
+
if (!m_count)
m_state = EEP_AFTERWRITE;
break;
-
+
case EEP_AFTERWRITE:
m_state = EEP_IDLE;
break;
@@ -434,7 +434,7 @@ WRITE32_MEMBER(gba_rom_eeprom_device::write_ram)
if (~mem_mask == 0x0000ffff)
data >>= 16;
-
+
m_eeprom->write(data);
}
@@ -443,7 +443,7 @@ READ32_MEMBER(gba_rom_eeprom64_device::read_ram)
// Larger games have smaller access to EERPOM content
if (m_rom_size > (16 * 1024 * 1024) && offset < 0xffff00/4)
return 0xffffffff;
-
+
return m_eeprom->read();
}
@@ -452,10 +452,9 @@ WRITE32_MEMBER(gba_rom_eeprom64_device::write_ram)
// Larger games have smaller access to EEPROM content
if (m_rom_size > (16 * 1024 * 1024) && offset < 0xffff00/4)
return;
-
+
if (~mem_mask == 0x0000ffff)
data >>= 16;
-
+
m_eeprom->write(data);
}
-
diff --git a/src/mess/machine/gba_rom.h b/src/mess/machine/gba_rom.h
index bb232a649b3..d51de2b36c9 100644
--- a/src/mess/machine/gba_rom.h
+++ b/src/mess/machine/gba_rom.h
@@ -19,7 +19,7 @@ public:
virtual void device_start();
virtual const rom_entry *device_rom_region() const;
virtual void device_reset();
-
+
// reading and writing
virtual DECLARE_READ32_MEMBER(read_rom) { return m_rom[offset]; }
};
@@ -31,7 +31,7 @@ class gba_rom_sram_device : public gba_rom_device
public:
// construction/destruction
gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// reading and writing
virtual DECLARE_READ32_MEMBER(read_ram);
virtual DECLARE_WRITE32_MEMBER(write_ram);
@@ -44,11 +44,11 @@ class gba_rom_flash_device : public gba_rom_device
public:
// construction/destruction
gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_reset();
-
+
// reading and writing
virtual DECLARE_READ32_MEMBER(read_ram);
virtual DECLARE_WRITE32_MEMBER(write_ram);
@@ -66,15 +66,15 @@ class gba_rom_flash1m_device : public gba_rom_device
public:
// construction/destruction
gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_reset();
-
+
// reading and writing
virtual DECLARE_READ32_MEMBER(read_ram);
virtual DECLARE_WRITE32_MEMBER(write_ram);
-
+
private:
//UINT32 m_flash_size;
UINT32 m_flash_mask;
@@ -115,7 +115,7 @@ protected:
int m_bits;
int m_addr_bits;
UINT8 m_eep_data;
-
+
running_machine& m_machine;
};
@@ -127,10 +127,10 @@ class gba_rom_eeprom_device : public gba_rom_device
public:
// construction/destruction
gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
-
+
// reading and writing
virtual DECLARE_READ32_MEMBER(read_ram);
virtual DECLARE_WRITE32_MEMBER(write_ram);
@@ -147,14 +147,14 @@ class gba_rom_eeprom64_device : public gba_rom_device
public:
// construction/destruction
gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
-
+
// reading and writing
virtual DECLARE_READ32_MEMBER(read_ram);
virtual DECLARE_WRITE32_MEMBER(write_ram);
-
+
private:
gba_eeprom_device *m_eeprom;
};
diff --git a/src/mess/machine/gba_slot.c b/src/mess/machine/gba_slot.c
index 9a75d1ae50a..4486d07b0a9 100644
--- a/src/mess/machine/gba_slot.c
+++ b/src/mess/machine/gba_slot.c
@@ -159,7 +159,7 @@ bool gba_cart_slot_device::call_load()
{
UINT8 *ROM = (UINT8 *)m_cart->get_rom_base();
UINT32 cart_size;
-
+
if (software_entry() == NULL)
{
cart_size = length();
@@ -169,9 +169,9 @@ bool gba_cart_slot_device::call_load()
return IMAGE_INIT_FAIL;
}
fread(ROM, cart_size);
- m_cart->set_rom_size(cart_size); // we store the actual game size...
+ m_cart->set_rom_size(cart_size); // we store the actual game size...
- m_type = get_cart_type(ROM, cart_size);
+ m_type = get_cart_type(ROM, cart_size);
}
else
{
@@ -184,8 +184,8 @@ bool gba_cart_slot_device::call_load()
return IMAGE_INIT_FAIL;
}
memcpy(ROM, get_software_region("rom"), cart_size);
- m_cart->set_rom_size(cart_size); // we store the actual game size...
-
+ m_cart->set_rom_size(cart_size); // we store the actual game size...
+
if (pcb_name)
m_type = gba_get_pcb_id(pcb_name);
@@ -249,7 +249,7 @@ bool gba_cart_slot_device::call_softlist_load(char *swlist, char *swname, rom_en
/*-------------------------------------------------
- get_cart_type - code to detect NVRAM type from
+ get_cart_type - code to detect NVRAM type from
fullpath
-------------------------------------------------*/
@@ -305,16 +305,16 @@ int gba_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
chip |= GBA_CHIP_RTC;
}
mame_printf_info("GBA: Detected (ROM) %s\n", gba_chip_string(chip).cstr());
-
+
// fix for games which return more than one kind of chip: either it is one of the known titles, or we default to no battery
if (gba_chip_has_conflict(chip))
{
char game_code[5] = { 0 };
bool resolved = FALSE;
-
+
if (len >= 0xac + 4)
memcpy(game_code, ROM + 0xac, 4);
-
+
mame_printf_info("GBA: Game Code \"%s\"\n", game_code);
chip &= ~(GBA_CHIP_EEPROM | GBA_CHIP_EEPROM_4K | GBA_CHIP_EEPROM_64K | GBA_CHIP_FLASH | GBA_CHIP_FLASH_1M | GBA_CHIP_FLASH_512 | GBA_CHIP_SRAM);
@@ -333,7 +333,7 @@ int gba_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
if (!resolved)
mame_printf_warning("GBA: NVRAM is disabled because multiple NVRAM chips were detected!\n");
}
-
+
// fix for games which are known to require an eeprom with 14-bit addressing (64 kbit)
if (chip & GBA_CHIP_EEPROM)
{
@@ -341,7 +341,7 @@ int gba_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
if (len >= 0xac + 4)
memcpy(game_code, ROM + 0xac, 4);
-
+
mame_printf_info("GBA: Game Code \"%s\"\n", game_code);
for (int i = 0; i < sizeof(gba_chip_fix_eeprom_list) / sizeof(gba_chip_fix_eeprom_item); i++)
@@ -462,7 +462,7 @@ void gba_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len)
/*-------------------------------------------------
- Install ROM - directly point system address map
+ Install ROM - directly point system address map
to the cart ROM region so to avoid the memory
system additional load
-------------------------------------------------*/
@@ -481,4 +481,3 @@ void gba_cart_slot_device::install_rom()
machine().root_device().membank("rom3")->set_base(machine().root_device().memregion(m_cart->device().subtag(tempstring, "cartridge"))->base());
}
}
-
diff --git a/src/mess/machine/gba_slot.h b/src/mess/machine/gba_slot.h
index 119d0d31aa8..efb3c9077a5 100644
--- a/src/mess/machine/gba_slot.h
+++ b/src/mess/machine/gba_slot.h
@@ -42,9 +42,9 @@ public:
void set_rom_size(UINT32 val) { m_rom_size = val; }
// internal state
- UINT32 *m_rom; // this points to the cart rom region
+ UINT32 *m_rom; // this points to the cart rom region
UINT32 *m_nvram;
- UINT32 m_rom_size; // this is the actual game size, not the rom region size!
+ UINT32 m_rom_size; // this is the actual game size, not the rom region size!
UINT32 m_nvram_size;
};
@@ -119,9 +119,9 @@ extern const device_type GBA_CART_SLOT;
//------------------------------------------------------------------------
-//
+//
// Misc structs to attempt NVRAM identification when loading from fullpath
-//
+//
//------------------------------------------------------------------------
diff --git a/src/mess/machine/intv.c b/src/mess/machine/intv.c
index 0119b6b992d..21205d72adc 100644
--- a/src/mess/machine/intv.c
+++ b/src/mess/machine/intv.c
@@ -250,7 +250,7 @@ READ16_MEMBER( intv_state::intv_stic_r )
{
if (m_bus_copy_mode || !m_stic->read_stic_handshake())
return m_stic->read(space, offset, mem_mask);
- else
+ else
return offset;
}
@@ -266,8 +266,8 @@ READ16_MEMBER( intv_state::intv_gram_r )
//logerror("read: %d = GRAM(%d)\n",state->m_gram[offset],offset);
if (m_bus_copy_mode || !m_stic->read_stic_handshake())
return m_stic->gram_read(space, offset, mem_mask);
- else
- return offset;
+ else
+ return offset;
}
WRITE16_MEMBER( intv_state::intv_gram_w )
@@ -345,7 +345,7 @@ WRITE16_MEMBER( intv_state::ecs_bank2_page_select )
if (data == 0x7a50)
{
m_ecs_bank_src[1] = 1;
- m_bank2->set_base(m_bank_base[m_ecs_bank_src[1]] + (0x7000 << 1)); // ECS ROM at 0x7000 is on page 1
+ m_bank2->set_base(m_bank_base[m_ecs_bank_src[1]] + (0x7000 << 1)); // ECS ROM at 0x7000 is on page 1
}
else if (data == 0x7a51 )
{
@@ -619,10 +619,10 @@ void intv_state::machine_reset()
if (m_is_ecs)
{
// ECS can switch between the maincpu and the ecs roms
- m_ecs_bank_src[0] = 0; // CPU
- m_ecs_bank_src[1] = 1; // ECS
- m_ecs_bank_src[2] = 0; // CPU
- m_ecs_bank_src[3] = 0; // CPU
+ m_ecs_bank_src[0] = 0; // CPU
+ m_ecs_bank_src[1] = 1; // ECS
+ m_ecs_bank_src[2] = 0; // CPU
+ m_ecs_bank_src[3] = 0; // CPU
m_bank_base[0] = m_region_maincpu->base();
m_bank_base[1] = m_region_ecs_rom->base();
m_bank1->set_base(m_bank_base[m_ecs_bank_src[0]] + (0x2000 << 1));
@@ -684,7 +684,7 @@ void intv_state::machine_start()
save_item(NAME(m_ecs_bank_src));
machine().save().register_postload(save_prepost_delegate(FUNC(intv_state::ecs_banks_restore), this));
}
-
+
// intvkbd
if (m_is_keybd)
{
diff --git a/src/mess/machine/mboard.c b/src/mess/machine/mboard.c
index 6650de7ab63..a669df137e1 100644
--- a/src/mess/machine/mboard.c
+++ b/src/mess/machine/mboard.c
@@ -109,11 +109,11 @@ data: 0 0000 0000 all fields occupied
else
{
/* looking for a piece in this line and clear bit in data if found */
-
+
for (i_AH = 0; i_AH < 8; i_AH = i_AH + 1)
if (IsPiece(64 - (i_18 * 8 + 8 - i_AH)))
data &= ~(1 << i_AH); // clear bit
-
+
read_board_flag = TRUE;
}
}
diff --git a/src/mess/machine/mc68328.c b/src/mess/machine/mc68328.c
index 732f8839661..89fbb7be55b 100644
--- a/src/mess/machine/mc68328.c
+++ b/src/mess/machine/mc68328.c
@@ -47,7 +47,7 @@ void mc68328_device::device_config_complete()
const mc68328_interface *intf = reinterpret_cast<const mc68328_interface *>(static_config());
if (intf != NULL)
*static_cast<mc68328_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -84,7 +84,7 @@ void mc68328_device::device_config_complete()
//-------------------------------------------------
void mc68328_device::device_start()
-{
+{
m_out_port_a.resolve(m_out_port_a_func, *this);
m_out_port_b.resolve(m_out_port_b_func, *this);
m_out_port_c.resolve(m_out_port_c_func, *this);
@@ -95,7 +95,7 @@ void mc68328_device::device_start()
m_out_port_j.resolve(m_out_port_j_func, *this);
m_out_port_k.resolve(m_out_port_k_func, *this);
m_out_port_m.resolve(m_out_port_m_func, *this);
-
+
m_in_port_a.resolve(m_in_port_a_func, *this);
m_in_port_b.resolve(m_in_port_b_func, *this);
m_in_port_c.resolve(m_in_port_c_func, *this);
@@ -108,7 +108,7 @@ void mc68328_device::device_start()
m_in_port_m.resolve(m_in_port_m_func, *this);
m_out_pwm.resolve(m_out_pwm_func, *this);
-
+
m_out_spim.resolve(m_out_spim_func, *this);
m_in_spim.resolve(m_in_spim_func, *this);
@@ -155,18 +155,18 @@ void mc68328_device::device_reset()
m_regs.csd1 = 0x00010006;
m_regs.csd2 = 0x00010006;
m_regs.csd3 = 0x00010006;
-
+
m_regs.pllcr = 0x2400;
m_regs.pllfsr = 0x0123;
m_regs.pctlr = 0x1f;
-
+
m_regs.ivr = 0x00;
m_regs.icr = 0x0000;
m_regs.imr = 0x00ffffff;
m_regs.iwr = 0x00ffffff;
m_regs.isr = 0x00000000;
m_regs.ipr = 0x00000000;
-
+
m_regs.padir = 0x00;
m_regs.padata = 0x00;
m_regs.pasel = 0x00;
@@ -206,12 +206,12 @@ void mc68328_device::device_reset()
m_regs.pmdata = 0x00;
m_regs.pmpuen = 0xff;
m_regs.pmsel = 0xff;
-
+
m_regs.pwmc = 0x0000;
m_regs.pwmp = 0x0000;
m_regs.pwmw = 0x0000;
m_regs.pwmcnt = 0x0000;
-
+
m_regs.tctl[0] = m_regs.tctl[1] = 0x0000;
m_regs.tprer[0] = m_regs.tprer[1] = 0x0000;
m_regs.tcmp[0] = m_regs.tcmp[1] = 0xffff;
@@ -221,18 +221,18 @@ void mc68328_device::device_reset()
m_regs.wctlr = 0x0000;
m_regs.wcmpr = 0xffff;
m_regs.wcn = 0x0000;
-
+
m_regs.spisr = 0x0000;
-
+
m_regs.spimdata = 0x0000;
m_regs.spimcont = 0x0000;
-
+
m_regs.ustcnt = 0x0000;
m_regs.ubaud = 0x003f;
m_regs.urx = 0x0000;
m_regs.utx = 0x0000;
m_regs.umisc = 0x0000;
-
+
m_regs.lssa = 0x00000000;
m_regs.lvpw = 0xff;
m_regs.lxmax = 0x03ff;
@@ -251,14 +251,14 @@ void mc68328_device::device_reset()
m_regs.lposr = 0x00;
m_regs.lfrcm = 0xb9;
m_regs.lgpmr = 0x1073;
-
+
m_regs.hmsr = 0x00000000;
m_regs.alarm = 0x00000000;
m_regs.rtcctl = 0x00;
m_regs.rtcisr = 0x00;
m_regs.rtcienr = 0x00;
m_regs.stpwtch = 0x00;
-
+
m_rtc->adjust(attotime::from_hz(1), 0, attotime::from_hz(1));
}
@@ -2735,13 +2735,13 @@ UINT32 mc68328_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap
UINT16 word;
UINT16 *line;
int y, x, b;
-
+
if (m_regs.lckcon & LCKCON_LCDC_EN)
{
for (y = 0; y < 160; y++)
{
line = &bitmap.pix16(y);
-
+
for (x = 0; x < 160; x += 16)
{
word = *(video_ram++);
@@ -2757,7 +2757,7 @@ UINT32 mc68328_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap
for (y = 0; y < 160; y++)
{
line = &bitmap.pix16(y);
-
+
for (x = 0; x < 160; x++)
{
line[x] = 0;
@@ -2905,4 +2905,3 @@ void mc68328_device::register_state_save()
save_item(NAME(m_regs.rtcienr));
save_item(NAME(m_regs.stpwtch));
}
-
diff --git a/src/mess/machine/mc68328.h b/src/mess/machine/mc68328.h
index 617c21e7f9a..78ed79fa43b 100644
--- a/src/mess/machine/mc68328.h
+++ b/src/mess/machine/mc68328.h
@@ -1,14 +1,14 @@
/**********************************************************************
-
+
Motorola 68328 ("DragonBall") System-on-a-Chip implementation
-
+
By MooglyGuy
contact mooglyguy@gmail.com with licensing and usage questions.
-
+
**********************************************************************/
/*****************************************************************************************************************
-
+
P P P P P P P P P P P P P P
E E E E E E E J J J J J J J
1 2 3 4 5 6 7 0 1 2 3 4 5 6
@@ -80,11 +80,11 @@
1 2 P
I
O
-
+
Figure 12-1. MC68328 144-Lead Plastic Thin-Quad Flat Pack Pin Assignment
-
+
Source: MC68328 (DragonBall)(tm) Integrated Processor User's Manual
-
+
*****************************************************************************************************************/
#ifndef __MC68328_H__
@@ -412,7 +412,7 @@
struct mc68328_interface
{
const char *m68k_cpu_tag;
-
+
devcb_write8 m_out_port_a_func; /* 8-bit output */
devcb_write8 m_out_port_b_func; /* 8-bit output */
devcb_write8 m_out_port_c_func; /* 8-bit output */
@@ -423,7 +423,7 @@ struct mc68328_interface
devcb_write8 m_out_port_j_func; /* 8-bit output */
devcb_write8 m_out_port_k_func; /* 8-bit output */
devcb_write8 m_out_port_m_func; /* 8-bit output */
-
+
devcb_read8 m_in_port_a_func; /* 8-bit input */
devcb_read8 m_in_port_b_func; /* 8-bit input */
devcb_read8 m_in_port_c_func; /* 8-bit input */
@@ -434,9 +434,9 @@ struct mc68328_interface
devcb_read8 m_in_port_j_func; /* 8-bit input */
devcb_read8 m_in_port_k_func; /* 8-bit input */
devcb_read8 m_in_port_m_func; /* 8-bit input */
-
+
devcb_write8 m_out_pwm_func; /* 1-bit output */
-
+
devcb_write16 m_out_spim_func; /* 16-bit output */
devcb_read16 m_in_spim_func; /* 16-bit input */
@@ -449,7 +449,7 @@ struct mc68328_regs_t
// $(FF)FFF000
UINT8 scr; // System Control Register
UINT8 unused0[255];
-
+
// $(FF)FFF100
UINT16 grpbasea; // Chip Select Group A Base Register
UINT16 grpbaseb; // Chip Select Group B Base Register
@@ -476,14 +476,14 @@ struct mc68328_regs_t
UINT32 csd2; // Group D Chip Select 2 Register
UINT32 csd3; // Group D Chip Select 3 Register
UINT8 unused1[176];
-
+
// $(FF)FFF200
UINT16 pllcr; // PLL Control Register
UINT16 pllfsr; // PLL Frequency Select Register
UINT8 pad2[3];
UINT8 pctlr; // Power Control Register
UINT8 unused3[248];
-
+
// $(FF)FFF300
UINT8 ivr; // Interrupt Vector Register
UINT8 unused4[1];
@@ -493,26 +493,26 @@ struct mc68328_regs_t
UINT32 isr; // Interrupt Status Register
UINT32 ipr; // Interrupt Pending Register
UINT8 unused5[236];
-
+
// $(FF)FFF400
UINT8 padir; // Port A Direction Register
UINT8 padata; // Port A Data Register
UINT8 unused6[1];
UINT8 pasel; // Port A Select Register
UINT8 unused7[4];
-
+
UINT8 pbdir; // Port B Direction Register
UINT8 pbdata; // Port B Data Register
UINT8 unused8[1];
UINT8 pbsel; // Port B Select Register
UINT8 unused9[4];
-
+
UINT8 pcdir; // Port C Direction Register
UINT8 pcdata; // Port C Data Register
UINT8 unused10[1];
UINT8 pcsel; // Port C Select Register
UINT8 unused11[4];
-
+
UINT8 pddir; // Port D Direction Register
UINT8 pddata; // Port D Data Register
UINT8 pdpuen; // Port D Pullup Enable Register
@@ -521,25 +521,25 @@ struct mc68328_regs_t
UINT8 pdirqen; // Port D IRQ Enable Register
UINT8 pddataedge; // Port D Data Edge Level
UINT8 pdirqedge; // Port D IRQ Edge Register
-
+
UINT8 pedir; // Port E Direction Register
UINT8 pedata; // Port E Data Register
UINT8 pepuen; // Port E Pullup Enable Register
UINT8 pesel; // Port E Select Register
UINT8 unused14[4];
-
+
UINT8 pfdir; // Port F Direction Register
UINT8 pfdata; // Port F Data Register
UINT8 pfpuen; // Port F Pullup Enable Register
UINT8 pfsel; // Port F Select Register
UINT8 unused15[4];
-
+
UINT8 pgdir; // Port G Direction Register
UINT8 pgdata; // Port G Data Register
UINT8 pgpuen; // Port G Pullup Enable Register
UINT8 pgsel; // Port G Select Register
UINT8 unused16[4];
-
+
UINT8 pjdir; // Port J Direction Register
UINT8 pjdata; // Port J Data Register
UINT8 unused17[1];
@@ -550,20 +550,20 @@ struct mc68328_regs_t
UINT8 pkpuen; // Port K Pullup Enable Register
UINT8 pksel; // Port K Select Register
UINT8 unused19[4];
-
+
UINT8 pmdir; // Port M Direction Register
UINT8 pmdata; // Port M Data Register
UINT8 pmpuen; // Port M Pullup Enable Register
UINT8 pmsel; // Port M Select Register
UINT8 unused20[180];
-
+
// $(FF)FFF500
UINT16 pwmc; // PWM Control Register
UINT16 pwmp; // PWM Period Register
UINT16 pwmw; // PWM Width Register
UINT16 pwmcnt; // PWN Counter
UINT8 unused21[248];
-
+
// $(FF)FFF600
UINT16 tctl[2]; // Timer Control Register
UINT16 tprer[2]; // Timer Prescaler Register
@@ -576,16 +576,16 @@ struct mc68328_regs_t
UINT16 wcn; // Watchdog Counter
UINT8 tclear[2]; // Timer Clearable Status
UINT8 unused22[224];
-
+
// $(FF)FFF700
UINT16 spisr; // SPIS Register
UINT8 unused23[254];
-
+
// $(FF)FFF800
UINT16 spimdata; // SPIM Data Register
UINT16 spimcont; // SPIM Control/Status Register
UINT8 unused24[252];
-
+
// $(FF)FFF900
UINT16 ustcnt; // UART Status/Control Register
UINT16 ubaud; // UART Baud Control Register
@@ -593,7 +593,7 @@ struct mc68328_regs_t
UINT16 utx; // UART TX Register
UINT16 umisc; // UART Misc Register
UINT8 unused25[246];
-
+
// $(FF)FFFA00
UINT32 lssa; // Screen Starting Address Register
UINT8 unused26[1];
@@ -625,7 +625,7 @@ struct mc68328_regs_t
UINT8 lfrcm; // Frame Rate Control Modulation Register
UINT16 lgpmr; // Gray Palette Mapping Register
UINT8 unused37[204];
-
+
// $(FF)FFFB00
UINT32 hmsr; // RTC Hours Minutes Seconds Register
UINT32 alarm; // RTC Alarm Register
@@ -657,15 +657,15 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
-private:
+
+private:
// internal state
void set_interrupt_line(UINT32 line, UINT32 active);
void poll_port_d_interrupts();
UINT32 get_timer_frequency(UINT32 index);
void maybe_start_timer(UINT32 index, UINT32 new_enable);
void timer_compare_event(UINT32 index);
-
+
void register_state_save();
TIMER_CALLBACK_MEMBER(timer1_hit);
@@ -674,11 +674,11 @@ private:
TIMER_CALLBACK_MEMBER(rtc_tick);
mc68328_regs_t m_regs;
-
+
emu_timer *m_gptimer[2];
emu_timer *m_rtc;
emu_timer *m_pwm;
-
+
devcb_resolved_write8 m_out_port_a; /* 8-bit output */
devcb_resolved_write8 m_out_port_b; /* 8-bit output */
devcb_resolved_write8 m_out_port_c; /* 8-bit output */
@@ -689,7 +689,7 @@ private:
devcb_resolved_write8 m_out_port_j; /* 8-bit output */
devcb_resolved_write8 m_out_port_k; /* 8-bit output */
devcb_resolved_write8 m_out_port_m; /* 8-bit output */
-
+
devcb_resolved_read8 m_in_port_a; /* 8-bit input */
devcb_resolved_read8 m_in_port_b; /* 8-bit input */
devcb_resolved_read8 m_in_port_c; /* 8-bit input */
@@ -700,13 +700,13 @@ private:
devcb_resolved_read8 m_in_port_j; /* 8-bit input */
devcb_resolved_read8 m_in_port_k; /* 8-bit input */
devcb_resolved_read8 m_in_port_m; /* 8-bit input */
-
+
devcb_resolved_write8 m_out_pwm; /* 1-bit output */
-
+
devcb_resolved_write16 m_out_spim; /* 16-bit output */
devcb_resolved_read16 m_in_spim; /* 16-bit input */
- devcb_resolved_write_line m_spim_xch_trigger; // not really a write_line, fix when converting to devcb2!
+ devcb_resolved_write_line m_spim_xch_trigger; // not really a write_line, fix when converting to devcb2!
cpu_device *m_cpu;
};
diff --git a/src/mess/machine/md_rom.c b/src/mess/machine/md_rom.c
index 93fc21639db..17d3113284e 100644
--- a/src/mess/machine/md_rom.c
+++ b/src/mess/machine/md_rom.c
@@ -1212,7 +1212,7 @@ WRITE16_MEMBER(md_rom_tekkensp_device::write)
// data output mode bit 1 ? (never written by game)
break;
default:
- if (data & 0x100) // data input (only connected to D0 ?)
+ if (data & 0x100) // data input (only connected to D0 ?)
{
// 4-bit hardware register ($400004 corresponds to bit0, $400006 to bit1, etc)
int shift = (offset - 2) & 3;
diff --git a/src/mess/machine/md_rom.h b/src/mess/machine/md_rom.h
index 890e6287db6..6cd16d477d2 100644
--- a/src/mess/machine/md_rom.h
+++ b/src/mess/machine/md_rom.h
@@ -155,7 +155,7 @@ class md_rom_16mj2_device : public md_std_rom_device
public:
// construction/destruction
md_rom_16mj2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
};
@@ -447,15 +447,15 @@ class md_rom_tekkensp_device : public md_std_rom_device
public:
// construction/destruction
md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
virtual DECLARE_WRITE16_MEMBER(write);
-
+
private:
UINT16 m_reg;
};
diff --git a/src/mess/machine/msx.c b/src/mess/machine/msx.c
index 8df2039e0ad..a76d1ba0aa2 100644
--- a/src/mess/machine/msx.c
+++ b/src/mess/machine/msx.c
@@ -858,7 +858,7 @@ void msx_state::msx_memory_init()
size = layout->size;
option = layout->option;
-
+
if (layout->type != SLOT_CARTRIDGE1 && layout->type != SLOT_CARTRIDGE2)
{
int size_tmp = 0;
diff --git a/src/mess/machine/pce.c b/src/mess/machine/pce.c
index 0e8925a009b..daee087e3b5 100644
--- a/src/mess/machine/pce.c
+++ b/src/mess/machine/pce.c
@@ -120,7 +120,7 @@ MACHINE_RESET_MEMBER(pce_state,mess_pce)
m_sys3_card = 1;
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x080000, 0x087fff, read8_delegate(FUNC(pce_state::pce_cd_acard_wram_r),this),write8_delegate(FUNC(pce_state::pce_cd_acard_wram_w),this));
}
-
+
if (m_cartslot->get_type() == PCE_CDSYS3U)
{
m_sys3_card = 3;
@@ -213,7 +213,7 @@ WRITE8_MEMBER(pce_state::pce_cd_intf_w)
if (offset & 0x200 && m_sys3_card && m_acard) // route Arcade Card handling ports
return m_cd->acard_w(space, offset, data);
-
+
m_cd->intf_w(space, offset, data);
m_cd->update();
@@ -238,7 +238,7 @@ READ8_MEMBER(pce_state::pce_cd_intf_r)
case 0xc7: return 0x03;
}
}
-
+
return m_cd->intf_r(space, offset);
}
diff --git a/src/mess/machine/pce_cd.c b/src/mess/machine/pce_cd.c
index ca08ef6847a..3050fc6e989 100644
--- a/src/mess/machine/pce_cd.c
+++ b/src/mess/machine/pce_cd.c
@@ -98,30 +98,30 @@ void pce_cd_device::device_start()
/* set up adpcm related things */
m_adpcm_ram = auto_alloc_array_clear(machine(), UINT8, PCE_ADPCM_RAM_SIZE);
m_adpcm_clock_divider = 1;
-
+
/* Set up cd command buffer */
m_command_buffer = auto_alloc_array_clear(machine(), UINT8, PCE_CD_COMMAND_BUFFER_SIZE);
m_command_buffer_index = 0;
-
+
/* Set up Arcade Card RAM buffer */
m_acard_ram = auto_alloc_array_clear(machine(), UINT8, PCE_ACARD_RAM_SIZE);
-
+
m_data_buffer = auto_alloc_array_clear(machine(), UINT8, 8192);
m_data_buffer_size = 0;
m_data_buffer_index = 0;
-
+
m_subcode_buffer = auto_alloc_array(machine(), UINT8, 96);
-
+
m_data_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pce_cd_device::data_timer_callback),this));
m_data_timer->adjust(attotime::never);
m_adpcm_dma_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pce_cd_device::adpcm_dma_timer_callback),this));
m_adpcm_dma_timer->adjust(attotime::never);
-
+
m_cdda_fadeout_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pce_cd_device::cdda_fadeout_callback),this));
m_cdda_fadeout_timer->adjust(attotime::never);
m_cdda_fadein_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pce_cd_device::cdda_fadein_callback),this));
m_cdda_fadein_timer->adjust(attotime::never);
-
+
m_adpcm_fadeout_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pce_cd_device::adpcm_fadeout_callback),this));
m_adpcm_fadeout_timer->adjust(attotime::never);
m_adpcm_fadein_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pce_cd_device::adpcm_fadein_callback),this));
@@ -187,16 +187,16 @@ void pce_cd_device::device_start()
}
void pce_cd_device::device_reset()
-{
+{
m_adpcm_read_buf = 0;
m_adpcm_write_buf = 0;
-
+
// TODO: add CD-DA stop command here
//m_cdda_status = PCE_CD_CDDA_OFF;
//m_cdda->stop_audio();
memset(m_regs, 0, sizeof(m_regs));
-
+
m_regs[0x0c] |= PCE_CD_ADPCM_STOP_FLAG;
m_regs[0x0c] &= ~PCE_CD_ADPCM_PLAY_FLAG;
//m_regs[0x03] = (m_regs[0x03] & ~0x0c) | (PCE_CD_SAMPLE_STOP_PLAY);
@@ -286,28 +286,28 @@ void pce_cd_device::adpcm_play()
WRITE_LINE_MEMBER( pce_cd_device::msm5205_int )
{
UINT8 msm_data;
-
+
// popmessage("%08x %08x %08x %02x %02x",m_msm_start_addr,m_msm_end_addr,m_msm_half_addr,m_regs[0x0c],m_regs[0x0d]);
-
+
if (m_msm_idle)
return;
-
+
/* Supply new ADPCM data */
msm_data = (m_msm_nibble) ? (m_adpcm_ram[m_msm_start_addr] & 0x0f) : ((m_adpcm_ram[m_msm_start_addr] & 0xf0) >> 4);
-
+
m_msm->data_w(msm_data);
m_msm_nibble ^= 1;
-
+
if (m_msm_nibble == 0)
{
m_msm_start_addr++;
-
+
if (m_msm_start_addr == m_msm_half_addr)
{
//set_irq_line(PCE_CD_IRQ_SAMPLE_FULL_PLAY, CLEAR_LINE);
//set_irq_line(PCE_CD_IRQ_SAMPLE_HALF_PLAY, ASSERT_LINE);
}
-
+
if (m_msm_start_addr > m_msm_end_addr)
{
//set_irq_line(PCE_CD_IRQ_SAMPLE_HALF_PLAY, CLEAR_LINE);
@@ -328,7 +328,7 @@ void pce_cd_device::reply_status_byte(UINT8 status)
m_scsi_MSG = 0;
m_message_after_status = 1;
m_status_sent = m_message_sent = 0;
-
+
if (status == SCSI_STATUS_OK)
{
m_regs[0x01] = 0x00;
@@ -361,24 +361,24 @@ void pce_cd_device::read_6()
UINT32 frame = ((m_command_buffer[1] & 0x1f) << 16) | (m_command_buffer[2] << 8) | m_command_buffer[3];
UINT32 frame_count = m_command_buffer[4];
printf("%08x %08x\n",frame,frame_count);
-
+
/* Check for presence of a CD */
if (!m_cd_file)
{
reply_status_byte(SCSI_CHECK_CONDITION);
return;
}
-
+
if (m_cdda_status != PCE_CD_CDDA_OFF)
{
m_cdda_status = PCE_CD_CDDA_OFF;
m_cdda->stop_audio();
m_end_mark = 0;
}
-
+
m_current_frame = frame;
m_end_frame = frame + frame_count;
-
+
if (frame_count == 0)
{
/* Star Breaker uses this */
@@ -389,7 +389,7 @@ void pce_cd_device::read_6()
{
m_data_timer->adjust(attotime::from_hz(PCE_CD_DATA_FRAMES_PER_SECOND), 0, attotime::from_hz(PCE_CD_DATA_FRAMES_PER_SECOND));
}
-
+
/* TODO: correct place? */
set_irq_line(PCE_CD_IRQ_TRANSFER_READY, ASSERT_LINE);
}
@@ -398,14 +398,14 @@ void pce_cd_device::read_6()
void pce_cd_device::nec_set_audio_start_position()
{
UINT32 frame = 0;
-
+
if (!m_cd_file)
{
/* Throw some error here */
reply_status_byte(SCSI_CHECK_CONDITION);
return;
}
-
+
switch (m_command_buffer[9] & 0xC0)
{
case 0x00:
@@ -415,11 +415,11 @@ void pce_cd_device::nec_set_audio_start_position()
case 0x40:
{
UINT8 m,s,f;
-
+
m = bcd_2_dec(m_command_buffer[2]);
s = bcd_2_dec(m_command_buffer[3]);
f = bcd_2_dec(m_command_buffer[4]);
-
+
frame = f + 75 * (s + m * 60);
// PCE tries to be clever here and set (start of track + track pregap size) to skip the pregap
// (I guess it wants the TOC to have the real start sector for data tracks and the start of the pregap for audio?)
@@ -434,9 +434,9 @@ void pce_cd_device::nec_set_audio_start_position()
//assert(NULL == nec_set_audio_start_position);
break;
}
-
+
m_current_frame = frame;
-
+
if (m_cdda_status == PCE_CD_CDDA_PAUSED)
{
m_cdda_status = PCE_CD_CDDA_OFF;
@@ -463,7 +463,7 @@ void pce_cd_device::nec_set_audio_start_position()
m_cdda_play_mode = 3;
}
}
-
+
reply_status_byte(SCSI_STATUS_OK);
set_irq_line(PCE_CD_IRQ_TRANSFER_DONE, ASSERT_LINE);
}
@@ -472,14 +472,14 @@ void pce_cd_device::nec_set_audio_start_position()
void pce_cd_device::nec_set_audio_stop_position()
{
UINT32 frame = 0;
-
+
if (!m_cd_file)
{
/* Throw some error here */
reply_status_byte(SCSI_CHECK_CONDITION);
return;
}
-
+
switch (m_command_buffer[9] & 0xC0)
{
case 0x00:
@@ -489,11 +489,11 @@ void pce_cd_device::nec_set_audio_stop_position()
case 0x40:
{
UINT8 m,s,f;
-
+
m = bcd_2_dec(m_command_buffer[2]);
s = bcd_2_dec(m_command_buffer[3]);
f = bcd_2_dec(m_command_buffer[4]);
-
+
frame = f + 75 * (s + m * 60);
// if (frame >= 525) // TODO: seven seconds gap? O_o
// frame -= 525;
@@ -507,10 +507,10 @@ void pce_cd_device::nec_set_audio_stop_position()
//assert(NULL == nec_set_audio_start_position);
break;
}
-
+
m_end_frame = frame;
m_cdda_play_mode = m_command_buffer[1] & 0x03;
-
+
if (m_cdda_play_mode)
{
if (m_cdda_status == PCE_CD_CDDA_PAUSED)
@@ -533,7 +533,7 @@ void pce_cd_device::nec_set_audio_stop_position()
m_end_mark = 0;
// assert(NULL == nec_set_audio_stop_position);
}
-
+
reply_status_byte(SCSI_STATUS_OK);
set_irq_line(PCE_CD_IRQ_TRANSFER_DONE, ASSERT_LINE);
}
@@ -547,14 +547,14 @@ void pce_cd_device::nec_pause()
reply_status_byte(SCSI_CHECK_CONDITION);
return;
}
-
+
/* If there was no cdda playing, throw an error */
if (m_cdda_status == PCE_CD_CDDA_OFF)
{
reply_status_byte(SCSI_CHECK_CONDITION);
return;
}
-
+
m_cdda_status = PCE_CD_CDDA_PAUSED;
m_current_frame = m_cdda->get_audio_lba();
m_cdda->pause_audio(1);
@@ -566,16 +566,16 @@ void pce_cd_device::nec_get_subq()
{
/* WP - I do not have access to chds with subchannel information yet, so I'm faking something here */
UINT32 msf_abs, msf_rel, track, frame;
-
+
if (!m_cd_file)
{
/* Throw some error here */
reply_status_byte(SCSI_CHECK_CONDITION);
return;
}
-
+
frame = m_current_frame;
-
+
switch (m_cdda_status)
{
case PCE_CD_CDDA_PAUSED:
@@ -590,11 +590,11 @@ void pce_cd_device::nec_get_subq()
m_data_buffer[0] = 3;
break;
}
-
+
msf_abs = lba_to_msf_alt(frame);
track = cdrom_get_track(m_cd_file, frame);
msf_rel = lba_to_msf_alt(frame - cdrom_get_track_start(m_cd_file, track));
-
+
m_data_buffer[1] = 0x01 | ((cdrom_get_track_type(m_cd_file, cdrom_get_track(m_cd_file, track+1)) == CD_TRACK_AUDIO) ? 0x00 : 0x40);
m_data_buffer[2] = dec_2_bcd(track+1); /* track */
m_data_buffer[3] = 1; /* index */
@@ -605,7 +605,7 @@ void pce_cd_device::nec_get_subq()
m_data_buffer[8] = dec_2_bcd((msf_abs >> 8) & 0xFF); /* S (absolute) */
m_data_buffer[9] = dec_2_bcd(msf_abs & 0xFF); /* F (absolute) */
m_data_buffer_size = 10;
-
+
m_data_buffer_index = 0;
m_data_transferred = 1;
m_scsi_IO = 1;
@@ -618,15 +618,15 @@ void pce_cd_device::nec_get_dir_info()
UINT32 frame, msf, track = 0;
const cdrom_toc *toc;
logerror("nec get dir info\n");
-
+
if (!m_cd_file)
{
/* Throw some error here */
reply_status_byte(SCSI_CHECK_CONDITION);
}
-
+
toc = cdrom_get_toc(m_cd_file);
-
+
switch (m_command_buffer[1])
{
case 0x00: /* Get first and last track numbers */
@@ -638,7 +638,7 @@ void pce_cd_device::nec_get_dir_info()
frame = toc->tracks[toc->numtrks-1].logframeofs;
frame += toc->tracks[toc->numtrks-1].frames;
msf = lba_to_msf(frame + 150);
-
+
m_data_buffer[0] = (msf >> 16) & 0xFF; /* M */
m_data_buffer[1] = (msf >> 8) & 0xFF; /* S */
m_data_buffer[2] = msf & 0xFF; /* F */
@@ -672,7 +672,7 @@ void pce_cd_device::nec_get_dir_info()
// assert(pce_cd_nec_get_dir_info == NULL); // Not implemented yet
break;
}
-
+
m_data_buffer_index = 0;
m_data_transferred = 1;
m_scsi_IO = 1;
@@ -702,28 +702,28 @@ void pce_cd_device::handle_data_output()
{ 0xDE,10, &pce_cd_device::nec_get_dir_info }, /* NEC GET DIR INFO */
{ 0xFF, 1, &pce_cd_device::end_of_list } /* end of list marker */
};
-
+
if (m_scsi_REQ && m_scsi_ACK)
{
/* Command byte received */
logerror("Command byte $%02X received\n", m_regs[0x01]);
-
+
/* Check for buffer overflow */
assert(m_command_buffer_index < PCE_CD_COMMAND_BUFFER_SIZE);
-
+
m_command_buffer[m_command_buffer_index] = m_regs[0x01];
m_command_buffer_index++;
m_scsi_REQ = 0;
}
-
+
if (! m_scsi_REQ && ! m_scsi_ACK && m_command_buffer_index)
{
int i = 0;
-
+
logerror("Check if command done\n");
-
+
for(i = 0; m_command_buffer[0] > pce_cd_commands[i].command_byte; i++);
-
+
/* Check for unknown commands */
if (m_command_buffer[0] != pce_cd_commands[i].command_byte)
{
@@ -732,7 +732,7 @@ void pce_cd_device::handle_data_output()
popmessage("CD command 0x03 issued (Request Sense), contact MESSdev");
}
assert(m_command_buffer[0] == pce_cd_commands[i].command_byte);
-
+
if (m_command_buffer_index == pce_cd_commands[i].command_size)
{
//printf("%02x command issued\n",m_command_buffer[0]);
@@ -757,7 +757,7 @@ void pce_cd_device::handle_data_input()
m_scsi_REQ = 0;
m_status_sent = 1;
}
-
+
if (! m_scsi_REQ && ! m_scsi_ACK && m_status_sent)
{
m_status_sent = 0;
@@ -777,7 +777,7 @@ void pce_cd_device::handle_data_input()
{
m_scsi_REQ = 0;
}
-
+
if (! m_scsi_REQ && ! m_scsi_ACK)
{
if (m_data_buffer_index == m_data_buffer_size)
@@ -814,7 +814,7 @@ void pce_cd_device::handle_message_input()
m_scsi_REQ = 0;
m_message_sent = 1;
}
-
+
if (! m_scsi_REQ && ! m_scsi_ACK && m_message_sent)
{
m_message_sent = 0;
@@ -842,7 +842,7 @@ void pce_cd_device::update()
}
m_scsi_last_RST = m_scsi_RST;
}
-
+
/* Check if bus can be freed */
if (! m_scsi_SEL && ! m_scsi_BSY && m_selected)
{
@@ -851,7 +851,7 @@ void pce_cd_device::update()
m_scsi_CD = m_scsi_MSG = m_scsi_IO = m_scsi_REQ = 0;
set_irq_line(PCE_CD_IRQ_TRANSFER_DONE, CLEAR_LINE);
}
-
+
/* Select the CD device */
if (m_scsi_SEL)
{
@@ -863,7 +863,7 @@ void pce_cd_device::update()
m_scsi_MSG = m_scsi_IO = 0;
}
}
-
+
if (m_scsi_ATN)
{
}
@@ -900,7 +900,7 @@ void pce_cd_device::update()
}
}
}
-
+
/* FIXME: presumably CD-DA needs an irq interface for this */
if (m_cdda->audio_ended() && m_end_mark == 1)
{
@@ -919,7 +919,7 @@ void pce_cd_device::set_irq_line(int num, int state)
m_regs[0x03] |= num;
else
m_regs[0x03] &= ~num;
-
+
if (m_regs[0x02] & m_regs[0x03] & 0x7c)
{
//printf("IRQ PEND = %02x MASK = %02x IRQ ENABLE %02X\n",m_regs[0x02] & m_regs[0x03] & 0x7c,m_regs[0x02] & 0x7c,m_regs[0x03] & 0x7c);
@@ -945,14 +945,14 @@ TIMER_CALLBACK_MEMBER(pce_cd_device::data_timer_callback)
{
logerror("Succesfully read mode1 frame #%d\n", m_current_frame);
}
-
+
m_data_buffer_index = 0;
m_data_buffer_size = 2048;
m_current_frame++;
-
+
m_scsi_IO = 1;
m_scsi_CD = 0;
-
+
if (m_current_frame == m_end_frame)
{
/* We are done, disable the timer */
@@ -997,7 +997,7 @@ void pce_cd_device::set_adpcm_ram_byte(UINT8 val)
TIMER_CALLBACK_MEMBER(pce_cd_device::cdda_fadeout_callback)
{
m_cdda_volume -= 0.1;
-
+
if (m_cdda_volume <= 0)
{
m_cdda_volume = 0.0;
@@ -1014,7 +1014,7 @@ TIMER_CALLBACK_MEMBER(pce_cd_device::cdda_fadeout_callback)
TIMER_CALLBACK_MEMBER(pce_cd_device::cdda_fadein_callback)
{
m_cdda_volume += 0.1;
-
+
if (m_cdda_volume >= 100.0)
{
m_cdda_volume = 100.0;
@@ -1031,7 +1031,7 @@ TIMER_CALLBACK_MEMBER(pce_cd_device::cdda_fadein_callback)
TIMER_CALLBACK_MEMBER(pce_cd_device::adpcm_fadeout_callback)
{
m_adpcm_volume -= 0.1;
-
+
if (m_adpcm_volume <= 0)
{
m_adpcm_volume = 0.0;
@@ -1048,7 +1048,7 @@ TIMER_CALLBACK_MEMBER(pce_cd_device::adpcm_fadeout_callback)
TIMER_CALLBACK_MEMBER(pce_cd_device::adpcm_fadein_callback)
{
m_adpcm_volume += 0.1;
-
+
if (m_adpcm_volume >= 100.0)
{
m_adpcm_volume = 100.0;
@@ -1066,7 +1066,7 @@ TIMER_CALLBACK_MEMBER(pce_cd_device::adpcm_fadein_callback)
WRITE8_MEMBER(pce_cd_device::intf_w)
{
logerror("%04X: write to CD interface offset %02X, data %02X\n", space.device().safe_pc(), offset, data);
-
+
switch (offset & 0xf)
{
case 0x00: /* CDC status */
@@ -1134,7 +1134,7 @@ WRITE8_MEMBER(pce_cd_device::intf_w)
adpcm_stop(0);
m_msm->reset_w(1);
}
-
+
if ((data & 0x40) && ((m_regs[0x0D] & 0x40) == 0)) // ADPCM play
{
m_msm_start_addr = (m_adpcm_read_ptr);
@@ -1143,7 +1143,7 @@ WRITE8_MEMBER(pce_cd_device::intf_w)
m_msm_nibble = 0;
adpcm_play();
m_msm->reset_w(0);
-
+
//popmessage("%08x %08x",m_adpcm_read_ptr,m_adpcm_length);
}
else if ((data & 0x40) == 0)
@@ -1152,9 +1152,9 @@ WRITE8_MEMBER(pce_cd_device::intf_w)
adpcm_stop(0);
m_msm->reset_w(1);
}
-
+
m_msm_repeat = BIT(data, 5);
-
+
if (data & 0x10) //ADPCM set length
{
m_adpcm_length = (m_regs[0x09] << 8) | m_regs[0x08];
@@ -1273,7 +1273,7 @@ TIMER_CALLBACK_MEMBER(pce_cd_device::adpcm_dma_timer_callback)
{
m_adpcm_ram[m_adpcm_write_ptr] = get_cd_data_byte();
m_adpcm_write_ptr = (m_adpcm_write_ptr + 1) & 0xFFFF;
-
+
m_regs[0x0c] &= ~4;
}
}
@@ -1288,10 +1288,10 @@ UINT8 pce_cd_device::get_adpcm_ram_byte()
else
{
UINT8 res;
-
+
res = m_adpcm_ram[m_adpcm_read_ptr];
m_adpcm_read_ptr = ((m_adpcm_read_ptr + 1) & 0xffff);
-
+
return res;
}
}
@@ -1356,7 +1356,7 @@ READ8_MEMBER(pce_cd_device::intf_r)
data = 0xFF;
break;
}
-
+
return data;
}
@@ -1370,7 +1370,7 @@ PC Engine Arcade Card emulation
READ8_MEMBER(pce_cd_device::acard_r)
{
UINT8 r_num;
-
+
if ((offset & 0x2e0) == 0x2e0)
{
switch (offset & 0x2ef)
@@ -1384,12 +1384,12 @@ READ8_MEMBER(pce_cd_device::acard_r)
case 0x2ee: return 0x10;
case 0x2ef: return 0x51;
}
-
+
return 0;
}
-
+
r_num = (offset & 0x30) >> 4;
-
+
switch (offset & 0x0f)
{
case 0x00:
@@ -1400,7 +1400,7 @@ READ8_MEMBER(pce_cd_device::acard_r)
res = m_acard_ram[(m_acard_base_addr[r_num] + m_acard_addr_offset[r_num]) & 0x1fffff];
else
res = m_acard_ram[m_acard_base_addr[r_num] & 0x1fffff];
-
+
if (m_acard_ctrl[r_num] & 0x1)
{
if (m_acard_ctrl[r_num] & 0x10)
@@ -1413,7 +1413,7 @@ READ8_MEMBER(pce_cd_device::acard_r)
m_acard_addr_offset[r_num] += m_acard_addr_inc[r_num];
}
}
-
+
return res;
}
case 0x02: return (m_acard_base_addr[r_num] >> 0) & 0xff;
@@ -1426,14 +1426,14 @@ READ8_MEMBER(pce_cd_device::acard_r)
case 0x09: return m_acard_ctrl[r_num];
default: return 0;
}
-
+
return 0;
}
WRITE8_MEMBER(pce_cd_device::acard_w)
{
UINT8 w_num;
-
+
if ((offset & 0x2e0) == 0x2e0)
{
switch (offset & 0x0f)
@@ -1445,7 +1445,7 @@ WRITE8_MEMBER(pce_cd_device::acard_w)
case 4:
{
m_acard_shift_reg = data & 0x0f;
-
+
if (m_acard_shift_reg != 0)
{
m_acard_shift = (m_acard_shift_reg < 8) ?
@@ -1460,7 +1460,7 @@ WRITE8_MEMBER(pce_cd_device::acard_w)
else
{
w_num = (offset & 0x30) >> 4;
-
+
switch (offset & 0x0f)
{
case 0x00:
@@ -1469,7 +1469,7 @@ WRITE8_MEMBER(pce_cd_device::acard_w)
m_acard_ram[(m_acard_base_addr[w_num] + m_acard_addr_offset[w_num]) & 0x1fffff] = data;
else
m_acard_ram[m_acard_base_addr[w_num] & 0x1FFFFF] = data;
-
+
if (m_acard_ctrl[w_num] & 0x1)
{
if (m_acard_ctrl[w_num] & 0x10)
@@ -1482,16 +1482,16 @@ WRITE8_MEMBER(pce_cd_device::acard_w)
m_acard_addr_offset[w_num] += m_acard_addr_inc[w_num];
}
}
-
+
break;
-
+
case 0x02: m_acard_base_addr[w_num] = (data & 0xff) | (m_acard_base_addr[w_num] & 0xffff00); break;
case 0x03: m_acard_base_addr[w_num] = (data << 8) | (m_acard_base_addr[w_num] & 0xff00ff); break;
case 0x04: m_acard_base_addr[w_num] = (data << 16) | (m_acard_base_addr[w_num] & 0x00ffff); break;
case 0x05: m_acard_addr_offset[w_num] = (data & 0xff) | (m_acard_addr_offset[w_num] & 0xff00); break;
case 0x06:
m_acard_addr_offset[w_num] = (data << 8) | (m_acard_addr_offset[w_num] & 0x00ff);
-
+
if ((m_acard_ctrl[w_num] & 0x60) == 0x40)
{
m_acard_base_addr[w_num] += m_acard_addr_offset[w_num] + ((m_acard_ctrl[w_num] & 0x08) ? 0xff0000 : 0);
diff --git a/src/mess/machine/pce_cd.h b/src/mess/machine/pce_cd.h
index 967e0f8d887..c500ccb0770 100644
--- a/src/mess/machine/pce_cd.h
+++ b/src/mess/machine/pce_cd.h
@@ -105,7 +105,7 @@ private:
UINT8 m_msm_nibble;
UINT8 m_msm_idle;
UINT8 m_msm_repeat;
-
+
/* SCSI signals */
int m_scsi_BSY; /* Busy. Bus in use */
int m_scsi_SEL; /* Select. Initiator has won arbitration and has selected a target */
@@ -128,7 +128,7 @@ private:
int m_data_buffer_size;
int m_data_buffer_index;
int m_data_transferred;
-
+
/* Arcade Card specific */
UINT8 *m_acard_ram;
UINT8 m_acard_latch;
@@ -138,7 +138,7 @@ private:
UINT16 m_acard_addr_inc[4];
UINT32 m_acard_shift;
UINT8 m_acard_shift_reg;
-
+
UINT32 m_current_frame;
UINT32 m_end_frame;
UINT32 m_last_frame;
@@ -151,12 +151,12 @@ private:
required_device<cdda_device> m_cdda;
required_device<nvram_device> m_nvram;
required_device<cdrom_image_device> m_cdrom;
-
+
cdrom_file *m_cd_file;
const cdrom_toc* m_toc;
emu_timer *m_data_timer;
emu_timer *m_adpcm_dma_timer;
-
+
emu_timer *m_cdda_fadeout_timer;
emu_timer *m_cdda_fadein_timer;
double m_cdda_volume;
diff --git a/src/mess/machine/pce_rom.c b/src/mess/machine/pce_rom.c
index 4fbef351d62..86474afa9a4 100644
--- a/src/mess/machine/pce_rom.c
+++ b/src/mess/machine/pce_rom.c
@@ -1,8 +1,8 @@
/***********************************************************************************************************
-
+
PC-Engine & Turbografx-16 cart emulation
-
+
***********************************************************************************************************/
@@ -98,7 +98,7 @@ READ8_MEMBER(pce_populous_device::read_cart)
int bank = offset / 0x20000;
if (m_ram && offset >= 0x80000 && offset < 0x88000)
return m_ram[offset];
-
+
return m_rom[rom_bank_map[bank] * 0x20000 + (offset & 0x1ffff)];
}
@@ -122,4 +122,3 @@ WRITE8_MEMBER(pce_sf2_device::write_cart)
if (offset >= 0x1ff0 && offset < 0x1ff4)
m_bank_base = offset & 3;
}
-
diff --git a/src/mess/machine/pce_rom.h b/src/mess/machine/pce_rom.h
index 40eb8b45a9e..caaa1bcc7c7 100644
--- a/src/mess/machine/pce_rom.h
+++ b/src/mess/machine/pce_rom.h
@@ -13,11 +13,11 @@ public:
// construction/destruction
pce_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start() {}
virtual void device_reset() {}
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
};
@@ -57,11 +57,11 @@ class pce_sf2_device : public pce_rom_device
public:
// construction/destruction
pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
diff --git a/src/mess/machine/pce_slot.c b/src/mess/machine/pce_slot.c
index a4286622710..bb190ca7dd8 100644
--- a/src/mess/machine/pce_slot.c
+++ b/src/mess/machine/pce_slot.c
@@ -96,7 +96,7 @@ void device_pce_cart_interface::rom_map_setup(UINT32 size)
// setup the rom_bank_map array to faster ROM read
for (i = 0; i < size / 0x20000 && i < 8; i++)
rom_bank_map[i] = i;
-
+
// fill up remaining blocks with mirrors
while (i % 8)
{
@@ -110,10 +110,10 @@ void device_pce_cart_interface::rom_map_setup(UINT32 size)
}
}
// check bank map!
-// for (i = 0; i < 8; i++)
-// {
-// printf("bank %3d = %3d\t", i, rom_bank_map[i]);
-// }
+// for (i = 0; i < 8; i++)
+// {
+// printf("bank %3d = %3d\t", i, rom_bank_map[i]);
+// }
}
@@ -218,7 +218,7 @@ bool pce_cart_slot_device::call_load()
UINT32 offset = 0;
UINT32 len = (software_entry() == NULL) ? length() : get_software_region_length("rom");
UINT8 *ROM;
-
+
// From fullpath, check for presence of a header and skip it
if (software_entry() == NULL && (len % 0x4000) == 512)
{
@@ -227,7 +227,7 @@ bool pce_cart_slot_device::call_load()
len -= offset;
fseek(offset, SEEK_SET);
}
-
+
m_cart->rom_alloc(machine(), len);
ROM = m_cart->get_rom_base();
@@ -240,11 +240,11 @@ bool pce_cart_slot_device::call_load()
if (ROM[0x1fff] < 0xe0)
{
UINT8 decrypted[256];
-
+
/* Initialize decryption table */
for (int i = 0; i < 256; i++)
decrypted[i] = ((i & 0x01) << 7) | ((i & 0x02) << 5) | ((i & 0x04) << 3) | ((i & 0x08) << 1) | ((i & 0x10) >> 1) | ((i & 0x20 ) >> 3) | ((i & 0x40) >> 5) | ((i & 0x80) >> 7);
-
+
/* Decrypt ROM image */
for (int i = 0; i < len; i++)
ROM[i] = decrypted[ROM[i]];
@@ -253,13 +253,13 @@ bool pce_cart_slot_device::call_load()
m_cart->rom_map_setup(len);
if (software_entry() == NULL)
- m_type = get_cart_type(ROM, len);
+ m_type = get_cart_type(ROM, len);
else
{
const char *pcb_name = get_feature("slot");
if (pcb_name)
m_type = pce_get_pcb_id(pcb_name);
- }
+ }
//printf("Type: %s\n", pce_get_slot(m_type));
if (m_type == PCE_POPULOUS)
@@ -296,7 +296,7 @@ bool pce_cart_slot_device::call_softlist_load(char *swlist, char *swname, rom_en
/*-------------------------------------------------
- get_cart_type - code to detect NVRAM type from
+ get_cart_type - code to detect NVRAM type from
fullpath
-------------------------------------------------*/
@@ -307,11 +307,11 @@ int pce_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
/* Check for Street fighter 2 */
if (len == 0x280000)
type = PCE_SF2;
-
+
/* Check for Populous */
if (len >= 0x1f26 + 8 && !memcmp(ROM + 0x1f26, "POPULOUS", 8))
type = PCE_POPULOUS;
-
+
// Check for CD system card v3 which adds on-cart RAM to the system
if (!memcmp(ROM + 0x3FFB6, "PC Engine CD-ROM SYSTEM", 23))
{
@@ -382,4 +382,3 @@ WRITE8_MEMBER(pce_cart_slot_device::write_cart)
void pce_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len)
{
}
-
diff --git a/src/mess/machine/pce_slot.h b/src/mess/machine/pce_slot.h
index b8c4ca0b65f..5622024ebd8 100644
--- a/src/mess/machine/pce_slot.h
+++ b/src/mess/machine/pce_slot.h
@@ -44,7 +44,7 @@ public:
UINT32 m_ram_size;
void rom_map_setup(UINT32 size);
-
+
UINT8 rom_bank_map[8]; // 128K chunks of rom
};
diff --git a/src/mess/machine/s3c44b0.c b/src/mess/machine/s3c44b0.c
index 487c5410263..18e4df1cfb2 100644
--- a/src/mess/machine/s3c44b0.c
+++ b/src/mess/machine/s3c44b0.c
@@ -61,7 +61,7 @@ void s3c44b0_device::device_config_complete()
const s3c44b0_interface *intf = reinterpret_cast<const s3c44b0_interface *>(static_config());
if (intf != NULL)
*static_cast<s3c44b0_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -83,8 +83,8 @@ void s3c44b0_device::device_start()
m_sda_w.resolve(i2c_itf.sda_w, *this);
m_adc_data_r.resolve(adc_itf.data_r, *this);
m_i2s_data_w.resolve(i2s_itf.data_w, *this);
-
-
+
+
for (int i = 0; i < 6; i++) m_pwm.timer[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(s3c44b0_device::pwm_timer_exp),this));
for (int i = 0; i < 2; i++) m_uart[i].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(s3c44b0_device::uart_timer_exp),this));
for (int i = 0; i < 2; i++) m_zdma[i].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(s3c44b0_device::zdma_timer_exp),this));
@@ -114,12 +114,12 @@ void s3c44b0_device::device_start()
save_item(NAME(m_irq.regs.f_ispc));
save_item(NAME(m_irq.line_irq));
save_item(NAME(m_irq.line_fiq));
-
+
save_item(NAME(m_clkpow.regs.pllcon));
save_item(NAME(m_clkpow.regs.clkcon));
save_item(NAME(m_clkpow.regs.clkslow));
save_item(NAME(m_clkpow.regs.locktime));
-
+
// FIXME: how to save m_lcd.bitmap which gets allocated/freed during emulation?
save_item(NAME(m_lcd.regs.lcdcon1));
save_item(NAME(m_lcd.regs.lcdcon2));
@@ -149,9 +149,9 @@ void s3c44b0_device::device_start()
save_item(NAME(m_lcd.vpos_max));
save_item(NAME(m_lcd.vpos_end));
save_item(NAME(m_lcd.frame_time));
-
+
machine().save().register_postload(save_prepost_delegate(FUNC(s3c44b0_device::s3c44b0_postload), this));
-
+
for (int i = 0; i < 2; i++)
{
save_item(NAME(m_zdma[i].regs.dcon), i);
@@ -161,7 +161,7 @@ void s3c44b0_device::device_start()
save_item(NAME(m_zdma[i].regs.dcsrc), i);
save_item(NAME(m_zdma[i].regs.dcdst), i);
save_item(NAME(m_zdma[i].regs.dccnt), i);
-
+
save_item(NAME(m_bdma[i].regs.dcon), i);
save_item(NAME(m_bdma[i].regs.disrc), i);
save_item(NAME(m_bdma[i].regs.didst), i);
@@ -169,7 +169,7 @@ void s3c44b0_device::device_start()
save_item(NAME(m_bdma[i].regs.dcsrc), i);
save_item(NAME(m_bdma[i].regs.dcdst), i);
save_item(NAME(m_bdma[i].regs.dccnt), i);
-
+
save_item(NAME(m_uart[i].regs.ulcon), i);
save_item(NAME(m_uart[i].regs.ucon), i);
save_item(NAME(m_uart[i].regs.ufcon), i);
@@ -182,13 +182,13 @@ void s3c44b0_device::device_start()
save_item(NAME(m_uart[i].regs.urxh), i);
save_item(NAME(m_uart[i].regs.ubrdiv), i);
}
-
+
save_item(NAME(m_sio.regs.siocon));
save_item(NAME(m_sio.regs.siodat));
save_item(NAME(m_sio.regs.sbrdr));
save_item(NAME(m_sio.regs.itvcnt));
save_item(NAME(m_sio.regs.dcntz));
-
+
save_item(NAME(m_pwm.regs.tcfg0));
save_item(NAME(m_pwm.regs.tcfg1));
save_item(NAME(m_pwm.regs.tcon));
@@ -212,17 +212,17 @@ void s3c44b0_device::device_start()
save_item(NAME(m_pwm.cnt));
save_item(NAME(m_pwm.cmp));
save_item(NAME(m_pwm.freq));
-
+
save_item(NAME(m_wdt.regs.wtcon));
save_item(NAME(m_wdt.regs.wtdat));
save_item(NAME(m_wdt.regs.wtcnt));
-
+
save_item(NAME(m_iic.regs.iiccon));
save_item(NAME(m_iic.regs.iicstat));
save_item(NAME(m_iic.regs.iicadd));
save_item(NAME(m_iic.regs.iicds));
save_item(NAME(m_iic.count));
-
+
save_item(NAME(m_iis.regs.iiscon));
save_item(NAME(m_iis.regs.iismod));
save_item(NAME(m_iis.regs.iispsr));
@@ -230,7 +230,7 @@ void s3c44b0_device::device_start()
save_item(NAME(m_iis.regs.iisfifo));
save_item(NAME(m_iis.fifo));
save_item(NAME(m_iis.fifo_index));
-
+
save_item(NAME(m_gpio.regs.gpacon));
save_item(NAME(m_gpio.regs.gpadat));
save_item(NAME(m_gpio.regs.gpbcon));
@@ -253,11 +253,11 @@ void s3c44b0_device::device_start()
save_item(NAME(m_gpio.regs.spucr));
save_item(NAME(m_gpio.regs.extint));
save_item(NAME(m_gpio.regs.extintpnd));
-
+
save_item(NAME(m_adc.regs.adccon));
save_item(NAME(m_adc.regs.adcpsr));
save_item(NAME(m_adc.regs.adcdat));
-
+
save_item(NAME(m_cpuwrap.regs.syscfg));
save_item(NAME(m_cpuwrap.regs.ncachbe0));
save_item(NAME(m_cpuwrap.regs.ncachbe1));
diff --git a/src/mess/machine/s3c44b0.h b/src/mess/machine/s3c44b0.h
index 5b764d99ee3..0ae1c60699c 100644
--- a/src/mess/machine/s3c44b0.h
+++ b/src/mess/machine/s3c44b0.h
@@ -635,7 +635,7 @@ class s3c44b0_device : public device_t,
public:
s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~s3c44b0_device() {}
-
+
DECLARE_READ32_MEMBER(lcd_r);
DECLARE_READ32_MEMBER(clkpow_r);
DECLARE_READ32_MEMBER(irq_r);
@@ -680,7 +680,7 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
private:
// internal state
// LCD Controller
@@ -754,7 +754,7 @@ private:
void adc_stop();
void adc_recalc();
TIMER_CALLBACK_MEMBER(adc_timer_exp);
-
+
// SIO
void sio_start();
void sio_stop();
diff --git a/src/mess/machine/sega8_rom.c b/src/mess/machine/sega8_rom.c
index 9d8b37262de..4f02c3b6cc7 100644
--- a/src/mess/machine/sega8_rom.c
+++ b/src/mess/machine/sega8_rom.c
@@ -1,7 +1,7 @@
/***********************************************************************************************************
Sega 8-bit cart emulation (for Master System, GameGear and SG-1000)
-
+
TODO: implement proper ROM & RAM mirroring when the cart size is not a power of 2K (e.g. 24K or 48K)
***********************************************************************************************************/
@@ -318,20 +318,20 @@ void sega8_korean_device::late_bank_setup()
-------------------------------------------------*/
/*-------------------------------------------------
-
+
Base Sega 8bit carts, possibly with bankswitch
(only used by Mark III, SMS and GG games)
-
+
-------------------------------------------------*/
READ8_MEMBER(sega8_rom_device::read_cart)
{
int bank = offset / 0x4000;
-
+
if (bank == 2 && m_ram && m_ram_enabled)
return m_ram[(m_ram_base * 0x4000 + (offset & 0x3fff)) % m_ram_size];
- if (offset < 0x400) // first 1k is hardcoded
+ if (offset < 0x400) // first 1k is hardcoded
return m_rom[offset];
return m_rom[m_rom_bank_base[bank] * 0x4000 + (offset & 0x3fff)];
@@ -340,7 +340,7 @@ READ8_MEMBER(sega8_rom_device::read_cart)
WRITE8_MEMBER(sega8_rom_device::write_cart)
{
int bank = offset / 0x4000;
-
+
if (bank == 2 && m_ram && m_ram_enabled)
m_ram[(m_ram_base * 0x4000 + (offset & 0x3fff)) % m_ram_size] = data;
}
@@ -362,29 +362,29 @@ WRITE8_MEMBER(sega8_rom_device::write_mapper)
else
m_ram_enabled = 0;
break;
-
+
case 1: // Select 16k ROM bank for 0000-3fff
case 2: // Select 16k ROM bank for 4000-7fff
case 3: // Select 16k ROM bank for 8000-bfff
m_rom_bank_base[offset - 1] = data % m_rom_page_count;
break;
- }
+ }
}
/*-------------------------------------------------
-
- Sega Card Catcher is a passthrough adapter for
- SG-1000 to load games in MyCard format into the
+
+ Sega Card Catcher is a passthrough adapter for
+ SG-1000 to load games in MyCard format into the
main cartslot
-
+
-------------------------------------------------*/
READ8_MEMBER(sega8_cardcatch_device::read_cart)
{
if (offset < 0x8000)
return m_card->read_cart(space, offset);
-
+
return 0xff;
}
@@ -409,11 +409,11 @@ machine_config_constructor sega8_cardcatch_device::device_mconfig_additions() co
}
/*-------------------------------------------------
-
- Othello is a SG-1000 game featuring 2K of
+
+ Othello is a SG-1000 game featuring 2K of
oncart RAM, mapped at 0x8000-0x9fff.
Is RAM mirrored? For now we assume so...
-
+
-------------------------------------------------*/
READ8_MEMBER(sega8_othello_device::read_cart)
@@ -421,7 +421,7 @@ READ8_MEMBER(sega8_othello_device::read_cart)
// 8K of RAM sits in 0x8000-0x9fff
if (offset >= 0x8000 && offset < 0xa000)
return m_ram[offset & 0x7ff];
-
+
return m_rom[offset % m_rom_size];
}
@@ -434,10 +434,10 @@ WRITE8_MEMBER(sega8_othello_device::write_cart)
/*-------------------------------------------------
-
- The Castle is a SG-1000 game featuring 8K of
+
+ The Castle is a SG-1000 game featuring 8K of
oncart RAM, mapped at 0x8000-0x9fff
-
+
-------------------------------------------------*/
READ8_MEMBER(sega8_castle_device::read_cart)
@@ -445,7 +445,7 @@ READ8_MEMBER(sega8_castle_device::read_cart)
// 8K of RAM sits in 0x8000-0x9fff
if (offset >= 0x8000 && offset < 0xa000)
return m_ram[offset & 0x1fff];
-
+
return m_rom[offset % m_rom_size];
}
@@ -458,10 +458,10 @@ WRITE8_MEMBER(sega8_castle_device::write_cart)
/*-------------------------------------------------
-
- BASIC Level III cart featured 32K of
+
+ BASIC Level III cart featured 32K of
oncart RAM, mapped at 0x8000-0xffff?
-
+
-------------------------------------------------*/
READ8_MEMBER(sega8_basic_l3_device::read_cart)
@@ -469,7 +469,7 @@ READ8_MEMBER(sega8_basic_l3_device::read_cart)
// 8K of RAM sits in 0x8000-0x9fff
if (offset >= 0x8000)
return m_ram[offset & 0x3fff];
-
+
return m_rom[offset % m_rom_size];
}
@@ -492,10 +492,10 @@ WRITE8_MEMBER(sega8_basic_l3_device::write_ram)
/*-------------------------------------------------
-
- Music Editor cart featured 10K of oncart RAM, mapped
+
+ Music Editor cart featured 10K of oncart RAM, mapped
in 0x8000-0x9fff and 0xc000-0xffff
-
+
-------------------------------------------------*/
READ8_MEMBER(sega8_music_editor_device::read_cart)
@@ -503,7 +503,7 @@ READ8_MEMBER(sega8_music_editor_device::read_cart)
// 8K of RAM sits in 0x8000-0x9fff
if (offset >= 0x8000 && offset < 0xa000)
return m_ram[offset & 0x1fff];
-
+
return m_rom[offset % m_rom_size];
}
@@ -530,38 +530,38 @@ WRITE8_MEMBER(sega8_music_editor_device::write_ram)
/*-------------------------------------------------
-
+
SG-1000 Terebi Oekaki using a Tablet input device
-
+
-------------------------------------------------*/
/*
-
+
Terebi Oekaki (TV Draw)
-
+
Address Access Bits
7 6 5 4 3 2 1 0
$6000 W - - - - - - - AXIS
$8000 R BUSY - - - - - - PRESS
$A000 R/W DATA
-
+
AXIS: write 0 to select X axis, 1 to select Y axis.
BUSY: reads 1 when graphic board is busy sampling position, else 0.
PRESS: reads 0 when pen is touching graphic board, else 1.
DATA: when pen is touching graphic board, return 8-bit sample position for currently selected axis (X is in the 0-255 range, Y in the 0-191 range). Else, return 0.
-
+
*/
READ8_MEMBER(sega8_terebi_device::read_cart)
{
int bank = offset / 0x4000;
-
+
if (offset == 0x8000)
return m_tvdraw_pen->read();
if (offset == 0xa000)
return m_tvdraw_data;
-
+
return m_rom[m_rom_bank_base[bank] * 0x4000 + (offset & 0x3fff)];
}
@@ -573,7 +573,7 @@ WRITE8_MEMBER(sega8_terebi_device::write_cart)
if (data & 0x01)
{
m_tvdraw_data = m_tvdraw_x->read();
-
+
if (m_tvdraw_data < 4) m_tvdraw_data = 4;
if (m_tvdraw_data > 251) m_tvdraw_data = 251;
}
@@ -604,16 +604,16 @@ ioport_constructor sega8_terebi_device::device_input_ports() const
/*-------------------------------------------------
-
+
Dahjee carts were sold with a RAM expansion pass-through
- cart (which we don't emulate separately for the
- moment) which allowed to play on old SG1000 machines
+ cart (which we don't emulate separately for the
+ moment) which allowed to play on old SG1000 machines
some MSX conversions requiring more RAM than available
-
+
Two kind of expansion existed (for different games),
- one with 9K of RAM (Type A) and one with 8K of
+ one with 9K of RAM (Type A) and one with 8K of
RAM (Type B).
-
+
-------------------------------------------------*/
// TYPE A
@@ -622,7 +622,7 @@ READ8_MEMBER(sega8_dahjee_typea_device::read_cart)
// 8K of RAM sits in 0x2000-0x3fff
if (offset >= 0x2000 && offset < 0x4000)
return m_ram[offset & 0x1fff];
-
+
return m_rom[offset % m_rom_size];
}
@@ -670,27 +670,27 @@ WRITE8_MEMBER(sega8_dahjee_typeb_device::write_ram)
/*-------------------------------------------------
-
+
Sega carts + EEPROM, used for some GameGear baseball
games
-
+
-------------------------------------------------*/
READ8_MEMBER(sega8_eeprom_device::read_cart)
{
int bank = offset / 0x4000;
-
+
if (offset == 0x8000 && m_93c46_enabled)
{
UINT8 value = (m_93c46_lines & 0xfc) | 0x02;
value |= m_eeprom->read_bit() ? 1 : 0;
return value;
}
-
- if (offset < 0x400) // first 1k is hardcoded
+
+ if (offset < 0x400) // first 1k is hardcoded
return m_rom[offset];
-
+
return m_rom[m_rom_bank_base[bank] * 0x4000 + (offset & 0x3fff)];
}
@@ -719,13 +719,13 @@ WRITE8_MEMBER(sega8_eeprom_device::write_mapper)
m_93c46_enabled = BIT(data, 3);
logerror("eeprom %s\n", m_93c46_enabled ? "enabled" : "disabled");
break;
-
+
case 1: // Select 16k ROM bank for 0000-3fff
case 2: // Select 16k ROM bank for 4000-7fff
case 3: // Select 16k ROM bank for 8000-bfff
m_rom_bank_base[offset - 1] = data % m_rom_page_count;
break;
- }
+ }
}
MACHINE_CONFIG_FRAGMENT( gg_eeprom )
@@ -739,19 +739,19 @@ machine_config_constructor sega8_eeprom_device::device_mconfig_additions() const
/*-------------------------------------------------
-
+
Codemasters carts, possibly having on cart RAM
(Ernie Els Golf)
-
+
-------------------------------------------------*/
READ8_MEMBER(sega8_codemasters_device::read_cart)
{
int bank = offset / 0x2000;
-
+
if (bank == 5 && m_ram && m_ram_enabled)
return m_ram[(m_ram_base * 0x2000 + (offset & 0x1fff)) % m_ram_size];
-
+
return m_rom[m_rom_bank_base[bank/2] * 0x4000 + (offset & 0x3fff)];
}
@@ -786,9 +786,9 @@ WRITE8_MEMBER(sega8_codemasters_device::write_cart)
}
/*-------------------------------------------------
-
+
HES 4 PAK All Action cart
-
+
-------------------------------------------------*/
@@ -814,25 +814,25 @@ WRITE8_MEMBER(sega8_4pak_device::write_cart)
/*-------------------------------------------------
-
+
base Zemina carts, allowing for 8K bankswitch
-
+
-------------------------------------------------*/
READ8_MEMBER(sega8_zemina_device::read_cart)
{
int bank = offset / 0x2000;
-
+
if (bank >= 4 && m_ram && m_ram_enabled)
return m_ram[(m_ram_base * 0x2000 + (offset & 0x1fff)) % m_ram_size];
-
+
return m_rom[m_rom_bank_base[bank] * 0x2000 + (offset & 0x1fff)];
}
WRITE8_MEMBER(sega8_zemina_device::write_cart)
{
int bank = offset / 0x2000;
-
+
if (bank >= 4 && m_ram && m_ram_enabled)
m_ram[(m_ram_base * 0x2000 + (offset & 0x1fff)) % m_ram_size] = data;
@@ -857,28 +857,28 @@ WRITE8_MEMBER(sega8_zemina_device::write_cart)
}
/*-------------------------------------------------
-
+
Zemina cart used for Nemesis: same as above, but
different bank layout at start (see late_bank_setup)
-
+
-------------------------------------------------*/
/*-------------------------------------------------
-
+
Daiou cart used for SMS Janggun-ui Adeul
-
+
the game expects to access 256 x 8K banks:
first 64 are just the game, second 64 are a mirror of the first ones
upper 128 are the same as the previous but with bytes in reverse order
probably as a shortcut to get sprite flipping for free from hw
so if bit7 of current bank page is set, we swap the result
-
+
-------------------------------------------------*/
READ8_MEMBER(sega8_janggun_device::read_cart)
{
int bank = offset / 0x2000;
-
+
if (m_rom_bank_base[bank] < 0x80)
return m_rom[(m_rom_bank_base[bank] & 0x3f) * 0x2000 + (offset & 0x1fff)];
else
@@ -911,32 +911,31 @@ WRITE8_MEMBER(sega8_janggun_device::write_mapper)
{
case 0:
break;
-
+
case 1: // Select 16k ROM bank for 0000-3fff
case 2: // Select 16k ROM bank for 4000-7fff
case 3: // Select 16k ROM bank for 8000-bfff
m_rom_bank_base[(offset - 1) * 2] = (data % m_rom_page_count) * 2;
m_rom_bank_base[(offset - 1) * 2 + 1] = (data % m_rom_page_count) * 2 + 1;
break;
- }
+ }
}
/*-------------------------------------------------
-
- Korean cart, used e.g. in Dodgeball King,
+
+ Korean cart, used e.g. in Dodgeball King,
uses writes to 0xa000 for bankswitch
-
+
-------------------------------------------------*/
WRITE8_MEMBER(sega8_korean_device::write_cart)
{
int bank = offset / 0x4000;
-
+
if (bank == 2 && m_ram && m_ram_enabled)
m_ram[m_ram_base * 0x4000 + (offset & 0x3fff)] = data;
if (offset == 0xa000)
m_rom_bank_base[2] = data % m_rom_page_count;
}
-
diff --git a/src/mess/machine/sega8_rom.h b/src/mess/machine/sega8_rom.h
index 1c78a20788f..98403c2f0ec 100644
--- a/src/mess/machine/sega8_rom.h
+++ b/src/mess/machine/sega8_rom.h
@@ -41,14 +41,14 @@ class sega8_cardcatch_device : public sega8_rom_device
public:
// construction/destruction
sega8_cardcatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
virtual DECLARE_WRITE8_MEMBER(write_mapper) {}
-
+
virtual machine_config_constructor device_mconfig_additions() const;
-
+
protected:
required_device<sega8_card_slot_device> m_card;
};
@@ -61,7 +61,7 @@ class sega8_othello_device : public sega8_rom_device
public:
// construction/destruction
sega8_othello_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
@@ -76,7 +76,7 @@ class sega8_castle_device : public sega8_rom_device
public:
// construction/destruction
sega8_castle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
@@ -91,12 +91,12 @@ class sega8_basic_l3_device : public sega8_rom_device
public:
// construction/destruction
sega8_basic_l3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
virtual DECLARE_WRITE8_MEMBER(write_mapper) {}
-
+
// has internal RAM which overwrites the system one!
virtual DECLARE_READ8_MEMBER(read_ram);
virtual DECLARE_WRITE8_MEMBER(write_ram);
@@ -110,12 +110,12 @@ class sega8_music_editor_device : public sega8_rom_device
public:
// construction/destruction
sega8_music_editor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
virtual DECLARE_WRITE8_MEMBER(write_mapper) {}
-
+
// has internal RAM which overwrites the system one!
virtual DECLARE_READ8_MEMBER(read_ram);
virtual DECLARE_WRITE8_MEMBER(write_ram);
@@ -129,21 +129,21 @@ class sega8_terebi_device : public sega8_rom_device
public:
// construction/destruction
sega8_terebi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual ioport_constructor device_input_ports() const;
virtual void device_reset();
-
+
required_ioport m_tvdraw_x;
required_ioport m_tvdraw_y;
required_ioport m_tvdraw_pen;
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
virtual DECLARE_WRITE8_MEMBER(write_mapper) {}
-
+
protected:
UINT8 m_tvdraw_data;
};
@@ -156,12 +156,12 @@ class sega8_dahjee_typea_device : public sega8_rom_device
public:
// construction/destruction
sega8_dahjee_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
virtual DECLARE_WRITE8_MEMBER(write_mapper) {}
-
+
// has internal RAM which overwrites the system one!
virtual DECLARE_READ8_MEMBER(read_ram);
virtual DECLARE_WRITE8_MEMBER(write_ram);
@@ -175,12 +175,12 @@ class sega8_dahjee_typeb_device : public sega8_rom_device
public:
// construction/destruction
sega8_dahjee_typeb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart) {}
virtual DECLARE_WRITE8_MEMBER(write_mapper) {}
-
+
// has internal RAM which overwrites the system one!
virtual DECLARE_READ8_MEMBER(read_ram);
virtual DECLARE_WRITE8_MEMBER(write_ram);
@@ -197,22 +197,22 @@ class sega8_eeprom_device : public device_t,
public:
// construction/destruction
sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_reset();
-
+
virtual void late_bank_setup();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
virtual DECLARE_WRITE8_MEMBER(write_mapper);
-
+
protected:
UINT8 m_rom_bank_base[3];
-
+
required_device<eeprom_device> m_eeprom;
int m_93c46_enabled;
UINT8 m_93c46_lines;
@@ -227,18 +227,18 @@ class sega8_codemasters_device : public device_t,
public:
// construction/destruction
sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
virtual void late_bank_setup();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
// no mapper write for this!
-
+
protected:
UINT8 m_rom_bank_base[3];
UINT8 m_ram_base;
@@ -253,7 +253,7 @@ class sega8_4pak_device : public sega8_rom_device
public:
// construction/destruction
sega8_4pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_reset();
@@ -275,18 +275,18 @@ public:
// construction/destruction
sega8_zemina_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
virtual void late_bank_setup();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
// no mapper write for this!
-
+
protected:
UINT8 m_rom_bank_base[6];
UINT8 m_ram_base;
@@ -301,7 +301,7 @@ class sega8_nemesis_device : public sega8_zemina_device
public:
// construction/destruction
sega8_nemesis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual void late_bank_setup();
};
@@ -317,14 +317,14 @@ public:
// device-level overrides
virtual void device_start() { save_item(NAME(m_rom_bank_base)); }
-
+
virtual void late_bank_setup();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);
virtual DECLARE_WRITE8_MEMBER(write_cart);
virtual DECLARE_WRITE8_MEMBER(write_mapper);
-
+
protected:
UINT8 m_rom_bank_base[6];
};
@@ -337,9 +337,9 @@ class sega8_korean_device : public sega8_rom_device
public:
// construction/destruction
sega8_korean_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual void late_bank_setup();
-
+
// reading and writing
virtual DECLARE_WRITE8_MEMBER(write_cart);
virtual DECLARE_WRITE8_MEMBER(write_mapper) {}
diff --git a/src/mess/machine/sega8_slot.c b/src/mess/machine/sega8_slot.c
index 31d8245d966..5b4f53bb810 100644
--- a/src/mess/machine/sega8_slot.c
+++ b/src/mess/machine/sega8_slot.c
@@ -1,13 +1,13 @@
/***********************************************************************************************************
-
-
+
+
Sega 8-bit cart emulation
(through slot devices)
Master System (Mark III) and Game Gear memory map can access 3 x 16K banks of ROM in
- 0x0000-0xbfff memory range. These banks can however point to different ROM or RAM area
+ 0x0000-0xbfff memory range. These banks can however point to different ROM or RAM area
of the cart (or to BIOS banks, but these are handled directly in SMS emulation).
-
+
Hence, carts can interface with the main system through the following handlers
* read_cart : to read from ROM/RAM in memory range [0000-bfff]
* write_cart : to write to ROM/RAM in memory range [0000-bfff]
@@ -17,10 +17,10 @@
Note about Sega Card / MyCard: the data contained in these matches the data in carts, it's only
the connector to be different. We emulate this with a variant of the slot having different media
switch and different interface (the latter not implemented yet)
-
+
TODO:
- investigate SG-1000 carts so to reduce duplicated code and to add full .sg support to sg1000m3
-
+
***********************************************************************************************************/
@@ -81,8 +81,8 @@ void device_sega8_cart_interface::rom_alloc(running_machine &machine, UINT32 siz
m_rom = auto_alloc_array_clear(machine, UINT8, size);
m_rom_size = size;
m_rom_page_count = size / 0x4000;
- if (!m_rom_page_count)
- m_rom_page_count = 1; // we compute rom pages through (XXX % m_rom_page_count)!
+ if (!m_rom_page_count)
+ m_rom_page_count = 1; // we compute rom pages through (XXX % m_rom_page_count)!
late_bank_setup();
}
}
@@ -221,14 +221,14 @@ static const char *sega8_get_slot(int type)
int sega8_cart_slot_device::verify_cart( UINT8 *magic, int size )
{
int retval = IMAGE_VERIFY_FAIL;
-
+
// Verify the file is a valid image - check $7ff0 for "TMR SEGA"
if (size >= 0x8000)
{
if (!strncmp((char*)&magic[0x7ff0], "TMR SEGA", 8))
- retval = IMAGE_VERIFY_PASS;
+ retval = IMAGE_VERIFY_PASS;
}
-
+
return retval;
}
@@ -256,19 +256,19 @@ void sega8_cart_slot_device::set_lphaser_xoffset( UINT8 *rom, int size )
{
if (!memcmp(&rom[0x7ff0], signatures[0], 16) || !memcmp(&rom[0x7ff0], signatures[1], 16))
xoff = 41;
-
+
if (!memcmp(&rom[0x7ff0], signatures[2], 16))
xoff = 50;
-
+
if (!memcmp(&rom[0x7ff0], signatures[3], 16))
xoff = 48;
-
+
if (!memcmp(&rom[0x7ff0], signatures[4], 16))
xoff = 45;
-
+
if (!memcmp(&rom[0x7ff0], signatures[5], 16))
xoff = 54;
-
+
}
m_cart->set_lphaser_xoffs(xoff);
@@ -313,11 +313,11 @@ void sega8_cart_slot_device::setup_ram()
// Codemasters cart can have 64KB of RAM (Ernie Els Golf? or 8KB?) and no battery
m_cart->ram_alloc(machine(), 0x10000);
m_cart->set_has_battery(FALSE);
- }
+ }
else
{
- // for generic carts loaded from fullpath we have no way to know exactly if there was RAM,
- // how much RAM was in the cart and if there was a battery so we always alloc 32KB and
+ // for generic carts loaded from fullpath we have no way to know exactly if there was RAM,
+ // how much RAM was in the cart and if there was a battery so we always alloc 32KB and
// we save its content only if the game enable the RAM
m_cart->set_late_battery(TRUE);
m_cart->ram_alloc(machine(), 0x08000);
@@ -328,13 +328,13 @@ void sega8_cart_slot_device::setup_ram()
// from softlist we rely on the xml to only allocate the correct amount of RAM and to save it only if a battery was present
const char *battery = get_feature("battery");
m_cart->set_late_battery(FALSE);
-
+
if (get_software_region_length("ram"))
m_cart->ram_alloc(machine(), get_software_region_length("ram"));
if (battery && !strcmp(battery, "yes"))
m_cart->set_has_battery(TRUE);
- }
+ }
}
bool sega8_cart_slot_device::call_load()
@@ -350,21 +350,21 @@ bool sega8_cart_slot_device::call_load()
seterror(IMAGE_ERROR_UNSPECIFIED, "Attempted loading a card larger than 32KB");
return IMAGE_INIT_FAIL;
}
-
+
// check for header
if ((len % 0x4000) == 512)
{
offset = 512;
len -= 512;
}
-
+
// make sure that we only get complete (0x4000) rom banks
if (len & 0x3fff)
len = ((len >> 14) + 1) << 14;
-
+
m_cart->rom_alloc(machine(), len);
ROM = m_cart->get_rom_base();
-
+
if (software_entry() == NULL)
{
fseek(offset, SEEK_SET);
@@ -372,7 +372,7 @@ bool sega8_cart_slot_device::call_load()
}
else
memcpy(ROM, get_software_region("rom") + offset, len);
-
+
/* check the image */
if (verify_cart(ROM, len) == IMAGE_VERIFY_FAIL)
logerror("Warning loading image: verify_cart failed\n");
@@ -381,11 +381,11 @@ bool sega8_cart_slot_device::call_load()
m_type = sega8_get_pcb_id(get_feature("slot") ? get_feature("slot") : "rom");
else
m_type = get_cart_type(ROM, len);
-
+
set_lphaser_xoffset(ROM, len);
setup_ram();
-
+
// Check for gamegear cartridges with PIN 42 set to SMS mode
if (software_entry() != NULL)
{
@@ -398,11 +398,11 @@ bool sega8_cart_slot_device::call_load()
// we attempt to load a battery because the game might have it!
if (m_cart->get_ram_size() && (m_cart->get_has_battery() || m_cart->get_late_battery()))
battery_load(m_cart->get_ram_base(), m_cart->get_ram_size(), 0x00);
-
+
//printf("Type: %s\n", sega8_get_slot(type));
-
+
internal_header_logging(ROM + offset, len, m_cart->get_ram_size());
-
+
return IMAGE_INIT_PASS;
}
@@ -452,19 +452,19 @@ bool sega8_cart_slot_device::call_softlist_load(char *swlist, char *swname, rom_
- gamegear Pete Sampras Tennis
- gamegear S.S. Lucifer
- 95 - gamegear Micro Machines 2 - Turbo Tournament
-
+
The Korean game Jang Pung II also seems to use a codemasters style mapper.
*/
int sms_state::detect_codemasters_mapper( UINT8 *rom )
{
static const UINT8 jang_pung2[16] = { 0x00, 0xba, 0x38, 0x0d, 0x00, 0xb8, 0x38, 0x0c, 0x00, 0xb6, 0x38, 0x0b, 0x00, 0xb4, 0x38, 0x0a };
-
+
if (((rom[0x7fe0] & 0x0f ) <= 9) && (rom[0x7fe3] == 0x93 || rom[0x7fe3] == 0x94 || rom[0x7fe3] == 0x95) && rom[0x7fef] == 0x00)
return 1;
-
+
if (!memcmp(&rom[0x7ff0], jang_pung2, 16))
return 1;
-
+
return 0;
}
@@ -477,7 +477,7 @@ int sms_state::detect_korean_mapper( UINT8 *rom )
{ 0x41, 0x48, 0x37, 0x37, 0x44, 0x37, 0x4e, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20 }, /* Sangokushi 3 */
};
int i;
-
+
for (i = 0; i < 2; i++)
{
if (!memcmp(&rom[0x7ff0], signatures[i], 16))
@@ -518,9 +518,9 @@ int sega8_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
{ i += 2; _6000++; continue; }
}
}
-
+
LOG(("Mapper test: _0002 = %d, _8000 = %d, _a000 = %d, _ffff = %d\n", _0002, _8000, _a000, _ffff));
-
+
// 2 is a security measure, although tests on existing ROM showed it was not needed
if (_0002 > _ffff + 2 || (_0002 > 0 && _ffff == 0))
{
@@ -545,13 +545,13 @@ int sega8_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
if (len >= 0x8000)
{
int x2000_3000 = 0, xd000_e000_f000 = 0, x2000_ff = 0;
-
+
for (int i = 0; i < 0x8000; i++)
{
if (ROM[i] == 0x32)
{
UINT16 addr = ROM[i + 1] | (ROM[i + 2] << 8);
-
+
switch (addr & 0xf000)
{
case 0x2000:
@@ -559,7 +559,7 @@ int sega8_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
i += 2;
x2000_3000++;
break;
-
+
case 0xd000:
case 0xe000:
case 0xf000:
@@ -582,7 +582,7 @@ int sega8_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
type = SEGA8_DAHJEE_TYPEA;
}
}
-
+
// Terebi Oekaki (TV Draw)
if (!strncmp((const char *)&ROM[0x13b3], "annakmn", 7))
type = SEGA8_TEREBIOEKAKI;
@@ -590,16 +590,16 @@ int sega8_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
// The Castle (ROM+RAM)
if (!strncmp((const char *)&ROM[0x1cc3], "ASCII 1986", 10))
type = SEGA8_CASTLE;
-
+
// BASIC Level 3
if (!strncmp((const char *)&ROM[0x6a20], "SC-3000 BASIC Level 3 ver 1.0", 29))
type = SEGA8_BASIC_L3;
-
+
// Music Editor
if (!strncmp((const char *)&ROM[0x0841], "PIANO", 5) || !strncmp((const char *)&ROM[0x0841], "music", 5))
type = SEGA8_MUSIC_EDITOR;
-
-
+
+
return type;
}
/*-------------------------------------------------
@@ -724,12 +724,12 @@ void sega8_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len, UIN
0x10000,
0x20000,
};
-
+
char reserved[10];
UINT8 version, csum_size, region, serial[3];
UINT16 checksum, csum = 0;
UINT32 csum_end = 0;
-
+
// LOG FILE DETAILS
logerror("FILE DETAILS\n" );
logerror("============\n" );
@@ -741,30 +741,30 @@ void sega8_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len, UIN
if (nvram_len)
logerror("RAM (Allocated) Size: 0x%X - Battery: %s\n", nvram_len, m_cart->get_has_battery() ? "Yes" : "No");
logerror("\n" );
-
-
+
+
// LOG HEADER DETAILS
if (len < 0x8000)
return;
for (int i = 0; i < 10; i++)
reserved[i] = ROM[0x7ff0 + i];
-
+
checksum = ROM[0x7ffa] | (ROM[0x7ffb] << 8);
-
+
for (int i = 0; i < 3; i++)
serial[i] = ROM[0x7ffc + i];
serial[2] &= 0x0f;
-
+
version = (ROM[0x7ffe] & 0xf0) >> 4;
-
+
csum_size = ROM[0x7fff] & 0x0f;
csum_end = csum_length[csum_size];
if (!csum_end || csum_end > len)
csum_end = len;
-
+
region = (ROM[0x7fff] & 0xf0) >> 4;
-
+
// compute cart checksum to compare with expected one
for (int i = 0; i < csum_end; i++)
{
@@ -772,9 +772,9 @@ void sega8_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len, UIN
{
csum += ROM[i];
csum &= 0xffff;
- }
+ }
}
-
+
logerror("INTERNAL HEADER\n" );
logerror("===============\n" );
logerror("Reserved String: %.10s\n", reserved);
@@ -785,12 +785,12 @@ void sega8_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len, UIN
logerror("Software Revision: %x\n", version);
logerror("\n" );
-
+
if (m_type == SEGA8_CODEMASTERS)
{
UINT8 day, month, year, hour, minute;
csum = 0;
-
+
day = ROM[0x7fe1];
month = ROM[0x7fe2];
year = ROM[0x7fe3];
@@ -808,7 +808,7 @@ void sega8_cart_slot_device::internal_header_logging(UINT8 *ROM, UINT32 len, UIN
csum &= 0xffff;
}
}
-
+
logerror("CODEMASTERS HEADER\n" );
logerror("==================\n" );
logerror("Build date & time: %x/%x/%x %.2x:%.2x\n", day, month, year, hour, minute);
diff --git a/src/mess/machine/sega8_slot.h b/src/mess/machine/sega8_slot.h
index 2a4fafb53f3..7e681ae294b 100644
--- a/src/mess/machine/sega8_slot.h
+++ b/src/mess/machine/sega8_slot.h
@@ -48,12 +48,12 @@ public:
// a few carts (for SG1000) acts as a RAM expansion, taking control of the system RAM in 0xc000-0xffff
virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_ram) {}
-
+
void rom_alloc(running_machine &machine, UINT32 size);
void ram_alloc(running_machine &machine, UINT32 size);
-
+
virtual void late_bank_setup() {}
-
+
void set_has_battery(bool val) { has_battery = val; }
bool get_has_battery() { return has_battery; }
void set_late_battery(bool val) { m_late_battery_enable = val; }
@@ -62,7 +62,7 @@ public:
int get_lphaser_xoffs() { return m_lphaser_xoffs; }
void set_sms_mode(int val) { m_sms_mode = val; }
int get_sms_mode() { return m_sms_mode; }
-
+
//protected:
UINT8* get_rom_base() { return m_rom; }
UINT8* get_ram_base() { return m_ram; }
@@ -81,10 +81,10 @@ public:
int m_rom_page_count;
bool has_battery;
-
- // we use this variable for fullpath loading only: in this case, RAM is always allocated,
+
+ // we use this variable for fullpath loading only: in this case, RAM is always allocated,
// but we set has_battery only if RAM is actually enabled during game...
- bool m_late_battery_enable;
+ bool m_late_battery_enable;
int m_lphaser_xoffs;
int m_sms_mode;
@@ -218,14 +218,12 @@ public:
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
static_cast<sega8_card_slot_device *>(device)->set_mandatory(FALSE); \
static_cast<sega8_card_slot_device *>(device)->set_intf("sms_card"); \
- static_cast<sega8_card_slot_device *>(device)->set_ext("bin"); \
-
+ static_cast<sega8_card_slot_device *>(device)->set_ext("bin");
#define MCFG_SG1000_CARD_ADD(_tag,_slot_intf,_def_slot) \
MCFG_DEVICE_ADD(_tag, SEGA8_CARD_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
static_cast<sega8_card_slot_device *>(device)->set_intf("sg1000_cart"); \
- static_cast<sega8_card_slot_device *>(device)->set_ext("bin,sg"); \
-
+ static_cast<sega8_card_slot_device *>(device)->set_ext("bin,sg");
#endif
diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c
index 3f62b69aa09..c75f71794d3 100644
--- a/src/mess/machine/sms.c
+++ b/src/mess/machine/sms.c
@@ -694,7 +694,7 @@ WRITE8_MEMBER(sms_state::sms_mapper_w)
{
bool bios_selected = false;
bool cartridge_selected = false;
-
+
m_mapper[offset] = data;
m_mainram[0x1ffc + offset] = data;
@@ -703,19 +703,19 @@ WRITE8_MEMBER(sms_state::sms_mapper_w)
if (!(m_bios_port & IO_CARTRIDGE) || (m_is_gamegear && m_BIOS == NULL))
cartridge_selected = true;
else
- return; // nothing to page in
+ return; // nothing to page in
}
else
{
if (!m_BIOS)
- return; // nothing to page in
+ return; // nothing to page in
bios_selected = true;
}
-
+
switch (offset)
{
case 0: // Control RAM/ROM
- if (!(data & 0x08) && !(m_bios_port & IO_BIOS_ROM) && bios_selected) // BIOS ROM
+ if (!(data & 0x08) && !(m_bios_port & IO_BIOS_ROM) && bios_selected) // BIOS ROM
{
if (!m_has_bios_0400 && !m_has_bios_2000)
{
@@ -723,13 +723,13 @@ WRITE8_MEMBER(sms_state::sms_mapper_w)
m_bios_page[2] = m_mapper[3];
}
}
- else if (cartridge_selected) // CART ROM/RAM
+ else if (cartridge_selected) // CART ROM/RAM
{
m_bank_enabled[2] = ENABLE_CART;
m_cartslot->write_mapper(space, offset, data);
}
break;
-
+
case 1: // Select 16k ROM bank for 0400-3fff
case 2: // Select 16k ROM bank for 4000-7fff
case 3: // Select 16k ROM bank for 8000-bfff
@@ -761,9 +761,9 @@ READ8_MEMBER(sms_state::read_0000)
return m_BIOS[(m_bios_page[3] * 0x4000) + (offset & 0x3fff)];
}
if (m_bank_enabled[3] == ENABLE_CART)
- return m_cartslot->read_cart(space, offset);
+ return m_cartslot->read_cart(space, offset);
if (m_card && m_bank_enabled[3] == ENABLE_CARD)
- return m_card->read_cart(space, offset);
+ return m_card->read_cart(space, offset);
}
else
{
@@ -773,10 +773,10 @@ READ8_MEMBER(sms_state::read_0000)
return m_BIOS[(m_bios_page[0] * 0x4000) + (offset & 0x3fff)];
}
if (m_bank_enabled[0] == ENABLE_CART)
- return m_cartslot->read_cart(space, offset);
+ return m_cartslot->read_cart(space, offset);
if (m_card && m_bank_enabled[0] == ENABLE_CARD)
- return m_card->read_cart(space, offset);
- }
+ return m_card->read_cart(space, offset);
+ }
return m_region_maincpu->base()[offset];
}
@@ -789,9 +789,9 @@ READ8_MEMBER(sms_state::read_4000)
}
if (m_bank_enabled[1] == ENABLE_CART)
- return m_cartslot->read_cart(space, offset + 0x4000);
+ return m_cartslot->read_cart(space, offset + 0x4000);
if (m_card && m_bank_enabled[1] == ENABLE_CARD)
- return m_card->read_cart(space, offset + 0x4000);
+ return m_card->read_cart(space, offset + 0x4000);
return m_region_maincpu->base()[offset];
}
@@ -805,9 +805,9 @@ READ8_MEMBER(sms_state::read_8000)
}
if (m_bank_enabled[2] == ENABLE_CART)
- return m_cartslot->read_cart(space, offset + 0x8000);
+ return m_cartslot->read_cart(space, offset + 0x8000);
if (m_card && m_bank_enabled[2] == ENABLE_CARD)
- return m_card->read_cart(space, offset + 0x8000);
+ return m_card->read_cart(space, offset + 0x8000);
return m_region_maincpu->base()[offset];
}
@@ -827,9 +827,9 @@ READ8_MEMBER(smssdisp_state::store_read_0000)
return m_BIOS[(m_bios_page[3] * 0x4000) + (offset & 0x3fff)];
}
if (m_bank_enabled[3] == ENABLE_CART)
- return m_slots[m_current_cartridge]->read_cart(space, offset);
+ return m_slots[m_current_cartridge]->read_cart(space, offset);
if (m_bank_enabled[3] == ENABLE_CARD)
- return m_cards[m_current_cartridge]->read_cart(space, offset);
+ return m_cards[m_current_cartridge]->read_cart(space, offset);
}
else
{
@@ -839,10 +839,10 @@ READ8_MEMBER(smssdisp_state::store_read_0000)
return m_BIOS[(m_bios_page[0] * 0x4000) + (offset & 0x3fff)];
}
if (m_bank_enabled[0] == ENABLE_CART)
- return m_slots[m_current_cartridge]->read_cart(space, offset);
+ return m_slots[m_current_cartridge]->read_cart(space, offset);
if (m_bank_enabled[0] == ENABLE_CARD)
- return m_cards[m_current_cartridge]->read_cart(space, offset);
- }
+ return m_cards[m_current_cartridge]->read_cart(space, offset);
+ }
return m_region_maincpu->base()[offset];
}
@@ -855,10 +855,10 @@ READ8_MEMBER(smssdisp_state::store_read_4000)
return m_BIOS[(m_bios_page[1] * 0x4000) + (offset & 0x3fff)];
}
if (m_bank_enabled[1] == ENABLE_CART)
- return m_slots[m_current_cartridge]->read_cart(space, offset + 0x4000);
+ return m_slots[m_current_cartridge]->read_cart(space, offset + 0x4000);
if (m_bank_enabled[1] == ENABLE_CARD)
- return m_cards[m_current_cartridge]->read_cart(space, offset + 0x4000);
-
+ return m_cards[m_current_cartridge]->read_cart(space, offset + 0x4000);
+
return m_region_maincpu->base()[offset];
}
@@ -868,12 +868,12 @@ READ8_MEMBER(smssdisp_state::store_read_8000)
{
if (m_BIOS)
return m_BIOS[(m_bios_page[2] * 0x4000) + (offset & 0x3fff)];
- }
+ }
if (m_bank_enabled[2] == ENABLE_CART)
- return m_slots[m_current_cartridge]->read_cart(space, offset + 0x8000);
+ return m_slots[m_current_cartridge]->read_cart(space, offset + 0x8000);
if (m_bank_enabled[2] == ENABLE_CARD)
- return m_cards[m_current_cartridge]->read_cart(space, offset + 0x8000);
-
+ return m_cards[m_current_cartridge]->read_cart(space, offset + 0x8000);
+
return m_region_maincpu->base()[offset];
}
@@ -882,18 +882,18 @@ WRITE8_MEMBER(smssdisp_state::store_write_cart)
// this might only work because we are not emulating properly the cart/card selection system
// it will have to be reviewed when proper emulation is worked on!
if (m_bank_enabled[0] == ENABLE_CART)
- m_slots[m_current_cartridge]->write_cart(space, offset, data);
+ m_slots[m_current_cartridge]->write_cart(space, offset, data);
if (m_bank_enabled[0] == ENABLE_CARD)
- m_cards[m_current_cartridge]->write_cart(space, offset, data);
+ m_cards[m_current_cartridge]->write_cart(space, offset, data);
}
READ8_MEMBER(smssdisp_state::store_cart_peek)
{
if (m_bank_enabled[1] == ENABLE_CART)
- return m_slots[m_current_cartridge]->read_cart(space, 0x4000 + (offset & 0x1fff));
+ return m_slots[m_current_cartridge]->read_cart(space, 0x4000 + (offset & 0x1fff));
if (m_bank_enabled[1] == ENABLE_CARD)
- return m_cards[m_current_cartridge]->read_cart(space, 0x4000 + (offset & 0x1fff));
-
+ return m_cards[m_current_cartridge]->read_cart(space, 0x4000 + (offset & 0x1fff));
+
return m_region_maincpu->base()[offset];
}
@@ -1055,7 +1055,7 @@ void sms_state::setup_bios()
MACHINE_START_MEMBER(sms_state,sms)
{
char str[7];
-
+
m_rapid_fire_timer = timer_alloc(TIMER_RAPID_FIRE);
m_rapid_fire_timer->adjust(attotime::from_hz(10), 0, attotime::from_hz(10));
@@ -1132,7 +1132,7 @@ MACHINE_START_MEMBER(sms_state,sms)
// a bunch of SG1000 carts (compatible with SG1000 Mark III) can access directly system RAM... let's install here the necessary handlers
// TODO: are BASIC and Music actually compatible with Mark III??
- if (m_cartslot->get_type() == SEGA8_BASIC_L3 || m_cartslot->get_type() == SEGA8_MUSIC_EDITOR
+ if (m_cartslot->get_type() == SEGA8_BASIC_L3 || m_cartslot->get_type() == SEGA8_MUSIC_EDITOR
|| m_cartslot->get_type() == SEGA8_DAHJEE_TYPEA || m_cartslot->get_type() == SEGA8_DAHJEE_TYPEB)
{
m_maincpu->space(AS_PROGRAM).install_read_handler(0xc000, 0xffff, 0, 0, read8_delegate(FUNC(sega8_cart_slot_device::read_ram),(sega8_cart_slot_device*)m_cartslot));
@@ -1206,8 +1206,8 @@ WRITE8_MEMBER(smssdisp_state::sms_store_cart_select_w)
logerror("switching in part of %s slot #%d\n", slottype ? "card" : "cartridge", slot );
/* cartridge? slot #0 */
-// if (slottype == 0)
-// m_current_cartridge = slot;
+// if (slottype == 0)
+// m_current_cartridge = slot;
setup_rom();
}
diff --git a/src/mess/machine/sns_sa1.c b/src/mess/machine/sns_sa1.c
index 147f088277b..bdfac6cf11f 100644
--- a/src/mess/machine/sns_sa1.c
+++ b/src/mess/machine/sns_sa1.c
@@ -53,7 +53,6 @@ sns_sa1_device::sns_sa1_device(const machine_config &mconfig, const char *tag, d
void sns_sa1_device::device_start()
{
-
}
void sns_sa1_device::device_reset()
@@ -78,7 +77,7 @@ void sns_sa1_device::device_reset()
m_bwram_sa1 = 0;
m_bwram_sa1_source = 0;
m_bwram_sa1_format = 0;
- m_bwram_write_snes = 1;
+ m_bwram_write_snes = 1;
m_bwram_write_sa1 = 1;
m_bwpa_sa1 = 0x0f;
m_iram_write_snes = 1;
@@ -220,15 +219,15 @@ UINT8 sns_sa1_device::read_regs(address_space &space, UINT32 offset)
UINT32 data = (var_length_read(space, m_vda + 0) << 0) | (var_length_read(space, m_vda + 1) << 8)
| (var_length_read(space, m_vda + 2) << 16);
data >>= m_vbit;
-
- if (m_drm == 1)
+
+ if (m_drm == 1)
{
//auto-increment mode
m_vbit += m_vlen;
m_vda += (m_vbit >> 3);
m_vbit &= 7;
}
-
+
value = (data >> 8) & 0xff;
}
break;
@@ -255,7 +254,7 @@ void sns_sa1_device::write_regs(UINT32 offset, UINT8 data)
// reset sa-1?
}
m_sa1_ctrl = data;
-
+
if (BIT(m_sa1_ctrl, 7))
{
// IRQ
diff --git a/src/mess/machine/sns_sdd1.c b/src/mess/machine/sns_sdd1.c
index 85d336d4d5a..8291e00574e 100644
--- a/src/mess/machine/sns_sdd1.c
+++ b/src/mess/machine/sns_sdd1.c
@@ -435,7 +435,7 @@ void sns_rom_sdd1_device::device_start()
save_item(NAME(m_sdd1_enable));
save_item(NAME(m_xfer_enable));
save_item(NAME(m_mmc));
-
+
for (int i = 0; i < 8; i++)
{
save_item(NAME(m_dma[i].addr), i);
diff --git a/src/mess/machine/sns_sgb.c b/src/mess/machine/sns_sgb.c
index eba0b14b57e..cdab2bdd3a4 100644
--- a/src/mess/machine/sns_sgb.c
+++ b/src/mess/machine/sns_sgb.c
@@ -1,12 +1,12 @@
/***********************************************************************************************************
-
+
Super Game Boy emulation (for SNES/SFC)
-
+
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
TODO: almost everything
-
+
***********************************************************************************************************/
@@ -123,60 +123,60 @@ READ8_MEMBER( sns_rom_sgb_device::chip_read )
UINT16 address = offset & 0xffff;
//LY counter
- if (address == 0x6000)
+ if (address == 0x6000)
{
m_sgb_ly = 0;// GameBoy PPU LY here
m_sgb_row = m_lcd_row;
return m_sgb_ly;
}
-
+
//command ready port
- if (address == 0x6002)
+ if (address == 0x6002)
{
bool data = (m_packetsize > 0);
- if (data)
+ if (data)
{
- for (int i = 0; i < 16; i++)
+ for (int i = 0; i < 16; i++)
m_joy_pckt[i] = m_packet_data[0][i];
- m_packetsize--;
+ m_packetsize--;
//hack because we still don't emulate input packets!
if (!m_packetsize) m_packetsize = 64;
// shift packet
- for (int i = 0; i < m_packetsize; i++)
+ for (int i = 0; i < m_packetsize; i++)
for (int j = 0; j < 16; j++)
m_packet_data[i][j] = m_packet_data[i + 1][j];
}
return data;
}
-
+
//ICD2 revision
- if (address == 0x600f)
+ if (address == 0x600f)
return 0x21;
-
+
//command port
- if ((address & 0xfff0) == 0x7000)
+ if ((address & 0xfff0) == 0x7000)
return m_joy_pckt[address & 0x0f];
-
+
//VRAM port
- if (address == 0x7800)
+ if (address == 0x7800)
{
UINT8 data = m_lcd_output[m_vram_offs];
m_vram_offs = (m_vram_offs + 1) % 320;
return data;
}
- return 0x00; // this should never happen?
+ return 0x00; // this should never happen?
}
-void sns_rom_sgb_device::lcd_render(UINT32 *source)
+void sns_rom_sgb_device::lcd_render(UINT32 *source)
{
memset(m_lcd_output, 0x00, 320 * sizeof(UINT16));
-
+
for (int y = 0; y < 8; y++)
{
- for (int x = 0; x < 160; x++)
+ for (int x = 0; x < 160; x++)
{
UINT32 pixel = *source++;
UINT16 addr = y * 2 + (x / 8 * 16);
@@ -189,59 +189,58 @@ void sns_rom_sgb_device::lcd_render(UINT32 *source)
WRITE8_MEMBER( sns_rom_sgb_device::chip_write )
{
UINT16 address = offset & 0xffff;
-
+
//VRAM port
- if (address == 0x6001)
+ if (address == 0x6001)
{
m_vram = data;
m_vram_offs = 0;
-
+
UINT8 offset = (m_sgb_row - (4 - (m_vram - (m_sgb_ly & 3)))) & 3;
lcd_render(m_lcd_buffer + offset * 160 * 8);
-
+
return;
}
-
+
//control port
- if (address == 0x6003)
+ if (address == 0x6003)
{
- if ((m_port & 0x80) == 0x00 && (data & 0x80) == 0x80)
+ if ((m_port & 0x80) == 0x00 && (data & 0x80) == 0x80)
{
//reset
}
- switch (data & 3)
+ switch (data & 3)
{
//change CPU frequency
}
m_port = data;
return;
}
-
- if (address == 0x6004)
+
+ if (address == 0x6004)
{
//joypad 1
- m_joy1 = data;
- return;
+ m_joy1 = data;
+ return;
}
- if (address == 0x6005)
+ if (address == 0x6005)
{
//joypad 2
- m_joy2 = data;
- return;
+ m_joy2 = data;
+ return;
}
- if (address == 0x6006)
+ if (address == 0x6006)
{
//joypad 3
- m_joy3 = data;
- return;
+ m_joy3 = data;
+ return;
}
- if (address == 0x6007)
+ if (address == 0x6007)
{
//joypad 4
- m_joy4 = data;
- return;
+ m_joy4 = data;
+ return;
}
-
-}
+}
diff --git a/src/mess/machine/sns_sgb.h b/src/mess/machine/sns_sgb.h
index 4c6ebf15af5..492a35f3315 100644
--- a/src/mess/machine/sns_sgb.h
+++ b/src/mess/machine/sns_sgb.h
@@ -14,7 +14,7 @@ class sns_rom_sgb_device : public sns_rom_device
public:
// construction/destruction
sns_rom_sgb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_reset();
@@ -25,7 +25,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_h);
virtual DECLARE_READ8_MEMBER(chip_read);
virtual DECLARE_WRITE8_MEMBER(chip_write);
-
+
virtual DECLARE_READ8_MEMBER(gb_cart_r);
virtual DECLARE_WRITE8_MEMBER(gb_bank_w);
virtual DECLARE_READ8_MEMBER(gb_ram_r);
diff --git a/src/mess/machine/sns_spc7110.c b/src/mess/machine/sns_spc7110.c
index 8bf8536284b..2eb768af13f 100644
--- a/src/mess/machine/sns_spc7110.c
+++ b/src/mess/machine/sns_spc7110.c
@@ -318,7 +318,7 @@ SPC7110_Decomp::SPC7110_Decomp(running_machine &machine)
+ map(3, 24) + map(2, 16) + map(1, 8) + map(0, 0);
#undef map
}
-
+
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_decomp_mode);
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_decomp_offset);
state_save_register_item_pointer(machine, "SNES_SPC7110", NULL, 0, m_decomp_buffer, SPC7110_DECOMP_BUFFER_SIZE);
@@ -331,7 +331,7 @@ SPC7110_Decomp::SPC7110_Decomp(running_machine &machine)
state_save_register_item(machine, "SNES_SPC7110", NULL, i, m_context[i].index);
state_save_register_item(machine, "SNES_SPC7110", NULL, i, m_context[i].invert);
}
-
+
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m0_val);
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m0_in);
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m0_span);
@@ -349,7 +349,7 @@ SPC7110_Decomp::SPC7110_Decomp(running_machine &machine)
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_inverts);
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_lps);
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m1_in_count);
-
+
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_pixelorder);
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_realorder);
state_save_register_item(machine, "SNES_SPC7110", NULL, 0, m_m2_bitplanebuffer);
@@ -455,7 +455,7 @@ UINT8 SPC7110_Decomp::dataread(UINT8 *ROM, UINT32 len)
}
void SPC7110_Decomp::mode0(UINT8 init, UINT8 *ROM, UINT32 len)
-{
+{
if (init == 1)
{
m_m0_out = m_m0_inverts = m_m0_lps = 0;
diff --git a/src/mess/machine/sns_spc7110.h b/src/mess/machine/sns_spc7110.h
index 24871f3040f..0a607d2d001 100644
--- a/src/mess/machine/sns_spc7110.h
+++ b/src/mess/machine/sns_spc7110.h
@@ -36,7 +36,7 @@ public:
void mode2(UINT8 init, UINT8 *ROM, UINT32 len);
private:
-
+
UINT8 dataread(UINT8 *ROM, UINT32 len);
UINT8 probability(UINT32 n);
UINT8 next_lps(UINT32 n);
@@ -44,21 +44,21 @@ private:
UINT8 toggle_invert(UINT32 n);
UINT32 morton_2x8(UINT32 data);
UINT32 morton_4x8(UINT32 data);
-
+
UINT32 m_decomp_mode;
UINT32 m_decomp_offset;
-
+
UINT8 *m_decomp_buffer;
UINT32 m_decomp_buffer_rdoffset;
UINT32 m_decomp_buffer_wroffset;
UINT32 m_decomp_buffer_length;
-
+
struct ContextState
{
UINT8 index;
UINT8 invert;
} m_context[32];
-
+
UINT32 m_morton16[2][256];
UINT32 m_morton32[4][256];
diff --git a/src/mess/machine/softbox.h b/src/mess/machine/softbox.h
index 68100948ad8..f11d5737cb6 100644
--- a/src/mess/machine/softbox.h
+++ b/src/mess/machine/softbox.h
@@ -74,4 +74,4 @@ extern const device_type SOFTBOX;
-#endif \ No newline at end of file
+#endif
diff --git a/src/mess/machine/upd71071.c b/src/mess/machine/upd71071.c
index b3ebe814bd8..58fa6a44e90 100644
--- a/src/mess/machine/upd71071.c
+++ b/src/mess/machine/upd71071.c
@@ -100,7 +100,7 @@ void upd71071_device::device_config_complete()
const upd71071_intf *intf = reinterpret_cast<const upd71071_intf *>(static_config());
if (intf != NULL)
*static_cast<upd71071_intf *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
diff --git a/src/mess/machine/victor9kb.h b/src/mess/machine/victor9kb.h
index f067320a7ca..cd4321b688c 100644
--- a/src/mess/machine/victor9kb.h
+++ b/src/mess/machine/victor9kb.h
@@ -32,8 +32,7 @@
#define MCFG_VICTOR9K_KEYBOARD_ADD(_kbrdy) \
MCFG_DEVICE_ADD(VICTOR9K_KEYBOARD_TAG, VICTOR9K_KEYBOARD, 0) \
- downcast<victor9k_keyboard_device *>(device)->set_kbrdy_callback(DEVCB2_##_kbrdy); \
-
+ downcast<victor9k_keyboard_device *>(device)->set_kbrdy_callback(DEVCB2_##_kbrdy);
//**************************************************************************
diff --git a/src/mess/machine/vp575.c b/src/mess/machine/vp575.c
index e31c7a10923..17f9c8c1aff 100644
--- a/src/mess/machine/vp575.c
+++ b/src/mess/machine/vp575.c
@@ -65,15 +65,15 @@ WRITE_LINE_MEMBER( vp575_device::exp5_dma_in_w ) { m_dma_in[4] = state; update_i
static MACHINE_CONFIG_FRAGMENT( vp575 )
MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL_3_52128MHz/2, vip_expansion_cards, NULL)
- MCFG_VIP_EXPANSION_SLOT_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp1_int_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp1_dma_out_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp1_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp1_int_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp1_dma_out_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp1_dma_in_w))
MCFG_VIP_EXPANSION_SLOT_ADD("exp2", XTAL_3_52128MHz/2, vip_expansion_cards, NULL)
- MCFG_VIP_EXPANSION_SLOT_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp2_int_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp2_dma_out_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp2_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp2_int_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp2_dma_out_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp2_dma_in_w))
MCFG_VIP_EXPANSION_SLOT_ADD("exp3", XTAL_3_52128MHz/2, vip_expansion_cards, NULL)
- MCFG_VIP_EXPANSION_SLOT_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp3_int_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp3_dma_out_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp3_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp3_int_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp3_dma_out_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp3_dma_in_w))
MCFG_VIP_EXPANSION_SLOT_ADD("exp4", XTAL_3_52128MHz/2, vip_expansion_cards, NULL)
- MCFG_VIP_EXPANSION_SLOT_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp4_int_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp4_dma_out_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp4_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp4_int_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp4_dma_out_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp4_dma_in_w))
MCFG_VIP_EXPANSION_SLOT_ADD("exp5", XTAL_3_52128MHz/2, vip_expansion_cards, NULL)
- MCFG_VIP_EXPANSION_SLOT_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp5_int_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp5_dma_out_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp5_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_CALLBACKS(DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp5_int_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp5_dma_out_w), DEVWRITELINE(DEVICE_SELF_OWNER, vp575_device, exp5_dma_in_w))
MACHINE_CONFIG_END
diff --git a/src/mess/machine/wangpc_mcc.c b/src/mess/machine/wangpc_mcc.c
index aa83bb1fdd7..0049608899e 100644
--- a/src/mess/machine/wangpc_mcc.c
+++ b/src/mess/machine/wangpc_mcc.c
@@ -272,7 +272,7 @@ void wangpc_mcc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, U
case 0x06/2:
m_sio->cd_ba_w(space, offset >> 1, data & 0xff);
break;
-
+
case 0x08/2:
case 0x0a/2:
case 0x0c/2:
diff --git a/src/mess/machine/zx8302.h b/src/mess/machine/zx8302.h
index edabc673d00..47b46d12ecb 100644
--- a/src/mess/machine/zx8302.h
+++ b/src/mess/machine/zx8302.h
@@ -172,7 +172,7 @@ private:
enum
{
- INT_GAP = 0x01,
+ INT_GAP = 0x01,
INT_INTERFACE = 0x02,
INT_TRANSMIT = 0x04,
INT_FRAME = 0x08,
@@ -181,7 +181,7 @@ private:
enum
{
- STATUS_NETWORK_PORT = 0x01,
+ STATUS_NETWORK_PORT = 0x01,
STATUS_TX_BUFFER_FULL = 0x02,
STATUS_RX_BUFFER_FULL = 0x04,
STATUS_MICRODRIVE_GAP = 0x08,
diff --git a/src/mess/video/gba.c b/src/mess/video/gba.c
index 2bf8756f4e2..ef3fbc1351d 100644
--- a/src/mess/video/gba.c
+++ b/src/mess/video/gba.c
@@ -53,16 +53,16 @@ inline void gba_state::update_mask(UINT8* mask, int mode, int submode, UINT32* o
for (int x = 0; x < 240; x++)
{
mask[x] = out_mask;
-
+
if ((obj_win[x] & 0x80000000) == 0)
mask[x] = m_WINOUT >> 8;
-
+
if (inwin1)
{
if (is_in_window(x, 1))
mask[x] = in1_mask;
}
-
+
if (inwin0)
{
if (is_in_window(x, 0))
@@ -87,7 +87,7 @@ inline void gba_state::update_mask(UINT8* mask, int mode, int submode, UINT32* o
mode_mask = ~0x0b;
}
-
+
if (mode_mask)
{
for (int x = 0; x < 240; x++)
@@ -103,8 +103,8 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
UINT8 inWin0Mask = m_WININ & 0x00ff;
UINT8 inWin1Mask = m_WININ >> 8;
UINT8 outMask = m_WINOUT & 0x00ff;
- UINT8 masks[240]; // this puts together WinMasks with the fact that some modes/submodes skip specific layers!
-
+ UINT8 masks[240]; // this puts together WinMasks with the fact that some modes/submodes skip specific layers!
+
if (submode == GBA_SUBMODE2)
{
if (m_DISPCNT & DISPCNT_WIN0_EN)
@@ -117,7 +117,7 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
else
inWindow0 |= (y >= v0 || y < v1) ? 1 : 0;
}
-
+
if (m_DISPCNT & DISPCNT_WIN1_EN)
{
UINT8 v0 = m_WIN1V >> 8;
@@ -129,7 +129,7 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
inWindow1 |= (y >= v0 || y < v1) ? 1 : 0;
}
}
-
+
// Draw BG
switch (mode)
{
@@ -154,7 +154,7 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
draw_roz_bitmap_scanline(line2, y, DISPCNT_BG2_EN, m_BG2CNT, m_BG2X, m_BG2Y, m_BG2PA, m_BG2PB, m_BG2PC, m_BG2PD, &m_gfxBG2X, &m_gfxBG2Y, m_gfxBG2Changed, bpp);
break;
}
-
+
// Draw OAM
draw_gba_oam(lineOBJ, y);
if (submode == GBA_SUBMODE2)
@@ -162,73 +162,73 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
memset(masks, 0xff, sizeof(masks));
update_mask(&masks[0], mode, submode, lineOBJWin, inWindow0, inWindow1, inWin0Mask, inWin1Mask, outMask);
-
+
for (int x = 0; x < 240; x++)
{
UINT32 color = backdrop;
UINT8 top = 0x20;
-
+
if ((UINT8)(line0[x] >> 24) < (UINT8)(color >> 24) && masks[x] & 0x01)
{
color = line0[x];
top = 0x01;
}
-
+
if ((UINT8)(line1[x] >> 24) < (UINT8)(color >> 24) && masks[x] & 0x02)
{
color = line1[x];
top = 0x02;
}
-
+
if ((UINT8)(line2[x] >> 24) < (UINT8)(color >> 24) && masks[x] & 0x04)
{
color = line2[x];
top = 0x04;
}
-
+
if ((UINT8)(line3[x] >> 24) < (UINT8)(color >> 24) && masks[x] & 0x08)
{
color = line3[x];
top = 0x08;
}
-
+
if ((UINT8)(lineOBJ[x] >> 24) < (UINT8)(color >> 24) && masks[x] & 0x10)
{
color = lineOBJ[x];
top = 0x10;
}
-
+
if (color & 0x00010000)
{
if (submode != GBA_SUBMODE0 || top == 0x10)
{
UINT32 back = backdrop;
UINT8 top2 = 0x20;
-
+
if ((UINT8)(line0[x] >> 24) < (UINT8)(back >> 24) && masks[x] & 0x01)
{
back = line0[x];
top2 = 0x01;
}
-
+
if ((UINT8)(line1[x] >> 24) < (UINT8)(back >> 24) && masks[x] & 0x02)
{
back = line1[x];
top2 = 0x02;
}
-
+
if ((UINT8)(line2[x] >> 24) < (UINT8)(back >> 24) && masks[x] & 0x04)
{
back = line2[x];
top2 = 0x04;
}
-
+
if ((UINT8)(line3[x] >> 24) < (UINT8)(back >> 24) && masks[x] & 0x08)
{
back = line3[x];
top2 = 0x08;
}
-
+
if (top2 & (m_BLDCNT >> BLDCNT_TP2_SHIFT))
color = alpha_blend_pixel(color, back, coeff[m_BLDALPHA & 0x1f], coeff[(m_BLDALPHA >> 8) & 0x1f]);
else
@@ -260,7 +260,7 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
{
UINT32 back = backdrop;
UINT8 top2 = 0x20;
-
+
if ((UINT8)(line0[x] >> 24) < (UINT8)(back >> 24) && masks[x] & 0x01)
{
if (top != 0x01)
@@ -269,7 +269,7 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
top2 = 0x01;
}
}
-
+
if ((UINT8)(line1[x] >> 24) < (UINT8)(back >> 24) && masks[x] & 0x02)
{
if (top != 0x02)
@@ -278,7 +278,7 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
top2 = 0x02;
}
}
-
+
if ((UINT8)(line2[x] >> 24) < (UINT8)(back >> 24) && masks[x] & 0x04)
{
if (top != 0x04)
@@ -287,7 +287,7 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
top2 = 0x04;
}
}
-
+
if ((UINT8)(line3[x] >> 24) < (UINT8)(back >> 24) && masks[x] & 0x08)
{
if (top != 0x08)
@@ -296,7 +296,7 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
top2 = 0x08;
}
}
-
+
if ((UINT8)(lineOBJ[x] >> 24) < (UINT8)(back >> 24) && masks[x] & 0x10)
{
if (top != 0x10)
@@ -305,7 +305,7 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
top2 = 0x10;
}
}
-
+
if (top2 & (m_BLDCNT >> BLDCNT_TP2_SHIFT))
color = alpha_blend_pixel(color, back, coeff[m_BLDALPHA & 0x1f], coeff[(m_BLDALPHA >> 8) & 0x1f]);
}
@@ -320,7 +320,7 @@ void gba_state::draw_modes(int mode, int submode, int y, UINT32* line0, UINT32*
}
}
lineMix[x] = color;
- }
+ }
if (mode == GBA_MODE1 || mode == GBA_MODE2 || mode == GBA_MODE345)
m_gfxBG2Changed = 0;
if (mode == GBA_MODE2)
@@ -336,13 +336,13 @@ void gba_state::draw_roz_bitmap_scanline(UINT32 *scanline, int ypos, UINT32 enab
INT32 sy = (depth == 4) ? 128 : 160;
UINT32 prio = ((ctrl & BGCNT_PRIORITY) << 25) + 0x1000000;
INT32 cx, cy, pixx, pixy, x;
-
+
if ((depth == 8) && (m_DISPCNT & DISPCNT_FRAMESEL))
src8 += 0xa000;
-
+
if ((depth == 4) && (m_DISPCNT & DISPCNT_FRAMESEL))
src16 += 0xa000/2;
-
+
// sign extend roz parameters
if (X & 0x08000000) X |= 0xf0000000;
if (Y & 0x08000000) Y |= 0xf0000000;
@@ -350,23 +350,23 @@ void gba_state::draw_roz_bitmap_scanline(UINT32 *scanline, int ypos, UINT32 enab
if (PB & 0x8000) PB |= 0xffff0000;
if (PC & 0x8000) PC |= 0xffff0000;
if (PD & 0x8000) PD |= 0xffff0000;
-
+
if(ypos == 0)
changed = 3;
-
+
if(changed & 1)
*currentx = X;
else
*currentx += PB;
-
+
if(changed & 2)
*currenty = Y;
else
*currenty += PD;
-
+
cx = *currentx;
cy = *currenty;
-
+
if(ctrl & BGCNT_MOSAIC)
{
INT32 mosaic_line = ((m_MOSAIC & 0xf0) >> 4) + 1;
@@ -374,10 +374,10 @@ void gba_state::draw_roz_bitmap_scanline(UINT32 *scanline, int ypos, UINT32 enab
cx = X + tempy*PB;
cy = Y + tempy*PD;
}
-
+
pixx = cx >> 8;
pixy = cy >> 8;
-
+
for(x = 0; x < 240; x++)
{
if(pixx < 0 || pixy < 0 || pixx >= sx || pixy >= sy)
@@ -396,14 +396,14 @@ void gba_state::draw_roz_bitmap_scanline(UINT32 *scanline, int ypos, UINT32 enab
scanline[x] = src16[pixy*sx + pixx] | prio;
}
}
-
+
cx += PA;
cy += PC;
-
+
pixx = cx >> 8;
pixy = cy >> 8;
}
-
+
if(ctrl & BGCNT_MOSAIC)
{
INT32 mosaicx = (m_MOSAIC & 0x0f) + 1;
@@ -508,17 +508,17 @@ void gba_state::draw_roz_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
// shall we shift for (ctrl & BGCNT_PALETTE256)?? or is not effective for ROZ?
tile = mgba_vram[mapbase + (pixx >> 3) + (pixy >> 3) * (sizes[size] >> 3)];
pixel = mgba_vram[base + (tile << 6) + (tiley << 3) + tilex];
-
+
// plot it
scanline[x] = pixel ? (pgba_pram[pixel] | prio) : 0x80000000;
}
-
+
cx += PA;
cy += PC;
-
+
pixx = cx >> 8;
pixy = cy >> 8;
-
+
if(ctrl & BGCNT_PALETTESET_WRAP)
{
pixx %= sizes[size];
@@ -573,10 +573,9 @@ void gba_state::draw_bg_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
for (x = 0; x < 240; x++)
scanline[x] = 0x80000000;
-
+
if(m_DISPCNT & enablemask)
{
-
switch((ctrl & BGCNT_SCREENSIZE) >> BGCNT_SCREENSIZE_SHIFT)
{
case 1:
@@ -590,13 +589,13 @@ void gba_state::draw_bg_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
height = 512;
break;
}
-
+
maskx = width - 1;
masky = height - 1;
-
+
pixx = hofs & maskx;
pixy = (vofs + ypos) & masky;
-
+
if(use_mosaic)
{
if((ypos % mosaicy) != 0)
@@ -605,7 +604,7 @@ void gba_state::draw_bg_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
pixy = (vofs + mosaicy) & masky;
}
}
-
+
if(pixy > 255 && height > 256)
{
pixy &= 0x000000ff;
@@ -615,9 +614,9 @@ void gba_state::draw_bg_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
screendata += 0x400;
}
}
-
+
stride = (pixy >> 3) << 5;
-
+
UINT16 *src = screendata + 0x400 * (pixx >> 8) + ((pixx & 255) >> 3) + stride;
for(x = 0; x < 240; x++)
{
@@ -627,7 +626,7 @@ void gba_state::draw_bg_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
INT32 tiley = pixy & 7;
UINT8 color;
UINT8 palindex;
-
+
if(data & TILEOBJ_HFLIP)
{
tilex = 7 - tilex;
@@ -636,7 +635,7 @@ void gba_state::draw_bg_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
{
tiley = 7 - tiley;
}
-
+
if (ctrl & BGCNT_PALETTE256)
{
color = chardata[(tile << 6) + (tiley << 3) + tilex];
@@ -645,19 +644,19 @@ void gba_state::draw_bg_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
else
{
color = chardata[(tile << 5) + (tiley << 2) + (tilex >> 1)];
-
+
if (tilex & 1)
color >>= 4;
else
color &= 0x0f;
palindex = (data >> 8) & 0x00f0;
- }
+ }
if (color)
scanline[x] = palette[palindex + color] | priority;
else
scanline[x] = 0x80000000;
-
+
if (data & TILEOBJ_HFLIP)
{
if (tilex == 0)
@@ -669,7 +668,7 @@ void gba_state::draw_bg_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
{
src++;
}
-
+
pixx++;
if(pixx == 256)
{
@@ -689,7 +688,7 @@ void gba_state::draw_bg_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
src = screendata + stride;
}
}
-
+
if(use_mosaic)
{
if(mosaicx > 1)
@@ -707,7 +706,7 @@ void gba_state::draw_bg_scanline(UINT32 *scanline, int ypos, UINT32 enablemask,
}
}
}
-
+
}
}
@@ -722,7 +721,7 @@ void gba_state::draw_gba_oam_window(UINT32 *scanline, int y)
for (x = 0; x < 240; x++)
scanline[x] = 0x80000000;
-
+
if (m_DISPCNT & DISPCNT_OBJWIN_EN)
{
for( gba_oamindex = 127; gba_oamindex >= 0; gba_oamindex-- )
@@ -1170,7 +1169,7 @@ void gba_state::draw_gba_oam(UINT32 *scanline, int y)
for (x = 0; x < 240; x++)
scanline[x] = 0x80000000;
-
+
if( m_DISPCNT & DISPCNT_OBJ_EN )
{
for( gba_oamindex = 0; gba_oamindex < 128; gba_oamindex++ )
@@ -1861,7 +1860,7 @@ void gba_state::draw_scanline(int y)
depth = 8;
else if ((m_DISPCNT & 7) == 5)
depth = 4;
-
+
//printf("mode = %d, %d\n", m_DISPCNT & 7, submode);
switch(m_DISPCNT & 7)
@@ -1880,7 +1879,7 @@ void gba_state::draw_scanline(int y)
fatalerror("Invalid screen mode (6 or 7)!\n");
break;
}
-
+
for (int x = 0; x < 240; x++)
{
scanline[x] = m_xferscan[6][1024 + x] & 0x7fff;
diff --git a/src/mess/video/gf4500.c b/src/mess/video/gf4500.c
index a8619ea7cc6..4ca6cbf3789 100644
--- a/src/mess/video/gf4500.c
+++ b/src/mess/video/gf4500.c
@@ -74,7 +74,7 @@ void gf4500_device::device_reset()
{
m_screen_x = m_screen_y = 0;
m_screen_x_max = m_screen_y_max = m_screen_x_min = m_screen_y_min = 0;
-}
+}
void gf4500_device::vram_write16( UINT16 data )
@@ -180,4 +180,3 @@ WRITE32_MEMBER( gf4500_device::write )
}
}
}
-
diff --git a/src/mess/video/gf4500.h b/src/mess/video/gf4500.h
index 0a4e3299f7e..2e14c450562 100644
--- a/src/mess/video/gf4500.h
+++ b/src/mess/video/gf4500.h
@@ -15,8 +15,8 @@ class gf4500_device : public device_t
public:
gf4500_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~gf4500_device() {}
-
-
+
+
DECLARE_READ32_MEMBER( read );
DECLARE_WRITE32_MEMBER( write );
@@ -27,12 +27,12 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
-private:
+
+private:
// internal state
void vram_write16(UINT16 data);
-
+
UINT32 *m_data;
int m_screen_x;
int m_screen_y;
diff --git a/src/mess/video/newport.c b/src/mess/video/newport.c
index 4f32d6400fb..210d6406f8f 100644
--- a/src/mess/video/newport.c
+++ b/src/mess/video/newport.c
@@ -102,7 +102,7 @@ void newport_video_device::device_config_complete()
void newport_video_device::device_start()
{
m_base = auto_alloc_array_clear(machine(), UINT32, (1280+64) * (1024+64));
-
+
save_pointer(NAME(m_base), (1280+64) * (1024+64));
save_item(NAME(m_VC2.nRegister));
save_item(NAME(m_VC2.nRAM));
@@ -203,8 +203,8 @@ void newport_video_device::device_reset()
m_REX3.nDrawMode0 = 0x00000000;
m_REX3.nDrawMode1 = 0x3002f001;
m_REX3.nDCBMode = 0x00000780;
- m_REX3.nKludge_SkipLine = 0;
-}
+ m_REX3.nKludge_SkipLine = 0;
+}
UINT32 newport_video_device::screen_update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect)
@@ -214,7 +214,7 @@ UINT32 newport_video_device::screen_update(screen_device &device, bitmap_rgb32 &
{
UINT32 *src = &m_base[1344 * y];
UINT32 *dest = &bitmap.pix32(y, cliprect.min_x);
-
+
/* loop over columns */
for (int x = cliprect.min_x; x < cliprect.max_x; x++)
{
diff --git a/src/mess/video/newport.h b/src/mess/video/newport.h
index 4df773e0ac4..0fa7d9fc198 100644
--- a/src/mess/video/newport.h
+++ b/src/mess/video/newport.h
@@ -116,22 +116,22 @@ class newport_video_device : public device_t
public:
newport_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~newport_video_device() {}
-
-
+
+
DECLARE_READ32_MEMBER( rex3_r );
DECLARE_WRITE32_MEMBER( rex3_w );
-
+
UINT32 screen_update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
+
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
-private:
+
+private:
// internal state
-
+
DECLARE_READ32_MEMBER( cmap0_r );
DECLARE_WRITE32_MEMBER( cmap0_w );
DECLARE_READ32_MEMBER( cmap1_r );
@@ -142,14 +142,14 @@ private:
DECLARE_READ32_MEMBER( vc2_r );
DECLARE_WRITE32_MEMBER( vc2_w );
void DoREX3Command();
-
+
VC2_t m_VC2;
XMAP_t m_XMAP0;
XMAP_t m_XMAP1;
REX3_t m_REX3;
UINT32 *m_base;
UINT8 m_nDrawGreen;
- CMAP_t m_CMAP0;
+ CMAP_t m_CMAP0;
};
diff --git a/src/mess/video/nick.c b/src/mess/video/nick.c
index 57b919e781d..883feb96708 100644
--- a/src/mess/video/nick.c
+++ b/src/mess/video/nick.c
@@ -104,18 +104,18 @@ ADDRESS_MAP_END
nick_device::nick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NICK, "NICK", tag, owner, clock, "nick", __FILE__),
- device_memory_interface(mconfig, *this),
- m_space_config("vram", ENDIANNESS_LITTLE, 8, 16, 0, *ADDRESS_MAP_NAME(nick_map)),
- m_write_virq(*this),
- horizontal_clock(0),
- m_scanline_count(0),
- m_FIXBIAS(0),
- m_BORDER(0),
- m_LPL(0),
- m_LPH(0),
- m_LD1(0),
- m_LD2(0),
- m_virq(CLEAR_LINE)
+ device_memory_interface(mconfig, *this),
+ m_space_config("vram", ENDIANNESS_LITTLE, 8, 16, 0, *ADDRESS_MAP_NAME(nick_map)),
+ m_write_virq(*this),
+ horizontal_clock(0),
+ m_scanline_count(0),
+ m_FIXBIAS(0),
+ m_BORDER(0),
+ m_LPL(0),
+ m_LPH(0),
+ m_LD1(0),
+ m_LD2(0),
+ m_virq(CLEAR_LINE)
{
}
@@ -243,7 +243,7 @@ WRITE8_MEMBER( nick_device::vram_w )
//-------------------------------------------------
-// fixbias_w -
+// fixbias_w -
//-------------------------------------------------
WRITE8_MEMBER( nick_device::fixbias_w )
@@ -253,7 +253,7 @@ WRITE8_MEMBER( nick_device::fixbias_w )
//-------------------------------------------------
-// border_w -
+// border_w -
//-------------------------------------------------
WRITE8_MEMBER( nick_device::border_w )
@@ -263,7 +263,7 @@ WRITE8_MEMBER( nick_device::border_w )
//-------------------------------------------------
-// lpl_w -
+// lpl_w -
//-------------------------------------------------
WRITE8_MEMBER( nick_device::lpl_w )
@@ -275,7 +275,7 @@ WRITE8_MEMBER( nick_device::lpl_w )
//-------------------------------------------------
-// lph_w -
+// lph_w -
//-------------------------------------------------
WRITE8_MEMBER( nick_device::lph_w )
@@ -287,7 +287,7 @@ WRITE8_MEMBER( nick_device::lph_w )
//-------------------------------------------------
-// initialize_palette -
+// initialize_palette -
//-------------------------------------------------
void nick_device::initialize_palette()
@@ -305,9 +305,9 @@ void nick_device::initialize_palette()
for (int i = 0; i < 256; i++)
{
/*
-
+
bit description
-
+
PC0 100R -- RED
PC1 100R -- GREEN
PC2 82R -- BLUE
@@ -316,7 +316,7 @@ void nick_device::initialize_palette()
PC5 220R -- BLUE
PC6 470R -- RED
PC7 470R -- GREEN
-
+
*/
int ra = BIT(i, 0);
@@ -340,10 +340,10 @@ void nick_device::initialize_palette()
for (int i = 0; i < 256; i++)
{
int pen_index;
-
+
pen_index = (BIT(i, 7) << 0) | (BIT(i, 3) << 1);
m_pen_idx_4col[i] = pen_index;
-
+
pen_index = (BIT(i, 7) << 0) | (BIT(i, 3) << 1) | (BIT(i, 5) << 2) | (BIT(i, 1) << 3);
m_pen_idx_16col[i] = pen_index;
}
@@ -437,10 +437,10 @@ void nick_device::write_pixels2color_lpixel(UINT8 pen0, UINT8 pen1, UINT8 data_b
int col_index[2];
int pen_index;
UINT8 data = data_byte;
-
+
col_index[0] = get_color_index(pen0);
col_index[1] = get_color_index(pen1);
-
+
for (int i = 0; i < 8; i++)
{
pen_index = col_index[BIT(data, 7)];
diff --git a/src/mess/video/nick.h b/src/mess/video/nick.h
index acc3a795c4d..efd6f942a40 100644
--- a/src/mess/video/nick.h
+++ b/src/mess/video/nick.h
@@ -66,7 +66,7 @@ struct LPT_ENTRY
// ======================> nick_device
class nick_device : public device_t,
- public device_memory_interface
+ public device_memory_interface
{
public:
// construction/destruction
@@ -132,28 +132,28 @@ private:
UINT8 horizontal_clock;
/* current scanline within LPT */
UINT8 m_scanline_count;
-
+
UINT8 m_FIXBIAS;
UINT8 m_BORDER;
UINT8 m_LPL;
UINT8 m_LPH;
-
+
UINT16 m_LD1;
UINT16 m_LD2;
-
+
LPT_ENTRY m_LPT;
-
+
UINT32 *m_dest;
int m_dest_pos;
int m_dest_max_pos;
-
+
UINT8 m_reg[4];
-
+
/* first clock visible on left hand side */
int m_first_visible_clock;
/* first clock visible on right hand side */
int m_last_visible_clock;
-
+
/* given a bit pattern, this will get the pen index */
UINT8 m_pen_idx_4col[256];
/* given a bit pattern, this will get the pen index */
diff --git a/src/mess/video/stic.c b/src/mess/video/stic.c
index cca1631d632..142da8646aa 100644
--- a/src/mess/video/stic.c
+++ b/src/mess/video/stic.c
@@ -1,11 +1,11 @@
/**********************************************************************
-
+
General Instruments AY-3-8900-1 a.k.a. Standard Television Interface Chip
(STIC) emulation for Mattel Intellivision
-
+
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
-
+
*********************************************************************/
#include "emu.h"
@@ -42,7 +42,7 @@ stic_device::~stic_device()
void stic_device::device_start()
{
machine().primary_screen->register_screen_bitmap(m_bitmap);
-
+
save_item(NAME(m_stic_registers));
save_item(NAME(m_gramdirty));
save_item(NAME(m_gram));
@@ -123,7 +123,7 @@ void stic_device::device_reset()
m_col_delay = 0;
m_row_delay = 0;
m_left_edge_inhibit = 0;
- m_top_edge_inhibit = 0;
+ m_top_edge_inhibit = 0;
}
ROM_START( stic_grom )
@@ -149,12 +149,12 @@ const rom_entry *stic_device::device_rom_region() const
void stic_device::intv_set_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color)
{
int w, h;
-
+
// output scaling
x *= m_x_scale;
y *= m_y_scale;
color = SET_COLOR(color);
-
+
for (h = 0; h < m_y_scale; h++)
for (w = 0; w < m_x_scale; w++)
bitmap.pix16(y + h, x + w) = color;
@@ -174,10 +174,10 @@ void stic_device::intv_plot_box(bitmap_ind16 &bitmap, int x, int y, int w, int h
int stic_device::sprites_collide(int spriteNum1, int spriteNum2)
{
INT16 x0, y0, w0, h0, x1, y1, w1, h1, x2, y2, w2, h2;
-
+
intv_sprite_type* s1 = &m_sprite[spriteNum1];
intv_sprite_type* s2 = &m_sprite[spriteNum2];
-
+
x0 = STIC_OVERSCAN_LEFT_WIDTH + m_col_delay - STIC_CARD_WIDTH;
y0 = STIC_OVERSCAN_TOP_HEIGHT + m_row_delay - STIC_CARD_HEIGHT;
x1 = (s1->xpos + x0) * STIC_X_SCALE; y1 = (s1->ypos + y0) * STIC_Y_SCALE;
@@ -186,11 +186,11 @@ int stic_device::sprites_collide(int spriteNum1, int spriteNum2)
w2 = (s2->doublex ? 2 : 1) * STIC_CARD_WIDTH;
h1 = (s1->quady ? 4 : 1) * (s1->doubley ? 2 : 1) * (s1->doubleyres ? 2 : 1) * STIC_CARD_HEIGHT;
h2 = (s2->quady ? 4 : 1) * (s2->doubley ? 2 : 1) * (s2->doubleyres ? 2 : 1) * STIC_CARD_HEIGHT;
-
+
if ((x1 >= x2 + w2) || (y1 >= y2 + h2) ||
(x2 >= x1 + w1) || (y2 >= y1 + h1))
return FALSE;
-
+
// iterate over the intersecting bits to see if any touch
x0 = MAX(x1, x2);
y0 = MAX(y1, y2);
@@ -209,7 +209,7 @@ int stic_device::sprites_collide(int spriteNum1, int spriteNum2)
return TRUE;
}
}
-
+
return FALSE;
}
@@ -221,13 +221,13 @@ void stic_device::determine_sprite_collisions()
intv_sprite_type* s1 = &m_sprite[i];
if (s1->xpos == 0 || !s1->coll)
continue;
-
+
for (int j = i + 1; j < STIC_MOBS; j++)
{
intv_sprite_type* s2 = &m_sprite[j];
if (s2->xpos == 0 || !s2->coll)
continue;
-
+
if (sprites_collide(i, j))
{
s1->collision |= (1 << j);
@@ -246,21 +246,21 @@ void stic_device::render_sprites()
INT32 nextX;
INT32 nextY;
INT32 xInc;
-
+
UINT8* memory = m_grom_region->base();
-
+
for (int i = 0; i < STIC_MOBS; i++)
{
intv_sprite_type* s = &m_sprite[i];
-
+
if (s->grom)
cardMemoryLocation = (s->card * STIC_CARD_HEIGHT);
else
cardMemoryLocation = ((s->card & 0x003F) * STIC_CARD_HEIGHT);
-
+
pixelSize = (s->quady ? 4 : 1) * (s->doubley ? 2 : 1);
spritePixelHeight = pixelSize * (s->doubleyres ? 2 : 1) * STIC_CARD_HEIGHT;
-
+
for (int j = 0; j < spritePixelHeight; j++)
{
nextMemoryLocation = (cardMemoryLocation + (j/pixelSize));
@@ -273,7 +273,7 @@ void stic_device::render_sprites()
nextX = (s->xflip ? ((s->doublex ? 2 : 1) * STIC_CARD_WIDTH - 1) : 0);
nextY = (s->yflip ? (spritePixelHeight - j - 1) : j);
xInc = (s->xflip ? -1: 1);
-
+
for (int k = 0; k < STIC_CARD_WIDTH * (1 + s->doublex); k++)
{
m_sprite_buffers[i][nextX + k * xInc][nextY] = (nextData & (1 << ((STIC_CARD_WIDTH - 1) - k / (1 + s->doublex)))) != 0;
@@ -285,7 +285,7 @@ void stic_device::render_sprites()
void stic_device::render_line(bitmap_ind16 &bitmap, UINT8 nextByte, UINT16 x, UINT16 y, UINT8 fgcolor, UINT8 bgcolor)
{
UINT32 color;
-
+
for (int i = 0; i < STIC_CARD_WIDTH; i++)
{
color = (nextByte & (1 << ((STIC_CARD_WIDTH - 1) - i)) ? fgcolor : bgcolor);
@@ -308,17 +308,17 @@ void stic_device::render_color_stack_mode(bitmap_ind16 &bitmap)
UINT8 csPtr = 0;
UINT16 nextCard;
UINT8 *ram = m_grom_region->base();
-
+
for (h = 0, nexty = (STIC_OVERSCAN_TOP_HEIGHT + m_row_delay) * STIC_Y_SCALE;
- h < STIC_BACKTAB_HEIGHT;
- h++, nexty += STIC_CARD_HEIGHT * STIC_Y_SCALE)
+ h < STIC_BACKTAB_HEIGHT;
+ h++, nexty += STIC_CARD_HEIGHT * STIC_Y_SCALE)
{
for (w = 0, nextx = (STIC_OVERSCAN_LEFT_WIDTH + m_col_delay) * STIC_X_SCALE;
- w < STIC_BACKTAB_WIDTH;
- w++, nextx += STIC_CARD_WIDTH * STIC_X_SCALE)
+ w < STIC_BACKTAB_WIDTH;
+ w++, nextx += STIC_CARD_WIDTH * STIC_X_SCALE)
{
nextCard = m_backtab_buffer[h][w];
-
+
// colored squares mode
if ((nextCard & (STIC_CSTM_FG3|STIC_CSTM_SEL)) == STIC_CSTM_FG3)
{
@@ -329,10 +329,10 @@ void stic_device::render_color_stack_mode(bitmap_ind16 &bitmap)
UINT8 color3 = ((nextCard & STIC_CSQM_D2) >> 11) |
((nextCard & (STIC_CSQM_D10)) >> 9);
render_colored_squares(bitmap, nextx, nexty,
- (color0 == 7 ? csColor : (color0 | FOREGROUND_BIT)),
- (color1 == 7 ? csColor : (color1 | FOREGROUND_BIT)),
- (color2 == 7 ? csColor : (color2 | FOREGROUND_BIT)),
- (color3 == 7 ? csColor : (color3 | FOREGROUND_BIT)));
+ (color0 == 7 ? csColor : (color0 | FOREGROUND_BIT)),
+ (color1 == 7 ? csColor : (color1 | FOREGROUND_BIT)),
+ (color2 == 7 ? csColor : (color2 | FOREGROUND_BIT)),
+ (color3 == 7 ? csColor : (color3 | FOREGROUND_BIT)));
}
//color stack mode
else
@@ -340,15 +340,15 @@ void stic_device::render_color_stack_mode(bitmap_ind16 &bitmap)
UINT8 isGrom;
UINT16 memoryLocation, fgcolor, bgcolor;
UINT8* memory;
-
+
//advance the color pointer, if necessary
if (nextCard & STIC_CSTM_ADV)
csPtr = (csPtr+1) & (STIC_CSRS - 1);
-
+
fgcolor = ((nextCard & STIC_CSTM_FG3) >> 9) |
(nextCard & (STIC_CSTM_FG20)) | FOREGROUND_BIT;
bgcolor = m_stic_registers[STIC_CSR + csPtr] & STIC_CSR_BG;
-
+
isGrom = !(nextCard & STIC_CSTM_SEL);
if (isGrom)
{
@@ -378,20 +378,20 @@ void stic_device::render_fg_bg_mode(bitmap_ind16 &bitmap)
UINT16 nextCard, memoryLocation;
UINT8* memory;
UINT8* ram = m_grom_region->base();
-
+
for (h = 0, nexty = (STIC_OVERSCAN_TOP_HEIGHT + m_row_delay) * STIC_Y_SCALE;
- h < STIC_BACKTAB_HEIGHT;
- h++, nexty += STIC_CARD_HEIGHT * STIC_Y_SCALE)
+ h < STIC_BACKTAB_HEIGHT;
+ h++, nexty += STIC_CARD_HEIGHT * STIC_Y_SCALE)
{
for (w = 0, nextx = (STIC_OVERSCAN_LEFT_WIDTH + m_col_delay) * STIC_X_SCALE;
- w < STIC_BACKTAB_WIDTH;
- w++, nextx += STIC_CARD_WIDTH * STIC_X_SCALE)
+ w < STIC_BACKTAB_WIDTH;
+ w++, nextx += STIC_CARD_WIDTH * STIC_X_SCALE)
{
nextCard = m_backtab_buffer[h][w];
fgcolor = (nextCard & STIC_FBM_FG) | FOREGROUND_BIT;
bgcolor = ((nextCard & STIC_FBM_BG2) >> 11) |
((nextCard & STIC_FBM_BG310) >> 9);
-
+
isGrom = !(nextCard & STIC_FBM_SEL);
if (isGrom)
{
@@ -421,27 +421,27 @@ void stic_device::copy_sprites_to_background(bitmap_ind16 &bitmap)
INT16 leftX, nextY;
INT16 leftBorder, rightBorder, topBorder, bottomBorder;
INT32 nextX;
-
+
for (int i = STIC_MOBS - 1; i >= 0; i--)
{
intv_sprite_type *s = &m_sprite[i];
if (s->xpos == 0 || (!s->coll && !s->visible))
continue;
-
+
borderCollision = FALSE;
foregroundCollision = FALSE;
-
+
spritePixelHeight = (s->quady ? 4 : 1) * (s->doubley ? 2 : 1) * (s->doubleyres ? 2 : 1) * STIC_CARD_HEIGHT;
width = (s->doublex ? 2 : 1) * STIC_CARD_WIDTH;
-
+
leftX = (s->xpos - STIC_CARD_WIDTH + STIC_OVERSCAN_LEFT_WIDTH + m_col_delay) * STIC_X_SCALE;
nextY = (s->ypos - STIC_CARD_HEIGHT + STIC_OVERSCAN_TOP_HEIGHT + m_row_delay) * STIC_Y_SCALE;
-
+
leftBorder = (STIC_OVERSCAN_LEFT_WIDTH + (m_left_edge_inhibit ? STIC_CARD_WIDTH : 0)) * STIC_X_SCALE;
rightBorder = (STIC_OVERSCAN_LEFT_WIDTH + STIC_BACKTAB_WIDTH * STIC_CARD_WIDTH - 1 - 1) * STIC_X_SCALE;
topBorder = (STIC_OVERSCAN_TOP_HEIGHT + (m_top_edge_inhibit ? STIC_CARD_HEIGHT : 0)) * STIC_Y_SCALE;
bottomBorder = (STIC_OVERSCAN_TOP_HEIGHT + STIC_BACKTAB_HEIGHT * STIC_CARD_HEIGHT) * STIC_Y_SCALE - 1;
-
+
for (y = 0; y < spritePixelHeight; y++)
{
for (x = 0; x < width; x++)
@@ -449,7 +449,7 @@ void stic_device::copy_sprites_to_background(bitmap_ind16 &bitmap)
//if this sprite pixel is not on, then don't paint it
if (!m_sprite_buffers[i][x][y])
continue;
-
+
nextX = leftX + x;
//if the next pixel location is on the border, then we
//have a border collision and we can ignore painting it
@@ -459,9 +459,9 @@ void stic_device::copy_sprites_to_background(bitmap_ind16 &bitmap)
borderCollision = TRUE;
continue;
}
-
+
currentPixel = intv_get_pixel(bitmap, nextX, nextY);
-
+
//check for foreground collision
if (currentPixel & FOREGROUND_BIT)
{
@@ -469,7 +469,7 @@ void stic_device::copy_sprites_to_background(bitmap_ind16 &bitmap)
if (s->behind_foreground)
continue;
}
-
+
if (s->visible)
{
intv_set_pixel(bitmap, nextX, nextY, s->color | (currentPixel & FOREGROUND_BIT));
@@ -477,7 +477,7 @@ void stic_device::copy_sprites_to_background(bitmap_ind16 &bitmap)
}
nextY++;
}
-
+
//update the collision bits
if (s->coll)
{
@@ -506,18 +506,18 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
int row,col;
int fgcolor,bgcolor = 0;
int code;
-
+
int colora, colorb, colorc, colord;
-
+
int n_bit;
int p_bit;
int g_bit;
-
+
int j;
-
+
int x0 = STIC_OVERSCAN_LEFT_WIDTH + m_col_delay;
int y0 = STIC_OVERSCAN_TOP_HEIGHT + m_row_delay;
-
+
if (m_color_stack_mode == 1)
{
m_color_stack_offset = 0;
@@ -526,11 +526,11 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
for(col = 0; col < STIC_BACKTAB_WIDTH; col++)
{
value = m_ram16[offs];
-
+
n_bit = value & STIC_CSTM_ADV;
p_bit = value & STIC_CSTM_FG3;
g_bit = value & STIC_CSTM_SEL;
-
+
if (p_bit && (!g_bit)) // colored squares mode
{
colora = value & STIC_CSQM_A;
@@ -554,24 +554,24 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
m_color_stack_offset += 1;
m_color_stack_offset &= (STIC_CSRS - 1);
}
-
+
if (p_bit) // pastel color set
fgcolor = (value & STIC_CSTM_FG20) + 8;
else
fgcolor = value & STIC_CSTM_FG20;
-
+
bgcolor = m_stic_registers[STIC_CSR + m_color_stack_offset];
code = (value & STIC_CSTM_C)>>3;
-
+
if (g_bit) // read from gram
{
code &= (STIC_CSTM_C50 >> 3); // keep from going outside the array
//if (m_gramdirtybytes[code] == 1)
{
decodechar(machine().gfx[1],
- code,
- m_gram,
- machine().config()->gfxdecodeinfo[1].gfxlayout);
+ code,
+ m_gram,
+ machine().config()->gfxdecodeinfo[1].gfxlayout);
m_gramdirtybytes[code] = 0;
}
// Draw GRAM char
@@ -580,12 +580,12 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
bgcolor*16+fgcolor,
0,0, (x0 + col * STIC_CARD_WIDTH) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT) * STIC_Y_SCALE,
0,transparency,bgcolor);
-
+
for(j=0;j<8;j++)
{
//intv_set_pixel(bitmap, (x0 + col * STIC_CARD_WIDTH + j) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT + 7) * STIC_Y_SCALE + 1, 1);
}
-
+
}
else // read from grom
{
@@ -594,7 +594,7 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
bgcolor*16+fgcolor,
0,0, (x0 + col * STIC_CARD_WIDTH) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT) * STIC_Y_SCALE,
0,transparency,bgcolor);
-
+
for(j=0;j<8;j++)
{
//intv_set_pixel(bitmap, (x0 + col * STIC_CARD_WIDTH + j) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT + 7) * STIC_Y_SCALE + 1, 2);
@@ -616,15 +616,15 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
fgcolor = value & STIC_FBM_FG;
bgcolor = ((value & STIC_FBM_BG2) >> 11) + ((value & STIC_FBM_BG310) >> 9);
code = (value & STIC_FBM_C) >> 3;
-
+
if (value & STIC_FBM_SEL) // read for GRAM
{
//if (m_gramdirtybytes[code] == 1)
{
decodechar(machine().gfx[1],
- code,
- m_gram,
- machine().config()->gfxdecodeinfo[1].gfxlayout);
+ code,
+ m_gram,
+ machine().config()->gfxdecodeinfo[1].gfxlayout);
m_gramdirtybytes[code] = 0;
}
// Draw GRAM char
@@ -656,7 +656,7 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
int code;
int x0 = STIC_OVERSCAN_LEFT_WIDTH + m_col_delay - STIC_CARD_WIDTH;
int y0 = STIC_OVERSCAN_TOP_HEIGHT + m_row_delay - STIC_CARD_HEIGHT;
-
+
for (int i = STIC_MOBS - 1; i >= 0; --i)
{
intv_sprite_type *s = &m_sprite[i];
@@ -671,47 +671,47 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
//if (m_gramdirtybytes[code] == 1)
{
decodechar(machine().gfx[1],
- code,
- m_gram,
- machine().config()->gfxdecodeinfo[1].gfxlayout);
+ code,
+ m_gram,
+ machine().config()->gfxdecodeinfo[1].gfxlayout);
m_gramdirtybytes[code] = 0;
}
// Draw GRAM char
drawgfxzoom_transpen(bitmap,&machine().screen[0].visarea,machine().gfx[1],
- code,
- s->color,
- s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE,
- 0x8000 * s->xsize, 0x8000 * s->ysize,0);
+ code,
+ s->color,
+ s->xflip,s->yflip,
+ (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE,
+ 0x8000 * s->xsize, 0x8000 * s->ysize,0);
}
else
{
//if ((m_gramdirtybytes[code] == 1) || (m_gramdirtybytes[code+1] == 1))
{
decodechar(machine().gfx[1],
- code,
- m_gram,
- machine().config()->gfxdecodeinfo[1].gfxlayout);
+ code,
+ m_gram,
+ machine().config()->gfxdecodeinfo[1].gfxlayout);
decodechar(machine().gfx[1],
- code+1,
- m_gram,
- machine().config()->gfxdecodeinfo[1].gfxlayout);
+ code+1,
+ m_gram,
+ machine().config()->gfxdecodeinfo[1].gfxlayout);
m_gramdirtybytes[code] = 0;
m_gramdirtybytes[code+1] = 0;
}
// Draw GRAM char
drawgfxzoom_transpen(bitmap,&machine().screen[0].visarea,machine().gfx[1],
- code,
- s->color,
- s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + s->yflip * s->ysize * STIC_CARD_HEIGHT,
- 0x8000*s->xsize, 0x8000*s->ysize,0);
+ code,
+ s->color,
+ s->xflip,s->yflip,
+ (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + s->yflip * s->ysize * STIC_CARD_HEIGHT,
+ 0x8000*s->xsize, 0x8000*s->ysize,0);
drawgfxzoom_transpen(bitmap,&machine().screen[0].visarea,machine().gfx[1],
- code+1,
- s->color,
- s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + (1 - s->yflip) * s->ysize * STIC_CARD_HEIGHT,
- 0x8000*s->xsize, 0x8000*s->ysize,0);
+ code+1,
+ s->color,
+ s->xflip,s->yflip,
+ (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + (1 - s->yflip) * s->ysize * STIC_CARD_HEIGHT,
+ 0x8000*s->xsize, 0x8000*s->ysize,0);
}
}
else
@@ -720,26 +720,26 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
{
// Draw GROM char
drawgfxzoom_transpen(bitmap,&machine().screen[0].visarea,machine().gfx[0],
- code,
- s->color,
- s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE,
- 0x8000*s->xsize, 0x8000*s->ysize,0);
+ code,
+ s->color,
+ s->xflip,s->yflip,
+ (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE,
+ 0x8000*s->xsize, 0x8000*s->ysize,0);
}
else
{
drawgfxzoom_transpen(bitmap,&machine().screen[0].visarea,machine().gfx[0],
- code,
- s->color,
- s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + s->yflip * s->ysize * STIC_CARD_HEIGHT,
- 0x8000*s->xsize, 0x8000*s->ysize,0);
+ code,
+ s->color,
+ s->xflip,s->yflip,
+ (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + s->yflip * s->ysize * STIC_CARD_HEIGHT,
+ 0x8000*s->xsize, 0x8000*s->ysize,0);
drawgfxzoom_transpen(bitmap,&machine().screen[0].visarea,machine().gfx[0],
- code+1,
- s->color,
- s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + (1 - s->yflip) * s->ysize * STIC_CARD_HEIGHT,
- 0x8000*s->xsize, 0x8000*s->ysize,0);
+ code+1,
+ s->color,
+ s->xflip,s->yflip,
+ (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + (1 - s->yflip) * s->ysize * STIC_CARD_HEIGHT,
+ 0x8000*s->xsize, 0x8000*s->ysize,0);
}
}
}
@@ -751,7 +751,7 @@ void stic_device::draw_borders(bitmap_ind16 &bitmap)
{
intv_plot_box(bitmap, 0, 0, (STIC_OVERSCAN_LEFT_WIDTH + (m_left_edge_inhibit ? STIC_CARD_WIDTH : m_col_delay)) * STIC_X_SCALE, (STIC_OVERSCAN_TOP_HEIGHT + STIC_BACKTAB_HEIGHT * STIC_CARD_HEIGHT + STIC_OVERSCAN_BOTTOM_HEIGHT) * STIC_Y_SCALE, m_border_color);
intv_plot_box(bitmap, (STIC_OVERSCAN_LEFT_WIDTH + STIC_BACKTAB_WIDTH * STIC_CARD_WIDTH - 1) * STIC_X_SCALE, 0, STIC_OVERSCAN_RIGHT_WIDTH, (STIC_OVERSCAN_TOP_HEIGHT + STIC_BACKTAB_HEIGHT * STIC_CARD_HEIGHT + STIC_OVERSCAN_BOTTOM_HEIGHT) * STIC_Y_SCALE, m_border_color);
-
+
intv_plot_box(bitmap, 0, 0, (STIC_OVERSCAN_LEFT_WIDTH + STIC_BACKTAB_WIDTH * STIC_CARD_WIDTH - 1 + STIC_OVERSCAN_RIGHT_WIDTH) * STIC_X_SCALE, (STIC_OVERSCAN_TOP_HEIGHT + (m_top_edge_inhibit ? STIC_CARD_HEIGHT : m_row_delay)) * STIC_Y_SCALE, m_border_color);
intv_plot_box(bitmap, 0, (STIC_OVERSCAN_TOP_HEIGHT + STIC_BACKTAB_HEIGHT * STIC_CARD_HEIGHT) * STIC_Y_SCALE, (STIC_OVERSCAN_LEFT_WIDTH + STIC_BACKTAB_WIDTH * STIC_CARD_WIDTH - 1 + STIC_OVERSCAN_RIGHT_WIDTH) * STIC_X_SCALE, STIC_OVERSCAN_BOTTOM_HEIGHT * STIC_Y_SCALE, m_border_color);
}
@@ -765,12 +765,12 @@ void stic_device::screenrefresh()
render_background(m_bitmap);
// Render the sprites into their buffers
render_sprites();
- for (int i = 0; i < STIC_MOBS; i++)
+ for (int i = 0; i < STIC_MOBS; i++)
m_sprite[i].collision = 0;
// Copy the sprites to the background
copy_sprites_to_background(m_bitmap);
determine_sprite_collisions();
- for (int i = 0; i < STIC_MOBS; i++)
+ for (int i = 0; i < STIC_MOBS; i++)
m_stic_registers[STIC_MCR + i] |= m_sprite[i].collision;
/* draw the screen borders if enabled */
draw_borders(m_bitmap);
@@ -951,7 +951,7 @@ WRITE16_MEMBER( stic_device::write )
//logerror("unmapped write to STIC register %02X: %04X\n", offset, data);
break;
}
-
+
if (offset < sizeof(m_stic_registers) / sizeof(m_stic_registers[0]))
m_stic_registers[offset] = data;
}
diff --git a/src/mess/video/stic.h b/src/mess/video/stic.h
index e5c83699a07..fa8a8a8a1ee 100644
--- a/src/mess/video/stic.h
+++ b/src/mess/video/stic.h
@@ -476,7 +476,7 @@ public:
// construction/destruction
stic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~stic_device();
-
+
DECLARE_READ16_MEMBER(read);
DECLARE_READ16_MEMBER(gram_read);
DECLARE_READ16_MEMBER(grom_read) { if (offset > 0x800) printf("help! %X\n", offset); return (0xff00 | m_grom_region->base()[offset]); }
@@ -488,17 +488,17 @@ public:
int read_stic_handshake() { return m_stic_handshake; }
void set_x_scale(int val) { m_x_scale = val; }
void set_y_scale(int val) { m_y_scale = val; }
-
+
// device-level overrides
virtual void device_start();
virtual const rom_entry *device_rom_region() const;
virtual void device_reset();
-
+
void screenrefresh();
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
private:
-
+
required_memory_region m_grom_region;
void intv_set_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color);
@@ -514,14 +514,14 @@ private:
void copy_sprites_to_background(bitmap_ind16 &bitmap);
void render_background(bitmap_ind16 &bitmap);
void draw_borders(bitmap_ind16 &bitmap);
-
+
#ifdef UNUSED_CODE
void draw_background(bitmap_ind16 &bitmap, int transparency);
void draw_sprites(bitmap_ind16 &bitmap, int behind_foreground);
#endif
-
+
bitmap_ind16 m_bitmap;
-
+
intv_sprite_type m_sprite[STIC_MOBS];
UINT8 m_sprite_buffers[STIC_MOBS][STIC_CARD_WIDTH * 2][STIC_CARD_HEIGHT * 4 * 2 * 2];
UINT16 m_backtab_buffer[STIC_BACKTAB_HEIGHT][STIC_BACKTAB_WIDTH];
@@ -539,7 +539,7 @@ private:
UINT8 m_gramdirty;
UINT8 m_gram[512];
- UINT8 m_gramdirtybytes[512];
+ UINT8 m_gramdirtybytes[512];
};
// device type definition
diff --git a/src/mess/video/vic4567.c b/src/mess/video/vic4567.c
index 7eb911b67ae..88262ed9d41 100644
--- a/src/mess/video/vic4567.c
+++ b/src/mess/video/vic4567.c
@@ -159,7 +159,7 @@ void vic3_device::device_config_complete()
const vic3_interface *intf = reinterpret_cast<const vic3_interface *>(static_config());
if (intf != NULL)
*static_cast<vic3_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -184,33 +184,33 @@ void vic3_device::device_config_complete()
void vic3_device::device_start()
{
int width, height;
-
+
m_cpu = machine().device(cpu_tag);
m_main_screen = machine().device<screen_device>(screen_tag);
width = m_main_screen->width();
height = m_main_screen->height();
-
+
m_bitmap = auto_bitmap_ind16_alloc(machine(), width, height);
-
+
m_type = vic_type;
-
+
m_dma_read.resolve(dma_read, *this);
m_dma_read_color.resolve(dma_read_color, *this);
m_interrupt.resolve(irq, *this);
-
+
m_port_changed.resolve(port_changed, *this);
-
+
m_c64_mem_r.resolve(c64_mem_r, *this);
-
+
m_lightpen_button_cb.resolve(button_cb, *this);
m_lightpen_x_cb.resolve(x_cb, *this);
m_lightpen_y_cb.resolve(y_cb, *this);
-
+
m_screen[0] = auto_alloc_array(machine(), UINT8, 216 * 656 / 8);
-
+
for (int i = 1; i < 216; i++)
m_screen[i] = m_screen[i - 1] + 656 / 8;
-
+
for (int i = 0; i < 256; i++)
{
m_foreground[i] = 0;
@@ -223,7 +223,7 @@ void vic3_device::device_start()
if ((i & 0xc0) > 0x40)
m_foreground[i] |= 0xc0;
}
-
+
for (int i = 0; i < 256; i++)
{
m_expandx[i] = 0;
@@ -244,7 +244,7 @@ void vic3_device::device_start()
if (i & 0x80)
m_expandx[i] |= 0xc000;
}
-
+
for (int i = 0; i < 256; i++)
{
m_expandx_multi[i] = 0;
@@ -265,24 +265,24 @@ void vic3_device::device_start()
if (i & 0x80)
m_expandx_multi[i] |= 0xa000;
}
-
+
save_item(NAME(m_reg));
-
+
save_item(NAME(m_on));
-
+
//save_item(NAME(m_bitmap));
-
+
save_item(NAME(m_lines));
-
+
save_item(NAME(m_chargenaddr));
save_item(NAME(m_videoaddr));
save_item(NAME(m_bitmapaddr));
-
+
save_item(NAME(m_x_begin));
save_item(NAME(m_x_end));
save_item(NAME(m_y_begin));
save_item(NAME(m_y_end));
-
+
save_item(NAME(m_c64_bitmap));
save_item(NAME(m_bitmapmulti));
save_item(NAME(m_mono));
@@ -290,23 +290,23 @@ void vic3_device::device_start()
save_item(NAME(m_ecmcolor));
save_item(NAME(m_colors));
save_item(NAME(m_spritemulti));
-
+
save_item(NAME(m_lastline));
save_item(NAME(m_rasterline));
save_item(NAME(m_interlace));
-
+
save_item(NAME(m_columns));
save_item(NAME(m_rows));
-
+
save_item(NAME(m_shift));
save_item(NAME(m_foreground));
save_item(NAME(m_multi_collision));
-
+
save_item(NAME(m_palette_red));
save_item(NAME(m_palette_green));
save_item(NAME(m_palette_blue));
save_item(NAME(m_palette_dirty));
-
+
for (int i = 0; i < 8; i++)
{
save_item(NAME(m_sprites[i].x), i);
@@ -332,32 +332,32 @@ void vic3_device::device_start()
void vic3_device::device_reset()
{
memset(m_reg, 0, ARRAY_LENGTH(m_reg));