summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/emu/cpu/cpu.mak6
-rw-r--r--src/emu/cpu/g65816/g65816.c4
-rw-r--r--src/emu/cpu/jaguar/jaguar.c4
-rw-r--r--src/emu/cpu/m6502/m3745x.c185
-rw-r--r--src/emu/cpu/m6502/m3745x.h30
-rw-r--r--src/emu/cpu/m6502/m740.c10
-rw-r--r--src/emu/cpu/m6502/m740.h32
-rw-r--r--src/emu/cpu/m6502/om740.lst1
-rw-r--r--src/emu/cpu/m6809/hd6309.c266
-rw-r--r--src/emu/cpu/m6809/hd6309.h29
-rw-r--r--src/emu/cpu/m6809/konami.c74
-rw-r--r--src/emu/cpu/m6809/konami.h2
-rw-r--r--src/emu/cpu/m6809/m6809.c78
-rw-r--r--src/emu/cpu/m6809/m6809.h190
-rw-r--r--src/emu/cpu/m6809/m6809inl.h68
-rw-r--r--src/emu/cpu/sh2/sh2drc.c28
-rw-r--r--src/emu/debug/debugcpu.h4
-rw-r--r--src/emu/machine/6840ptm.c2
-rw-r--r--src/emu/machine/mos6551.c4
-rw-r--r--src/emu/machine/mos6551.h2
-rw-r--r--src/emu/machine/nscsi_hd.c6
-rw-r--r--src/emu/machine/saturn.c62
-rw-r--r--src/emu/machine/smpc.c2
-rw-r--r--src/emu/machine/stvcd.c4
-rw-r--r--src/emu/machine/tms9901.c4
-rw-r--r--src/emu/machine/z80sti.c2
-rw-r--r--src/emu/romload.c8
-rw-r--r--src/emu/sound/astrocde.c25
-rw-r--r--src/emu/sound/astrocde.h6
-rw-r--r--src/emu/sound/beep.c12
-rw-r--r--src/emu/sound/beep.h6
-rw-r--r--src/emu/sound/c140.c16
-rw-r--r--src/emu/sound/c140.h42
-rw-r--r--src/emu/sound/cem3394.c42
-rw-r--r--src/emu/sound/cem3394.h32
-rw-r--r--src/emu/sound/es8712.c26
-rw-r--r--src/emu/sound/es8712.h16
-rw-r--r--src/emu/sound/filter.h28
-rw-r--r--src/emu/sound/k051649.c64
-rw-r--r--src/emu/sound/k051649.h42
-rw-r--r--src/emu/sound/mos6560.h4
-rw-r--r--src/emu/sound/mos7360.c2
-rw-r--r--src/emu/sound/okim6258.c24
-rw-r--r--src/emu/sound/okim6258.h16
-rw-r--r--src/emu/sound/pokey.c2
-rw-r--r--src/emu/sound/rf5c400.c8
-rw-r--r--src/emu/sound/rf5c400.h16
-rw-r--r--src/emu/sound/rf5c68.c18
-rw-r--r--src/emu/sound/rf5c68.h28
-rw-r--r--src/emu/sound/saa1099.c26
-rw-r--r--src/emu/sound/saa1099.h72
-rw-r--r--src/emu/sound/scsp.c22
-rw-r--r--src/emu/sound/st0016.c11
-rw-r--r--src/emu/sound/st0016.h10
-rw-r--r--src/emu/sound/tms3615.c20
-rw-r--r--src/emu/sound/tms3615.h4
-rw-r--r--src/emu/sound/tms36xx.c36
-rw-r--r--src/emu/sound/tms36xx.h18
-rw-r--r--src/emu/sound/zsg2.c13
-rw-r--r--src/emu/sound/zsg2.h28
-rw-r--r--src/emu/video/315_5124.c8
-rw-r--r--src/emu/video/ef9340_1.h2
-rw-r--r--src/emu/video/hd66421.c2
-rw-r--r--src/emu/video/mc6847.c4
-rw-r--r--src/emu/video/stvvdp1.c4
-rw-r--r--src/emu/video/stvvdp2.c52
-rw-r--r--src/mame/audio/cps3.c8
-rw-r--r--src/mame/audio/gomoku.c23
-rw-r--r--src/mame/audio/gridlee.c16
-rw-r--r--src/mame/audio/polepos.c16
-rw-r--r--src/mame/audio/redbaron.c32
-rw-r--r--src/mame/audio/taitosnd.c16
-rw-r--r--src/mame/audio/taitosnd.h18
-rw-r--r--src/mame/audio/tiamc1.c50
-rw-r--r--src/mame/drivers/chihiro.c2
-rw-r--r--src/mame/drivers/chinagat.c2
-rw-r--r--src/mame/drivers/coolridr.c703
-rw-r--r--src/mame/drivers/cps1.c122
-rw-r--r--src/mame/drivers/de_2.c6
-rw-r--r--src/mame/drivers/deco_mlc.c10
-rw-r--r--src/mame/drivers/dreambal.c6
-rw-r--r--src/mame/drivers/gambl186.c4
-rw-r--r--src/mame/drivers/gunpey.c308
-rw-r--r--src/mame/drivers/moo.c2
-rw-r--r--src/mame/drivers/mquake.c2
-rw-r--r--src/mame/drivers/multfish.c10
-rw-r--r--src/mame/drivers/namcos10.c4
-rw-r--r--src/mame/drivers/naomi.c4
-rw-r--r--src/mame/drivers/neogeo.c2
-rw-r--r--src/mame/drivers/popobear.c20
-rw-r--r--src/mame/drivers/scramble.c12
-rw-r--r--src/mame/drivers/seattle.c4
-rw-r--r--src/mame/drivers/stv.c36
-rw-r--r--src/mame/drivers/taitowlf.c2
-rw-r--r--src/mame/drivers/vegas.c2
-rw-r--r--src/mame/drivers/vicdual.c2
-rw-r--r--src/mame/drivers/wmg.c40
-rw-r--r--src/mame/includes/actfancr.h1
-rw-r--r--src/mame/includes/asuka.h4
-rw-r--r--src/mame/includes/bzone.h4
-rw-r--r--src/mame/includes/cps3.h26
-rw-r--r--src/mame/includes/deco32.h1
-rw-r--r--src/mame/includes/deco_mlc.h4
-rw-r--r--src/mame/includes/fastfred.h2
-rw-r--r--src/mame/includes/galpani2.h3
-rw-r--r--src/mame/includes/galpanic.h2
-rw-r--r--src/mame/includes/gomoku.h18
-rw-r--r--src/mame/includes/gridlee.h4
-rw-r--r--src/mame/includes/itech8.h5
-rw-r--r--src/mame/includes/klax.h2
-rw-r--r--src/mame/includes/matmania.h2
-rw-r--r--src/mame/includes/namcos2.h1
-rw-r--r--src/mame/includes/neogeo.h2
-rw-r--r--src/mame/includes/pacman.h6
-rw-r--r--src/mame/includes/pgm.h20
-rw-r--r--src/mame/includes/polepos.h6
-rw-r--r--src/mame/includes/psikyosh.h2
-rw-r--r--src/mame/includes/segas32.h4
-rw-r--r--src/mame/includes/snes.h42
-rw-r--r--src/mame/includes/suprnova.h1
-rw-r--r--src/mame/includes/taitosj.h2
-rw-r--r--src/mame/includes/tiamc1.h42
-rw-r--r--src/mame/includes/vertigo.h1
-rw-r--r--src/mame/includes/volfied.h2
-rw-r--r--src/mame/includes/wc90.h2
-rw-r--r--src/mame/includes/wiz.h2
-rw-r--r--src/mame/machine/decathlt.c7
-rw-r--r--src/mame/machine/megacdcd.c2
-rw-r--r--src/mame/machine/namcos2.c3
-rw-r--r--src/mame/machine/naomicrypt.c26
-rw-r--r--src/mame/machine/naomicrypt.h1
-rw-r--r--src/mame/machine/naomim4.c2
-rw-r--r--src/mame/machine/neoprot.c4
-rw-r--r--src/mame/machine/pgmprot1.c6
-rw-r--r--src/mame/machine/pgmprot3.c6
-rw-r--r--src/mame/machine/pgmprot4.c4
-rw-r--r--src/mame/machine/slikshot.c2
-rw-r--r--src/mame/machine/snes.c2
-rw-r--r--src/mame/machine/stvprot.c28
-rw-r--r--src/mame/mame.lst30
-rw-r--r--src/mame/video/deco_mlc.c36
-rw-r--r--src/mame/video/fastfred.c2
-rw-r--r--src/mame/video/jagblit.c2
-rw-r--r--src/mame/video/seibuspi.c2
-rw-r--r--src/mame/video/snes.c28
-rw-r--r--src/mame/video/ssrj.c2
-rw-r--r--src/mame/video/wc90.c10
-rw-r--r--src/mess/audio/channelf.c4
-rw-r--r--src/mess/audio/channelf.h2
-rw-r--r--src/mess/audio/special.c10
-rw-r--r--src/mess/audio/svision.c5
-rw-r--r--src/mess/audio/vc4000.c10
-rw-r--r--src/mess/audio/wswan.c40
-rw-r--r--src/mess/drivers/a7800.c2
-rw-r--r--src/mess/drivers/abc80x.c4
-rw-r--r--src/mess/drivers/apple2.c2
-rw-r--r--src/mess/drivers/apple2gs.c4
-rw-r--r--src/mess/drivers/besta.c40
-rw-r--r--src/mess/drivers/c64.c2
-rw-r--r--src/mess/drivers/casloopy.c26
-rw-r--r--src/mess/drivers/cat.c4
-rw-r--r--src/mess/drivers/cbm2.c24
-rw-r--r--src/mess/drivers/clcd.c26
-rw-r--r--src/mess/drivers/craft.c4
-rw-r--r--src/mess/drivers/dectalk.c10
-rw-r--r--src/mess/drivers/fp200.c44
-rw-r--r--src/mess/drivers/gb.c4
-rw-r--r--src/mess/drivers/mmodular.c52
-rw-r--r--src/mess/drivers/mod8.c2
-rw-r--r--src/mess/drivers/nes.c2
-rw-r--r--src/mess/drivers/ng_aes.c16
-rw-r--r--src/mess/drivers/ob68k1a.c4
-rw-r--r--src/mess/drivers/odyssey2.c67
-rw-r--r--src/mess/drivers/pc4.c2
-rw-r--r--src/mess/drivers/pet.c2
-rw-r--r--src/mess/drivers/thomson.c2
-rw-r--r--src/mess/drivers/vic10.c2
-rw-r--r--src/mess/includes/c65.h2
-rw-r--r--src/mess/includes/channelf.h2
-rw-r--r--src/mess/includes/fidelz80.h10
-rw-r--r--src/mess/includes/mikromik.h6
-rw-r--r--src/mess/includes/nes.h2
-rw-r--r--src/mess/includes/ob68k1a.h4
-rw-r--r--src/mess/includes/osi.h2
-rw-r--r--src/mess/includes/pet.h4
-rw-r--r--src/mess/includes/prof80.h4
-rw-r--r--src/mess/includes/psion.h14
-rw-r--r--src/mess/includes/special.h6
-rw-r--r--src/mess/includes/studio2.h12
-rw-r--r--src/mess/includes/super80.h2
-rw-r--r--src/mess/includes/svision.h90
-rw-r--r--src/mess/includes/vc4000.h4
-rw-r--r--src/mess/includes/wswan.h22
-rw-r--r--src/mess/includes/xerox820.h2
-rw-r--r--src/mess/machine/3c505.c16
-rw-r--r--src/mess/machine/68561mpcc.c38
-rw-r--r--src/mess/machine/68561mpcc.h4
-rw-r--r--src/mess/machine/a2mockingboard.c1
-rw-r--r--src/mess/machine/a2scsi.c34
-rw-r--r--src/mess/machine/a2ssc.c2
-rw-r--r--src/mess/machine/a2zipdrive.c25
-rw-r--r--src/mess/machine/a2zipdrive.h4
-rw-r--r--src/mess/machine/apollo.c4
-rw-r--r--src/mess/machine/c1551.c2
-rw-r--r--src/mess/machine/c1571.c2
-rw-r--r--src/mess/machine/c64_ieee488.c2
-rw-r--r--src/mess/machine/c64_midi_maplin.c10
-rw-r--r--src/mess/machine/c64_midi_namesoft.c10
-rw-r--r--src/mess/machine/c64_midi_passport.c14
-rw-r--r--src/mess/machine/c64_midi_sci.c10
-rw-r--r--src/mess/machine/c64_midi_siel.c10
-rw-r--r--src/mess/machine/c64_tdos.c4
-rw-r--r--src/mess/machine/c64_vic1011.c30
-rw-r--r--src/mess/machine/c64user.h4
-rw-r--r--src/mess/machine/cococart.c4
-rw-r--r--src/mess/machine/gb_mbc.c94
-rw-r--r--src/mess/machine/gb_mbc.h24
-rw-r--r--src/mess/machine/gb_rom.c4
-rw-r--r--src/mess/machine/gb_rom.h6
-rw-r--r--src/mess/machine/gb_slot.c8
-rw-r--r--src/mess/machine/gb_slot.h2
-rw-r--r--src/mess/machine/isa_com.c72
-rw-r--r--src/mess/machine/kc_rom.h2
-rw-r--r--src/mess/machine/mbee.c2
-rw-r--r--src/mess/machine/md_rom.c69
-rw-r--r--src/mess/machine/md_rom.h26
-rw-r--r--src/mess/machine/md_slot.c2
-rw-r--r--src/mess/machine/md_slot.h6
-rw-r--r--src/mess/machine/ncr5380n.c57
-rw-r--r--src/mess/machine/ncr5380n.h42
-rw-r--r--src/mess/machine/ne1000.c1
-rw-r--r--src/mess/machine/nes_slot.c201
-rw-r--r--src/mess/machine/nes_slot.h14
-rw-r--r--src/mess/machine/nes_unif.c10
-rw-r--r--src/mess/machine/pet_64k.c2
-rw-r--r--src/mess/machine/petexp.h2
-rw-r--r--src/mess/machine/sns_bsx.c6
-rw-r--r--src/mess/machine/sns_rom.c46
-rw-r--r--src/mess/machine/sns_rom.h38
-rw-r--r--src/mess/machine/sns_rom21.c6
-rw-r--r--src/mess/machine/sns_sdd1.c7
-rw-r--r--src/mess/machine/sns_sfx.c1
-rw-r--r--src/mess/machine/sns_slot.c24
-rw-r--r--src/mess/machine/sns_slot.h14
-rw-r--r--src/mess/machine/sns_spc7110.c39
-rw-r--r--src/mess/machine/sns_upd.c3
-rw-r--r--src/mess/machine/sns_upd.h14
-rw-r--r--src/mess/machine/super80.c2
-rw-r--r--src/mess/machine/tandy2kb.c4
-rw-r--r--src/mess/machine/thomflop.c1
-rw-r--r--src/mess/machine/thomson.c10
-rw-r--r--src/mess/machine/ti99/mecmouse.h2
-rw-r--r--src/mess/machine/ti99/ti_fdc.h2
-rw-r--r--src/mess/machine/vic1011.c30
-rw-r--r--src/mess/mess.lst1
-rw-r--r--src/mess/video/crt.c16
-rw-r--r--src/mess/video/crt.h20
-rw-r--r--src/mess/video/crtc_ega.c4
-rw-r--r--src/osd/windows/input.c6
-rw-r--r--src/tools/unidasm.c2
-rw-r--r--src/version.c2
261 files changed, 2773 insertions, 2825 deletions
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak
index 53cfe7a72bc..7eb9a7f3dce 100644
--- a/src/emu/cpu/cpu.mak
+++ b/src/emu/cpu/cpu.mak
@@ -1222,15 +1222,15 @@ $(CPUOBJ)/m6809/konami.o: $(CPUSRC)/m6809/konami.c \
$(CPUSRC)/m6809/m6809inl.h \
$(CPUOBJ)/m6809/konami.inc
-$(CPUOBJ)/m6809/m6809.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/m6809.ops $(CPUSRC)/m6809/base6x09.ops
+$(CPUOBJ)/m6809/m6809.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/m6809.ops $(CPUSRC)/m6809/base6x09.ops
@echo Generating m6809 source file...
$(PYTHON) $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/m6809.ops > $@
-$(CPUOBJ)/m6809/hd6309.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/hd6309.ops $(CPUSRC)/m6809/base6x09.ops
+$(CPUOBJ)/m6809/hd6309.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/hd6309.ops $(CPUSRC)/m6809/base6x09.ops
@echo Generating hd6309 source file...
$(PYTHON) $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/hd6309.ops > $@
-$(CPUOBJ)/m6809/konami.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/konami.ops $(CPUSRC)/m6809/base6x09.ops
+$(CPUOBJ)/m6809/konami.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/konami.ops $(CPUSRC)/m6809/base6x09.ops
@echo Generating konami source file...
$(PYTHON) $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/konami.ops > $@
diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c
index 4e49f0678f4..47cfad6ae15 100644
--- a/src/emu/cpu/g65816/g65816.c
+++ b/src/emu/cpu/g65816/g65816.c
@@ -681,9 +681,9 @@ void set_5a22_map(legacy_cpu_device &cpu)
cpu.space(AS_PROGRAM).install_legacy_write_handler(0x4204, 0x4204, 0, 0xbf0000, FUNC(wrdivl_w));
cpu.space(AS_PROGRAM).install_legacy_write_handler(0x4205, 0x4205, 0, 0xbf0000, FUNC(wrdivh_w));
cpu.space(AS_PROGRAM).install_legacy_write_handler(0x4206, 0x4206, 0, 0xbf0000, FUNC(wrdvdd_w));
-
+
cpu.space(AS_PROGRAM).install_legacy_write_handler(0x420d, 0x420d, 0, 0xbf0000, FUNC(memsel_w));
-
+
cpu.space(AS_PROGRAM).install_legacy_read_handler(0x4214, 0x4214, 0, 0xbf0000, FUNC(rddivl_r));
cpu.space(AS_PROGRAM).install_legacy_read_handler(0x4215, 0x4215, 0, 0xbf0000, FUNC(rddivh_r));
cpu.space(AS_PROGRAM).install_legacy_read_handler(0x4216, 0x4216, 0, 0xbf0000, FUNC(rdmpyl_r));
diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c
index 20ad81fe031..10843a961b8 100644
--- a/src/emu/cpu/jaguar/jaguar.c
+++ b/src/emu/cpu/jaguar/jaguar.c
@@ -103,8 +103,8 @@ struct jaguar_cpu_state
address_space *program;
direct_read_data *direct;
- UINT32 internal_ram_start;
- UINT32 internal_ram_end;
+ UINT32 internal_ram_start;
+ UINT32 internal_ram_end;
};
diff --git a/src/emu/cpu/m6502/m3745x.c b/src/emu/cpu/m6502/m3745x.c
index 87ecd7b5b25..bc3851ddb1e 100644
--- a/src/emu/cpu/m6502/m3745x.c
+++ b/src/emu/cpu/m6502/m3745x.c
@@ -11,16 +11,16 @@
// Interrupt control bits (interpolated from C68 program; need 7450 Group manual badly)
-#define IRQ1_INT1 (0x04)
-#define IRQ1_INT2 (0x08) // guess, not used in C68
-#define IRQ1_INT3 (0x10) // guess, not used in C68
+#define IRQ1_INT1 (0x04)
+#define IRQ1_INT2 (0x08) // guess, not used in C68
+#define IRQ1_INT3 (0x10) // guess, not used in C68
-#define IRQ2_SERIALRX (0x08)
-#define IRQ2_SERIALTX (0x10)
-#define IRQ2_ADC (0x20)
+#define IRQ2_SERIALRX (0x08)
+#define IRQ2_SERIALTX (0x10)
+#define IRQ2_ADC (0x20)
-#define ADCTRL_CH_MASK (0x07) // AD ctrl reg. channel mask
-#define ADCTRL_COMPLETE (0x08) // AD ctrl "start"/"complete" bit
+#define ADCTRL_CH_MASK (0x07) // AD ctrl reg. channel mask
+#define ADCTRL_COMPLETE (0x08) // AD ctrl "start"/"complete" bit
//**************************************************************************
// DEVICE DEFINITIONS
@@ -75,7 +75,7 @@ void m3745x_device::device_start()
write_p3.resolve_safe();
write_p4.resolve_safe();
write_p5.resolve_safe();
- write_p6.resolve_safe();
+ write_p6.resolve_safe();
read_ad_0.resolve_safe(0);
read_ad_1.resolve_safe(0);
read_ad_2.resolve_safe(0);
@@ -109,7 +109,7 @@ void m3745x_device::device_reset()
{
m740_device::device_reset();
- SP = 0x01ff; // we have the "traditional" stack in page 1, not 0 like some M740 derivatives
+ SP = 0x01ff; // we have the "traditional" stack in page 1, not 0 like some M740 derivatives
for (int i = 0; i < NUM_TIMERS; i++)
{
@@ -179,7 +179,7 @@ void m3745x_device::execute_set_input(int inputnum, int state)
}
break;
- case M3745X_SET_OVERFLOW: // the base 740 class can handle this
+ case M3745X_SET_OVERFLOW: // the base 740 class can handle this
m740_device::execute_set_input(M740_SET_OVERFLOW, state);
break;
}
@@ -190,7 +190,7 @@ void m3745x_device::execute_set_input(int inputnum, int state)
void m3745x_device::recalc_irqs()
{
UINT16 all_ints = 0;
- int static const irq_lines[16] =
+ int static const irq_lines[16] =
{
-1, -1, -1, M740_INT11_LINE, M740_INT12_LINE, M740_INT13_LINE, -1, -1,
-1, -1, M740_INT2_LINE, M740_INT3_LINE, M740_INT4_LINE, -1, -1, -1
@@ -199,7 +199,7 @@ void m3745x_device::recalc_irqs()
all_ints = (m_intreq1 & m_intctrl1) << 8;
all_ints |= (m_intreq2 & m_intctrl2);
-// printf("recalc_irqs: last_all_ints = %04x last_ints = %04x (req1 %02x ctrl1 %02x req2 %02x ctrl2 %02x)\n", all_ints, m_last_all_ints, m_intreq1, m_intctrl1, m_intreq2, m_intctrl2);
+// printf("recalc_irqs: last_all_ints = %04x last_ints = %04x (req1 %02x ctrl1 %02x req2 %02x ctrl2 %02x)\n", all_ints, m_last_all_ints, m_intreq1, m_intctrl1, m_intreq2, m_intctrl2);
// check all 16 IRQ bits for changes
for (int i = 0; i < 16; i++)
@@ -210,19 +210,19 @@ void m3745x_device::recalc_irqs()
// and wasn't last time
if (!(m_last_all_ints & (1 << i)))
{
-// printf(" asserting irq %d (%d)\n", i, irq_lines[i]);
+// printf(" asserting irq %d (%d)\n", i, irq_lines[i]);
if (irq_lines[i] != -1)
{
m740_device::execute_set_input(irq_lines[i], ASSERT_LINE);
}
}
}
- else // bit is clear now
+ else // bit is clear now
{
// ...and wasn't clear last time
if (m_last_all_ints & (1 << i))
{
-// printf(" clearing irq %d (%d)\n", i, irq_lines[i]);
+// printf(" clearing irq %d (%d)\n", i, irq_lines[i]);
if (irq_lines[i] != -1)
{
m740_device::execute_set_input(irq_lines[i], CLEAR_LINE);
@@ -258,103 +258,103 @@ void m3745x_device::send_port(address_space &space, UINT8 offset, UINT8 data)
UINT8 m3745x_device::read_port(UINT8 offset)
{
- UINT8 incoming = 0;
+ UINT8 incoming = 0;
- switch (offset)
- {
- case 0:
- incoming = read_p3();
- break;
+ switch (offset)
+ {
+ case 0:
+ incoming = read_p3();
+ break;
- case 1:
- incoming = read_p4();
- break;
+ case 1:
+ incoming = read_p4();
+ break;
- case 2:
- incoming = read_p5();
- break;
+ case 2:
+ incoming = read_p5();
+ break;
- case 3:
- incoming = read_p6();
- break;
- }
+ case 3:
+ incoming = read_p6();
+ break;
+ }
- // apply data direction registers
- incoming &= (m_ddrs[offset] ^ 0xff);
- // OR in ddr-masked version of port writes
- incoming |= (m_ports[offset] & m_ddrs[offset]);
+ // apply data direction registers
+ incoming &= (m_ddrs[offset] ^ 0xff);
+ // OR in ddr-masked version of port writes
+ incoming |= (m_ports[offset] & m_ddrs[offset]);
- return incoming;
+ return incoming;
}
READ8_MEMBER(m3745x_device::ports_r)
{
- switch (offset)
- {
- case 0:
- return read_port(0);
+ switch (offset)
+ {
+ case 0:
+ return read_port(0);
- case 1:
- return m_ddrs[0];
+ case 1:
+ return m_ddrs[0];
- case 2:
- return read_port(1);
+ case 2:
+ return read_port(1);
- case 4:
- return read_port(2);
+ case 4:
+ return read_port(2);
- case 5:
- return m_ddrs[2];
+ case 5:
+ return m_ddrs[2];
- case 6:
- return read_port(3);
+ case 6:
+ return read_port(3);
- case 7:
- return m_ddrs[3];
- }
+ case 7:
+ return m_ddrs[3];
+ }
- return 0xff;
+ return 0xff;
}
WRITE8_MEMBER(m3745x_device::ports_w)
{
- switch (offset)
- {
- case 0: // p3
- send_port(space, 0, data & m_ddrs[0]);
- m_ports[0] = data;
- break;
-
- case 1: // p3 ddr
- send_port(space, 0, m_ports[0] & data);
- m_ddrs[0] = data;
- break;
-
- case 2: // p4
- send_port(space, 1, data & m_ddrs[1]);
- m_ports[1] = data;
- break;
-
- case 4: // p5
- send_port(space, 2, data & m_ddrs[2]);
- m_ports[2] = data;
- break;
-
- case 5: // p5 ddr
- send_port(space, 2, m_ports[2] & data);
- m_ddrs[2] = data;
- break;
-
- case 6: // p6
- send_port(space, 3, data & m_ddrs[3]);
- m_ports[3] = data;
- break;
-
- case 7: // p6 ddr
- send_port(space, 3, m_ports[3] & data);
- m_ddrs[3] = data;
- break;
- }
+ switch (offset)
+ {
+ case 0: // p3
+ send_port(space, 0, data & m_ddrs[0]);
+ m_ports[0] = data;
+ break;
+
+ case 1: // p3 ddr
+ send_port(space, 0, m_ports[0] & data);
+ m_ddrs[0] = data;
+ break;
+
+ case 2: // p4
+ send_port(space, 1, data & m_ddrs[1]);
+ m_ports[1] = data;
+ break;
+
+ case 4: // p5
+ send_port(space, 2, data & m_ddrs[2]);
+ m_ports[2] = data;
+ break;
+
+ case 5: // p5 ddr
+ send_port(space, 2, m_ports[2] & data);
+ m_ddrs[2] = data;
+ break;
+
+ case 6: // p6
+ send_port(space, 3, data & m_ddrs[3]);
+ m_ports[3] = data;
+ break;
+
+ case 7: // p6 ddr
+ send_port(space, 3, m_ports[3] & data);
+ m_ddrs[3] = data;
+ break;
+ }
}
READ8_MEMBER(m3745x_device::intregs_r)
@@ -495,4 +495,3 @@ m37450_device::m37450_device(const machine_config &mconfig, device_type type, co
m3745x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m37450_map))
{
}
-
diff --git a/src/emu/cpu/m6502/m3745x.h b/src/emu/cpu/m6502/m3745x.h
index 43798a5b83a..83178649083 100644
--- a/src/emu/cpu/m6502/m3745x.h
+++ b/src/emu/cpu/m6502/m3745x.h
@@ -63,31 +63,31 @@ public:
const address_space_config m_program_config;
- template<class _read, class _write> void set_p3_callbacks(_read rd, _write wr)
+ template<class _read, class _write> void set_p3_callbacks(_read rd, _write wr)
{
read_p3.set_callback(rd);
write_p3.set_callback(wr);
}
- template<class _read, class _write> void set_p4_callbacks(_read rd, _write wr)
+ template<class _read, class _write> void set_p4_callbacks(_read rd, _write wr)
{
read_p4.set_callback(rd);
write_p4.set_callback(wr);
}
- template<class _read, class _write> void set_p5_callbacks(_read rd, _write wr)
+ template<class _read, class _write> void set_p5_callbacks(_read rd, _write wr)
{
read_p5.set_callback(rd);
write_p5.set_callback(wr);
}
- template<class _read, class _write> void set_p6_callbacks(_read rd, _write wr)
+ template<class _read, class _write> void set_p6_callbacks(_read rd, _write wr)
{
read_p6.set_callback(rd);
write_p6.set_callback(wr);
}
- template<class _read, class _read2, class _read3, class _read4> void set_ad14_callbacks(_read rd, _read2 rd2, _read3 rd3, _read4 rd4)
+ template<class _read, class _read2, class _read3, class _read4> void set_ad14_callbacks(_read rd, _read2 rd2, _read3 rd3, _read4 rd4)
{
read_ad_0.set_callback(rd);
read_ad_1.set_callback(rd2);
@@ -95,7 +95,7 @@ public:
read_ad_3.set_callback(rd4);
}
- template<class _read, class _read2, class _read3, class _read4> void set_ad58_callbacks(_read rd, _read2 rd2, _read3 rd3, _read4 rd4)
+ template<class _read, class _read2, class _read3, class _read4> void set_ad58_callbacks(_read rd, _read2 rd2, _read3 rd3, _read4 rd4)
{
read_ad_4.set_callback(rd);
read_ad_5.set_callback(rd2);
@@ -108,12 +108,12 @@ public:
devcb2_read8 read_ad_0, read_ad_1, read_ad_2, read_ad_3;
devcb2_read8 read_ad_4, read_ad_5, read_ad_6, read_ad_7;
- DECLARE_READ8_MEMBER(ports_r);
- DECLARE_WRITE8_MEMBER(ports_w);
- DECLARE_READ8_MEMBER(adc_r);
- DECLARE_WRITE8_MEMBER(adc_w);
- DECLARE_READ8_MEMBER(intregs_r);
- DECLARE_WRITE8_MEMBER(intregs_w);
+ DECLARE_READ8_MEMBER(ports_r);
+ DECLARE_WRITE8_MEMBER(ports_w);
+ DECLARE_READ8_MEMBER(adc_r);
+ DECLARE_WRITE8_MEMBER(adc_w);
+ DECLARE_READ8_MEMBER(intregs_r);
+ DECLARE_WRITE8_MEMBER(intregs_w);
bool are_port_bits_output(UINT8 port, UINT8 mask) { return ((m_ddrs[port] & mask) == mask) ? true : false; }
@@ -127,11 +127,11 @@ protected:
virtual const address_space_config *memory_space_config(address_spacenum spacenum) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
void send_port(address_space &space, UINT8 offset, UINT8 data);
- UINT8 read_port(UINT8 offset);
+ UINT8 read_port(UINT8 offset);
void recalc_irqs();
- UINT8 m_ports[6], m_ddrs[6];
+ UINT8 m_ports[6], m_ddrs[6];
UINT8 m_intreq1, m_intreq2, m_intctrl1, m_intctrl2;
UINT8 m_adctrl;
UINT16 m_last_all_ints;
@@ -140,7 +140,7 @@ private:
emu_timer *m_timers[NUM_TIMERS];
};
-class m37450_device : public m3745x_device
+class m37450_device : public m3745x_device
{
public:
m37450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
diff --git a/src/emu/cpu/m6502/m740.c b/src/emu/cpu/m6502/m740.c
index 9aa42f13c37..f6035794c1e 100644
--- a/src/emu/cpu/m6502/m740.c
+++ b/src/emu/cpu/m6502/m740.c
@@ -88,12 +88,12 @@ UINT8 m740_device::do_seb(UINT8 in, UINT8 bit)
// doesn't affect the flags
UINT8 m740_device::do_rrf(UINT8 in)
{
- return ((in&0xf)<<4) | ((in&0xf0)>>4);
+ return ((in&0xf)<<4) | ((in&0xf0)>>4);
}
void m740_device::execute_set_input(int inputnum, int state)
{
- switch(inputnum)
+ switch(inputnum)
{
case M740_INT0_LINE:
case M740_INT1_LINE:
@@ -109,9 +109,9 @@ void m740_device::execute_set_input(int inputnum, int state)
case M740_INT11_LINE:
case M740_INT12_LINE:
case M740_INT13_LINE:
- case M740_INT14_LINE: // 37450 has 15 IRQ lines, no other known variant has that many
+ case M740_INT14_LINE: // 37450 has 15 IRQ lines, no other known variant has that many
set_irq_line(inputnum - M740_INT0_LINE, state);
- break;
+ break;
case V_LINE:
if(!v_state && state == ASSERT_LINE)
@@ -151,7 +151,7 @@ void m740_device::set_irq_line(int line, int state)
}
}
-// printf("M740 single IRQ state is %d (MPX %08x, vector %x)\n", irq_state, m_irq_multiplex, m_irq_vector);
+// printf("M740 single IRQ state is %d (MPX %08x, vector %x)\n", irq_state, m_irq_multiplex, m_irq_vector);
}
#include "cpu/m6502/m740.inc"
diff --git a/src/emu/cpu/m6502/m740.h b/src/emu/cpu/m6502/m740.h
index 4e085f95cda..cdf738956c2 100644
--- a/src/emu/cpu/m6502/m740.h
+++ b/src/emu/cpu/m6502/m740.h
@@ -46,16 +46,16 @@ class m740_device : public m6502_device {
public:
enum
{
- M740_INT0_LINE = INPUT_LINE_IRQ0, // (fffc)
- M740_INT1_LINE, // (fffa)
- M740_INT2_LINE, // (fff8)
- M740_INT3_LINE, // (fff6)
- M740_INT4_LINE, // (fff4)
- M740_INT5_LINE, // (fff2)
- M740_INT6_LINE, // (fff0)
- M740_INT7_LINE, // (ffee)
- M740_INT8_LINE, // (ffec)
- M740_INT9_LINE, // (ffea)
+ M740_INT0_LINE = INPUT_LINE_IRQ0, // (fffc)
+ M740_INT1_LINE, // (fffa)
+ M740_INT2_LINE, // (fff8)
+ M740_INT3_LINE, // (fff6)
+ M740_INT4_LINE, // (fff4)
+ M740_INT5_LINE, // (fff2)
+ M740_INT6_LINE, // (fff0)
+ M740_INT7_LINE, // (ffee)
+ M740_INT8_LINE, // (ffec)
+ M740_INT9_LINE, // (ffea)
M740_INT10_LINE, // (ffe8)
M740_INT11_LINE, // (ffe6)
M740_INT12_LINE, // (ffe4)
@@ -68,14 +68,14 @@ public:
m740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
m740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
- virtual void device_reset();
+ virtual void device_reset();
- static const disasm_entry disasm_entries[0x100];
+ static const disasm_entry disasm_entries[0x100];
- virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
- virtual void do_exec_full();
- virtual void do_exec_partial();
- virtual void execute_set_input(int inputnum, int state);
+ virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
+ virtual void do_exec_full();
+ virtual void do_exec_partial();
+ virtual void execute_set_input(int inputnum, int state);
protected:
#define O(o) void o ## _full(); void o ## _partial()
diff --git a/src/emu/cpu/m6502/om740.lst b/src/emu/cpu/m6502/om740.lst
index 49f9c4a782b..048fa1304ea 100644
--- a/src/emu/cpu/m6502/om740.lst
+++ b/src/emu/cpu/m6502/om740.lst
@@ -143,4 +143,3 @@ brk740_imp
P |= F_I; // Do *not* move after the prefetch
prefetch();
inst_state = -1;
-
diff --git a/src/emu/cpu/m6809/hd6309.c b/src/emu/cpu/m6809/hd6309.c
index bc7362b5721..5fbb2a9fa78 100644
--- a/src/emu/cpu/m6809/hd6309.c
+++ b/src/emu/cpu/m6809/hd6309.c
@@ -26,7 +26,7 @@
History:
March 2013 NPW:
- Rewrite of 6809/6309/Konami CPU; attempted to make cycle exact.
+ Rewrite of 6809/6309/Konami CPU; attempted to make cycle exact.
070614 ZV:
Fixed N flag setting in DIV overflow
@@ -140,12 +140,12 @@ void hd6309_device::device_start()
super::device_start();
// register our state for the debugger
- state_add(HD6309_E, "E", m_w.b.h).mask(0xff);
- state_add(HD6309_F, "F", m_w.b.l).mask(0xff);
- state_add(HD6309_W, "W", m_w.w).mask(0xffff);
- state_add(HD6309_V, "V", m_w.w).mask(0xffff);
- state_add(HD6309_MD, "MD", m_md).mask(0xff);
-
+ state_add(HD6309_E, "E", m_w.b.h).mask(0xff);
+ state_add(HD6309_F, "F", m_w.b.l).mask(0xff);
+ state_add(HD6309_W, "W", m_w.w).mask(0xffff);
+ state_add(HD6309_V, "V", m_w.w).mask(0xffff);
+ state_add(HD6309_MD, "MD", m_md).mask(0xff);
+
// initialize variables
m_w.w = 0x0000;
m_v.w = 0x0000;
@@ -220,13 +220,13 @@ ATTR_FORCE_INLINE UINT8 hd6309_device::read_operand()
{
switch(m_addressing_mode)
{
- case ADDRESSING_MODE_EA: return read_memory(m_ea.w);
- case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
- case ADDRESSING_MODE_REGISTER_A: return m_d.b.h;
- case ADDRESSING_MODE_REGISTER_B: return m_d.b.l;
- case ADDRESSING_MODE_REGISTER_E: return m_w.b.h;
- case ADDRESSING_MODE_REGISTER_F: return m_w.b.l;
- default: fatalerror("Unexpected"); return 0x00;
+ case ADDRESSING_MODE_EA: return read_memory(m_ea.w);
+ case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
+ case ADDRESSING_MODE_REGISTER_A: return m_d.b.h;
+ case ADDRESSING_MODE_REGISTER_B: return m_d.b.l;
+ case ADDRESSING_MODE_REGISTER_E: return m_w.b.h;
+ case ADDRESSING_MODE_REGISTER_F: return m_w.b.l;
+ default: fatalerror("Unexpected"); return 0x00;
}
}
@@ -239,18 +239,18 @@ ATTR_FORCE_INLINE UINT8 hd6309_device::read_operand(int ordinal)
{
switch(m_addressing_mode)
{
- case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal);
- case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
- case ADDRESSING_MODE_REGISTER_D: return (ordinal & 1) ? m_d.b.l : m_d.b.h;
- case ADDRESSING_MODE_REGISTER_W: return (ordinal & 1) ? m_w.b.l : m_w.b.h;
- case ADDRESSING_MODE_REGISTER_X: return (ordinal & 1) ? m_x.b.l : m_x.b.h;
- case ADDRESSING_MODE_REGISTER_Y: return (ordinal & 1) ? m_y.b.l : m_y.b.h;
- case ADDRESSING_MODE_REGISTER_U: return (ordinal & 1) ? m_u.b.l : m_u.b.h;
- case ADDRESSING_MODE_REGISTER_S: return (ordinal & 1) ? m_s.b.l : m_s.b.h;
- case ADDRESSING_MODE_REGISTER_V: return (ordinal & 1) ? m_v.b.l : m_v.b.h;
- case ADDRESSING_MODE_REGISTER_PC: return (ordinal & 1) ? m_pc.b.l : m_pc.b.h;
- case ADDRESSING_MODE_ZERO: return 0x00;
- default: fatalerror("Unexpected"); return 0x00;
+ case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal);
+ case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
+ case ADDRESSING_MODE_REGISTER_D: return (ordinal & 1) ? m_d.b.l : m_d.b.h;
+ case ADDRESSING_MODE_REGISTER_W: return (ordinal & 1) ? m_w.b.l : m_w.b.h;
+ case ADDRESSING_MODE_REGISTER_X: return (ordinal & 1) ? m_x.b.l : m_x.b.h;
+ case ADDRESSING_MODE_REGISTER_Y: return (ordinal & 1) ? m_y.b.l : m_y.b.h;
+ case ADDRESSING_MODE_REGISTER_U: return (ordinal & 1) ? m_u.b.l : m_u.b.h;
+ case ADDRESSING_MODE_REGISTER_S: return (ordinal & 1) ? m_s.b.l : m_s.b.h;
+ case ADDRESSING_MODE_REGISTER_V: return (ordinal & 1) ? m_v.b.l : m_v.b.h;
+ case ADDRESSING_MODE_REGISTER_PC: return (ordinal & 1) ? m_pc.b.l : m_pc.b.h;
+ case ADDRESSING_MODE_ZERO: return 0x00;
+ default: fatalerror("Unexpected"); return 0x00;
}
}
@@ -263,13 +263,13 @@ ATTR_FORCE_INLINE void hd6309_device::write_operand(UINT8 data)
{
switch(m_addressing_mode)
{
- case ADDRESSING_MODE_EA: write_memory(m_ea.w, data); break;
- case ADDRESSING_MODE_REGISTER_A: m_d.b.h = data; break;
- case ADDRESSING_MODE_REGISTER_B: m_d.b.l = data; break;
- case ADDRESSING_MODE_REGISTER_E: m_w.b.h = data; break;
- case ADDRESSING_MODE_REGISTER_F: m_w.b.l = data; break;
- case ADDRESSING_MODE_ZERO: break;
- default: fatalerror("Unexpected"); break;
+ case ADDRESSING_MODE_EA: write_memory(m_ea.w, data); break;
+ case ADDRESSING_MODE_REGISTER_A: m_d.b.h = data; break;
+ case ADDRESSING_MODE_REGISTER_B: m_d.b.l = data; break;
+ case ADDRESSING_MODE_REGISTER_E: m_w.b.h = data; break;
+ case ADDRESSING_MODE_REGISTER_F: m_w.b.l = data; break;
+ case ADDRESSING_MODE_ZERO: break;
+ default: fatalerror("Unexpected"); break;
}
}
@@ -282,17 +282,17 @@ ATTR_FORCE_INLINE void hd6309_device::write_operand(int ordinal, UINT8 data)
{
switch(m_addressing_mode)
{
- case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break;
- case ADDRESSING_MODE_REGISTER_D: *((ordinal & 1) ? &m_d.b.l : &m_d.b.h) = data; break;
- case ADDRESSING_MODE_REGISTER_W: *((ordinal & 1) ? &m_w.b.l : &m_w.b.h) = data; break;
- case ADDRESSING_MODE_REGISTER_X: *((ordinal & 1) ? &m_x.b.l : &m_x.b.h) = data; break;
- case ADDRESSING_MODE_REGISTER_Y: *((ordinal & 1) ? &m_y.b.l : &m_y.b.h) = data; break;
- case ADDRESSING_MODE_REGISTER_U: *((ordinal & 1) ? &m_u.b.l : &m_u.b.h) = data; break;
- case ADDRESSING_MODE_REGISTER_S: *((ordinal & 1) ? &m_s.b.l : &m_s.b.h) = data; break;
- case ADDRESSING_MODE_REGISTER_V: *((ordinal & 1) ? &m_v.b.l : &m_v.b.h) = data; break;
- case ADDRESSING_MODE_REGISTER_PC: *((ordinal & 1) ? &m_pc.b.l : &m_pc.b.h) = data; break;
- case ADDRESSING_MODE_ZERO: break;
- default: fatalerror("Unexpected"); break;
+ case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break;
+ case ADDRESSING_MODE_REGISTER_D: *((ordinal & 1) ? &m_d.b.l : &m_d.b.h) = data; break;
+ case ADDRESSING_MODE_REGISTER_W: *((ordinal & 1) ? &m_w.b.l : &m_w.b.h) = data; break;
+ case ADDRESSING_MODE_REGISTER_X: *((ordinal & 1) ? &m_x.b.l : &m_x.b.h) = data; break;
+ case ADDRESSING_MODE_REGISTER_Y: *((ordinal & 1) ? &m_y.b.l : &m_y.b.h) = data; break;
+ case ADDRESSING_MODE_REGISTER_U: *((ordinal & 1) ? &m_u.b.l : &m_u.b.h) = data; break;
+ case ADDRESSING_MODE_REGISTER_S: *((ordinal & 1) ? &m_s.b.l : &m_s.b.h) = data; break;
+ case ADDRESSING_MODE_REGISTER_V: *((ordinal & 1) ? &m_v.b.l : &m_v.b.h) = data; break;
+ case ADDRESSING_MODE_REGISTER_PC: *((ordinal & 1) ? &m_pc.b.l : &m_pc.b.h) = data; break;
+ case ADDRESSING_MODE_ZERO: break;
+ default: fatalerror("Unexpected"); break;
}
}
@@ -305,10 +305,10 @@ ATTR_FORCE_INLINE UINT8 &hd6309_device::bittest_register()
{
switch(m_temp_im & 0xC0)
{
- case 0x00: return m_cc;
- case 0x40: return m_d.b.h;
- case 0x80: return m_d.b.l;
- default: return m_temp.b.l;
+ case 0x00: return m_cc;
+ case 0x40: return m_d.b.h;
+ case 0x80: return m_d.b.l;
+ default: return m_temp.b.l;
}
}
@@ -357,22 +357,22 @@ ATTR_FORCE_INLINE m6809_base_device::exgtfr_register hd6309_device::read_exgtfr_
switch(reg & 0x0F)
{
- case 0: value = m_d.w; break; // D
- case 1: value = m_x.w; break; // X
- case 2: value = m_y.w; break; // Y
- case 3: value = m_u.w; break; // U
- case 4: value = m_s.w; break; // S
- case 5: value = m_pc.w; break; // PC
- case 6: value = m_w.w; break; // W
- case 7: value = m_v.w; break; // V
- case 8: value = ((UINT16) m_d.b.h) << 8 | m_d.b.h; break; // A
- case 9: value = ((UINT16) m_d.b.l) << 8 | m_d.b.l; break; // B
- case 10: value = ((UINT16) m_cc) << 8 | m_cc; break; // CC
- case 11: value = ((UINT16) m_dp) << 8 | m_dp; break; // DP
- case 12: value = 0; break; // 0
- case 13: value = 0; break; // 0
- case 14: value = ((UINT16) m_w.b.h) << 8 | m_w.b.h; break; // E
- case 15: value = ((UINT16) m_w.b.l) << 8 | m_w.b.l; break; // F
+ case 0: value = m_d.w; break; // D
+ case 1: value = m_x.w; break; // X
+ case 2: value = m_y.w; break; // Y
+ case 3: value = m_u.w; break; // U
+ case 4: value = m_s.w; break; // S
+ case 5: value = m_pc.w; break; // PC
+ case 6: value = m_w.w; break; // W
+ case 7: value = m_v.w; break; // V
+ case 8: value = ((UINT16) m_d.b.h) << 8 | m_d.b.h; break; // A
+ case 9: value = ((UINT16) m_d.b.l) << 8 | m_d.b.l; break; // B
+ case 10: value = ((UINT16) m_cc) << 8 | m_cc; break; // CC
+ case 11: value = ((UINT16) m_dp) << 8 | m_dp; break; // DP
+ case 12: value = 0; break; // 0
+ case 13: value = 0; break; // 0
+ case 14: value = ((UINT16) m_w.b.h) << 8 | m_w.b.h; break; // E
+ case 15: value = ((UINT16) m_w.b.l) << 8 | m_w.b.l; break; // F
default:
fatalerror("Should not reach here");
break;
@@ -394,22 +394,22 @@ ATTR_FORCE_INLINE void hd6309_device::write_exgtfr_register(UINT8 reg, m6809_bas
{
switch(reg & 0x0F)
{
- case 0: m_d.w = value.word_value; break; // D
- case 1: m_x.w = value.word_value; break; // X
- case 2: m_y.w = value.word_value; break; // Y
- case 3: m_u.w = value.word_value; break; // U
- case 4: m_s.w = value.word_value; break; // S
- case 5: m_pc.w = value.word_value; break; // PC
- case 6: m_w.w = value.word_value; break; // W
- case 7: m_v.w = value.word_value; break; // V
- case 8: m_d.b.h = (UINT8) (value.word_value >> 8); break; // A
- case 9: m_d.b.l = (UINT8) (value.word_value >> 0); break; // B
- case 10: m_cc = (UINT8) (value.word_value >> 0); break; // CC
- case 11: m_dp = (UINT8) (value.word_value >> 8); break; // DP
- case 12: break; // 0
- case 13: break; // 0
- case 14: m_w.b.h = (UINT8) (value.word_value >> 8); break; // E
- case 15: m_w.b.l = (UINT8) (value.word_value >> 0); break; // F
+ case 0: m_d.w = value.word_value; break; // D
+ case 1: m_x.w = value.word_value; break; // X
+ case 2: m_y.w = value.word_value; break; // Y
+ case 3: m_u.w = value.word_value; break; // U
+ case 4: m_s.w = value.word_value; break; // S
+ case 5: m_pc.w = value.word_value; break; // PC
+ case 6: m_w.w = value.word_value; break; // W
+ case 7: m_v.w = value.word_value; break; // V
+ case 8: m_d.b.h = (UINT8) (value.word_value >> 8); break; // A
+ case 9: m_d.b.l = (UINT8) (value.word_value >> 0); break; // B
+ case 10: m_cc = (UINT8) (value.word_value >> 0); break; // CC
+ case 11: m_dp = (UINT8) (value.word_value >> 8); break; // DP
+ case 12: break; // 0
+ case 13: break; // 0
+ case 14: m_w.b.h = (UINT8) (value.word_value >> 8); break; // E
+ case 15: m_w.b.l = (UINT8) (value.word_value >> 0); break; // F
default:
fatalerror("Should not reach here");
break;
@@ -428,22 +428,22 @@ ATTR_FORCE_INLINE bool hd6309_device::tfr_read(UINT8 opcode, UINT8 arg, UINT8 &d
switch(arg & 0xF0)
{
- case 0x00: reg = &m_d; break;
- case 0x10: reg = &m_x; break;
- case 0x20: reg = &m_y; break;
- case 0x30: reg = &m_u; break;
- case 0x40: reg = &m_s; break;
- default: return false;
+ case 0x00: reg = &m_d; break;
+ case 0x10: reg = &m_x; break;
+ case 0x20: reg = &m_y; break;
+ case 0x30: reg = &m_u; break;
+ case 0x40: reg = &m_s; break;
+ default: return false;
}
data = read_memory(reg->w);
switch(opcode & 0x03)
{
- case 0x00: reg->w++; break; // TFM R0+,R1+
- case 0x01: reg->w--; break; // TFM R0-,R1-
- case 0x02: reg->w++; break; // TFM R0+,R1
- case 0x03: break; // TFM R0,R1+
+ case 0x00: reg->w++; break; // TFM R0+,R1+
+ case 0x01: reg->w--; break; // TFM R0-,R1-
+ case 0x02: reg->w++; break; // TFM R0+,R1
+ case 0x03: break; // TFM R0,R1+
}
return true;
@@ -461,22 +461,22 @@ ATTR_FORCE_INLINE bool hd6309_device::tfr_write(UINT8 opcode, UINT8 arg, UINT8 d
switch(arg & 0x0F)
{
- case 0x00: reg = &m_d; break;
- case 0x01: reg = &m_x; break;
- case 0x02: reg = &m_y; break;
- case 0x03: reg = &m_u; break;
- case 0x04: reg = &m_s; break;
- default: return false;
+ case 0x00: reg = &m_d; break;
+ case 0x01: reg = &m_x; break;
+ case 0x02: reg = &m_y; break;
+ case 0x03: reg = &m_u; break;
+ case 0x04: reg = &m_s; break;
+ default: return false;
}
write_memory(reg->w, data);
switch(opcode & 0x03)
{
- case 0x00: reg->w++; break; // TFM R0+,R1+
- case 0x01: reg->w--; break; // TFM R0-,R1-
- case 0x02: break; // TFM R0+,R1
- case 0x03: reg->w++; break; // TFM R0,R1+
+ case 0x00: reg->w++; break; // TFM R0+,R1+
+ case 0x01: reg->w--; break; // TFM R0-,R1-
+ case 0x02: break; // TFM R0+,R1
+ case 0x03: reg->w++; break; // TFM R0,R1+
}
return true;
@@ -501,22 +501,22 @@ void hd6309_device::register_register_op()
// set destination
switch((operand >> 0) & 0x0F)
{
- case 0: set_regop16(m_d); break; // D
- case 1: set_regop16(m_x); break; // X
- case 2: set_regop16(m_y); break; // Y
- case 3: set_regop16(m_u); break; // U
- case 4: set_regop16(m_s); break; // S
- case 5: set_regop16(m_pc); break; // PC
- case 6: set_regop16(m_w); break; // W
- case 7: set_regop16(m_v); break; // V
- case 8: if (promote) set_regop16(m_d); else set_regop8(m_d.b.h); break; // A
- case 9: if (promote) set_regop16(m_d); else set_regop8(m_d.b.l); break; // B
- case 10: if (promote) set_regop16(m_temp); else set_regop8(m_cc); break; // CC
- case 11: if (promote) set_regop16(m_temp); else set_regop8(m_dp); break; // DP
- case 12: if (promote) set_regop16(m_temp); else set_regop8(m_temp.b.l); break; // 0
- case 13: if (promote) set_regop16(m_temp); else set_regop8(m_temp.b.l); break; // 0
- case 14: if (promote) set_regop16(m_w); else set_regop8(m_w.b.h); break; // E
- case 15: if (promote) set_regop16(m_w); else set_regop8(m_w.b.l); break; // F
+ case 0: set_regop16(m_d); break; // D
+ case 1: set_regop16(m_x); break; // X
+ case 2: set_regop16(m_y); break; // Y
+ case 3: set_regop16(m_u); break; // U
+ case 4: set_regop16(m_s); break; // S
+ case 5: set_regop16(m_pc); break; // PC
+ case 6: set_regop16(m_w); break; // W
+ case 7: set_regop16(m_v); break; // V
+ case 8: if (promote) set_regop16(m_d); else set_regop8(m_d.b.h); break; // A
+ case 9: if (promote) set_regop16(m_d); else set_regop8(m_d.b.l); break; // B
+ case 10: if (promote) set_regop16(m_temp); else set_regop8(m_cc); break; // CC
+ case 11: if (promote) set_regop16(m_temp); else set_regop8(m_dp); break; // DP
+ case 12: if (promote) set_regop16(m_temp); else set_regop8(m_temp.b.l); break; // 0
+ case 13: if (promote) set_regop16(m_temp); else set_regop8(m_temp.b.l); break; // 0
+ case 14: if (promote) set_regop16(m_w); else set_regop8(m_w.b.h); break; // E
+ case 15: if (promote) set_regop16(m_w); else set_regop8(m_w.b.l); break; // F
default:
fatalerror("Should not reach here");
break;
@@ -525,22 +525,22 @@ void hd6309_device::register_register_op()
// set source
switch((operand >> 4) & 0x0F)
{
- case 0: m_addressing_mode = ADDRESSING_MODE_REGISTER_D; break; // D
- case 1: m_addressing_mode = ADDRESSING_MODE_REGISTER_X; break; // X
- case 2: m_addressing_mode = ADDRESSING_MODE_REGISTER_Y; break; // Y
- case 3: m_addressing_mode = ADDRESSING_MODE_REGISTER_U; break; // U
- case 4: m_addressing_mode = ADDRESSING_MODE_REGISTER_S; break; // S
- case 5: m_addressing_mode = ADDRESSING_MODE_REGISTER_PC; break; // PC
- case 6: m_addressing_mode = ADDRESSING_MODE_REGISTER_W; break; // W
- case 7: m_addressing_mode = ADDRESSING_MODE_REGISTER_V; break; // V
- case 8: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_D : ADDRESSING_MODE_REGISTER_A; break; // A
- case 9: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_D : ADDRESSING_MODE_REGISTER_B; break; // B
- case 10: m_addressing_mode = promote ? ADDRESSING_MODE_ZERO : ADDRESSING_MODE_REGISTER_CC; break; // CC
- case 11: m_addressing_mode = promote ? ADDRESSING_MODE_ZERO : ADDRESSING_MODE_REGISTER_DP; break; // DP
- case 12: m_addressing_mode = ADDRESSING_MODE_ZERO; break; // 0
- case 13: m_addressing_mode = ADDRESSING_MODE_ZERO; break; // 0
- case 14: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_W : ADDRESSING_MODE_REGISTER_E; break; // E
- case 15: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_W : ADDRESSING_MODE_REGISTER_F; break; // F
+ case 0: m_addressing_mode = ADDRESSING_MODE_REGISTER_D; break; // D
+ case 1: m_addressing_mode = ADDRESSING_MODE_REGISTER_X; break; // X
+ case 2: m_addressing_mode = ADDRESSING_MODE_REGISTER_Y; break; // Y
+ case 3: m_addressing_mode = ADDRESSING_MODE_REGISTER_U; break; // U
+ case 4: m_addressing_mode = ADDRESSING_MODE_REGISTER_S; break; // S
+ case 5: m_addressing_mode = ADDRESSING_MODE_REGISTER_PC; break; // PC
+ case 6: m_addressing_mode = ADDRESSING_MODE_REGISTER_W; break; // W
+ case 7: m_addressing_mode = ADDRESSING_MODE_REGISTER_V; break; // V
+ case 8: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_D : ADDRESSING_MODE_REGISTER_A; break; // A
+ case 9: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_D : ADDRESSING_MODE_REGISTER_B; break; // B
+ case 10: m_addressing_mode = promote ? ADDRESSING_MODE_ZERO : ADDRESSING_MODE_REGISTER_CC; break; // CC
+ case 11: m_addressing_mode = promote ? ADDRESSING_MODE_ZERO : ADDRESSING_MODE_REGISTER_DP; break; // DP
+ case 12: m_addressing_mode = ADDRESSING_MODE_ZERO; break; // 0
+ case 13: m_addressing_mode = ADDRESSING_MODE_ZERO; break; // 0
+ case 14: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_W : ADDRESSING_MODE_REGISTER_E; break; // E
+ case 15: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_W : ADDRESSING_MODE_REGISTER_F; break; // F
default:
fatalerror("Should not reach here");
break;
@@ -623,7 +623,7 @@ bool hd6309_device::divq()
// soft overflow
m_cc |= CC_V;
- if ((result > 65536 ) || (result < -65535 ))
+ if ((result > 65536 ) || (result < -65535 ))
{
// hard overflow - division is aborted
if (old_q < 0)
diff --git a/src/emu/cpu/m6809/hd6309.h b/src/emu/cpu/m6809/hd6309.h
index f2deda9c24f..121f1209275 100644
--- a/src/emu/cpu/m6809/hd6309.h
+++ b/src/emu/cpu/m6809/hd6309.h
@@ -2,7 +2,7 @@
hd6309.h
- Portable Hitachi 6309 emulator
+ Portable Hitachi 6309 emulator
**********************************************************************/
@@ -67,14 +67,14 @@ private:
{
VECTOR_ILLEGAL = 0xFFF0
};
-
+
// CPU registers
- PAIR16 m_w;
- PAIR16 m_v;
- UINT8 m_md;
-
+ PAIR16 m_w;
+ PAIR16 m_v;
+ UINT8 m_md;
+
// other state
- UINT8 m_temp_im;
+ UINT8 m_temp_im;
// operand reading/writing
UINT8 read_operand();
@@ -83,8 +83,8 @@ private:
void write_operand(int ordinal, UINT8 data);
// interrupt registers
- bool firq_saves_entire_state() { return m_md & 0x02; }
- UINT16 entire_state_registers() { return hd6309_native_mode() ? 0x3FF : 0xFF; }
+ bool firq_saves_entire_state() { return m_md & 0x02; }
+ UINT16 entire_state_registers() { return hd6309_native_mode() ? 0x3FF : 0xFF; }
// bit tests
UINT8 &bittest_register();
@@ -102,16 +102,16 @@ private:
void put_q(UINT32 value);
// miscellaneous
- void set_e() { m_addressing_mode = ADDRESSING_MODE_REGISTER_E; }
- void set_f() { m_addressing_mode = ADDRESSING_MODE_REGISTER_F; }
- void set_w() { m_addressing_mode = ADDRESSING_MODE_REGISTER_W; }
+ void set_e() { m_addressing_mode = ADDRESSING_MODE_REGISTER_E; }
+ void set_f() { m_addressing_mode = ADDRESSING_MODE_REGISTER_F; }
+ void set_w() { m_addressing_mode = ADDRESSING_MODE_REGISTER_W; }
exgtfr_register read_exgtfr_register(UINT8 reg);
void write_exgtfr_register(UINT8 reg, exgtfr_register value);
bool tfr_read(UINT8 opcode, UINT8 arg, UINT8 &data);
bool tfr_write(UINT8 opcode, UINT8 arg, UINT8 data);
- bool add8_sets_h() { return (m_opcode & 0xFE) != 0x30; }
+ bool add8_sets_h() { return (m_opcode & 0xFE) != 0x30; }
void register_register_op();
- bool hd6309_native_mode() { return m_md & 0x01; }
+ bool hd6309_native_mode() { return m_md & 0x01; }
void execute_one();
};
@@ -140,4 +140,3 @@ enum
#define HD6309_FIRQ_LINE 1 /* FIRQ line number */
#endif // __HD6309_H__
-
diff --git a/src/emu/cpu/m6809/konami.c b/src/emu/cpu/m6809/konami.c
index 01abfa12cbf..25e00f8787f 100644
--- a/src/emu/cpu/m6809/konami.c
+++ b/src/emu/cpu/m6809/konami.c
@@ -2,7 +2,7 @@
konami.c
- Portable Konami cpu emulator
+ Portable Konami cpu emulator
Copyright Nicola Salmoria and the MAME Team
@@ -27,19 +27,19 @@
History:
March 2013 NPW:
- Rewrite of 6809/6309/Konami CPU; overall core is now unified and
- supports mid-instruction timings.
+ Rewrite of 6809/6309/Konami CPU; overall core is now unified and
+ supports mid-instruction timings.
- Some of the instruction timings have changed with the new core; the
- old core had some nonsensical timings. For example (from scontra):
-
- 819A 3A 07 1F 8C STA $1f8C
+ Some of the instruction timings have changed with the new core; the
+ old core had some nonsensical timings. For example (from scontra):
- Under the old core, this took four clock cycles, which is dubious
- because this instruction would have to do four opcode reads and one
- write. OGalibert says that the current timings are just a guess and
- nobody has done precise readings, so I'm replacing the old guesses
- with new guesses.
+ 819A 3A 07 1F 8C STA $1f8C
+
+ Under the old core, this took four clock cycles, which is dubious
+ because this instruction would have to do four opcode reads and one
+ write. OGalibert says that the current timings are just a guess and
+ nobody has done precise readings, so I'm replacing the old guesses
+ with new guesses.
991022 HJB:
Tried to improve speed: Using bit7 of cycles1 as flag for multi
@@ -133,10 +133,10 @@ inline ATTR_FORCE_INLINE UINT8 konami_cpu_device::read_operand(int ordinal)
{
switch(m_addressing_mode)
{
- case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal);
- case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
- case ADDRESSING_MODE_REGISTER_D: return (ordinal & 1) ? m_d.b.l : m_d.b.h;
- default: fatalerror("Unexpected"); return 0x00;
+ case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal);
+ case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
+ case ADDRESSING_MODE_REGISTER_D: return (ordinal & 1) ? m_d.b.l : m_d.b.h;
+ default: fatalerror("Unexpected"); return 0x00;
}
}
@@ -160,10 +160,10 @@ ATTR_FORCE_INLINE void konami_cpu_device::write_operand(int ordinal, UINT8 data)
{
switch(m_addressing_mode)
{
- case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break;
- case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break;
- case ADDRESSING_MODE_REGISTER_D: *((ordinal & 1) ? &m_d.b.l : &m_d.b.h) = data; break;
- default: fatalerror("Unexpected"); break;
+ case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break;
+ case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break;
+ case ADDRESSING_MODE_REGISTER_D: *((ordinal & 1) ? &m_d.b.l : &m_d.b.h) = data; break;
+ default: fatalerror("Unexpected"); break;
}
}
@@ -176,11 +176,11 @@ ATTR_FORCE_INLINE UINT16 &konami_cpu_device::ireg()
{
switch(m_opcode & 0x70)
{
- case 0x20: return m_x.w;
- case 0x30: return m_y.w;
- case 0x50: return m_u.w;
- case 0x60: return m_s.w;
- case 0x70: return m_pc.w;
+ case 0x20: return m_x.w;
+ case 0x30: return m_y.w;
+ case 0x50: return m_u.w;
+ case 0x60: return m_s.w;
+ case 0x70: return m_pc.w;
default:
fatalerror("Should not get here");
return m_x.w;
@@ -199,12 +199,12 @@ ATTR_FORCE_INLINE m6809_base_device::exgtfr_register konami_cpu_device::read_exg
switch(reg & 0x07)
{
- case 0: result.word_value = m_d.b.h; break; // A
- case 1: result.word_value = m_d.b.l; break; // B
- case 2: result.word_value = m_x.w; break; // X
- case 3: result.word_value = m_y.w; break; // Y
- case 4: result.word_value = m_s.w; break; // S
- case 5: result.word_value = m_u.w; break; // U
+ case 0: result.word_value = m_d.b.h; break; // A
+ case 1: result.word_value = m_d.b.l; break; // B
+ case 2: result.word_value = m_x.w; break; // X
+ case 3: result.word_value = m_y.w; break; // Y
+ case 4: result.word_value = m_s.w; break; // S
+ case 5: result.word_value = m_u.w; break; // U
}
result.byte_value = (UINT8) result.word_value;
return result;
@@ -219,12 +219,12 @@ ATTR_FORCE_INLINE void konami_cpu_device::write_exgtfr_register(UINT8 reg, m6809
{
switch(reg & 0x07)
{
- case 0: m_d.b.h = value.byte_value; break; // A
- case 1: m_d.b.l = value.byte_value; break; // B
- case 2: m_x.w = value.word_value; break; // X
- case 3: m_y.w = value.word_value; break; // Y
- case 4: m_s.w = value.word_value; break; // S
- case 5: m_u.w = value.word_value; break; // U
+ case 0: m_d.b.h = value.byte_value; break; // A
+ case 1: m_d.b.l = value.byte_value; break; // B
+ case 2: m_x.w = value.word_value; break; // X
+ case 3: m_y.w = value.word_value; break; // Y
+ case 4: m_s.w = value.word_value; break; // S
+ case 5: m_u.w = value.word_value; break; // U
}
}
diff --git a/src/emu/cpu/m6809/konami.h b/src/emu/cpu/m6809/konami.h
index 200762ab8e7..d8f6c006578 100644
--- a/src/emu/cpu/m6809/konami.h
+++ b/src/emu/cpu/m6809/konami.h
@@ -2,7 +2,7 @@
konami.h
- Portable Konami CPU emulator
+ Portable Konami CPU emulator
**********************************************************************/
diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c
index 8f8d7c736c8..b7d1fa46142 100644
--- a/src/emu/cpu/m6809/m6809.c
+++ b/src/emu/cpu/m6809/m6809.c
@@ -21,7 +21,7 @@
History:
March 2013 NPW:
- Rewrite of 6809/6309/Konami CPU; attempted to make cycle exact.
+ Rewrite of 6809/6309/Konami CPU; attempted to make cycle exact.
991026 HJB:
Fixed missing calls to cpu_changepc() for the TFR and EXG ocpodes.
@@ -84,7 +84,7 @@ March 2013 NPW:
// PARAMETERS
//**************************************************************************
-#define LOG_INTERRUPTS 0
+#define LOG_INTERRUPTS 0
// turn off 'unreferenced label' errors
#ifdef __GNUC__
@@ -150,18 +150,18 @@ void m6809_base_device::device_start()
// register our state for the debugger
astring tempstr;
state_add(STATE_GENPC, "GENPC", m_pc.w).noshow();
- state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc.w).noshow();
+ state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc.w).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_cc).callimport().callexport().formatstr("%8s").noshow();
- state_add(M6809_PC, "PC", m_pc.w).mask(0xffff);
- state_add(M6809_S, "S", m_s.w).mask(0xffff);
+ state_add(M6809_PC, "PC", m_pc.w).mask(0xffff);
+ state_add(M6809_S, "S", m_s.w).mask(0xffff);
state_add(M6809_CC, "CC", m_cc).mask(0xff);
- state_add(M6809_U, "U", m_u.w).mask(0xffff);
- state_add(M6809_A, "A", m_d.b.h).mask(0xff);
- state_add(M6809_B, "B", m_d.b.l).mask(0xff);
- state_add(M6809_X, "X", m_x.w).mask(0xffff);
- state_add(M6809_Y, "Y", m_y.w).mask(0xffff);
+ state_add(M6809_U, "U", m_u.w).mask(0xffff);
+ state_add(M6809_A, "A", m_d.b.h).mask(0xff);
+ state_add(M6809_B, "B", m_d.b.l).mask(0xff);
+ state_add(M6809_X, "X", m_x.w).mask(0xffff);
+ state_add(M6809_Y, "Y", m_y.w).mask(0xffff);
state_add(M6809_DP, "DP", m_dp).mask(0xff);
-
+
// initialize variables
m_cc = 0;
m_pc.w = 0;
@@ -215,10 +215,10 @@ void m6809_base_device::device_reset()
m_irq_line = false;
m_lds_encountered = false;
- m_dp = 0x00; // reset direct page register
+ m_dp = 0x00; // reset direct page register
- m_cc |= CC_I; // IRQ disabled
- m_cc |= CC_F; // FIRQ disabled
+ m_cc |= CC_I; // IRQ disabled
+ m_cc |= CC_F; // FIRQ disabled
m_pc.b.h = m_program->read_byte(VECTOR_RESET_FFFE + 0);
m_pc.b.l = m_program->read_byte(VECTOR_RESET_FFFE + 1);
@@ -462,10 +462,10 @@ const char *m6809_base_device::inputnum_string(int inputnum)
{
switch(inputnum)
{
- case INPUT_LINE_NMI: return "NMI";
- case M6809_FIRQ_LINE: return "FIRQ";
- case M6809_IRQ_LINE: return "IRQ";
- default: return "???";
+ case INPUT_LINE_NMI: return "NMI";
+ case M6809_FIRQ_LINE: return "FIRQ";
+ case M6809_IRQ_LINE: return "IRQ";
+ default: return "???";
}
}
@@ -482,16 +482,16 @@ ATTR_FORCE_INLINE m6809_base_device::exgtfr_register m6809_base_device::read_exg
switch(reg & 0x0F)
{
- case 0: result.word_value = m_d.w; break; // D
- case 1: result.word_value = m_x.w; break; // X
- case 2: result.word_value = m_y.w; break; // Y
- case 3: result.word_value = m_u.w; break; // U
- case 4: result.word_value = m_s.w; break; // S
- case 5: result.word_value = m_pc.w; break; // PC
- case 8: result.byte_value = m_d.b.h; break; // A
- case 9: result.byte_value = m_d.b.l; break; // B
- case 10: result.byte_value = m_cc; break; // CC
- case 11: result.byte_value = m_dp; break; // DP
+ case 0: result.word_value = m_d.w; break; // D
+ case 1: result.word_value = m_x.w; break; // X
+ case 2: result.word_value = m_y.w; break; // Y
+ case 3: result.word_value = m_u.w; break; // U
+ case 4: result.word_value = m_s.w; break; // S
+ case 5: result.word_value = m_pc.w; break; // PC
+ case 8: result.byte_value = m_d.b.h; break; // A
+ case 9: result.byte_value = m_d.b.l; break; // B
+ case 10: result.byte_value = m_cc; break; // CC
+ case 11: result.byte_value = m_dp; break; // DP
}
return result;
}
@@ -505,23 +505,23 @@ ATTR_FORCE_INLINE void m6809_base_device::write_exgtfr_register(UINT8 reg, m6809
{
switch(reg & 0x0F)
{
- case 0: m_d.w = value.word_value; break; // D
- case 1: m_x.w = value.word_value; break; // X
- case 2: m_y.w = value.word_value; break; // Y
- case 3: m_u.w = value.word_value; break; // U
- case 4: m_s.w = value.word_value; break; // S
- case 5: m_pc.w = value.word_value; break; // PC
- case 8: m_d.b.h = value.byte_value; break; // A
- case 9: m_d.b.l = value.byte_value; break; // B
- case 10: m_cc = value.byte_value; break; // CC
- case 11: m_dp = value.byte_value; break; // DP
+ case 0: m_d.w = value.word_value; break; // D
+ case 1: m_x.w = value.word_value; break; // X
+ case 2: m_y.w = value.word_value; break; // Y
+ case 3: m_u.w = value.word_value; break; // U
+ case 4: m_s.w = value.word_value; break; // S
+ case 5: m_pc.w = value.word_value; break; // PC
+ case 8: m_d.b.h = value.byte_value; break; // A
+ case 9: m_d.b.l = value.byte_value; break; // B
+ case 10: m_cc = value.byte_value; break; // CC
+ case 11: m_dp = value.byte_value; break; // DP
}
}
//-------------------------------------------------
// log_illegal - used to log hits to illegal
-// instructions (except for HD6309 which traps)
+// instructions (except for HD6309 which traps)
//-------------------------------------------------
void m6809_base_device::log_illegal()
diff --git a/src/emu/cpu/m6809/m6809.h b/src/emu/cpu/m6809/m6809.h
index d6e7f3c0953..6d806672360 100644
--- a/src/emu/cpu/m6809/m6809.h
+++ b/src/emu/cpu/m6809/m6809.h
@@ -2,7 +2,7 @@
m6809.h
- Portable Motorola 6809 emulator
+ Portable Motorola 6809 emulator
**********************************************************************/
@@ -77,116 +77,116 @@ protected:
// device_state_interface overrides
virtual void state_string_export(const device_state_entry &entry, astring &string);
-
+
// addressing modes
enum
{
- ADDRESSING_MODE_IMMEDIATE = 0,
- ADDRESSING_MODE_EA = 1,
- ADDRESSING_MODE_REGISTER_A = 2,
- ADDRESSING_MODE_REGISTER_B = 3,
+ ADDRESSING_MODE_IMMEDIATE = 0,
+ ADDRESSING_MODE_EA = 1,
+ ADDRESSING_MODE_REGISTER_A = 2,
+ ADDRESSING_MODE_REGISTER_B = 3,
ADDRESSING_MODE_REGISTER_D = 4
};
// register transfer
struct exgtfr_register
{
- UINT8 byte_value;
- UINT16 word_value;
+ UINT8 byte_value;
+ UINT16 word_value;
};
// flag bits in the cc register
enum
{
- CC_C = 0x01, // Carry
- CC_V = 0x02, // Overflow
- CC_Z = 0x04, // Zero
- CC_N = 0x08, // Negative
- CC_I = 0x10, // Inhibit IRQ
- CC_H = 0x20, // Half (auxiliary) carry
- CC_F = 0x40, // Inhibit FIRQ
- CC_E = 0x80 // Entire state pushed
+ CC_C = 0x01, // Carry
+ CC_V = 0x02, // Overflow
+ CC_Z = 0x04, // Zero
+ CC_N = 0x08, // Negative
+ CC_I = 0x10, // Inhibit IRQ
+ CC_H = 0x20, // Half (auxiliary) carry
+ CC_F = 0x40, // Inhibit FIRQ
+ CC_E = 0x80 // Entire state pushed
};
// flag combinations
enum
{
- CC_VC = CC_V | CC_C,
- CC_ZC = CC_Z | CC_C,
- CC_NZ = CC_N | CC_Z,
- CC_NZC = CC_N | CC_Z | CC_C,
- CC_NZV = CC_N | CC_Z | CC_V,
- CC_NZVC = CC_N | CC_Z | CC_V | CC_C,
+ CC_VC = CC_V | CC_C,
+ CC_ZC = CC_Z | CC_C,
+ CC_NZ = CC_N | CC_Z,
+ CC_NZC = CC_N | CC_Z | CC_C,
+ CC_NZV = CC_N | CC_Z | CC_V,
+ CC_NZVC = CC_N | CC_Z | CC_V | CC_C,
CC_HNZVC = CC_H | CC_N | CC_Z | CC_V | CC_C
};
// interrupt vectors
enum
{
- VECTOR_SWI3 = 0xFFF2,
- VECTOR_SWI2 = 0xFFF4,
- VECTOR_FIRQ = 0xFFF6,
- VECTOR_IRQ = 0xFFF8,
- VECTOR_SWI = 0xFFFA,
- VECTOR_NMI = 0xFFFC,
- VECTOR_RESET_FFFE = 0xFFFE
+ VECTOR_SWI3 = 0xFFF2,
+ VECTOR_SWI2 = 0xFFF4,
+ VECTOR_FIRQ = 0xFFF6,
+ VECTOR_IRQ = 0xFFF8,
+ VECTOR_SWI = 0xFFFA,
+ VECTOR_NMI = 0xFFFC,
+ VECTOR_RESET_FFFE = 0xFFFE
};
// CPU registers
- PAIR16 m_pc; // program counter
- PAIR16 m_ppc; // previous program counter
- PAIR16 m_d; // accumulator a and b
- PAIR16 m_x, m_y; // index registers
- PAIR16 m_u, m_s; // stack pointers
- UINT8 m_dp; // direct page register
- UINT8 m_cc;
- PAIR16 m_temp;
- UINT8 m_opcode;
+ PAIR16 m_pc; // program counter
+ PAIR16 m_ppc; // previous program counter
+ PAIR16 m_d; // accumulator a and b
+ PAIR16 m_x, m_y; // index registers
+ PAIR16 m_u, m_s; // stack pointers
+ UINT8 m_dp; // direct page register
+ UINT8 m_cc;
+ PAIR16 m_temp;
+ UINT8 m_opcode;
// other internal state
- bool m_nmi_line;
- bool m_nmi_asserted;
- bool m_firq_line;
- bool m_irq_line;
- bool m_lds_encountered;
- int m_icount;
- int m_addressing_mode;
- PAIR16 m_ea; // effective address
+ bool m_nmi_line;
+ bool m_nmi_asserted;
+ bool m_firq_line;
+ bool m_irq_line;
+ bool m_lds_encountered;
+ int m_icount;
+ int m_addressing_mode;
+ PAIR16 m_ea; // effective address
// eat cycles
- ATTR_FORCE_INLINE void eat(int cycles) { m_icount -= cycles; }
+ ATTR_FORCE_INLINE void eat(int cycles) { m_icount -= cycles; }
void eat_remaining();
// read a byte from given memory location
- ATTR_FORCE_INLINE UINT8 read_memory(UINT16 address) { eat(1); return m_program->read_byte(address); }
+ ATTR_FORCE_INLINE UINT8 read_memory(UINT16 address) { eat(1); return m_program->read_byte(address); }
// write a byte to given memory location
- ATTR_FORCE_INLINE void write_memory(UINT16 address, UINT8 data) { eat(1); m_program->write_byte(address, data); }
+ ATTR_FORCE_INLINE void write_memory(UINT16 address, UINT8 data) { eat(1); m_program->write_byte(address, data); }
// read_opcode() is like read_memory() except it is used for reading opcodes. In the case of a system
- // with memory mapped I/O, this function can be used to greatly speed up emulation.
- ATTR_FORCE_INLINE UINT8 read_opcode(UINT16 address) { eat(1); return m_direct->read_decrypted_byte(address); }
+ // with memory mapped I/O, this function can be used to greatly speed up emulation.
+ ATTR_FORCE_INLINE UINT8 read_opcode(UINT16 address) { eat(1); return m_direct->read_decrypted_byte(address); }
// read_opcode_arg() is identical to read_opcode() except it is used for reading opcode arguments. This
// difference can be used to support systems that use different encoding mechanisms for opcodes
// and opcode arguments.
- ATTR_FORCE_INLINE UINT8 read_opcode_arg(UINT16 address) { eat(1); return m_direct->read_raw_byte(address); }
+ ATTR_FORCE_INLINE UINT8 read_opcode_arg(UINT16 address) { eat(1); return m_direct->read_raw_byte(address); }
// read_opcode() and bump the program counter
- ATTR_FORCE_INLINE UINT8 read_opcode() { return read_opcode(m_pc.w++); }
- ATTR_FORCE_INLINE UINT8 read_opcode_arg() { return read_opcode_arg(m_pc.w++); }
+ ATTR_FORCE_INLINE UINT8 read_opcode() { return read_opcode(m_pc.w++); }
+ ATTR_FORCE_INLINE UINT8 read_opcode_arg() { return read_opcode_arg(m_pc.w++); }
// state stack - implemented as a UINT32
- void push_state(UINT8 state) { m_state = (m_state << 8) | state; }
- UINT8 pop_state() { UINT8 result = (UINT8) m_state; m_state >>= 8; return result; }
- void reset_state() { m_state = 0; }
+ void push_state(UINT8 state) { m_state = (m_state << 8) | state; }
+ UINT8 pop_state() { UINT8 result = (UINT8) m_state; m_state >>= 8; return result; }
+ void reset_state() { m_state = 0; }
// effective address reading/writing
- UINT8 read_ea() { return read_memory(m_ea.w); }
- void write_ea(UINT8 data) { write_memory(m_ea.w, data); }
- void set_ea(UINT16 ea) { m_ea.w = ea; m_addressing_mode = ADDRESSING_MODE_EA; }
- void set_ea_h(UINT8 ea_h) { m_ea.b.h = ea_h; }
- void set_ea_l(UINT8 ea_l) { m_ea.b.l = ea_l; m_addressing_mode = ADDRESSING_MODE_EA; }
+ UINT8 read_ea() { return read_memory(m_ea.w); }
+ void write_ea(UINT8 data) { write_memory(m_ea.w, data); }
+ void set_ea(UINT16 ea) { m_ea.w = ea; m_addressing_mode = ADDRESSING_MODE_EA; }
+ void set_ea_h(UINT8 ea_h) { m_ea.b.h = ea_h; }
+ void set_ea_l(UINT8 ea_l) { m_ea.b.l = ea_l; m_addressing_mode = ADDRESSING_MODE_EA; }
// operand reading/writing
UINT8 read_operand();
@@ -203,20 +203,20 @@ protected:
void mul();
// miscellaneous
- void nop() { }
+ void nop() { }
template<class T> T rotate_right(T value);
template<class T> UINT32 rotate_left(T value);
- void set_a() { m_addressing_mode = ADDRESSING_MODE_REGISTER_A; }
- void set_b() { m_addressing_mode = ADDRESSING_MODE_REGISTER_B; }
- void set_d() { m_addressing_mode = ADDRESSING_MODE_REGISTER_D; }
- void set_imm() { m_addressing_mode = ADDRESSING_MODE_IMMEDIATE; }
- void set_regop8(UINT8 &reg) { m_reg8 = &reg; m_reg16 = NULL; }
- void set_regop16(PAIR16 &reg) { m_reg16 = &reg; m_reg8 = NULL; }
- UINT8 &regop8() { assert(m_reg8 != NULL); return *m_reg8; }
- PAIR16 &regop16() { assert(m_reg16 != NULL); return *m_reg16; }
- bool is_register_register_op_16_bit() { return m_reg16 != NULL; }
- bool add8_sets_h() { return true; }
- bool hd6309_native_mode() { return false; }
+ void set_a() { m_addressing_mode = ADDRESSING_MODE_REGISTER_A; }
+ void set_b() { m_addressing_mode = ADDRESSING_MODE_REGISTER_B; }
+ void set_d() { m_addressing_mode = ADDRESSING_MODE_REGISTER_D; }
+ void set_imm() { m_addressing_mode = ADDRESSING_MODE_IMMEDIATE; }
+ void set_regop8(UINT8 &reg) { m_reg8 = &reg; m_reg16 = NULL; }
+ void set_regop16(PAIR16 &reg) { m_reg16 = &reg; m_reg8 = NULL; }
+ UINT8 &regop8() { assert(m_reg8 != NULL); return *m_reg8; }
+ PAIR16 &regop16() { assert(m_reg16 != NULL); return *m_reg16; }
+ bool is_register_register_op_16_bit() { return m_reg16 != NULL; }
+ bool add8_sets_h() { return true; }
+ bool hd6309_native_mode() { return false; }
// index reg
UINT16 &ireg();
@@ -226,20 +226,20 @@ protected:
template<class T> T set_flags(UINT8 mask, T r);
// branch conditions
- ATTR_FORCE_INLINE bool cond_hi() { return !(m_cc & CC_ZC); } // BHI/BLS
- ATTR_FORCE_INLINE bool cond_cc() { return !(m_cc & CC_C); } // BCC/BCS
- ATTR_FORCE_INLINE bool cond_ne() { return !(m_cc & CC_Z); } // BNE/BEQ
- ATTR_FORCE_INLINE bool cond_vc() { return !(m_cc & CC_V); } // BVC/BVS
- ATTR_FORCE_INLINE bool cond_pl() { return !(m_cc & CC_N); } // BPL/BMI
- ATTR_FORCE_INLINE bool cond_ge() { return (m_cc & CC_N ? true : false) == (m_cc & CC_V ? true : false); } // BGE/BLT
- ATTR_FORCE_INLINE bool cond_gt() { return cond_ge() && !(m_cc & CC_Z); } // BGT/BLE
- ATTR_FORCE_INLINE void set_cond(bool cond) { m_cond = cond; }
- ATTR_FORCE_INLINE bool branch_taken() { return m_cond; }
+ ATTR_FORCE_INLINE bool cond_hi() { return !(m_cc & CC_ZC); } // BHI/BLS
+ ATTR_FORCE_INLINE bool cond_cc() { return !(m_cc & CC_C); } // BCC/BCS
+ ATTR_FORCE_INLINE bool cond_ne() { return !(m_cc & CC_Z); } // BNE/BEQ
+ ATTR_FORCE_INLINE bool cond_vc() { return !(m_cc & CC_V); } // BVC/BVS
+ ATTR_FORCE_INLINE bool cond_pl() { return !(m_cc & CC_N); } // BPL/BMI
+ ATTR_FORCE_INLINE bool cond_ge() { return (m_cc & CC_N ? true : false) == (m_cc & CC_V ? true : false); } // BGE/BLT
+ ATTR_FORCE_INLINE bool cond_gt() { return cond_ge() && !(m_cc & CC_Z); } // BGT/BLE
+ ATTR_FORCE_INLINE void set_cond(bool cond) { m_cond = cond; }
+ ATTR_FORCE_INLINE bool branch_taken() { return m_cond; }
// interrupt registers
- bool firq_saves_entire_state() { return false; }
- UINT16 partial_state_registers() { return 0x81; }
- UINT16 entire_state_registers() { return 0xFF; }
+ bool firq_saves_entire_state() { return false; }
+ UINT16 partial_state_registers() { return 0x81; }
+ UINT16 entire_state_registers() { return 0xFF; }
// miscellaneous
exgtfr_register read_exgtfr_register(UINT8 reg);
@@ -252,19 +252,19 @@ protected:
private:
// address spaces
- const address_space_config m_program_config;
- address_space * m_program;
- direct_read_data * m_direct;
+ const address_space_config m_program_config;
+ address_space * m_program;
+ direct_read_data * m_direct;
// other state
- UINT32 m_state;
- int m_reg;
- UINT8 * m_reg8;
- PAIR16 * m_reg16;
- bool m_cond;
+ UINT32 m_state;
+ int m_reg;
+ UINT8 * m_reg8;
+ PAIR16 * m_reg16;
+ bool m_cond;
// incidentals
- int m_clock_divider;
+ int m_clock_divider;
// functions
void execute_one();
diff --git a/src/emu/cpu/m6809/m6809inl.h b/src/emu/cpu/m6809/m6809inl.h
index ac299d91818..09567f73c00 100644
--- a/src/emu/cpu/m6809/m6809inl.h
+++ b/src/emu/cpu/m6809/m6809inl.h
@@ -2,8 +2,8 @@
m6809inl.h
- Portable 6809 emulator - Inline functions for the purposes of
- optimization
+ Portable 6809 emulator - Inline functions for the purposes of
+ optimization
**********************************************************************/
@@ -67,11 +67,11 @@ inline ATTR_FORCE_INLINE UINT8 m6809_base_device::read_operand()
{
switch(m_addressing_mode)
{
- case ADDRESSING_MODE_EA: return read_memory(m_ea.w);
- case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
- case ADDRESSING_MODE_REGISTER_A: return m_d.b.h;
- case ADDRESSING_MODE_REGISTER_B: return m_d.b.l;
- default: fatalerror("Unexpected"); return 0x00;
+ case ADDRESSING_MODE_EA: return read_memory(m_ea.w);
+ case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
+ case ADDRESSING_MODE_REGISTER_A: return m_d.b.h;
+ case ADDRESSING_MODE_REGISTER_B: return m_d.b.l;
+ default: fatalerror("Unexpected"); return 0x00;
}
}
@@ -84,9 +84,9 @@ inline ATTR_FORCE_INLINE UINT8 m6809_base_device::read_operand(int ordinal)
{
switch(m_addressing_mode)
{
- case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal);
- case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
- default: fatalerror("Unexpected"); return 0x00;
+ case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal);
+ case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
+ default: fatalerror("Unexpected"); return 0x00;
}
}
@@ -99,11 +99,11 @@ inline ATTR_FORCE_INLINE void m6809_base_device::write_operand(UINT8 data)
{
switch(m_addressing_mode)
{
- case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break;
- case ADDRESSING_MODE_EA: write_memory(m_ea.w, data); break;
- case ADDRESSING_MODE_REGISTER_A: m_d.b.h = data; break;
- case ADDRESSING_MODE_REGISTER_B: m_d.b.l = data; break;
- default: fatalerror("Unexpected"); break;
+ case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break;
+ case ADDRESSING_MODE_EA: write_memory(m_ea.w, data); break;
+ case ADDRESSING_MODE_REGISTER_A: m_d.b.h = data; break;
+ case ADDRESSING_MODE_REGISTER_B: m_d.b.l = data; break;
+ default: fatalerror("Unexpected"); break;
}
}
@@ -116,9 +116,9 @@ inline ATTR_FORCE_INLINE void m6809_base_device::write_operand(int ordinal, UINT
{
switch(m_addressing_mode)
{
- case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break;
- case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break;
- default: fatalerror("Unexpected"); break;
+ case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break;
+ case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break;
+ default: fatalerror("Unexpected"); break;
}
}
@@ -129,10 +129,10 @@ inline ATTR_FORCE_INLINE void m6809_base_device::write_operand(int ordinal, UINT
inline ATTR_FORCE_INLINE bool m6809_base_device::match_target_bytes(UINT16 address, const UINT8 *bytes, int length)
{
- UINT8 *start_raw = (UINT8 *) m_direct->read_raw_ptr(address);
- UINT8 *start_decrypted = (UINT8 *) m_direct->read_decrypted_ptr(address);
- UINT8 *end_raw = (UINT8 *) m_direct->read_raw_ptr(address + length - 1);
- UINT8 *end_decrypted = (UINT8 *) m_direct->read_decrypted_ptr(address + length - 1);
+ UINT8 *start_raw = (UINT8 *) m_direct->read_raw_ptr(address);
+ UINT8 *start_decrypted = (UINT8 *) m_direct->read_decrypted_ptr(address);
+ UINT8 *end_raw = (UINT8 *) m_direct->read_raw_ptr(address + length - 1);
+ UINT8 *end_decrypted = (UINT8 *) m_direct->read_decrypted_ptr(address + length - 1);
return (start_raw != NULL)
&& (end_raw != NULL)
@@ -145,7 +145,7 @@ inline ATTR_FORCE_INLINE bool m6809_base_device::match_target_bytes(UINT16 addre
//-------------------------------------------------
// burn_any_delay_loops - optimization for delay
-// loops
+// loops
//-------------------------------------------------
inline ATTR_FORCE_INLINE void m6809_base_device::burn_any_delay_loops()
@@ -176,15 +176,15 @@ inline ATTR_FORCE_INLINE void m6809_base_device::daa()
UINT8 lsn = m_d.b.h & 0x0F;
// compute the carry
- if (lsn > 0x09 || m_cc & CC_H) cf |= 0x06;
- if (msn > 0x80 && lsn > 0x09 ) cf |= 0x60;
- if (msn > 0x90 || m_cc & CC_C) cf |= 0x60;
+ if (lsn > 0x09 || m_cc & CC_H) cf |= 0x06;
+ if (msn > 0x80 && lsn > 0x09 ) cf |= 0x60;
+ if (msn > 0x90 || m_cc & CC_C) cf |= 0x60;
// calculate the result
t = m_d.b.h + cf;
m_cc &= ~CC_V;
- if (t & 0x0100) // keep carry from previous operation
+ if (t & 0x0100) // keep carry from previous operation
m_cc |= CC_C;
// and put it back into A
@@ -220,10 +220,10 @@ inline ATTR_FORCE_INLINE UINT16 &m6809_base_device::ireg()
{
switch(m_opcode & 0x60)
{
- case 0x00: return m_x.w;
- case 0x20: return m_y.w;
- case 0x40: return m_u.w;
- case 0x60: return m_s.w;
+ case 0x00: return m_x.w;
+ case 0x20: return m_y.w;
+ case 0x40: return m_u.w;
+ case 0x60: return m_s.w;
default:
fatalerror("Unexpected");
return m_x.w;
@@ -276,7 +276,7 @@ inline void m6809_base_device::eat_remaining()
UINT16 real_pc = m_pc.w;
eat(m_icount);
-
+
m_pc.w = m_ppc.w;
debugger_instruction_hook(this, m_pc.w);
m_pc.w = real_pc;
@@ -333,10 +333,10 @@ inline UINT16 m6809_base_device::check_pending_interrupt()
switch(result)
{
case VECTOR_FIRQ:
- standard_irq_callback(M6809_FIRQ_LINE);
+ standard_irq_callback(M6809_FIRQ_LINE);
break;
case VECTOR_IRQ:
- standard_irq_callback(M6809_IRQ_LINE);
+ standard_irq_callback(M6809_IRQ_LINE);
break;
}
diff --git a/src/emu/cpu/sh2/sh2drc.c b/src/emu/cpu/sh2/sh2drc.c
index e2963aa4033..6448ffa4257 100644
--- a/src/emu/cpu/sh2/sh2drc.c
+++ b/src/emu/cpu/sh2/sh2drc.c
@@ -1171,7 +1171,7 @@ static void static_generate_memory_accessor(sh2_state *sh2, int size, int iswrit
UML_LABEL(block, label++); // label:
-#if 0 // DO NOT ENABLE - SEVERE AARON DAMAGE
+#if 0 // DO NOT ENABLE - SEVERE AARON DAMAGE
for (int ramnum = 0; ramnum < SH2_MAX_FASTRAM; ramnum++)
{
if (sh2->fastram[ramnum].base != NULL && (!iswrite || !sh2->fastram[ramnum].readonly))
@@ -2020,24 +2020,24 @@ static int generate_group_0(sh2_state *sh2, drcuml_block *block, compiler_state
int skip = compiler->labelnum+1;
compiler->labelnum += 3;
- UML_MOV(block, I0, mem(&sh2->sleep_mode)); // mov i0, sleep_mode
- UML_CMP(block, I0, 0x2); // cmp i0, #2
- UML_JMPc(block, COND_E, skip+1); // beq skip + 1
+ UML_MOV(block, I0, mem(&sh2->sleep_mode)); // mov i0, sleep_mode
+ UML_CMP(block, I0, 0x2); // cmp i0, #2
+ UML_JMPc(block, COND_E, skip+1); // beq skip + 1
// sleep mode != 2
- UML_CMP(block, I0, 0x0); // cmp i0, #0
- UML_JMPc(block, COND_NE, skip); // bne skip
- UML_MOV(block, mem(&sh2->sleep_mode), 0x1); // mov sleep_mode, #1
+ UML_CMP(block, I0, 0x0); // cmp i0, #0
+ UML_JMPc(block, COND_NE, skip); // bne skip
+ UML_MOV(block, mem(&sh2->sleep_mode), 0x1); // mov sleep_mode, #1
- UML_LABEL(block, skip); // skip:
- generate_update_cycles(sh2, block, compiler, desc->pc, TRUE); // repeat this insn
- UML_JMP(block, skip+2); // jmp skip+2
+ UML_LABEL(block, skip); // skip:
+ generate_update_cycles(sh2, block, compiler, desc->pc, TRUE); // repeat this insn
+ UML_JMP(block, skip+2); // jmp skip+2
- UML_LABEL(block, skip+1); // skip + 1:
+ UML_LABEL(block, skip+1); // skip + 1:
// sleep_mode == 2
- UML_MOV(block, mem(&sh2->sleep_mode), 0x0); // sleep_mode = 0
- generate_update_cycles(sh2, block, compiler, desc->pc+2, TRUE); // go to next insn
+ UML_MOV(block, mem(&sh2->sleep_mode), 0x0); // sleep_mode = 0
+ generate_update_cycles(sh2, block, compiler, desc->pc+2, TRUE); // go to next insn
- UML_LABEL(block, skip+2); // skip + 2:
+ UML_LABEL(block, skip+2); // skip + 2:
}
return TRUE;
diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h
index bd2fc5ec0d4..edabecf9070 100644
--- a/src/emu/debug/debugcpu.h
+++ b/src/emu/debug/debugcpu.h
@@ -311,8 +311,8 @@ private:
int m_stopirq; // stop IRQ number for DEBUG_FLAG_STOP_INTERRUPT
int m_stopexception; // stop exception number for DEBUG_FLAG_STOP_EXCEPTION
attotime m_endexectime; // ending time of the current execution
- UINT64 m_total_cycles; // current total cycles
- UINT64 m_last_total_cycles; // last total cycles
+ UINT64 m_total_cycles; // current total cycles
+ UINT64 m_last_total_cycles; // last total cycles
// history
offs_t m_pc_history[HISTORY_SIZE]; // history of recent PCs
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index c234d60545d..ecd6815bf17 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -159,7 +159,7 @@ void ptm6840_device::device_reset()
m_t3_divisor = 1;
m_status_read_since_int = 0;
m_IRQ = 0;
- m_t3_scaler = 0;
+ m_t3_scaler = 0;
for (int i = 0; i < 3; i++)
{
m_counter[i] = 0xffff;
diff --git a/src/emu/machine/mos6551.c b/src/emu/machine/mos6551.c
index 63436791ddd..46ab2323f08 100644
--- a/src/emu/machine/mos6551.c
+++ b/src/emu/machine/mos6551.c
@@ -242,7 +242,7 @@ void mos6551_device::update_serial()
m_connection_state &= ~SERIAL_STATE_RTS;
else
m_connection_state |= SERIAL_STATE_RTS;
-
+
m_write_rts((m_connection_state & SERIAL_STATE_RTS) ? 0 : 1);
serial_connection_out();
@@ -371,7 +371,7 @@ WRITE_LINE_MEMBER( mos6551_device::rxc_w )
WRITE_LINE_MEMBER( mos6551_device::cts_w )
{
- m_cts = state;
+ m_cts = state;
}
diff --git a/src/emu/machine/mos6551.h b/src/emu/machine/mos6551.h
index 1736d61c2bb..6f84e41b213 100644
--- a/src/emu/machine/mos6551.h
+++ b/src/emu/machine/mos6551.h
@@ -66,7 +66,7 @@ public:
mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _irq> void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); }
- template<class _rxd, class _txd> void set_rxd_txd_callbacks(_rxd rxd, _txd txd) {
+ template<class _rxd, class _txd> void set_rxd_txd_callbacks(_rxd rxd, _txd txd) {
m_read_rxd.set_callback(rxd);
m_write_txd.set_callback(txd);
}
diff --git a/src/emu/machine/nscsi_hd.c b/src/emu/machine/nscsi_hd.c
index b6def37b0c9..8f1b3fd51b7 100644
--- a/src/emu/machine/nscsi_hd.c
+++ b/src/emu/machine/nscsi_hd.c
@@ -139,8 +139,8 @@ void nscsi_harddisk_device::scsi_command()
strcpy((char *)&scsi_cmdbuf[8], " SEAGATE");
strcpy((char *)&scsi_cmdbuf[15], " ST225N");
strcpy((char *)&scsi_cmdbuf[31], "1.00");
- scsi_cmdbuf[36] = 0x00; // # of extents high
- scsi_cmdbuf[37] = 0x08; // # of extents low
+ scsi_cmdbuf[36] = 0x00; // # of extents high
+ scsi_cmdbuf[37] = 0x08; // # of extents low
scsi_cmdbuf[38] = 0x00; // group 0 commands 0-1f
scsi_cmdbuf[39] = 0x99; // commands 0,3,4,7
scsi_cmdbuf[40] = 0xa0; // commands 8, a
@@ -156,7 +156,7 @@ void nscsi_harddisk_device::scsi_command()
scsi_cmdbuf[50] = 0xa0; // commands 8, a
scsi_cmdbuf[51] = 0x00;
scsi_cmdbuf[52] = 0x00;
- scsi_cmdbuf[53] = 0xff; // end of list
+ scsi_cmdbuf[53] = 0xff; // end of list
if(size > 54)
size = 54;
scsi_data_in(0, size);
diff --git a/src/emu/machine/saturn.c b/src/emu/machine/saturn.c
index e91e64ca174..e44137ff67f 100644
--- a/src/emu/machine/saturn.c
+++ b/src/emu/machine/saturn.c
@@ -1,39 +1,39 @@
/**************************************************************************************
- Sega Saturn (c) 1994 Sega
-
- List of things that needs to be implemented:
- - There's definitely an ack mechanism in SCU irqs. This is almost surely done via
- the ISM register (i.e. going 0->1 to the given bit acks it).
- - There might be a delay to exactly when SCU irqs happens. This is due to the basic
- fact that SCU runs at 14-ish MHz, so it needs some time before actually firing the
- irq.
- - Vblank-Out actually happens at the last screen line, not at 0.
- - VDP2 V counter has a similar roll-back as MD correspondent register:
- vpos line 0 == 0x1ff (Vblank-Out happens here)
- vpos line 1 == 0
+ Sega Saturn (c) 1994 Sega
+
+ List of things that needs to be implemented:
+ - There's definitely an ack mechanism in SCU irqs. This is almost surely done via
+ the ISM register (i.e. going 0->1 to the given bit acks it).
+ - There might be a delay to exactly when SCU irqs happens. This is due to the basic
+ fact that SCU runs at 14-ish MHz, so it needs some time before actually firing the
+ irq.
+ - Vblank-Out actually happens at the last screen line, not at 0.
+ - VDP2 V counter has a similar roll-back as MD correspondent register:
+ vpos line 0 == 0x1ff (Vblank-Out happens here)
+ vpos line 1 == 0
...
vpos line 241 == 0xf0 (Vblank-In happens here)
vpos line 246 == 0xf5
- vpos line 247 == 0x1ef (rolls back here)
- vpos line 263 == 0x1ff again
- - HBlank bit seems to follow a normal logic instead.
- - Timer 0 doesn't work if the TENB bit isn't enabled (documentation is a bit fussy
- over this).
- - Timer 0 fires at the HBlank-In signal, not before.
- - VDP2 H Counter actually counts x2 in non Hi-Res mode.
- - Timer 1 is definitely annoying. Starts from H-Blank signal and starts counting from
- that position.
- H counter value 0x282 (642) -> timer 1 fires at setting 1
- H counter value 0x284 (644) -> 2
- H counter value 0x2a0 (672) -> 0x10
+ vpos line 247 == 0x1ef (rolls back here)
+ vpos line 263 == 0x1ff again
+ - HBlank bit seems to follow a normal logic instead.
+ - Timer 0 doesn't work if the TENB bit isn't enabled (documentation is a bit fussy
+ over this).
+ - Timer 0 fires at the HBlank-In signal, not before.
+ - VDP2 H Counter actually counts x2 in non Hi-Res mode.
+ - Timer 1 is definitely annoying. Starts from H-Blank signal and starts counting from
+ that position.
+ H counter value 0x282 (642) -> timer 1 fires at setting 1
+ H counter value 0x284 (644) -> 2
+ H counter value 0x2a0 (672) -> 0x10
H counter value 0x2c0 (704) -> 0x20
H counter value 0x300 (768) -> 0x40
H counter value 0x340 (832) -> 0x60
- H counter value 0x352 (850) -> 0x69
- H counter value 0x000 (0) -> 0x6a, V counter goes +1 here (max range?)
- H counter value 0x02c (44) -> 0x80
- H counter value 0x0ec (236) -> 0xe0
+ H counter value 0x352 (850) -> 0x69
+ H counter value 0x000 (0) -> 0x6a, V counter goes +1 here (max range?)
+ H counter value 0x02c (44) -> 0x80
+ H counter value 0x0ec (236) -> 0xe0
H counter value 0x12c (300) -> 0x100
- Timer 1 seems to count backwards compared to Timer 0 from setting 0x6b onward.
@@ -250,9 +250,9 @@ READ32_MEMBER(saturn_state::saturn_scu_r)
case 0xa4/4:
if(LOG_SCU && !space.debugger_access()) logerror("(PC=%08x) IRQ status reg read MASK=%08x IST=%08x | ISM=%08x\n",space.device().safe_pc(),mem_mask,m_scu.ist,m_scu.ism);
/* TODO: Bug! trips an HW fault. Basically, it tries to read the IST bit 1 with that irq enabled.
- Densetsu no Ogre Battle doesn't like this, so it needs investigation ...
+ Densetsu no Ogre Battle doesn't like this, so it needs investigation ...
*/
-// res = m_scu.ist | ~m_scu.ism;
+// res = m_scu.ist | ~m_scu.ism;
res = m_scu.ist;
break;
case 0xc8/4:
@@ -474,7 +474,7 @@ void saturn_state::scu_dma_direct(address_space &space, UINT8 dma_ch)
}
/* Burning Rangers doesn't agree with this. */
-// m_scu.size[dma_ch] = 0;
+// m_scu.size[dma_ch] = 0;
if(!(DRUP(dma_ch))) m_scu.src[dma_ch] = tmp_src;
if(!(DWUP(dma_ch))) m_scu.dst[dma_ch] = tmp_dst;
diff --git a/src/emu/machine/smpc.c b/src/emu/machine/smpc.c
index 86e38bfe6fa..07dbec9f35f 100644
--- a/src/emu/machine/smpc.c
+++ b/src/emu/machine/smpc.c
@@ -299,7 +299,7 @@ static TIMER_CALLBACK( stv_smpc_intback )
saturn_state *state = machine.driver_data<saturn_state>();
int i;
-// printf("%02x %02x %02x\n",state->m_smpc.intback_buf[0],state->m_smpc.intback_buf[1],state->m_smpc.intback_buf[2]);
+// printf("%02x %02x %02x\n",state->m_smpc.intback_buf[0],state->m_smpc.intback_buf[1],state->m_smpc.intback_buf[2]);
if(state->m_smpc.intback_buf[0] != 0)
{
diff --git a/src/emu/machine/stvcd.c b/src/emu/machine/stvcd.c
index 1b36f1de64d..3d91387ca7f 100644
--- a/src/emu/machine/stvcd.c
+++ b/src/emu/machine/stvcd.c
@@ -721,10 +721,10 @@ void saturn_state::cd_exec_command( void )
CDROM_LOG(("%s:CD: Set Filter Connection %x => mode %x parm %04x\n", machine().describe_context(), fnum, cr1 & 0xf, cr2))
- if (cr1 & 1) // set true condition
+ if (cr1 & 1) // set true condition
filters[fnum].condtrue = (cr2>>8)&0xff;
- if (cr1 & 2) // set false condition
+ if (cr1 & 2) // set false condition
filters[fnum].condfalse = cr2&0xff;
hirqreg |= (CMOK|ESEL);
diff --git a/src/emu/machine/tms9901.c b/src/emu/machine/tms9901.c
index 7437e647882..b37f1e1ad7d 100644
--- a/src/emu/machine/tms9901.c
+++ b/src/emu/machine/tms9901.c
@@ -510,7 +510,7 @@ void tms9901_device::device_reset(void)
field_interrupts();
m_clock_mode = false;
-
+
m_clock_register = 0;
timer_reload();
}
@@ -537,7 +537,7 @@ void tms9901_device::device_start(void)
}
m_interrupt.resolve(intf->interrupt_callback, *this);
-
+
m_clock_register = 0;
}
diff --git a/src/emu/machine/z80sti.c b/src/emu/machine/z80sti.c
index e48861668fe..14f75d1e8af 100644
--- a/src/emu/machine/z80sti.c
+++ b/src/emu/machine/z80sti.c
@@ -261,7 +261,7 @@ void z80sti_device::device_start()
void z80sti_device::device_reset()
{
memset(m_tmc, 0, sizeof(m_tmc));
- memset(m_to, 0, sizeof(m_to));
+ memset(m_to, 0, sizeof(m_to));
}
diff --git a/src/emu/romload.c b/src/emu/romload.c
index 2ac6ada8a21..6fa7c0af6cd 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -1324,7 +1324,7 @@ void load_software_part_region(device_t *device, char *swlist, char *swname, rom
romdata->romstotal = 0;
romdata->romstotalsize = 0;
romdata->romsloadedsize = 0;
-
+
if (software_get_support(device->machine().options(), swlist, swname) == SOFTWARE_SUPPORTED_PARTIAL)
{
romdata->errorstring.catprintf("WARNING: support for software %s (in list %s) is only partial\n", swname, swlist);
@@ -1377,14 +1377,14 @@ void load_software_part_region(device_t *device, char *swlist, char *swname, rom
else
fill_random(romdata->machine(), romdata->region->base(), romdata->region->bytes());
#endif
-
+
/* update total number of roms */
for (const rom_entry *rom = rom_first_file(region); rom != NULL; rom = rom_next_file(rom))
{
romdata->romstotal++;
romdata->romstotalsize += rom_file_size(rom);
}
-
+
/* now process the entries in the region */
if (ROMREGION_ISROMDATA(region))
process_rom_entries(romdata, locationtag, region, region + 1, device, TRUE);
@@ -1393,7 +1393,7 @@ void load_software_part_region(device_t *device, char *swlist, char *swname, rom
}
/* now go back and post-process all the regions */
- for (region = start_region; region != NULL; region = rom_next_region(region))
+ for (region = start_region; region != NULL; region = rom_next_region(region))
{
device->subtag(regiontag, ROMREGION_GETTAG(region));
region_post_process(romdata, regiontag.cstr(), ROMREGION_ISINVERTED(region));
diff --git a/src/emu/sound/astrocde.c b/src/emu/sound/astrocde.c
index 52ab586f69c..dfb7674f1fa 100644
--- a/src/emu/sound/astrocde.c
+++ b/src/emu/sound/astrocde.c
@@ -57,18 +57,18 @@ const device_type ASTROCADE = &device_creator<astrocade_device>;
astrocade_device::astrocade_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ASTROCADE, "Astrocade", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
- m_master_count(0),
- m_vibrato_clock(0),
- m_noise_clock(0),
- m_noise_state(0),
- m_a_count(0),
- m_a_state(0),
- m_b_count(0),
- m_b_state(0),
- m_c_count(0),
- m_c_state(0)
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
+ m_master_count(0),
+ m_vibrato_clock(0),
+ m_noise_clock(0),
+ m_noise_state(0),
+ m_a_count(0),
+ m_a_state(0),
+ m_b_count(0),
+ m_b_state(0),
+ m_c_count(0),
+ m_c_state(0)
{
memset(m_reg, 0, sizeof(UINT8)*8);
memset(m_bitswap, 0, sizeof(UINT8)*256);
@@ -281,4 +281,3 @@ WRITE8_MEMBER( astrocade_device::astrocade_sound_w )
/* stash the new register value */
m_reg[offset & 7] = data;
}
-
diff --git a/src/emu/sound/astrocde.h b/src/emu/sound/astrocde.h
index 36516a6d735..799a2a32b1c 100644
--- a/src/emu/sound/astrocde.h
+++ b/src/emu/sound/astrocde.h
@@ -22,7 +22,7 @@
// ======================> astrocade_device
class astrocade_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
astrocade_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -37,10 +37,10 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( astrocade_sound_w );
+ DECLARE_WRITE8_MEMBER( astrocade_sound_w );
private:
- void state_save_register();
+ void state_save_register();
private:
sound_stream *m_stream; /* sound stream */
diff --git a/src/emu/sound/beep.c b/src/emu/sound/beep.c
index 51bf4f3c8c3..b2fe51f4356 100644
--- a/src/emu/sound/beep.c
+++ b/src/emu/sound/beep.c
@@ -31,12 +31,12 @@ const device_type BEEP = &device_creator<beep_device>;
beep_device::beep_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, BEEP, "Beep", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
- m_enable(0),
- m_frequency(0),
- m_incr(0),
- m_signal(0)
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
+ m_enable(0),
+ m_frequency(0),
+ m_incr(0),
+ m_signal(0)
{
}
diff --git a/src/emu/sound/beep.h b/src/emu/sound/beep.h
index d7b50bacbe9..7b9fbf5cd67 100644
--- a/src/emu/sound/beep.h
+++ b/src/emu/sound/beep.h
@@ -27,9 +27,9 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- void set_state(int on);
- void set_frequency(int frequency);
- void set_volume(int volume);
+ void set_state(int on);
+ void set_frequency(int frequency);
+ void set_volume(int volume);
private:
sound_stream *m_stream; /* stream number */
diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c
index faae14e0f15..cf731de3a16 100644
--- a/src/emu/sound/c140.c
+++ b/src/emu/sound/c140.c
@@ -86,14 +86,14 @@ INLINE int limit(INT32 in)
c140_device::c140_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, C140, "C140", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_sample_rate(0),
- m_stream(NULL),
- m_banking_type(0),
- m_mixer_buffer_left(NULL),
- m_mixer_buffer_right(NULL),
- m_baserate(0),
- m_pRom(NULL)
+ device_sound_interface(mconfig, *this),
+ m_sample_rate(0),
+ m_stream(NULL),
+ m_banking_type(0),
+ m_mixer_buffer_left(NULL),
+ m_mixer_buffer_right(NULL),
+ m_baserate(0),
+ m_pRom(NULL)
{
memset(m_REG, 0, sizeof(UINT8)*0x200);
memset(m_pcmtbl, 0, sizeof(INT16)*8);
diff --git a/src/emu/sound/c140.h b/src/emu/sound/c140.h
index 175127906f0..f77d320b4b7 100644
--- a/src/emu/sound/c140.h
+++ b/src/emu/sound/c140.h
@@ -36,22 +36,22 @@ struct c140_interface
struct C140_VOICE
{
- C140_VOICE() :
- ptoffset(0),
- pos(0),
- key(0),
- lastdt(0),
- prevdt(0),
- dltdt(0),
- rvol(0),
- lvol(0),
- frequency(0),
- bank(0),
- mode(0),
- sample_start(0),
- sample_end(0),
- sample_loop(0) {}
-
+ C140_VOICE() :
+ ptoffset(0),
+ pos(0),
+ key(0),
+ lastdt(0),
+ prevdt(0),
+ dltdt(0),
+ rvol(0),
+ lvol(0),
+ frequency(0),
+ bank(0),
+ mode(0),
+ sample_start(0),
+ sample_end(0),
+ sample_loop(0) {}
+
long ptoffset;
long pos;
long key;
@@ -89,15 +89,15 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_READ8_MEMBER( c140_r );
- DECLARE_WRITE8_MEMBER( c140_w );
+ DECLARE_READ8_MEMBER( c140_r );
+ DECLARE_WRITE8_MEMBER( c140_w );
public:
- void set_base(void *base);
+ void set_base(void *base);
private:
- void init_voice( C140_VOICE *v );
- long find_sample(long adrs, long bank, int voice);
+ void init_voice( C140_VOICE *v );
+ long find_sample(long adrs, long bank, int voice);
private:
int m_sample_rate;
diff --git a/src/emu/sound/cem3394.c b/src/emu/sound/cem3394.c
index b685eb4f6e3..162fb664c93 100644
--- a/src/emu/sound/cem3394.c
+++ b/src/emu/sound/cem3394.c
@@ -94,7 +94,7 @@
#define WAVE_SAWTOOTH 2
#define WAVE_PULSE 4
-// keep lots of fractional bits
+// keep lots of fractional bits
#define FRACTION_BITS 28
#define FRACTION_ONE (1 << FRACTION_BITS)
#define FRACTION_ONE_D ((double)(1 << FRACTION_BITS))
@@ -115,26 +115,26 @@ const device_type CEM3394 = &device_creator<cem3394_device>;
cem3394_device::cem3394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CEM3394, "CEM3394", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_external(NULL),
- m_stream(NULL),
- m_vco_zero_freq(0.0),
- m_filter_zero_freq(0.0),
- m_wave_select(0),
- m_volume(0),
- m_mixer_internal(0),
- m_mixer_external(0),
- m_position(0),
- m_step(0),
- m_filter_position(0),
- m_filter_step(0),
- m_modulation_depth(0),
- m_last_ext(0),
- m_pulse_width(0),
- m_inv_sample_rate(0.0),
- m_sample_rate(0),
- m_mixer_buffer(NULL),
- m_external_buffer(NULL)
+ device_sound_interface(mconfig, *this),
+ m_external(NULL),
+ m_stream(NULL),
+ m_vco_zero_freq(0.0),
+ m_filter_zero_freq(0.0),
+ m_wave_select(0),
+ m_volume(0),
+ m_mixer_internal(0),
+ m_mixer_external(0),
+ m_position(0),
+ m_step(0),
+ m_filter_position(0),
+ m_filter_step(0),
+ m_modulation_depth(0),
+ m_last_ext(0),
+ m_pulse_width(0),
+ m_inv_sample_rate(0.0),
+ m_sample_rate(0),
+ m_mixer_buffer(NULL),
+ m_external_buffer(NULL)
{
memset(m_values, 0, 8*sizeof(double));
}
diff --git a/src/emu/sound/cem3394.h b/src/emu/sound/cem3394.h
index 0beb55b212d..0581df78a94 100644
--- a/src/emu/sound/cem3394.h
+++ b/src/emu/sound/cem3394.h
@@ -40,7 +40,7 @@ enum
class cem3394_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
cem3394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -54,23 +54,23 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- // Set the voltage going to a particular parameter
- void set_voltage(int input, double voltage);
-
- // Get the translated parameter associated with the given input as follows:
- // CEM3394_VCO_FREQUENCY: frequency in Hz
- // CEM3394_MODULATION_AMOUNT: scale factor, 0.0 to 2.0
- // CEM3394_WAVE_SELECT: voltage from this line
- // CEM3394_PULSE_WIDTH: width fraction, from 0.0 to 1.0
- // CEM3394_MIXER_BALANCE: balance, from -1.0 to 1.0
- // CEM3394_FILTER_RESONANCE: resonance, from 0.0 to 1.0
- // CEM3394_FILTER_FREQENCY: frequency, in Hz
- // CEM3394_FINAL_GAIN: gain, in dB
- double get_parameter(int input);
+ // Set the voltage going to a particular parameter
+ void set_voltage(int input, double voltage);
+
+ // Get the translated parameter associated with the given input as follows:
+ // CEM3394_VCO_FREQUENCY: frequency in Hz
+ // CEM3394_MODULATION_AMOUNT: scale factor, 0.0 to 2.0
+ // CEM3394_WAVE_SELECT: voltage from this line
+ // CEM3394_PULSE_WIDTH: width fraction, from 0.0 to 1.0
+ // CEM3394_MIXER_BALANCE: balance, from -1.0 to 1.0
+ // CEM3394_FILTER_RESONANCE: resonance, from 0.0 to 1.0
+ // CEM3394_FILTER_FREQENCY: frequency, in Hz
+ // CEM3394_FINAL_GAIN: gain, in dB
+ double get_parameter(int input);
private:
- double compute_db(double voltage);
- UINT32 compute_db_volume(double voltage);
+ double compute_db(double voltage);
+ UINT32 compute_db_volume(double voltage);
private:
void (*m_external)(device_t*, int, short*);/* callback to generate external samples */
diff --git a/src/emu/sound/es8712.c b/src/emu/sound/es8712.c
index ed9e1b80382..853125b2639 100644
--- a/src/emu/sound/es8712.c
+++ b/src/emu/sound/es8712.c
@@ -39,19 +39,19 @@ const device_type ES8712 = &device_creator<es8712_device>;
es8712_device::es8712_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ES8712, "ES8712", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_playing(0),
- m_base_offset(0),
- m_sample(0),
- m_count(0),
- m_signal(0),
- m_step(0),
- m_start(0),
- m_end(0),
- m_repeat(0),
- m_bank_offset(0),
- m_region_base(NULL),
- m_stream(NULL)
+ device_sound_interface(mconfig, *this),
+ m_playing(0),
+ m_base_offset(0),
+ m_sample(0),
+ m_count(0),
+ m_signal(0),
+ m_step(0),
+ m_start(0),
+ m_end(0),
+ m_repeat(0),
+ m_bank_offset(0),
+ m_region_base(NULL),
+ m_stream(NULL)
{
}
diff --git a/src/emu/sound/es8712.h b/src/emu/sound/es8712.h
index 07311424953..acbb8eb9b78 100644
--- a/src/emu/sound/es8712.h
+++ b/src/emu/sound/es8712.h
@@ -23,7 +23,7 @@
// ======================> es8712_device
class es8712_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
es8712_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -38,17 +38,17 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( es8712_w );
+ DECLARE_WRITE8_MEMBER( es8712_w );
public:
- void play();
- void set_bank_base(int base);
- void set_frequency(int frequency);
+ void play();
+ void set_bank_base(int base);
+ void set_frequency(int frequency);
private:
- void compute_tables();
- void generate_adpcm(stream_sample_t *buffer, int samples);
- void es8712_state_save_register();
+ void compute_tables();
+ void generate_adpcm(stream_sample_t *buffer, int samples);
+ void es8712_state_save_register();
private:
UINT8 m_playing; /* 1 if we're actively playing */
diff --git a/src/emu/sound/filter.h b/src/emu/sound/filter.h
index 6441dfb804a..b2ed922b642 100644
--- a/src/emu/sound/filter.h
+++ b/src/emu/sound/filter.h
@@ -65,20 +65,20 @@ filter_real filter_compute(filter* f, filter_state* s);
struct filter2_context
{
- filter2_context() :
- x0(0.0),
- x1(0.0),
- x2(0.0),
- y0(0.0),
- y1(0.0),
- y2(0.0),
- a1(0.0),
- a2(0.0),
- b0(0.0),
- b1(0.0),
- b2(0.0)
- {}
-
+ filter2_context() :
+ x0(0.0),
+ x1(0.0),
+ x2(0.0),
+ y0(0.0),
+ y1(0.0),
+ y2(0.0),
+ a1(0.0),
+ a2(0.0),
+ b0(0.0),
+ b1(0.0),
+ b2(0.0)
+ {}
+
double x0, x1, x2; /* x[k], x[k-1], x[k-2], current and previous 2 input values */
double y0, y1, y2; /* y[k], y[k-1], y[k-2], current and previous 2 output values */
double a1, a2; /* digital filter coefficients, denominator */
diff --git a/src/emu/sound/k051649.c b/src/emu/sound/k051649.c
index 44465fc604e..1dcc60446fe 100644
--- a/src/emu/sound/k051649.c
+++ b/src/emu/sound/k051649.c
@@ -43,14 +43,14 @@ const device_type K051649 = &device_creator<k051649_device>;
k051649_device::k051649_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, K051649, "K051649", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
- m_mclock(0),
- m_rate(0),
- m_mixer_table(NULL),
- m_mixer_lookup(NULL),
- m_mixer_buffer(NULL),
- m_test(0)
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
+ m_mclock(0),
+ m_rate(0),
+ m_mixer_table(NULL),
+ m_mixer_lookup(NULL),
+ m_mixer_buffer(NULL),
+ m_test(0)
{
}
@@ -61,15 +61,15 @@ k051649_device::k051649_device(const machine_config &mconfig, const char *tag, d
void k051649_device::device_start()
{
- // get stream channels
+ // get stream channels
m_rate = clock()/16;
m_stream = stream_alloc(0, 1, m_rate);
m_mclock = clock();
- // allocate a buffer to mix into - 1 second's worth should be more than enough
+ // allocate a buffer to mix into - 1 second's worth should be more than enough
m_mixer_buffer = auto_alloc_array(machine(), short, 2 * m_rate);
- // build the mixer table
+ // build the mixer table
make_mixer_table(5);
}
@@ -83,9 +83,9 @@ void k051649_device::device_reset()
k051649_sound_channel *voice = m_channel_list;
int i;
- // reset all the voices
+ // reset all the voices
for (i = 0; i < 5; i++)
- {
+ {
voice[i].frequency = 0;
voice[i].volume = 0xf;
voice[i].counter = 0;
@@ -108,12 +108,12 @@ void k051649_device::sound_stream_update(sound_stream &stream, stream_sample_t *
short *mix;
int i,j;
- // zap the contents of the mixer buffer
+ // zap the contents of the mixer buffer
memset(m_mixer_buffer, 0, samples * sizeof(short));
for (j = 0; j < 5; j++)
- {
- // channel is halted for freq < 9
+ {
+ // channel is halted for freq < 9
if (voice[j].frequency > 8)
{
const signed char *w = voice[j].waveram;
@@ -123,7 +123,7 @@ void k051649_device::sound_stream_update(sound_stream &stream, stream_sample_t *
mix = m_mixer_buffer;
- // add our contribution
+ // add our contribution
for (i = 0; i < samples; i++)
{
int offs;
@@ -133,12 +133,12 @@ void k051649_device::sound_stream_update(sound_stream &stream, stream_sample_t *
*mix++ += (w[offs] * v)>>3;
}
- // update the counter for this voice
+ // update the counter for this voice
voice[j].counter = c;
}
}
- // mix it down
+ // mix it down
mix = m_mixer_buffer;
for (i = 0; i < samples; i++)
*buffer++ = m_mixer_lookup[*mix++];
@@ -150,7 +150,7 @@ void k051649_device::sound_stream_update(sound_stream &stream, stream_sample_t *
WRITE8_MEMBER( k051649_device::k051649_waveform_w )
{
- // waveram is read-only?
+ // waveram is read-only?
if (m_test & 0x40 || (m_test & 0x80 && offset >= 0x60))
return;
@@ -158,7 +158,7 @@ WRITE8_MEMBER( k051649_device::k051649_waveform_w )
if (offset >= 0x60)
{
- // channel 5 shares waveram with channel 4
+ // channel 5 shares waveram with channel 4
m_channel_list[3].waveram[offset&0x1f]=data;
m_channel_list[4].waveram[offset&0x1f]=data;
}
@@ -169,7 +169,7 @@ WRITE8_MEMBER( k051649_device::k051649_waveform_w )
READ8_MEMBER ( k051649_device::k051649_waveform_r )
{
- // test-register bits 6/7 expose the internal counter
+ // test-register bits 6/7 expose the internal counter
if (m_test & 0xc0)
{
m_stream->update();
@@ -185,7 +185,7 @@ READ8_MEMBER ( k051649_device::k051649_waveform_r )
WRITE8_MEMBER( k051649_device::k052539_waveform_w )
{
- // waveram is read-only?
+ // waveram is read-only?
if (m_test & 0x40)
return;
@@ -196,7 +196,7 @@ WRITE8_MEMBER( k051649_device::k052539_waveform_w )
READ8_MEMBER ( k051649_device::k052539_waveform_r )
{
- // test-register bit 6 exposes the internal counter
+ // test-register bit 6 exposes the internal counter
if (m_test & 0x40)
{
m_stream->update();
@@ -220,13 +220,13 @@ WRITE8_MEMBER( k051649_device::k051649_frequency_w )
m_stream->update();
- // test-register bit 5 resets the internal counter
+ // test-register bit 5 resets the internal counter
if (m_test & 0x20)
m_channel_list[offset].counter = ~0;
else if (m_channel_list[offset].frequency < 9)
m_channel_list[offset].counter |= ((1 << FREQ_BITS) - 1);
- // update frequency
+ // update frequency
if (freq_hi)
m_channel_list[offset].frequency = (m_channel_list[offset].frequency & 0x0ff) | (data << 8 & 0xf00);
else
@@ -240,7 +240,7 @@ WRITE8_MEMBER( k051649_device::k051649_keyonoff_w )
m_stream->update();
for (i = 0; i < 5; i++)
- {
+ {
m_channel_list[i].key=data&1;
data >>= 1;
}
@@ -255,7 +255,7 @@ WRITE8_MEMBER( k051649_device::k051649_test_w )
READ8_MEMBER ( k051649_device::k051649_test_r )
{
- // reading the test register sets it to $ff!
+ // reading the test register sets it to $ff!
k051649_test_w(space, offset, 0xff);
return 0xff;
}
@@ -269,13 +269,13 @@ void k051649_device::make_mixer_table(int voices)
{
int i;
- // allocate memory
+ // allocate memory
m_mixer_table = auto_alloc_array(machine(), INT16, 512 * voices);
- // find the middle of the table
+ // find the middle of the table
m_mixer_lookup = m_mixer_table + (256 * voices);
- // fill in the table - 16 bit case
+ // fill in the table - 16 bit case
for (i = 0; i < (voices * 256); i++)
{
int val = i * DEF_GAIN * 16 / voices;
@@ -284,5 +284,3 @@ void k051649_device::make_mixer_table(int voices)
m_mixer_lookup[-i] = -val;
}
}
-
-
diff --git a/src/emu/sound/k051649.h b/src/emu/sound/k051649.h
index aa042095915..c0bc7606284 100644
--- a/src/emu/sound/k051649.h
+++ b/src/emu/sound/k051649.h
@@ -23,15 +23,15 @@
// Parameters for a channel
struct k051649_sound_channel
{
- k051649_sound_channel() :
- counter(0),
- frequency(0),
- volume(0),
- key(0)
- {
- memset(waveram, 0, sizeof(signed char)*32);
- }
-
+ k051649_sound_channel() :
+ counter(0),
+ frequency(0),
+ volume(0),
+ key(0)
+ {
+ memset(waveram, 0, sizeof(signed char)*32);
+ }
+
unsigned long counter;
int frequency;
int volume;
@@ -43,7 +43,7 @@ struct k051649_sound_channel
// ======================> k051649_device
class k051649_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
k051649_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -58,19 +58,19 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( k051649_waveform_w );
- DECLARE_READ8_MEMBER ( k051649_waveform_r );
- DECLARE_WRITE8_MEMBER( k051649_volume_w );
- DECLARE_WRITE8_MEMBER( k051649_frequency_w );
- DECLARE_WRITE8_MEMBER( k051649_keyonoff_w );
- DECLARE_WRITE8_MEMBER( k051649_test_w );
- DECLARE_READ8_MEMBER ( k051649_test_r );
+ DECLARE_WRITE8_MEMBER( k051649_waveform_w );
+ DECLARE_READ8_MEMBER ( k051649_waveform_r );
+ DECLARE_WRITE8_MEMBER( k051649_volume_w );
+ DECLARE_WRITE8_MEMBER( k051649_frequency_w );
+ DECLARE_WRITE8_MEMBER( k051649_keyonoff_w );
+ DECLARE_WRITE8_MEMBER( k051649_test_w );
+ DECLARE_READ8_MEMBER ( k051649_test_r );
- DECLARE_WRITE8_MEMBER( k052539_waveform_w );
- DECLARE_READ8_MEMBER ( k052539_waveform_r );
+ DECLARE_WRITE8_MEMBER( k052539_waveform_w );
+ DECLARE_READ8_MEMBER ( k052539_waveform_r );
private:
- void make_mixer_table(int voices);
+ void make_mixer_table(int voices);
private:
k051649_sound_channel m_channel_list[5];
@@ -78,7 +78,7 @@ private:
/* global sound parameters */
sound_stream *m_stream;
int m_mclock;
- int m_rate;
+ int m_rate;
/* mixer tables and internal buffers */
INT16 *m_mixer_table;
diff --git a/src/emu/sound/mos6560.h b/src/emu/sound/mos6560.h
index 13cacb5d8ae..5c398516669 100644
--- a/src/emu/sound/mos6560.h
+++ b/src/emu/sound/mos6560.h
@@ -185,8 +185,8 @@ protected:
const address_space_config m_videoram_space_config;
const address_space_config m_colorram_space_config;
- devcb2_read8 m_read_potx;
- devcb2_read8 m_read_poty;
+ devcb2_read8 m_read_potx;
+ devcb2_read8 m_read_poty;
const char *m_screen_tag;
screen_device *m_screen;
diff --git a/src/emu/sound/mos7360.c b/src/emu/sound/mos7360.c
index 45d9261f716..8c85769c6d3 100644
--- a/src/emu/sound/mos7360.c
+++ b/src/emu/sound/mos7360.c
@@ -410,7 +410,7 @@ void mos7360_device::device_timer(emu_timer &timer, device_timer_id id, int para
m_timer3_active = 1;
set_interrupt(0x40);
break;
-
+
case TIMER_LINE:
raster_interrupt_gen();
break;
diff --git a/src/emu/sound/okim6258.c b/src/emu/sound/okim6258.c
index 97e2d2922b0..6ec9ddc6b43 100644
--- a/src/emu/sound/okim6258.c
+++ b/src/emu/sound/okim6258.c
@@ -46,17 +46,17 @@ const device_type OKIM6258 = &device_creator<okim6258_device>;
okim6258_device::okim6258_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, OKIM6258, "OKI6258", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_status(0),
- m_master_clock(0),
- m_divider(0),
- m_adpcm_type(0),
- m_data_in(0),
- m_nibble_shift(0),
- m_stream(NULL),
- m_output_bits(0),
- m_signal(0),
- m_step(0)
+ device_sound_interface(mconfig, *this),
+ m_status(0),
+ m_master_clock(0),
+ m_divider(0),
+ m_adpcm_type(0),
+ m_data_in(0),
+ m_nibble_shift(0),
+ m_stream(NULL),
+ m_output_bits(0),
+ m_signal(0),
+ m_step(0)
{
}
@@ -338,5 +338,3 @@ WRITE8_MEMBER( okim6258_device::okim6258_ctrl_w )
m_status &= ~STATUS_RECORDING;
}
}
-
-
diff --git a/src/emu/sound/okim6258.h b/src/emu/sound/okim6258.h
index 6a58988cc63..9e1f2087c57 100644
--- a/src/emu/sound/okim6258.h
+++ b/src/emu/sound/okim6258.h
@@ -54,18 +54,18 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_READ8_MEMBER( okim6258_status_r );
- DECLARE_WRITE8_MEMBER( okim6258_data_w );
- DECLARE_WRITE8_MEMBER( okim6258_ctrl_w );
+ DECLARE_READ8_MEMBER( okim6258_status_r );
+ DECLARE_WRITE8_MEMBER( okim6258_data_w );
+ DECLARE_WRITE8_MEMBER( okim6258_ctrl_w );
public:
- void set_divider(int val);
- void set_clock(int val);
- int get_vclk();
+ void set_divider(int val);
+ void set_clock(int val);
+ int get_vclk();
private:
- void okim6258_state_save_register();
- INT16 clock_adpcm(UINT8 nibble);
+ void okim6258_state_save_register();
+ INT16 clock_adpcm(UINT8 nibble);
private:
UINT8 m_status;
diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c
index b44c21eef58..10b69d28d6e 100644
--- a/src/emu/sound/pokey.c
+++ b/src/emu/sound/pokey.c
@@ -279,7 +279,7 @@ void pokey_device::device_start()
m_out_filter = 0;
m_output = 0;
m_kbd_state = 0;
-
+
/* reset more internal state */
for (i=0; i<3; i++)
{
diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c
index 97af027bc14..3a8e3d140ad 100644
--- a/src/emu/sound/rf5c400.c
+++ b/src/emu/sound/rf5c400.c
@@ -65,10 +65,10 @@ const device_type RF5C400 = &device_creator<rf5c400_device>;
rf5c400_device::rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RF5C400, "RF5C400", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_rom(NULL),
- m_rom_length(0),
- m_stream(NULL)
+ device_sound_interface(mconfig, *this),
+ m_rom(NULL),
+ m_rom_length(0),
+ m_stream(NULL)
{
memset(m_env_ar_table, 0, sizeof(double)*0x9f);
memset(m_env_dr_table, 0, sizeof(double)*0x9f);
diff --git a/src/emu/sound/rf5c400.h b/src/emu/sound/rf5c400.h
index 8dc085c0265..23ac6ec91af 100644
--- a/src/emu/sound/rf5c400.h
+++ b/src/emu/sound/rf5c400.h
@@ -21,7 +21,7 @@
struct rf5c400_channel
{
- rf5c400_channel() :
+ rf5c400_channel() :
startH(0),
startL(0),
freq(0),
@@ -42,8 +42,8 @@ struct rf5c400_channel
env_level(0.0),
env_step(0.0),
env_scale(0.0)
- { }
-
+ { }
+
UINT16 startH;
UINT16 startL;
UINT16 freq;
@@ -74,7 +74,7 @@ struct rf5c400_channel
// ======================> rf5c400_device
class rf5c400_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -88,12 +88,12 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_READ16_MEMBER( rf5c400_r );
- DECLARE_WRITE16_MEMBER( rf5c400_w );
+ DECLARE_READ16_MEMBER( rf5c400_r );
+ DECLARE_WRITE16_MEMBER( rf5c400_w );
private:
- void rf5c400_init_chip();
- UINT8 decode80(UINT8 val);
+ void rf5c400_init_chip();
+ UINT8 decode80(UINT8 val);
private:
INT16 *m_rom;
diff --git a/src/emu/sound/rf5c68.c b/src/emu/sound/rf5c68.c
index 09f917402dd..9cbef82f167 100644
--- a/src/emu/sound/rf5c68.c
+++ b/src/emu/sound/rf5c68.c
@@ -20,12 +20,12 @@ const device_type RF5C68 = &device_creator<rf5c68_device>;
rf5c68_device::rf5c68_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, RF5C68, "RF5C68", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
- m_cbank(0),
- m_wbank(0),
- m_enable(0),
- m_sample_callback(NULL)
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
+ m_cbank(0),
+ m_wbank(0),
+ m_enable(0),
+ m_sample_callback(NULL)
{
memset(m_data, 0, sizeof(UINT8)*0x10000);
}
@@ -142,7 +142,7 @@ void rf5c68_device::sound_stream_update(sound_stream &stream, stream_sample_t **
//-------------------------------------------------
-// RF5C68 write register
+// RF5C68 write register
//-------------------------------------------------
READ8_MEMBER( rf5c68_device::rf5c68_r )
@@ -219,7 +219,7 @@ WRITE8_MEMBER( rf5c68_device::rf5c68_w )
//-------------------------------------------------
-// RF5C68 read memory
+// RF5C68 read memory
//-------------------------------------------------
READ8_MEMBER( rf5c68_device::rf5c68_mem_r )
@@ -229,7 +229,7 @@ READ8_MEMBER( rf5c68_device::rf5c68_mem_r )
//-------------------------------------------------
-// RF5C68 write memory
+// RF5C68 write memory
//-------------------------------------------------
WRITE8_MEMBER( rf5c68_device::rf5c68_mem_w )
diff --git a/src/emu/sound/rf5c68.h b/src/emu/sound/rf5c68.h
index 091dc77ecfe..22468038f2b 100644
--- a/src/emu/sound/rf5c68.h
+++ b/src/emu/sound/rf5c68.h
@@ -32,15 +32,15 @@ struct rf5c68_interface
struct rf5c68_pcm_channel
{
- rf5c68_pcm_channel() :
- enable(0),
- env(0),
- pan(0),
- start(0),
- addr(0),
- step(0),
- loopst(0) {}
-
+ rf5c68_pcm_channel() :
+ enable(0),
+ env(0),
+ pan(0),
+ start(0),
+ addr(0),
+ step(0),
+ loopst(0) {}
+
UINT8 enable;
UINT8 env;
UINT8 pan;
@@ -55,7 +55,7 @@ struct rf5c68_pcm_channel
// ======================> rf5c68_device
class rf5c68_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
rf5c68_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -69,11 +69,11 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_READ8_MEMBER( rf5c68_r );
- DECLARE_WRITE8_MEMBER( rf5c68_w );
+ DECLARE_READ8_MEMBER( rf5c68_r );
+ DECLARE_WRITE8_MEMBER( rf5c68_w );
- DECLARE_READ8_MEMBER( rf5c68_mem_r );
- DECLARE_WRITE8_MEMBER( rf5c68_mem_w );
+ DECLARE_READ8_MEMBER( rf5c68_mem_r );
+ DECLARE_WRITE8_MEMBER( rf5c68_mem_w );
private:
sound_stream* m_stream;
diff --git a/src/emu/sound/saa1099.c b/src/emu/sound/saa1099.c
index 03f221fc87d..0e2b04c593c 100644
--- a/src/emu/sound/saa1099.c
+++ b/src/emu/sound/saa1099.c
@@ -133,20 +133,20 @@ const device_type SAA1099 = &device_creator<saa1099_device>;
saa1099_device::saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SAA1099, "SAA1099", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
- m_all_ch_enable(0),
- m_sync_state(0),
- m_selected_reg(0),
- m_sample_rate(0.0)
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
+ m_all_ch_enable(0),
+ m_sync_state(0),
+ m_selected_reg(0),
+ m_sample_rate(0.0)
{
- memset(m_noise_params, 0, sizeof(int)*2);
- memset(m_env_enable, 0, sizeof(int)*2);
- memset(m_env_reverse_right, 0, sizeof(int)*2);
- memset(m_env_mode, 0, sizeof(int)*2);
- memset(m_env_bits, 0, sizeof(int)*2);
- memset(m_env_clock, 0, sizeof(int)*2);
- memset(m_env_step, 0, sizeof(int)*2);
+ memset(m_noise_params, 0, sizeof(int)*2);
+ memset(m_env_enable, 0, sizeof(int)*2);
+ memset(m_env_reverse_right, 0, sizeof(int)*2);
+ memset(m_env_mode, 0, sizeof(int)*2);
+ memset(m_env_bits, 0, sizeof(int)*2);
+ memset(m_env_clock, 0, sizeof(int)*2);
+ memset(m_env_step, 0, sizeof(int)*2);
}
diff --git a/src/emu/sound/saa1099.h b/src/emu/sound/saa1099.h
index f7350286070..75452e2c0ce 100644
--- a/src/emu/sound/saa1099.h
+++ b/src/emu/sound/saa1099.h
@@ -23,19 +23,19 @@
struct saa1099_channel
{
- saa1099_channel() :
- frequency(0),
- freq_enable(0),
- noise_enable(0),
- octave(0),
- counter(0.0),
- freq(0.0),
- level(0)
- {
- memset(amplitude, 0, sizeof(int)*2);
- memset(envelope, 0, sizeof(int)*2);
- }
-
+ saa1099_channel() :
+ frequency(0),
+ freq_enable(0),
+ noise_enable(0),
+ octave(0),
+ counter(0.0),
+ freq(0.0),
+ level(0)
+ {
+ memset(amplitude, 0, sizeof(int)*2);
+ memset(envelope, 0, sizeof(int)*2);
+ }
+
int frequency; /* frequency (0x00..0xff) */
int freq_enable; /* frequency enable */
int noise_enable; /* noise enable */
@@ -51,11 +51,11 @@ struct saa1099_channel
struct saa1099_noise
{
- saa1099_noise() :
- counter(0.0),
- freq(0.0),
- level(0) {}
-
+ saa1099_noise() :
+ counter(0.0),
+ freq(0.0),
+ level(0) {}
+
/* vars to simulate the noise generator output */
double counter;
double freq;
@@ -66,7 +66,7 @@ struct saa1099_noise
// ======================> saa1099_device
class saa1099_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -80,27 +80,27 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( saa1099_control_w );
- DECLARE_WRITE8_MEMBER( saa1099_data_w );
+ DECLARE_WRITE8_MEMBER( saa1099_control_w );
+ DECLARE_WRITE8_MEMBER( saa1099_data_w );
private:
- void saa1099_envelope(int ch);
+ void saa1099_envelope(int ch);
private:
- sound_stream *m_stream; /* our stream */
- int m_noise_params[2]; /* noise generators parameters */
- int m_env_enable[2]; /* envelope generators enable */
- int m_env_reverse_right[2]; /* envelope reversed for right channel */
- int m_env_mode[2]; /* envelope generators mode */
- int m_env_bits[2]; /* non zero = 3 bits resolution */
- int m_env_clock[2]; /* envelope clock mode (non-zero external) */
- int m_env_step[2]; /* current envelope step */
- int m_all_ch_enable; /* all channels enable */
- int m_sync_state; /* sync all channels */
- int m_selected_reg; /* selected register */
- saa1099_channel m_channels[6]; /* channels */
- saa1099_noise m_noise[2]; /* noise generators */
- double m_sample_rate;
+ sound_stream *m_stream; /* our stream */
+ int m_noise_params[2]; /* noise generators parameters */
+ int m_env_enable[2]; /* envelope generators enable */
+ int m_env_reverse_right[2]; /* envelope reversed for right channel */
+ int m_env_mode[2]; /* envelope generators mode */
+ int m_env_bits[2]; /* non zero = 3 bits resolution */
+ int m_env_clock[2]; /* envelope clock mode (non-zero external) */
+ int m_env_step[2]; /* current envelope step */
+ int m_all_ch_enable; /* all channels enable */
+ int m_sync_state; /* sync all channels */
+ int m_selected_reg; /* selected register */
+ saa1099_channel m_channels[6]; /* channels */
+ saa1099_noise m_noise[2]; /* noise generators */
+ double m_sample_rate;
};
extern const device_type SAA1099;
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index 9d8a64c97db..537199f92a1 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -1066,17 +1066,17 @@ static unsigned short SCSP_r16(scsp_state *scsp, address_space &space, unsigned
004A88: 3540 009E move.w D0, ($9e,A2)
004A8C: 4E75 rts
- 004C9A: 48E7 4000 movem.l D1, -(A7)
- 004C9E: 3010 move.w (A0), D0 ;reads from 0x100ee0/ee2
- 004CA0: 4A40 tst.w D0
- 004CA2: 6A00 0004 bpl $4ca8
- 004CA6: 4440 neg.w D0
- 004CA8: 3211 move.w (A1), D1
- 004CAA: D041 add.w D1, D0
- 004CAC: E248 lsr.w #1, D0
- 004CAE: 3280 move.w D0, (A1) ;writes to RAM buffer 0x790/0x792
- 004CB0: 4CDF 0002 movem.l (A7)+, D1
- 004CB4: 4E75 rts
+ 004C9A: 48E7 4000 movem.l D1, -(A7)
+ 004C9E: 3010 move.w (A0), D0 ;reads from 0x100ee0/ee2
+ 004CA0: 4A40 tst.w D0
+ 004CA2: 6A00 0004 bpl $4ca8
+ 004CA6: 4440 neg.w D0
+ 004CA8: 3211 move.w (A1), D1
+ 004CAA: D041 add.w D1, D0
+ 004CAC: E248 lsr.w #1, D0
+ 004CAE: 3280 move.w D0, (A1) ;writes to RAM buffer 0x790/0x792
+ 004CB0: 4CDF 0002 movem.l (A7)+, D1
+ 004CB4: 4E75 rts
*/
logerror("SCSP: Reading from unmapped register %08x\n",addr);
if(addr == 0xee0)
diff --git a/src/emu/sound/st0016.c b/src/emu/sound/st0016.c
index 68e212363a2..e7283d3a937 100644
--- a/src/emu/sound/st0016.c
+++ b/src/emu/sound/st0016.c
@@ -24,13 +24,13 @@ const device_type ST0016 = &device_creator<st0016_device>;
st0016_device::st0016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ST0016, "ST0016", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
- m_sound_ram(NULL)
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
+ m_sound_ram(NULL)
{
memset(m_vpos, 0, sizeof(int)*8);
- memset(m_frac, 0, sizeof(int)*8);
- memset(m_lponce, 0, sizeof(int)*8);
+ memset(m_frac, 0, sizeof(int)*8);
+ memset(m_lponce, 0, sizeof(int)*8);
memset(m_regs, 0, sizeof(UINT8)*0x100);
}
@@ -159,4 +159,3 @@ WRITE8_MEMBER( st0016_device::st0016_snd_w )
}
}
}
-
diff --git a/src/emu/sound/st0016.h b/src/emu/sound/st0016.h
index 322afca9ee6..3e1b1c35b8e 100644
--- a/src/emu/sound/st0016.h
+++ b/src/emu/sound/st0016.h
@@ -27,7 +27,7 @@ struct st0016_interface
// ======================> st0016_device
class st0016_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
st0016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -41,15 +41,15 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_READ8_MEMBER( st0016_snd_r );
- DECLARE_WRITE8_MEMBER( st0016_snd_w );
+ DECLARE_READ8_MEMBER( st0016_snd_r );
+ DECLARE_WRITE8_MEMBER( st0016_snd_w );
private:
sound_stream *m_stream;
UINT8 **m_sound_ram;
int m_vpos[8];
- int m_frac[8];
- int m_lponce[8];
+ int m_frac[8];
+ int m_lponce[8];
UINT8 m_regs[0x100];
};
diff --git a/src/emu/sound/tms3615.c b/src/emu/sound/tms3615.c
index f543f8a66b6..5a32a33e94d 100644
--- a/src/emu/sound/tms3615.c
+++ b/src/emu/sound/tms3615.c
@@ -21,16 +21,16 @@ const device_type TMS3615 = &device_creator<tms3615_device>;
tms3615_device::tms3615_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS3615, "TMS3615", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_channel(0),
- m_samplerate(0),
- m_basefreq(0),
- m_output8(0),
- m_output16(0),
- m_enable(0)
+ device_sound_interface(mconfig, *this),
+ m_channel(0),
+ m_samplerate(0),
+ m_basefreq(0),
+ m_output8(0),
+ m_output16(0),
+ m_enable(0)
{
- memset(m_counter8, 0, TMS3615_TONES);
- memset(m_counter16, 0, TMS3615_TONES);
+ memset(m_counter8, 0, TMS3615_TONES);
+ memset(m_counter16, 0, TMS3615_TONES);
}
@@ -105,5 +105,3 @@ void tms3615_device::enable_w(int enable)
{
m_enable = enable;
}
-
-
diff --git a/src/emu/sound/tms3615.h b/src/emu/sound/tms3615.h
index 31c4ef5574a..5fc23aaabed 100644
--- a/src/emu/sound/tms3615.h
+++ b/src/emu/sound/tms3615.h
@@ -26,7 +26,7 @@
// ======================> tms3615_device
class tms3615_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
tms3615_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -40,7 +40,7 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- void enable_w(int enable);
+ void enable_w(int enable);
private:
sound_stream *m_channel; /* returned by stream_create() */
diff --git a/src/emu/sound/tms36xx.c b/src/emu/sound/tms36xx.c
index f5d494a755f..303d627cad6 100644
--- a/src/emu/sound/tms36xx.c
+++ b/src/emu/sound/tms36xx.c
@@ -323,23 +323,23 @@ const device_type TMS36XX = &device_creator<tms36xx_device>;
tms36xx_device::tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TMS36XX, "TMS36XX", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_subtype(NULL),
- m_channel(NULL),
- m_samplerate(0),
- m_basefreq(0),
- m_octave(0),
- m_speed(0),
- m_tune_counter(0),
- m_note_counter(0),
- m_voices(0),
- m_shift(0),
- m_output(0),
- m_enable(0),
- m_tune_num(0),
- m_tune_ofs(0),
- m_tune_max(0),
- m_intf(NULL)
+ device_sound_interface(mconfig, *this),
+ m_subtype(NULL),
+ m_channel(NULL),
+ m_samplerate(0),
+ m_basefreq(0),
+ m_octave(0),
+ m_speed(0),
+ m_tune_counter(0),
+ m_note_counter(0),
+ m_voices(0),
+ m_shift(0),
+ m_output(0),
+ m_enable(0),
+ m_tune_num(0),
+ m_tune_ofs(0),
+ m_tune_max(0),
+ m_intf(NULL)
{
memset(m_vol, 0, sizeof(int)*12);
memset(m_vol_counter, 0, sizeof(int)*12);
@@ -491,7 +491,7 @@ void tms36xx_device::tms36xx_note_w(int octave, int note)
//-------------------------------------------------
// TMS3617 interface functions
//-------------------------------------------------
-
+
void tms36xx_device::tms3617_enable_w(int enable)
{
tms3617_enable(enable);
diff --git a/src/emu/sound/tms36xx.h b/src/emu/sound/tms36xx.h
index 1d3ff6a63f2..fc4c7c9bac6 100644
--- a/src/emu/sound/tms36xx.h
+++ b/src/emu/sound/tms36xx.h
@@ -36,7 +36,7 @@ struct tms36xx_interface
// ======================> tms36xx_device
class tms36xx_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -50,18 +50,18 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- // MM6221AA interface functions
- void mm6221aa_tune_w(int tune);
+ // MM6221AA interface functions
+ void mm6221aa_tune_w(int tune);
- // TMS3615/17 interface functions
- void tms36xx_note_w(int octave, int note);
+ // TMS3615/17 interface functions
+ void tms36xx_note_w(int octave, int note);
- // TMS3617 interface functions
- void tms3617_enable_w(int enable);
+ // TMS3617 interface functions
+ void tms3617_enable_w(int enable);
private:
- void tms36xx_reset_counters();
- void tms3617_enable(int enable);
+ void tms36xx_reset_counters();
+ void tms3617_enable(int enable);
private:
char *m_subtype; // subtype name MM6221AA, TMS3615 or TMS3617
diff --git a/src/emu/sound/zsg2.c b/src/emu/sound/zsg2.c
index 65f36bcff9f..1bac9113c23 100644
--- a/src/emu/sound/zsg2.c
+++ b/src/emu/sound/zsg2.c
@@ -61,12 +61,12 @@ const device_type ZSG2 = &device_creator<zsg2_device>;
zsg2_device::zsg2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ZSG2, "ZSG-2", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_alow(0),
- m_ahigh(0),
- m_bank_samples(NULL),
- m_sample_rate(0),
- m_stream(NULL)
+ device_sound_interface(mconfig, *this),
+ m_alow(0),
+ m_ahigh(0),
+ m_bank_samples(NULL),
+ m_sample_rate(0),
+ m_stream(NULL)
{
memset(m_act, 0, sizeof(UINT16)*3);
}
@@ -239,4 +239,3 @@ READ16_MEMBER( zsg2_device::zsg2_r )
return 0;
}
-
diff --git a/src/emu/sound/zsg2.h b/src/emu/sound/zsg2.h
index ccb55e1ed89..0411e762a31 100644
--- a/src/emu/sound/zsg2.h
+++ b/src/emu/sound/zsg2.h
@@ -30,11 +30,11 @@ struct zsg2_interface
// 16 registers per channel, 48 channels
struct zchan
{
- zchan()
- {
- memset(v, 0, sizeof(UINT16)*16);
- }
-
+ zchan()
+ {
+ memset(v, 0, sizeof(UINT16)*16);
+ }
+
UINT16 v[16];
};
@@ -56,22 +56,22 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_READ16_MEMBER( zsg2_r );
- DECLARE_WRITE16_MEMBER( zsg2_w );
+ DECLARE_READ16_MEMBER( zsg2_r );
+ DECLARE_WRITE16_MEMBER( zsg2_w );
public:
- void chan_w(int chan, int reg, UINT16 data);
- UINT16 chan_r(int chan, int reg);
- void check_channel(int chan);
- void keyon(int chan);
- void control_w(int reg, UINT16 data);
- UINT16 control_r(int reg);
+ void chan_w(int chan, int reg, UINT16 data);
+ UINT16 chan_r(int chan, int reg);
+ void check_channel(int chan);
+ void keyon(int chan);
+ void control_w(int reg, UINT16 data);
+ UINT16 control_r(int reg);
private:
zchan m_zc[48];
UINT16 m_act[3];
UINT16 m_alow;
- UINT16 m_ahigh;
+ UINT16 m_ahigh;
UINT8 *m_bank_samples;
int m_sample_rate;
diff --git a/src/emu/video/315_5124.c b/src/emu/video/315_5124.c
index 39d312bfd0d..a13cf4b1050 100644
--- a/src/emu/video/315_5124.c
+++ b/src/emu/video/315_5124.c
@@ -335,7 +335,7 @@ void sega315_5124_device::process_line_timer()
/* Activate flags that were pending until the end of previous line. */
check_pending_flags(m_screen->width());
-
+
/* Check if we're on the last line of a frame */
if (vpos == vpos_limit - 1)
{
@@ -542,7 +542,7 @@ READ8_MEMBER( sega315_5124_device::register_read )
check_pending_flags(m_screen->hpos());
temp = m_status;
-
+
if ( !space.debugger_access() )
{
/* Clear pending write flag */
@@ -636,7 +636,7 @@ WRITE8_MEMBER( sega315_5124_device::register_write )
set_display_settings();
if ( ( reg_num == 0 && (m_status & STATUS_HINT) ) ||
- ( reg_num == 1 && (m_status & STATUS_VINT) ) )
+ ( reg_num == 1 && (m_status & STATUS_VINT) ) )
{
// For HINT disabling through register 00:
// "Line IRQ VCount" test, of Flubba's VDPTest ROM, disables HINT to wait
@@ -650,7 +650,7 @@ WRITE8_MEMBER( sega315_5124_device::register_write )
// The following bit of code takes care of that.
//
if ( ( (m_status & STATUS_HINT) && !(m_reg[0x00] & 0x10) ) ||
- ( (m_status & STATUS_VINT) && !(m_reg[0x01] & 0x20) ) )
+ ( (m_status & STATUS_VINT) && !(m_reg[0x01] & 0x20) ) )
{
if (m_irq_state == 1)
{
diff --git a/src/emu/video/ef9340_1.h b/src/emu/video/ef9340_1.h
index aab26d8391f..e6dee063a84 100644
--- a/src/emu/video/ef9340_1.h
+++ b/src/emu/video/ef9340_1.h
@@ -70,7 +70,7 @@ protected:
UINT8 Y0;
UINT8 R;
UINT8 M;
- int max_vpos;
+ int max_vpos;
} m_ef9340;
UINT8 m_ef934x_ram_a[1024];
UINT8 m_ef934x_ram_b[1024];
diff --git a/src/emu/video/hd66421.c b/src/emu/video/hd66421.c
index c3d81390c95..93b2856235d 100644
--- a/src/emu/video/hd66421.c
+++ b/src/emu/video/hd66421.c
@@ -251,6 +251,6 @@ UINT32 hd66421_device::update_screen(screen_device &screen, bitmap_ind16 &bitmap
rectangle rect(0, HD66421_WIDTH - 1, 0, HD66421_HEIGHT - 1);
bitmap.fill(get_white_pen(machine()), rect);
}
-
+
return 0;
}
diff --git a/src/emu/video/mc6847.c b/src/emu/video/mc6847.c
index d5471d5f00f..e1e16559fb1 100644
--- a/src/emu/video/mc6847.c
+++ b/src/emu/video/mc6847.c
@@ -65,8 +65,8 @@
if skew existed. SockMaster has confirmed that scanlines are in
fact 228 clock cycles.
- The PAL emulation is little more than having more scanlines; surely
- there are details that we are missing here.
+ The PAL emulation is little more than having more scanlines; surely
+ there are details that we are missing here.
**********************************************************************/
diff --git a/src/emu/video/stvvdp1.c b/src/emu/video/stvvdp1.c
index 4badc5408f9..2fc000a13ba 100644
--- a/src/emu/video/stvvdp1.c
+++ b/src/emu/video/stvvdp1.c
@@ -190,7 +190,7 @@ void saturn_state::stv_clear_framebuffer( int which_framebuffer )
start_y = STV_VDP1_EWLR_Y1 * (m_vdp1.framebuffer_double_interlace+1);
end_x = STV_VDP1_EWRR_X3 * ((STV_VDP1_TVM & 1) ? 16 : 8);
end_y = (STV_VDP1_EWRR_Y3+1) * (m_vdp1.framebuffer_double_interlace+1);
-// popmessage("%d %d %d %d %d",STV_VDP1_EWLR_X1,STV_VDP1_EWLR_Y1,STV_VDP1_EWRR_X3,STV_VDP1_EWRR_Y3,m_vdp1.framebuffer_double_interlace);
+// popmessage("%d %d %d %d %d",STV_VDP1_EWLR_X1,STV_VDP1_EWLR_Y1,STV_VDP1_EWRR_X3,STV_VDP1_EWRR_Y3,m_vdp1.framebuffer_double_interlace);
if(STV_VDP1_TVM & 1)
{
@@ -206,7 +206,7 @@ void saturn_state::stv_clear_framebuffer( int which_framebuffer )
}
if ( VDP1_LOG ) logerror( "Clearing %d framebuffer\n", m_vdp1.framebuffer_current_draw );
-// memset( m_vdp1.framebuffer[ which_framebuffer ], m_vdp1.ewdr, 1024 * 256 * sizeof(UINT16) * 2 );
+// memset( m_vdp1.framebuffer[ which_framebuffer ], m_vdp1.ewdr, 1024 * 256 * sizeof(UINT16) * 2 );
}
diff --git a/src/emu/video/stvvdp2.c b/src/emu/video/stvvdp2.c
index ec9aadda1dd..a3f09e64c7c 100644
--- a/src/emu/video/stvvdp2.c
+++ b/src/emu/video/stvvdp2.c
@@ -2577,7 +2577,7 @@ void saturn_state::stv_vdp2_drawgfxzoom_rgb555(
gfxdata = m_vdp2.gfx_decode + code * 0x20;
if(stv2_current_tilemap.window_control.enabled[0] ||
- stv2_current_tilemap.window_control.enabled[1])
+ stv2_current_tilemap.window_control.enabled[1])
popmessage("Window Enabled for RGB555 Zoom");
if (!scalex || !scaley) return;
@@ -2804,8 +2804,8 @@ void saturn_state::stv_vdp2_drawgfx_rgb555( bitmap_rgb32 &dest_bmp, const rectan
sprite_screen_width = sprite_screen_height = 8;
if(stv2_current_tilemap.window_control.enabled[0] ||
- stv2_current_tilemap.window_control.enabled[1])
- popmessage("Window Enabled for RGB555 tiles");
+ stv2_current_tilemap.window_control.enabled[1])
+ popmessage("Window Enabled for RGB555 tiles");
/* KW 991012 -- Added code to force clip to bitmap boundary */
myclip = clip;
@@ -2918,8 +2918,8 @@ void saturn_state::stv_vdp2_drawgfx_rgb888( bitmap_rgb32 &dest_bmp, const rectan
sprite_screen_width = sprite_screen_height = 8;
if(stv2_current_tilemap.window_control.enabled[0] ||
- stv2_current_tilemap.window_control.enabled[1])
- popmessage("Window Enabled for RGB888 tiles");
+ stv2_current_tilemap.window_control.enabled[1])
+ popmessage("Window Enabled for RGB888 tiles");
/* KW 991012 -- Added code to force clip to bitmap boundary */
myclip = clip;
@@ -3053,7 +3053,7 @@ void saturn_state::stv_vdp2_drawgfx_alpha(bitmap_rgb32 &dest_bmp,const rectangle
/* clip top */
if (sy < clip.min_y)
- { int pixels = clip.min_y-sy;
+ { int pixels = clip.min_y-sy;
sy += pixels;
y_index += yinc*pixels;
}
@@ -3130,7 +3130,7 @@ void saturn_state::stv_vdp2_drawgfx_transpen(bitmap_rgb32 &dest_bmp,const rectan
/* clip top */
if (sy < clip.min_y)
- { int pixels = clip.min_y-sy;
+ { int pixels = clip.min_y-sy;
sy += pixels;
y_index += yinc*pixels;
}
@@ -3492,7 +3492,7 @@ void saturn_state::stv_vdp2_draw_basic_bitmap(bitmap_rgb32 &bitmap, const rectan
{
// case 0: draw_4bpp_bitmap(bitmap,cliprect); return;
case 1: draw_8bpp_bitmap(bitmap,cliprect); return;
- // case 2: draw_11bpp_bitmap(bitmap, cliprect); return;
+ // case 2: draw_11bpp_bitmap(bitmap, cliprect); return;
case 3: draw_rgb15_bitmap(bitmap,cliprect); return;
case 4: draw_rgb32_bitmap(bitmap,cliprect); return;
}
@@ -4474,8 +4474,8 @@ void saturn_state::stv_vdp2_check_tilemap(bitmap_rgb32 &bitmap, const rectangle
/* Ide Yousuke Meijin No Shin Jissen Mahjong 0x0303 */
/* Decathlete 0x088 */
/* Sexy Parodius 0x2300 */
-// if(STV_VDP2_WCTLD & 0x2000)
-// popmessage("Special window enabled %04x, contact MAMEdev",STV_VDP2_WCTLD);
+// if(STV_VDP2_WCTLD & 0x2000)
+// popmessage("Special window enabled %04x, contact MAMEdev",STV_VDP2_WCTLD);
/* Shining Force III, After Burner 2 (doesn't make a proper use tho?) */
/* Layer Section */
@@ -4963,10 +4963,10 @@ void saturn_state::stv_vdp2_draw_NBG0(bitmap_rgb32 &bitmap, const rectangle &cli
stv2_current_tilemap.window_control.logic = STV_VDP2_N0LOG;
stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_N0W0E;
stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_N0W1E;
-// stv2_current_tilemap.window_control.? = STV_VDP2_N0SWE;
+// stv2_current_tilemap.window_control.? = STV_VDP2_N0SWE;
stv2_current_tilemap.window_control.area[0] = STV_VDP2_N0W0A;
stv2_current_tilemap.window_control.area[1] = STV_VDP2_N0W1A;
-// stv2_current_tilemap.window_control.? = STV_VDP2_N0SWA;
+// stv2_current_tilemap.window_control.? = STV_VDP2_N0SWA;
stv2_current_tilemap.line_screen_enabled = STV_VDP2_N0LCEN;
stv2_current_tilemap.mosaic_screen_enabled = STV_VDP2_N0MZE;
@@ -5063,10 +5063,10 @@ void saturn_state::stv_vdp2_draw_NBG1(bitmap_rgb32 &bitmap, const rectangle &cli
stv2_current_tilemap.window_control.logic = STV_VDP2_N1LOG;
stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_N1W0E;
stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_N1W1E;
-// stv2_current_tilemap.window_control.? = STV_VDP2_N1SWE;
+// stv2_current_tilemap.window_control.? = STV_VDP2_N1SWE;
stv2_current_tilemap.window_control.area[0] = STV_VDP2_N1W0A;
stv2_current_tilemap.window_control.area[1] = STV_VDP2_N1W1A;
-// stv2_current_tilemap.window_control.? = STV_VDP2_N1SWA;
+// stv2_current_tilemap.window_control.? = STV_VDP2_N1SWA;
stv2_current_tilemap.line_screen_enabled = STV_VDP2_N1LCEN;
stv2_current_tilemap.mosaic_screen_enabled = STV_VDP2_N1MZE;
@@ -5164,10 +5164,10 @@ void saturn_state::stv_vdp2_draw_NBG2(bitmap_rgb32 &bitmap, const rectangle &cli
stv2_current_tilemap.window_control.logic = STV_VDP2_N2LOG;
stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_N2W0E;
stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_N2W1E;
-// stv2_current_tilemap.window_control.? = STV_VDP2_N2SWE;
+// stv2_current_tilemap.window_control.? = STV_VDP2_N2SWE;
stv2_current_tilemap.window_control.area[0] = STV_VDP2_N2W0A;
stv2_current_tilemap.window_control.area[1] = STV_VDP2_N2W1A;
-// stv2_current_tilemap.window_control.? = STV_VDP2_N2SWA;
+// stv2_current_tilemap.window_control.? = STV_VDP2_N2SWA;
stv2_current_tilemap.line_screen_enabled = STV_VDP2_N2LCEN;
stv2_current_tilemap.mosaic_screen_enabled = STV_VDP2_N2MZE;
@@ -5267,10 +5267,10 @@ void saturn_state::stv_vdp2_draw_NBG3(bitmap_rgb32 &bitmap, const rectangle &cli
stv2_current_tilemap.window_control.logic = STV_VDP2_N3LOG;
stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_N3W0E;
stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_N3W1E;
-// stv2_current_tilemap.window_control.? = STV_VDP2_N3SWE;
+// stv2_current_tilemap.window_control.? = STV_VDP2_N3SWE;
stv2_current_tilemap.window_control.area[0] = STV_VDP2_N3W0A;
stv2_current_tilemap.window_control.area[1] = STV_VDP2_N3W1A;
-// stv2_current_tilemap.window_control.? = STV_VDP2_N3SWA;
+// stv2_current_tilemap.window_control.? = STV_VDP2_N3SWA;
stv2_current_tilemap.line_screen_enabled = STV_VDP2_N3LCEN;
stv2_current_tilemap.mosaic_screen_enabled = STV_VDP2_N3MZE;
@@ -5419,8 +5419,8 @@ void saturn_state::stv_vdp2_draw_rotation_screen(bitmap_rgb32 &bitmap, const rec
colour_calculation_enabled = stv2_current_tilemap.colour_calculation_enabled;
stv2_current_tilemap.colour_calculation_enabled = 0;
-// window_control = stv2_current_tilemap.window_control;
-// stv2_current_tilemap.window_control = 0;
+// window_control = stv2_current_tilemap.window_control;
+// stv2_current_tilemap.window_control = 0;
fade_control = stv2_current_tilemap.fade_control;
stv2_current_tilemap.fade_control = 0;
g_profiler.start(PROFILER_USER1);
@@ -5528,10 +5528,10 @@ void saturn_state::stv_vdp2_draw_RBG0(bitmap_rgb32 &bitmap, const rectangle &cli
stv2_current_tilemap.window_control.logic = STV_VDP2_R0LOG;
stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_R0W0E;
stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_R0W1E;
-// stv2_current_tilemap.window_control.? = STV_VDP2_R0SWE;
+// stv2_current_tilemap.window_control.? = STV_VDP2_R0SWE;
stv2_current_tilemap.window_control.area[0] = STV_VDP2_R0W0A;
stv2_current_tilemap.window_control.area[1] = STV_VDP2_R0W1A;
-// stv2_current_tilemap.window_control.? = STV_VDP2_R0SWA;
+// stv2_current_tilemap.window_control.? = STV_VDP2_R0SWA;
stv2_current_tilemap.scrollx = 0;
stv2_current_tilemap.scrolly = 0;
@@ -6325,7 +6325,7 @@ int saturn_state::stv_vdp2_window_process(int x,int y)
int w0_pix, w1_pix;
if (stv2_current_tilemap.window_control.enabled[0] == 0 &&
- stv2_current_tilemap.window_control.enabled[1] == 0)
+ stv2_current_tilemap.window_control.enabled[1] == 0)
return 1;
stv_vdp2_get_window0_coordinates(&s_x, &e_x, &s_y, &e_y);
@@ -6479,12 +6479,12 @@ void saturn_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect,
stv2_current_tilemap.window_control.logic = STV_VDP2_SPLOG;
stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_SPW0E;
stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_SPW1E;
-// stv2_current_tilemap.window_control.? = STV_VDP2_SPSWE;
+// stv2_current_tilemap.window_control.? = STV_VDP2_SPSWE;
stv2_current_tilemap.window_control.area[0] = STV_VDP2_SPW0A;
stv2_current_tilemap.window_control.area[1] = STV_VDP2_SPW1A;
-// stv2_current_tilemap.window_control.? = STV_VDP2_SPSWA;
+// stv2_current_tilemap.window_control.? = STV_VDP2_SPSWA;
-// stv_vdp2_apply_window_on_layer(mycliprect);
+// stv_vdp2_apply_window_on_layer(mycliprect);
if (interlace_framebuffer == 0 && double_x == 0 )
{
diff --git a/src/mame/audio/cps3.c b/src/mame/audio/cps3.c
index 4fe7d29f546..42d07819bb8 100644
--- a/src/mame/audio/cps3.c
+++ b/src/mame/audio/cps3.c
@@ -21,10 +21,10 @@ const device_type CPS3 = &device_creator<cps3_sound_device>;
cps3_sound_device::cps3_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CPS3, "CPS3 Custom", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_stream(NULL),
- m_key(0),
- m_base(NULL)
+ device_sound_interface(mconfig, *this),
+ m_stream(NULL),
+ m_key(0),
+ m_base(NULL)
{
}
diff --git a/src/mame/audio/gomoku.c b/src/mame/audio/gomoku.c
index 077fa78e470..b0f01144395 100644
--- a/src/mame/audio/gomoku.c
+++ b/src/mame/audio/gomoku.c
@@ -27,16 +27,16 @@ const device_type GOMOKU = &device_creator<gomoku_sound_device>;
gomoku_sound_device::gomoku_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GOMOKU, "Gomoku Custom", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_last_channel(NULL),
- m_sound_rom(NULL),
- m_num_voices(0),
- m_sound_enable(0),
- m_stream(NULL),
- m_mixer_table(NULL),
- m_mixer_lookup(NULL),
- m_mixer_buffer(NULL),
- m_mixer_buffer_2(NULL)
+ device_sound_interface(mconfig, *this),
+ m_last_channel(NULL),
+ m_sound_rom(NULL),
+ m_num_voices(0),
+ m_sound_enable(0),
+ m_stream(NULL),
+ m_mixer_table(NULL),
+ m_mixer_lookup(NULL),
+ m_mixer_buffer(NULL),
+ m_mixer_buffer_2(NULL)
{
memset(m_channel_list, 0, sizeof(gomoku_sound_channel)*GOMOKU_MAX_VOICES);
memset(m_soundregs1, 0, sizeof(UINT8)*0x20);
@@ -206,7 +206,7 @@ WRITE8_MEMBER( gomoku_sound_device::sound1_w )
m_stream->update();
/* set the register */
- m_soundregs1[offset] = data;
+ m_soundregs1[offset] = data;
/* recompute all the voice parameters */
for (ch = 0, base = 0, voice = m_channel_list; voice < m_channel_list + 3; ch++, voice++, base += 8)
@@ -258,4 +258,3 @@ WRITE8_MEMBER( gomoku_sound_device::sound2_w )
voice->oneshotplaying = 0;
}
}
-
diff --git a/src/mame/audio/gridlee.c b/src/mame/audio/gridlee.c
index 1f1f0a8b6ab..2cfb0b634cf 100644
--- a/src/mame/audio/gridlee.c
+++ b/src/mame/audio/gridlee.c
@@ -22,15 +22,15 @@ const device_type GRIDLEE = &device_creator<gridlee_sound_device>;
gridlee_sound_device::gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, GRIDLEE, "Gridlee Custom", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_tone_step(0),
- m_tone_fraction(0),
- m_tone_volume(0),
- m_stream(NULL),
- m_samples(NULL),
- m_freq_to_step(0.0)
+ device_sound_interface(mconfig, *this),
+ m_tone_step(0),
+ m_tone_fraction(0),
+ m_tone_volume(0),
+ m_stream(NULL),
+ m_samples(NULL),
+ m_freq_to_step(0.0)
{
- memset(m_sound_data, 0, sizeof(UINT8)*24);
+ memset(m_sound_data, 0, sizeof(UINT8)*24);
}
diff --git a/src/mame/audio/polepos.c b/src/mame/audio/polepos.c
index cadc57bbe06..182519657b3 100644
--- a/src/mame/audio/polepos.c
+++ b/src/mame/audio/polepos.c
@@ -51,12 +51,12 @@ const device_type POLEPOS = &device_creator<polepos_sound_device>;
polepos_sound_device::polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, POLEPOS, "Pole Position Custom", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_current_position(0),
- m_sample_msb(0),
- m_sample_lsb(0),
- m_sample_enable(0),
- m_stream(NULL)
+ device_sound_interface(mconfig, *this),
+ m_current_position(0),
+ m_sample_msb(0),
+ m_sample_lsb(0),
+ m_sample_enable(0),
+ m_stream(NULL)
{
}
@@ -187,7 +187,7 @@ WRITE8_MEMBER( polepos_sound_device::polepos_engine_sound_msb_w )
static const discrete_dac_r1_ladder polepos_54xx_dac =
{
4, /* number of DAC bits */
- /* 54XX_0 54XX_1 54XX_2 */
+ /* 54XX_0 54XX_1 54XX_2 */
{ RES_K(47), /* R124, R136, R152 */
RES_K(22), /* R120, R132, R142 */
RES_K(10), /* R119, R131, R138 */
@@ -357,5 +357,3 @@ DISCRETE_SOUND_START(polepos)
DISCRETE_OUTPUT(POLEPOS_CHANL3_SND, 32767/2)
DISCRETE_OUTPUT(POLEPOS_CHANL4_SND, 32767/2)
DISCRETE_SOUND_END
-
-
diff --git a/src/mame/audio/redbaron.c b/src/mame/audio/redbaron.c
index 1a7bbe677f0..e93d2819972 100644
--- a/src/mame/audio/redbaron.c
+++ b/src/mame/audio/redbaron.c
@@ -35,23 +35,23 @@ const device_type REDBARON = &device_creator<redbaron_sound_device>;
redbaron_sound_device::redbaron_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, REDBARON, "Red Baron Custom", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_vol_lookup(NULL),
- m_channel(NULL),
- m_latch(0),
- m_poly_counter(0),
- m_poly_shift(0),
- m_filter_counter(0),
- m_crash_amp(0),
- m_shot_amp(0),
- m_shot_amp_counter(0),
- m_squeal_amp(0),
- m_squeal_amp_counter(0),
- m_squeal_off_counter(0),
- m_squeal_on_counter(0),
- m_squeal_out(0)
+ device_sound_interface(mconfig, *this),
+ m_vol_lookup(NULL),
+ m_channel(NULL),
+ m_latch(0),
+ m_poly_counter(0),
+ m_poly_shift(0),
+ m_filter_counter(0),
+ m_crash_amp(0),
+ m_shot_amp(0),
+ m_shot_amp_counter(0),
+ m_squeal_amp(0),
+ m_squeal_amp_counter(0),
+ m_squeal_off_counter(0),
+ m_squeal_on_counter(0),
+ m_squeal_out(0)
{
- memset(m_vol_crash, 0, sizeof(INT16)*16);
+ memset(m_vol_crash, 0, sizeof(INT16)*16);
}
diff --git a/src/mame/audio/taitosnd.c b/src/mame/audio/taitosnd.c
index 429f2f93b6f..9304b080800 100644
--- a/src/mame/audio/taitosnd.c
+++ b/src/mame/audio/taitosnd.c
@@ -30,13 +30,13 @@ const device_type TC0140SYT = &device_creator<tc0140syt_device>;
tc0140syt_device::tc0140syt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TC0140SYT, "Taito TC0140SYT", tag, owner, clock),
- m_mainmode(0),
- m_submode(0),
- m_status(0),
- m_nmi_enabled(0),
- m_nmi_req(0),
- m_mastercpu(NULL),
- m_slavecpu(NULL)
+ m_mainmode(0),
+ m_submode(0),
+ m_status(0),
+ m_nmi_enabled(0),
+ m_nmi_req(0),
+ m_mastercpu(NULL),
+ m_slavecpu(NULL)
{
memset(m_slavedata, 0, sizeof(UINT8)*4);
memset(m_masterdata, 0, sizeof(UINT8)*4);
@@ -307,5 +307,3 @@ READ8_MEMBER( tc0140syt_device::tc0140syt_slave_comm_r )
return res;
}
-
-
diff --git a/src/mame/audio/taitosnd.h b/src/mame/audio/taitosnd.h
index 9c2ca4a0bb8..c3c28444f77 100644
--- a/src/mame/audio/taitosnd.h
+++ b/src/mame/audio/taitosnd.h
@@ -37,18 +37,18 @@ protected:
virtual void device_reset();
public:
- // MASTER (8bit bus) control functions
- DECLARE_WRITE8_MEMBER( tc0140syt_port_w );
- DECLARE_WRITE8_MEMBER( tc0140syt_comm_w );
- DECLARE_READ8_MEMBER( tc0140syt_comm_r );
+ // MASTER (8bit bus) control functions
+ DECLARE_WRITE8_MEMBER( tc0140syt_port_w );
+ DECLARE_WRITE8_MEMBER( tc0140syt_comm_w );
+ DECLARE_READ8_MEMBER( tc0140syt_comm_r );
- // SLAVE (8bit bus) control functions ONLY
- DECLARE_WRITE8_MEMBER( tc0140syt_slave_port_w );
- DECLARE_READ8_MEMBER( tc0140syt_slave_comm_r );
- DECLARE_WRITE8_MEMBER( tc0140syt_slave_comm_w );
+ // SLAVE (8bit bus) control functions ONLY
+ DECLARE_WRITE8_MEMBER( tc0140syt_slave_port_w );
+ DECLARE_READ8_MEMBER( tc0140syt_slave_comm_r );
+ DECLARE_WRITE8_MEMBER( tc0140syt_slave_comm_w );
private:
- void interrupt_controller();
+ void interrupt_controller();
private:
UINT8 m_slavedata[4]; /* Data on master->slave port (4 nibbles) */
diff --git a/src/mame/audio/tiamc1.c b/src/mame/audio/tiamc1.c
index 051e8d660c7..d6cfec7cee4 100644
--- a/src/mame/audio/tiamc1.c
+++ b/src/mame/audio/tiamc1.c
@@ -57,9 +57,9 @@ const device_type TIAMC1 = &device_creator<tiamc1_sound_device>;
tiamc1_sound_device::tiamc1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TIAMC1, "TIA-MC1 Custom", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_channel(NULL),
- m_timer1_divider(0)
+ device_sound_interface(mconfig, *this),
+ m_channel(NULL),
+ m_timer1_divider(0)
{
}
@@ -80,11 +80,11 @@ void tiamc1_sound_device::device_start()
m_timer1_divider = 0;
for (i = 0; i < 2; i++)
- {
+ {
struct timer8253struct *t = (i ? &m_timer1 : &m_timer0);
for (j = 0; j < 3; j++)
- {
+ {
state_save_register_item(machine(), "channel", NULL, i * 3 + j, t->channel[j].count);
state_save_register_item(machine(), "channel", NULL, i * 3 + j, t->channel[j].cnval);
state_save_register_item(machine(), "channel", NULL, i * 3 + j, t->channel[j].bcdMode);
@@ -112,10 +112,10 @@ void tiamc1_sound_device::sound_stream_update(sound_stream &stream, stream_sampl
len = samples * CLOCK_DIVIDER;
for (count = 0; count < len; count++)
- {
+ {
m_timer1_divider++;
if (m_timer1_divider == 228)
- {
+ {
m_timer1_divider = 0;
timer8253_tick(&m_timer1, 0);
timer8253_tick(&m_timer1, 1);
@@ -137,7 +137,7 @@ void tiamc1_sound_device::sound_stream_update(sound_stream &stream, stream_sampl
orval = (orval << 1) | (((o0 | o1) ^ 0xff) & o2);
if ((count + 1) % CLOCK_DIVIDER == 0)
- {
+ {
outputs[0][count / CLOCK_DIVIDER] = orval ? 0x2828 : 0;
orval = 0;
}
@@ -147,16 +147,16 @@ void tiamc1_sound_device::sound_stream_update(sound_stream &stream, stream_sampl
void tiamc1_sound_device::timer8253_reset(struct timer8253struct *t)
{
- memset(t,0,sizeof(struct timer8253struct));
+ memset(t,0,sizeof(struct timer8253struct));
}
void tiamc1_sound_device::timer8253_tick(struct timer8253struct *t, int chn)
{
- if (t->channel[chn].enable && t->channel[chn].gate)
- {
- switch (t->channel[chn].cntMode)
- {
+ if (t->channel[chn].enable && t->channel[chn].gate)
+ {
+ switch (t->channel[chn].cntMode)
+ {
case 0:
t->channel[chn].count--;
if (t->channel[chn].count == 0xffff)
@@ -181,7 +181,7 @@ void tiamc1_sound_device::timer8253_tick(struct timer8253struct *t, int chn)
t->channel[chn].output = 1;
if(t->channel[chn].count == 0xffff)
- {
+ {
t->channel[chn].enable = 0;
t->channel[chn].output = 1;
}
@@ -196,18 +196,18 @@ void tiamc1_sound_device::timer8253_wr(struct timer8253struct *t, int reg, UINT8
{
int chn;
- switch (reg)
- {
+ switch (reg)
+ {
case T8253_CWORD:
chn = val >> 6;
- if (chn < 3)
- {
+ if (chn < 3)
+ {
t->channel[chn].bcdMode = (val & 1) ? 1 : 0;
t->channel[chn].cntMode = (val >> 1) & 0x07;
t->channel[chn].valMode = (val >> 4) & 0x03;
switch (t->channel[chn].valMode)
- {
+ {
case 1:
case 2:
t->channel[chn].loadCnt = 1;
@@ -222,7 +222,7 @@ void tiamc1_sound_device::timer8253_wr(struct timer8253struct *t, int reg, UINT8
}
switch (t->channel[chn].cntMode)
- {
+ {
case 0:
t->channel[chn].output = 0;
t->channel[chn].enable = 0;
@@ -247,7 +247,7 @@ void tiamc1_sound_device::timer8253_wr(struct timer8253struct *t, int reg, UINT8
chn = reg;
switch (t->channel[chn].valMode)
- {
+ {
case 1:
t->channel[chn].cnval = (t->channel[chn].cnval & 0xff00) | val;
break;
@@ -262,16 +262,16 @@ void tiamc1_sound_device::timer8253_wr(struct timer8253struct *t, int reg, UINT8
}
if (t->channel[chn].cntMode==0)
- {
+ {
t->channel[chn].enable = 0;
}
t->channel[chn].loadCnt--;
if (t->channel[chn].loadCnt == 0)
- {
+ {
switch (t->channel[chn].valMode)
- {
+ {
case 1:
case 2:
t->channel[chn].loadCnt = 1;
@@ -286,7 +286,7 @@ void tiamc1_sound_device::timer8253_wr(struct timer8253struct *t, int reg, UINT8
}
switch (t->channel[chn].cntMode)
- {
+ {
case 3:
t->channel[chn].count = t->channel[chn].cnval;
t->channel[chn].enable = 1;
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index 084273a657b..f3a731deffc 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -445,7 +445,7 @@ most methods set parameters, others actually draw
class nv2a_renderer : public poly_manager<float, nvidia_object_data, 12, 6000>
{
public:
- nv2a_renderer(running_machine &machine) : poly_manager<float, nvidia_object_data, 12, 6000>(machine)
+ nv2a_renderer(running_machine &machine) : poly_manager<float, nvidia_object_data, 12, 6000>(machine)
{
memset(channel,0,sizeof(channel));
memset(pfifo,0,sizeof(pfifo));
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index 2e997aa77bb..9e53d5ddde4 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -156,7 +156,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(chinagat_state::chinagat_scanline)
}
WRITE8_MEMBER(chinagat_state::chinagat_interrupt_w )
-{
+{
switch (offset)
{
case 0: /* 3e00 - SND irq */
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index 9a61214403f..42718b4ae31 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -5,16 +5,16 @@
Driver by David Haywood, Angelo Salese and Tomasz Slanina
special thanks to Guru for references and HW advices
- This system is interesting in that it makes use of an RLE compression scheme, which
- is not something common for Sega hardware, there is a patent for it ( 6,141,122 )
- http://www.google.com/patents/US6141122
+ This system is interesting in that it makes use of an RLE compression scheme, which
+ is not something common for Sega hardware, there is a patent for it ( 6,141,122 )
+ http://www.google.com/patents/US6141122
TODO:
- - Understand what the 0x400000c reads on SH-2 really do.
- - Remove SH-2 watchdog hack, if we ever bother about it ...
- - improve sound emulation
+ - Understand what the 0x400000c reads on SH-2 really do.
+ - Remove SH-2 watchdog hack, if we ever bother about it ...
+ - improve sound emulation
- i8237 purpose is unknown (missing ROM for comms?).
- - verify zooming etc. our current algorithm is a bit ugly for text
+ - verify zooming etc. our current algorithm is a bit ugly for text
=======================================================================================================
@@ -562,14 +562,14 @@ void coolridr_state::video_start()
}
/*
- vregs are setted up with one of DMA commands (see below)
- 0x3e09b80 screen 1 base, 0x3e9bc0 screen 2 base
- [+0x1c] ---- ---- ---- ---- ---- ---- ---- -xxx tile offset start * 0x8000
- [+0x2c] ---- -xxx xxxx xxxx ---- --yy yyyy yyyy scrolling registers
- [+0x34] 1111 1111 2222 2222 3333 3333 4444 4444 - Almost surely Sega "map" registers
- [+0x38] 5555 5555 6666 6666 7777 7777 8888 8888 /
- [+0x3c] x--- ---- ---- ---- xxxx xxxx xxxx xxxx 0x11b8 on bike select, 0xffffffff otherwise, transparent pen value?
- (everything else is unknown at current time)
+ vregs are setted up with one of DMA commands (see below)
+ 0x3e09b80 screen 1 base, 0x3e9bc0 screen 2 base
+ [+0x1c] ---- ---- ---- ---- ---- ---- ---- -xxx tile offset start * 0x8000
+ [+0x2c] ---- -xxx xxxx xxxx ---- --yy yyyy yyyy scrolling registers
+ [+0x34] 1111 1111 2222 2222 3333 3333 4444 4444 - Almost surely Sega "map" registers
+ [+0x38] 5555 5555 6666 6666 7777 7777 8888 8888 /
+ [+0x3c] x--- ---- ---- ---- xxxx xxxx xxxx xxxx 0x11b8 on bike select, 0xffffffff otherwise, transparent pen value?
+ (everything else is unknown at current time)
*/
#define COOLRIDERS_DRAWGFX_CORE(PIXEL_TYPE, COOL_PIXEL_OP) \
@@ -762,7 +762,7 @@ void coolridr_state::coolriders_drawgfx_transpen(bitmap_ind16 &dest, const recta
}
// render
- const pen_t *paldata = &m_tilepals[gfx->colorbase() + gfx->granularity() * (color % gfx->colors())] ;
+ const pen_t *paldata = &m_tilepals[gfx->colorbase() + gfx->granularity() * (color % gfx->colors())] ;
COOLRIDERS_DRAWGFX_CORE(UINT16, COOLRIDERS_PIXEL_OP_REMAP_TRANSPEN);
}
@@ -812,10 +812,10 @@ void coolridr_state::draw_bg_coolridr(bitmap_ind16 &bitmap, const rectangle &cli
UINT16 basey = scrolly>>4;
for (int y=0;y<25;y++)
- {
+ {
UINT16 basex = scrollx>>4;
for (int x=0;x<32;x++)
- {
+ {
vram_data = (m_h1_vram[(basex&0x7f)+((basey&0x3f)*0x80)+base_offset] & 0xffff);
color = m_color_bank + ((vram_data & 0x800) >> 11) * 4;
/* bike select enables bits 15-12, pretty sure one of these is tile bank (because there's a solid pen on 0x3ff / 0x7ff). */
@@ -951,15 +951,15 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
{ \
blankcount = 256;\
lastSpriteNumber = spriteNumber; \
- \
+ \
int i = 1;/* skip first 10 bits for now */ \
int data_written = 0; \
- \
+ \
while (data_written<256) \
{ \
- \
+ \
const UINT16 compdata = expanded_10bit_gfx[ (b3romoffset) + spriteNumber + i]; \
- \
+ \
if (((compdata & 0x300) == 0x000) || ((compdata & 0x300) == 0x100)) /* 3bpp */ \
{ \
/* mm ccrr rrr0 */ \
@@ -968,7 +968,7 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
/* guess, blank tiles have the following form */ \
/* 00120 (00000024,0) | 010 03f */ \
if (compdata&1) encodelength = 255; \
- \
+ \
while (data_written<256 && encodelength >=0) \
{ \
tempshape[data_written^writeaddrxor] = rledata; \
@@ -980,7 +980,7 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
else if ((compdata & 0x300) == 0x200) /* 6bpp */ \
{ \
/* mm cccc ccrr */ \
- int encodelength = (compdata & 0x003); \
+ int encodelength = (compdata & 0x003); \
const UINT16 rledata = rearranged_16bit_gfx[color_offs + ((compdata & 0x0fc) >> 2) + 8]; \
while (data_written<256 && encodelength >=0) \
{ \
@@ -1001,7 +1001,7 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
if (tempshape[data_written^writeaddrxor]==0x8000) blankcount--; \
data_written++; \
} \
- \
+ \
i++; \
} \
if (!indirect_tile_enable && size < DECODECACHE_NUMSPRITETILES) \
@@ -1031,7 +1031,7 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
} \
} \
else \
- { if (used_flipx) \
+ { if (used_flipx) \
{ \
RLE_BLOCK(0x0f) \
} \
@@ -1221,10 +1221,10 @@ UINT32 coolridr_state::screen_update_coolridr2(screen_device &screen, bitmap_ind
/* the two tables that the patent claims are located at:
- 0x1ec800
- 0x1f0000
- 0x3ec800
- 0x3f0000
+ 0x1ec800
+ 0x1f0000
+ 0x3ec800
+ 0x3f0000
of each rom ... ROM 1 + 2 gives the full palette data for each pixel, in even/odd order.
TODO: fix anything that isn't text.
*/
@@ -1259,15 +1259,15 @@ TODO: fix anything that isn't text.
} \
else \
{ \
- UINT16 source = line[drawx]; \
- int src_r = ((source>>10)&0x1f) * blit4blendlevelinv; \
- int src_g = ((source>>5)&0x1f) * blit4blendlevelinv; \
- int src_b = ((source>>0)&0x1f) * blit4blendlevelinv; \
- int dest_r = ((pix>>10)&0x1f) * blit4blendlevel; \
- int dest_g = ((pix>>5)&0x1f) * blit4blendlevel; \
- int dest_b = ((pix>>0)&0x1f) * blit4blendlevel; \
- line[drawx] = (((src_r+dest_r)>>3)<<10) | (((src_g+dest_g)>>3)<<5) | (((src_b+dest_b)>>3)<<0); \
- /* zline[drawx] = object->zpri; */ \
+ UINT16 source = line[drawx]; \
+ int src_r = ((source>>10)&0x1f) * blit4blendlevelinv; \
+ int src_g = ((source>>5)&0x1f) * blit4blendlevelinv; \
+ int src_b = ((source>>0)&0x1f) * blit4blendlevelinv; \
+ int dest_r = ((pix>>10)&0x1f) * blit4blendlevel; \
+ int dest_g = ((pix>>5)&0x1f) * blit4blendlevel; \
+ int dest_b = ((pix>>0)&0x1f) * blit4blendlevel; \
+ line[drawx] = (((src_r+dest_r)>>3)<<10) | (((src_g+dest_g)>>3)<<5) | (((src_b+dest_b)>>3)<<0); \
+ /* zline[drawx] = object->zpri; */ \
} \
} \
} \
@@ -1279,10 +1279,10 @@ TODO: fix anything that isn't text.
//object->expanded_10bit_gfx
#define GET_PIX_ROTATED \
- UINT16 pix = tempshape[realx*16+realy]; \
+ UINT16 pix = tempshape[realx*16+realy]; \
#define GET_PIX_NORMAL \
- UINT16 pix = tempshape[realy*16+realx]; \
+ UINT16 pix = tempshape[realy*16+realx]; \
void *coolridr_state::draw_object_threaded(void *param, int threadid)
@@ -1333,7 +1333,7 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
if (b1mode)
{
- // b1colorNumber = object->state->machine().rand()&0xfff;
+ // b1colorNumber = object->state->machine().rand()&0xfff;
}
/************* object->spriteblit[3] *************/
@@ -1345,11 +1345,11 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
if (b2colorNumber != b1colorNumber)
{
- // b1colorNumber = space.machine().rand()&0xfff;
+ // b1colorNumber = space.machine().rand()&0xfff;
}
-// if(b1colorNumber > 0x60 || b2colorNumber)
-// printf("%08x %08x\n",b1colorNumber,b2colorNumber);
+// if(b1colorNumber > 0x60 || b2colorNumber)
+// printf("%08x %08x\n",b1colorNumber,b2colorNumber);
if (blit2_unused!=0) printf("blit1 unknown bits set %08x\n", object->spriteblit[2]);
@@ -1362,9 +1362,9 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
// 0x01/0x02 trips in rare cases (start of one of the attract levels) maybe this is some kind of alpha instead?
if ((b2altpenmask != 0x00) && (b2altpenmask != 0x01) && (b2altpenmask != 0x02)) printf("b1mode 0, b2altpenmask!=0x00,0x01 or 0x02 (is %02x)\n", b2altpenmask);
}
- // 00??0uuu
- // ?? seems to be 00 or 7f, set depending on b1mode
- // uuu, at least 11 bits used, maybe 12 usually the same as blit1_unused? leftover?
+ // 00??0uuu
+ // ?? seems to be 00 or 7f, set depending on b1mode
+ // uuu, at least 11 bits used, maybe 12 usually the same as blit1_unused? leftover?
@@ -1465,287 +1465,287 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
//UINT32 textlookup = 0; // we've cached the data here already
/*
- sample data from attract mode 'filmstrip'
+ sample data from attract mode 'filmstrip'
- you can see it's screen regions at least, gets enabled in certain game situations too
- interestingly there is a bit to determine the screen number this applies to, even if that should already be implied from m_blitterMode
+ you can see it's screen regions at least, gets enabled in certain game situations too
+ interestingly there is a bit to determine the screen number this applies to, even if that should already be implied from m_blitterMode
- screen 1 clipping(?)
+ screen 1 clipping(?)
- unknown sprite list type 1 - 00000001 003f00f0 027801f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 03e001f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 000700e3 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 010c01f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 027801f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 03e001f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 000700e3 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 010c01f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 027401f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 03dc01f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 000700df 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 010801f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 027401f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 03dc01f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 000700df 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 010801f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 027001f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 03d801f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 000700db 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 010401f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 027001f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 03d801f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 000700db 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 010401f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 019c01f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 030401f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 00070007 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 0030016f 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 019c01f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 030401f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 00070007 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 0030016f 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- screen 2 clipping
+ screen 2 clipping
- unknown sprite list type 1 - 00000001 003f00f0 039803f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 050003f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 02070203 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 022c036b 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 039803f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 050003f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 02070203 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 022c036b 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 039403f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 04fc03f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 020701ff 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 02280367 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 039403f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 04fc03f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 020701ff 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 02280367 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 039003f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 04f803f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 020701fb 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 003f00f0 02240363 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 039003f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 04f803f7 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 020701fb 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 003f00f0 02240363 00000207 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
NOTE, we only copy across [1] [2] and [3] as [0] [1] and [2]
the 3rd dword seems to be some kind of offset, it's 0x207 on the 2nd screen, and the actual x-clip rects are also higher on that screen?
- note this is practically the same format as the sysh1_fb_data_w commands..
-
-
-
- between stages (screen 1)
- unknown sprite list type 1 - 00000001 000000a4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000a4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000a3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000a4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000a4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000a5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000a6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000a8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000a9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000ab 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000ac 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000ae 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000af 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000b1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000b2 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000b3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000b5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000b6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000b8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000b9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000ba 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000bc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000bd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000be 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000c0 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000c1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000c2 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000c4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000c5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000c6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000c8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000c9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000cb 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000cc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000ce 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000cf 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d2 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000db 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000db 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000dc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000dd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000dd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000de 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e0 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e2 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000ea 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000eb 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000ed 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000ee 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f0 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fa 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fe 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fe 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fa 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000fa 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000f1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000ee 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000eb 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000e1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000dd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000da 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 000000d5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ note this is practically the same format as the sysh1_fb_data_w commands..
+
+
+
+ between stages (screen 1)
+ unknown sprite list type 1 - 00000001 000000a4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000a4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000a3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000a4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000a4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000a5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000a6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000a8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000a9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000ab 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000ac 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000ae 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000af 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000b1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000b2 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000b3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000b5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000b6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000b8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000b9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000ba 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000bc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000bd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000be 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000c0 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000c1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000c2 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000c4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000c5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000c6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000c8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000c9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000cb 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000cc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000ce 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000cf 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d2 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000db 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000db 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000dc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000dd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000dd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000de 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e0 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e2 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000ea 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000eb 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000ed 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000ee 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f0 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fa 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fe 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fe 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fc 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fa 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000fa 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f8 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f6 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f3 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000f1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000ee 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000eb 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e9 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e4 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000e1 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000dd 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000da 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d7 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 000000d5 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
ending
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 0000017f 000701f7 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
romania
- unknown sprite list type 1 - 00000001 00000001 00000001 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+ unknown sprite list type 1 - 00000001 00000001 00000001 00000007 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
*/
// how does this really work? there's more to it
@@ -1816,15 +1816,15 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
for (int k=0;k<DECODECACHE_NUMOBJECTCACHES;k++)
{
if(((object->state->decode[screen].objcache[k].lastromoffset == b3romoffset)) &&
- ((object->state->decode[screen].objcache[k].lastused_flipx == used_flipx)) &&
- ((object->state->decode[screen].objcache[k].lastused_flipy == used_flipy)) &&
- ((object->state->decode[screen].objcache[k].lastblit_rotate == blit_rotate)) &&
- ((object->state->decode[screen].objcache[k].lastb1mode == b1mode)) &&
- ((object->state->decode[screen].objcache[k].lastb1colorNumber == b1colorNumber)) &&
- ((object->state->decode[screen].objcache[k].lastb2colorNumber == b2colorNumber)) &&
- ((object->state->decode[screen].objcache[k].lastused_hCellCount == used_hCellCount)) &&
- ((object->state->decode[screen].objcache[k].lastused_vCellCount == used_vCellCount)) &&
- ((object->state->decode[screen].objcache[k].lastb2altpenmask == b2altpenmask)))
+ ((object->state->decode[screen].objcache[k].lastused_flipx == used_flipx)) &&
+ ((object->state->decode[screen].objcache[k].lastused_flipy == used_flipy)) &&
+ ((object->state->decode[screen].objcache[k].lastblit_rotate == blit_rotate)) &&
+ ((object->state->decode[screen].objcache[k].lastb1mode == b1mode)) &&
+ ((object->state->decode[screen].objcache[k].lastb1colorNumber == b1colorNumber)) &&
+ ((object->state->decode[screen].objcache[k].lastb2colorNumber == b2colorNumber)) &&
+ ((object->state->decode[screen].objcache[k].lastused_hCellCount == used_hCellCount)) &&
+ ((object->state->decode[screen].objcache[k].lastused_vCellCount == used_vCellCount)) &&
+ ((object->state->decode[screen].objcache[k].lastb2altpenmask == b2altpenmask)))
{
found = k;
break;
@@ -1913,7 +1913,7 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
// I don't know, the Rainbow is a non-zoomed sprite and won't link unless you move one half
// (fixed in the hOrigin handling instead)
//if (used_flipx)
- // hPositionx -= 1;
+ // hPositionx -= 1;
int hPosition = 0;
@@ -1962,8 +1962,8 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
/*
if (object->screen==0)
{
- if (current_decoded) printf("setting temp shape to %04x tile is marked as decoded %08x \n", v*used_hCellCount + h, ((UINT64)(void*)tempshape)&0xffffffff);
- else printf("setting temp shape to %04x tile is marked as NOT decoded %08x \n", v*used_hCellCount + h, ((UINT64)(void*)tempshape)&0xffffffff);
+ if (current_decoded) printf("setting temp shape to %04x tile is marked as decoded %08x \n", v*used_hCellCount + h, ((UINT64)(void*)tempshape)&0xffffffff);
+ else printf("setting temp shape to %04x tile is marked as NOT decoded %08x \n", v*used_hCellCount + h, ((UINT64)(void*)tempshape)&0xffffffff);
}
*/
}
@@ -1993,13 +1993,13 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
{
#define GET_PIX GET_PIX_ROTATED
YXLOOP
- #undef GET_PIX
+ #undef GET_PIX
}
else // no rotate
{
#define GET_PIX GET_PIX_NORMAL
YXLOOP
- #undef GET_PIX
+ #undef GET_PIX
}
}
@@ -2144,7 +2144,7 @@ void *coolridr_state::draw_object_threaded(void *param, int threadid)
/* This is a RLE-based sprite blitter (US Patent #6,141,122), very unusual from Sega... */
void coolridr_state::blit_current_sprite(address_space &space)
{
-// const pen_t *clut = &machine().pens[0];
+// const pen_t *clut = &machine().pens[0];
// Serialized 32-bit words in order of appearance:
// 0: 00000000 - unknown, 0x00000000 or 0x00000001, 0 seems to be regular sprite, 1 seems to change meaning of below, possible clip area?
@@ -2380,7 +2380,7 @@ WRITE32_MEMBER(coolridr_state::sysh1_blit_mode_w)
}
else if (m_blitterMode == 0x30 || m_blitterMode == 0x40 || m_blitterMode == 0x4f || m_blitterMode == 0x50 || m_blitterMode == 0x60
- || m_blitterMode == 0x90 || m_blitterMode == 0xa0 || m_blitterMode == 0xaf || m_blitterMode == 0xb0 || m_blitterMode == 0xc0)
+ || m_blitterMode == 0x90 || m_blitterMode == 0xa0 || m_blitterMode == 0xaf || m_blitterMode == 0xb0 || m_blitterMode == 0xc0)
{
// 4f / af are used to send the clipping window during the end sequence, I don't know if the 'f' bit has any special meaning
// we need a hack for the blit window to set by them to work at all
@@ -2411,7 +2411,7 @@ WRITE32_MEMBER(coolridr_state::sysh1_blit_mode_w)
// might be there are more z-bits, or it's just overflowing when there are too many sprites
// also set on the 4f/af cliprect during the ending
//if (data & 0x0000f000)
- // printf("blitter mode with mask 0x0000f000 (%08x)\n", data & 0x0000f000);
+ // printf("blitter mode with mask 0x0000f000 (%08x)\n", data & 0x0000f000);
@@ -2435,7 +2435,7 @@ WRITE32_MEMBER(coolridr_state::sysh1_blit_mode_w)
m_blitterSerialCount = 0;
m_textOffset = (data & 0x0000ffff);
- // printf("set e0 %08x\n", data);
+ // printf("set e0 %08x\n", data);
}
else
@@ -2454,7 +2454,7 @@ WRITE32_MEMBER(coolridr_state::sysh1_blit_data_w)
m_blitterSerialCount += 0x04;
}
else if (m_blitterMode == 0x30 || m_blitterMode == 0x40 || m_blitterMode == 0x4f || m_blitterMode == 0x50 || m_blitterMode == 0x60
- || m_blitterMode == 0x90 || m_blitterMode == 0xa0 || m_blitterMode == 0xaf || m_blitterMode == 0xb0 || m_blitterMode == 0xc0)
+ || m_blitterMode == 0x90 || m_blitterMode == 0xa0 || m_blitterMode == 0xaf || m_blitterMode == 0xb0 || m_blitterMode == 0xc0)
{
// Serialized counts
if (m_blitterSerialCount < 12)
@@ -2529,8 +2529,8 @@ WRITE32_MEMBER(coolridr_state::sysh1_fb_mode_w)
COMBINE_DATA(&m_blitterClearMode);
/*
- if(m_blitterClearMode != 0x8c200000 && m_blitterClearMode != 0x8c800000)
- printf("Blitter Clear used with param %08x\n",m_blitterClearMode);
+ if(m_blitterClearMode != 0x8c200000 && m_blitterClearMode != 0x8c800000)
+ printf("Blitter Clear used with param %08x\n",m_blitterClearMode);
*/
m_blitterClearCount = 0;
@@ -2555,7 +2555,7 @@ WRITE32_MEMBER(coolridr_state::sysh1_fb_data_w)
{
/*
if(data != 0x000701f7 && m_sysh1_txt_blit[offset] != 0x020703f7)
- printf("Blitter Clear Count == 2 used with param %08x\n",data);
+ printf("Blitter Clear Count == 2 used with param %08x\n",data);
*/
}
else if(m_blitterClearCount == 3)
@@ -2683,7 +2683,7 @@ WRITE32_MEMBER(coolridr_state::sysh1_fb_data_w)
READ32_MEMBER(coolridr_state::sysh1_unk_blit_r)
{
-// if(offset == 0x0c/4) // TODO
+// if(offset == 0x0c/4) // TODO
return m_sysh1_txt_blit[offset];
}
@@ -3018,7 +3018,7 @@ static ADDRESS_MAP_START( coolridr_submap, AS_PROGRAM, 32, coolridr_state )
AM_RANGE(0x03300000, 0x03300fff) AM_DEVREADWRITE16_LEGACY("scsp2", scsp_r, scsp_w, 0xffffffff)
AM_RANGE(0x04000000, 0x0400003f) AM_READWRITE(sysh1_sound_dma_r,sysh1_sound_dma_w) AM_SHARE("sound_dma")
-// AM_RANGE(0x04200000, 0x0420003f) AM_RAM /* unknown */
+// AM_RANGE(0x04200000, 0x0420003f) AM_RAM /* unknown */
AM_RANGE(0x05000000, 0x05000fff) AM_RAM
AM_RANGE(0x05200000, 0x052001ff) AM_RAM
@@ -3059,7 +3059,7 @@ ADDRESS_MAP_END
static GFXDECODE_START( coolridr )
-// GFXDECODE_ENTRY( NULL, 0, tiles16x16_layout, 0, 0x100 )
+// GFXDECODE_ENTRY( NULL, 0, tiles16x16_layout, 0, 0x100 )
GFXDECODE_END
static INPUT_PORTS_START( coolridr )
@@ -3704,26 +3704,26 @@ ROM_END
/*
TODO: both irq routines writes 1 to 0x60d8894, sets up the Watchdog timer then expect that this buffer goes low IN the irq routines.
- The Watchdog Timer is setted up with these params:
- 0xee for wtcnt
- 0x39 for wtcsr (enable irq (bit 5), enable timer (bit 4), clock select divider / 64 (bits 2-0))
- vector is 0x7f (so VBR+0x1fc)
- level is 0xf
+ The Watchdog Timer is setted up with these params:
+ 0xee for wtcnt
+ 0x39 for wtcsr (enable irq (bit 5), enable timer (bit 4), clock select divider / 64 (bits 2-0))
+ vector is 0x7f (so VBR+0x1fc)
+ level is 0xf
... and indeed the Watchdog irq routine effectively clears this RAM buffer. What the manual doesn't say is that the Watchdog timer irq
presumably is treated as an NMI by the SH-2 CPU and not really a "normal" irq exception.
For the record, here's the ITI code snippet:
06002DE4: 2F36 MOV.L R3,@-SP
- 06002DE6: E300 MOV #$00,R3
- 06002DE8: 2F26 MOV.L R2,@-SP
- 06002DEA: D20B MOV.L @($2C,PC),R2
- 06002DEC: 2230 MOV.B R3,@R2 ;writes 0 to the RAM buffer 0x60d8896
- 06002DEE: 9305 MOV.W @($000A,PC),R3
- 06002DF0: 9205 MOV.W @($000A,PC),R2
- 06002DF2: 2231 MOV.W R3,@R2 ;writes 0x19, disables the watchdog timer
- 06002DF4: 62F6 MOV.L @SP+,R2
- 06002DF6: 63F6 MOV.L @SP+,R3
- 06002DF8: 002B RTE
- 06002DFA: 0009 NOP
+ 06002DE6: E300 MOV #$00,R3
+ 06002DE8: 2F26 MOV.L R2,@-SP
+ 06002DEA: D20B MOV.L @($2C,PC),R2
+ 06002DEC: 2230 MOV.B R3,@R2 ;writes 0 to the RAM buffer 0x60d8896
+ 06002DEE: 9305 MOV.W @($000A,PC),R3
+ 06002DF0: 9205 MOV.W @($000A,PC),R2
+ 06002DF2: 2231 MOV.W R3,@R2 ;writes 0x19, disables the watchdog timer
+ 06002DF4: 62F6 MOV.L @SP+,R2
+ 06002DF6: 63F6 MOV.L @SP+,R3
+ 06002DF8: 002B RTE
+ 06002DFA: 0009 NOP
*/
READ32_MEMBER(coolridr_state::coolridr_hack2_r)
@@ -3751,4 +3751,3 @@ DRIVER_INIT_MEMBER(coolridr_state,coolridr)
}
GAME( 1995, coolridr, 0, coolridr, coolridr, coolridr_state, coolridr, ROT0, "Sega", "Cool Riders",GAME_IMPERFECT_SOUND) // region is set in test mode, this set is for Japan, USA and Export (all regions)
-
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index a408a6d2b39..215f7b65170 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -645,11 +645,11 @@ static ADDRESS_MAP_START( sf2m3_map, AS_PROGRAM, 16, cps_state )
AM_RANGE(0x800010, 0x800011) AM_READ_PORT("IN1") /* Player input ports */
AM_RANGE(0x800028, 0x80002f) AM_READ(cps1_hack_dsw_r) /* System input ports / Dip Switches */
AM_RANGE(0x800030, 0x800037) AM_WRITE(cps1_coinctrl_w)
- AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_SHARE("cps_a_regs") /* CPS-A custom */
- AM_RANGE(0x800140, 0x80017f) AM_MIRROR(0x80) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_SHARE("cps_b_regs") /* CPS-B custom */
+ AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_SHARE("cps_a_regs") /* CPS-A custom */
+ AM_RANGE(0x800140, 0x80017f) AM_MIRROR(0x80) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_SHARE("cps_b_regs") /* CPS-B custom */
AM_RANGE(0x800186, 0x800187) AM_READ(cps1_in2_r) /* Buttons 4,5,6 for both players */
- AM_RANGE(0x800190, 0x800197) AM_WRITE(cps1_soundlatch_w) /* Sound command */
- AM_RANGE(0x800198, 0x80019f) AM_WRITE(cps1_soundlatch2_w) /* Sound timer fade */
+ AM_RANGE(0x800190, 0x800197) AM_WRITE(cps1_soundlatch_w) /* Sound command */
+ AM_RANGE(0x800198, 0x80019f) AM_WRITE(cps1_soundlatch2_w) /* Sound timer fade */
AM_RANGE(0x8001a0, 0x8001bf) AM_WRITE(cps1_cps_a_w)
AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_SHARE("gfxram")
AM_RANGE(0xff0000, 0xffffff) AM_RAM
@@ -3866,11 +3866,11 @@ ROM_END
/* B-Board 89624B-3 */
ROM_START( striderua )
ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */
- ROM_LOAD16_BYTE( "30(__striderua).11f", 0x00000, 0x20000, CRC(66aec273) SHA1(576b1e9062874e68d68f8725949c151509eb6d56) ) /* different CRC from strider, pcb verified */
- ROM_LOAD16_BYTE( "35(__striderua).11h", 0x00001, 0x20000, CRC(50e0e865) SHA1(201ef385c228c124ed9412002233a501ea514efd) ) /* different CRC from strider, pcb verified */
- ROM_LOAD16_BYTE( "31(__striderua).12f", 0x40000, 0x20000, CRC(eae93bd1) SHA1(b320a00b67ea3c7fffc6c37d57863163975f7b80) ) /* different CRC from strider, pcb verified */
- ROM_LOAD16_BYTE( "36(__striderua).12h", 0x40001, 0x20000, CRC(b904a31d) SHA1(5509d1024151eb8548fd1b29e6c0c95775c61364) ) /* different CRC from strider, pcb verified */
- ROM_LOAD16_WORD_SWAP( "st-14.8h", 0x80000, 0x80000, CRC(9b3cfc08) SHA1(a7d7f270a097437affa845d80bed82a1fa874878) ) // in "32" socket
+ ROM_LOAD16_BYTE( "30(__striderua).11f", 0x00000, 0x20000, CRC(66aec273) SHA1(576b1e9062874e68d68f8725949c151509eb6d56) ) /* different CRC from strider, pcb verified */
+ ROM_LOAD16_BYTE( "35(__striderua).11h", 0x00001, 0x20000, CRC(50e0e865) SHA1(201ef385c228c124ed9412002233a501ea514efd) ) /* different CRC from strider, pcb verified */
+ ROM_LOAD16_BYTE( "31(__striderua).12f", 0x40000, 0x20000, CRC(eae93bd1) SHA1(b320a00b67ea3c7fffc6c37d57863163975f7b80) ) /* different CRC from strider, pcb verified */
+ ROM_LOAD16_BYTE( "36(__striderua).12h", 0x40001, 0x20000, CRC(b904a31d) SHA1(5509d1024151eb8548fd1b29e6c0c95775c61364) ) /* different CRC from strider, pcb verified */
+ ROM_LOAD16_WORD_SWAP( "st-14.8h", 0x80000, 0x80000, CRC(9b3cfc08) SHA1(a7d7f270a097437affa845d80bed82a1fa874878) ) // in "32" socket
ROM_REGION( 0x400000, "gfx", 0 )
ROMX_LOAD( "st-2.8a", 0x000000, 0x80000, CRC(4eee9aea) SHA1(5e619fd5f3f1181e32a8fd9dbb4661d74ff8a484) , ROM_GROUPWORD | ROM_SKIP(6) ) // in "6" socket
@@ -3886,7 +3886,7 @@ ROM_START( striderua )
ROM_COPY( "gfx", 0x000000, 0x000000, 0x8000 )
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
- ROM_LOAD( "09(__striderua).12b", 0x00000, 0x08000, CRC(08d63519) SHA1(c120ecfe25c3c50bc51bc7d5a9ef1c8ca6591240) ) /* different CRC from strider, pcb verified */
+ ROM_LOAD( "09(__striderua).12b", 0x00000, 0x08000, CRC(08d63519) SHA1(c120ecfe25c3c50bc51bc7d5a9ef1c8ca6591240) ) /* different CRC from strider, pcb verified */
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
@@ -4136,41 +4136,41 @@ ROM_START( dynwarj )
ROM_LOAD16_BYTE( "41.11h", 0xc0001, 0x20000, CRC(1aae69a4) SHA1(56e4761818f7857bc7520f2b8de90eabd857c577) ) // == tkm-9.8h
ROM_REGION( 0x400000, "gfx", 0 )
- ROMX_LOAD( "09.4b", 0x000000, 0x20000, CRC(c3e83c69) SHA1(bd361a39dc6428fea8f56ebbe5cdcc4bf63a51f0) , ROM_SKIP(7) ) // == tkm-5.7a
- ROMX_LOAD( "01.4a", 0x000001, 0x20000, CRC(187b2886) SHA1(b16121f57926d9fd2c3bc82ae6babf6a2297f140) , ROM_SKIP(7) ) // == tkm-5.7a
- ROMX_LOAD( "13.9b", 0x000002, 0x20000, CRC(0273d87d) SHA1(7803b04d72eedb4c8b39f63fea458cfef0034813) , ROM_SKIP(7) ) // == tkm-8.9a
- ROMX_LOAD( "05.9a", 0x000003, 0x20000, CRC(339378b8) SHA1(c3dfe7039e4572b9ef56166346f3cbc6f6ab07c1) , ROM_SKIP(7) ) // == tkm-8.9a
- ROMX_LOAD( "24.5e", 0x000004, 0x20000, CRC(c6909b6f) SHA1(2828bd6bdc8e3f87a4a37d4e20bdff86cb6850c9) , ROM_SKIP(7) ) // == tkm-6.3a
- ROMX_LOAD( "17.5c", 0x000005, 0x20000, CRC(2e2f8320) SHA1(7bcb80447d9ce7cc9a38e2506196acd6bf50b49f) , ROM_SKIP(7) ) // == tkm-6.3a
- ROMX_LOAD( "38.8h", 0x000006, 0x20000, CRC(cd7923ed) SHA1(29187b99847a4b56f2f1763d086b8e7dc5cebed7) , ROM_SKIP(7) ) // == tkm-7.5a
- ROMX_LOAD( "32.8f", 0x000007, 0x20000, CRC(21a0a453) SHA1(ace38c5943f9f744212cfdb7caa2caa43312e82c) , ROM_SKIP(7) ) // == tkm-7.5a
- ROMX_LOAD( "10.5b", 0x100000, 0x20000, CRC(ff28f8d0) SHA1(c8c4851816f17a4a0494164f5e8cc910f16669e8) , ROM_SKIP(7) ) // == tkm-5.7a
- ROMX_LOAD( "02.5a", 0x100001, 0x20000, CRC(cc83c02f) SHA1(915e9d7acec1ba7a2035ae140f576839eba8694f) , ROM_SKIP(7) ) // == tkm-5.7a
- ROMX_LOAD( "14(__dynwarj).10b", 0x100002, 0x20000, CRC(18fb232c) SHA1(c690ca668a56c756c04ef5db4900eb3fd34897e7) , ROM_SKIP(7) ) /* 1 byte different from dynwara, pcb verified */
- ROMX_LOAD( "06.10a", 0x100003, 0x20000, CRC(6f9edd75) SHA1(e8d43c0ec2165e88aefbb5c92048fbcd06fe578b) , ROM_SKIP(7) ) // == tkm-8.9a
- ROMX_LOAD( "25.7e", 0x100004, 0x20000, CRC(152ea74a) SHA1(c0c56b1bdfa0d7fdea040dbcc6ff871e5957a5b6) , ROM_SKIP(7) ) // == tkm-6.3a
- ROMX_LOAD( "18.7c", 0x100005, 0x20000, CRC(1833f932) SHA1(81f94d26bdb6758736ca02d7b1772801be4da181) , ROM_SKIP(7) ) // == tkm-6.3a
- ROMX_LOAD( "39.9h", 0x100006, 0x20000, CRC(bc09b360) SHA1(de2c9a42490db79c8e5fe57b9107f1adbe5dd241) , ROM_SKIP(7) ) // == tkm-7.5a
- ROMX_LOAD( "33.9f", 0x100007, 0x20000, CRC(89de1533) SHA1(e48312e37c0f98faeec91546acde5daf0da8f6b3) , ROM_SKIP(7) ) // == tkm-7.5a
- ROMX_LOAD( "11.7b", 0x200000, 0x20000, CRC(29eaf490) SHA1(42fcb67c7014e0ad62cde9e77c79e61268647528) , ROM_SKIP(7) ) // == tkm-1.8a
- ROMX_LOAD( "03.7a", 0x200001, 0x20000, CRC(7bf51337) SHA1(c21938029641ebcbc484680cf8a57186cdde220f) , ROM_SKIP(7) ) // == tkm-1.8a
- ROMX_LOAD( "15.11b", 0x200002, 0x20000, CRC(d36cdb91) SHA1(66ab873ce285e857f30294dd1c9b1dda0c6c6b76) , ROM_SKIP(7) ) // == tkm-4.10a
- ROMX_LOAD( "07.11a", 0x200003, 0x20000, CRC(e04af054) SHA1(f227b8a0a3d8f41e1922d184eaec7a1243c7c3af) , ROM_SKIP(7) ) // == tkm-4.10a
- ROMX_LOAD( "26.8e", 0x200004, 0x20000, CRC(07fc714b) SHA1(eda97a3c5596ebdfa61bdd01d39647c89b9a2f13) , ROM_SKIP(7) ) // == tkm-2.4a
- ROMX_LOAD( "19.8c", 0x200005, 0x20000, CRC(7114e5c6) SHA1(2f2925b942af50781857f4fe74e9a58f2cf7b883) , ROM_SKIP(7) ) // == tkm-2.4a
- ROMX_LOAD( "28.10e", 0x200006, 0x20000, CRC(af62bf07) SHA1(a6e0f598de1fa8a4960e89d655b7514572ed6310) , ROM_SKIP(7) ) // == tkm-3.6a
- ROMX_LOAD( "21.10c", 0x200007, 0x20000, CRC(523f462a) SHA1(b0fc9e29d6ca44aafb20a62355bde9f4b4cf1e43) , ROM_SKIP(7) ) // == tkm-3.6a
- ROMX_LOAD( "12.8b", 0x300000, 0x20000, CRC(38652339) SHA1(930a035bbe34c81c26d774d2ab45f53a3a9205fb) , ROM_SKIP(7) ) // == tkm-1.8a
- ROMX_LOAD( "04.8a", 0x300001, 0x20000, CRC(4951bc0f) SHA1(07f424c147d787321b668d787216733c35e2cff9) , ROM_SKIP(7) ) // == tkm-1.8a
- ROMX_LOAD( "16.12b", 0x300002, 0x20000, CRC(381608ae) SHA1(666e15e61c7c59df5a97bdc2d77db611d60b3ca8) , ROM_SKIP(7) ) // == tkm-4.10a
- ROMX_LOAD( "08.12a", 0x300003, 0x20000, CRC(b475d4e9) SHA1(dc5d223bc2a27904e6e38b68507d2e87fbbde158) , ROM_SKIP(7) ) // == tkm-4.10a
- ROMX_LOAD( "27.9e", 0x300004, 0x20000, CRC(a27e81fa) SHA1(b25854d4a7e52d500c19445badb4cfe745d88d23) , ROM_SKIP(7) ) // == tkm-2.4a
- ROMX_LOAD( "20.9c", 0x300005, 0x20000, CRC(002796dc) SHA1(2dba0434916dd82c59a66e2f3ce8d3165713c308) , ROM_SKIP(7) ) // == tkm-2.4a
- ROMX_LOAD( "29.11e", 0x300006, 0x20000, CRC(6b41f82d) SHA1(111af606d8107d377e3af618584a75ed6cfc9bbd) , ROM_SKIP(7) ) // == tkm-3.6a
- ROMX_LOAD( "22.11c", 0x300007, 0x20000, CRC(52145369) SHA1(bd422f0c51cdd62b69229f926569ad05d430bd57) , ROM_SKIP(7) ) // == tkm-3.6a
-
- ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
- ROM_LOAD( "23.13c", 0x00000, 0x08000, CRC(b3b79d4f) SHA1(2b960545741d3b9a53ffbf3ed83030392aa02698) ) // == tke_17.12b
+ ROMX_LOAD( "09.4b", 0x000000, 0x20000, CRC(c3e83c69) SHA1(bd361a39dc6428fea8f56ebbe5cdcc4bf63a51f0) , ROM_SKIP(7) ) // == tkm-5.7a
+ ROMX_LOAD( "01.4a", 0x000001, 0x20000, CRC(187b2886) SHA1(b16121f57926d9fd2c3bc82ae6babf6a2297f140) , ROM_SKIP(7) ) // == tkm-5.7a
+ ROMX_LOAD( "13.9b", 0x000002, 0x20000, CRC(0273d87d) SHA1(7803b04d72eedb4c8b39f63fea458cfef0034813) , ROM_SKIP(7) ) // == tkm-8.9a
+ ROMX_LOAD( "05.9a", 0x000003, 0x20000, CRC(339378b8) SHA1(c3dfe7039e4572b9ef56166346f3cbc6f6ab07c1) , ROM_SKIP(7) ) // == tkm-8.9a
+ ROMX_LOAD( "24.5e", 0x000004, 0x20000, CRC(c6909b6f) SHA1(2828bd6bdc8e3f87a4a37d4e20bdff86cb6850c9) , ROM_SKIP(7) ) // == tkm-6.3a
+ ROMX_LOAD( "17.5c", 0x000005, 0x20000, CRC(2e2f8320) SHA1(7bcb80447d9ce7cc9a38e2506196acd6bf50b49f) , ROM_SKIP(7) ) // == tkm-6.3a
+ ROMX_LOAD( "38.8h", 0x000006, 0x20000, CRC(cd7923ed) SHA1(29187b99847a4b56f2f1763d086b8e7dc5cebed7) , ROM_SKIP(7) ) // == tkm-7.5a
+ ROMX_LOAD( "32.8f", 0x000007, 0x20000, CRC(21a0a453) SHA1(ace38c5943f9f744212cfdb7caa2caa43312e82c) , ROM_SKIP(7) ) // == tkm-7.5a
+ ROMX_LOAD( "10.5b", 0x100000, 0x20000, CRC(ff28f8d0) SHA1(c8c4851816f17a4a0494164f5e8cc910f16669e8) , ROM_SKIP(7) ) // == tkm-5.7a
+ ROMX_LOAD( "02.5a", 0x100001, 0x20000, CRC(cc83c02f) SHA1(915e9d7acec1ba7a2035ae140f576839eba8694f) , ROM_SKIP(7) ) // == tkm-5.7a
+ ROMX_LOAD( "14(__dynwarj).10b", 0x100002, 0x20000, CRC(18fb232c) SHA1(c690ca668a56c756c04ef5db4900eb3fd34897e7) , ROM_SKIP(7) ) /* 1 byte different from dynwara, pcb verified */
+ ROMX_LOAD( "06.10a", 0x100003, 0x20000, CRC(6f9edd75) SHA1(e8d43c0ec2165e88aefbb5c92048fbcd06fe578b) , ROM_SKIP(7) ) // == tkm-8.9a
+ ROMX_LOAD( "25.7e", 0x100004, 0x20000, CRC(152ea74a) SHA1(c0c56b1bdfa0d7fdea040dbcc6ff871e5957a5b6) , ROM_SKIP(7) ) // == tkm-6.3a
+ ROMX_LOAD( "18.7c", 0x100005, 0x20000, CRC(1833f932) SHA1(81f94d26bdb6758736ca02d7b1772801be4da181) , ROM_SKIP(7) ) // == tkm-6.3a
+ ROMX_LOAD( "39.9h", 0x100006, 0x20000, CRC(bc09b360) SHA1(de2c9a42490db79c8e5fe57b9107f1adbe5dd241) , ROM_SKIP(7) ) // == tkm-7.5a
+ ROMX_LOAD( "33.9f", 0x100007, 0x20000, CRC(89de1533) SHA1(e48312e37c0f98faeec91546acde5daf0da8f6b3) , ROM_SKIP(7) ) // == tkm-7.5a
+ ROMX_LOAD( "11.7b", 0x200000, 0x20000, CRC(29eaf490) SHA1(42fcb67c7014e0ad62cde9e77c79e61268647528) , ROM_SKIP(7) ) // == tkm-1.8a
+ ROMX_LOAD( "03.7a", 0x200001, 0x20000, CRC(7bf51337) SHA1(c21938029641ebcbc484680cf8a57186cdde220f) , ROM_SKIP(7) ) // == tkm-1.8a
+ ROMX_LOAD( "15.11b", 0x200002, 0x20000, CRC(d36cdb91) SHA1(66ab873ce285e857f30294dd1c9b1dda0c6c6b76) , ROM_SKIP(7) ) // == tkm-4.10a
+ ROMX_LOAD( "07.11a", 0x200003, 0x20000, CRC(e04af054) SHA1(f227b8a0a3d8f41e1922d184eaec7a1243c7c3af) , ROM_SKIP(7) ) // == tkm-4.10a
+ ROMX_LOAD( "26.8e", 0x200004, 0x20000, CRC(07fc714b) SHA1(eda97a3c5596ebdfa61bdd01d39647c89b9a2f13) , ROM_SKIP(7) ) // == tkm-2.4a
+ ROMX_LOAD( "19.8c", 0x200005, 0x20000, CRC(7114e5c6) SHA1(2f2925b942af50781857f4fe74e9a58f2cf7b883) , ROM_SKIP(7) ) // == tkm-2.4a
+ ROMX_LOAD( "28.10e", 0x200006, 0x20000, CRC(af62bf07) SHA1(a6e0f598de1fa8a4960e89d655b7514572ed6310) , ROM_SKIP(7) ) // == tkm-3.6a
+ ROMX_LOAD( "21.10c", 0x200007, 0x20000, CRC(523f462a) SHA1(b0fc9e29d6ca44aafb20a62355bde9f4b4cf1e43) , ROM_SKIP(7) ) // == tkm-3.6a
+ ROMX_LOAD( "12.8b", 0x300000, 0x20000, CRC(38652339) SHA1(930a035bbe34c81c26d774d2ab45f53a3a9205fb) , ROM_SKIP(7) ) // == tkm-1.8a
+ ROMX_LOAD( "04.8a", 0x300001, 0x20000, CRC(4951bc0f) SHA1(07f424c147d787321b668d787216733c35e2cff9) , ROM_SKIP(7) ) // == tkm-1.8a
+ ROMX_LOAD( "16.12b", 0x300002, 0x20000, CRC(381608ae) SHA1(666e15e61c7c59df5a97bdc2d77db611d60b3ca8) , ROM_SKIP(7) ) // == tkm-4.10a
+ ROMX_LOAD( "08.12a", 0x300003, 0x20000, CRC(b475d4e9) SHA1(dc5d223bc2a27904e6e38b68507d2e87fbbde158) , ROM_SKIP(7) ) // == tkm-4.10a
+ ROMX_LOAD( "27.9e", 0x300004, 0x20000, CRC(a27e81fa) SHA1(b25854d4a7e52d500c19445badb4cfe745d88d23) , ROM_SKIP(7) ) // == tkm-2.4a
+ ROMX_LOAD( "20.9c", 0x300005, 0x20000, CRC(002796dc) SHA1(2dba0434916dd82c59a66e2f3ce8d3165713c308) , ROM_SKIP(7) ) // == tkm-2.4a
+ ROMX_LOAD( "29.11e", 0x300006, 0x20000, CRC(6b41f82d) SHA1(111af606d8107d377e3af618584a75ed6cfc9bbd) , ROM_SKIP(7) ) // == tkm-3.6a
+ ROMX_LOAD( "22.11c", 0x300007, 0x20000, CRC(52145369) SHA1(bd422f0c51cdd62b69229f926569ad05d430bd57) , ROM_SKIP(7) ) // == tkm-3.6a
+
+ ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+ ROM_LOAD( "23.13c", 0x00000, 0x08000, CRC(b3b79d4f) SHA1(2b960545741d3b9a53ffbf3ed83030392aa02698) ) // == tke_17.12b
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
@@ -4646,10 +4646,10 @@ ROM_END
/* B-Board 89624B-3 */
ROM_START( ffightua )
ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */
- ROM_LOAD16_BYTE( "ffu_36.11f", 0x00000, 0x20000, CRC(e2a48af9) SHA1(11e06f95bdf575af396dded2b84d858f6c7388f1) ) // in "30" socket
- ROM_LOAD16_BYTE( "ffu_42.11h", 0x00001, 0x20000, CRC(f4bb480e) SHA1(32114df1d2f4f98a4a2280a330c7b6af8ab4d862) ) // in "35" socket
- ROM_LOAD16_BYTE( "ffu_37.12f", 0x40000, 0x20000, CRC(c371c667) SHA1(633977c91a8ff09b7fe83128eced7c4dee9aee1d) ) // in "31" socket
- ROM_LOAD16_BYTE( "ffu_43(__ffightua).12h", 0x40001, 0x20000, CRC(2f5771f9) SHA1(fb532402bc00b5619a23dfa7e4525f1717020303) ) // in "36" socket /* different CRC from ffightu, ffightu1, pcb verified */
+ ROM_LOAD16_BYTE( "ffu_36.11f", 0x00000, 0x20000, CRC(e2a48af9) SHA1(11e06f95bdf575af396dded2b84d858f6c7388f1) ) // in "30" socket
+ ROM_LOAD16_BYTE( "ffu_42.11h", 0x00001, 0x20000, CRC(f4bb480e) SHA1(32114df1d2f4f98a4a2280a330c7b6af8ab4d862) ) // in "35" socket
+ ROM_LOAD16_BYTE( "ffu_37.12f", 0x40000, 0x20000, CRC(c371c667) SHA1(633977c91a8ff09b7fe83128eced7c4dee9aee1d) ) // in "31" socket
+ ROM_LOAD16_BYTE( "ffu_43(__ffightua).12h", 0x40001, 0x20000, CRC(2f5771f9) SHA1(fb532402bc00b5619a23dfa7e4525f1717020303) ) // in "36" socket /* different CRC from ffightu, ffightu1, pcb verified */
ROM_LOAD16_WORD_SWAP( "ff-32m.8h", 0x80000, 0x80000, CRC(c747696e) SHA1(d3362dadded31ccb7eaf71ef282d698d18edd722) )
ROM_REGION( 0x200000, "gfx", 0 )
@@ -5717,7 +5717,7 @@ ROM_START( nemoj )
ROMX_LOAD( "nm_33.9f", 0x100007, 0x20000, CRC(c469dc74) SHA1(d06956eef5f9b31779f218d597a1a504c1e16bad) , ROM_SKIP(7) ) // == nm-3m.5a
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
- ROM_LOAD( "nm_23.13b", 0x00000, 0x08000, CRC(8d3c5a42) SHA1(cc7477da80f3d08cf014379318e39cb75b5d3205) ) /* 1 byte different from nemo, pcb verified */
+ ROM_LOAD( "nm_23.13b", 0x00000, 0x08000, CRC(8d3c5a42) SHA1(cc7477da80f3d08cf014379318e39cb75b5d3205) ) /* 1 byte different from nemo, pcb verified */
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
@@ -6778,8 +6778,8 @@ ROM_START( 3wondersr1 )
ROM_LOAD16_BYTE( "rte_35.11h", 0x00001, 0x20000, CRC(73dd0e20) SHA1(b4f4086574176befa70863a85a3c0a8fd6e4bd90) )
ROM_LOAD16_BYTE( "rte_31.12f", 0x40000, 0x20000, CRC(33e0337d) SHA1(53e5795baf307a789b4337f081a932359e569a98) )
ROM_LOAD16_BYTE( "rte_36.12h", 0x40001, 0x20000, CRC(a8865243) SHA1(0a4d7e8e07d88104aa01457a10a8a9abd3ed4ce1) )
- ROM_LOAD16_BYTE( "rte_28.9f", 0x80000, 0x20000, CRC(054137c8) SHA1(e4c406e0a32198323a5931093fbaa6836510b8ad) ) // == rt_28a.9f
- ROM_LOAD16_BYTE( "rte_33.9h", 0x80001, 0x20000, CRC(7264cb1b) SHA1(b367acb9f6579569321ecaa98a14e29dd775b9db) ) // == rt_33a.9h
+ ROM_LOAD16_BYTE( "rte_28.9f", 0x80000, 0x20000, CRC(054137c8) SHA1(e4c406e0a32198323a5931093fbaa6836510b8ad) ) // == rt_28a.9f
+ ROM_LOAD16_BYTE( "rte_33.9h", 0x80001, 0x20000, CRC(7264cb1b) SHA1(b367acb9f6579569321ecaa98a14e29dd775b9db) ) // == rt_33a.9h
ROM_LOAD16_BYTE( "rte_29.10f", 0xc0000, 0x20000, CRC(9a8df1e4) SHA1(5b61d2d729145d524e23036bb27ba3ba75c208fe) )
ROM_LOAD16_BYTE( "rte_34.10h", 0xc0001, 0x20000, CRC(6348a79d) SHA1(2e4b58f9c6c1ad6a89c90d8ebb46cee2613f1397) )
@@ -6794,11 +6794,11 @@ ROM_START( 3wondersr1 )
ROMX_LOAD( "rt-4m.6a", 0x200006, 0x80000, CRC(df0eea8b) SHA1(5afa05654cccb0504bd44569d42fd68f08fd172f) , ROM_GROUPWORD | ROM_SKIP(6) )
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
- ROM_LOAD( "rt_9(__3wondersr1).12b", 0x00000, 0x08000, CRC(7d5a77a7) SHA1(4f2a6534d7a9e518061102c1dd7d7aca39600c33) ) /* 1 byte different from 3wonders, pcb verified */
+ ROM_LOAD( "rt_9(__3wondersr1).12b", 0x00000, 0x08000, CRC(7d5a77a7) SHA1(4f2a6534d7a9e518061102c1dd7d7aca39600c33) ) /* 1 byte different from 3wonders, pcb verified */
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
- ROM_LOAD( "rt_18(__3wondersr1).11c", 0x00000, 0x20000, CRC(f6dc0d3d) SHA1(9959fc3339613042c95b90aad2bc1c3dafdb605e) ) /* 6 bytes different from 3wonders, pcb verified */
+ ROM_LOAD( "rt_18(__3wondersr1).11c", 0x00000, 0x20000, CRC(f6dc0d3d) SHA1(9959fc3339613042c95b90aad2bc1c3dafdb605e) ) /* 6 bytes different from 3wonders, pcb verified */
ROM_LOAD( "rt_19.12c", 0x20000, 0x20000, CRC(dbe64ad0) SHA1(09f2ad522fe75d7bcca094b8c6696c3733b539d5) )
ROM_REGION( 0x0200, "aboardplds", 0 )
@@ -6909,7 +6909,7 @@ ROM_START( wonder3 )
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
ROM_LOAD( "rt_23.13b", 0x00000, 0x08000, CRC(abfca165) SHA1(428069d3bdc45775854cd0e8abe447f134fe5492) ) // == rt_9.12b
-// ROM_LOAD( "rt_23(__alt).13b", 0x00000, 0x08000, CRC(7d5a77a7) SHA1(4f2a6534d7a9e518061102c1dd7d7aca39600c33) ) /* dumped from another board, 1 byte different, pcb verified */
+// ROM_LOAD( "rt_23(__alt).13b", 0x00000, 0x08000, CRC(7d5a77a7) SHA1(4f2a6534d7a9e518061102c1dd7d7aca39600c33) ) /* dumped from another board, 1 byte different, pcb verified */
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
@@ -7053,12 +7053,12 @@ ROM_START( kodr1 )
ROMX_LOAD( "kd-4m.5c", 0x200006, 0x80000, CRC(402b9b4f) SHA1(4c11976976eadf1ad293b31b0a4d047d05032b06) , ROM_GROUPWORD | ROM_SKIP(6) ) // in "12" socket
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
- ROM_LOAD( "kd_9(__kodr1).12a", 0x00000, 0x08000, CRC(f5514510) SHA1(07e9c836adf9ef2f7e7729e99015f71e3b5f16e0) ) /* different CRC from kod, pcb verified */
+ ROM_LOAD( "kd_9(__kodr1).12a", 0x00000, 0x08000, CRC(f5514510) SHA1(07e9c836adf9ef2f7e7729e99015f71e3b5f16e0) ) /* different CRC from kod, pcb verified */
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
- ROM_LOAD( "kd_18(__kodr1).11c", 0x00000, 0x20000, CRC(69ecb2c8) SHA1(fadf266b6b20bd6329a3e638918c5a3106413476) ) /* different CRC from kod, pcb verified */
- ROM_LOAD( "kd_19(__kodr1).12c", 0x20000, 0x20000, CRC(02d851c1) SHA1(c959a6fc3e7d893557f319debae91f28471f4be2) ) /* different CRC from kod, pcb verified */
+ ROM_LOAD( "kd_18(__kodr1).11c", 0x00000, 0x20000, CRC(69ecb2c8) SHA1(fadf266b6b20bd6329a3e638918c5a3106413476) ) /* different CRC from kod, pcb verified */
+ ROM_LOAD( "kd_19(__kodr1).12c", 0x20000, 0x20000, CRC(02d851c1) SHA1(c959a6fc3e7d893557f319debae91f28471f4be2) ) /* different CRC from kod, pcb verified */
ROM_REGION( 0x0200, "aboardplds", 0 )
ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) )
@@ -8745,7 +8745,7 @@ ROM_START( cworld2j )
ROM_LOAD16_BYTE( "q5_34.10f", 0x80000, 0x20000, CRC(7fcc1317) SHA1(672ca45d3fad5eec4d65bbbbd1d21cbf6be4ec8b) )
ROM_LOAD16_BYTE( "q5_40.10h", 0x80001, 0x20000, CRC(7f14b7b4) SHA1(5564eb9f65dad76ebe40d12d5c39fec5e246adf0) )
ROM_LOAD16_BYTE( "q5_35.11f", 0xc0000, 0x20000, CRC(abacee26) SHA1(2f513c02f715ffeec12a6d1c292619e214155cbc) )
-// ROM_LOAD16_BYTE( "q5_35(__alt).11f", 0xc0000, 0x20000, CRC(59961612) SHA1(ded5144746dd9612f2db1415e96a826e215ad176) ) /* dumped from another board, 1 byte different, pcb verified */
+// ROM_LOAD16_BYTE( "q5_35(__alt).11f", 0xc0000, 0x20000, CRC(59961612) SHA1(ded5144746dd9612f2db1415e96a826e215ad176) ) /* dumped from another board, 1 byte different, pcb verified */
ROM_LOAD16_BYTE( "q5_41.11h", 0xc0001, 0x20000, CRC(d3654067) SHA1(0b597483e136ff19b031171941cb8439bcd7f145) )
ROM_REGION( 0x200000, "gfx", 0 )
@@ -10610,7 +10610,7 @@ ROM_START( pang3b )
ROM_CONTINUE( 0x000006, 0x100000 )
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
- ROM_LOAD( "pa3_11(__pang3b).11f", 0x00000, 0x08000, CRC(90a08c46) SHA1(7544adab2d7e052e0d21c920bff7841d9d718345) ) // == pa3_11.11f but different size, resized by bootlegger
+ ROM_LOAD( "pa3_11(__pang3b).11f", 0x00000, 0x08000, CRC(90a08c46) SHA1(7544adab2d7e052e0d21c920bff7841d9d718345) ) // == pa3_11.11f but different size, resized by bootlegger
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
ROM_LOAD( "pa3_05.10d", 0x00000, 0x20000, CRC(73a10d5d) SHA1(999465e4fbc35a34746d2db61ad49f61403d5af7) )
@@ -10842,7 +10842,7 @@ ROM_START( wofch )
ROMX_LOAD( "tk2-4m.6a", 0x000006, 0x80000, CRC(e349551c) SHA1(1d977bdf256accf750ad9930ec4a0a19bbf86964) , ROM_GROUPWORD | ROM_SKIP(6) )
ROMX_LOAD( "tk2(ch)_05.7a", 0x200000, 0x80000, CRC(e4a44d53) SHA1(b747679f4d63e5e62d9fd81b3120fba0401fadfb) , ROM_GROUPWORD | ROM_SKIP(6) ) // == tk2_05.7a
ROMX_LOAD( "tk2(ch)_06.8a", 0x200002, 0x80000, CRC(58066ba8) SHA1(c93af968e21094d020e4b2002e0c6fc0d746af0b) , ROM_GROUPWORD | ROM_SKIP(6) ) // == tk2_06.8a
- ROMX_LOAD( "tk2(ch)_07.9a", 0x200004, 0x80000, CRC(cc9006c9) SHA1(cfcbec3a67052268a7739538aa28a6391fe5400e) , ROM_GROUPWORD | ROM_SKIP(6) ) /* 1 byte different from wofj, pcb verified */
+ ROMX_LOAD( "tk2(ch)_07.9a", 0x200004, 0x80000, CRC(cc9006c9) SHA1(cfcbec3a67052268a7739538aa28a6391fe5400e) , ROM_GROUPWORD | ROM_SKIP(6) ) /* 1 byte different from wofj, pcb verified */
ROMX_LOAD( "tk2(ch)_08.10a", 0x200006, 0x80000, CRC(d4a19a02) SHA1(ff396b1d33d9b4842140f2c6d085fe05748e3244) , ROM_GROUPWORD | ROM_SKIP(6) ) // == tk2_08.10a
ROM_REGION( 0x28000, "audiocpu", 0 ) /* QSound Z80 code */
diff --git a/src/mame/drivers/de_2.c b/src/mame/drivers/de_2.c
index f5102524c60..692eccc41ac 100644
--- a/src/mame/drivers/de_2.c
+++ b/src/mame/drivers/de_2.c
@@ -308,9 +308,9 @@ INPUT_CHANGED_MEMBER( de_2_state::audio_nmi )
{
// Not on DECO board?
// Diagnostic button sends a pulse to NMI pin
-// if (newval==CLEAR_LINE)
-// if(m_audiocpu)
-// m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
+// if (newval==CLEAR_LINE)
+// if(m_audiocpu)
+// m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
// 6821 PIA at 0x2000
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index 1201f1fa6fc..86d471c6302 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -89,9 +89,9 @@
Driver todo:
stadhr96 - protection? issues (or 156 co-processor? or timing?)
- avengrgs - doesn't generate enough line interrupts?
+ avengrgs - doesn't generate enough line interrupts?
ddream95 seems to have a dual screen mode(??)
- hoops** - crash entering test mode (regression from 0.113 era?)
+ hoops** - crash entering test mode (regression from 0.113 era?)
Driver by Bryan McPhail, bmcphail@tendril.co.uk, thank you to Avedis and The Guru.
@@ -137,12 +137,12 @@ READ32_MEMBER(deco_mlc_state::mlc_44001c_r)
{
/*
test3 7 - vbl loop on 0x10 0000 at end of IRQ
- avengrgs tests other bits too
+ avengrgs tests other bits too
*/
//if (offset==0)
// return machine().rand()|(machine().rand()<<16);
// logerror("%08x: Test3_r %d\n",space.device().safe_pc(),offset);
-// return 0x00100000;
+// return 0x00100000;
return 0xffffffff;
}
@@ -216,7 +216,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(deco_mlc_state::interrupt_gen)
WRITE32_MEMBER(deco_mlc_state::mlc_irq_w)
{
-// int scanline=machine().primary_screen->vpos();
+// int scanline=machine().primary_screen->vpos();
COMBINE_DATA(&m_irq_ram[offset]);
diff --git a/src/mame/drivers/dreambal.c b/src/mame/drivers/dreambal.c
index 4e333cbe65e..de2a7b9e742 100644
--- a/src/mame/drivers/dreambal.c
+++ b/src/mame/drivers/dreambal.c
@@ -91,7 +91,7 @@ static ADDRESS_MAP_START( dreambal_map, AS_PROGRAM, 16, dreambal_state )
AM_RANGE(0x120000, 0x123fff) AM_RAM
AM_RANGE(0x140000, 0x1403ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
- AM_RANGE(0x161000, 0x16100f) AM_DEVWRITE_LEGACY("tilegen1", deco16ic_pf_control_w)
+ AM_RANGE(0x161000, 0x16100f) AM_DEVWRITE_LEGACY("tilegen1", deco16ic_pf_control_w)
AM_RANGE(0x160088, 0x160089) AM_READ_PORT("INP")
AM_RANGE(0x160292, 0x160293) AM_READ_PORT("SYS")
@@ -103,7 +103,7 @@ static ADDRESS_MAP_START( dreambal_map, AS_PROGRAM, 16, dreambal_state )
AM_RANGE(0x162000, 0x162001) AM_WRITENOP // writes 0003 on startup
AM_RANGE(0x163000, 0x163001) AM_WRITENOP // something on bit 1
AM_RANGE(0x164000, 0x164001) AM_WRITENOP // something on bit 1
-
+
AM_RANGE(0x165000, 0x165001) AM_WRITE( dreambal_eeprom_w ) // EEP Write?
AM_RANGE(0x16c002, 0x16c00d) AM_WRITENOP // writes 0000 to 0005 on startup
@@ -321,7 +321,7 @@ static MACHINE_CONFIG_START( dreambal, dreambal_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", 9830400/8, OKIM6295_PIN7_HIGH)
-
+
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gambl186.c b/src/mame/drivers/gambl186.c
index 9c4849c348d..ffa0a12c874 100644
--- a/src/mame/drivers/gambl186.c
+++ b/src/mame/drivers/gambl186.c
@@ -2,12 +2,12 @@
/*
-80186xl20 Xtal 40Mhz
+80186xl20 Xtal 40Mhz
At89c52 (not dumped) with external 32K ram?? Xtal 11.xxx18Mhz
Cirrus Logic CL-GD5428-80QC-A video chip with 416c256 ram near it Xtal 14.x818 Mhaz
U9-U10 programm rom common to both pcb
-u11-u12 Program rom/GFX
+u11-u12 Program rom/GFX
U13-U14 256Kramx8 (32Kbyte x16)
U23 Nec D71055C
diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c
index 411b3685cd9..d82b8f001b4 100644
--- a/src/mame/drivers/gunpey.c
+++ b/src/mame/drivers/gunpey.c
@@ -2,106 +2,106 @@
/********************************************************************************************
- Gunpey (c) 2000 Banpresto
+ Gunpey (c) 2000 Banpresto
ASM code study:
0x84718 main code
0x8472c call 0x81f34 reading of dip-switches
- 0x5e62:
+ 0x5e62:
0x84731 call 0x81f5c move dip-switches settings to work RAM
0x84736 call 0x80ae4 writes to i/os 0x7fc0-0x7fff:
- 0x7fc0: 0x00
- 0x7fc1: 0x00
- 0x7fc2: 0x40
- 0x7fc3: 0x03
- 0x7fc4: 0x72
- 0x7fc5: 0x72
- 0x7fc6: 0x90
- 0x7fc7: 0x01
- 0x7fc8: 0x55 irq mask?
- (note: skips irq ack)
- 0x7fca: 0x00
- 0x7fcb: 0x00
- 0x7fcc: 0x00
- 0x7fcd: 0x00
- 0x7fce: 0x00
- 0x7fcf: 0x07
- 0x7fd0: 0x00
- 0x7fd1: 0x00
- 0x7fd2: 0x00
- 0x7fd3: 0x8c
- 0x7fd4-0x7fde: 0x00
- (skips 0x7fdf)
- 0x7fe0: 0x40
- 0x7fe1: 0x02
- 0x7fe2: 0x00
- 0x7fe3: 0x00
- 0x7fe4: 0x60
- 0x7fe5: 0x07
- 0x7fe6: 0x88
- 0x7fe7: 0x07
- 0x7fe8: 0x9f
- 0x7fe9: 0x08
- 0x7fea: 0x77
- 0x7feb: 0x08
- (here the code writes 16-bit words, read from 0x500e ...)
- 0x7fec: 0x00
- 0x7fed: 0x84
- (read from 0x5012)
- 0x7fee: 0x00
- 0x7fef: 0x88
- (returns to byte filling)
- 0x7ff0: 0x84
- 0x7ff1: 0x00
- 0x7ff2: 0x00
- 0x7ff3: 0x01
- 0x7ff4: 0x00
- 0x7ff5: 0x00
- 0x7ff6: 0xc7
- 0x7ff7: 0x56
- 0x7ff8: 0x3f
- 0x7ff9: 0x48
- 0x7ffa: 0x9a
- 0x7ffb: 0x22
- 0x7ffc: 0x0e
- 0x7ffd: 0x43
- 0x7ffe: 0xf0
- 0x7fff: 0x15
- Then, it fills the following work RAMs (with 0 except where noted):
- 0x5e36, 0x5e38, 0x5e44, 0x5e46 (4), 0x5e48, 0x5e4a, 0x5e40, 0x5e42, 0x5b68 (0x9c8), 0x5b6a (0x9c8), 0x59c4 (1)
+ 0x7fc0: 0x00
+ 0x7fc1: 0x00
+ 0x7fc2: 0x40
+ 0x7fc3: 0x03
+ 0x7fc4: 0x72
+ 0x7fc5: 0x72
+ 0x7fc6: 0x90
+ 0x7fc7: 0x01
+ 0x7fc8: 0x55 irq mask?
+ (note: skips irq ack)
+ 0x7fca: 0x00
+ 0x7fcb: 0x00
+ 0x7fcc: 0x00
+ 0x7fcd: 0x00
+ 0x7fce: 0x00
+ 0x7fcf: 0x07
+ 0x7fd0: 0x00
+ 0x7fd1: 0x00
+ 0x7fd2: 0x00
+ 0x7fd3: 0x8c
+ 0x7fd4-0x7fde: 0x00
+ (skips 0x7fdf)
+ 0x7fe0: 0x40
+ 0x7fe1: 0x02
+ 0x7fe2: 0x00
+ 0x7fe3: 0x00
+ 0x7fe4: 0x60
+ 0x7fe5: 0x07
+ 0x7fe6: 0x88
+ 0x7fe7: 0x07
+ 0x7fe8: 0x9f
+ 0x7fe9: 0x08
+ 0x7fea: 0x77
+ 0x7feb: 0x08
+ (here the code writes 16-bit words, read from 0x500e ...)
+ 0x7fec: 0x00
+ 0x7fed: 0x84
+ (read from 0x5012)
+ 0x7fee: 0x00
+ 0x7fef: 0x88
+ (returns to byte filling)
+ 0x7ff0: 0x84
+ 0x7ff1: 0x00
+ 0x7ff2: 0x00
+ 0x7ff3: 0x01
+ 0x7ff4: 0x00
+ 0x7ff5: 0x00
+ 0x7ff6: 0xc7
+ 0x7ff7: 0x56
+ 0x7ff8: 0x3f
+ 0x7ff9: 0x48
+ 0x7ffa: 0x9a
+ 0x7ffb: 0x22
+ 0x7ffc: 0x0e
+ 0x7ffd: 0x43
+ 0x7ffe: 0xf0
+ 0x7fff: 0x15
+ Then, it fills the following work RAMs (with 0 except where noted):
+ 0x5e36, 0x5e38, 0x5e44, 0x5e46 (4), 0x5e48, 0x5e4a, 0x5e40, 0x5e42, 0x5b68 (0x9c8), 0x5b6a (0x9c8), 0x59c4 (1)
0x8473b: call 0x81415
- reads [0x500e] -> [0xf0bc]
- reads [0x5010] -> [0xf0be]
- (does it twice, shrug -.-")
- reads 0xf0bc / 0xf0be
- AW = 0xb3c9, CW = 0x10
- 0x81447: call 0xb3aa0
- moves RAM from 0xb3c90-0xb3c9f to RAM 0x400-0x40f
- writes 0x800 to [0xf0b8] writes 0 to [0xf0ba]
- loops while writing to [0xf0b8] [0xf0ba] for 0x200 times, filling a table at [0x800][0x27f0] with a 1
- writes 0x800 to [0xf0b8] writes 0 to [0xf0ba] again
- reads the [0xf0b8][0xf0ba]
- 0x81484: call 0xb3aa0
- moves RAM from 0xb3ca0-0xb3caf to RAM 0x800-0x80f
- writes 0x2800 to [0xf0b8] writes 0 to [0xf0ba]
- loops while writing to [0xf0b8] [0xf0ba] for 0x200 times, filling a table at [0x2800][0x47f0] with a 1
- 0x81484: call 0xb3aa0
- moves RAM from 0xb3ca0-0xb3caf to RAM 0x2800-0x280f
+ reads [0x500e] -> [0xf0bc]
+ reads [0x5010] -> [0xf0be]
+ (does it twice, shrug -.-")
+ reads 0xf0bc / 0xf0be
+ AW = 0xb3c9, CW = 0x10
+ 0x81447: call 0xb3aa0
+ moves RAM from 0xb3c90-0xb3c9f to RAM 0x400-0x40f
+ writes 0x800 to [0xf0b8] writes 0 to [0xf0ba]
+ loops while writing to [0xf0b8] [0xf0ba] for 0x200 times, filling a table at [0x800][0x27f0] with a 1
+ writes 0x800 to [0xf0b8] writes 0 to [0xf0ba] again
+ reads the [0xf0b8][0xf0ba]
+ 0x81484: call 0xb3aa0
+ moves RAM from 0xb3ca0-0xb3caf to RAM 0x800-0x80f
+ writes 0x2800 to [0xf0b8] writes 0 to [0xf0ba]
+ loops while writing to [0xf0b8] [0xf0ba] for 0x200 times, filling a table at [0x2800][0x47f0] with a 1
+ 0x81484: call 0xb3aa0
+ moves RAM from 0xb3ca0-0xb3caf to RAM 0x2800-0x280f
0x84740: call 0x821cd
- fills 0x5c88-0x5c9a with this pattern (byte writes):
- [+0x00] 0x00
- [+0x02] 0x00
- [+0x08] 0x00
- [+0x04] 0x00
- [+0x0c] 0x00
- [+0x0e] 0x0c
- [+0x06] 0x00
- [+0x10] 0x00
- [+0x12] 0x0c
- does the same with 0x5c89-0x5c9b
+ fills 0x5c88-0x5c9a with this pattern (byte writes):
+ [+0x00] 0x00
+ [+0x02] 0x00
+ [+0x08] 0x00
+ [+0x04] 0x00
+ [+0x0c] 0x00
+ [+0x0e] 0x0c
+ [+0x06] 0x00
+ [+0x10] 0x00
+ [+0x12] 0x0c
+ does the same with 0x5c89-0x5c9b
0x84745: call 0x82026
- checks if 0x5e62 is 0 (bit 6 of 0x5c80, i/o 0x7f41)
- ...
+ checks if 0x5e62 is 0 (bit 6 of 0x5c80, i/o 0x7f41)
+ ...
0x8474a: call 0xa7f53 sound init
...
@@ -371,7 +371,7 @@ UINT8 gunpey_state::draw_gfx(running_machine &machine, bitmap_ind16 &bitmap,cons
if(cliprect.contains(x+(xi*2), y+yi))
{
if (alpha==0x00) // a value of 0x00 is solid
- {
+ {
bitmap.pix16(y+yi, x+(xi*2)) = color_data & 0x7fff;
}
else
@@ -419,7 +419,7 @@ UINT8 gunpey_state::draw_gfx(running_machine &machine, bitmap_ind16 &bitmap,cons
if(cliprect.contains(x+1+(xi*2),y+yi))
{
if (alpha==0x00) // a value of 0x00 is solid
- {
+ {
bitmap.pix16(y+yi, x+1+(xi*2)) = color_data & 0x7fff;
}
else
@@ -439,7 +439,7 @@ UINT8 gunpey_state::draw_gfx(running_machine &machine, bitmap_ind16 &bitmap,cons
}
}
-
+
}
}
}
@@ -504,7 +504,7 @@ UINT8 gunpey_state::draw_gfx(running_machine &machine, bitmap_ind16 &bitmap,cons
if(cliprect.contains(x+xi,y+yi))
{
if (alpha==0x00) // a value of 0x00 is solid
- {
+ {
bitmap.pix16(y+yi, x+xi) = color_data & 0x7fff;
}
else
@@ -524,7 +524,7 @@ UINT8 gunpey_state::draw_gfx(running_machine &machine, bitmap_ind16 &bitmap,cons
}
}
-
+
}
}
}
@@ -567,8 +567,8 @@ UINT32 gunpey_state::screen_update_gunpey(screen_device &screen, bitmap_ind16 &b
scene_enabled = m_wram[scene_index+0] & 0x01;
scene_gradient = m_wram[scene_index+1] & 0xff;
-// printf("%08x: %08x %08x %08x %08x | %08x %08x %08x %08x\n",scene_index,m_wram[scene_index+0],m_wram[scene_index+1],m_wram[scene_index+2],m_wram[scene_index+3],
-// m_wram[scene_index+4],m_wram[scene_index+5],m_wram[scene_index+6],m_wram[scene_index+7]);
+// printf("%08x: %08x %08x %08x %08x | %08x %08x %08x %08x\n",scene_index,m_wram[scene_index+0],m_wram[scene_index+1],m_wram[scene_index+2],m_wram[scene_index+3],
+// m_wram[scene_index+4],m_wram[scene_index+5],m_wram[scene_index+6],m_wram[scene_index+7]);
if(scene_enabled)
{
@@ -739,7 +739,7 @@ data:
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
- 101100101 101100101 101100101 101100101
+ 101100101 101100101 101100101 101100101
101001 1001 0000
@@ -759,7 +759,7 @@ data:
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
- 101100101 101100101 101100101 101100101 101100101 101100101
+ 101100101 101100101 101100101 101100101 101100101 101100101
101001 1001 0000
@@ -780,7 +780,7 @@ data:
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
- 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+ 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101001 1001 0000
@@ -800,7 +800,7 @@ data:
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
- 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+ 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101001 1001 0000
@@ -820,12 +820,12 @@ data:
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
- 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+ 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101001 1001 0000
(this is 239 repeats)
-
+
101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
@@ -841,13 +841,13 @@ data:
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
- 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+ 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
(then what happens?! is this part of the same sprite or just running past the end of the compressed source block?)
(this is also a repeat of 239 values, but this time 11 bit ones)
- 101001110000000
-
+ 101001110000000
+
10101000100 10101000100 10101000100 10101000100 10101000100 10101000100
10101000100 10101000100 10101000100 10101000100 10101000100 10101000100
10101000100 10101000100 10101000100 10101000100 10101000100 10101000100
@@ -894,35 +894,35 @@ data:
219 in char test
02 08 00 8c|8a 03 78 00|90 01 e0 02|17 00 27 00
-data: 000101 010 001011 010 000011
+data: 000101 010 001011 010 000011
(40 (0x28) 'repeat' values, last one is different)
1101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 10110010
1101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 10110010
1101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 10110010
1101100101 101100101 101100101 101100101 101100101 101100101
-
+
10100110010000
-
- 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+
+ 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101
-
+
101001 1001 0000 << this string again before repeating data..
(39 (0x27) repeat)
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101
-
+
101001 1001 0000 << this string again before repeating data..
(39 (0x27) 'repeat' values, last one is different)
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
- 101100101 101100101 101100101 101100101 101100101 101100101
-
+ 101100101 101100101 101100101 101100101 101100101 101100101
+
000000 000000
@@ -932,7 +932,7 @@ data: 000101 010 001011 010 000011
703 - another (mostly) blank?
02 08 00 8c|1a 00 3f 03|90 01 e0 02|23 00 67 00
-data: 000101 001100 10000
+data: 000101 001100 10000
(0x67 repeats...)
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
@@ -942,9 +942,9 @@ data: 000101 001100 10000
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101
-
+
101001 1001 0000 << this.. again
-
+
(0x67 repeats...)
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
@@ -953,32 +953,32 @@ data: 000101 001100 10000
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101
-
+
101001 1001 0000
-
+
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
- 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-
+ 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+
1010011001 0000
-
+
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101
-
+
10100111111111000000101000110000110010100010100111110100010110100100101101101010101100000101111100110010101110001010100011001000110010101011
101100101
- 10101000111001100101010111010011111001001001000011001010001010011111010001011010010010 110110100 110010000
-
- 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+ 10101000111001100101010111010011111001001001000011001010001010011111010001011010010010 110110100 110010000
+
+ 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-
+
10100110010000
101100101
@@ -988,10 +988,10 @@ data: 000101 001100 10000
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
- 101100101 101100101 101100101 101100101 101100101 101100101
-
+ 101100101 101100101 101100101 101100101 101100101 101100101
+
101001 1001 0000
-
+
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
@@ -1011,33 +1011,33 @@ data: 000101 001100 10000
not all data is 9-bit, some blocks are made of 11-bit repeating values, see first example.
-
+
02 08 00 8c|90 03 78 00|90 01 e0 02|17 00 27 00
-data:
+data:
00010101 00010110 10000 0111
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101
101001100 10000
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101
101001100 10000
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101
101001100 10000
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
-101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101 101100101
+101100101 101100101 101100101 101100101 101100101 101100101 101100101
00000000000000
@@ -1265,7 +1265,7 @@ WRITE8_MEMBER(gunpey_state::gunpey_blitter_upper2_w)
WRITE8_MEMBER(gunpey_state::gunpey_output_w)
{
//bit 0 is coin counter
-// popmessage("%02x",data);
+// popmessage("%02x",data);
m_oki->set_bank_base(((data & 0x70)>>4) * 0x40000);
}
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 5dda9cace30..0ee15da5409 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -609,7 +609,7 @@ static MACHINE_CONFIG_DERIVED( bucky, moo )
/* video hardware */
MCFG_PALETTE_LENGTH(4096)
-
+
MCFG_VIDEO_START_OVERRIDE(moo_state,bucky)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index 90261349000..6f62876cd8f 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -29,7 +29,7 @@ public:
DECLARE_READ8_MEMBER( es5503_sample_r );
DECLARE_WRITE16_MEMBER( output_w );
DECLARE_READ16_MEMBER( coin_chip_r );
- DECLARE_WRITE16_MEMBER( coin_chip_w );
+ DECLARE_WRITE16_MEMBER( coin_chip_w );
};
/*************************************
diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c
index f011b8b25e4..60878ab855d 100644
--- a/src/mame/drivers/multfish.c
+++ b/src/mame/drivers/multfish.c
@@ -1,7 +1,7 @@
/*
todo: bank handlers etc. should be installed on a per-game basis
to make it clearer why all the sets with hacked bank
- setup existed in the wild
+ setup existed in the wild
*/
/*
@@ -2004,7 +2004,7 @@ ROM_END
ROM_START( lhaunt_11 ) // 100331 entertainment
ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked
ROM_LOAD( "lh_x_100331.rom", 0x00000, 0x40000, CRC(992c4f25) SHA1(23618fb387e24fae26c7cd184bc61be61c11ad62) )
-
+
ROM_REGION( 0x400000, "gfx", 0 )
ROM_LOAD( "luckyhaunter_ent.001", 0x000000, 0x80000, CRC(f4d3eb09) SHA1(ac6796250a60cf926087671e9fac3980a136d86e) )
ROM_LOAD( "luckyhaunter_ent.002", 0x100000, 0x80000, CRC(a2a88abc) SHA1(d417ab939faab373fc50abec5dc6edc160f0fdfb) )
@@ -3106,7 +3106,7 @@ ROM_END
ROM_START( gnome_12 ) // 100326 Russia
ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked
ROM_LOAD( "gn_100326.rom", 0x00000, 0x40000, CRC(78585923) SHA1(c3fadbb9e1de317ec5be78c102dd90a64b85e816) )
-
+
ROM_REGION( 0x400000, "gfx", 0 )
ROM_LOAD( "gnome.001", 0x000000, 0x80000, CRC(6ed866d7) SHA1(68d75d24d98e6d533cb26ceac0a680203cb26069) )
ROM_LOAD( "gnome.002", 0x100000, 0x80000, CRC(f6e5e6f0) SHA1(9751e8df87f14a252595547d24b8dd865ee4f08d) )
@@ -3370,7 +3370,7 @@ Most games had a revision in early 2007 to meet the standards of the "Government
//GAME( 2003, crzmon_11, crzmon_parent, multfish, multfish, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (081113 Lottery)", GAME_SUPPORTS_SAVE ) /* Lottery */
//GAME( 2003, crzmon_12, crzmon_parent, multfish, multfish, multfish_state, crzmonent,ROT0, "Igrosoft", "Crazy Monkey (090711 Entertainment)", GAME_SUPPORTS_SAVE ) /* Entertainment */
GAME( 2003, crzmon13, 0, multfish, multfish, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (100311 World)", GAME_SUPPORTS_SAVE ) /* World */
-// GAME( 2003, crzmon_14, crzmon_parent, multfish, multfish, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (100311 Lottery)", GAME_SUPPORTS_SAVE ) /* Lottery */
+// GAME( 2003, crzmon_14, crzmon_parent, multfish, multfish, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (100311 Lottery)", GAME_SUPPORTS_SAVE ) /* Lottery */
GAME( 2003, crzmon_15, crzmon_parent, multfish, multfish, multfish_state, crzmonent,ROT0, "Igrosoft", "Crazy Monkey (100311 Entertainment)", GAME_SUPPORTS_SAVE ) /* Entertainment */
GAME( 2003, crzmon_16, crzmon_parent, multfish, multfish, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (100312 Russia)", GAME_SUPPORTS_SAVE ) /* Russia */
@@ -3440,7 +3440,7 @@ Most games had a revision in early 2007 to meet the standards of the "Government
//GAME( 2004, resdnt_4, resdnt_parent, multfish, multfish, driver_device, 0, ROT0, "Igrosoft", "Resident (090129 Lottery)", GAME_SUPPORTS_SAVE ) /* Lottery */
//GAME( 2004, resdnt_5, resdnt_parent, multfish, multfish, multfish_state, resdntent,ROT0, "Igrosoft", "Resident (090722 Entertainment)", GAME_SUPPORTS_SAVE ) /* Entertainment */
GAME( 2004, resdnt_6, 0, multfish, multfish, driver_device, 0, ROT0, "Igrosoft", "Resident (100311 World)", GAME_SUPPORTS_SAVE ) /* World */
-// GAME( 2004, resdnt_7, resdnt_parent, multfish, multfish, driver_device, 0, ROT0, "Igrosoft", "Resident (100311 Lottery)", GAME_SUPPORTS_SAVE ) /* Lottery */
+// GAME( 2004, resdnt_7, resdnt_parent, multfish, multfish, driver_device, 0, ROT0, "Igrosoft", "Resident (100311 Lottery)", GAME_SUPPORTS_SAVE ) /* Lottery */
GAME( 2004, resdnt_8, resdnt_parent, multfish, multfish, multfish_state, resdntent,ROT0, "Igrosoft", "Resident (100311 Entertainment)", GAME_SUPPORTS_SAVE ) /* Entertainment */
GAME( 2004, resdnt_9, resdnt_parent, multfish, multfish, driver_device, 0, ROT0, "Igrosoft", "Resident (100316 Russia)", GAME_SUPPORTS_SAVE ) /* Russia */
diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c
index 206eaa3d42c..7c355985172 100644
--- a/src/mame/drivers/namcos10.c
+++ b/src/mame/drivers/namcos10.c
@@ -422,7 +422,7 @@ READ32_MEMBER(namcos10_state::nand_status_r )
WRITE32_MEMBER(namcos10_state::nand_address1_w )
{
logerror("nand_a1_w %08x (%08x)\n", data, space.device().safe_pc());
- // nand_address = ( nand_address & 0x00ffffff ) | ( ( data & 0xff ) << 24 );
+ // nand_address = ( nand_address & 0x00ffffff ) | ( ( data & 0xff ) << 24 );
}
WRITE32_MEMBER(namcos10_state::nand_address2_w )
@@ -459,7 +459,7 @@ READ32_MEMBER(namcos10_state::nand_data_r )
{
UINT32 data = nand_read2( nand_address * 2 );
- // logerror("read %08x = %04x\n", nand_address*2, data);
+ // logerror("read %08x = %04x\n", nand_address*2, data);
/* printf( "data<-%08x (%08x)\n", data, nand_address ); */
nand_address++;
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index d9735347e83..25a29daf5e6 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -312,7 +312,7 @@ OutTrigger 840-0017C 22163 19 (64Mb) ?
Power Stone 841-0001C 21597 8 (64Mb) present 315-6213 317-5046-COM joystick + 3 buttons
Power Stone 2 841-0008C 23127 9 (64Mb) present 315-6213 317-5054-COM joystick + 3 buttons
Puyo Puyo Da! 841-0006C 22206 20 (64Mb) ? ? ?
-Ring Out 4x4 840-0004C 21779 10 (64Mb) ? ? ?
+Ring Out 4x4 840-0004C 21779 10 (64Mb) ? ? ?
Samba de Amigo (prototype) 840-0020C proto 16 (64Mb) ? 315-6213 317-0270-COM will boot but requires special controller to play it
Samba de Amigo (Rev B) 840-0020C 22966B 16 (64Mb) ? 315-6213 317-0270-COM will boot but requires special controller to play it
Sega Marine Fishing 840-0027C 22221 10 (64Mb) ? 315-6213 not present ROM 3&4 not present. Requires special I/O board and fishing controller
@@ -427,7 +427,7 @@ Alien Front (Rev T) 840-0048C 23586T 5 (128Mb) 3
Capcom Vs. SNK Millennium Fight 2000 (Rev A) 841-0011C 23511A 7 (128Mb) 315-6219 present 317-5059-COM (000804)
Capcom Vs. SNK Millennium Fight 2000 (Rev C) 841-0011C 23511C 7 (128Mb) 315-6319 present 317-5059-COM (000904)
Club Kart: European Session (Rev D) 840-0062C 21473D 11 (128Mb) 315-6319A present 317-0313-COM
-Crackin' DJ 840-0043C 23450D 10 (128Mb) 315-6319 present ?
+Crackin' DJ 840-0043C 23450D 10 (128Mb) 315-6319 present ?
Derby Owners Club II (Rev B) 840-0083C 22306B 11 (128Mb) 315-6319A present not present
Derby Owners Club World Edition (Rev C) 840-0088C 22336C 7 (128Mb) 315-6319A present not present
Derby Owners Club World Edition (Rev D) 840-0088C 22336D 7 (128Mb) 315-6319A present not present 2 MaskROM are different from Rev C
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 7dc6aa6712f..2f043e18cc7 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1322,7 +1322,7 @@ DEVICE_IMAGE_LOAD_MEMBER( neogeo_state, neo_cartridge )
}
else
machine().memory().region_free(":ymsnd.deltat"); // removing the region will fix sound glitches in non-Delta-T games
- ym->reset(); // and this makes the new pointers take effect
+ ym->reset(); // and this makes the new pointers take effect
size = image.get_software_region_length("sprites");
machine().memory().region_free(":sprites");
machine().memory().region_alloc(":sprites",size,1, ENDIANNESS_LITTLE);
diff --git a/src/mame/drivers/popobear.c b/src/mame/drivers/popobear.c
index e4e82d21eeb..facfbcf2163 100644
--- a/src/mame/drivers/popobear.c
+++ b/src/mame/drivers/popobear.c
@@ -7,10 +7,10 @@
TODO:
- auto-animation speed is erratic (way too fast);
- BGM seems quite off, YM2413 core bug?
- - IRQ generation;
+ - IRQ generation;
- all possible related to some timers?
-
-
+
+
- I/Os;
- Port 0x620000 is quite a mystery, some silly protection?
@@ -251,7 +251,7 @@ void popobear_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect
---- ---- ---- --x- NOT set on the enemy character / characters in your line
---- ---- ---- ---x set on opposite to above?
*/
-
+
for (int drawpri = 0xf;drawpri>=0x0;drawpri--)
{
/* 0x106 = 8 x 8 */
@@ -262,9 +262,9 @@ void popobear_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect
int x = vram[i+0x7f800+4]|(vram[i+0x7f800+5]<<8);
int spr_num = vram[i+0x7f800+6]|(vram[i+0x7f800+7]<<8);
int param = vram[i+0x7f800+0]|(vram[i+0x7f800+1]<<8);
-
+
int pri = (param & 0x0f00)>>8;
-
+
// we do this because it's sprite<->sprite priority,
if (pri!=drawpri)
continue;
@@ -281,7 +281,7 @@ void popobear_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect
if (param&0xf000) color_bank = (machine().rand() & 0x3);
-
+
int add_it = 0;
@@ -297,12 +297,12 @@ void popobear_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect
//color_bank = (machine().rand() & 0x3);
add_it = color_bank*0x40;
break;
-
+
case 0x2: // characters in intro, main player, powerups, timer, large dancing chars between levels (0x3f?)
//color_bank = (machine().rand() & 0x3);
add_it = color_bank*0x40;
break;
-
+
case 0x3: // letters on GAME OVER need this..
add_it = color_bank*0x40;
add_it += 0x20;
@@ -359,7 +359,7 @@ UINT32 popobear_state::screen_update_popobear(screen_device &screen, bitmap_ind1
//popmessage("%04x",m_vregs[0/2]);
UINT16* vreg = m_vregs;
-// popmessage("%04x %04x %04x %04x %04x %04x %04x - %04x - %04x %04x",vreg[0x00],vreg[0x01],vreg[0x02],vreg[0x03],vreg[0x04],vreg[0x05],vreg[0x06], vreg[0x0b],vreg[0x0e],vreg[0x0f]);
+// popmessage("%04x %04x %04x %04x %04x %04x %04x - %04x - %04x %04x",vreg[0x00],vreg[0x01],vreg[0x02],vreg[0x03],vreg[0x04],vreg[0x05],vreg[0x06], vreg[0x0b],vreg[0x0e],vreg[0x0f]);
// vreg[0x00] also looks like it could be some enable registers
// 0x82ff - BMC logo
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 1bd64c90630..84673038d4f 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -1161,7 +1161,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( harem ) /* Switch 8 doesn't appear to mapped (just like Scorpion) */
PORT_START("IN0") // $6100 - PPI0 Port A
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Up in Cocktail - Not Used */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Up in Cocktail - Not Used */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1176,15 +1176,15 @@ static INPUT_PORTS_START( harem ) /* Switch 8 doesn't appear to mapped (just lik
PORT_DIPSETTING( 0x02, "3" )
PORT_DIPSETTING( 0x01, "4" )
PORT_DIPSETTING( 0x00, DEF_STR( Infinite ) )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Button2 in Cocktail - Not Used */
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Button1 in Cocktail - Not Used */
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Right in Cocktail - Not Used */
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Left in Cocktail - Not Used */
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Button2 in Cocktail - Not Used */
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Button1 in Cocktail - Not Used */
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Right in Cocktail - Not Used */
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Left in Cocktail - Not Used */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
PORT_START("IN2") // $6102 - PPI0 Port C
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Down in Cocktail */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Same hardware as Scorpion: P2 Down in Cocktail */
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5")
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index 94780f0d74b..0f379e69c0f 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -818,7 +818,7 @@ UINT32 seattle_state::pci_bridge_r(address_space &space, UINT8 reg, UINT8 type)
void seattle_state::pci_bridge_w(address_space &space, UINT8 reg, UINT8 type, UINT32 data)
-{
+{
m_galileo.pci_bridge_regs[reg] = data;
if (LOG_PCI)
logerror("%08X:PCI bridge write: reg %d type %d = %08X\n", space.device().safe_pc(), reg, type, data);
@@ -833,7 +833,7 @@ void seattle_state::pci_bridge_w(address_space &space, UINT8 reg, UINT8 type, UI
*************************************/
UINT32 seattle_state::pci_3dfx_r(address_space &space, UINT8 reg, UINT8 type)
-{
+{
UINT32 result = m_galileo.pci_3dfx_regs[reg];
switch (reg)
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 9ccff9bba14..d4c3fc87d73 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -2821,30 +2821,30 @@ ROM_START( pclb2elk ) // set to 1p
ROM_END
-GAME( 1996, stvbios, 0, stv_slot, stv, stv_state, stv, ROT0, "Sega", "ST-V Bios", GAME_IS_BIOS_ROOT )
+GAME( 1996, stvbios, 0, stv_slot, stv, stv_state, stv, ROT0, "Sega", "ST-V Bios", GAME_IS_BIOS_ROOT )
//GAME YEAR, NAME, PARENT, MACH, INP, INIT, MONITOR
/* Playable */
-GAME( 1998, astrass, stvbios, stv, stv6b, stv_state, astrass, ROT0, "Sunsoft", "Astra SuperStars (J 980514 V1.002)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
+GAME( 1998, astrass, stvbios, stv, stv6b, stv_state, astrass, ROT0, "Sunsoft", "Astra SuperStars (J 980514 V1.002)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
GAME( 1995, bakubaku, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Baku Baku Animal (J 950407 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1996, batmanfr, stvbios, stv, stv, stv_state, batmanfr, ROT0, "Acclaim", "Batman Forever (JUE 960507 V1.000)", GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1996, colmns97, stvbios, stv, stv, stv_state, colmns97, ROT0, "Sega", "Columns '97 (JET 961209 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1997, cotton2, stvbios, stv, stv, stv_state, cotton2, ROT0, "Success", "Cotton 2 (JUET 970902 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1998, cottonbm, stvbios, stv, stv, stv_state, cottonbm, ROT0, "Success", "Cotton Boomerang (JUET 980709 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1995, critcrsh, stvbios, stv, critcrsh, stv_state, critcrsh, ROT0, "Sega", "Critter Crusher (EA 951204 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
-GAME( 1999, danchih, stvbios, stv, stvmp, stv_state, danchih, ROT0, "Altron (Tecmo license)", "Danchi de Hanafuda (J 990607 V1.400)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
+GAME( 1999, danchih, stvbios, stv, stvmp, stv_state, danchih, ROT0, "Altron (Tecmo license)", "Danchi de Hanafuda (J 990607 V1.400)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 2000, danchiq, stvbios, stv, stv, stv_state, danchiq, ROT0, "Altron", "Danchi de Quiz Okusan Yontaku Desuyo! (J 001128 V1.200)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1996, diehard, stvbios, stv, stv, stv_state, diehard, ROT0, "Sega", "Die Hard Arcade (UET 960515 V1.000)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
GAME( 1996, dnmtdeka, diehard, stv, stv, stv_state, dnmtdeka, ROT0, "Sega", "Dynamite Deka (J 960515 V1.000)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
GAME( 1995, ejihon, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Ejihon Tantei Jimusyo (J 950613 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1995, fhboxers, stvbios, stv, stv, stv_state, fhboxers, ROT0, "Sega", "Funky Head Boxers (JUETBKAL 951218 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1997, findlove, stvbios, stv, stv, stv_state, stv, ROT0, "Daiki / FCF", "Zenkoku Seifuku Bishoujo Grand Prix Find Love (J 971212 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
-GAME( 1994, gaxeduel, stvbios, stv, stv6b, stv_state, gaxeduel, ROT0, "Sega", "Golden Axe - The Duel (JUETL 950117 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS)
+GAME( 1994, gaxeduel, stvbios, stv, stv6b, stv_state, gaxeduel, ROT0, "Sega", "Golden Axe - The Duel (JUETL 950117 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS)
GAME( 1998, grdforce, stvbios, stv, stv, stv_state, grdforce, ROT0, "Success", "Guardian Force (JUET 980318 V0.105)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
-GAME( 1998, groovef, stvbios, stv, stv6b, stv_state, groovef, ROT0, "Atlus", "Groove on Fight - Gouketsuji Ichizoku 3 (J 970416 V1.001)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
+GAME( 1998, groovef, stvbios, stv, stv6b, stv_state, groovef, ROT0, "Atlus", "Groove on Fight - Gouketsuji Ichizoku 3 (J 970416 V1.001)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1997, hanagumi, stvbios, stv, stv, stv_state, hanagumi, ROT0, "Sega", "Sakura Taisen - Hanagumi Taisen Columns (J 971007 V1.010)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
GAME( 1996, introdon, stvbios, stv, stv, stv_state, stv, ROT0, "Sunsoft / Success", "Karaoke Quiz Intro Don Don! (J 960213 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
-GAME( 1995, kiwames, stvbios, stv, stvmp, stv_state, stvmp, ROT0, "Athena", "Pro Mahjong Kiwame S (J 951020 V1.208)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
+GAME( 1995, kiwames, stvbios, stv, stvmp, stv_state, stvmp, ROT0, "Athena", "Pro Mahjong Kiwame S (J 951020 V1.208)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1997, maruchan, stvbios, stv, stv, stv_state, maruchan, ROT0, "Sega / Toyosuisan", "Maru-Chan de Goo! (J 971216 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1996, mausuke, stvbios, stv, stv, stv_state, mausuke, ROT0, "Data East", "Mausuke no Ojama the World (J 960314 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1998, myfairld, stvbios, stv, myfairld, stv_state, stvmp, ROT0, "Micronet", "Virtual Mahjong 2 - My Fair Lady (J 980608 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
@@ -2865,7 +2865,7 @@ GAME( 1997, thuntk, sandor, stv, stv, stv_state, sandor, ROT
GAME( 1995, smleague, stvbios, stv, stv, stv_state, smleague, ROT0, "Sega", "Super Major League (U 960108 V1.000)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1995, finlarch, smleague,stv, stv, stv_state, finlarch, ROT0, "Sega", "Final Arch (J 950714 V1.001)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1996, sokyugrt, stvbios, stv, stv, stv_state, sokyugrt, ROT0, "Raizing / Eighting", "Soukyugurentai / Terra Diver (JUET 960821 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
-GAME( 1995, suikoenb, stvbios, stv, stv6b, stv_state, suikoenb, ROT0, "Data East", "Suiko Enbu / Outlaws of the Lost Dynasty (JUETL 950314 V2.001)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
+GAME( 1995, suikoenb, stvbios, stv, stv6b, stv_state, suikoenb, ROT0, "Data East", "Suiko Enbu / Outlaws of the Lost Dynasty (JUETL 950314 V2.001)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1996, vfkids, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Virtua Fighter Kids (JUET 960319 V0.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1997, vmahjong, stvbios, stv, myfairld, stv_state, stvmp, ROT0, "Micronet", "Virtual Mahjong (J 961214 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1997, winterht, stvbios, stv, stv, stv_state, winterht, ROT0, "Sega", "Winter Heat (JUET 971012 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
@@ -2873,22 +2873,22 @@ GAME( 1997, znpwfv, stvbios, stv, stv, stv_state, znpwfv, ROT
/* Almost */
GAME( 1998, twcup98, stvbios, stv, stv, stv_state, twcup98, ROT0, "Tecmo", "Tecmo World Cup '98 (JUET 980410 V1.000)", GAME_UNEMULATED_PROTECTION | GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
-GAME( 1998, elandore, stvbios, stv, stv6b, stv_state, elandore, ROT0, "Sai-Mate", "Touryuu Densetsu Elan-Doree / Elan Doree - Legend of Dragoon (JUET 980922 V1.006)", GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION | GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
+GAME( 1998, elandore, stvbios, stv, stv6b, stv_state, elandore, ROT0, "Sai-Mate", "Touryuu Densetsu Elan-Doree / Elan Doree - Legend of Dragoon (JUET 980922 V1.006)", GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION | GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
/* Unemulated printer / camera devices */
GAME( 1998, stress, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Stress Busters (J 981020 V1.000)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
GAME( 1997, nclubv3, stvbios, stv, stv, stv_state, nameclv3, ROT0, "Sega", "Name Club Ver.3 (J 970723 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_NOT_WORKING )
GAME( 1997, pclub2, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 (U 970921 V1.000)", GAME_NOT_WORKING )
-GAME( 1999, pclub2fc, pclub2, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Felix The Cat (Rev. A) (J 970415 V1.100)", GAME_NOT_WORKING )
-GAME( 1997, pclb297w, pclub2, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '97 Winter Ver (J 971017 V1.100)", GAME_NOT_WORKING )
-GAME( 1997, pclub298, pclub2, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Spring Ver (J 971017 V1.100)", GAME_NOT_WORKING )
-GAME( 1998, pclb298a, pclub2, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Autumn Ver (J 980827 V1.000)", GAME_NOT_WORKING )
-GAME( 1999, pclubor, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Goukakenran (J 991104 V1.000)", GAME_NOT_WORKING )
-GAME( 1999, pclubol, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Olive (J 980717 V1.000)", GAME_NOT_WORKING )
-GAME( 1999, pclub2v3, pclub2, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 3 (U 990310 V1.000)", GAME_NOT_WORKING )
-GAME( 1999, pclubpok, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Pokemon B (U 991126 V1.000)", GAME_NOT_WORKING )
-GAME( 1997, pclub2kc, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Kome Kome Club (J 970203 V1.000)", GAME_NOT_WORKING )
-GAME( 1997, pclb2elk, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Earth Limited Kobe (Print Club Custom) (J 970808 V1.000)", GAME_NOT_WORKING )
+GAME( 1999, pclub2fc, pclub2, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Felix The Cat (Rev. A) (J 970415 V1.100)", GAME_NOT_WORKING )
+GAME( 1997, pclb297w, pclub2, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '97 Winter Ver (J 971017 V1.100)", GAME_NOT_WORKING )
+GAME( 1997, pclub298, pclub2, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Spring Ver (J 971017 V1.100)", GAME_NOT_WORKING )
+GAME( 1998, pclb298a, pclub2, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Autumn Ver (J 980827 V1.000)", GAME_NOT_WORKING )
+GAME( 1999, pclubor, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Goukakenran (J 991104 V1.000)", GAME_NOT_WORKING )
+GAME( 1999, pclubol, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Olive (J 980717 V1.000)", GAME_NOT_WORKING )
+GAME( 1999, pclub2v3, pclub2, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 3 (U 990310 V1.000)", GAME_NOT_WORKING )
+GAME( 1999, pclubpok, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Pokemon B (U 991126 V1.000)", GAME_NOT_WORKING )
+GAME( 1997, pclub2kc, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Kome Kome Club (J 970203 V1.000)", GAME_NOT_WORKING )
+GAME( 1997, pclb2elk, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Earth Limited Kobe (Print Club Custom) (J 970808 V1.000)", GAME_NOT_WORKING )
/* Doing something.. but not enough yet */
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index f520cde5174..d30b445b752 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -482,7 +482,7 @@ static ADDRESS_MAP_START( taitowlf_map, AS_PROGRAM, 32, taitowlf_state )
AM_RANGE(0x000f0000, 0x000fffff) AM_ROMBANK("bank1")
AM_RANGE(0x000f0000, 0x000fffff) AM_WRITE(bios_ram_w)
AM_RANGE(0x00100000, 0x01ffffff) AM_RAM
-// AM_RANGE(0xf8000000, 0xf83fffff) AM_ROM AM_REGION("user3", 0)
+// AM_RANGE(0xf8000000, 0xf83fffff) AM_ROM AM_REGION("user3", 0)
AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("user1", 0) /* System BIOS */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index e49b8cf468c..aa06b084e91 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -509,7 +509,7 @@ public:
void update_sio_irqs();
inline void _add_dynamic_address(offs_t start, offs_t end, read32_space_func read, write32_space_func write, const char *rdname, const char *wrname);
inline void _add_dynamic_device_address(device_t *device, offs_t start, offs_t end, read32_device_func read, write32_device_func write, const char *rdname, const char *wrname);
-
+
void init_common(int ioasic, int serialnum);
};
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 0d0e5dbddbe..77f329913c5 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -645,7 +645,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( headons )
PORT_INCLUDE( headon )
-
+
PORT_MODIFY(COLOR_BW_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* no color/bw option */
INPUT_PORTS_END
diff --git a/src/mame/drivers/wmg.c b/src/mame/drivers/wmg.c
index 49d9cbb1ff5..4dfaf17518d 100644
--- a/src/mame/drivers/wmg.c
+++ b/src/mame/drivers/wmg.c
@@ -28,17 +28,17 @@ There are 3 boards - the CPU board, the Sound board, and the Widget board.
- The Sound board only has the new sound ROM. The sounds are selected via the bank number from C400.
- The Widget board has the joysticks and buttons connected to it. These are steered to the correct
- inputs by a custom-programmed large square XC9572 84-pin chip. This is also controlled by
- the bank number from C400.
+ inputs by a custom-programmed large square XC9572 84-pin chip. This is also controlled by
+ the bank number from C400.
- The CPU board has 3 components:
-- A DS1225AD 8k x 8 NVRAM. Like the other chips, it is banked, giving each game its own save area.
-- The new cpu ROM, containing code for the 6 games and the menu. Splat and Defender are slightly
- modified to work properly on the Robotron hardware. Splat is converted from SC2 to SC1; while
- Defender has the I/O devices remapped to suit the hardware.
+ modified to work properly on the Robotron hardware. Splat is converted from SC2 to SC1; while
+ Defender has the I/O devices remapped to suit the hardware.
-- A square custom-programmed 44-pin chip (number rubbed off), which performs all the bank-switching,
- the special changes for Defender, the lock feature, and the sound cpu reset. It is not known
- which square chip detects and acts on the P1+P2 reset.
+ the special changes for Defender, the lock feature, and the sound cpu reset. It is not known
+ which square chip detects and acts on the P1+P2 reset.
Setting it up:
@@ -136,13 +136,13 @@ WRITE8_MEMBER( wmg_state::wmg_rombank_w )
data &= 7;
- if ((!data) || (!m_wmg_bank)) // we must be going to/from the menu
+ if ((!data) || (!m_wmg_bank)) // we must be going to/from the menu
{
m_wmg_bank = data;
wmg_def_rombank_w( space1, 0, 0);
- memcpy( &RAM[0x10000], &RAM[(data << 16) + 0x20000], 0x9000 ); /* Gfx etc */
- membank("bank5")->set_entry(data); /* Code */
- membank("bank6")->set_entry(data); /* Sound */
+ memcpy( &RAM[0x10000], &RAM[(data << 16) + 0x20000], 0x9000 ); /* Gfx etc */
+ membank("bank5")->set_entry(data); /* Code */
+ membank("bank6")->set_entry(data); /* Sound */
}
}
@@ -187,7 +187,7 @@ WRITE8_MEMBER( wmg_state::wmg_def_rombank_w )
{
address_space &space1 = m_maincpu->space(AS_PROGRAM);
data &= 15;
- if ((m_wmg_def_bank != data) && (m_wmg_bank == 5) && (data))
+ if ((m_wmg_def_bank != data) && (m_wmg_bank == 5) && (data))
{
m_wmg_def_bank = data;
@@ -268,14 +268,14 @@ static const pia6821_interface wmg_muxed_pia_0_intf =
READ8_MEMBER( wmg_state::wmg_pia_0_r )
{
/* if player presses P1 and P2 in a game, return to the menu.
- Since there is no code in rom to handle this, it must be a hardware feature
- which probably just resets the cpu. */
+ Since there is no code in rom to handle this, it must be a hardware feature
+ which probably just resets the cpu. */
address_space &space1 = m_maincpu->space(AS_PROGRAM);
pia6821_device *pia_0 = space1.machine().device<pia6821_device>("pia_0");
UINT8 data = pia_0->read(space1, offset);
- if ((m_wmg_bank) && (!offset) && ((data & 0x30) == 0x30)) // P1 and P2 pressed
+ if ((m_wmg_bank) && (!offset) && ((data & 0x30) == 0x30)) // P1 and P2 pressed
{
wmg_rombank_w( space1, 0, 0);
m_maincpu->reset();
@@ -298,8 +298,8 @@ static ADDRESS_MAP_START( wmg_cpu1, AS_PROGRAM, 8, wmg_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( wmg_cpu2, AS_PROGRAM, 8, wmg_state )
- AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
- AM_RANGE(0x0080, 0x00ff) AM_RAM /* MC6810 RAM */
+ AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
+ AM_RANGE(0x0080, 0x00ff) AM_RAM /* MC6810 RAM */
AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pia_2", pia6821_device, read, write)
/* These next 2 are actually banked in CPU 1, but its not something Mame can handle very well. Placed here instead. */
AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITEONLY AM_SHARE("paletteram")
@@ -507,10 +507,10 @@ DRIVER_INIT_MEMBER( wmg_state, wmg )
{
UINT8 *RAM = memregion("maincpu")->base();
UINT8 *ROM = memregion("soundcpu")->base();
- membank("bank5")->configure_entries(0, 8, &RAM[0x2d000], 0x10000); /* Code */
- membank("bank6")->configure_entries(0, 8, &ROM[0x10000], 0x1000); /* Sound */
- membank("bank7")->configure_entries(1, 4, &RAM[0x78000], 0x1000); /* Defender roms */
-// CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
+ membank("bank5")->configure_entries(0, 8, &RAM[0x2d000], 0x10000); /* Code */
+ membank("bank6")->configure_entries(0, 8, &ROM[0x10000], 0x1000); /* Sound */
+ membank("bank7")->configure_entries(1, 4, &RAM[0x78000], 0x1000); /* Defender roms */
+// CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
m_blitter_config = WILLIAMS_BLITTER_SC01;
m_blitter_clip_address = 0xc000;
}
diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h
index 9ec6e88ae9a..d65f2e0fe94 100644
--- a/src/mame/includes/actfancr.h
+++ b/src/mame/includes/actfancr.h
@@ -36,4 +36,3 @@ public:
UINT32 screen_update_actfancr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void register_savestate( );
};
-
diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h
index e02b50fdc8c..552afcf8fa5 100644
--- a/src/mame/includes/asuka.h
+++ b/src/mame/includes/asuka.h
@@ -52,7 +52,7 @@ public:
void screen_eof_asuka(screen_device &screen, bool state);
INTERRUPT_GEN_MEMBER(cadash_interrupt);
TIMER_CALLBACK_MEMBER(cadash_interrupt5);
-
+
/*----------- defined in machine/bonzeadv.c -----------*/
void WriteLevelData();
void WriteRestartPos(int level );
@@ -61,5 +61,5 @@ public:
DECLARE_READ16_MEMBER( bonzeadv_cchip_ram_r );
DECLARE_WRITE16_MEMBER( bonzeadv_cchip_ctrl_w );
DECLARE_WRITE16_MEMBER( bonzeadv_cchip_bank_w );
- DECLARE_WRITE16_MEMBER( bonzeadv_cchip_ram_w );
+ DECLARE_WRITE16_MEMBER( bonzeadv_cchip_ram_w );
};
diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h
index 866d4f90734..6a7c8bccee8 100644
--- a/src/mame/includes/bzone.h
+++ b/src/mame/includes/bzone.h
@@ -47,7 +47,7 @@ MACHINE_CONFIG_EXTERN( bzone_audio );
// ======================> redbaron_sound_device
class redbaron_sound_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
redbaron_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -61,7 +61,7 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( redbaron_sounds_w );
+ DECLARE_WRITE8_MEMBER( redbaron_sounds_w );
private:
INT16 *m_vol_lookup;
diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h
index 92c87dd7455..e69947a38c9 100644
--- a/src/mame/includes/cps3.h
+++ b/src/mame/includes/cps3.h
@@ -123,9 +123,9 @@ public:
void cps3_process_character_dma(UINT32 address);
void copy_from_nvram();
inline void cps3_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangle &clip, gfx_element *gfx,
- unsigned int code, unsigned int color, int flipx, int flipy, int sx, int sy,
- int transparency, int transparent_color,
- int scalex, int scaley, bitmap_ind8 *pri_buffer, UINT32 pri_mask);
+ unsigned int code, unsigned int color, int flipx, int flipy, int sx, int sy,
+ int transparency, int transparent_color,
+ int scalex, int scaley, bitmap_ind8 *pri_buffer, UINT32 pri_mask);
};
@@ -140,13 +140,13 @@ public:
struct cps3_voice
{
- cps3_voice() :
- pos(0),
- frac(0)
- {
- memset(regs, 0, sizeof(UINT32)*8);
- }
-
+ cps3_voice() :
+ pos(0),
+ frac(0)
+ {
+ memset(regs, 0, sizeof(UINT32)*8);
+ }
+
UINT32 regs[8];
UINT32 pos;
UINT16 frac;
@@ -155,7 +155,7 @@ struct cps3_voice
// ======================> cps3_sound_device
class cps3_sound_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
cps3_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -169,8 +169,8 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE32_MEMBER( cps3_sound_w );
- DECLARE_READ32_MEMBER( cps3_sound_r );
+ DECLARE_WRITE32_MEMBER( cps3_sound_w );
+ DECLARE_READ32_MEMBER( cps3_sound_r );
private:
sound_stream *m_stream;
diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h
index 030db512e2a..54afb1d542d 100644
--- a/src/mame/includes/deco32.h
+++ b/src/mame/includes/deco32.h
@@ -153,4 +153,3 @@ public:
void screen_eof_dragngun(screen_device &screen, bool state);
void dragngun_draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect, const UINT32 *spritedata);
};
-
diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h
index f9b3e17a48b..194ddedcdc8 100644
--- a/src/mame/includes/deco_mlc.h
+++ b/src/mame/includes/deco_mlc.h
@@ -7,7 +7,7 @@ public:
m_irq_ram(*this, "irq_ram"),
m_mlc_clip_ram(*this, "mlc_clip_ram"),
m_mlc_vram(*this, "mlc_vram")
-
+
{ }
required_shared_ptr<UINT32> m_mlc_ram;
@@ -48,7 +48,7 @@ public:
DECLARE_READ32_MEMBER(mlc_spriteram_r);
DECLARE_WRITE32_MEMBER(mlc_spriteram_w);
-
+
DECLARE_DRIVER_INIT(mlc);
DECLARE_DRIVER_INIT(avengrgs);
diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h
index 7fc139daec3..48416c19966 100644
--- a/src/mame/includes/fastfred.h
+++ b/src/mame/includes/fastfred.h
@@ -76,5 +76,5 @@ public:
DECLARE_WRITE8_MEMBER(fastfred_flip_screen_y_w);
DECLARE_WRITE8_MEMBER(imago_fg_videoram_w);
- DECLARE_WRITE8_MEMBER(imago_charbank_w);
+ DECLARE_WRITE8_MEMBER(imago_charbank_w);
};
diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h
index edd6e5928b7..3dc24258334 100644
--- a/src/mame/includes/galpani2.h
+++ b/src/mame/includes/galpani2.h
@@ -67,6 +67,3 @@ public:
DECLARE_WRITE16_MEMBER( galpani2_bg15_w );
};
-
-
-
diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h
index d7825257b37..4718e9fa825 100644
--- a/src/mame/includes/galpanic.h
+++ b/src/mame/includes/galpanic.h
@@ -33,5 +33,5 @@ public:
void draw_fgbitmap(bitmap_ind16 &bitmap, const rectangle &cliprect);
/*----------- defined in video/galpanic.c -----------*/
DECLARE_WRITE16_MEMBER( galpanic_bgvideoram_w );
- DECLARE_WRITE16_MEMBER( galpanic_paletteram_w );
+ DECLARE_WRITE16_MEMBER( galpanic_paletteram_w );
};
diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h
index 31d10d88622..c0ded0cf9ec 100644
--- a/src/mame/includes/gomoku.h
+++ b/src/mame/includes/gomoku.h
@@ -39,12 +39,12 @@ public:
struct gomoku_sound_channel
{
- gomoku_sound_channel():
- channel(0),
- frequency(0),
- counter(0),
- volume(0),
- oneshotplaying(0) {}
+ gomoku_sound_channel():
+ channel(0),
+ frequency(0),
+ counter(0),
+ volume(0),
+ oneshotplaying(0) {}
int channel;
int frequency;
@@ -71,11 +71,11 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( sound1_w );
- DECLARE_WRITE8_MEMBER( sound2_w );
+ DECLARE_WRITE8_MEMBER( sound1_w );
+ DECLARE_WRITE8_MEMBER( sound2_w );
private:
- void make_mixer_table(int voices, int gain);
+ void make_mixer_table(int voices, int gain);
private:
/* data about the sound system */
diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h
index 3445b381998..7b2bc2d7499 100644
--- a/src/mame/includes/gridlee.h
+++ b/src/mame/includes/gridlee.h
@@ -68,7 +68,7 @@ public:
/*----------- defined in audio/gridlee.c -----------*/
class gridlee_sound_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -82,7 +82,7 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( gridlee_sound_w );
+ DECLARE_WRITE8_MEMBER( gridlee_sound_w );
private:
/* tone variables */
diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h
index aab8f7652e7..ea5dc4eaab4 100644
--- a/src/mame/includes/itech8.h
+++ b/src/mame/includes/itech8.h
@@ -110,7 +110,7 @@ public:
inline void consume_rle(int count);
void perform_blit(address_space &space);
void itech8_update_interrupts(int periodic, int tms34061, int blitter);
-
+
/*----------- defined in machine/slikshot.c -----------*/
DECLARE_READ8_MEMBER( slikz80_port_r );
@@ -126,10 +126,9 @@ public:
UINT16 *inter1, UINT16 *inter2, UINT16 *inter3, UINT8 *beams);
void inters_to_words(UINT16 inter1, UINT16 inter2, UINT16 inter3, UINT8 *beams,
UINT16 *word1, UINT16 *word2, UINT16 *word3);
-
+
void words_to_sensors(UINT16 word1, UINT16 word2, UINT16 word3, UINT8 beams,
UINT16 *sens0, UINT16 *sens1, UINT16 *sens2, UINT16 *sens3);
void compute_sensors();
TIMER_CALLBACK_MEMBER( delayed_z80_control_w );
};
-
diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h
index 5a471d61512..a4c4075e9b3 100644
--- a/src/mame/includes/klax.h
+++ b/src/mame/includes/klax.h
@@ -19,5 +19,5 @@ public:
DECLARE_MACHINE_RESET(klax);
DECLARE_VIDEO_START(klax);
UINT32 screen_update_klax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE16_MEMBER( klax_latch_w );
+ DECLARE_WRITE16_MEMBER( klax_latch_w );
};
diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h
index 34f2f407ea7..bcb47975d2d 100644
--- a/src/mame/includes/matmania.h
+++ b/src/mame/includes/matmania.h
@@ -73,5 +73,5 @@ public:
DECLARE_WRITE8_MEMBER( maniach_68705_ddr_c_w );
DECLARE_WRITE8_MEMBER( maniach_mcu_w );
DECLARE_READ8_MEMBER( maniach_mcu_r );
- DECLARE_READ8_MEMBER( maniach_mcu_status_r );
+ DECLARE_READ8_MEMBER( maniach_mcu_status_r );
};
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index d168cbb7d84..b70dc3e5a04 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -366,4 +366,3 @@ void namcos2_adjust_posirq_timer( running_machine &machine, int scanline );
/**************************************************************/
/* Sound CPU support handlers - 6809 */
/**************************************************************/
-
diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h
index f6986c87a83..4a8cf753638 100644
--- a/src/mame/includes/neogeo.h
+++ b/src/mame/includes/neogeo.h
@@ -334,7 +334,7 @@ protected:
void set_output_data( UINT8 data );
TIMER_CALLBACK_MEMBER( ms5pcb_bios_timer_callback );
TIMER_CALLBACK_MEMBER( svcpcb_bios_timer_callback );
-
+
// protections implementation
DECLARE_READ16_MEMBER( sbp_lowerrom_r );
DECLARE_WRITE16_MEMBER( sbp_lowerrom_w );
diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h
index 2fa94845713..83ba2324944 100644
--- a/src/mame/includes/pacman.h
+++ b/src/mame/includes/pacman.h
@@ -141,7 +141,7 @@ public:
void korosuke_rom_decode();
void eyes_decode(UINT8 *data);
void mspacman_install_patches(UINT8 *ROM);
-
+
// theglopb.c
void theglobp_decrypt_rom_8();
void theglobp_decrypt_rom_9();
@@ -158,7 +158,7 @@ public:
// jumpshot.c
UINT8 jumpshot_decrypt(int addr, UINT8 e);
void jumpshot_decode();
-
+
// acitya.c
void acitya_decrypt_rom_8();
void acitya_decrypt_rom_9();
@@ -166,5 +166,5 @@ public:
void acitya_decrypt_rom_B();
DECLARE_READ8_MEMBER(acitya_decrypt_rom);
DECLARE_MACHINE_START(acitya);
- DECLARE_MACHINE_RESET(acitya);
+ DECLARE_MACHINE_RESET(acitya);
};
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index c6b66e36e5c..8d47bee5fff 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -119,7 +119,7 @@ public:
UINT32 screen_update_pgm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof_pgm(screen_device &screen, bool state);
TIMER_DEVICE_CALLBACK_MEMBER(pgm_interrupt);
-
+
// from pgmprot5.c
int protection_address;
@@ -127,12 +127,12 @@ public:
UINT8 dw2_asic_z;
UINT8 dw2_asic_y;
UINT16 dw2_asic_hold;
-
+
DECLARE_READ16_MEMBER( dw2_d80000_r );
DECLARE_WRITE16_MEMBER( dw2_d80000_w );
DECLARE_WRITE16_MEMBER(dw2_unk_w);
void pgm_dw2_decrypt();
- void drgwld2_common_init();
+ void drgwld2_common_init();
inline void pgm_draw_pix( int xdrawpos, int pri, UINT16* dest, UINT8* destpri, UINT16 srcdat);
inline void pgm_draw_pix_nopri( int xdrawpos, UINT16* dest, UINT8* destpri, UINT16 srcdat);
inline void pgm_draw_pix_pri( int xdrawpos, UINT16* dest, UINT8* destpri, UINT16 srcdat);
@@ -169,7 +169,7 @@ public:
void asic3_compute_hold();
DECLARE_READ16_MEMBER( pgm_asic3_r );
DECLARE_WRITE16_MEMBER( pgm_asic3_w );
- DECLARE_WRITE16_MEMBER( pgm_asic3_reg_w );
+ DECLARE_WRITE16_MEMBER( pgm_asic3_reg_w );
};
@@ -235,7 +235,7 @@ public:
DECLARE_DRIVER_INIT(kovboot);
DECLARE_DRIVER_INIT(oldsplus);
DECLARE_MACHINE_START(pgm_arm_type1);
-
+
DECLARE_READ32_MEMBER( pgm_arm7_type1_protlatch_r );
DECLARE_WRITE32_MEMBER( pgm_arm7_type1_protlatch_w );
DECLARE_READ16_MEMBER( pgm_arm7_type1_68k_protlatch_r );
@@ -263,7 +263,7 @@ public:
void command_handler_oldsplus(int pc);
DECLARE_WRITE16_MEMBER( pgm_arm7_type1_sim_w );
DECLARE_READ16_MEMBER( pgm_arm7_type1_sim_protram_r );
- DECLARE_READ16_MEMBER( pstars_arm7_type1_sim_protram_r );
+ DECLARE_READ16_MEMBER( pstars_arm7_type1_sim_protram_r );
};
/* for machine/pgmprot2.c type games */
@@ -366,9 +366,9 @@ public:
int m_kb_ptr;
int m_kb_region_sequence_position;
UINT32 m_kb_regs[0x10];
- int reg;
- int ptr;
- UINT8 dw3_swap;
+ int reg;
+ int ptr;
+ UINT8 dw3_swap;
required_shared_ptr<UINT16> m_sharedprotram;
DECLARE_DRIVER_INIT(killbld);
@@ -404,7 +404,7 @@ public:
DECLARE_DRIVER_INIT(olds);
DECLARE_MACHINE_RESET(olds);
-
+
UINT32 olds_prot_addr( UINT16 addr );
UINT32 olds_read_reg( UINT16 addr );
void olds_write_reg( UINT16 addr, UINT32 val );
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index f977522d07c..5322cad5c1d 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -93,7 +93,7 @@ public:
/*----------- defined in audio/polepos.c -----------*/
class polepos_sound_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -108,8 +108,8 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( polepos_engine_sound_lsb_w );
- DECLARE_WRITE8_MEMBER( polepos_engine_sound_msb_w );
+ DECLARE_WRITE8_MEMBER( polepos_engine_sound_lsb_w );
+ DECLARE_WRITE8_MEMBER( polepos_engine_sound_msb_w );
private:
UINT32 m_current_position;
diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h
index 84e6db2dac2..e08598da28b 100644
--- a/src/mame/includes/psikyosh.h
+++ b/src/mame/includes/psikyosh.h
@@ -79,5 +79,5 @@ public:
void psikyosh_postlineblend( bitmap_rgb32 &bitmap, const rectangle &cliprect, UINT8 req_pri );
void psikyosh_drawgfxzoom( bitmap_rgb32 &dest_bmp,const rectangle &clip,gfx_element *gfx,
UINT32 code,UINT32 color,int flipx,int flipy,int offsx,int offsy,
- int alpha, int zoomx, int zoomy, int wide, int high, UINT32 z);
+ int alpha, int zoomx, int zoomy, int wide, int high, UINT32 z);
};
diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h
index f12aec577e1..286b0dc80f5 100644
--- a/src/mame/includes/segas32.h
+++ b/src/mame/includes/segas32.h
@@ -46,8 +46,8 @@ public:
tilemap_t * tmap;
UINT8 page;
UINT8 bank;
- };
-
+ };
+
UINT8 m_v60_irq_control[0x10];
timer_device *m_v60_irq_timer[2];
UINT8 m_sound_irq_control[4];
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index 6af510b33d2..ee8405c86f6 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -363,15 +363,15 @@
#define DSP_FIR_C7 0x7F
-#define SNES_CPU_REG(a) m_cpu_regs[a - 0x4200] // regs 0x4200-0x421f
-#define SNES_CPU_REG_STATE(a) state->m_cpu_regs[a - 0x4200] // regs 0x4200-0x421f
+#define SNES_CPU_REG(a) m_cpu_regs[a - 0x4200] // regs 0x4200-0x421f
+#define SNES_CPU_REG_STATE(a) state->m_cpu_regs[a - 0x4200] // regs 0x4200-0x421f
/* (PPU) Video related */
struct SNES_SCANLINE
{
int enable, clip;
-
+
UINT16 buffer[SNES_SCR_WIDTH];
UINT8 priority[SNES_SCR_WIDTH];
UINT8 layer[SNES_SCR_WIDTH];
@@ -384,7 +384,7 @@ public:
UINT8 m_regs[0x40];
SNES_SCANLINE m_scanlines[2];
-
+
struct
{
/* clipmasks */
@@ -393,23 +393,23 @@ public:
UINT8 wlog_mask;
/* color math enabled */
UINT8 color_math;
-
+
UINT8 charmap;
UINT8 tilemap;
UINT8 tilemap_size;
-
+
UINT8 tile_size;
UINT8 mosaic_enabled; // actually used only for layers 0->3!
-
+
UINT8 main_window_enabled;
UINT8 sub_window_enabled;
UINT8 main_bg_enabled;
UINT8 sub_bg_enabled;
-
+
UINT16 hoffs;
UINT16 voffs;
} m_layer[6]; // this is for the BG1 - BG2 - BG3 - BG4 - OBJ - color layers
-
+
struct
{
UINT8 address_low;
@@ -427,7 +427,7 @@ public:
UINT8 flip;
UINT16 write_latch;
} m_oam;
-
+
struct
{
UINT16 latch_horz;
@@ -437,7 +437,7 @@ public:
UINT8 last_visible_line;
UINT8 interlace_count;
} m_beam;
-
+
struct
{
UINT8 repeat;
@@ -453,7 +453,7 @@ public:
UINT16 ver_offset;
UINT8 extbg;
} m_mode7;
-
+
UINT8 m_mosaic_size;
UINT8 m_clip_to_black;
UINT8 m_prevent_color_math;
@@ -461,13 +461,13 @@ public:
UINT8 m_bg3_priority_bit;
UINT8 m_direct_color;
UINT8 m_ppu_last_scroll; /* as per Anomie's doc and Theme Park, all scroll regs shares (but mode 7 ones) the same
- 'previous' scroll value */
+ 'previous' scroll value */
UINT8 m_mode7_last_scroll; /* as per Anomie's doc mode 7 scroll regs use a different value, shared with mode 7 matrix! */
-
+
UINT8 m_ppu1_open_bus, m_ppu2_open_bus;
UINT8 m_ppu1_version, m_ppu2_version;
UINT8 m_window1_left, m_window1_right, m_window2_left, m_window2_right;
-
+
UINT16 m_mosaic_table[16][4096];
UINT8 m_clipmasks[6][SNES_SCR_WIDTH];
UINT8 m_update_windows;
@@ -494,7 +494,7 @@ public:
UINT16 m_vram_fgr_shift;
UINT16 m_vram_read_buffer;
UINT16 m_vmadd;
-
+
inline UINT16 get_bgcolor(UINT8 direct_colors, UINT16 palette, UINT8 color);
inline void set_scanline_pixel(int screen, INT16 x, UINT16 color, UINT8 priority, UINT8 layer, int blend);
inline void draw_bgtile_lores(UINT8 layer, INT16 ii, UINT8 colour, UINT16 pal, UINT8 direct_colors, UINT8 priority);
@@ -531,7 +531,7 @@ public:
void ppu_start(running_machine &machine);
UINT8 read(address_space &space, UINT32 offset, UINT8 wrio_bit7);
void write(address_space &space, UINT32 offset, UINT8 data);
-
+
DECLARE_READ8_MEMBER( oam_read );
DECLARE_WRITE8_MEMBER( oam_write );
DECLARE_READ8_MEMBER( cgram_read );
@@ -676,15 +676,15 @@ public:
void hdma_update(address_space &space, int dma);
void hirq_tick();
inline UINT8 snes_rom_access(UINT32 offset);
-
+
void snes_init_ram();
-
+
DECLARE_WRITE8_MEMBER(nss_io_read);
DECLARE_READ8_MEMBER(nss_oldjoy1_read);
DECLARE_READ8_MEMBER(nss_oldjoy2_read);
DECLARE_READ8_MEMBER(snes_r_io);
- DECLARE_WRITE8_MEMBER(snes_w_io);
+ DECLARE_WRITE8_MEMBER(snes_w_io);
DECLARE_READ8_MEMBER(snes_io_dma_r);
DECLARE_WRITE8_MEMBER(snes_io_dma_w);
DECLARE_READ8_MEMBER(snes_r_bank1);
@@ -701,7 +701,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(snes_extern_irq_w);
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(snes_cart);
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(sufami_cart);
- virtual void video_start();
+ virtual void video_start();
};
/* Special chips, checked at init and used in memory handlers */
diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h
index a0f4386a7b4..59ea46130b7 100644
--- a/src/mame/includes/suprnova.h
+++ b/src/mame/includes/suprnova.h
@@ -147,4 +147,3 @@ public:
void init_skns();
void set_drc_pcflush(UINT32 addr);
};
-
diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h
index 7937e0104c6..d4c9e2a65f5 100644
--- a/src/mame/includes/taitosj.h
+++ b/src/mame/includes/taitosj.h
@@ -18,7 +18,7 @@ public:
m_collision_reg(*this, "collision_reg"),
m_kikstart_scrollram(*this, "kikstart_scroll"){ }
- typedef void (taitosj_state::*copy_layer_func_t)(bitmap_ind16 &,
+ typedef void (taitosj_state::*copy_layer_func_t)(bitmap_ind16 &,
const rectangle &, int, int *, rectangle *);
UINT8 m_sndnmi_disable;
UINT8 m_input_port_4_f0;
diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h
index 2febdb71cf0..0834e2fa627 100644
--- a/src/mame/includes/tiamc1.h
+++ b/src/mame/includes/tiamc1.h
@@ -45,18 +45,18 @@ public:
struct timer8253chan
{
- timer8253chan() :
- count(0),
- cnval(0),
- bcdMode(0),
- cntMode(0),
- valMode(0),
- gate(0),
- output(0),
- loadCnt(0),
- enable(0)
- {}
-
+ timer8253chan() :
+ count(0),
+ cnval(0),
+ bcdMode(0),
+ cntMode(0),
+ valMode(0),
+ gate(0),
+ output(0),
+ loadCnt(0),
+ enable(0)
+ {}
+
UINT16 count;
UINT16 cnval;
UINT8 bcdMode;
@@ -70,7 +70,7 @@ struct timer8253chan
struct timer8253struct
{
- struct timer8253chan channel[3];
+ struct timer8253chan channel[3];
};
@@ -91,16 +91,16 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( tiamc1_timer0_w );
- DECLARE_WRITE8_MEMBER( tiamc1_timer1_w );
- DECLARE_WRITE8_MEMBER( tiamc1_timer1_gate_w );
+ DECLARE_WRITE8_MEMBER( tiamc1_timer0_w );
+ DECLARE_WRITE8_MEMBER( tiamc1_timer1_w );
+ DECLARE_WRITE8_MEMBER( tiamc1_timer1_gate_w );
private:
- void timer8253_reset(struct timer8253struct *t);
- void timer8253_tick(struct timer8253struct *t,int chn);
- void timer8253_wr(struct timer8253struct *t, int reg, UINT8 val);
- char timer8253_get_output(struct timer8253struct *t, int chn);
- void timer8253_set_gate(struct timer8253struct *t, int chn, UINT8 gate);
+ void timer8253_reset(struct timer8253struct *t);
+ void timer8253_tick(struct timer8253struct *t,int chn);
+ void timer8253_wr(struct timer8253struct *t, int reg, UINT8 val);
+ char timer8253_get_output(struct timer8253struct *t, int chn);
+ void timer8253_set_gate(struct timer8253struct *t, int chn, UINT8 gate);
private:
sound_stream *m_channel;
diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h
index 29827336dd1..f07165533a1 100644
--- a/src/mame/includes/vertigo.h
+++ b/src/mame/includes/vertigo.h
@@ -127,4 +127,3 @@ public:
void vertigo_update_irq(device_t *device);
extern const struct pit8253_config vertigo_pit8254_config;
-
diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h
index cd7687efc3f..555c4616622 100644
--- a/src/mame/includes/volfied.h
+++ b/src/mame/includes/volfied.h
@@ -49,5 +49,3 @@ public:
void volfied_cchip_init( );
void volfied_cchip_reset( );
};
-
-
diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h
index 95ec2ef5b60..264cb21f09f 100644
--- a/src/mame/includes/wc90.h
+++ b/src/mame/includes/wc90.h
@@ -21,7 +21,7 @@ public:
m_spriteram(*this, "spriteram"){ }
typedef void (wc90_state::*draw_sprites_func)(bitmap_ind16 &, const rectangle &, int, int, int, int, int );
-
+
required_shared_ptr<UINT8> m_fgvideoram;
required_shared_ptr<UINT8> m_bgvideoram;
required_shared_ptr<UINT8> m_txvideoram;
diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h
index 525d33641f8..7f21eac1633 100644
--- a/src/mame/includes/wiz.h
+++ b/src/mame/includes/wiz.h
@@ -55,5 +55,5 @@ public:
INTERRUPT_GEN_MEMBER(wiz_sound_interrupt);
void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int bank, int colortype);
void draw_foreground(bitmap_ind16 &bitmap, const rectangle &cliprect, int colortype);
- void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, UINT8* sprite_ram,int bank);
+ void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, UINT8* sprite_ram,int bank);
};
diff --git a/src/mame/machine/decathlt.c b/src/mame/machine/decathlt.c
index 99642f6ebe4..b44e6edba41 100644
--- a/src/mame/machine/decathlt.c
+++ b/src/mame/machine/decathlt.c
@@ -52,7 +52,7 @@ static READ32_HANDLER( decathlt_prot_r )
if (fake0) retvalue = fake0[(((0x20080/4)+decathlt_lastcount))];
decathlt_lastcount++;
return retvalue;
-
+
case 0x00a9f3a:
if (fake0) retvalue = fake0[(((0x00000/4)+decathlt_lastcount))];
decathlt_lastcount++;
@@ -70,7 +70,7 @@ static READ32_HANDLER( decathlt_prot_r )
case 0x033f16c:
case 0x038929c:
-
+
case 0x00de05a:
@@ -99,7 +99,7 @@ static READ32_HANDLER( decathlt_prot_r )
return retvalue;
}
-
+
}
else
{
@@ -250,4 +250,3 @@ void install_decathlt_protection(running_machine &machine)
/* It accesses the device at this address too, with different tables, for the game textures, should it just act like a mirror, or a secondary device? */
machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x27FFFF0, 0x27FFFFF, FUNC(decathlt_prot_r), FUNC(decathlt_prot2_w));
}
-
diff --git a/src/mame/machine/megacdcd.c b/src/mame/machine/megacdcd.c
index c99c03400fd..f063e60e888 100644
--- a/src/mame/machine/megacdcd.c
+++ b/src/mame/machine/megacdcd.c
@@ -497,7 +497,7 @@ void lc89510_temp_device::CDC_Reset(void)
LC8951RegistersW[REG_W_WAL] = wa & 0xff; LC8951RegistersW[REG_W_WAH] = (wa >> 8) &0xff;
LC8951RegistersR[REG_R_HEAD0] = 0x01;
LC8951RegistersR[REG_R_STAT3] = 0x80;
-
+
LC8951UpdateHeader();
}
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c
index 2de065a033f..2c9a9ec107f 100644
--- a/src/mame/machine/namcos2.c
+++ b/src/mame/machine/namcos2.c
@@ -112,7 +112,7 @@ MACHINE_START_MEMBER(namcos2_shared_state,namcos2)
MACHINE_RESET_MEMBER(namcos2_shared_state,namcos2)
{
-// address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+// address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
address_space &audio_space = machine().device("audiocpu")->memory().space(AS_PROGRAM);
mFinalLapProtCount = 0;
@@ -818,4 +818,3 @@ READ8_MEMBER( namcos2_shared_state::namcos2_mcu_port_d_r )
/* Return the result */
return data;
}
-
diff --git a/src/mame/machine/naomicrypt.c b/src/mame/machine/naomicrypt.c
index 37e3429577c..6a6d7dbde81 100644
--- a/src/mame/machine/naomicrypt.c
+++ b/src/mame/machine/naomicrypt.c
@@ -27,7 +27,7 @@ struct game_keys
static const struct game_keys keys_table[] =
{
- // name key gameid # year
+ // name key gameid # year
// M2
{ "wldkicks", 0x00ae2901 }, // 25209801 2000
{ "toukon4", 0x012e2901 }, // 25349801 2000
@@ -45,7 +45,7 @@ static const struct game_keys keys_table[] =
{ "ggram2", 0x00074a61 }, // 840-0007 1999
{ "vs2_2k", 0x00088b08 }, // 840-0010 1999
{ "toyfight", 0x0002ca85 }, // 840-0011 1999
- { "smlg99", 0x00048a01 }, // 840-0012 1999
+ { "smlg99", 0x00048a01 }, // 840-0012 1999
{ "jambo", 0x000fab95 }, // 840-0013 1999
{ "vtennis", 0x0003eb15 }, // 840-0015 1999
{ "derbyoc", 0x000fee35 }, // 840-0016 1999
@@ -79,13 +79,13 @@ static const struct game_keys keys_table[] =
{ "pstone2", 0x000b8dc0 }, // 841-0008 2000
{ "capsnk", 0x00000000 }, // 841-0011 2000
{ "capsnka", 0x00000000 }, // ^
- { "cspike", 0x000e2010 }, // 841-0012 2000
+ { "cspike", 0x000e2010 }, // 841-0012 2000
{ "ggx", 0x00076110 }, // 841-0013 2000
{ "gwing2", 0x000b25d0 }, // 841-0014 2000
{ "pjustic", 0x000725d0 }, // 841-0015 2000
{ "deathcox", 0x000b64d0 }, // 841-0016 2000
{ "gundmct", 0x000e8010 }, // 841-0017 2001
- { "zerogu2", 0x0007c010 }, // 841-0020 2001
+ { "zerogu2", 0x0007c010 }, // 841-0020 2001
{ "hmgeo", 0x00038510 }, // HMG016007 2001
// M1
{ "qmegamis", 0x96489bcd }, // 840-0030 2000
@@ -99,12 +99,12 @@ static const struct game_keys keys_table[] =
{ "kick4csh", 0xc9570882 }, // 840-0140 2004
{ "mtkob2", 0x3892fb3a }, // 840-0150 2003
// M4
- { "pokasuka", 0x4792bcde }, // 840-0170 2007
- { "asndynmt", 0x00008784 }, // 840-0175 2007
- { "sl2007", 0x88c274c7 }, // 841-0057 2007
- { "ausfache", 0x092b6007 }, // 841-0058 2008
- { "illvelo", 0xf3a5982c }, // 841-0059 2008
- { "mbaa", 0xab0f2aba }, // 841-0061 2008
+ { "pokasuka", 0x4792bcde }, // 840-0170 2007
+ { "asndynmt", 0x00008784 }, // 840-0175 2007
+ { "sl2007", 0x88c274c7 }, // 841-0057 2007
+ { "ausfache", 0x092b6007 }, // 841-0058 2008
+ { "illvelo", 0xf3a5982c }, // 841-0059 2008
+ { "mbaa", 0xab0f2aba }, // 841-0061 2008
{ NULL, 0 } // end of table
};
@@ -114,7 +114,7 @@ UINT32 get_naomi_key(running_machine &machine)
const char *gamename = machine.system().name;
const struct game_keys *k = &keys_table[0];
-
+
while (k->name)
{
if (strcmp(k->name, gamename) == 0)
@@ -126,6 +126,6 @@ UINT32 get_naomi_key(running_machine &machine)
}
printf("get_naomi_key : KEY NOT FOUND\n");
-
+
return 0;
-} \ No newline at end of file
+}
diff --git a/src/mame/machine/naomicrypt.h b/src/mame/machine/naomicrypt.h
index c53d802c793..80ef2cae2e1 100644
--- a/src/mame/machine/naomicrypt.h
+++ b/src/mame/machine/naomicrypt.h
@@ -2,4 +2,3 @@
#define USE_NAOMICRYPT 1
UINT32 get_naomi_key(running_machine &machine);
-
diff --git a/src/mame/machine/naomim4.c b/src/mame/machine/naomim4.c
index 9bb34551872..fe8724272d0 100644
--- a/src/mame/machine/naomim4.c
+++ b/src/mame/machine/naomim4.c
@@ -46,7 +46,7 @@ void naomi_m4_board::device_start()
naomi_board::device_start();
#if USE_NAOMICRYPT
- UINT32 tempkey = get_naomi_key(machine());
+ UINT32 tempkey = get_naomi_key(machine());
iv = (tempkey >> 16) &0xffff;
key = tempkey & 0xffff;
#else
diff --git a/src/mame/machine/neoprot.c b/src/mame/machine/neoprot.c
index 75161edaa81..ccd20a3d72b 100644
--- a/src/mame/machine/neoprot.c
+++ b/src/mame/machine/neoprot.c
@@ -23,7 +23,7 @@
/************************ Fatal Fury 2 *************************/
READ16_MEMBER( neogeo_state::fatfury2_protection_16_r )
-{
+{
UINT16 res = m_fatfury2_prot_data >> 24;
switch (offset)
@@ -93,7 +93,7 @@ WRITE16_MEMBER( neogeo_state::fatfury2_protection_16_w )
void neogeo_state::fatfury2_install_protection()
-{
+{
/* the protection involves reading and writing addresses in the */
/* 0x2xxxxx range. There are several checks all around the code. */
machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x200000, 0x2fffff, read16_delegate(FUNC(neogeo_state::fatfury2_protection_16_r),this), write16_delegate(FUNC(neogeo_state::fatfury2_protection_16_w),this));
diff --git a/src/mame/machine/pgmprot1.c b/src/mame/machine/pgmprot1.c
index 1befdc6bd3d..071fe1a2d66 100644
--- a/src/mame/machine/pgmprot1.c
+++ b/src/mame/machine/pgmprot1.c
@@ -64,7 +64,7 @@ READ32_MEMBER(pgm_arm_type1_state::pgm_arm7_type1_protlatch_r )
}
WRITE32_MEMBER(pgm_arm_type1_state::pgm_arm7_type1_protlatch_w )
-{
+{
machine().scheduler().synchronize(); // force resync
if (ACCESSING_BITS_16_31)
@@ -80,7 +80,7 @@ WRITE32_MEMBER(pgm_arm_type1_state::pgm_arm7_type1_protlatch_w )
}
READ16_MEMBER(pgm_arm_type1_state::pgm_arm7_type1_68k_protlatch_r )
-{
+{
machine().scheduler().synchronize(); // force resync
switch (offset)
@@ -1342,7 +1342,7 @@ void pgm_arm_type1_state::command_handler_oldsplus(int pc)
}
WRITE16_MEMBER(pgm_arm_type1_state::pgm_arm7_type1_sim_w )
-{
+{
int pc = space.device().safe_pc();
if (offset == 0)
diff --git a/src/mame/machine/pgmprot3.c b/src/mame/machine/pgmprot3.c
index 37be09d17b3..4ad3f82ff63 100644
--- a/src/mame/machine/pgmprot3.c
+++ b/src/mame/machine/pgmprot3.c
@@ -43,7 +43,7 @@
WRITE32_MEMBER(pgm_arm_type3_state::svg_arm7_ram_sel_w )
{
// printf("svg_arm7_ram_sel_w %08x\n", data);
- machine().scheduler().synchronize(); // force resync
+ machine().scheduler().synchronize(); // force resync
m_svg_ram_sel = data & 1;
}
@@ -248,7 +248,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type3_state,killbldp)
}
READ32_MEMBER(pgm_arm_type3_state::dmnfrnt_speedup_r )
-{
+{
int pc = space.device().safe_pc();
if (pc == 0x8000fea) space.device().execute().eat_cycles(500);
// else printf("dmn_speedup_r %08x\n", pc);
@@ -256,7 +256,7 @@ READ32_MEMBER(pgm_arm_type3_state::dmnfrnt_speedup_r )
}
READ16_MEMBER(pgm_arm_type3_state::dmnfrnt_main_speedup_r )
-{
+{
UINT16 data = m_mainram[0xa03c/2];
int pc = space.device().safe_pc();
if (pc == 0x10193a) space.device().execute().spin_until_interrupt();
diff --git a/src/mame/machine/pgmprot4.c b/src/mame/machine/pgmprot4.c
index 5130bafc1e3..2831dd3f4dc 100644
--- a/src/mame/machine/pgmprot4.c
+++ b/src/mame/machine/pgmprot4.c
@@ -330,7 +330,7 @@ void pgm_022_025_state::IGS022_handle_command()
WRITE16_MEMBER(pgm_022_025_state::killbld_igs025_prot_w )
{
// mame_printf_debug("killbrd prot r\n");
-// return 0;
+// return 0;
offset &= 0xf;
if (offset == 0)
@@ -518,7 +518,7 @@ WRITE16_MEMBER(pgm_022_025_state::drgw3_igs025_prot_w )
READ16_MEMBER(pgm_022_025_state::drgw3_igs025_prot_r )
{
-// mame_printf_debug("killbld prot w\n");
+// mame_printf_debug("killbld prot w\n");
UINT16 res ;
offset&=0xf;
diff --git a/src/mame/machine/slikshot.c b/src/mame/machine/slikshot.c
index ef1d5a1f55e..709d17e5155 100644
--- a/src/mame/machine/slikshot.c
+++ b/src/mame/machine/slikshot.c
@@ -383,7 +383,7 @@ void itech8_state::words_to_sensors(UINT16 word1, UINT16 word2, UINT16 word3, UI
*************************************/
void itech8_state::compute_sensors()
-{
+{
UINT16 inter1, inter2, inter3;
UINT16 word1 = 0, word2 = 0, word3 = 0;
UINT8 beams;
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c
index 43d733da7da..12e14515743 100644
--- a/src/mame/machine/snes.c
+++ b/src/mame/machine/snes.c
@@ -387,7 +387,7 @@ READ8_MEMBER( snes_state::snes_r_io )
// other accesses (notice that WRMPYA, WRMPYB, WRDIVL, WRDIVH, WRDVDD, MEMSEL, RDDIVL, RDDIVH, RDMPYL, RDMPYH are handled by the CPU directly)
- switch (offset) // offset is from 0x000000
+ switch (offset) // offset is from 0x000000
{
case WMDATA: /* Data to read from WRAM */
value = space.read_byte(0x7e0000 + m_wram_address++);
diff --git a/src/mame/machine/stvprot.c b/src/mame/machine/stvprot.c
index 35eceb62ae5..8da4ad707ac 100644
--- a/src/mame/machine/stvprot.c
+++ b/src/mame/machine/stvprot.c
@@ -148,7 +148,7 @@ and the size of it
fad size file name date
000000aa 00003000 2000/2/8
-000000aa 00003000  2000/2/8
+000000aa 00003000 ? 2000/2/8
000000b0 00076080 0;1 2000/2/8
0001799e 014b2000 ALY.RED;1 1999/11/9
00002350 00001900 ALYHRAM.BIN;1 2000/2/8
@@ -404,7 +404,7 @@ fad size file name date
UINT32 rsgun_prot_read_callback( address_space &space, int protaddr, UINT32 key )
{
int tempctrl = protaddr - 0x0201000; // technically it doesn't seem to care, but...
-
+
switch(key)
{
case 0x77770000:
@@ -418,7 +418,7 @@ UINT32 rsgun_prot_read_callback( address_space &space, int protaddr, UINT32 key
val &= 0x0f0f0f0f;
else
val &= 0xf0f0f0f0;
-
+
return val;
}
}
@@ -466,13 +466,13 @@ UINT32 sss_prot_read_callback( address_space &space, int protaddr, UINT32 key )
UINT32 res;
/*
- MAIN : 2c5b0000 DATA : 000000a6 014c0000
- MAIN : 47f10000 DATA : 0f9800a6 014c1f30
- MAIN : fcda0000 DATA : 1d4800a6 014c3a90
- MAIN : b5e60000 DATA : 29e300a6 014c53c6
- MAIN : 392c0000 DATA : 38e900a6 014c71d2
- MAIN : 77c30000 DATA : 462500a6 014c8c4a
- MAIN : 8a620000 DATA : 555c00a6 014caab8
+ MAIN : 2c5b0000 DATA : 000000a6 014c0000
+ MAIN : 47f10000 DATA : 0f9800a6 014c1f30
+ MAIN : fcda0000 DATA : 1d4800a6 014c3a90
+ MAIN : b5e60000 DATA : 29e300a6 014c53c6
+ MAIN : 392c0000 DATA : 38e900a6 014c71d2
+ MAIN : 77c30000 DATA : 462500a6 014c8c4a
+ MAIN : 8a620000 DATA : 555c00a6 014caab8
*/
// I have a feeling rather than the offsets being scrambled they were lazy
@@ -597,7 +597,7 @@ static READ32_HANDLER( common_prot_r )
#endif
UINT32 realret = space.read_dword(0x2000000+ctrl_index);
UINT32 retdata = prot_readback(space, ctrl_index, m_abus_protkey);
-
+
logerror("A-Bus control protection read at %06x with data = %08x Returning = %08x Would otherwise return = %08x\n",space.device().safe_pc(),m_abus_protkey, retdata, realret);
ctrl_index += 4;
@@ -620,7 +620,7 @@ static WRITE32_HANDLER ( common_prot_w )
{
COMBINE_DATA(&a_bus[offset]);
//printf("A-Bus control protection write at %06x: [%02x] <- %08x\n",space.device().safe_pc(),offset,data);
-
+
if (offset == 0)
{
COMBINE_DATA(&m_abus_protenable);
@@ -637,7 +637,7 @@ static WRITE32_HANDLER ( common_prot_w )
a_bus_vector|= (m_abus_prot_addr & 0xffff) << 16;
a_bus_vector<<= 1;
//printf("MAIN : %08x DATA : %08x %08x\n",m_abus_protkey,m_abus_prot_addr,a_bus_vector);
-
+
// if you look at the first transfer in ffreveng this is clearly a ROM address from a table | MAIN : 10d70000 DATA : 0b780013 002616f0
// (opr21872.7, offset 0x616f0, which happens to be 0x2616f0 in the ROM region "game0")
// the values sent by the CPU are plucked from a table above where the data is, located at 0x60000
@@ -666,7 +666,7 @@ void install_sss_protection(running_machine &machine)
void install_astrass_protection(running_machine &machine)
{
install_common_protection(machine);
- prot_readback = astrass_prot_read_callback;
+ prot_readback = astrass_prot_read_callback;
}
void install_ffreveng_protection(running_machine &machine)
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 0c7c0eac123..8cee3e2de12 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -217,7 +217,7 @@ sstarcrs // Taito (Brazil)
mooncmw // bootleg
mooncrsb // bootleg
mooncrs2 // bootleg
-starfgmc // bootleg
+starfgmc // bootleg
spcdrag // bootleg
stera // bootleg
spcdraga // bootleg
@@ -4005,7 +4005,7 @@ headon1 // 163-167/192-193 (c) Gremlin
headonb // bootleg, headonb.c
headons // Sidam bootleg
headonsa // Sidam bootleg
-headonmz // bootleg
+headonmz // bootleg
supcrash // bootleg
hocrash // bootleg
headon2 // ???-??? (c) 1979 Sega
@@ -5016,8 +5016,8 @@ sstrkfgt // 2000.10 Sega Strike Fighter (Rev A)
confmiss // 2000.11 Confidential Mission // First GD-ROM game?
// 2000.11 Ninja Assault (NJA1 Ver. A)
// 2000.11 Ninja Assault (NJA2 Ver. A)
-ninjaslt // 2000.11 Ninja Assault (NJA3 Ver. A)
-ninjaslt4 // 2000.11 Ninja Assault (NJA4 Ver. A)
+ninjaslt // 2000.11 Ninja Assault (NJA3 Ver. A)
+ninjaslt4 // 2000.11 Ninja Assault (NJA4 Ver. A)
// 2000.11 Shakatto Tambourine
wwfroyal // 2000.11 WWF Royal Rumble
pjustic // 2000.12 Moero Justice Gakuen / Project Justice
@@ -5070,7 +5070,7 @@ ggxx // 2002.05 Guilty Gear XX
mok // 2002.05 The Maze of the Kings
chocomk // 2002.06 Musapey's Choco Marker (Rev A)
mazan // 2002.07 Mazan : Flash of the Blade (MAZ2 Ver. A)
- // 2002.07 Mazan : Flash of the Blade (MAZ3 Ver. A)
+ // 2002.07 Mazan : Flash of the Blade (MAZ3 Ver. A)
// 2002.09 Yonin Uchi Mahjong MJ
azumanga // 2002.12 Azumanga Daiou Puzzle Bobble
moeru // 2002.12 Moeru Casinyo
@@ -5732,7 +5732,7 @@ candance // MCF (c) 1996 Mitchell
sotsugyo // (c) 1995 Mitchell (Atlus license)
sshangha // (c) 1992 Hot-B
sshanghab // bootleg
-dreambal // MM
+dreambal // MM
// Data East MLC Games
hoops96 // MCE (c) 1996 Data East Corporation
@@ -8053,7 +8053,7 @@ cupsocs // (c) 1992 Seibu
cupsocs2 // (c) 1992 Seibu
cupsocsb // bootleg
cupsocsb2 // bootleg
-cupsocsb3 // bootleg
+cupsocsb3 // bootleg
olysoc92 // (c) 1992 Seibu
olysoc92a // (c) 1992 Seibu
goal92 // bootleg
@@ -8696,7 +8696,7 @@ goindolk // (c) 1987 Sun a Electronics
homo // bootleg
rranger // (c) 1988 SunA + Sharp Image license
sranger // (c) 1988
-srangero // (c) 1988
+srangero // (c) 1988
srangerb // bootleg
srangern // (c) 1988 SunA (NOVA License)
srangerw // (c) 1988 SunA (WDK License)
@@ -8890,7 +8890,7 @@ magicbuba // (c) Yun Sung
shocking // (c) 1997 Yun Sung
shockingk // (c) 1997 Yun Sung
bombkick // (c) 1998 Yun Sung
-bombkicka // (c) 1998 Yun Sung
+bombkicka // (c) 1998 Yun Sung
nmg5 // (c) 1998 Yun Sung
nmg5e // (c) 1998 Yun Sung
searchey // (c) 1999 Yun Sung
@@ -9429,7 +9429,7 @@ toursol1 // (c) 1995 Dynamo
dynamski // (c) 1984 Taiyo
chinhero // (c) 1984 Taiyo
chinhero2 // (c) 1984 Taiyo
-chinhero3 // (c) 1984 Taiyo
+chinhero3 // (c) 1984 Taiyo
chinherot // (c) 1984 Taiyo
shangkid // (c) 1985 Taiyo + Data East license
hiryuken // (c) 1985 Taito
@@ -10489,8 +10489,8 @@ galgame // (c) 1971 Computer Recreations, Inc
ichiban // (c) 199? Excel
3x3puzzl // (c) 199? Ace
3x3puzzla // (c) 199? Ace
-gambl186 // unknown
-gambl186a // unknown
+gambl186 // unknown
+gambl186a // unknown
// InterFlip / Recreativos Franco
@@ -11200,9 +11200,9 @@ fcockt2_6 // (c) 2008
fcockt2_7 // (c) 2008
// Crazy Monkey 2
-crzmon2 // (c) 2010
-crzmon2_2 // (c) 2010
-crzmon2_3 // (c) 2010
+crzmon2 // (c) 2010
+crzmon2_2 // (c) 2010
+crzmon2_3 // (c) 2010
// Igrosoft bootleg sets
diff --git a/src/mame/video/deco_mlc.c b/src/mame/video/deco_mlc.c
index dc82ccde372..89316df151d 100644
--- a/src/mame/video/deco_mlc.c
+++ b/src/mame/video/deco_mlc.c
@@ -21,7 +21,7 @@ VIDEO_START_MEMBER(deco_mlc_state,mlc)
m_colour_mask=0x3f;
else
m_colour_mask=0x1f;
-
+
// temp_bitmap = auto_bitmap_rgb32_alloc( machine(), 512, 512 );
m_mlc_buffered_spriteram = auto_alloc_array(machine(), UINT16, 0x3000/2);
m_mlc_spriteram_spare = auto_alloc_array(machine(), UINT16, 0x3000/2);
@@ -39,7 +39,7 @@ static void mlc_drawgfxzoomline(
UINT32* dest,const rectangle &clip,gfx_element *gfx,
UINT32 code1,UINT32 code2, UINT32 color,int flipx,int sx,
int transparent_color,int use8bpp,
- int scalex, int alpha, int srcline )
+ int scalex, int alpha, int srcline )
{
if (!scalex) return;
@@ -99,7 +99,7 @@ static void mlc_drawgfxzoomline(
/* no alpha */
if (alpha == 0xff)
- {
+ {
const UINT8 *code_base2 = gfx->get_data(code2 % gfx->elements());
const UINT8 *source1 = code_base1 + (srcline) * gfx->rowbytes();
const UINT8 *source2 = code_base2 + (srcline) * gfx->rowbytes();
@@ -176,7 +176,7 @@ void deco_mlc_state::draw_sprites( const rectangle &cliprect, int scanline, UINT
0x0800 - upper clip bit (stadhr96 view of bases)
0x0400 - Use raster IRQ lookup table when drawing object - or not? (OK for stadhr96, NOT enabled for avengrgs)
0x0300 - lower clipping window to use (swapped) - and upper bits of raster select (stadhr96)
- 0x0080 - seems to be both the lower bit of the raster select (stadhr96) AND the upper bit of colour / alpha (avngrgs?) - might depend on other bits?
+ 0x0080 - seems to be both the lower bit of the raster select (stadhr96) AND the upper bit of colour / alpha (avngrgs?) - might depend on other bits?
0x007f - Colour/alpha shadow enable
Word 2: 0x07ff - Y position
Word 3: 0x07ff - X position
@@ -229,7 +229,7 @@ void deco_mlc_state::draw_sprites( const rectangle &cliprect, int scanline, UINT
-
+
clipper = (mlc_spriteram[offs+1]>>8)&0x3;
indx = mlc_spriteram[offs+0]&0x3fff;
@@ -242,11 +242,11 @@ void deco_mlc_state::draw_sprites( const rectangle &cliprect, int scanline, UINT
clipper=((clipper&2)>>1)|((clipper&1)<<1); // Swap low two bits
-
+
int upperclip = (mlc_spriteram[offs+1]>>10)&0x2;
// this is used on some ingame gfx in stadhr96
// to clip the images of your guys on the bases
- if (upperclip)
+ if (upperclip)
clipper |= 0x4;
@@ -372,9 +372,9 @@ void deco_mlc_state::draw_sprites( const rectangle &cliprect, int scanline, UINT
if (raster_select==1 || raster_select==2 || raster_select==3)
{
-
+
int irq_base_reg; /* 6, 9, 12 are possible */
- if (raster_select== 1) irq_base_reg = 6; // OK upper screen.. left?
+ if (raster_select== 1) irq_base_reg = 6; // OK upper screen.. left?
else if (raster_select== 2) irq_base_reg = 9; // OK upper screen.. main / center
else irq_base_reg = 12;
@@ -384,7 +384,7 @@ void deco_mlc_state::draw_sprites( const rectangle &cliprect, int scanline, UINT
if (extra_x_off & 0x400) { extra_x_off -= 0x800; }
if (extra_y_off & 0x400) { extra_y_off -= 0x800; }
-
+
x += extra_x_off;
y += extra_y_off;
@@ -408,7 +408,7 @@ void deco_mlc_state::draw_sprites( const rectangle &cliprect, int scanline, UINT
int xbase=x<<16;
int xinc=(xscale)*16;
-
+
if (fx)
xbase+=(xoffs-15) * (xscale) - ((w-1)*xinc);
else
@@ -439,13 +439,13 @@ void deco_mlc_state::draw_sprites( const rectangle &cliprect, int scanline, UINT
continue;
-
-// color = machine().rand();
-
+
+// color = machine().rand();
+
int srcline = ((bby<<16) / ratio);
-
+
by = srcline >> 4;
-
+
srcline &=0xf;
if( fy )
@@ -455,7 +455,7 @@ void deco_mlc_state::draw_sprites( const rectangle &cliprect, int scanline, UINT
for (bx=0; bx<w; bx++) {
-
+
int realxbase = xbase + bx * xinc;
int count = 0;
if (fx)
@@ -569,7 +569,7 @@ UINT32 deco_mlc_state::screen_update_mlc(screen_device &screen, bitmap_rgb32 &bi
printf("%d -", i);
for (int j=0;j<0x20;j++)
{
- printf("%08x, ",m_irq_ram[j]);
+ printf("%08x, ",m_irq_ram[j]);
}
printf("\n");
*/
diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c
index c220bb74baf..cab386bcbf7 100644
--- a/src/mame/video/fastfred.c
+++ b/src/mame/video/fastfred.c
@@ -114,7 +114,7 @@ VIDEO_START_MEMBER(fastfred_state,fastfred)
*************************************/
WRITE8_MEMBER(fastfred_state::fastfred_videoram_w )
-{
+{
m_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
diff --git a/src/mame/video/jagblit.c b/src/mame/video/jagblit.c
index e8dd4aa6438..c8205d063da 100644
--- a/src/mame/video/jagblit.c
+++ b/src/mame/video/jagblit.c
@@ -172,7 +172,7 @@ void jaguar_state::FUNCNAME(UINT32 command, UINT32 a1flags, UINT32 a2flags)
INT32 a2_zoffs = (A2FIXED >> 6) & 7;
INT32 a2_width = ((4 | ((a2flags >> 9) & 3)) << ((a2flags >> 11) & 15)) >> 2;
INT32 a2_xadd = (A2FIXED >> 16) & 0x03;
- INT32 a2_yadd = (A1FIXED >> 18) & 0x01; // From Jaguar HW errata: "If the A1 Y add control bit is set it will affect both address generators."
+ INT32 a2_yadd = (A1FIXED >> 18) & 0x01; // From Jaguar HW errata: "If the A1 Y add control bit is set it will affect both address generators."
INT32 a2_x = (m_blitter_regs[A2_PIXEL] << 16);
INT32 a2_y = (m_blitter_regs[A2_PIXEL] & 0xffff0000);
INT32 a2_xstep = 0;
diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c
index d9a87eb200b..59f3858ee51 100644
--- a/src/mame/video/seibuspi.c
+++ b/src/mame/video/seibuspi.c
@@ -209,7 +209,7 @@ WRITE32_MEMBER(seibuspi_state::video_dma_address_w)
}
void seibuspi_state::drawgfx_blend(bitmap_rgb32 &bitmap, const rectangle &cliprect, gfx_element *gfx, UINT32 code, UINT32 color, int flipx, int flipy, int sx, int sy)
-{
+{
const pen_t *pens = &gfx->machine().pens[gfx->colorbase()];
const UINT8 *dp;
int i, j;
diff --git a/src/mame/video/snes.c b/src/mame/video/snes.c
index 04c183d30f6..761cbe79e53 100644
--- a/src/mame/video/snes.c
+++ b/src/mame/video/snes.c
@@ -1644,7 +1644,7 @@ void snes_ppu_class::refresh_scanline( running_machine &machine, bitmap_rgb32 &b
}
void snes_ppu_class::ppu_start(running_machine &machine)
-{
+{
#if SNES_LAYER_DEBUG
memset(&debug_options, 0, sizeof(debug_options));
#endif
@@ -1652,7 +1652,7 @@ void snes_ppu_class::ppu_start(running_machine &machine)
m_vram = auto_alloc_array(machine, UINT8, SNES_VRAM_SIZE);
m_cgram = auto_alloc_array(machine, UINT16, SNES_CGRAM_SIZE/2);
m_oam_ram = auto_alloc_array(machine, UINT16, SNES_OAM_SIZE/2);
-
+
/* Inititialize registers/variables */
m_update_windows = 1;
m_beam.latch_vert = 0;
@@ -1677,16 +1677,16 @@ void snes_ppu_class::ppu_start(running_machine &machine)
for (int i = 0; i < 4096; i++)
m_mosaic_table[j][i] = (i / (j + 1)) * (j + 1);
}
-
+
/* Init VRAM */
memset(m_vram, 0, SNES_VRAM_SIZE);
-
+
/* Init Palette RAM */
memset((UINT8 *)m_cgram, 0, SNES_CGRAM_SIZE);
-
+
/* Init oam RAM */
memset((UINT8 *)m_oam_ram, 0xff, SNES_OAM_SIZE);
-
+
for (int i = 0; i < 6; i++)
{
state_save_register_item(machine, "snes_ppu", NULL, i, m_layer[i].window1_enabled);
@@ -1706,10 +1706,10 @@ void snes_ppu_class::ppu_start(running_machine &machine)
state_save_register_item(machine, "snes_ppu", NULL, i, m_layer[i].sub_bg_enabled);
state_save_register_item(machine, "snes_ppu", NULL, i, m_layer[i].hoffs);
state_save_register_item(machine, "snes_ppu", NULL, i, m_layer[i].voffs);
-
+
state_save_register_item_array(machine, "snes_ppu", NULL, i, m_clipmasks[i]);
}
-
+
state_save_register_global(machine, m_oam.address_low);
state_save_register_global(machine, m_oam.address_high);
state_save_register_global(machine, m_oam.saved_address_low);
@@ -1724,14 +1724,14 @@ void snes_ppu_class::ppu_start(running_machine &machine)
state_save_register_global(machine, m_oam.first_sprite);
state_save_register_global(machine, m_oam.flip);
state_save_register_global(machine, m_oam.write_latch);
-
+
state_save_register_global(machine, m_beam.latch_horz);
state_save_register_global(machine, m_beam.latch_vert);
state_save_register_global(machine, m_beam.current_horz);
state_save_register_global(machine, m_beam.current_vert);
state_save_register_global(machine, m_beam.last_visible_line);
state_save_register_global(machine, m_beam.interlace_count);
-
+
state_save_register_global(machine, m_mode7.repeat);
state_save_register_global(machine, m_mode7.hflip);
state_save_register_global(machine, m_mode7.vflip);
@@ -1744,7 +1744,7 @@ void snes_ppu_class::ppu_start(running_machine &machine)
state_save_register_global(machine, m_mode7.hor_offset);
state_save_register_global(machine, m_mode7.ver_offset);
state_save_register_global(machine, m_mode7.extbg);
-
+
state_save_register_global(machine, m_mosaic_size);
state_save_register_global(machine, m_clip_to_black);
state_save_register_global(machine, m_prevent_color_math);
@@ -1753,7 +1753,7 @@ void snes_ppu_class::ppu_start(running_machine &machine)
state_save_register_global(machine, m_direct_color);
state_save_register_global(machine, m_ppu_last_scroll);
state_save_register_global(machine, m_mode7_last_scroll);
-
+
state_save_register_global(machine, m_ppu1_open_bus);
state_save_register_global(machine, m_ppu2_open_bus);
state_save_register_global(machine, m_ppu1_version);
@@ -1762,7 +1762,7 @@ void snes_ppu_class::ppu_start(running_machine &machine)
state_save_register_global(machine, m_window1_right);
state_save_register_global(machine, m_window2_left);
state_save_register_global(machine, m_window2_right);
-
+
state_save_register_global(machine, m_update_windows);
state_save_register_global(machine, m_update_offsets);
state_save_register_global(machine, m_update_oam_list);
@@ -1792,7 +1792,7 @@ void snes_ppu_class::ppu_start(running_machine &machine)
state_save_register_global_pointer(machine, m_vram, SNES_VRAM_SIZE);
state_save_register_global_pointer(machine, m_cgram, SNES_CGRAM_SIZE/2);
- state_save_register_global_pointer(machine, m_oam_ram, SNES_OAM_SIZE/2);
+ state_save_register_global_pointer(machine, m_oam_ram, SNES_OAM_SIZE/2);
}
diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c
index bdfba1b0028..dd7d190c5bb 100644
--- a/src/mame/video/ssrj.c
+++ b/src/mame/video/ssrj.c
@@ -63,7 +63,7 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info4)
TODO: This table is nowhere near as accurate. If you bother, here's how colors should be:
-"START" sign is red with dark blue background.
-Sidewalk is yellow-ish.
--first opponents have swapped colors (blue/yellow ìnstead of yellow/blue)
+-first opponents have swapped colors (blue/yellow ?nstead of yellow/blue)
-after the first stage, houses have red/white colors.
*/
diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c
index 9483cff451d..8a90c8b2298 100644
--- a/src/mame/video/wc90.c
+++ b/src/mame/video/wc90.c
@@ -157,12 +157,12 @@ static const char p64x64[4][16] = {
{ 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }
};
-void wc90_state::draw_sprite_16x16(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags )
+void wc90_state::draw_sprite_16x16(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags )
{
WC90_DRAW_SPRITE( code, sx, sy );
}
-void wc90_state::draw_sprite_16x32(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags )
+void wc90_state::draw_sprite_16x32(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags )
{
if ( bank & 2 ) {
WC90_DRAW_SPRITE( code+1, sx, sy+16 );
@@ -173,7 +173,7 @@ void wc90_state::draw_sprite_16x32(bitmap_ind16 &bitmap, const rectangle &clipre
}
}
-void wc90_state::draw_sprite_16x64(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags )
+void wc90_state::draw_sprite_16x64(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags )
{
if ( bank & 2 ) {
WC90_DRAW_SPRITE( code+3, sx, sy+48 );
@@ -199,7 +199,7 @@ void wc90_state::draw_sprite_32x16(bitmap_ind16 &bitmap, const rectangle &clipre
}
}
-void wc90_state::draw_sprite_32x32(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags )
+void wc90_state::draw_sprite_32x32(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags )
{
const char *p = p32x32[ bank&3 ];
@@ -223,7 +223,7 @@ void wc90_state::draw_sprite_32x64(bitmap_ind16 &bitmap, const rectangle &clipre
WC90_DRAW_SPRITE( code+p[7], sx+16, sy+48 );
}
-void wc90_state::draw_sprite_64x16(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags )
+void wc90_state::draw_sprite_64x16(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags )
{
if ( bank & 1 ) {
WC90_DRAW_SPRITE( code+3, sx+48, sy );
diff --git a/src/mess/audio/channelf.c b/src/mess/audio/channelf.c
index 8c806a1b004..09cd7786dfd 100644
--- a/src/mess/audio/channelf.c
+++ b/src/mess/audio/channelf.c
@@ -16,9 +16,9 @@ channelf_sound_device::channelf_sound_device(const machine_config &mconfig, cons
m_envelope(0),
m_sample_counter(0),
m_forced_ontime(0),
- m_min_ontime(0)
+ m_min_ontime(0)
{
-
+
}
//-------------------------------------------------
diff --git a/src/mess/audio/channelf.h b/src/mess/audio/channelf.h
index 9bdbb628c16..339e26ca1c0 100644
--- a/src/mess/audio/channelf.h
+++ b/src/mess/audio/channelf.h
@@ -12,7 +12,7 @@ class channelf_sound_device : public device_t,
{
public:
channelf_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
void sound_w(int mode);
protected:
// device-level overrides
diff --git a/src/mess/audio/special.c b/src/mess/audio/special.c
index 8afb2c6a915..d5d13c96f32 100644
--- a/src/mess/audio/special.c
+++ b/src/mess/audio/special.c
@@ -24,10 +24,10 @@ const device_type SPECIMX = &device_creator<specimx_sound_device>;
specimx_sound_device::specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SPECIMX, "Specialist MX Custom", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_mixer_channel(NULL)
+ device_sound_interface(mconfig, *this),
+ m_mixer_channel(NULL)
{
- memset(m_specimx_input, 0, sizeof(int)*3);
+ memset(m_specimx_input, 0, sizeof(int)*3);
}
@@ -79,10 +79,8 @@ void specimx_sound_device::sound_stream_update(sound_stream &stream, stream_samp
void specimx_sound_device::set_input(int index, int state)
{
if (m_mixer_channel!=NULL)
- {
+ {
m_mixer_channel->update();
}
m_specimx_input[index] = state;
}
-
-
diff --git a/src/mess/audio/svision.c b/src/mess/audio/svision.c
index fa9673c63e7..0913c08dd57 100644
--- a/src/mess/audio/svision.c
+++ b/src/mess/audio/svision.c
@@ -22,8 +22,8 @@ const device_type SVISION = &device_creator<svision_sound_device>;
svision_sound_device::svision_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, SVISION, "Super Vision Custom", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_mixer_channel(NULL)
+ device_sound_interface(mconfig, *this),
+ m_mixer_channel(NULL)
{
}
@@ -263,4 +263,3 @@ void svision_sound_device::soundport_w(int which, int offset, int data)
break;
}
}
-
diff --git a/src/mess/audio/vc4000.c b/src/mess/audio/vc4000.c
index 587891a46e8..80736eeecb1 100644
--- a/src/mess/audio/vc4000.c
+++ b/src/mess/audio/vc4000.c
@@ -12,11 +12,11 @@ const device_type VC4000 = &device_creator<vc4000_sound_device>;
vc4000_sound_device::vc4000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VC4000, "VC 4000 Custom", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_channel(NULL),
- m_size(0),
- m_pos(0),
- m_level(0)
+ device_sound_interface(mconfig, *this),
+ m_channel(NULL),
+ m_size(0),
+ m_pos(0),
+ m_level(0)
{
memset(m_reg, 0, sizeof(UINT8)*1);
}
diff --git a/src/mess/audio/wswan.c b/src/mess/audio/wswan.c
index b3cdbf33181..e5d442efbdc 100644
--- a/src/mess/audio/wswan.c
+++ b/src/mess/audio/wswan.c
@@ -25,25 +25,25 @@ const device_type WSWAN = &device_creator<wswan_sound_device>;
wswan_sound_device::wswan_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, WSWAN, "WonderSwan Custom", tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_channel(NULL),
- m_sweep_step(0),
- m_sweep_time(0),
- m_sweep_count(0),
- m_noise_type(0),
- m_noise_reset(0),
- m_noise_enable(0),
- m_sample_address(0),
- m_audio2_voice(0),
- m_audio3_sweep(0),
- m_audio4_noise(0),
- m_mono(0),
- m_voice_data(0),
- m_output_volume(0),
- m_external_stereo(0),
- m_external_speaker(0),
- m_noise_shift(0),
- m_master_volume(0)
+ device_sound_interface(mconfig, *this),
+ m_channel(NULL),
+ m_sweep_step(0),
+ m_sweep_time(0),
+ m_sweep_count(0),
+ m_noise_type(0),
+ m_noise_reset(0),
+ m_noise_enable(0),
+ m_sample_address(0),
+ m_audio2_voice(0),
+ m_audio3_sweep(0),
+ m_audio4_noise(0),
+ m_mono(0),
+ m_voice_data(0),
+ m_output_volume(0),
+ m_external_stereo(0),
+ m_external_speaker(0),
+ m_noise_shift(0),
+ m_master_volume(0)
{
}
@@ -246,5 +246,3 @@ WRITE8_MEMBER( wswan_sound_device::wswan_sound_port_w )
break;
}
}
-
-
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c
index f59091d5c31..df500ed4f8f 100644
--- a/src/mess/drivers/a7800.c
+++ b/src/mess/drivers/a7800.c
@@ -33,7 +33,7 @@
Colorburst/Hue = 180 degrees
2013/02/27 Robert Tuccitto Palette rebuild due to misaligned
- data references. Corrected PAL color sequence order.
+ data references. Corrected PAL color sequence order.
***************************************************************************/
diff --git a/src/mess/drivers/abc80x.c b/src/mess/drivers/abc80x.c
index e1668e08fdd..ab9f320343e 100644
--- a/src/mess/drivers/abc80x.c
+++ b/src/mess/drivers/abc80x.c
@@ -1093,7 +1093,7 @@ void abc802_state::machine_reset()
// 50/60 Hz
m_dart->cts_w(1, BIT(config, 3)); // 0 = 50Hz, 1 = 60Hz
-
+
m_dfd_in = 0;
}
@@ -1174,7 +1174,7 @@ void abc806_state::machine_reset()
// 50/60 Hz
m_dart->cts_w(1, 0); // 0 = 50Hz, 1 = 60Hz
-
+
m_dfd_in = 0;
}
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c
index bdf8cb6079e..e3faca5dd9a 100644
--- a/src/mess/drivers/apple2.c
+++ b/src/mess/drivers/apple2.c
@@ -637,7 +637,7 @@ static SLOT_INTERFACE_START(apple2_cards)
SLOT_INTERFACE("midi", A2BUS_MIDI) /* Generic 6840+6850 MIDI board */
SLOT_INTERFACE("zipdrive", A2BUS_ZIPDRIVE) /* ZIP Technologies IDE card */
SLOT_INTERFACE("echoiiplus", A2BUS_ECHOPLUS) /* Street Electronics Echo Plus (Echo II + Mockingboard clone) */
- SLOT_INTERFACE("scsi", A2BUS_SCSI) /* Apple II SCSI Card */
+ SLOT_INTERFACE("scsi", A2BUS_SCSI) /* Apple II SCSI Card */
SLOT_INTERFACE_END
static SLOT_INTERFACE_START(apple2eaux_cards)
diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c
index a82caffd378..ad81429f7c2 100644
--- a/src/mess/drivers/apple2gs.c
+++ b/src/mess/drivers/apple2gs.c
@@ -308,10 +308,10 @@ static SLOT_INTERFACE_START(apple2_cards)
SLOT_INTERFACE("vulcan", A2BUS_VULCAN) /* AE Vulcan IDE card */
SLOT_INTERFACE("zipdrive", A2BUS_ZIPDRIVE) /* ZIP Technologies IDE card */
SLOT_INTERFACE("echoiiplus", A2BUS_ECHOPLUS) /* Street Electronics Echo Plus (Echo II + Mockingboard clone) */
-// SLOT_INTERFACE("mdturbo", A2BUS_UDRIVE_TURBO) /* ///SHH Systeme MicroDrive Turbo IDE card */
+// SLOT_INTERFACE("mdturbo", A2BUS_UDRIVE_TURBO) /* ///SHH Systeme MicroDrive Turbo IDE card */
// SLOT_INTERFACE("softcard", A2BUS_SOFTCARD) /* Microsoft SoftCard */ // appears not to be IIgs compatible?
- SLOT_INTERFACE("scsi", A2BUS_SCSI) /* Apple II SCSI Card */
+ SLOT_INTERFACE("scsi", A2BUS_SCSI) /* Apple II SCSI Card */
SLOT_INTERFACE_END
static MACHINE_CONFIG_START( apple2gs, apple2gs_state )
diff --git a/src/mess/drivers/besta.c b/src/mess/drivers/besta.c
index b3594516f58..8303f6911da 100644
--- a/src/mess/drivers/besta.c
+++ b/src/mess/drivers/besta.c
@@ -2,7 +2,7 @@
Besta-88 and Besta-90 engineering workstations.
- Derived (OEMd?) from Force Computers' SYS68K series.
+ Derived (OEMd?) from Force Computers' SYS68K series.
****************************************************************************/
@@ -56,14 +56,14 @@ READ8_MEMBER( besta_state::mpcc_reg_r )
UINT8 ret;
if (!(offset == 0 && !m_mpcc_regs[0])) {
- DBG_LOG(1,"mpcc_reg_r",("(%d) = %02X at %s\n", offset,
+ DBG_LOG(1,"mpcc_reg_r",("(%d) = %02X at %s\n", offset,
(offset > 31 ? -1 : m_mpcc_regs[offset]), machine.describe_context()));
}
switch (offset) {
- case 0: /* r_stat aka ... */
+ case 0: /* r_stat aka ... */
return (m_term_data) ? 0x80 : 0;
- case 2: /* r_data aka ... */
+ case 2: /* r_data aka ... */
ret = m_term_data;
m_term_data = 0;
return ret;
@@ -96,18 +96,18 @@ WRITE8_MEMBER( besta_state::kbd_put )
#endif
static ADDRESS_MAP_START(besta_mem, AS_PROGRAM, 32, besta_state)
- AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_SHARE("p_ram") // local bus DRAM, 4MB
-// AM_RANGE(0x08010000, 0x08011fff) AM_RAM // unknown -- accessed by cp31dssp
- AM_RANGE(0xff000000, 0xff00ffff) AM_ROM AM_REGION("user1",0) // actual mapping is up to 0xff03ffff
- AM_RANGE(0xff040000, 0xff07ffff) AM_RAM // onboard SRAM
-// 68561 MPCC (console)
-// AM_RANGE(0xff800000, 0xff80001f) AM_DEVREADWRITE8("mpcc", mpcc68561_t, reg_r, reg_w, 0xffffffff)
+ AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_SHARE("p_ram") // local bus DRAM, 4MB
+// AM_RANGE(0x08010000, 0x08011fff) AM_RAM // unknown -- accessed by cp31dssp
+ AM_RANGE(0xff000000, 0xff00ffff) AM_ROM AM_REGION("user1",0) // actual mapping is up to 0xff03ffff
+ AM_RANGE(0xff040000, 0xff07ffff) AM_RAM // onboard SRAM
+// 68561 MPCC (console)
+// AM_RANGE(0xff800000, 0xff80001f) AM_DEVREADWRITE8("mpcc", mpcc68561_t, reg_r, reg_w, 0xffffffff)
AM_RANGE(0xff800000, 0xff80001f) AM_READWRITE8(mpcc_reg_r, mpcc_reg_w, 0xffffffff)
-// AM_RANGE(0xff800200, 0xff800xxx) // 68230 PIT2
-// AM_RANGE(0xff800400, 0xff800xxx) // ??? -- shows up in cp31dssp log
-// AM_RANGE(0xff800800, 0xff800xxx) // BIM
-// AM_RANGE(0xff800a00, 0xff800xxx) // 62421 RTC
-// AM_RANGE(0xff800c00, 0xff800xxx) // 68230 PIT
+// AM_RANGE(0xff800200, 0xff800xxx) // 68230 PIT2
+// AM_RANGE(0xff800400, 0xff800xxx) // ??? -- shows up in cp31dssp log
+// AM_RANGE(0xff800800, 0xff800xxx) // BIM
+// AM_RANGE(0xff800a00, 0xff800xxx) // 62421 RTC
+// AM_RANGE(0xff800c00, 0xff800xxx) // 68230 PIT
ADDRESS_MAP_END
/* Input ports */
@@ -119,9 +119,9 @@ void besta_state::machine_reset()
{
UINT8* user1 = memregion("user1")->base();
- memcpy((UINT8*)m_p_ram.target(),user1,0x10000); // not really what happens but...
- memset(m_mpcc_regs, sizeof(m_mpcc_regs), 0); // should initialize to defined values
- m_mpcc_regs[8] = 0x80; // always ready to transmit
+ memcpy((UINT8*)m_p_ram.target(),user1,0x10000); // not really what happens but...
+ memset(m_mpcc_regs, sizeof(m_mpcc_regs), 0); // should initialize to defined values
+ m_mpcc_regs[8] = 0x80; // always ready to transmit
machine().device("maincpu")->reset();
}
@@ -139,7 +139,7 @@ static MACHINE_CONFIG_START( besta, besta_state )
MCFG_CPU_PROGRAM_MAP(besta_mem)
#if 0
- MCFG_MPCC68561_ADD("mpcc", XTAL_25MHz, line_cb_t()); // confirm internal oscillator frequency
+ MCFG_MPCC68561_ADD("mpcc", XTAL_25MHz, line_cb_t()); // confirm internal oscillator frequency
#endif
MCFG_GENERIC_TERMINAL_ADD(TERMINAL_TAG, terminal_intf)
MACHINE_CONFIG_END
@@ -147,7 +147,7 @@ MACHINE_CONFIG_END
/* ROM definition */
ROM_START( besta88 )
- ROM_REGION32_BE( 0x10000, "user1", ROMREGION_ERASEFF )
+ ROM_REGION32_BE( 0x10000, "user1", ROMREGION_ERASEFF )
ROM_SYSTEM_BIOS(0, "cp31dbg", "CP31 Debug")
ROMX_LOAD( "cp31dbgboot.27c512", 0x0000, 0x10000, CRC(9bf057de) SHA1(b13cb16042e4c6ca63ae26058a78259c0849d0b6), ROM_BIOS(1))
diff --git a/src/mess/drivers/c64.c b/src/mess/drivers/c64.c
index 7d03b68254c..95051563b6a 100644
--- a/src/mess/drivers/c64.c
+++ b/src/mess/drivers/c64.c
@@ -1034,7 +1034,7 @@ void c64_state::machine_reset()
m_sid->reset();
m_cia1->reset();
m_cia2->reset();
-
+
m_iec->reset();
m_exp->reset();
m_user->reset();
diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c
index 21089d15d7c..ccc3567fe4f 100644
--- a/src/mess/drivers/casloopy.c
+++ b/src/mess/drivers/casloopy.c
@@ -13,13 +13,13 @@
the idea is to understand the HW enough to extract the SH-1 internal BIOS
data via a trojan;
- ASM notes:
- - first vector is almost certainly VBR value.
- - [VBR + 0x2c] irq for i/o?
- - [VBR + 0x140] points to an internal BIOS routine, at 0x6238
- (Nigaoe Artist has a direct 0x648c instead)
- - 0x0604 is probably a BRA -2 / NOP (some games puts that as a null irq vector)
- - Nigaoe Artist jumps to 0x668 at some point.
+ ASM notes:
+ - first vector is almost certainly VBR value.
+ - [VBR + 0x2c] irq for i/o?
+ - [VBR + 0x140] points to an internal BIOS routine, at 0x6238
+ (Nigaoe Artist has a direct 0x648c instead)
+ - 0x0604 is probably a BRA -2 / NOP (some games puts that as a null irq vector)
+ - Nigaoe Artist jumps to 0x668 at some point.
===============================================================================
@@ -379,7 +379,7 @@ WRITE16_MEMBER(casloopy_state::sh7021_w)
sh7021_regs[0x7e/2]&=0xfffe;
}
-// printf("%08x %04x\n",sh7021_regs[offset],0x05ffff00+offset*2);
+// printf("%08x %04x\n",sh7021_regs[offset],0x05ffff00+offset*2);
}
READ8_MEMBER(casloopy_state::casloopy_bitmap_r)
@@ -402,7 +402,7 @@ static ADDRESS_MAP_START( casloopy_map, AS_PROGRAM, 32, casloopy_state )
AM_RANGE(0x04058000, 0x04058007) AM_READWRITE16(casloopy_vregs_r,casloopy_vregs_w,0xffffffff)
AM_RANGE(0x0405b000, 0x0405b00f) AM_RAM AM_SHARE("vregs") // RGB555 brightness control plus scrolling
AM_RANGE(0x05ffff00, 0x05ffffff) AM_READWRITE16(sh7021_r,sh7021_w,0xffffffff)
-// AM_RANGE(0x05ffff00, 0x05ffffff) - SH7021 internal i/o
+// AM_RANGE(0x05ffff00, 0x05ffffff) - SH7021 internal i/o
AM_RANGE(0x06000000, 0x061fffff) AM_ROM AM_REGION("rom_cart",0)
AM_RANGE(0x07000000, 0x070003ff) AM_RAM AM_SHARE("oram")// on-chip RAM, actually at 0xf000000 (1 kb)
AM_RANGE(0x09000000, 0x0907ffff) AM_RAM AM_SHARE("wram")
@@ -482,10 +482,10 @@ static MACHINE_CONFIG_START( casloopy, casloopy_state )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(8000000, 444, 0, 256, 263, 0, 224)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
-// MCFG_SCREEN_SIZE(444, 263)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+// MCFG_SCREEN_SIZE(444, 263)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(casloopy_state, screen_update_casloopy)
MCFG_PALETTE_LENGTH(512)
diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c
index 2444e9bc725..17d5b15681f 100644
--- a/src/mess/drivers/cat.c
+++ b/src/mess/drivers/cat.c
@@ -93,7 +93,7 @@ Scott Kim - responsible for fonts on swyft and cat
Ralph Voorhees - Model construction and mockups (swyft 'flat cat')
Cat HLSL stuff:
-*scanlines:
+*scanlines:
the cat has somewhat visible and fairly close scanlines with very little fuzziness
try hlsl options:
hlsl_prescale_x 4
@@ -937,7 +937,7 @@ static void duart_tx(device_t *device, int channel, UINT8 data)
* IP2: KTOBF (IP2 changes state 0->1 or 1->0 on the rising edge of KTOBF using a d-latch; KTOBF is a 6.5536ms-period squarewave generated by one of the gate arrays, i need to check with a scope to see whether it is a single spike/pulse every 6.5536ms or if from the gate array it inverts every 6.5536ms, documentation isn't 100% clear but I suspect the former) [uses the Delta IP2 state change detection feature to generate an interrupt; I'm not sure if IP2 is used as a counter clock source but given the beep frequency of the real unit i very much doubt it, 6.5536ms is too slow]
* IP3: RG ("ring" input)
* IP4: Centronics BUSY
- * IP5: DSR
+ * IP5: DSR
*/
static UINT8 duart_input(device_t *device)
{
diff --git a/src/mess/drivers/cbm2.c b/src/mess/drivers/cbm2.c
index 7e0e2d8f572..cc95d7c300b 100644
--- a/src/mess/drivers/cbm2.c
+++ b/src/mess/drivers/cbm2.c
@@ -364,19 +364,19 @@ READ8_MEMBER( cbm2_state::ext_read )
if (!casseg1)
{
- data = m_ram->pointer()[offset & 0xffff];
+ data = m_ram->pointer()[offset & 0xffff];
}
if (!casseg2)
{
- data = m_ram->pointer()[0x10000 | (offset & 0xffff)];
+ data = m_ram->pointer()[0x10000 | (offset & 0xffff)];
}
if (!casseg3 && (m_ram->size() > 0x20000))
{
- data = m_ram->pointer()[0x20000 | (offset & 0xffff)];
+ data = m_ram->pointer()[0x20000 | (offset & 0xffff)];
}
if (!casseg4 && (m_ram->size() > 0x30000))
{
- data = m_ram->pointer()[0x30000 | (offset & 0xffff)];
+ data = m_ram->pointer()[0x30000 | (offset & 0xffff)];
}
return data;
@@ -402,19 +402,19 @@ WRITE8_MEMBER( cbm2_state::ext_write )
if (!casseg1)
{
- m_ram->pointer()[offset & 0xffff] = data;
+ m_ram->pointer()[offset & 0xffff] = data;
}
if (!casseg2)
{
- m_ram->pointer()[0x10000 | (offset & 0xffff)] = data;
+ m_ram->pointer()[0x10000 | (offset & 0xffff)] = data;
}
if (!casseg3 && (m_ram->size() > 0x20000))
{
- m_ram->pointer()[0x20000 | (offset & 0xffff)] = data;
+ m_ram->pointer()[0x20000 | (offset & 0xffff)] = data;
}
if (!casseg4 && (m_ram->size() > 0x30000))
{
- m_ram->pointer()[0x30000 | (offset & 0xffff)] = data;
+ m_ram->pointer()[0x30000 | (offset & 0xffff)] = data;
}
#endif
@@ -1755,8 +1755,8 @@ WRITE8_MEMBER( cbm2_state::ext_tpi_pb_w )
bit description
- 0
- 1 _BUSY2
+ 0
+ 1 _BUSY2
2
3
4
@@ -1862,8 +1862,8 @@ WRITE8_MEMBER( cbm2_state::ext_cia_pb_w )
bit description
- 0
- 1 _BUSY2
+ 0
+ 1 _BUSY2
2
3
4
diff --git a/src/mess/drivers/clcd.c b/src/mess/drivers/clcd.c
index 6be06b90cde..388f054a751 100644
--- a/src/mess/drivers/clcd.c
+++ b/src/mess/drivers/clcd.c
@@ -62,7 +62,7 @@ public:
DECLARE_WRITE8_MEMBER(ramwrite_w)
{
// this area might be shared between rom & ram or it might be ram only
-// printf( "ram write:%04x %02x\n", offset, data );
+// printf( "ram write:%04x %02x\n", offset, data );
}
// these seem to control what appears in the memory space at various addresses.
@@ -70,64 +70,64 @@ public:
DECLARE_WRITE8_MEMBER(fa00_w)
{
-// printf( "fa00\n" );
+// printf( "fa00\n" );
}
DECLARE_WRITE8_MEMBER(fa80_w)
{
-// printf( "fa80\n" );
+// printf( "fa80\n" );
}
DECLARE_WRITE8_MEMBER(fb00_w)
{
-// printf( "fb00\n" );
+// printf( "fb00\n" );
}
DECLARE_WRITE8_MEMBER(fb80_w)
{
-// printf( "fb80\n" );
+// printf( "fb80\n" );
}
DECLARE_WRITE8_MEMBER(fc00_w)
{
-// printf( "fc00\n" );
+// printf( "fc00\n" );
}
DECLARE_WRITE8_MEMBER(fc80_w)
{
-// printf( "fc80\n" );
+// printf( "fc80\n" );
}
DECLARE_WRITE8_MEMBER(fd00_w)
{
-// printf( "fd00\n" );
+// printf( "fd00\n" );
}
DECLARE_WRITE8_MEMBER(fd80_w)
{
-// printf( "fd80\n" );
+// printf( "fd80\n" );
}
DECLARE_WRITE8_MEMBER(fe00_w)
{
-// printf( "fe00\n" );
+// printf( "fe00\n" );
}
DECLARE_WRITE8_MEMBER(fe80_w)
{
-// printf( "fe80\n" );
+// printf( "fe80\n" );
}
DECLARE_WRITE8_MEMBER(rombank_w)
{
-// printf( "rom bank %02x\n", data);
+// printf( "rom bank %02x\n", data);
// this might be for ram banking
membank("bankedroms")->set_entry(0);
}
DECLARE_WRITE8_MEMBER(ff80_w)
{
-// printf( "ff80:%02x %02x\n", offset, data );
+// printf( "ff80:%02x %02x\n", offset, data );
}
WRITE8_MEMBER( via0_pa_w )
diff --git a/src/mess/drivers/craft.c b/src/mess/drivers/craft.c
index ec6483d96db..d70adaaea19 100644
--- a/src/mess/drivers/craft.c
+++ b/src/mess/drivers/craft.c
@@ -76,9 +76,9 @@ public:
DECLARE_DRIVER_INIT(craft);
virtual void machine_reset();
UINT32 screen_update_craft(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-#if ENABLE_VERBOSE_LOG
+#if ENABLE_VERBOSE_LOG
inline void verboselog(int n_level, const char *s_fmt, ...);
-#endif
+#endif
};
void craft_state::machine_start()
diff --git a/src/mess/drivers/dectalk.c b/src/mess/drivers/dectalk.c
index cd16dae0617..1c439e102ee 100644
--- a/src/mess/drivers/dectalk.c
+++ b/src/mess/drivers/dectalk.c
@@ -179,7 +179,7 @@ better; in reality, it's big advantage was it made far fewer stupid
stress-placement mistakes because
it did a much better job of understanding prefixes and suffixes.
-Dave Conroy
+Dave Conroy
*/
/*
There are 3 things on the pins. Serial I/O. The telephone line. Power.
@@ -202,7 +202,7 @@ and use the telephone pins as a transformer-coupled audio output. This
is what we
used to do in the lab all the time.
-dgc (dg(no!spam)cx@mac.com)
+dgc (dg(no!spam)cx@mac.com)
*/
// USE_LOOSE_TIMING makes the cpu interleave much lower and boosts it on fifo and flag writes by the 68k and semaphore sets by the dsp
@@ -792,9 +792,9 @@ TIMER_CALLBACK_MEMBER(dectalk_state::outfifo_read_cb)
// also it doesn't work well, the setup menu is badly corrupt
/*device_t *duart = machine().device("duart68681");
if (machine.input().code_pressed(KEYCODE_F1))
- duart68681_rx_break(duart, 1, 1);
+ duart68681_rx_break(duart, 1, 1);
else
- duart68681_rx_break(duart, 1, 0);*/
+ duart68681_rx_break(duart, 1, 0);*/
}
/* Driver init: stuff that needs setting up which isn't directly affected by reset */
@@ -886,7 +886,7 @@ ROM_START( dectalk )
ROM_LOAD16_BYTE("23-098e5.e15", 0x38001, 0x4000, CRC(3d8910e7) SHA1(01921e77b46c2d4845023605239c45ffa4a35872)) // Label: "SP8510098E5" @ E15
/* the undumped 1.8 or 2.0 (beta?) version likely has roms:
- 23-091e5.e22, 23-092e5.e21, 23-093e5.e20, 23-094e5.e19,
+ 23-091e5.e22, 23-092e5.e21, 23-093e5.e20, 23-094e5.e19,
23-099e5.e8, 23-100e5.e7, 23-101e5.e6, 23-102e5.e5
and shares the 23-103e5 thru 106e5, and 095e5 thru 098e5 roms with
the 2.0 version above
diff --git a/src/mess/drivers/fp200.c b/src/mess/drivers/fp200.c
index 2bc4b3e2ebd..375b86b17e8 100644
--- a/src/mess/drivers/fp200.c
+++ b/src/mess/drivers/fp200.c
@@ -1,15 +1,15 @@
/***************************************************************************
- FP-200 (c) 1982 Casio
+ FP-200 (c) 1982 Casio
- preliminary driver by Angelo Salese
+ preliminary driver by Angelo Salese
- TODO:
- - What's the LCDC type? Custom?
- - Why RAM isn't recognized? Perhaps RAM is back-upped and needs default
- data?
- - Unless I've missed something in the schems, this one shouldn't have any
- sound capability.
+ TODO:
+ - What's the LCDC type? Custom?
+ - Why RAM isn't recognized? Perhaps RAM is back-upped and needs default
+ data?
+ - Unless I've missed something in the schems, this one shouldn't have any
+ sound capability.
***************************************************************************/
@@ -129,11 +129,11 @@ UINT32 fp200_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap,
/*
else if(m_lcd.attr[x/8+yoffs*20] == 0x40)
{
- UINT8 vram,pix;
+ UINT8 vram,pix;
- vram = m_lcd.vram[x/8+yoffs*20];
- pix = (vram) >> (7-(yoffs & 7)) & 1;
- bitmap.pix16(y,x) = pix;
+ vram = m_lcd.vram[x/8+yoffs*20];
+ pix = (vram) >> (7-(yoffs & 7)) & 1;
+ bitmap.pix16(y,x) = pix;
}*/
}
}
@@ -159,11 +159,11 @@ UINT32 fp200_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap,
}
/*else if(m_lcd.attr[x/8+yoffs*20] == 0x40)
{
- UINT8 vram,pix;
+ UINT8 vram,pix;
- vram = m_lcd.vram[x/8+yoffs*20];
- pix = (vram) >> (7-(yoffs & 7)) & 1;
- bitmap.pix16(y,x) = pix;
+ vram = m_lcd.vram[x/8+yoffs*20];
+ pix = (vram) >> (7-(yoffs & 7)) & 1;
+ bitmap.pix16(y,x) = pix;
}*/
}
}
@@ -175,7 +175,7 @@ UINT32 fp200_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap,
/*
[1] DDDD DDDD vram data/attr (left half)
[2] DDDD DDDD vram data/attr (right half)
-[8] SSSS --YY Status code (1=vram type/0xb=attr type) / upper part of Y address
+[8] SSSS --YY Status code (1=vram type/0xb=attr type) / upper part of Y address
[9] YYYY XXXX lower part of Y address / X address
*/
UINT8 fp200_state::read_lcd_attr(UINT16 X, UINT16 Y)
@@ -262,7 +262,7 @@ void fp200_state::write_lcd_attr(UINT16 X, UINT16 Y,UINT8 data)
return;
//if(data != 0x60)
- // printf("%d %d %02x\n",X,Y,data);
+ // printf("%d %d %02x\n",X,Y,data);
m_lcd.attr[base_offs] = data;
}
@@ -316,9 +316,9 @@ WRITE8_MEMBER(fp200_state::fp200_lcd_w)
READ8_MEMBER(fp200_state::fp200_keyb_r)
{
const char *const keynames[16] = { "KEY0", "KEY1", "KEY2", "KEY3",
- "KEY4", "KEY5", "KEY6", "KEY7",
- "KEY8", "KEY9", "UNUSED", "UNUSED",
- "UNUSED", "UNUSED", "UNUSED", "UNUSED"};
+ "KEY4", "KEY5", "KEY6", "KEY7",
+ "KEY8", "KEY9", "UNUSED", "UNUSED",
+ "UNUSED", "UNUSED", "UNUSED", "UNUSED"};
UINT8 res;
if(offset == 0)
@@ -452,7 +452,7 @@ static INPUT_PORTS_START( fp200 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("; / +") PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, fp200_state,keyb_irq, 0)
PORT_START("KEY4")
-// PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("CAPS LOCK") PORT_CODE(KEYCODE_CAPSLOCK) //PORT_TOGGLE PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, fp200_state,keyb_irq, 0)
+// PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("CAPS LOCK") PORT_CODE(KEYCODE_CAPSLOCK) //PORT_TOGGLE PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, fp200_state,keyb_irq, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("INS / DEL") PORT_CODE(KEYCODE_INSERT) PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, fp200_state,keyb_irq, 0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("HOME / CLS") PORT_CODE(KEYCODE_HOME) PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, fp200_state,keyb_irq, 0)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("PF0 / PF5") PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, fp200_state,keyb_irq, 0)
diff --git a/src/mess/drivers/gb.c b/src/mess/drivers/gb.c
index 05e63e637fe..c6476eef7d2 100644
--- a/src/mess/drivers/gb.c
+++ b/src/mess/drivers/gb.c
@@ -662,8 +662,8 @@ static SLOT_INTERFACE_START(gb_cart)
SLOT_INTERFACE_INTERNAL("rom_digimon", GB_ROM_DIGIMON)
SLOT_INTERFACE_INTERNAL("rom_rock8", GB_ROM_ROCKMAN8)
SLOT_INTERFACE_INTERNAL("rom_sm3sp", GB_ROM_SM3SP)
-// SLOT_INTERFACE_INTERNAL("rom_dkong5", GB_ROM_DKONG5)
-// SLOT_INTERFACE_INTERNAL("rom_unk01", GB_ROM_UNK01)
+// SLOT_INTERFACE_INTERNAL("rom_dkong5", GB_ROM_DKONG5)
+// SLOT_INTERFACE_INTERNAL("rom_unk01", GB_ROM_UNK01)
SLOT_INTERFACE_END
static SLOT_INTERFACE_START(megaduck_cart)
diff --git a/src/mess/drivers/mmodular.c b/src/mess/drivers/mmodular.c
index ef9650b9269..cda1358fced 100644
--- a/src/mess/drivers/mmodular.c
+++ b/src/mess/drivers/mmodular.c
@@ -243,10 +243,10 @@ WRITE8_MEMBER(polgar_state::write_polgar_IO)
m_lcdc->write(space, BIT(data,0), lcd_char);
}
- if (BIT(data,2) || BIT(data,3))
- machine().device<beep_device>("beep")->set_state(1);
- else
- machine().device<beep_device>("beep")->set_state(0);
+ if (BIT(data,2) || BIT(data,3))
+ machine().device<beep_device>("beep")->set_state(1);
+ else
+ machine().device<beep_device>("beep")->set_state(0);
if (BIT(data,7) && BIT(data, 4)) {
for (i = 0;i < 8;i++)
@@ -411,12 +411,12 @@ WRITE8_MEMBER(polgar_state::milano_write_LED)
WRITE8_MEMBER(polgar_state::megaiv_write_LED)
{
- if (BIT(data,7))
- machine().device<beep_device>("beep")->set_state(1);
- else
- machine().device<beep_device>("beep")->set_state(0);
- output_set_led_value(102,BIT(data,1)?1:0);
- output_set_led_value(107,BIT(data,6)?1:0);
+ if (BIT(data,7))
+ machine().device<beep_device>("beep")->set_state(1);
+ else
+ machine().device<beep_device>("beep")->set_state(0);
+ output_set_led_value(102,BIT(data,1)?1:0);
+ output_set_led_value(107,BIT(data,6)?1:0);
// logerror("LEDs FUNC = %02x found = %d\n",data,found);
logerror("LED mask %d\n",data);
@@ -474,14 +474,14 @@ if ((data & 0xa1) == 0xa1) {
found = 1;
}
-if (BIT(data,7))
- machine().device<beep_device>("beep")->set_state(1);
-else
- machine().device<beep_device>("beep")->set_state(0);
-if (BIT(data,1))
- machine().device<beep_device>("beep")->set_state(1);
-else
- machine().device<beep_device>("beep")->set_state(0);
+if (BIT(data,7))
+ machine().device<beep_device>("beep")->set_state(1);
+else
+ machine().device<beep_device>("beep")->set_state(0);
+if (BIT(data,1))
+ machine().device<beep_device>("beep")->set_state(1);
+else
+ machine().device<beep_device>("beep")->set_state(0);
// logerror("LEDs FUNC = %02x found = %d\n",data,found);
if (!found) {
logerror("unknown LED mask %d\n",data);
@@ -723,10 +723,10 @@ READ32_MEMBER(polgar_state::read_keys_BPL32)
WRITE8_MEMBER(polgar_state::beep_academy)
{
- if (!BIT(data,7))
- machine().device<beep_device>("beep")->set_state(1);
- else
- machine().device<beep_device>("beep")->set_state(0);
+ if (!BIT(data,7))
+ machine().device<beep_device>("beep")->set_state(1);
+ else
+ machine().device<beep_device>("beep")->set_state(0);
}
WRITE8_MEMBER(polgar_state::megaiv_IO)
@@ -903,10 +903,10 @@ void polgar_state::write_IOenable(unsigned char data,address_space &space)
logerror("Write to IOENBL data: %08x\n",data);
- if (BIT(data,2) || BIT(data,3))
- speaker->set_state(1);
- else
- speaker->set_state(0);
+ if (BIT(data,2) || BIT(data,3))
+ speaker->set_state(1);
+ else
+ speaker->set_state(0);
}
}
diff --git a/src/mess/drivers/mod8.c b/src/mess/drivers/mod8.c
index bc9aaf1a508..a074bf79116 100644
--- a/src/mess/drivers/mod8.c
+++ b/src/mess/drivers/mod8.c
@@ -90,7 +90,7 @@ IRQ_CALLBACK_MEMBER(mod8_state::mod8_irq_callback)
void mod8_state::machine_reset()
{
- machine().device("maincpu")->execute().set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(mod8_state::mod8_irq_callback),this));
+ machine().device("maincpu")->execute().set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(mod8_state::mod8_irq_callback),this));
}
WRITE8_MEMBER( mod8_state::kbd_put )
diff --git a/src/mess/drivers/nes.c b/src/mess/drivers/nes.c
index 720ccdc28fa..e9d9efce4a9 100644
--- a/src/mess/drivers/nes.c
+++ b/src/mess/drivers/nes.c
@@ -568,7 +568,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( famicom, nes )
MCFG_DEVICE_REMOVE( "nes_slot" )
- MCFG_NES_CARTRIDGE_ADD("nes_slot", nes_crt_interface, nes_cart, NULL, NULL) // here we need a non-mandatory cart...
+ MCFG_NES_CARTRIDGE_ADD("nes_slot", nes_crt_interface, nes_cart, NULL, NULL) // here we need a non-mandatory cart...
MCFG_NES_CARTRIDGE_NOT_MANDATORY
MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, nes_floppy_interface)
diff --git a/src/mess/drivers/ng_aes.c b/src/mess/drivers/ng_aes.c
index 58866950e8c..202437817f9 100644
--- a/src/mess/drivers/ng_aes.c
+++ b/src/mess/drivers/ng_aes.c
@@ -1692,21 +1692,21 @@ ROM_START( aes )
ROM_SYSTEM_BIOS( 2, "uni-bios23", "Universe Bios (Ver. 2.3)" )
ROMX_LOAD( "uni-bios_2_3.rom", 0x00000, 0x020000, CRC(27664eb5) SHA1(5b02900a3ccf3df168bdcfc98458136fd2b92ac0), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(3) ) /* Universe Bios v2.3 (hack) */
ROM_SYSTEM_BIOS( 3, "uni-bios30", "Universe Bios (Ver. 3.0)" )
- ROMX_LOAD("uni-bios-30.rom", 0x00000, 0x020000, CRC(a97c89a9) SHA1(97a5eff3b119062f10e31ad6f04fe4b90d366e7f), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(4)) /* Universe Bios v3.0 */
+ ROMX_LOAD("uni-bios-30.rom", 0x00000, 0x020000, CRC(a97c89a9) SHA1(97a5eff3b119062f10e31ad6f04fe4b90d366e7f), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(4)) /* Universe Bios v3.0 */
ROM_SYSTEM_BIOS( 4, "uni-bios10", "Universe Bios (Ver. 1.0)" )
- ROMX_LOAD("uni-bios-10.rom", 0x00000, 0x020000, CRC(0ce453a0) SHA1(3b4c0cd26c176fc6b26c3a2f95143dd478f6abf9), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(5)) /* Universe Bios v1.0 */
+ ROMX_LOAD("uni-bios-10.rom", 0x00000, 0x020000, CRC(0ce453a0) SHA1(3b4c0cd26c176fc6b26c3a2f95143dd478f6abf9), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(5)) /* Universe Bios v1.0 */
ROM_SYSTEM_BIOS( 5, "uni-bios11", "Universe Bios (Ver. 1.1)" )
- ROMX_LOAD("uni-bios-11.rom", 0x00000, 0x020000, CRC(5dda0d84) SHA1(4153d533c02926a2577e49c32657214781ff29b7), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(6)) /* Universe Bios v1.1 */
+ ROMX_LOAD("uni-bios-11.rom", 0x00000, 0x020000, CRC(5dda0d84) SHA1(4153d533c02926a2577e49c32657214781ff29b7), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(6)) /* Universe Bios v1.1 */
ROM_SYSTEM_BIOS( 6, "uni-bios12", "Universe Bios (Ver. 1.2)" )
- ROMX_LOAD("uni-bios-12.rom", 0x00000, 0x020000, CRC(4fa698e9) SHA1(682e13ec1c42beaa2d04473967840c88fd52c75a), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(7)) /* Universe Bios v1.2 */
+ ROMX_LOAD("uni-bios-12.rom", 0x00000, 0x020000, CRC(4fa698e9) SHA1(682e13ec1c42beaa2d04473967840c88fd52c75a), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(7)) /* Universe Bios v1.2 */
ROM_SYSTEM_BIOS( 7, "uni-bios13", "Universe Bios (Ver. 1.3)" )
- ROMX_LOAD("uni-bios-13.rom", 0x00000, 0x020000, CRC(b24b44a0) SHA1(eca8851d30557b97c309a0d9f4a9d20e5b14af4e), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(8)) /* Universe Bios v1.3 */
+ ROMX_LOAD("uni-bios-13.rom", 0x00000, 0x020000, CRC(b24b44a0) SHA1(eca8851d30557b97c309a0d9f4a9d20e5b14af4e), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(8)) /* Universe Bios v1.3 */
ROM_SYSTEM_BIOS( 8, "uni-bios20", "Universe Bios (Ver. 2.0)" )
- ROMX_LOAD("uni-bios-20.rom", 0x00000, 0x020000, CRC(0c12c2ad) SHA1(37bcd4d30f3892078b46841d895a6eff16dc921e), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(9)) /* Universe Bios v2.0 */
+ ROMX_LOAD("uni-bios-20.rom", 0x00000, 0x020000, CRC(0c12c2ad) SHA1(37bcd4d30f3892078b46841d895a6eff16dc921e), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(9)) /* Universe Bios v2.0 */
ROM_SYSTEM_BIOS( 9, "uni-bios21", "Universe Bios (Ver. 2.1)" )
- ROMX_LOAD("uni-bios-21.rom", 0x00000, 0x020000, CRC(8dabf76b) SHA1(c23732c4491d966cf0373c65c83c7a4e88f0082c), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(10)) /* Universe Bios v2.1 */
+ ROMX_LOAD("uni-bios-21.rom", 0x00000, 0x020000, CRC(8dabf76b) SHA1(c23732c4491d966cf0373c65c83c7a4e88f0082c), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(10)) /* Universe Bios v2.1 */
ROM_SYSTEM_BIOS( 10, "uni-bios22", "Universe Bios (Ver. 2.2)" )
- ROMX_LOAD("uni-bios-22.rom", 0x00000, 0x020000, CRC(2d50996a) SHA1(5241a4fb0c63b1a23fd1da8efa9c9a9bd3b4279c), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(11)) /* Universe Bios v2.2 */
+ ROMX_LOAD("uni-bios-22.rom", 0x00000, 0x020000, CRC(2d50996a) SHA1(5241a4fb0c63b1a23fd1da8efa9c9a9bd3b4279c), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(11)) /* Universe Bios v2.2 */
ROM_REGION( 0x200000, "maincpu", ROMREGION_ERASEFF )
diff --git a/src/mess/drivers/ob68k1a.c b/src/mess/drivers/ob68k1a.c
index 0f4ece25381..a9ba2d5a3bb 100644
--- a/src/mess/drivers/ob68k1a.c
+++ b/src/mess/drivers/ob68k1a.c
@@ -326,8 +326,8 @@ void ob68k1a_state::machine_reset()
// initialize COM8116
com8116_w(program, 0, 0xee);
-// m_dbrg->stt_w(program, 0, 0x01);
-// m_dbrg->str_w(program, 0, 0x01);
+// m_dbrg->stt_w(program, 0, 0x01);
+// m_dbrg->str_w(program, 0, 0x01);
// set reset vector
void *ram = program.get_write_ptr(0);
diff --git a/src/mess/drivers/odyssey2.c b/src/mess/drivers/odyssey2.c
index 92c49a0ce6e..23cf3393033 100644
--- a/src/mess/drivers/odyssey2.c
+++ b/src/mess/drivers/odyssey2.c
@@ -246,24 +246,24 @@ INPUT_PORTS_END
const UINT8 odyssey2_colors[] =
{
/* Background,Grid Dim */
- 0x00,0x00,0x00, /* Black */ // i r g b
- 0x1A,0x37,0xBE, /* Blue - Calibrated To Real VideoPac */ // i r g B
- 0x00,0x6D,0x07, /* Green - Calibrated To Real VideoPac */ // i r G b
- 0x2A,0xAA,0xBE, /* Blue-Green - Calibrated To Real VideoPac */ // i r G B
- 0x79,0x00,0x00, /* Red - Calibrated To Real VideoPac */ // i R g b
- 0x94,0x30,0x9F, /* Violet - Calibrated To Real VideoPac */ // i R g B
- 0x77,0x67,0x0B, /* Khaki - Calibrated To Real VideoPac */ // i R g B
- 0xCE,0xCE,0xCE, /* Lt Grey */ // i R G B
+ 0x00,0x00,0x00, /* Black */ // i r g b
+ 0x1A,0x37,0xBE, /* Blue - Calibrated To Real VideoPac */ // i r g B
+ 0x00,0x6D,0x07, /* Green - Calibrated To Real VideoPac */ // i r G b
+ 0x2A,0xAA,0xBE, /* Blue-Green - Calibrated To Real VideoPac */ // i r G B
+ 0x79,0x00,0x00, /* Red - Calibrated To Real VideoPac */ // i R g b
+ 0x94,0x30,0x9F, /* Violet - Calibrated To Real VideoPac */ // i R g B
+ 0x77,0x67,0x0B, /* Khaki - Calibrated To Real VideoPac */ // i R g B
+ 0xCE,0xCE,0xCE, /* Lt Grey */ // i R G B
/* Background,Grid Bright */
- 0x67,0x67,0x67, /* Grey - Calibrated To Real VideoPac */ // I R g B
- 0x5C,0x80,0xF6, /* Lt Blue - Calibrated To Real VideoPac */ // I R g B
- 0x56,0xC4,0x69, /* Lt Green - Calibrated To Real VideoPac */ // I R g B
- 0x77,0xE6,0xEB, /* Lt Blue-Green - Calibrated To Real VideoPac */ // I R g b
- 0xC7,0x51,0x51, /* Lt Red - Calibrated To Real VideoPac */ // I R g b
- 0xDC,0x84,0xE8, /* Lt Violet - Calibrated To Real VideoPac */ // I R g B
- 0xC6,0xB8,0x6A, /* Lt Yellow - Calibrated To Real VideoPac */ // I R G b
- 0xFF,0xFF,0xFF, /* White */ // I R G B
+ 0x67,0x67,0x67, /* Grey - Calibrated To Real VideoPac */ // I R g B
+ 0x5C,0x80,0xF6, /* Lt Blue - Calibrated To Real VideoPac */ // I R g B
+ 0x56,0xC4,0x69, /* Lt Green - Calibrated To Real VideoPac */ // I R g B
+ 0x77,0xE6,0xEB, /* Lt Blue-Green - Calibrated To Real VideoPac */ // I R g b
+ 0xC7,0x51,0x51, /* Lt Red - Calibrated To Real VideoPac */ // I R g b
+ 0xDC,0x84,0xE8, /* Lt Violet - Calibrated To Real VideoPac */ // I R g B
+ 0xC6,0xB8,0x6A, /* Lt Yellow - Calibrated To Real VideoPac */ // I R G b
+ 0xFF,0xFF,0xFF, /* White */ // I R G B
};
@@ -280,23 +280,23 @@ void g7400_state::palette_init()
{
const UINT8 g7400_colors[] =
{
- 0x00,0x00,0x00, // Black
- 0x1A,0x37,0xBE, // Blue
- 0x00,0x6D,0x07, // Green
- 0x2A,0xAA,0xBE, // Blue-Green
- 0x79,0x00,0x00, // Red
- 0x94,0x30,0x9F, // Violet
- 0x77,0x67,0x0B, // Khaki
- 0xCE,0xCE,0xCE, // Lt Grey
-
- 0x67,0x67,0x67, // Grey
- 0x5C,0x80,0xF6, // Lt Blue
- 0x56,0xC4,0x69, // Lt Green
- 0x77,0xE6,0xEB, // Lt Blue-Green
- 0xC7,0x51,0x51, // Lt Red
- 0xDC,0x84,0xE8, // Lt Violet
- 0xC6,0xB8,0x6A, // Lt Yellow
- 0xff,0xff,0xff // White
+ 0x00,0x00,0x00, // Black
+ 0x1A,0x37,0xBE, // Blue
+ 0x00,0x6D,0x07, // Green
+ 0x2A,0xAA,0xBE, // Blue-Green
+ 0x79,0x00,0x00, // Red
+ 0x94,0x30,0x9F, // Violet
+ 0x77,0x67,0x0B, // Khaki
+ 0xCE,0xCE,0xCE, // Lt Grey
+
+ 0x67,0x67,0x67, // Grey
+ 0x5C,0x80,0xF6, // Lt Blue
+ 0x56,0xC4,0x69, // Lt Green
+ 0x77,0xE6,0xEB, // Lt Blue-Green
+ 0xC7,0x51,0x51, // Lt Red
+ 0xDC,0x84,0xE8, // Lt Violet
+ 0xC6,0xB8,0x6A, // Lt Yellow
+ 0xff,0xff,0xff // White
};
@@ -976,4 +976,3 @@ COMP( 1979, videopac, odyssey2, 0, videopac, odyssey2, odyssey2_state, odys
COMP( 1983, g7400, odyssey2, 0, g7400, odyssey2, odyssey2_state, odyssey2, "Philips", "Videopac Plus G7400", GAME_IMPERFECT_GRAPHICS )
COMP( 1983, jopac, odyssey2, 0, g7400, odyssey2, odyssey2_state, odyssey2, "Brandt", "Jopac JO7400", GAME_IMPERFECT_GRAPHICS )
COMP( 1983, odyssey3, odyssey2, 0, odyssey3, odyssey2, odyssey2_state, odyssey2, "Maganvox", "Odyssey 3 Command Center (prototype)", GAME_IMPERFECT_GRAPHICS )
-
diff --git a/src/mess/drivers/pc4.c b/src/mess/drivers/pc4.c
index f6f8299f32b..1149b84b590 100644
--- a/src/mess/drivers/pc4.c
+++ b/src/mess/drivers/pc4.c
@@ -192,7 +192,7 @@ void pc4_state::machine_start()
m_blink_timer = timer_alloc(BLINKING_TIMER);
m_blink_timer->adjust(attotime::from_msec(409), 0, attotime::from_msec(409));
- for (int i=0; i<8; i++)
+ for (int i=0; i<8; i++)
{
io_port[i] = ioport(bitnames[i]);
}
diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c
index c2808dcada8..0725a9491ce 100644
--- a/src/mess/drivers/pet.c
+++ b/src/mess/drivers/pet.c
@@ -1795,7 +1795,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED_CLASS( cbm8296, pet80, cbm8296_state )
MCFG_MACHINE_START_OVERRIDE(cbm8296_state, cbm8296)
MCFG_MACHINE_RESET_OVERRIDE(cbm8296_state, cbm8296)
-
+
MCFG_CPU_MODIFY(M6502_TAG)
MCFG_CPU_PROGRAM_MAP(cbm8296_mem)
diff --git a/src/mess/drivers/thomson.c b/src/mess/drivers/thomson.c
index b7c9db17a2f..1e5a03118a1 100644
--- a/src/mess/drivers/thomson.c
+++ b/src/mess/drivers/thomson.c
@@ -565,7 +565,7 @@ INPUT_PORTS_END
static WRITE_LINE_DEVICE_HANDLER(thomson_index_callback)
{
- device->machine().driver_data<thomson_state>()->thomson_index_callback(device, state);
+ device->machine().driver_data<thomson_state>()->thomson_index_callback(device, state);
}
diff --git a/src/mess/drivers/vic10.c b/src/mess/drivers/vic10.c
index 07783d18018..03496be5e95 100644
--- a/src/mess/drivers/vic10.c
+++ b/src/mess/drivers/vic10.c
@@ -586,7 +586,7 @@ void vic10_state::machine_start()
void vic10_state::machine_reset()
{
m_maincpu->reset();
-
+
m_vic->reset();
m_sid->reset();
m_cia->reset();
diff --git a/src/mess/includes/c65.h b/src/mess/includes/c65.h
index aa8084ac063..e335d30058f 100644
--- a/src/mess/includes/c65.h
+++ b/src/mess/includes/c65.h
@@ -103,7 +103,7 @@ public:
UINT8 *m_io_ram_w_ptr;
UINT8 *m_io_ram_r_ptr;
c64_cart_t m_cart;
- int m_nmilevel; int m_charset_select;
+ int m_nmilevel; int m_charset_select;
int m_c64mode;
UINT8 m_6511_port;
UINT8 m_keyline;
diff --git a/src/mess/includes/channelf.h b/src/mess/includes/channelf.h
index 461db0dea57..e3e21990128 100644
--- a/src/mess/includes/channelf.h
+++ b/src/mess/includes/channelf.h
@@ -29,7 +29,7 @@ class channelf_state : public driver_device
public:
channelf_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_custom(*this,"custom") { }
+ m_custom(*this,"custom") { }
DECLARE_READ8_MEMBER(channelf_port_0_r);
DECLARE_READ8_MEMBER(channelf_port_1_r);
diff --git a/src/mess/includes/fidelz80.h b/src/mess/includes/fidelz80.h
index da2e72231eb..d098a78d0b3 100644
--- a/src/mess/includes/fidelz80.h
+++ b/src/mess/includes/fidelz80.h
@@ -17,11 +17,11 @@ class fidelz80_state : public driver_device
public:
fidelz80_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_speech(*this, "speech"),
- m_beep(*this, BEEPER_TAG),
- m_i8041(*this, "mcu"),
- m_i8243(*this, "i8243")
+ m_maincpu(*this, "maincpu"),
+ m_speech(*this, "speech"),
+ m_beep(*this, BEEPER_TAG),
+ m_i8041(*this, "mcu"),
+ m_i8243(*this, "i8243")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/mikromik.h b/src/mess/includes/mikromik.h
index 3c82d06e2a5..b852a410672 100644
--- a/src/mess/includes/mikromik.h
+++ b/src/mess/includes/mikromik.h
@@ -26,9 +26,9 @@
#define I8275_TAG "ic59"
#define UPD7201_TAG "ic11"
#define UPD7220_TAG "ic101"
-#define RS232_A_TAG "rs232a"
-#define RS232_B_TAG "rs232b"
-#define RS232_C_TAG "rs232c"
+#define RS232_A_TAG "rs232a"
+#define RS232_B_TAG "rs232b"
+#define RS232_C_TAG "rs232c"
class mm1_state : public driver_device
{
diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h
index 0bc97034aeb..518f5f2197e 100644
--- a/src/mess/includes/nes.h
+++ b/src/mess/includes/nes.h
@@ -144,7 +144,7 @@ public:
ioport_port *m_io_zapper2_y;
ioport_port *m_io_paddle;
- optional_device<nes_cart_slot_device> m_cartslot; //mandatory
+ optional_device<nes_cart_slot_device> m_cartslot; //mandatory
private:
/* devices */
diff --git a/src/mess/includes/ob68k1a.h b/src/mess/includes/ob68k1a.h
index 1b33a8a8d03..785fcd8633f 100644
--- a/src/mess/includes/ob68k1a.h
+++ b/src/mess/includes/ob68k1a.h
@@ -19,8 +19,8 @@
#define MC6850_0_TAG "u34"
#define MC6850_1_TAG "u26"
#define COM8116_TAG "u56"
-#define RS232_A_TAG "rs232a"
-#define RS232_B_TAG "rs232b"
+#define RS232_A_TAG "rs232a"
+#define RS232_B_TAG "rs232b"
class ob68k1a_state : public driver_device
{
diff --git a/src/mess/includes/osi.h b/src/mess/includes/osi.h
index c7fe1ce7f07..295c346ba9d 100644
--- a/src/mess/includes/osi.h
+++ b/src/mess/includes/osi.h
@@ -93,7 +93,7 @@ class c1p_state : public sb2m600_state
public:
c1p_state(const machine_config &mconfig, device_type type, const char *tag)
: sb2m600_state(mconfig, type, tag),
- m_beep(*this, BEEPER_TAG)
+ m_beep(*this, BEEPER_TAG)
{ }
required_device<beep_device> m_beep;
diff --git a/src/mess/includes/pet.h b/src/mess/includes/pet.h
index b99e292d500..8f0d1ceac79 100644
--- a/src/mess/includes/pet.h
+++ b/src/mess/includes/pet.h
@@ -24,8 +24,8 @@
#define M6520_2_TAG "b8"
#define MC6845_TAG "ub13"
#define SCREEN_TAG "screen"
-#define PLA1_TAG "ue6"
-#define PLA2_TAG "ue5"
+#define PLA1_TAG "ue6"
+#define PLA2_TAG "ue5"
class pet_state : public driver_device
{
diff --git a/src/mess/includes/prof80.h b/src/mess/includes/prof80.h
index 13be84c0888..681d44851f9 100644
--- a/src/mess/includes/prof80.h
+++ b/src/mess/includes/prof80.h
@@ -18,8 +18,8 @@
#define Z80_TAG "z1"
#define UPD765_TAG "z38"
#define UPD1990A_TAG "z43"
-#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/psion.h b/src/mess/includes/psion.h
index 49de76d7799..f2db7fe48ad 100644
--- a/src/mess/includes/psion.h
+++ b/src/mess/includes/psion.h
@@ -22,13 +22,13 @@ class psion_state : public driver_device
public:
psion_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_lcdc(*this, "hd44780"),
- m_beep(*this, BEEPER_TAG),
- m_pack1(*this, "pack1"),
- m_pack2(*this, "pack2"),
- m_sys_register(*this, "sys_register"),
- m_ram(*this, "ram"){ }
+ m_maincpu(*this, "maincpu"),
+ m_lcdc(*this, "hd44780"),
+ m_beep(*this, BEEPER_TAG),
+ m_pack1(*this, "pack1"),
+ m_pack2(*this, "pack2"),
+ m_sys_register(*this, "sys_register"),
+ m_ram(*this, "ram"){ }
required_device<cpu_device> m_maincpu;
required_device<hd44780_device> m_lcdc;
diff --git a/src/mess/includes/special.h b/src/mess/includes/special.h
index 2c0004995c5..7e47e02f1ba 100644
--- a/src/mess/includes/special.h
+++ b/src/mess/includes/special.h
@@ -158,7 +158,7 @@ extern const rgb_t specimx_palette[16];
/*----------- defined in audio/special.c -----------*/
class specimx_sound_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -172,10 +172,10 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- void set_input(int index, int state);
+ void set_input(int index, int state);
private:
- sound_stream *m_mixer_channel;
+ sound_stream *m_mixer_channel;
int m_specimx_input[3];
};
diff --git a/src/mess/includes/studio2.h b/src/mess/includes/studio2.h
index 45d012b5e6e..2d336198113 100644
--- a/src/mess/includes/studio2.h
+++ b/src/mess/includes/studio2.h
@@ -22,12 +22,12 @@ class studio2_state : public driver_device
public:
studio2_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, CDP1802_TAG),
- m_speaker(*this, BEEPER_TAG),
- m_vdc(*this, CDP1861_TAG),
- m_clear(*this, "CLEAR"),
- m_a(*this, "A"),
- m_b(*this, "B")
+ m_maincpu(*this, CDP1802_TAG),
+ m_speaker(*this, BEEPER_TAG),
+ m_vdc(*this, CDP1861_TAG),
+ m_clear(*this, "CLEAR"),
+ m_a(*this, "A"),
+ m_b(*this, "B")
{ }
required_device<cosmac_device> m_maincpu;
diff --git a/src/mess/includes/super80.h b/src/mess/includes/super80.h
index 33d6ac23851..fac8471470c 100644
--- a/src/mess/includes/super80.h
+++ b/src/mess/includes/super80.h
@@ -120,4 +120,4 @@ MC6845_UPDATE_ROW( super80v_update_row );
/*----------- defined in machine/super80.c -----------*/
extern const z80pio_interface super80_pio_intf;
-QUICKLOAD_LOAD( super80 ); \ No newline at end of file
+QUICKLOAD_LOAD( super80 );
diff --git a/src/mess/includes/svision.h b/src/mess/includes/svision.h
index 143fb9c40e4..1906b4041fb 100644
--- a/src/mess/includes/svision.h
+++ b/src/mess/includes/svision.h
@@ -100,21 +100,21 @@ enum SVISION_NOISE_Type
struct SVISION_NOISE
{
- SVISION_NOISE() :
- on(0),
- right(0),
- left(0),
- play(0),
- type(SVISION_NOISE_Type7Bit),
- state(0),
- volume(0),
- count(0),
- step(0.0),
- pos(0.0),
- value(0)
- {
- memset(reg, 0, sizeof(UINT8)*3);
- }
+ SVISION_NOISE() :
+ on(0),
+ right(0),
+ left(0),
+ play(0),
+ type(SVISION_NOISE_Type7Bit),
+ state(0),
+ volume(0),
+ count(0),
+ step(0.0),
+ pos(0.0),
+ value(0)
+ {
+ memset(reg, 0, sizeof(UINT8)*3);
+ }
UINT8 reg[3];
int on, right, left, play;
@@ -128,19 +128,19 @@ struct SVISION_NOISE
struct SVISION_DMA
{
- SVISION_DMA() :
- on(0),
- right(0),
- left(0),
- ca14to16(0),
- start(0),
- size(0),
- pos(0.0),
- step(0.0),
- finished(0)
- {
- memset(reg, 0, sizeof(UINT8)*5);
- }
+ SVISION_DMA() :
+ on(0),
+ right(0),
+ left(0),
+ ca14to16(0),
+ start(0),
+ size(0),
+ pos(0.0),
+ step(0.0),
+ finished(0)
+ {
+ memset(reg, 0, sizeof(UINT8)*5);
+ }
UINT8 reg[5];
int on, right, left;
@@ -152,16 +152,16 @@ struct SVISION_DMA
struct SVISION_CHANNEL
{
- SVISION_CHANNEL() :
- on(0),
- waveform(0),
- volume(0),
- pos(0),
- size(0),
- count(0)
- {
- memset(reg, 0, sizeof(UINT8)*4);
- }
+ SVISION_CHANNEL() :
+ on(0),
+ waveform(0),
+ volume(0),
+ pos(0),
+ size(0),
+ count(0)
+ {
+ memset(reg, 0, sizeof(UINT8)*4);
+ }
UINT8 reg[4];
int on;
@@ -175,7 +175,7 @@ struct SVISION_CHANNEL
// ======================> svision_sound_device
class svision_sound_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
svision_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -189,13 +189,13 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( svision_sounddma_w );
- DECLARE_WRITE8_MEMBER( svision_noise_w );
-
+ DECLARE_WRITE8_MEMBER( svision_sounddma_w );
+ DECLARE_WRITE8_MEMBER( svision_noise_w );
+
public:
- int *dma_finished();
- void sound_decrement();
- void soundport_w(int which, int offset, int data);
+ int *dma_finished();
+ void sound_decrement();
+ void soundport_w(int which, int offset, int data);
private:
sound_stream *m_mixer_channel;
diff --git a/src/mess/includes/vc4000.h b/src/mess/includes/vc4000.h
index b416562f97a..040f1ccae4f 100644
--- a/src/mess/includes/vc4000.h
+++ b/src/mess/includes/vc4000.h
@@ -160,13 +160,13 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- void soundport_w(int mode, int data);
+ void soundport_w(int mode, int data);
private:
sound_stream *m_channel;
UINT8 m_reg[1];
int m_size;
- int m_pos;
+ int m_pos;
unsigned m_level;
};
diff --git a/src/mess/includes/wswan.h b/src/mess/includes/wswan.h
index cdea374b396..a1d1afb8465 100644
--- a/src/mess/includes/wswan.h
+++ b/src/mess/includes/wswan.h
@@ -191,15 +191,15 @@ void wswan_refresh_scanline( running_machine &machine );
struct CHAN
{
- CHAN() :
- freq(0),
- period(0),
- pos(0),
- vol_left(0),
- vol_right(0),
- on(0),
- signal(0) { }
-
+ CHAN() :
+ freq(0),
+ period(0),
+ pos(0),
+ vol_left(0),
+ vol_right(0),
+ on(0),
+ signal(0) { }
+
UINT16 freq; /* frequency */
UINT32 period; /* period */
UINT32 pos; /* position */
@@ -227,10 +227,10 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
public:
- DECLARE_WRITE8_MEMBER( wswan_sound_port_w );
+ DECLARE_WRITE8_MEMBER( wswan_sound_port_w );
private:
- void wswan_ch_set_freq( CHAN *ch, UINT16 freq );
+ void wswan_ch_set_freq( CHAN *ch, UINT16 freq );
private:
sound_stream *m_channel;
diff --git a/src/mess/includes/xerox820.h b/src/mess/includes/xerox820.h
index 7522323f379..db4e426afe5 100644
--- a/src/mess/includes/xerox820.h
+++ b/src/mess/includes/xerox820.h
@@ -114,7 +114,7 @@ class bigboard_state : public xerox820_state
public:
bigboard_state(const machine_config &mconfig, device_type type, const char *tag)
: xerox820_state(mconfig, type, tag),
- m_beeper(*this, BEEPER_TAG)
+ m_beeper(*this, BEEPER_TAG)
{ }
required_device<beep_device> m_beeper;
diff --git a/src/mess/machine/3c505.c b/src/mess/machine/3c505.c
index bc0eaccd28f..b7954077d71 100644
--- a/src/mess/machine/3c505.c
+++ b/src/mess/machine/3c505.c
@@ -400,7 +400,7 @@ void threecom3c505_device::data_buffer_fifo::reset()
m_count = 0;
}
-int threecom3c505_device::data_buffer_fifo::put(const UINT8 data[], const int length)
+int threecom3c505_device::data_buffer_fifo::put(const UINT8 data[], const int length)
{
UINT16 next_index = (m_put_index + 1) % m_size;
@@ -659,11 +659,11 @@ void threecom3c505_device::do_receive_command()
// preset receive response PCB
memcpy(&m_response, &m_rcv_response, sizeof(m_rcv_response));
-// m_response.command = CMD_RECEIVE_PACKET_COMPLETE; // 0x38
-// m_response.length = 16;
-// m_response.data.rcv_resp.buf_ofs = htole16(0);
-// m_response.data.rcv_resp.buf_seg = htole16(0);
-// m_response.data.rcv_resp.buf_len = htole16(buf_len);
+// m_response.command = CMD_RECEIVE_PACKET_COMPLETE; // 0x38
+// m_response.length = 16;
+// m_response.data.rcv_resp.buf_ofs = htole16(0);
+// m_response.data.rcv_resp.buf_seg = htole16(0);
+// m_response.data.rcv_resp.buf_len = htole16(buf_len);
// htole16 and friends are not portable beyond Linux. It's named differently on *BSD and differently again on OS X. Avoid!
m_response.data.rcv_resp.pkt_len = uint16_to_le(m_rx_data_buffer.get_length());
@@ -1129,7 +1129,7 @@ UINT8 threecom3c505_device::read_command_port()
case CMD_TRANSMIT_PACKET_18_COMPLETE:
m_netstat.tot_xmit++;
- if (!send(m_tx_data_buffer.get_data(), m_tx_data_buffer.get_length()))
+ if (!send(m_tx_data_buffer.get_data(), m_tx_data_buffer.get_length()))
{
// FIXME: failed to send the Ethernet packet
LOG(("read_command_port(): !!! failed to send Ethernet packet"));
@@ -1216,7 +1216,7 @@ void threecom3c505_device::write_data_port(UINT8 data)
}
}
else if (m_command_buffer[0] == CMD_TRANSMIT_PACKET || //
- m_command_buffer[0] == CMD_TRANSMIT_PACKET_18)
+ m_command_buffer[0] == CMD_TRANSMIT_PACKET_18)
{
if (!m_tx_data_buffer.append(data))
{
diff --git a/src/mess/machine/68561mpcc.c b/src/mess/machine/68561mpcc.c
index 487b4d4abd4..ef29f95a98d 100644
--- a/src/mess/machine/68561mpcc.c
+++ b/src/mess/machine/68561mpcc.c
@@ -19,9 +19,9 @@ const device_type MPCC68561 = &device_creator<mpcc68561_t>;
PARAMETERS
***************************************************************************/
-#define LOG_MPCC (1)
+#define LOG_MPCC (1)
-#if 0 // future
+#if 0 // future
/***************************************************************************
IMPLEMENTATION
@@ -253,10 +253,10 @@ void mpcc68561_t::putreg(int ch, UINT8 data)
switch (reg)
{
- case 0: // command register
+ case 0: // command register
switch ((data >> 3) & 7)
{
- case 1: // select high registers (handled elsewhere)
+ case 1: // select high registers (handled elsewhere)
break;
case 2: // reset external and status IRQs
@@ -268,7 +268,7 @@ void mpcc68561_t::putreg(int ch, UINT8 data)
updateirqs();
break;
- case 0: // nothing
+ case 0: // nothing
case 3: // send SDLC abort
case 4: // enable IRQ on next Rx byte
case 6: // reset errors
@@ -279,7 +279,7 @@ void mpcc68561_t::putreg(int ch, UINT8 data)
}
break;
- case 1: // Tx/Rx IRQ and data transfer mode defintion
+ case 1: // Tx/Rx IRQ and data transfer mode defintion
pChan->extIRQEnable = (data & 1);
pChan->txIRQEnable = (data & 2) ? 1 : 0;
pChan->rxIRQEnable = (data >> 3) & 3;
@@ -301,7 +301,7 @@ void mpcc68561_t::putreg(int ch, UINT8 data)
if (pChan->txEnable)
{
- pChan->reg_val[0] |= 0x04; // Tx empty
+ pChan->reg_val[0] |= 0x04; // Tx empty
}
break;
@@ -317,10 +317,10 @@ void mpcc68561_t::putreg(int ch, UINT8 data)
// channel reset command
switch ((data>>6) & 3)
{
- case 0: // do nothing
+ case 0: // do nothing
break;
- case 1: // reset channel B
+ case 1: // reset channel B
resetchannel(0);
break;
@@ -339,14 +339,14 @@ void mpcc68561_t::putreg(int ch, UINT8 data)
}
break;
- case 10: // misc transmitter/receiver control bits
- case 11: // clock mode control
- case 12: // lower byte of baud rate gen
- case 13: // upper byte of baud rate gen
+ case 10: // misc transmitter/receiver control bits
+ case 11: // clock mode control
+ case 12: // lower byte of baud rate gen
+ case 13: // upper byte of baud rate gen
break;
- case 14: // misc control bits
- if (data & 0x01) // baud rate generator enable?
+ case 14: // misc control bits
+ if (data & 0x01) // baud rate generator enable?
{
int brconst = pChan->reg_val[13]<<8 | pChan->reg_val[14];
int rate = clock() / brconst;
@@ -355,7 +355,7 @@ void mpcc68561_t::putreg(int ch, UINT8 data)
}
break;
- case 15: // external/status interrupt control
+ case 15: // external/status interrupt control
pChan->baudIRQEnable = (data & 2) ? 1 : 0;
pChan->DCDEnable = (data & 8) ? 1 : 0;
pChan->CTSEnable = (data & 0x20) ? 1 : 0;
@@ -469,10 +469,10 @@ WRITE8_MEMBER( mpcc68561_t::reg_w )
if (pChan->reg_val[14] & 0x10)
{
pChan->rxData = data;
- pChan->reg_val[0] |= 0x01; // Rx character available
+ pChan->reg_val[0] |= 0x01; // Rx character available
}
- pChan->reg_val[1] |= 0x01; // All sent
- pChan->reg_val[0] |= 0x04; // Tx empty
+ pChan->reg_val[1] |= 0x01; // All sent
+ pChan->reg_val[0] |= 0x04; // Tx empty
pChan->txUnderrun = 1;
pChan->txIRQPending = 1;
updateirqs();
diff --git a/src/mess/machine/68561mpcc.h b/src/mess/machine/68561mpcc.h
index 591278df9d8..2d446a5ab5b 100644
--- a/src/mess/machine/68561mpcc.h
+++ b/src/mess/machine/68561mpcc.h
@@ -11,8 +11,8 @@
#ifndef __68561MPCC_H__
#define __68561MPCC_H__
-#define MCFG_MPCC68561_ADD(_tag, _clock, _intrq_cb) \
- MCFG_DEVICE_ADD(_tag, MPCC68561, _clock) \
+#define MCFG_MPCC68561_ADD(_tag, _clock, _intrq_cb) \
+ MCFG_DEVICE_ADD(_tag, MPCC68561, _clock) \
downcast<mpcc68561_t *>(device)->set_intrq_cb(_intrq_cb);
class mpcc68561_t : public device_t
diff --git a/src/mess/machine/a2mockingboard.c b/src/mess/machine/a2mockingboard.c
index 0c896f19d3a..9bbf80bd375 100644
--- a/src/mess/machine/a2mockingboard.c
+++ b/src/mess/machine/a2mockingboard.c
@@ -563,4 +563,3 @@ void a2bus_echoplus_device::write_c0nx(address_space &space, UINT8 offset, UINT8
break;
}
}
-
diff --git a/src/mess/machine/a2scsi.c b/src/mess/machine/a2scsi.c
index ac0005d893a..a6599b10ca2 100644
--- a/src/mess/machine/a2scsi.c
+++ b/src/mess/machine/a2scsi.c
@@ -34,7 +34,7 @@
const device_type A2BUS_SCSI = &device_creator<a2bus_scsi_device>;
#define SCSI_ROM_REGION "scsi_rom"
-#define SCSI_BUS_TAG "scsibus"
+#define SCSI_BUS_TAG "scsibus"
#define SCSI_5380_TAG "scsibus:7:ncr5380"
static const ncr5380n_interface ncr5380_interface =
@@ -157,20 +157,20 @@ UINT8 a2bus_scsi_device::read_c0nx(address_space &space, UINT8 offset)
case 5:
case 6:
case 7:
-// printf("Read 5380 @ %x\n", offset);
+// printf("Read 5380 @ %x\n", offset);
return m_ncr5380->read(space, offset);
break;
- case 8: // read and DACK
+ case 8: // read and DACK
return m_ncr5380->dma_r();
case 9: // our SCSI ID (normally 0x80 = 7)
return (1<<7);
- case 0xa: // RAM/ROM bank
+ case 0xa: // RAM/ROM bank
return m_bank;
- case 0xe: // DRQ status in bit 7
+ case 0xe: // DRQ status in bit 7
return m_drq;
default:
@@ -198,11 +198,11 @@ void a2bus_scsi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 dat
case 5:
case 6:
case 7:
-// printf("%02x to 5380 reg %x\n", data, offset);
+// printf("%02x to 5380 reg %x\n", data, offset);
m_ncr5380->write(space, offset, data);
break;
- case 8: // write and DACK
+ case 8: // write and DACK
m_ncr5380->dma_w(data);
break;
@@ -224,23 +224,23 @@ void a2bus_scsi_device::write_c0nx(address_space &space, UINT8 offset, UINT8 dat
m_rambank = ((data>>4) & 0x7) * 0x400;
m_rombank = (data & 0xf) * 0x400;
m_bank = data;
-// printf("RAM bank to %x, ROM bank to %x\n", m_rambank, m_rombank);
- m_816block = false; // does this reset block mode?
+// printf("RAM bank to %x, ROM bank to %x\n", m_rambank, m_rombank);
+ m_816block = false; // does this reset block mode?
break;
- case 0xb: // reset 5380
-// printf("Resetting SCSI: %02x at %x\n", data, space.device().safe_pc());
+ case 0xb: // reset 5380
+// printf("Resetting SCSI: %02x at %x\n", data, space.device().safe_pc());
m_ncr5380->reset();
m_816block = false;
break;
- case 0xc: // set IIgs block mode DMA
+ case 0xc: // set IIgs block mode DMA
printf("%02x to block-mode DMA mode\n", data);
m_816block = true;
break;
- case 0xd: // set Mac-style pseudo-DMA
-// printf("%02x to pseudo-DMA mode\n", data);
+ case 0xd: // set Mac-style pseudo-DMA
+// printf("%02x to pseudo-DMA mode\n", data);
m_816block = false;
break;
@@ -263,7 +263,7 @@ UINT8 a2bus_scsi_device::read_cnxx(address_space &space, UINT8 offset)
void a2bus_scsi_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
{
// there are writes to cn0A, possibly misguided C0nA (bank select?) writes?
-// printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc());
+// printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc());
}
/*-------------------------------------------------
@@ -276,7 +276,7 @@ UINT8 a2bus_scsi_device::read_c800(address_space &space, UINT16 offset)
// bankswitched ROM at cc00-cfff
if (offset < 0x400)
{
-// printf("Read RAM at %x = %02x\n", offset+m_rambank, m_ram[offset + m_rambank]);
+// printf("Read RAM at %x = %02x\n", offset+m_rambank, m_ram[offset + m_rambank]);
if (m_816block)
{
return m_ncr5380->dma_r();
@@ -297,7 +297,7 @@ void a2bus_scsi_device::write_c800(address_space &space, UINT16 offset, UINT8 da
{
if (offset < 0x400)
{
-// printf("%02x to RAM at %x\n", data, offset+m_rambank);
+// printf("%02x to RAM at %x\n", data, offset+m_rambank);
if (m_816block)
{
m_ncr5380->dma_w(data);
diff --git a/src/mess/machine/a2ssc.c b/src/mess/machine/a2ssc.c
index 5a0a648b494..5c5c13e39a1 100644
--- a/src/mess/machine/a2ssc.c
+++ b/src/mess/machine/a2ssc.c
@@ -26,7 +26,7 @@ const device_type A2BUS_SSC = &device_creator<a2bus_ssc_device>;
#define SSC_ROM_REGION "ssc_rom"
#define SSC_ACIA_TAG "ssc_acia"
-#define SSC_RS232_TAG "ssc_rs232"
+#define SSC_RS232_TAG "ssc_rs232"
static SLOT_INTERFACE_START( rs232_devices )
SLOT_INTERFACE("serial_terminal", SERIAL_TERMINAL)
diff --git a/src/mess/machine/a2zipdrive.c b/src/mess/machine/a2zipdrive.c
index c3bdefe2a73..41a3e2db693 100644
--- a/src/mess/machine/a2zipdrive.c
+++ b/src/mess/machine/a2zipdrive.c
@@ -1,20 +1,20 @@
/*********************************************************************
-
- a2zipdrive.c
+
+ a2zipdrive.c
ZIP Technologies ZipDrive IDE card
-
+
NOTE: No known dump exists of the formatter utility and the
format of the custom partition record (block 0) that the card
expects has not yet been determined, so this is largely untested
and will work only with a drive dump from real h/w.
-
+
PLEASE use it only on a backup copy of said dump and contact MESSdev
if you have one!
-
+
Partition block format:
+0000: ASCII "Zip Technologies"
-
+
*********************************************************************/
#include "a2zipdrive.h"
@@ -119,9 +119,9 @@ UINT8 a2bus_zipdrivebase_device::read_c0nx(address_space &space, UINT8 offset)
case 7:
return ide_controller_r(m_ide, 0x1f0+offset, 1);
- case 8: // data port
+ case 8: // data port
m_lastdata = ide_controller_r(m_ide, 0x1f0, 2);
-// printf("%04x @ IDE data\n", m_lastdata);
+// printf("%04x @ IDE data\n", m_lastdata);
return m_lastdata&0xff;
case 9:
@@ -144,7 +144,7 @@ void a2bus_zipdrivebase_device::write_c0nx(address_space &space, UINT8 offset, U
{
switch (offset)
{
- case 0:
+ case 0:
case 1:
case 2:
case 3:
@@ -152,17 +152,17 @@ void a2bus_zipdrivebase_device::write_c0nx(address_space &space, UINT8 offset, U
case 5:
case 6:
case 7:
-// printf("%02x to IDE controller @ %x\n", data, offset);
+// printf("%02x to IDE controller @ %x\n", data, offset);
ide_controller_w(m_ide, 0x1f0+offset, 1, data);
break;
case 8:
-// printf("%02x to IDE data lo\n", data);
+// printf("%02x to IDE data lo\n", data);
m_lastdata = data;
break;
case 9:
-// printf("%02x to IDE data hi\n", data);
+// printf("%02x to IDE data hi\n", data);
m_lastdata &= 0x00ff;
m_lastdata |= (data << 8);
ide_controller_w(m_ide, 0x1f0, 2, m_lastdata);
@@ -196,4 +196,3 @@ UINT8 a2bus_zipdrivebase_device::read_c800(address_space &space, UINT16 offset)
return m_rom[offset+0x1800];
}
-
diff --git a/src/mess/machine/a2zipdrive.h b/src/mess/machine/a2zipdrive.h
index ac0006639ec..593987d623f 100644
--- a/src/mess/machine/a2zipdrive.h
+++ b/src/mess/machine/a2zipdrive.h
@@ -3,9 +3,9 @@
a2zipdrive.h
ZIP Technologies ZipDrive IDE card
-
+
See important NOTE at the top of a2zipdrive.c!
-
+
*********************************************************************/
#ifndef __A2BUS_ZIPDRIVE__
diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c
index 78e546d85dc..f8264aaa3db 100644
--- a/src/mess/machine/apollo.c
+++ b/src/mess/machine/apollo.c
@@ -440,7 +440,7 @@ READ8_MEMBER(apollo_state::apollo_dma_read_byte){
{
SLOG1(("dma read byte at offset %x+%03x = %02x", page_offset, offset, data));
}
-// logerror(" %02x", data);
+// logerror(" %02x", data);
return data;
}
@@ -460,7 +460,7 @@ WRITE8_MEMBER(apollo_state::apollo_dma_write_byte){
{
SLOG1(("dma write byte at offset %x+%03x = %02x", page_offset, offset , data));
}
-// logerror(" %02x", data);
+// logerror(" %02x", data);
}
READ8_MEMBER(apollo_state::apollo_dma_read_word){
diff --git a/src/mess/machine/c1551.c b/src/mess/machine/c1551.c
index 7a0cbb57a5d..d2c2d197877 100644
--- a/src/mess/machine/c1551.c
+++ b/src/mess/machine/c1551.c
@@ -480,7 +480,7 @@ void c1551_device::device_reset()
m_maincpu->reset();
m_tpi0->reset();
-
+
m_exp->reset();
// initialize gate array
diff --git a/src/mess/machine/c1571.c b/src/mess/machine/c1571.c
index 97121f98b00..7e22b45aee6 100644
--- a/src/mess/machine/c1571.c
+++ b/src/mess/machine/c1571.c
@@ -817,7 +817,7 @@ static MACHINE_CONFIG_FRAGMENT( c1571cr )
MCFG_VIA6522_ADD(M6522_1_TAG, XTAL_16MHz/16, via1_intf)
//MCFG_MOS5710_ADD(M5710_TAG, XTAL_16MHz/16, 0)
-
+
MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2)
MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, c1571_floppy_interface)
diff --git a/src/mess/machine/c64_ieee488.c b/src/mess/machine/c64_ieee488.c
index b2685edccf7..63585540bba 100644
--- a/src/mess/machine/c64_ieee488.c
+++ b/src/mess/machine/c64_ieee488.c
@@ -156,7 +156,7 @@ static const tpi6525_interface tpi_intf =
static MACHINE_CONFIG_FRAGMENT( c64_ieee488 )
MCFG_TPI6525_ADD(MOS6525_TAG, tpi_intf)
-
+
MCFG_CBM_IEEE488_ADD(NULL)
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
MACHINE_CONFIG_END
diff --git a/src/mess/machine/c64_midi_maplin.c b/src/mess/machine/c64_midi_maplin.c
index 4f34a03d6e3..6fbf4405807 100644
--- a/src/mess/machine/c64_midi_maplin.c
+++ b/src/mess/machine/c64_midi_maplin.c
@@ -15,7 +15,7 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define MC6850_TAG "mc6850"
+#define MC6850_TAG "mc6850"
@@ -48,7 +48,7 @@ WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::tx_out )
static ACIA6850_INTERFACE( acia_intf )
{
500000,
- 0, // rx clock (we manually clock rx)
+ 0, // rx clock (we manually clock rx)
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_maplin_midi_cartridge_device, rx_in),
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_maplin_midi_cartridge_device, tx_out),
DEVCB_NULL,
@@ -69,8 +69,8 @@ SLOT_INTERFACE_END
WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::midi_rx_w )
{
m_rx_state = state;
-
- for (int i = 0; i < 16; i++) // divider is set to 64
+
+ for (int i = 0; i < 16; i++) // divider is set to 64
{
m_acia->rx_clock_in();
}
@@ -92,7 +92,7 @@ SLOT_INTERFACE_END
static const serial_port_interface midiout_intf =
{
- DEVCB_NULL // midi out ports don't transmit inward
+ DEVCB_NULL // midi out ports don't transmit inward
};
diff --git a/src/mess/machine/c64_midi_namesoft.c b/src/mess/machine/c64_midi_namesoft.c
index 453a639571b..11309ac68df 100644
--- a/src/mess/machine/c64_midi_namesoft.c
+++ b/src/mess/machine/c64_midi_namesoft.c
@@ -15,7 +15,7 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define MC6850_TAG "mc6850"
+#define MC6850_TAG "mc6850"
@@ -48,7 +48,7 @@ WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::tx_out )
static ACIA6850_INTERFACE( acia_intf )
{
500000,
- 0, // rx clock (we manually clock rx)
+ 0, // rx clock (we manually clock rx)
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_namesoft_midi_cartridge_device, rx_in),
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_namesoft_midi_cartridge_device, tx_out),
DEVCB_NULL,
@@ -69,8 +69,8 @@ SLOT_INTERFACE_END
WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::midi_rx_w )
{
m_rx_state = state;
-
- for (int i = 0; i < 16; i++) // divider is set to 16
+
+ for (int i = 0; i < 16; i++) // divider is set to 16
{
m_acia->rx_clock_in();
}
@@ -92,7 +92,7 @@ SLOT_INTERFACE_END
static const serial_port_interface midiout_intf =
{
- DEVCB_NULL // midi out ports don't transmit inward
+ DEVCB_NULL // midi out ports don't transmit inward
};
diff --git a/src/mess/machine/c64_midi_passport.c b/src/mess/machine/c64_midi_passport.c
index 8aed258f633..8a49ebffa8a 100644
--- a/src/mess/machine/c64_midi_passport.c
+++ b/src/mess/machine/c64_midi_passport.c
@@ -15,8 +15,8 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define MC6840_TAG "mc6840"
-#define MC6850_TAG "mc6850"
+#define MC6840_TAG "mc6840"
+#define MC6850_TAG "mc6850"
@@ -71,7 +71,7 @@ WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::tx_out )
static ACIA6850_INTERFACE( acia_intf )
{
500000,
- 0, // rx clock (we manually clock rx)
+ 0, // rx clock (we manually clock rx)
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_passport_midi_cartridge_device, rx_in),
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_passport_midi_cartridge_device, tx_out),
DEVCB_NULL,
@@ -92,8 +92,8 @@ SLOT_INTERFACE_END
WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::midi_rx_w )
{
m_rx_state = state;
-
- for (int i = 0; i < 16; i++) // divider is set to 16
+
+ for (int i = 0; i < 16; i++) // divider is set to 16
{
m_acia->rx_clock_in();
}
@@ -115,7 +115,7 @@ SLOT_INTERFACE_END
static const serial_port_interface midiout_intf =
{
- DEVCB_NULL // midi out ports don't transmit inward
+ DEVCB_NULL // midi out ports don't transmit inward
};
@@ -246,7 +246,7 @@ void c64_passport_midi_cartridge_device::c64_cd_w(address_space &space, offs_t o
case 0x30:
// Drum sync SET
break;
-
+
case 0x38:
// Drum sync CLEAR
break;
diff --git a/src/mess/machine/c64_midi_sci.c b/src/mess/machine/c64_midi_sci.c
index 4835915b892..1edb8fcf7d7 100644
--- a/src/mess/machine/c64_midi_sci.c
+++ b/src/mess/machine/c64_midi_sci.c
@@ -15,7 +15,7 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define MC6850_TAG "mc6850"
+#define MC6850_TAG "mc6850"
@@ -48,7 +48,7 @@ WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::tx_out )
static ACIA6850_INTERFACE( acia_intf )
{
500000,
- 0, // rx clock (we manually clock rx)
+ 0, // rx clock (we manually clock rx)
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_sequential_midi_cartridge_device, rx_in),
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_sequential_midi_cartridge_device, tx_out),
DEVCB_NULL,
@@ -69,8 +69,8 @@ SLOT_INTERFACE_END
WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::midi_rx_w )
{
m_rx_state = state;
-
- for (int i = 0; i < 16; i++) // divider is set to 16
+
+ for (int i = 0; i < 16; i++) // divider is set to 16
{
m_acia->rx_clock_in();
}
@@ -92,7 +92,7 @@ SLOT_INTERFACE_END
static const serial_port_interface midiout_intf =
{
- DEVCB_NULL // midi out ports don't transmit inward
+ DEVCB_NULL // midi out ports don't transmit inward
};
diff --git a/src/mess/machine/c64_midi_siel.c b/src/mess/machine/c64_midi_siel.c
index 035f37e55d9..b936406359a 100644
--- a/src/mess/machine/c64_midi_siel.c
+++ b/src/mess/machine/c64_midi_siel.c
@@ -15,7 +15,7 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define MC6850_TAG "mc6850"
+#define MC6850_TAG "mc6850"
@@ -48,7 +48,7 @@ WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::tx_out )
static ACIA6850_INTERFACE( acia_intf )
{
XTAL_2MHz,
- 0, // rx clock (we manually clock rx)
+ 0, // rx clock (we manually clock rx)
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_siel_midi_cartridge_device, rx_in),
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, c64_siel_midi_cartridge_device, tx_out),
DEVCB_NULL,
@@ -69,8 +69,8 @@ SLOT_INTERFACE_END
WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::midi_rx_w )
{
m_rx_state = state;
-
- for (int i = 0; i < 64; i++) // divider is set to 64
+
+ for (int i = 0; i < 64; i++) // divider is set to 64
{
m_acia->rx_clock_in();
}
@@ -92,7 +92,7 @@ SLOT_INTERFACE_END
static const serial_port_interface midiout_intf =
{
- DEVCB_NULL // midi out ports don't transmit inward
+ DEVCB_NULL // midi out ports don't transmit inward
};
diff --git a/src/mess/machine/c64_tdos.c b/src/mess/machine/c64_tdos.c
index dade459fc2c..7d58930e990 100644
--- a/src/mess/machine/c64_tdos.c
+++ b/src/mess/machine/c64_tdos.c
@@ -95,8 +95,8 @@ static MC6852_INTERFACE( ssda_intf )
static MACHINE_CONFIG_FRAGMENT( c64_tdos )
MCFG_MC6852_ADD(MC68A52P_TAG, XTAL_6_5MHz, ssda_intf)
-
- MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
+
+ MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
MACHINE_CONFIG_END
diff --git a/src/mess/machine/c64_vic1011.c b/src/mess/machine/c64_vic1011.c
index e796723c2ba..77954218905 100644
--- a/src/mess/machine/c64_vic1011.c
+++ b/src/mess/machine/c64_vic1011.c
@@ -93,18 +93,18 @@ void c64_vic1011_device::device_start()
UINT8 c64_vic1011_device::c64_pb_r(address_space &space, offs_t offset)
{
/*
-
+
bit description
-
+
0 Sin
- 1
- 2
- 3
+ 1
+ 2
+ 3
4 DCDin
- 5
+ 5
6 CTS
7 DSR
-
+
*/
UINT8 data = 0;
@@ -125,18 +125,18 @@ UINT8 c64_vic1011_device::c64_pb_r(address_space &space, offs_t offset)
void c64_vic1011_device::c64_pb_w(address_space &space, offs_t offset, UINT8 data)
{
/*
-
+
bit description
-
- 0
+
+ 0
1 RTS
2 DTR
- 3
- 4
+ 3
+ 4
5 DCDout
- 6
- 7
-
+ 6
+ 7
+
*/
m_rs232->rts_w(BIT(data, 1));
diff --git a/src/mess/machine/c64user.h b/src/mess/machine/c64user.h
index 7fcdc2ec7f3..3088e901552 100644
--- a/src/mess/machine/c64user.h
+++ b/src/mess/machine/c64user.h
@@ -73,12 +73,12 @@ public:
c64_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _reset> void set_reset_callback(_reset reset) { m_write_reset.set_callback(reset); }
-
+
template<class _cnt, class _sp> void set_cia1_callbacks(_cnt cnt, _sp sp) {
m_write_cnt1.set_callback(cnt);
m_write_sp1.set_callback(sp);
}
-
+
template<class _cnt, class _sp, class _flag> void set_cia2_callbacks(_cnt cnt, _sp sp, _flag flag) {
m_write_cnt2.set_callback(cnt);
m_write_sp2.set_callback(sp);
diff --git a/src/mess/machine/cococart.c b/src/mess/machine/cococart.c
index a8b149472cc..da10ee3669d 100644
--- a/src/mess/machine/cococart.c
+++ b/src/mess/machine/cococart.c
@@ -50,7 +50,7 @@ void cococart_slot_device::device_start()
{
for(int i=0; i<TIMER_POOL; i++ )
{
- m_cart_line.timer[i] = timer_alloc(TIMER_CART);
+ m_cart_line.timer[i] = timer_alloc(TIMER_CART);
m_nmi_line.timer[i] = timer_alloc(TIMER_NMI);
m_halt_line.timer[i] = timer_alloc(TIMER_HALT);
}
@@ -294,7 +294,7 @@ void cococart_slot_device::cart_set_line(cococart_line line, cococart_line_value
break;
case COCOCART_LINE_SOUND_ENABLE:
- // do nothing for now
+ // do nothing for now
break;
}
}
diff --git a/src/mess/machine/gb_mbc.c b/src/mess/machine/gb_mbc.c
index 2704823acc7..29ae1320fbb 100644
--- a/src/mess/machine/gb_mbc.c
+++ b/src/mess/machine/gb_mbc.c
@@ -132,7 +132,7 @@ void gb_rom_mbc_device::shared_reset()
m_ram_bank = 0;
m_ram_enable = 0;
m_mode = 0;
-
+
has_rumble = FALSE;
has_timer = FALSE;
has_battery = FALSE;
@@ -173,7 +173,7 @@ void gb_rom_mbc6_device::device_reset()
m_bank_6000 = 3; // correct default?
m_latch1 = 0; // correct default?
m_latch2 = 0; // correct default?
-
+
m_latch_bank = 2; // correct default?
m_latch_bank2 = 3; // correct default?
m_ram_bank = 0;
@@ -212,7 +212,7 @@ void gb_rom_sintax_device::device_start()
void gb_rom_sintax_device::device_reset()
{
- shared_reset();
+ shared_reset();
m_sintax_mode = 0;
m_currentxor = 0;
m_xor2 = 0;
@@ -709,18 +709,18 @@ READ8_MEMBER(gb_rom_chongwu_device::read_rom)
void gb_rom_sintax_device::set_xor_for_bank(UINT8 bank)
{
- switch (bank & 0x0f)
+ switch (bank & 0x0f)
{
- case 0x00: case 0x04: case 0x08: case 0x0c:
+ case 0x00: case 0x04: case 0x08: case 0x0c:
m_currentxor = m_xor2;
break;
- case 0x01: case 0x05: case 0x09: case 0x0d:
+ case 0x01: case 0x05: case 0x09: case 0x0d:
m_currentxor = m_xor3;
break;
- case 0x02: case 0x06: case 0x0a: case 0x0e:
+ case 0x02: case 0x06: case 0x0a: case 0x0e:
m_currentxor = m_xor4;
break;
- case 0x03: case 0x07: case 0x0b: case 0x0f:
+ case 0x03: case 0x07: case 0x0b: case 0x0f:
m_currentxor = m_xor5;
break;
}
@@ -739,10 +739,10 @@ WRITE8_MEMBER(gb_rom_sintax_device::write_bank)
if (offset < 0x2000)
m_ram_enable = ((data & 0x0f) == 0x0a) ? 1 : 0;
else if (offset < 0x3000)
- {
+ {
set_xor_for_bank(data);
- switch (m_sintax_mode & 0x0f)
+ switch (m_sintax_mode & 0x0f)
{
case 0x0d:
data = BITSWAP8(data, 1,0,7,6,5,4,3,2);
@@ -767,8 +767,8 @@ WRITE8_MEMBER(gb_rom_sintax_device::write_bank)
data = BITSWAP8(data, 2,3,0,1,6,7,4,5); // 5 and 6 unconfirmed
break;
}
- m_latch_bank2 = (m_latch_bank2 & 0x100) | data;
- }
+ m_latch_bank2 = (m_latch_bank2 & 0x100) | data;
+ }
else if (offset < 0x4000)
{
m_latch_bank2 = (m_latch_bank2 & 0xff) | ((data & 0x01) << 8);
@@ -785,13 +785,13 @@ WRITE8_MEMBER(gb_rom_sintax_device::write_bank)
if (!m_sintax_mode)
{
m_sintax_mode = data;
- write_bank(space, 0x2000, 1); //force a fake bank switch
+ write_bank(space, 0x2000, 1); //force a fake bank switch
}
-// printf("sintax mode %x\n", m_sintax_mode & 0xf);
+// printf("sintax mode %x\n", m_sintax_mode & 0xf);
}
else if (offset >= 0x7000)
{
- switch ((offset & 0x00f0) >> 4)
+ switch ((offset & 0x00f0) >> 4)
{
case 2:
m_xor2 = data;
@@ -803,14 +803,14 @@ WRITE8_MEMBER(gb_rom_sintax_device::write_bank)
m_xor4 = data;
break;
case 5:
- m_xor5 = data;
+ m_xor5 = data;
break;
}
-
- if (m_currentxor == 0)
- set_xor_for_bank(4);
+
+ if (m_currentxor == 0)
+ set_xor_for_bank(4);
}
-
+
}
READ8_MEMBER(gb_rom_sintax_device::read_ram)
@@ -828,15 +828,15 @@ WRITE8_MEMBER(gb_rom_sintax_device::write_ram)
}
/*
-
+
Further MBC5 variants to emulate:
-
+
Digimon 2 & Digimon 4 (Yong Yong)
-
+
Digimon 2 writes at $2000 to select latch2 (data must be divided by 2, and 0 becomes 1),
then writes to $2400 a series of values that the patched version does not write...
Digimon 4 seems to share part of the $2000 behavior, but does not write to $2400...
-
+
*/
// MBC5 variant used by Digimon 2 (and maybe 4?)
@@ -855,29 +855,29 @@ WRITE8_MEMBER(gb_rom_digimon_device::write_bank)
m_ram_enable = ((data & 0x0f) == 0x0a) ? 1 : 0;
else if (offset == 0x2000)
{
-// printf("written $02 %X at %X\n", data, offset);
+// printf("written $02 %X at %X\n", data, offset);
if (!data)
data++;
m_latch_bank2 = data/2;
}
else if (offset < 0x3000)
{
-// printf("written $03 %X at %X\n", data, offset);
+// printf("written $03 %X at %X\n", data, offset);
}
else if (offset < 0x4000)
{
-// printf("written $04 %X at %X\n", data, offset);
+// printf("written $04 %X at %X\n", data, offset);
}
else if (offset < 0x6000)
{
-// printf("written $05-$06 %X at %X\n", data, offset);
+// printf("written $05-$06 %X at %X\n", data, offset);
data &= 0x0f;
if (has_rumble)
data &= 0x7;
m_ram_bank = data;
}
-// else
-// printf("written $07 %X at %X\n", data, offset);
+// else
+// printf("written $07 %X at %X\n", data, offset);
}
READ8_MEMBER(gb_rom_digimon_device::read_ram)
@@ -917,7 +917,7 @@ WRITE8_MEMBER(gb_rom_rockman8_device::write_bank)
data = 1;
if (data > 0xf)
data -= 8;
-
+
m_latch_bank2 = data;
}
}
@@ -946,15 +946,15 @@ WRITE8_MEMBER(gb_rom_rockman8_device::write_ram)
// 9th --> 0x0b
// 10th --> 0x0c
// 11th --> 0x0d
-// 12th --> 0x0f
+// 12th --> 0x0f
// 13th --> 0x13
-// writing data to 0x2000-0x2fff switches bank according to the table below
+// writing data to 0x2000-0x2fff switches bank according to the table below
// (the value values corresponding to table[0x0f] is not confirmed, choices
// 0,1,2,3,8,c,f freeze the game, while 4,5,6,7,b,d,0x13 work with glitches)
static UINT8 smb3_table1[0x20] =
{
- 0x00,0x04,0x01,0x05, 0x02,0x06,0x03,0x05, 0x08,0x0c,0x03,0x0d, 0x03,0x0b,0x0b,0x08 /* original doc here put 0x0f (i.e. 11th unique bank) */,
+ 0x00,0x04,0x01,0x05, 0x02,0x06,0x03,0x05, 0x08,0x0c,0x03,0x0d, 0x03,0x0b,0x0b,0x08 /* original doc here put 0x0f (i.e. 11th unique bank) */,
0x05,0x06,0x0b,0x0d, 0x08,0x06,0x13,0x0b, 0x08,0x05,0x05,0x08, 0x0b,0x0d,0x06,0x05
};
@@ -975,7 +975,7 @@ READ8_MEMBER(gb_rom_sm3sp_device::read_rom)
WRITE8_MEMBER(gb_rom_sm3sp_device::write_bank)
{
-// printf("write 0x%x at %x\n", data, offset);
+// printf("write 0x%x at %x\n", data, offset);
if (offset < 0x2000)
return;
else if (offset < 0x3000)
@@ -992,20 +992,20 @@ WRITE8_MEMBER(gb_rom_sm3sp_device::write_bank)
// 5bits only
data &= 0x1f;
-
+
m_latch_bank2 = smb3_table1[data];
if (m_mode)
{
switch (m_latch_bank2)
{
- case 0x02: m_latch_bank2 = 4; break;
- case 0x03: m_latch_bank2 = 6; break;
- case 0x04: m_latch_bank2 = 2; break;
- case 0x05: m_latch_bank2 = 3; break;
- case 0x06: m_latch_bank2 = 5; break;
- case 0x0b: m_latch_bank2 = 0xd; break;
- case 0x0c: m_latch_bank2 = 0xb; break;
- case 0x0d: m_latch_bank2 = 0xc; break;
+ case 0x02: m_latch_bank2 = 4; break;
+ case 0x03: m_latch_bank2 = 6; break;
+ case 0x04: m_latch_bank2 = 2; break;
+ case 0x05: m_latch_bank2 = 3; break;
+ case 0x06: m_latch_bank2 = 5; break;
+ case 0x0b: m_latch_bank2 = 0xd; break;
+ case 0x0c: m_latch_bank2 = 0xb; break;
+ case 0x0d: m_latch_bank2 = 0xc; break;
case 0x00:
case 0x01:
@@ -1019,14 +1019,14 @@ WRITE8_MEMBER(gb_rom_sm3sp_device::write_bank)
}
else if (offset < 0x5000)
{
-// printf("write $5 %X at %X\n", data, offset);
+// printf("write $5 %X at %X\n", data, offset);
//maybe rumble??
}
else if (offset < 0x6000)
{
-// printf("write mode %x\n", data);
+// printf("write mode %x\n", data);
m_mode = BIT(data, 5);
-// write_bank(space, 0x2000, 1);
+// write_bank(space, 0x2000, 1);
}
}
diff --git a/src/mess/machine/gb_mbc.h b/src/mess/machine/gb_mbc.h
index 2d8ea0a1b26..7299d5ca48e 100644
--- a/src/mess/machine/gb_mbc.h
+++ b/src/mess/machine/gb_mbc.h
@@ -17,10 +17,10 @@ public:
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
virtual void device_config_complete() { m_shortname = "gb_rom_mbc_base"; }
-
+
void shared_start();
void shared_reset();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_READ8_MEMBER(read_ram);
@@ -191,13 +191,13 @@ class gb_rom_sintax_device : public gb_rom_mbc_device
public:
// construction/destruction
gb_rom_sintax_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 device_config_complete() { m_shortname = "gb_rom_sintax"; }
void set_xor_for_bank(UINT8 bank);
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -215,12 +215,12 @@ class gb_rom_chongwu_device : public gb_rom_mbc5_device
public:
// construction/destruction
gb_rom_chongwu_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 device_config_complete() { m_shortname = "gb_rom_chongwu"; }
-
+
virtual DECLARE_READ8_MEMBER(read_rom);
UINT8 m_protection_checked;
};
@@ -232,12 +232,12 @@ class gb_rom_digimon_device : public gb_rom_mbc5_device
public:
// construction/destruction
gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
virtual void device_config_complete() { m_shortname = "gb_rom_digimon"; }
-
+
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
virtual DECLARE_READ8_MEMBER(read_ram);
@@ -250,12 +250,12 @@ class gb_rom_rockman8_device : public gb_rom_mbc_device
public:
// construction/destruction
gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
virtual void device_config_complete() { m_shortname = "gb_rom_rockman8"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
@@ -270,12 +270,12 @@ class gb_rom_sm3sp_device : public gb_rom_mbc_device
public:
// construction/destruction
gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
virtual void device_config_complete() { m_shortname = "gb_rom_sm3sp"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
diff --git a/src/mess/machine/gb_rom.c b/src/mess/machine/gb_rom.c
index 4937fb641be..e11e997ec6e 100644
--- a/src/mess/machine/gb_rom.c
+++ b/src/mess/machine/gb_rom.c
@@ -98,7 +98,7 @@ void gb_rom_device::shared_reset()
m_ram_bank = 0;
m_latch_bank = 0;
m_latch_bank2 = 1;
-
+
has_rumble = FALSE;
has_timer = FALSE;
has_battery = FALSE;
@@ -142,7 +142,7 @@ void megaduck_rom_device::device_reset()
m_ram_bank = 0;
m_latch_bank = 0;
m_latch_bank2 = 1;
-
+
has_rumble = FALSE;
has_timer = FALSE;
has_battery = FALSE;
diff --git a/src/mess/machine/gb_rom.h b/src/mess/machine/gb_rom.h
index 1953824b584..66cb2bb4b68 100644
--- a/src/mess/machine/gb_rom.h
+++ b/src/mess/machine/gb_rom.h
@@ -18,10 +18,10 @@ public:
virtual void device_start() { shared_start(); };
virtual void device_reset() { shared_reset(); };
virtual void device_config_complete() { m_shortname = "gb_rom"; }
-
+
void shared_start();
void shared_reset();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_READ8_MEMBER(read_ram);
@@ -131,7 +131,7 @@ public:
virtual void device_start();
virtual void device_reset();
virtual void device_config_complete() { m_shortname = "megaduck_rom"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
virtual DECLARE_WRITE8_MEMBER(write_bank);
diff --git a/src/mess/machine/gb_slot.c b/src/mess/machine/gb_slot.c
index 122c9425536..c136f97f966 100644
--- a/src/mess/machine/gb_slot.c
+++ b/src/mess/machine/gb_slot.c
@@ -392,7 +392,7 @@ bool base_gb_cart_slot_device::call_load()
if (strncmp((const char*)(ROM + 0x134), "DONKEYKONGLAND 2", 16) == 0 ||
strncmp((const char*)(ROM + 0x134), "DONKEYKONGLAND 3", 16) == 0)
m_sgb_hack = 1;
-
+
return IMAGE_INIT_PASS;
}
@@ -545,8 +545,8 @@ int base_gb_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
}
if (count == 4876)
{
-// printf("Niutoude!\n");
-// type = GB_MBC_NIUTOUDE;
+// printf("Niutoude!\n");
+// type = GB_MBC_NIUTOUDE;
}
if (count == 4138 || count == 4125)
{
@@ -556,7 +556,7 @@ int base_gb_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
type = GB_MBC_SINTAX;
}
}
-
+
/* Check if we're dealing with the multigame variant of the MBC1 mapper */
if (type == GB_MBC_MBC1)
{
diff --git a/src/mess/machine/gb_slot.h b/src/mess/machine/gb_slot.h
index b0915de5901..fe7ff000afa 100644
--- a/src/mess/machine/gb_slot.h
+++ b/src/mess/machine/gb_slot.h
@@ -147,7 +147,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_ram);
virtual DECLARE_WRITE8_MEMBER(write_ram);
-
+
protected:
// Donkey Kong Land 2 + 3 store SGB border tiles differently... this will be hopefully be removed when SGB is properly emulated!
int m_sgb_hack;
diff --git a/src/mess/machine/isa_com.c b/src/mess/machine/isa_com.c
index ee3b438045e..c6e35ea6216 100644
--- a/src/mess/machine/isa_com.c
+++ b/src/mess/machine/isa_com.c
@@ -29,22 +29,22 @@ static const ins8250_interface genpc_com_interface[2]=
DEVCB_NULL,
DEVCB_NULL
}/*,
- {
- DEVCB_DEVICE_LINE_MEMBER("serport2", serial_port_device, tx),
- DEVCB_DEVICE_LINE_MEMBER("serport2", rs232_port_device, dtr_w),
- DEVCB_DEVICE_LINE_MEMBER("serport2", rs232_port_device, rts_w),
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, isa8_com_device, pc_com_interrupt_1),
- DEVCB_NULL,
- DEVCB_NULL
- },
- {
- DEVCB_DEVICE_LINE_MEMBER("serport3", serial_port_device, tx),
- DEVCB_DEVICE_LINE_MEMBER("serport3", rs232_port_device, dtr_w),
- DEVCB_DEVICE_LINE_MEMBER("serport3", rs232_port_device, rts_w),
- DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, isa8_com_device, pc_com_interrupt_2),
- DEVCB_NULL,
- DEVCB_NULL
- }*/
+ {
+ DEVCB_DEVICE_LINE_MEMBER("serport2", serial_port_device, tx),
+ DEVCB_DEVICE_LINE_MEMBER("serport2", rs232_port_device, dtr_w),
+ DEVCB_DEVICE_LINE_MEMBER("serport2", rs232_port_device, rts_w),
+ DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, isa8_com_device, pc_com_interrupt_1),
+ DEVCB_NULL,
+ DEVCB_NULL
+ },
+ {
+ DEVCB_DEVICE_LINE_MEMBER("serport3", serial_port_device, tx),
+ DEVCB_DEVICE_LINE_MEMBER("serport3", rs232_port_device, dtr_w),
+ DEVCB_DEVICE_LINE_MEMBER("serport3", rs232_port_device, rts_w),
+ DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, isa8_com_device, pc_com_interrupt_2),
+ DEVCB_NULL,
+ DEVCB_NULL
+ }*/
};
static const rs232_port_interface serport_config[2] =
@@ -63,20 +63,20 @@ static const rs232_port_interface serport_config[2] =
DEVCB_DEVICE_LINE_MEMBER("uart_1", ins8250_uart_device, ri_w),
DEVCB_DEVICE_LINE_MEMBER("uart_1", ins8250_uart_device, cts_w)
}/*,
- {
- DEVCB_DEVICE_LINE_MEMBER("uart_2", ins8250_uart_device, rx_w),
- DEVCB_DEVICE_LINE_MEMBER("uart_2", ins8250_uart_device, dcd_w),
- DEVCB_DEVICE_LINE_MEMBER("uart_2", ins8250_uart_device, dsr_w),
- DEVCB_DEVICE_LINE_MEMBER("uart_2", ins8250_uart_device, ri_w),
- DEVCB_DEVICE_LINE_MEMBER("uart_2", ins8250_uart_device, cts_w)
- },
- {
- DEVCB_DEVICE_LINE_MEMBER("uart_3", ins8250_uart_device, rx_w),
- DEVCB_DEVICE_LINE_MEMBER("uart_3", ins8250_uart_device, dcd_w),
- DEVCB_DEVICE_LINE_MEMBER("uart_3", ins8250_uart_device, dsr_w),
- DEVCB_DEVICE_LINE_MEMBER("uart_3", ins8250_uart_device, ri_w),
- DEVCB_DEVICE_LINE_MEMBER("uart_3", ins8250_uart_device, cts_w)
- }*/
+ {
+ DEVCB_DEVICE_LINE_MEMBER("uart_2", ins8250_uart_device, rx_w),
+ DEVCB_DEVICE_LINE_MEMBER("uart_2", ins8250_uart_device, dcd_w),
+ DEVCB_DEVICE_LINE_MEMBER("uart_2", ins8250_uart_device, dsr_w),
+ DEVCB_DEVICE_LINE_MEMBER("uart_2", ins8250_uart_device, ri_w),
+ DEVCB_DEVICE_LINE_MEMBER("uart_2", ins8250_uart_device, cts_w)
+ },
+ {
+ DEVCB_DEVICE_LINE_MEMBER("uart_3", ins8250_uart_device, rx_w),
+ DEVCB_DEVICE_LINE_MEMBER("uart_3", ins8250_uart_device, dcd_w),
+ DEVCB_DEVICE_LINE_MEMBER("uart_3", ins8250_uart_device, dsr_w),
+ DEVCB_DEVICE_LINE_MEMBER("uart_3", ins8250_uart_device, ri_w),
+ DEVCB_DEVICE_LINE_MEMBER("uart_3", ins8250_uart_device, cts_w)
+ }*/
};
static SLOT_INTERFACE_START(isa_com)
@@ -143,8 +143,8 @@ void isa8_com_device::device_start()
set_isa_device();
m_isa->install_device(0x03f8, 0x03ff, 0, 0, read8_delegate(FUNC(ins8250_device::ins8250_r), subdevice<ins8250_uart_device>("uart_0")), write8_delegate(FUNC(ins8250_device::ins8250_w), subdevice<ins8250_uart_device>("uart_0")) );
m_isa->install_device(0x02f8, 0x02ff, 0, 0, read8_delegate(FUNC(ins8250_device::ins8250_r), subdevice<ins8250_uart_device>("uart_1")), write8_delegate(FUNC(ins8250_device::ins8250_w), subdevice<ins8250_uart_device>("uart_1")) );
-// m_isa->install_device(0x03e8, 0x03ef, 0, 0, read8_delegate(FUNC(ins8250_device::ins8250_r), subdevice<ins8250_uart_device>("uart_2")), write8_delegate(FUNC(ins8250_device::ins8250_w), subdevice<ins8250_uart_device>("uart_2")) );
-// m_isa->install_device(0x02e8, 0x02ef, 0, 0, read8_delegate(FUNC(ins8250_device::ins8250_r), subdevice<ins8250_uart_device>("uart_3")), write8_delegate(FUNC(ins8250_device::ins8250_w), subdevice<ins8250_uart_device>("uart_3")) );
+// m_isa->install_device(0x03e8, 0x03ef, 0, 0, read8_delegate(FUNC(ins8250_device::ins8250_r), subdevice<ins8250_uart_device>("uart_2")), write8_delegate(FUNC(ins8250_device::ins8250_w), subdevice<ins8250_uart_device>("uart_2")) );
+// m_isa->install_device(0x02e8, 0x02ef, 0, 0, read8_delegate(FUNC(ins8250_device::ins8250_r), subdevice<ins8250_uart_device>("uart_3")), write8_delegate(FUNC(ins8250_device::ins8250_w), subdevice<ins8250_uart_device>("uart_3")) );
}
//-------------------------------------------------
@@ -158,12 +158,12 @@ void isa8_com_device::device_reset()
static MACHINE_CONFIG_FRAGMENT( com_at_config )
MCFG_NS16450_ADD( "uart_0", genpc_com_interface[0], XTAL_1_8432MHz ) /* Verified: IBM P/N 6320947 Serial/Parallel card uses an NS16450N */
MCFG_NS16450_ADD( "uart_1", genpc_com_interface[1], XTAL_1_8432MHz )
-// MCFG_NS16450_ADD( "uart_2", genpc_com_interface[2], XTAL_1_8432MHz )
-// MCFG_NS16450_ADD( "uart_3", genpc_com_interface[3], XTAL_1_8432MHz )
+// MCFG_NS16450_ADD( "uart_2", genpc_com_interface[2], XTAL_1_8432MHz )
+// MCFG_NS16450_ADD( "uart_3", genpc_com_interface[3], XTAL_1_8432MHz )
MCFG_RS232_PORT_ADD( "serport0", serport_config[0], isa_com, "microsoft_mouse", NULL )
MCFG_RS232_PORT_ADD( "serport1", serport_config[1], isa_com, NULL, NULL )
-// MCFG_RS232_PORT_ADD( "serport2", serport_config[2], isa_com, NULL, NULL )
-// MCFG_RS232_PORT_ADD( "serport3", serport_config[3], isa_com, NULL, NULL )
+// MCFG_RS232_PORT_ADD( "serport2", serport_config[2], isa_com, NULL, NULL )
+// MCFG_RS232_PORT_ADD( "serport3", serport_config[3], isa_com, NULL, NULL )
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/mess/machine/kc_rom.h b/src/mess/machine/kc_rom.h
index 1149ca44f4f..1bf555ac9d5 100644
--- a/src/mess/machine/kc_rom.h
+++ b/src/mess/machine/kc_rom.h
@@ -29,7 +29,7 @@ protected:
virtual void device_reset();
virtual void device_config_complete() { m_shortname = "kc_8k"; }
virtual const rom_entry *device_rom_region() const;
-
+
// kcexp_interface overrides
virtual UINT8 module_id_r() { return 0xfb; }
virtual void control_w(UINT8 data);
diff --git a/src/mess/machine/mbee.c b/src/mess/machine/mbee.c
index 0618f542cd9..739a93f0fee 100644
--- a/src/mess/machine/mbee.c
+++ b/src/mess/machine/mbee.c
@@ -853,4 +853,4 @@ QUICKLOAD_LOAD( mbee_z80bin )
}
return IMAGE_INIT_PASS;
-} \ No newline at end of file
+}
diff --git a/src/mess/machine/md_rom.c b/src/mess/machine/md_rom.c
index 96bcc2dd742..fcee9a946d5 100644
--- a/src/mess/machine/md_rom.c
+++ b/src/mess/machine/md_rom.c
@@ -764,7 +764,7 @@ WRITE16_MEMBER(md_rom_lion3_device::write)
{
if (offset >= 0x600000/2 && offset < 0x700000/2)
{
-// printf("protection write, offset %d data %d\n", offset & 0x7, data);
+// printf("protection write, offset %d data %d\n", offset & 0x7, data);
switch (offset & 0x7)
{
case 0x0:
@@ -802,7 +802,7 @@ WRITE16_MEMBER(md_rom_lion3_device::write)
| (BIT(m_reg[0], 0) << 7);
break;
}
-
+
}
if (offset >= 0x700000/2)
m_bank = data & 0xff;
@@ -974,7 +974,7 @@ READ16_MEMBER(md_rom_smw64_device::read)
{
// 0x000000-0x0fffff: lower 512KB ROM (up to 0x07ffff) + mirror
// 0x600000-0x6fffff: internal hardware (up to 0x67ffff) + mirror
- // Namely,
+ // Namely,
// * 60xxx = bank1 of the upper 512KB ROM
// * 61xxx = bank2 of the upper 512KB ROM
// * 62xxx = alternate 4KB chunks of 0x0000 ~ 0xffff
@@ -1004,30 +1004,30 @@ READ16_MEMBER(md_rom_smw64_device::read)
case 0x0:
case 0x2:
case 0x4:
- return m_reg[offset/2]; // DATA1, DATA2, DATA3
+ return m_reg[offset/2]; // DATA1, DATA2, DATA3
case 0x1:
case 0x3:
case 0x5:
- return m_reg[offset/2] + 1; // DATA1+1, DATA2+1, DATA3+1
+ return m_reg[offset/2] + 1; // DATA1+1, DATA2+1, DATA3+1
case 0x6:
- return m_reg[2] + 2; // DATA3+2
+ return m_reg[2] + 2; // DATA3+2
case 0x7:
- return m_reg[2] + 3; // DATA3+3
+ return m_reg[2] + 3; // DATA3+3
}
}
if ((offset >= 0x670000/2) && (offset < 0x680000/2))
{
UINT16 data = (m_ctrl[1] & 0x80) ? ((m_ctrl[2] & 0x40) ? (m_reg[4] & m_reg[5]) : (m_reg[4] ^ 0xff)) : 0x0000;
- if (offset & 0x1) // odd offset, return lower 7 bits of the above
+ if (offset & 0x1) // odd offset, return lower 7 bits of the above
return data & 0x7f;
- else // even offset, return whole data above, but also update the regs if CTRL3 has 0x80 set
+ else // even offset, return whole data above, but also update the regs if CTRL3 has 0x80 set
{
- if (m_ctrl[2] & 0x80) // update regs if CTRL3 has bit7 set
+ if (m_ctrl[2] & 0x80) // update regs if CTRL3 has bit7 set
{
if (m_ctrl[2] & 0x20)
- m_reg[2] = (m_reg[5] << 2) & 0xfc; // DATA3
+ m_reg[2] = (m_reg[5] << 2) & 0xfc; // DATA3
else
- m_reg[0] = ((m_reg[4] << 1) ^ m_reg[3]) & 0xfe; // DATA1
+ m_reg[0] = ((m_reg[4] << 1) ^ m_reg[3]) & 0xfe; // DATA1
}
return data;
}
@@ -1038,7 +1038,7 @@ READ16_MEMBER(md_rom_smw64_device::read)
WRITE16_MEMBER(md_rom_smw64_device::write)
{
// 0x600000-0x6fffff: internal hardware (up to 0x67ffff) + mirror
- // Namely,
+ // Namely,
// * 62xxx/63xxx = unknown/unmapped
// * 65xxx/66xxx = unknown/unmapped
// * remaining ranges = CTRL/DATA
@@ -1047,35 +1047,35 @@ WRITE16_MEMBER(md_rom_smw64_device::write)
if (offset & 1)
{
if ((m_ctrl[0] & 7) == 0)
- m_reg[0] = ((m_reg[0] ^ m_reg[3]) ^ data) & 0xfe; // DATA1
+ m_reg[0] = ((m_reg[0] ^ m_reg[3]) ^ data) & 0xfe; // DATA1
if ((m_ctrl[0] & 7) == 1)
- m_reg[1] = data & 0xfe; // DATA2
+ m_reg[1] = data & 0xfe; // DATA2
if ((m_ctrl[0] & 7) == 7)
- m_latch1 = 8 + ((data & 0x1c) >> 2); // ROM BANKSWITCH $61
- m_reg[3] = data; // DATA4
+ m_latch1 = 8 + ((data & 0x1c) >> 2); // ROM BANKSWITCH $61
+ m_reg[3] = data; // DATA4
}
else
- m_ctrl[0] = data; // CTRL1
+ m_ctrl[0] = data; // CTRL1
}
if ((offset >= 0x610000/2) && (offset < 0x620000/2))
{
if (offset & 1)
- m_ctrl[1] = data; // CTRL2
+ m_ctrl[1] = data; // CTRL2
}
if ((offset >= 0x640000/2) && (offset < 0x650000/2))
{
if (offset & 1)
- m_reg[5] = data; // DATA6
+ m_reg[5] = data; // DATA6
else
- m_reg[4] = data; // DATA5
+ m_reg[4] = data; // DATA5
}
if ((offset >= 0x670000/2) && (offset < 0x680000/2))
{
if (!(offset & 1))
{
- m_ctrl[2] = data; // CTRL3
+ m_ctrl[2] = data; // CTRL3
if (m_ctrl[1] & 0x80)
- m_latch0 = 8 + ((data & 0x1c) >> 2); // ROM BANKSWITCH $60
+ m_latch0 = 8 + ((data & 0x1c) >> 2); // ROM BANKSWITCH $60
}
}
}
@@ -1174,12 +1174,12 @@ READ16_MEMBER(md_rom_radica_device::read_a13)
/*-------------------------------------------------
BEGGAR PRINCE
- This game uses cart which is the same as SEGA_SRAM
+ This game uses cart which is the same as SEGA_SRAM
+ bankswitch mechanism for first 256KB of the image:
depending on bit7 of the value written at 0xe00/2,
- accesses to 0x00000-0x3ffff go to the first 256KB
+ accesses to 0x00000-0x3ffff go to the first 256KB
of ROM, or to the second to last 256KB chunk (usually
- mapped to 0x380000-0x3bffff). SRAM is mapped at
+ mapped to 0x380000-0x3bffff). SRAM is mapped at
the end of ROM.
-------------------------------------------------*/
@@ -1199,7 +1199,7 @@ READ16_MEMBER(md_rom_beggarp_device::read)
WRITE16_MEMBER(md_rom_beggarp_device::write)
{
if (offset >= 0x0e00/2 && offset < 0x0f00/2)
- m_mode = BIT(data, 7);
+ m_mode = BIT(data, 7);
if (offset >= m_nvram_start/2 && offset <= m_nvram_end/2 && m_nvram_active && !m_nvram_readonly)
m_nvram[offset & 0x3fff] = data;
@@ -1212,7 +1212,7 @@ WRITE16_MEMBER(md_rom_beggarp_device::write_a13)
/* unsure if this is actually supposed to toggle or just switch on? yet to encounter game that uses this */
m_nvram_active = BIT(data, 0);
m_nvram_readonly = BIT(data, 1);
-
+
// since a lot of generic carts ends up here if loaded from fullpath
// we turn on nvram (with m_nvram_handlers_installed) only if they toggle it on by writing here!
if (m_nvram_active)
@@ -1221,11 +1221,11 @@ WRITE16_MEMBER(md_rom_beggarp_device::write_a13)
}
/*-------------------------------------------------
- LEGEND OF WUKONG
- This game uses cart which is the same as SEGA_SRAM
+ LEGEND OF WUKONG
+ This game uses cart which is the same as SEGA_SRAM
+ bankswitch mechanism for last 128KB of the image:
first 2MB of ROM is loaded in 0-0x200000 and
- mirrored in 0x200000-0x400000, but depending on
+ mirrored in 0x200000-0x400000, but depending on
bit7 of the value written at 0xe00/2 accesses to
0x200000-0x21ffff go either to the "physical" address
(i.e. last 128K of ROM) or to the "memory" address
@@ -1238,7 +1238,7 @@ READ16_MEMBER(md_rom_wukong_device::read)
return m_nvram[offset - m_nvram_start/2];
// here can access both last 128K of the ROM and the first 128K, depending of bit7 of m_mode
- if (offset >= 0x200000/2 && offset < 0x220000/2)
+ if (offset >= 0x200000/2 && offset < 0x220000/2)
return !m_mode ? m_rom[offset] : m_rom[offset & 0xffff];
else if (offset < 0x400000/2)
return m_rom[offset & 0xfffff];
@@ -1248,7 +1248,7 @@ READ16_MEMBER(md_rom_wukong_device::read)
WRITE16_MEMBER(md_rom_wukong_device::write)
{
- if (offset < 0x100000/2) // it actually writes to 0xe00/2
+ if (offset < 0x100000/2) // it actually writes to 0xe00/2
m_mode = BIT(data, 7);
if (offset >= m_nvram_start/2 && offset <= m_nvram_end/2 && m_nvram_active && !m_nvram_readonly)
@@ -1262,11 +1262,10 @@ WRITE16_MEMBER(md_rom_wukong_device::write_a13)
/* unsure if this is actually supposed to toggle or just switch on? yet to encounter game that uses this */
m_nvram_active = BIT(data, 0);
m_nvram_readonly = BIT(data, 1);
-
+
// since a lot of generic carts ends up here if loaded from fullpath
// we turn on nvram (with m_nvram_handlers_installed) only if they toggle it on by writing here!
if (m_nvram_active)
m_nvram_handlers_installed = 1;
}
}
-
diff --git a/src/mess/machine/md_rom.h b/src/mess/machine/md_rom.h
index 08a7041c2fa..cbae06b70cd 100644
--- a/src/mess/machine/md_rom.h
+++ b/src/mess/machine/md_rom.h
@@ -90,15 +90,15 @@ class md_rom_cm2in1_device : public md_std_rom_device
public:
// construction/destruction
md_rom_cm2in1_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 device_config_complete() { m_shortname = "md_rom_cm2in1"; }
-
+
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
-
+
private:
int m_base;
};
@@ -287,10 +287,10 @@ class md_rom_pokea_device : public md_std_rom_device
public:
// construction/destruction
md_rom_pokea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_config_complete() { m_shortname = "md_rom_pokea"; }
-
+
// reading and writing
virtual DECLARE_READ16_MEMBER(read_a13);
};
@@ -419,16 +419,16 @@ class md_rom_smw64_device : public md_std_rom_device
public:
// construction/destruction
md_rom_smw64_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 device_config_complete() { m_shortname = "md_rom_smw64"; }
-
+
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
virtual DECLARE_WRITE16_MEMBER(write);
-
+
private:
UINT32 m_latch0, m_latch1;
UINT16 m_reg[6];
@@ -537,12 +537,12 @@ class md_rom_beggarp_device : public md_std_rom_device
public:
// construction/destruction
md_rom_beggarp_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 device_config_complete() { m_shortname = "md_rom_beggarp"; }
-
+
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
virtual DECLARE_WRITE16_MEMBER(write);
@@ -559,17 +559,17 @@ class md_rom_wukong_device : public md_std_rom_device
public:
// construction/destruction
md_rom_wukong_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 device_config_complete() { m_shortname = "md_rom_wukong"; }
-
+
// reading and writing
virtual DECLARE_READ16_MEMBER(read);
virtual DECLARE_WRITE16_MEMBER(write);
virtual DECLARE_WRITE16_MEMBER(write_a13);
-
+
private:
UINT8 m_mode;
};
diff --git a/src/mess/machine/md_slot.c b/src/mess/machine/md_slot.c
index b6a3a4d9950..0f83aac451b 100644
--- a/src/mess/machine/md_slot.c
+++ b/src/mess/machine/md_slot.c
@@ -640,7 +640,7 @@ void base_md_cart_slot_device::setup_nvram()
case BEGGARP:
m_cart->m_nvram_start = 0x400000;
m_cart->m_nvram_end = m_cart->m_nvram_start + 0xffff;
- m_cart->nvram_alloc(machine(), 0x8000); // 32K mirrored
+ m_cart->nvram_alloc(machine(), 0x8000); // 32K mirrored
m_cart->m_nvram_active = 1;
break;
case WUKONG:
diff --git a/src/mess/machine/md_slot.h b/src/mess/machine/md_slot.h
index 40700fce9fa..a49c17ec121 100644
--- a/src/mess/machine/md_slot.h
+++ b/src/mess/machine/md_slot.h
@@ -162,11 +162,11 @@ public:
// slot interface overrides
virtual const char * get_default_card_software(const machine_config &config, emu_options &options);
-
+
int load_list();
int load_nonlist();
int get_cart_type(UINT8 *ROM, UINT32 len);
-
+
void setup_custom_mappers();
void setup_nvram();
void set_must_be_loaded(bool _must_be_loaded) { m_must_be_loaded = _must_be_loaded; }
@@ -182,7 +182,7 @@ public:
// TODO: this only needs to be public because megasvp copies rom into memory region, so we need to rework that code...
//private:
-
+
int m_type;
device_md_cart_interface* m_cart;
bool m_must_be_loaded;
diff --git a/src/mess/machine/ncr5380n.c b/src/mess/machine/ncr5380n.c
index 0d595877c28..e54a469949a 100644
--- a/src/mess/machine/ncr5380n.c
+++ b/src/mess/machine/ncr5380n.c
@@ -3,11 +3,11 @@
ncr5380n.c
Implementation of the NCR 5380, aka the Zilog Z5380
-
+
TODO:
- IRQs (Apple doesn't use 'em)
- Target mode
-
+
*********************************************************************/
#include "emu.h"
@@ -93,7 +93,7 @@ void ncr5380n_device::device_config_complete()
void ncr5380n_device::reset_soft()
{
state = IDLE;
- scsi_bus->ctrl_w(scsi_refid, 0, S_ALL); // clear any signals we're driving
+ scsi_bus->ctrl_w(scsi_refid, 0, S_ALL); // clear any signals we're driving
scsi_bus->ctrl_wait(scsi_refid, S_ALL, S_ALL);
status = 0;
drq = false;
@@ -113,13 +113,13 @@ void ncr5380n_device::scsi_ctrl_changed()
{
UINT32 ctrl = scsi_bus->ctrl_r();
-// printf("scsi_ctrl_changed: lines now %x\n", ctrl);
+// printf("scsi_ctrl_changed: lines now %x\n", ctrl);
-/* if ((ctrl & (S_PHASE_MASK|S_SEL|S_BSY)) != last_phase)
- {
- printf("phase now %d, SEL %x BSY %x\n", ctrl & S_PHASE_MASK, ctrl & S_SEL, ctrl & S_BSY);
- last_phase = (S_PHASE_MASK|S_SEL|S_BSY);
- }*/
+/* if ((ctrl & (S_PHASE_MASK|S_SEL|S_BSY)) != last_phase)
+ {
+ printf("phase now %d, SEL %x BSY %x\n", ctrl & S_PHASE_MASK, ctrl & S_SEL, ctrl & S_BSY);
+ last_phase = (S_PHASE_MASK|S_SEL|S_BSY);
+ }*/
// recalculate phase match
m_busstatus &= ~BAS_PHASEMATCH;
@@ -133,7 +133,7 @@ void ncr5380n_device::scsi_ctrl_changed()
// if BSY drops or the phase goes mismatch, that terminates the DMA
if ((!(ctrl & S_BSY)) || !(m_busstatus & BAS_PHASEMATCH))
{
-// printf("BSY dropped or phase mismatch during DMA, ending DMA\n");
+// printf("BSY dropped or phase mismatch during DMA, ending DMA\n");
m_mode &= ~MODE_DMA;
m_busstatus |= BAS_ENDOFDMA;
drq_clear();
@@ -178,7 +178,7 @@ void ncr5380n_device::step(bool timeout)
int win;
for(win=7; win>=0 && !(data & (1<<win)); win--);
-// printf("data %02x win %02x scsi_id %02x\n", data, win, scsi_id);
+// printf("data %02x win %02x scsi_id %02x\n", data, win, scsi_id);
if(win != scsi_id) {
scsi_bus->data_w(scsi_refid, 0);
scsi_bus->ctrl_w(scsi_refid, 0, S_ALL);
@@ -270,21 +270,21 @@ void ncr5380n_device::recv_byte()
void ncr5380n_device::function_bus_complete()
{
state = IDLE;
-// istatus |= I_FUNCTION|I_BUS;
+// istatus |= I_FUNCTION|I_BUS;
check_irq();
}
void ncr5380n_device::function_complete()
{
state = IDLE;
-// istatus |= I_FUNCTION;
+// istatus |= I_FUNCTION;
check_irq();
}
void ncr5380n_device::bus_complete()
{
state = IDLE;
-// istatus |= I_BUS;
+// istatus |= I_BUS;
check_irq();
}
@@ -327,7 +327,7 @@ WRITE8_MEMBER(ncr5380n_device::icmd_w)
// asserting to drive the data bus?
if ((data & IC_DBUS) && !(m_icommand & IC_DBUS))
{
-// printf("%s: driving data bus with %02x\n", tag(), m_outdata);
+// printf("%s: driving data bus with %02x\n", tag(), m_outdata);
scsi_bus->data_w(scsi_refid, m_outdata);
delay(2);
}
@@ -345,7 +345,7 @@ WRITE8_MEMBER(ncr5380n_device::icmd_w)
(data & IC_SEL ? S_SEL : 0) |
(data & IC_ATN ? S_ATN : 0);
-// printf("%s: changing control lines %04x\n", tag(), newdata);
+// printf("%s: changing control lines %04x\n", tag(), newdata);
scsi_bus->ctrl_w(scsi_refid, newdata, S_RST|S_ACK|S_BSY|S_SEL|S_ATN);
}
@@ -360,22 +360,22 @@ READ8_MEMBER(ncr5380n_device::mode_r)
WRITE8_MEMBER(ncr5380n_device::mode_w)
{
-// printf("%s: mode_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
+// printf("%s: mode_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
// arbitration bit being set?
if ((data & MODE_ARBITRATE) && !(m_mode & MODE_ARBITRATE))
{
- // if SEL is selected and the assert SEL bit in the initiator
+ // if SEL is selected and the assert SEL bit in the initiator
// command register is clear, fail
if ((scsi_bus->ctrl_r() & S_SEL) && !(m_icommand & IC_SEL))
{
-// printf("arbitration lost, ctrl = %x, m_icommand&IC_SEL = %x\n", scsi_bus->ctrl_r(), m_icommand & IC_SEL);
+// printf("arbitration lost, ctrl = %x, m_icommand&IC_SEL = %x\n", scsi_bus->ctrl_r(), m_icommand & IC_SEL);
m_icommand &= ~IC_ARBITRATION;
m_icommand |= IC_ARBLOST;
}
else
{
seq = 0;
-// state = DISC_SEL_ARBITRATION;
+// state = DISC_SEL_ARBITRATION;
arbitrate();
}
}
@@ -385,13 +385,13 @@ WRITE8_MEMBER(ncr5380n_device::mode_w)
READ8_MEMBER(ncr5380n_device::command_r)
{
-// logerror("%s: command_r %02x (%08x)\n", tag(), m_tcommand, space.device().safe_pc());
+// logerror("%s: command_r %02x (%08x)\n", tag(), m_tcommand, space.device().safe_pc());
return m_tcommand;
}
WRITE8_MEMBER(ncr5380n_device::command_w)
{
-// printf("%s: command_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
+// printf("%s: command_w %02x (%08x)\n", tag(), data, space.device().safe_pc());
m_tcommand = data;
// recalculate phase match
@@ -425,7 +425,7 @@ void ncr5380n_device::check_irq()
READ8_MEMBER(ncr5380n_device::status_r)
{
UINT32 ctrl = scsi_bus->ctrl_r();
- UINT8 res = status |
+ UINT8 res = status |
(ctrl & S_RST ? ST_RST : 0) |
(ctrl & S_BSY ? ST_BSY : 0) |
(ctrl & S_REQ ? ST_REQ : 0) |
@@ -434,7 +434,7 @@ READ8_MEMBER(ncr5380n_device::status_r)
(ctrl & S_INP ? ST_IO : 0) |
(ctrl & S_SEL ? ST_SEL : 0);
-// printf("%s: status_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
+// printf("%s: status_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
return res;
}
@@ -449,7 +449,7 @@ READ8_MEMBER(ncr5380n_device::busandstatus_r)
(ctrl & S_ATN ? BAS_ATN : 0) |
(ctrl & S_ACK ? BAS_ACK : 0);
-// printf("%s: busandstatus_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
+// printf("%s: busandstatus_r %02x (%08x)\n", tag(), res, space.device().safe_pc());
return res;
}
@@ -477,7 +477,7 @@ READ8_MEMBER(ncr5380n_device::resetparityirq_r)
WRITE8_MEMBER(ncr5380n_device::startdmainitrx_w)
{
-// printf("%02x to start dma initiator Rx\n", data);
+// printf("%02x to start dma initiator Rx\n", data);
recv_byte();
}
@@ -509,7 +509,7 @@ UINT8 ncr5380n_device::dma_r()
void ncr5380n_device::drq_set()
{
- if(!drq)
+ if(!drq)
{
drq = true;
m_busstatus |= BAS_DMAREQUEST;
@@ -520,7 +520,7 @@ void ncr5380n_device::drq_set()
void ncr5380n_device::drq_clear()
{
- if(drq)
+ if(drq)
{
drq = false;
m_busstatus &= ~BAS_DMAREQUEST;
@@ -598,4 +598,3 @@ WRITE8_MEMBER(ncr5380n_device::write)
break;
}
}
-
diff --git a/src/mess/machine/ncr5380n.h b/src/mess/machine/ncr5380n.h
index 68ad91b9e87..43675e9838a 100644
--- a/src/mess/machine/ncr5380n.h
+++ b/src/mess/machine/ncr5380n.h
@@ -142,7 +142,7 @@ private:
enum { BUS_BUSY, BUS_FREE_WAIT, BUS_FREE };
enum {
- ST_RST = 0x80,
+ ST_RST = 0x80,
ST_BSY = 0x40,
ST_REQ = 0x20,
ST_MSG = 0x10,
@@ -151,7 +151,7 @@ private:
ST_SEL = 0x02,
ST_DBP = 0x01,
- BAS_ENDOFDMA = 0x80,
+ BAS_ENDOFDMA = 0x80,
BAS_DMAREQUEST = 0x40,
BAS_PARITYERROR = 0x20,
BAS_IRQACTIVE = 0x10,
@@ -160,25 +160,25 @@ private:
BAS_ATN = 0x02,
BAS_ACK = 0x01,
- IC_RST = 0x80,
- IC_ARBITRATION = 0x40,
- IC_ARBLOST = 0x20,
- IC_ACK = 0x10,
- IC_BSY = 0x08,
- IC_SEL = 0x04,
- IC_ATN = 0x02,
- IC_DBUS = 0x01,
- IC_PHASEMASK = 0x9e,
- IC_WRITEMASK = 0x9f,
-
- MODE_BLOCKDMA = 0x80,
- MODE_TARGET = 0x40,
- MODE_PARITYCHK = 0x20,
- MODE_PARITYIRQ = 0x10,
- MODE_EOPIRQ = 0x08,
- MODE_BSYIRQ = 0x04,
- MODE_DMA = 0x02,
- MODE_ARBITRATE = 0x01,
+ IC_RST = 0x80,
+ IC_ARBITRATION = 0x40,
+ IC_ARBLOST = 0x20,
+ IC_ACK = 0x10,
+ IC_BSY = 0x08,
+ IC_SEL = 0x04,
+ IC_ATN = 0x02,
+ IC_DBUS = 0x01,
+ IC_PHASEMASK = 0x9e,
+ IC_WRITEMASK = 0x9f,
+
+ MODE_BLOCKDMA = 0x80,
+ MODE_TARGET = 0x40,
+ MODE_PARITYCHK = 0x20,
+ MODE_PARITYIRQ = 0x10,
+ MODE_EOPIRQ = 0x08,
+ MODE_BSYIRQ = 0x04,
+ MODE_DMA = 0x02,
+ MODE_ARBITRATE = 0x01,
};
enum { DMA_NONE, DMA_IN, DMA_OUT };
diff --git a/src/mess/machine/ne1000.c b/src/mess/machine/ne1000.c
index 71abec95905..4fcce641d5d 100644
--- a/src/mess/machine/ne1000.c
+++ b/src/mess/machine/ne1000.c
@@ -131,4 +131,3 @@ ioport_constructor ne1000_device::device_input_ports() const
{
return INPUT_PORTS_NAME(ne1000);
}
-
diff --git a/src/mess/machine/nes_slot.c b/src/mess/machine/nes_slot.c
index 4f66fb6382c..a7b41927894 100644
--- a/src/mess/machine/nes_slot.c
+++ b/src/mess/machine/nes_slot.c
@@ -163,12 +163,12 @@ void nes_cart_slot_device::device_start()
void nes_cart_slot_device::device_config_complete()
{
// inherit a copy of the static data
-// const nes_cart_interface *intf = reinterpret_cast<const nes_cart_interface *>(static_config());
-// if (intf != NULL)
-// {
-// *static_cast<nes_cart_interface *>(this) = *intf;
-// }
-
+// const nes_cart_interface *intf = reinterpret_cast<const nes_cart_interface *>(static_config());
+// if (intf != NULL)
+// {
+// *static_cast<nes_cart_interface *>(this) = *intf;
+// }
+
// set brief and instance name
update_names();
}
@@ -214,18 +214,18 @@ static const struct nes_cart_lines nes_cart_lines_table[] =
static int nes_cart_get_line( const char *feature )
{
const struct nes_cart_lines *nes_line = &nes_cart_lines_table[0];
-
+
if (feature == NULL)
return 128;
-
+
while (nes_line->tag)
{
if (strcmp(nes_line->tag, feature) == 0)
break;
-
+
nes_line++;
}
-
+
return nes_line->line;
}
@@ -237,51 +237,51 @@ bool nes_cart_slot_device::call_load()
{
if (m_cart)
{
- UINT32 vram_size = 0, prgram_size = 0, battery_size = 0, mapper_ram_size = 0, mapper_bram_size = 0; // helper for regions to alloc at the end
+ UINT32 vram_size = 0, prgram_size = 0, battery_size = 0, mapper_ram_size = 0, mapper_bram_size = 0; // helper for regions to alloc at the end
if (software_entry() == NULL)
{
const char *mapinfo = NULL;
int mapint1 = 0, mapint2 = 0, mapint3 = 0, mapint4 = 0;
char magic[4];
-
+
/* Check first 4 bytes of the image to decide if it is UNIF or iNES */
/* Unfortunately, many .unf files have been released as .nes, so we cannot rely on extensions only */
memset(magic, '\0', sizeof(magic));
fread(magic, 4);
-
+
if ((magic[0] == 'N') && (magic[1] == 'E') && (magic[2] == 'S')) /* If header starts with 'NES' it is iNES */
{
UINT32 prg_size, vrom_size;
UINT8 header[0x10];
UINT8 mapper, local_options;
bool ines20 = FALSE, has_trainer = FALSE, prg16k;
-
+
// check if the image is recognized by nes.hsi
mapinfo = hashfile_extrainfo(*this);
-
+
// image_extrainfo() resets the file position back to start.
fseek(0, SEEK_SET);
// read out the header
fread(&header, 0x10);
-
+
// SETUP step 1: getting PRG, VROM, VRAM sizes
prg16k = (header[4] == 1);
prg_size = prg16k ? 2 * 0x4000 : header[4] * 0x4000;
vrom_size = header[5] * 0x2000;
vram_size = 0x4000;
-
+
// SETUP step 2: getting PCB and other settings
mapper = (header[6] & 0xf0) >> 4;
local_options = header[6] & 0x0f;
-
+
switch (header[7] & 0xc)
{
case 0x4:
case 0xc:
// probably the header got corrupted: don't trust upper bits for mapper
break;
-
+
case 0x8: // it's iNES 2.0 format
ines20 = TRUE;
case 0x0:
@@ -289,7 +289,7 @@ bool nes_cart_slot_device::call_load()
mapper |= header[7] & 0xf0;
break;
}
-
+
// use info from nes.hsi if available!
if (mapinfo)
{
@@ -313,7 +313,7 @@ bool nes_cart_slot_device::call_load()
{
logerror("NES: No extrainfo found\n");
}
-
+
// use extended iNES2.0 info if available!
if (ines20)
{
@@ -322,7 +322,7 @@ bool nes_cart_slot_device::call_load()
prg_size += ((header[9] & 0x0f) << 8) * 0x4000;
vrom_size += ((header[9] & 0xf0) << 4) * 0x2000;
}
-
+
// SETUP step 3: storing the info needed for emulation
m_pcb_id = nes_get_mmc_id(machine(), mapper);
m_cart->set_mirroring(BIT(local_options, 0) ? PPU_MIRROR_VERT : PPU_MIRROR_HORZ);
@@ -330,7 +330,7 @@ bool nes_cart_slot_device::call_load()
battery_size = NES_BATTERY_SIZE; // with original iNES format we can only support 8K WRAM battery
has_trainer = BIT(local_options, 2) ? TRUE : FALSE;
m_cart->set_four_screen_vram(BIT(local_options, 3));
-
+
if (ines20)
{
// PRGRAM/BWRAM (not fully supported, also due to lack of 2.0 files)
@@ -353,7 +353,7 @@ bool nes_cart_slot_device::call_load()
// so its size has been added recently to the iNES format spec, but almost no image uses it
prgram_size = header[8] ? header[8] * 0x2000 : 0x2000;
}
-
+
// a few mappers correspond to multiple PCBs, so we need a few additional checks and tweaks
switch (m_pcb_id)
{
@@ -485,7 +485,7 @@ bool nes_cart_slot_device::call_load()
break;
//FIXME: we also have to fix Action 52 PRG loading somewhere...
}
-
+
// SETUP step 4: logging what we have found
if (!ines20)
{
@@ -516,17 +516,17 @@ bool nes_cart_slot_device::call_load()
logerror("-- CHR WRAM: %d\n", (header[11] & 0xf0) >> 4);
logerror("-- TV System: %s\n", (header[12] & 2) ? "Both NTSC and PAL" : (header[12] & 1) ? "PAL" : "NTSC");
}
-
+
// SETUP step 5: allocate pointers for PRG/VROM
if (prg_size)
m_cart->prg_alloc(machine(), prg_size);
if (vrom_size)
m_cart->vrom_alloc(machine(), vrom_size);
-
+
if (has_trainer)
fread(&m_cart->m_prgram[0x1000], 0x200);
-
-
+
+
// SETUP step 6: at last load the data!
// Read in the program chunks
if (prg16k)
@@ -540,7 +540,7 @@ bool nes_cart_slot_device::call_load()
{
FILE *prgout;
char outname[255];
-
+
sprintf(outname, "%s.prg", filename());
prgout = fopen(outname, "wb");
if (prgout)
@@ -548,21 +548,21 @@ bool nes_cart_slot_device::call_load()
fwrite(m_cart->get_prg_base(), 1, 0x4000 * m_cart->get_prg_size(), prgout);
mame_printf_error("Created PRG chunk\n");
}
-
+
fclose(prgout);
}
#endif
-
+
// Read in any chr chunks
if (m_cart->get_vrom_size())
fread(m_cart->get_vrom_base(), m_cart->get_vrom_size());
-
+
#if SPLIT_CHR
if (state->m_chr_chunks > 0)
{
FILE *chrout;
char outname[255];
-
+
sprintf(outname, "%s.chr", filename());
chrout= fopen(outname, "wb");
if (chrout)
@@ -584,29 +584,29 @@ bool nes_cart_slot_device::call_load()
char magic2[4];
char unif_mapr[32]; // here we should store MAPR chunks
bool mapr_chunk_found = FALSE, small_prg = FALSE;
-
+
// allocate space to temporarily store PRG & CHR banks
UINT8 *temp_prg = auto_alloc_array(machine(), UINT8, 256 * 0x4000);
UINT8 *temp_chr = auto_alloc_array(machine(), UINT8, 256 * 0x2000);
UINT8 temp_byte = 0;
-
+
fread(&buffer, 4);
unif_ver = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
logerror("Loaded game in UNIF format, version %d\n", unif_ver);
-
+
if (size <= 0x20)
{
logerror("%s only contains the UNIF header and no data.\n", filename());
return IMAGE_INIT_FAIL;
}
-
+
do
{
fseek(read_length, SEEK_SET);
-
+
memset(magic2, '\0', sizeof(magic2));
fread(&magic2, 4);
-
+
/* We first run through the whole image to find a [MAPR] chunk. This is needed
because, unfortunately, the MAPR chunk is not always the first chunk (see
Super 24-in-1). When such a chunk is found, we set mapr_chunk_found=1 and
@@ -619,11 +619,11 @@ bool nes_cart_slot_device::call_load()
logerror("[MAPR] chunk found: ");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
if (chunk_length <= 0x20)
fread(&unif_mapr, chunk_length);
logerror("%s\n", unif_mapr);
-
+
/* now that we found the MAPR chunk, we can go back to load other chunks */
fseek(0x20, SEEK_SET);
read_length = 0x20;
@@ -633,7 +633,7 @@ bool nes_cart_slot_device::call_load()
logerror("Skip this chunk. We need a [MAPR] chunk before anything else.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
}
@@ -647,7 +647,7 @@ bool nes_cart_slot_device::call_load()
logerror("[MAPR] chunk found (in the 2nd run). Already loaded.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'R') && (magic2[1] == 'E') && (magic2[2] == 'A') && (magic2[3] == 'D'))
@@ -655,7 +655,7 @@ bool nes_cart_slot_device::call_load()
logerror("[READ] chunk found. No support yet.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'N') && (magic2[1] == 'A') && (magic2[2] == 'M') && (magic2[3] == 'E'))
@@ -663,7 +663,7 @@ bool nes_cart_slot_device::call_load()
logerror("[NAME] chunk found. No support yet.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'W') && (magic2[1] == 'R') && (magic2[2] == 'T') && (magic2[3] == 'R'))
@@ -671,7 +671,7 @@ bool nes_cart_slot_device::call_load()
logerror("[WRTR] chunk found. No support yet.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'T') && (magic2[1] == 'V') && (magic2[2] == 'C') && (magic2[3] == 'I'))
@@ -679,10 +679,10 @@ bool nes_cart_slot_device::call_load()
logerror("[TVCI] chunk found.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
fread(&temp_byte, 1);
logerror("Television Standard : %s\n", (temp_byte == 0) ? "NTSC" : (temp_byte == 1) ? "PAL" : "Does not matter");
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'T') && (magic2[1] == 'V') && (magic2[2] == 'S') && (magic2[3] == 'C')) // is this the same as TVCI??
@@ -690,7 +690,7 @@ bool nes_cart_slot_device::call_load()
logerror("[TVSC] chunk found. No support yet.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'D') && (magic2[1] == 'I') && (magic2[2] == 'N') && (magic2[3] == 'F'))
@@ -698,7 +698,7 @@ bool nes_cart_slot_device::call_load()
logerror("[DINF] chunk found. No support yet.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'C') && (magic2[1] == 'T') && (magic2[2] == 'R') && (magic2[3] == 'L'))
@@ -706,7 +706,7 @@ bool nes_cart_slot_device::call_load()
logerror("[CTRL] chunk found. No support yet.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'B') && (magic2[1] == 'A') && (magic2[2] == 'T') && (magic2[3] == 'R'))
@@ -714,7 +714,7 @@ bool nes_cart_slot_device::call_load()
logerror("[BATR] chunk found. No support yet.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'V') && (magic2[1] == 'R') && (magic2[2] == 'O') && (magic2[3] == 'R'))
@@ -722,7 +722,7 @@ bool nes_cart_slot_device::call_load()
logerror("[VROR] chunk found. No support yet.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'M') && (magic2[1] == 'I') && (magic2[2] == 'R') && (magic2[3] == 'R'))
@@ -730,9 +730,9 @@ bool nes_cart_slot_device::call_load()
logerror("[MIRR] chunk found.\n");
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
fread(&mirror, 1);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'P') && (magic2[1] == 'C') && (magic2[2] == 'K'))
@@ -740,7 +740,7 @@ bool nes_cart_slot_device::call_load()
logerror("[PCK%c] chunk found. No support yet.\n", magic2[3]);
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'C') && (magic2[1] == 'C') && (magic2[2] == 'K'))
@@ -748,7 +748,7 @@ bool nes_cart_slot_device::call_load()
logerror("[CCK%c] chunk found. No support yet.\n", magic2[3]);
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
-
+
read_length += (chunk_length + 8);
}
else if ((magic2[0] == 'P') && (magic2[1] == 'R') && (magic2[2] == 'G'))
@@ -757,7 +757,7 @@ bool nes_cart_slot_device::call_load()
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
prg_size += chunk_length;
-
+
if (chunk_length / 0x4000)
logerror("It consists of %d 16K-blocks.\n", chunk_length / 0x4000);
else
@@ -765,10 +765,10 @@ bool nes_cart_slot_device::call_load()
small_prg = TRUE;
logerror("This chunk is smaller than 16K: the emulation might have issues. Please report this file to the MESS forums.\n");
}
-
+
/* Read in the program chunks */
fread(&temp_prg[prg_start], chunk_length);
-
+
prg_start += chunk_length;
read_length += (chunk_length + 8);
}
@@ -778,12 +778,12 @@ bool nes_cart_slot_device::call_load()
fread(&buffer, 4);
chunk_length = buffer[0] | (buffer[1] << 8) | (buffer[2] << 16) | (buffer[3] << 24);
vrom_size += chunk_length;
-
+
logerror("It consists of %d 8K-blocks.\n", chunk_length / 0x2000);
-
+
/* Read in the vrom chunks */
fread(&temp_chr[chr_start], chunk_length);
-
+
chr_start += chunk_length;
read_length += (chunk_length + 8);
}
@@ -794,32 +794,32 @@ bool nes_cart_slot_device::call_load()
}
}
} while (size > read_length);
-
+
if (!mapr_chunk_found)
{
auto_free(machine(), temp_prg);
auto_free(machine(), temp_chr);
fatalerror("UNIF should have a [MAPR] chunk to work. Check if your image has been corrupted\n");
}
-
+
if (!prg_start)
{
auto_free(machine(), temp_prg);
auto_free(machine(), temp_chr);
fatalerror("No PRG found. Please report the problem at MESS Board.\n");
}
-
+
// SETUP step 2: getting PCB and other settings
int pcb_id = 0, battery = 0, prgram = 0, vram_chunks = 0;
unif_mapr_setup(unif_mapr, &pcb_id, &battery, &prgram, &vram_chunks);
-
+
// SETUP step 3: storing the info needed for emulation
m_pcb_id = pcb_id;
if (battery)
battery_size = NES_BATTERY_SIZE; // we should allow for smaller battery!
prgram_size = prgram * 0x2000;
vram_size = vram_chunks * 0x2000;
-
+
m_cart->set_four_screen_vram(0);
switch (mirror)
{
@@ -849,13 +849,13 @@ bool nes_cart_slot_device::call_load()
m_cart->set_mirroring(PPU_MIRROR_HORZ);
break;
}
-
+
// SETUP step 4: logging what we have found
logerror("-- Board %s\n", unif_mapr);
logerror("-- PRG 0x%x (%d x 16k chunks)\n", prg_size, prg_size / 0x4000);
logerror("-- VROM 0x%x (%d x 8k chunks)\n", vrom_size, vrom_size / 0x2000);
logerror("-- VRAM 0x%x (%d x 8k chunks)\n", vram_size, vram_size / 0x2000);
-
+
// SETUP steps 5/6: allocate pointers for PRG/VROM and load the data!
if (prg_size == 0x4000)
{
@@ -868,10 +868,10 @@ bool nes_cart_slot_device::call_load()
m_cart->prg_alloc(machine(), prg_size);
memcpy(m_cart->get_prg_base(), temp_prg, prg_size);
}
-
+
if (small_prg) // This is not supported yet, so warn users about this
mame_printf_error("Loaded UNIF file with non-16k PRG chunk. This is not supported in MESS yet.");
-
+
if (vrom_size)
{
m_cart->vrom_alloc(machine(), vrom_size);
@@ -882,7 +882,7 @@ bool nes_cart_slot_device::call_load()
{
FILE *prgout;
char outname[255];
-
+
sprintf(outname, "%s.prg", filename());
prgout = fopen(outname, "wb");
if (prgout)
@@ -890,17 +890,17 @@ bool nes_cart_slot_device::call_load()
fwrite(m_cart->get_prg_base(), 1, 0x4000 * m_cart->get_prg_size(), prgout);
mame_printf_error("Created PRG chunk\n");
}
-
+
fclose(prgout);
}
#endif
-
+
#if SPLIT_CHR
if (state->m_chr_chunks > 0)
{
FILE *chrout;
char outname[255];
-
+
sprintf(outname, "%s.chr", filename());
chrout= fopen(outname, "wb");
if (chrout)
@@ -929,47 +929,47 @@ bool nes_cart_slot_device::call_load()
UINT32 vrom_size = get_software_region_length("chr");
UINT32 vram_size = get_software_region_length("vram");
vram_size += get_software_region_length("vram2");
-
+
// validate the xml fields
if (!prg_size)
fatalerror("No PRG entry for this software! Please check if the xml list got corrupted\n");
if (prg_size < 0x8000)
fatalerror("PRG entry is too small! Please check if the xml list got corrupted\n");
-
+
// SETUP step 2: getting PCB and other settings
if (get_feature("pcb"))
m_pcb_id = nes_get_pcb_id(machine(), get_feature("pcb"));
else
m_pcb_id = NO_BOARD;
-
+
// SETUP step 3: storing the info needed for emulation
if (m_pcb_id == STD_TVROM || m_pcb_id == STD_DRROM || m_pcb_id == IREM_LROG017)
m_cart->set_four_screen_vram(1);
else
m_cart->set_four_screen_vram(0);
-
+
if (get_software_region("bwram") != NULL)
battery_size = get_software_region_length("bwram");
-
+
if (m_pcb_id == BANDAI_LZ93EX)
{
// allocate the 24C01 or 24C02 EEPROM
battery_size += 0x2000;
}
-
+
if (m_pcb_id == BANDAI_DATACH)
{
// allocate the 24C01 and 24C02 EEPROM
battery_size += 0x4000;
}
-
+
if (get_software_region("wram") != NULL)
prgram_size = get_software_region_length("wram");
if (get_software_region("mapper_ram") != NULL)
mapper_ram_size = get_software_region_length("mapper_ram");
if (get_software_region("mapper_bram") != NULL)
mapper_bram_size = get_software_region_length("mapper_bram");
-
+
if (get_feature("mirroring"))
{
const char *mirroring = get_feature("mirroring");
@@ -984,7 +984,7 @@ bool nes_cart_slot_device::call_load()
}
else
m_cart->set_mirroring(PPU_MIRROR_NONE);
-
+
/* Check for pins in specific boards which require them */
if (m_pcb_id == STD_CNROM)
{
@@ -999,13 +999,13 @@ bool nes_cart_slot_device::call_load()
m_ce_state |= !strcmp(get_feature("chr-pin27"), "CE") ? 0x02 : 0;
}
}
-
+
if (m_pcb_id == TAITO_X1_005 && get_feature("x1-pin17") != NULL && get_feature("x1-pin31") != NULL)
{
if (!strcmp(get_feature("x1-pin17"), "CIRAM A10") && !strcmp(get_feature("x1-pin31"), "NC"))
m_pcb_id = TAITO_X1_005_A;
}
-
+
if (m_pcb_id == KONAMI_VRC2)
{
m_vrc_ls_prg_a = nes_cart_get_line(get_feature("vrc2-pin3"));
@@ -1013,34 +1013,34 @@ bool nes_cart_slot_device::call_load()
m_vrc_ls_chr = (nes_cart_get_line(get_feature("vrc2-pin21")) != 10) ? 1 : 0;
// mame_printf_error("VRC-2, pin3: A%d, pin4: A%d, pin21: %s\n", state->m_vrc_ls_prg_a, state->m_vrc_ls_prg_b, state->m_vrc_ls_chr ? "NC" : "A10");
}
-
+
if (m_pcb_id == KONAMI_VRC4)
{
m_vrc_ls_prg_a = nes_cart_get_line(get_feature("vrc4-pin3"));
m_vrc_ls_prg_b = nes_cart_get_line(get_feature("vrc4-pin4"));
// mame_printf_error("VRC-4, pin3: A%d, pin4: A%d\n", state->m_vrc_ls_prg_a, state->m_vrc_ls_prg_b);
}
-
+
if (m_pcb_id == KONAMI_VRC6)
{
m_vrc_ls_prg_a = nes_cart_get_line(get_feature("vrc6-pin9"));
m_vrc_ls_prg_b = nes_cart_get_line(get_feature("vrc6-pin10"));
// mame_printf_error("VRC-6, pin9: A%d, pin10: A%d\n", state->m_vrc_ls_prg_a, state->m_vrc_ls_prg_b);
}
-
+
/* Check for other misc board variants */
if (m_pcb_id == STD_SOROM)
{
if (get_feature("mmc1_type") != NULL && !strcmp(get_feature("mmc1_type"), "MMC1A"))
m_pcb_id = STD_SOROM_A; // in MMC1-A PRG RAM is always enabled
}
-
+
if (m_pcb_id == STD_SXROM)
{
if (get_feature("mmc1_type") != NULL && !strcmp(get_feature("mmc1_type"), "MMC1A"))
m_pcb_id = STD_SXROM_A; // in MMC1-A PRG RAM is always enabled
}
-
+
if (m_pcb_id == STD_NXROM || m_pcb_id == SUNSOFT_DCS)
{
if (get_software_region("minicart") != NULL) // check for dual minicart
@@ -1049,7 +1049,7 @@ bool nes_cart_slot_device::call_load()
// we shall load somewhere the minicart, but we still do not support this
}
}
-
+
// SETUP step 4: logging what we have found
logerror("Loaded game from softlist:\n");
logerror("-- PCB: %s", get_feature("pcb"));
@@ -1060,7 +1060,7 @@ bool nes_cart_slot_device::call_load()
logerror("-- VRAM 0x%x (%d x 8k chunks)\n", vram_size, vram_size / 0x2000);
logerror("-- PRG NVWRAM: %d\n", m_cart->get_battery_size());
logerror("-- PRG WRAM: %d\n", m_cart->get_prgram_size());
-
+
// SETUP steps 5/6: allocate pointers for PRG/VROM and load the data!
m_cart->prg_alloc(machine(), prg_size);
memcpy(m_cart->get_prg_base(), get_software_region("prg"), prg_size);
@@ -1070,7 +1070,7 @@ bool nes_cart_slot_device::call_load()
memcpy(m_cart->get_vrom_base(), get_software_region("chr"), vrom_size);
}
}
-
+
// Allocate the remaining pointer, when needed
if (vram_size)
m_cart->vram_alloc(machine(), vram_size);
@@ -1078,7 +1078,7 @@ bool nes_cart_slot_device::call_load()
m_cart->prgram_alloc(machine(), prgram_size);
if (mapper_ram_size)
m_cart->mapper_ram_alloc(machine(), mapper_ram_size);
-
+
// Attempt to load a battery file for this ROM
// A few boards have internal RAM with a battery (MMC6, Taito X1-005 & X1-017, etc.)
if (battery_size || mapper_bram_size)
@@ -1096,12 +1096,12 @@ bool nes_cart_slot_device::call_load()
m_cart->mapper_bram_alloc(machine(), mapper_bram_size);
memcpy(m_cart->get_mapper_bram_base(), temp_nvram + battery_size, mapper_bram_size);
}
-
+
if (temp_nvram)
auto_free(machine(), temp_nvram);
}
}
-
+
return IMAGE_INIT_PASS;
}
@@ -1122,7 +1122,7 @@ void nes_cart_slot_device::call_unload()
memcpy(temp_nvram, m_cart->get_battery_base(), m_cart->get_battery_size());
if (m_cart->get_mapper_bram_size())
memcpy(temp_nvram + m_cart->get_battery_size(), m_cart->get_mapper_bram_base(), m_cart->get_mapper_bram_size());
-
+
battery_save(temp_nvram, tot_size);
if (temp_nvram)
auto_free(machine(), temp_nvram);
@@ -1230,4 +1230,3 @@ nes_rom_device::nes_rom_device(const machine_config &mconfig, device_type type,
void nes_rom_device::device_start()
{
}
-
diff --git a/src/mess/machine/nes_slot.h b/src/mess/machine/nes_slot.h
index 5c5a86e0ed3..f7ab5fb601f 100644
--- a/src/mess/machine/nes_slot.h
+++ b/src/mess/machine/nes_slot.h
@@ -153,7 +153,7 @@ public:
//private:
- device_nes_cart_interface* m_cart;
+ device_nes_cart_interface* m_cart;
int m_pcb_id;
bool m_must_be_loaded;
};
@@ -197,12 +197,12 @@ public:
virtual void device_config_complete() { m_shortname = "nes_rom"; }
// nescart_interface overrides
-// virtual DECLARE_READ8_MEMBER(read_l);
-// virtual DECLARE_READ8_MEMBER(read_m);
-// virtual DECLARE_READ8_MEMBER(read_h);
-// virtual DECLARE_WRITE8_MEMBER(write_l);
-// virtual DECLARE_WRITE8_MEMBER(write_m);
-// virtual DECLARE_WRITE8_MEMBER(write_h);
+// virtual DECLARE_READ8_MEMBER(read_l);
+// virtual DECLARE_READ8_MEMBER(read_m);
+// virtual DECLARE_READ8_MEMBER(read_h);
+// virtual DECLARE_WRITE8_MEMBER(write_l);
+// virtual DECLARE_WRITE8_MEMBER(write_m);
+// virtual DECLARE_WRITE8_MEMBER(write_h);
};
// device type definition
diff --git a/src/mess/machine/nes_unif.c b/src/mess/machine/nes_unif.c
index 08d963ba7fc..cf801d6ac85 100644
--- a/src/mess/machine/nes_unif.c
+++ b/src/mess/machine/nes_unif.c
@@ -160,14 +160,14 @@ const unif *nes_unif_lookup( const char *board )
void unif_mapr_setup( const char *board, int *pcb_id, int *battery, int *prgram, int *vram_chunks )
{
- const unif *unif_board = nes_unif_lookup(board);
+ const unif *unif_board = nes_unif_lookup(board);
if (unif_board == NULL)
fatalerror("Unknown UNIF board %s.\n", board);
-
+
*pcb_id = unif_board->board_idx;
- *battery = unif_board->nvwram; // we should implement battery banks based on the size of this...
- *prgram = unif_board->wram; // we should implement WRAM banks based on the size of this...
-
+ *battery = unif_board->nvwram; // we should implement battery banks based on the size of this...
+ *prgram = unif_board->wram; // we should implement WRAM banks based on the size of this...
+
if (unif_board->chrram <= CHRRAM_8)
*vram_chunks = 1;
else if (unif_board->chrram == CHRRAM_16)
diff --git a/src/mess/machine/pet_64k.c b/src/mess/machine/pet_64k.c
index 1b9b1c4f9fa..1381a533e7d 100644
--- a/src/mess/machine/pet_64k.c
+++ b/src/mess/machine/pet_64k.c
@@ -181,7 +181,7 @@ void pet_64k_expansion_device::pet_bd_w(address_space &space, offs_t offset, UIN
case pet_expansion_slot_device::SELE:
if (!BIT(m_ctrl, 6) || !BIT(offset, 11))
{
- write_ram(offset, data);
+ write_ram(offset, data);
sel = pet_expansion_slot_device::SEL_NONE;
}
break;
diff --git a/src/mess/machine/petexp.h b/src/mess/machine/petexp.h
index e21481ef7bc..0ac796f876a 100644
--- a/src/mess/machine/petexp.h
+++ b/src/mess/machine/petexp.h
@@ -72,7 +72,7 @@ public:
UINT8 dma_bd_r(offs_t offset);
void dma_bd_w(offs_t offset, UINT8 data);
int phi2();
-
+
enum
{
SEL_NONE = -1,
diff --git a/src/mess/machine/sns_bsx.c b/src/mess/machine/sns_bsx.c
index 63750525839..9cf584c2ce9 100644
--- a/src/mess/machine/sns_bsx.c
+++ b/src/mess/machine/sns_bsx.c
@@ -64,7 +64,7 @@ void sns_rom_bsx_device::device_start()
m_cart_regs[7] = 0x80;
m_cart_regs[8] = 0x80;
access_update();
-
+
save_item(NAME(m_cart_regs));
save_item(NAME(access_00_1f));
save_item(NAME(access_80_9f));
@@ -77,7 +77,7 @@ void sns_rom_bsx_device::device_start()
}
void sns_rom_bsx_device::device_reset()
-{
+{
memset(m_pram, 0xff, sizeof(m_pram));
}
@@ -104,7 +104,7 @@ void sns_rom_bsmempak_device::device_reset()
m_command = 0;
m_write_old = 0;
m_write_new = 0;
-
+
m_flash_enable = 0;
m_read_enable = 0;
m_write_enable = 0;
diff --git a/src/mess/machine/sns_rom.c b/src/mess/machine/sns_rom.c
index 61d43edeaca..a2af182741d 100644
--- a/src/mess/machine/sns_rom.c
+++ b/src/mess/machine/sns_rom.c
@@ -309,17 +309,17 @@ WRITE8_MEMBER( sns_rom_pokemon_device::chip_write )
}
-// Tekken 2: It accesses the protection in a very strange way, always reading/writing the same data $f0 times,
-// because each access must be repeated a couple of times to be registered (typically around 7-30 times)
+// Tekken 2: It accesses the protection in a very strange way, always reading/writing the same data $f0 times,
+// because each access must be repeated a couple of times to be registered (typically around 7-30 times)
// They probably used a microcontroller here.
-// The protection itself is accessed in banks $80-$bf. Accessing (read/write, doesn't matter) adress lines
+// The protection itself is accessed in banks $80-$bf. Accessing (read/write, doesn't matter) adress lines
// A8,A9,A10 in these banks in a certain sequence makes the mc return a 4bit value. [d4s]
// Details on a possible algorythm behind the sequence of accesses were provided by nocash. Thanks!
void sns_rom_tekken2_device::update_prot(UINT32 offset)
{
// accesses to [80-bf][8000-87ff] ranges update the protection value
offset &= 0x7ff;
-
+
switch (offset & 0x700)
{
case 0x000:
@@ -328,22 +328,22 @@ void sns_rom_tekken2_device::update_prot(UINT32 offset)
case 0x100:
// used for read access
break;
- case 0x200: // BIT 0
+ case 0x200: // BIT 0
m_prot |= 1;
break;
- case 0x300: // BIT 1
+ case 0x300: // BIT 1
m_prot |= 2;
break;
- case 0x400: // BIT 2
+ case 0x400: // BIT 2
m_prot |= 4;
break;
- case 0x500: // BIT 3
+ case 0x500: // BIT 3
m_prot |= 8;
break;
- case 0x600: // DIRECTION
+ case 0x600: // DIRECTION
m_prot |= 0x10;
break;
- case 0x700: // FUNCTION
+ case 0x700: // FUNCTION
m_prot |= 0x20;
break;
}
@@ -355,18 +355,18 @@ READ8_MEMBER( sns_rom_tekken2_device::chip_read )
if ((offset & 0x700) == 0x100)
{
- if (BIT(m_prot, 5)) // FUNCTION = 1 means Shift
+ if (BIT(m_prot, 5)) // FUNCTION = 1 means Shift
{
- if (BIT(m_prot, 4)) // DIRECTION = 1 means Right
+ if (BIT(m_prot, 4)) // DIRECTION = 1 means Right
return (m_prot & 0x0f) >> 1;
- else // DIRECTION = 0 means Left
+ else // DIRECTION = 0 means Left
return (m_prot & 0x0f) << 1;
}
- else // FUNCTION = 0 means Add/Sub
+ else // FUNCTION = 0 means Add/Sub
{
- if (BIT(m_prot, 4)) // DIRECTION = 1 means Minus
+ if (BIT(m_prot, 4)) // DIRECTION = 1 means Minus
return (m_prot & 0x0f) - 1;
- else // DIRECTION = 0 means Plus
+ else // DIRECTION = 0 means Plus
return (m_prot & 0x0f) + 1;
}
}
@@ -380,7 +380,7 @@ WRITE8_MEMBER( sns_rom_tekken2_device::chip_write )
}
-// Soul Blade: Adresses $xxx0-$xxx3 in banks $80-$bf always read $55, $0f, $aa, $f0.
+// Soul Blade: Adresses $xxx0-$xxx3 in banks $80-$bf always read $55, $0f, $aa, $f0.
// Banks $c0-$ff return open bus.
READ8_MEMBER( sns_rom_soulblad_device::chip_read )
{
@@ -407,7 +407,7 @@ READ8_MEMBER( sns_rom_soulblad_device::chip_read )
// Multicart pirate banking emulation
// LoROM games, writes to [ff][ff00-ffff] control bankswitch
-// The actual banks depends on the last 8bits of the address accessed.
+// The actual banks depends on the last 8bits of the address accessed.
// Type 1: bits0-4 of the address are used as base bank (256KB chunks)
READ8_MEMBER(sns_rom_mcpirate1_device::read_l)
@@ -424,7 +424,7 @@ READ8_MEMBER(sns_rom_mcpirate1_device::read_h)
WRITE8_MEMBER( sns_rom_mcpirate1_device::chip_write )
{
m_base_bank = offset & 0x1f;
-// printf("offset %X data %X bank %X\n", offset, data, m_base_bank);
+// printf("offset %X data %X bank %X\n", offset, data, m_base_bank);
}
// Type 2: bits0-3 & bit5 of the address are used as base bank (256KB chunks)
@@ -442,7 +442,7 @@ READ8_MEMBER(sns_rom_mcpirate2_device::read_h)
WRITE8_MEMBER( sns_rom_mcpirate2_device::chip_write )
{
m_base_bank = (offset & 0x0f) | ((offset & 0x20) >> 1);
-// printf("offset %X data %X bank %X\n", offset, data, m_base_bank);
+// printf("offset %X data %X bank %X\n", offset, data, m_base_bank);
}
// Korean 20 in 1 collection with NES games
@@ -488,7 +488,7 @@ WRITE8_MEMBER( sns_rom_20col_device::chip_write )
// [19] mario bros - 9b
// [20] popeye - 9c
m_base_bank = data & 0xdf;
-// printf("offset %X data %X bank %X\n", offset, data, m_base_bank);
+// printf("offset %X data %X bank %X\n", offset, data, m_base_bank);
}
@@ -502,7 +502,7 @@ READ8_MEMBER( sns_rom_banana_device::chip_read )
WRITE8_MEMBER( sns_rom_banana_device::chip_write )
{
-// printf("write addr %X data %X\n", offset, data);
+// printf("write addr %X data %X\n", offset, data);
m_latch[0xf] = data;
}
@@ -515,5 +515,3 @@ WRITE8_MEMBER( sns_rom_bugs_device::chip_write )
{
m_latch[offset & 0xff] = data;
}
-
-
diff --git a/src/mess/machine/sns_rom.h b/src/mess/machine/sns_rom.h
index 2cded87bfbe..4170945e016 100644
--- a/src/mess/machine/sns_rom.h
+++ b/src/mess/machine/sns_rom.h
@@ -30,16 +30,16 @@ class sns_rom_obc1_device : public sns_rom_device
public:
// construction/destruction
sns_rom_obc1_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 device_config_complete() { m_shortname = "sns_rom_obc1"; }
-
+
// additional reading and writing
virtual DECLARE_READ8_MEMBER(chip_read);
virtual DECLARE_WRITE8_MEMBER(chip_write);
-
+
int m_address;
int m_offset;
int m_shift;
@@ -74,12 +74,12 @@ class sns_rom_tekken2_device : public sns_rom_device
public:
// construction/destruction
sns_rom_tekken2_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 device_config_complete() { m_shortname = "sns_rom_tekken2"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read); // protection device
virtual DECLARE_WRITE8_MEMBER(chip_write); // protection device
@@ -98,10 +98,10 @@ class sns_rom_soulblad_device : public sns_rom_device
public:
// construction/destruction
sns_rom_soulblad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_config_complete() { m_shortname = "sns_rom_soulblad"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read); // protection device
};
@@ -113,12 +113,12 @@ class sns_rom_mcpirate1_device : public sns_rom_device
public:
// construction/destruction
sns_rom_mcpirate1_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 device_config_complete() { m_shortname = "sns_rom_mcpirate1"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
virtual DECLARE_READ8_MEMBER(read_h);
@@ -133,12 +133,12 @@ class sns_rom_mcpirate2_device : public sns_rom_device
public:
// construction/destruction
sns_rom_mcpirate2_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 device_config_complete() { m_shortname = "sns_rom_mcpirate2"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
virtual DECLARE_READ8_MEMBER(read_h);
@@ -153,11 +153,11 @@ class sns_rom_20col_device : public sns_rom_device
public:
// construction/destruction
sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_config_complete() { m_shortname = "sns_rom_20col"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_l);
virtual DECLARE_READ8_MEMBER(read_h);
@@ -172,12 +172,12 @@ class sns_rom_banana_device : public sns_rom_device
public:
// construction/destruction
sns_rom_banana_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 device_start();
+// virtual void device_reset();
virtual void device_config_complete() { m_shortname = "sns_rom_banana"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read); // protection device
virtual DECLARE_WRITE8_MEMBER(chip_write); // protection device
@@ -191,12 +191,12 @@ class sns_rom_bugs_device : public sns_rom_device
public:
// construction/destruction
sns_rom_bugs_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 device_config_complete() { m_shortname = "sns_rom_bugslife"; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(chip_read); // protection device
virtual DECLARE_WRITE8_MEMBER(chip_write); // protection device
diff --git a/src/mess/machine/sns_rom21.c b/src/mess/machine/sns_rom21.c
index f6a746e299d..646d0c16a19 100644
--- a/src/mess/machine/sns_rom21.c
+++ b/src/mess/machine/sns_rom21.c
@@ -50,15 +50,15 @@ void sns_rom21_srtc_device::device_start()
{
save_item(NAME(m_mode));
save_item(NAME(m_index));
-// save_item(NAME(m_rtc_ram));
+// save_item(NAME(m_rtc_ram));
}
void sns_rom21_srtc_device::device_reset()
{
m_mode = RTCM_Read;
m_index = -1;
-// memset(m_rtc_ram, 0, sizeof(m_rtc_ram));
-
+// memset(m_rtc_ram, 0, sizeof(m_rtc_ram));
+
// at this stage, rtc_ram is not yet allocated. this will be fixed when converting RTC to be a separate device.
// update_time();
}
diff --git a/src/mess/machine/sns_sdd1.c b/src/mess/machine/sns_sdd1.c
index 166cd6bb1ae..c0487ee26d4 100644
--- a/src/mess/machine/sns_sdd1.c
+++ b/src/mess/machine/sns_sdd1.c
@@ -442,17 +442,17 @@ void sns_rom_sdd1_device::device_reset()
{
m_sdd1_enable = 0x00;
m_xfer_enable = 0x00;
-
+
m_mmc[0] = 0 << 20;
m_mmc[1] = 1 << 20;
m_mmc[2] = 2 << 20;
m_mmc[3] = 3 << 20;
-
+
for(int i = 0; i < 8; i++)
{
m_dma[i].addr = 0;
m_dma[i].size = 0;
- }
+ }
}
/*-------------------------------------------------
@@ -604,4 +604,3 @@ WRITE8_MEMBER( sns_rom_sdd1_device::write_ram )
{
m_nvram[offset & 0x1fff] = data;
}
-
diff --git a/src/mess/machine/sns_sfx.c b/src/mess/machine/sns_sfx.c
index 2be51bf9ec5..bc7be0b1baf 100644
--- a/src/mess/machine/sns_sfx.c
+++ b/src/mess/machine/sns_sfx.c
@@ -152,4 +152,3 @@ WRITE8_MEMBER( sns_rom_superfx_device::write_ram )
if (superfx_access_ram(m_superfx))
sfx_ram[offset & 0xfffff] = data;
}
-
diff --git a/src/mess/machine/sns_slot.c b/src/mess/machine/sns_slot.c
index 7a47da01a06..61d65403f1b 100644
--- a/src/mess/machine/sns_slot.c
+++ b/src/mess/machine/sns_slot.c
@@ -23,7 +23,7 @@
Notes about add-on detection and handling (useful for future addition of st018, cx4, etc.)
===============================================================================================
- When loading from softlist, m_type would be enough to take care of add-on chips, because
+ When loading from softlist, m_type would be enough to take care of add-on chips, because
the ones needing a CPU dump have it in the zipfile. However, to support these games also
from fullpath, both with files having DSP data appended to the .sfc and with older dumps
missing DSP data, a second variable is present in the SNES slot: m_addon.
@@ -32,15 +32,15 @@
ones containing DSP dump as device roms, so it gets m_type as the main device should be
used and if m_addon is ADDON_DSP* or ADDON_ST*, then it checks if the DSP data is appended
or if m_type has to be switched to legacy type
- - call_load needs to detect faulty dumps too, to alloc m_addon_bios and copy the data from
- the correct place, so if m_addon is ADDON_DSP* or ADDON_ST* it checks whether DSP data is
- appended or not: if it is, this data is copied to m_addon_bios; if not, then we are in
+ - call_load needs to detect faulty dumps too, to alloc m_addon_bios and copy the data from
+ the correct place, so if m_addon is ADDON_DSP* or ADDON_ST* it checks whether DSP data is
+ appended or not: if it is, this data is copied to m_addon_bios; if not, then we are in
the legacy device case and data is copied from the device rom
- After the cart has been loaded and emulation has started, only m_type is needed to later
+ After the cart has been loaded and emulation has started, only m_type is needed to later
handlers installation and cart accesses
- Also notice that, from softlist, DSP1, 1B, 2, 3 are treated as the same device, because they
- all have the same I/O and the only difference (i.e. the DSP data) comes from the zipfile itself.
+ Also notice that, from softlist, DSP1, 1B, 2, 3 are treated as the same device, because they
+ all have the same I/O and the only difference (i.e. the DSP data) comes from the zipfile itself.
OTOH, to support faulty dumps missing DSP content, we need separate legacy devices...
@@ -808,13 +808,13 @@ void base_sns_cart_slot_device::setup_addon_from_fullpath()
}
break;
}
-
+
// otherwise, we need to use the legacy versions including DSP dump in device romset
if (!m_cart->get_addon_bios_size())
{
astring region(m_cart->device().tag(), ":addon");
UINT8 *ROM = NULL;
-
+
switch (m_addon)
{
case ADDON_DSP1:
@@ -853,8 +853,8 @@ void base_sns_cart_slot_device::setup_addon_from_fullpath()
memcpy(m_cart->get_addon_bios_base(), ROM, 0x11000);
break;
}
- }
-
+ }
+
}
void base_sns_cart_slot_device::setup_nvram()
@@ -1041,7 +1041,7 @@ const char * base_sns_cart_slot_device::get_default_card_software(const machine_
if (type == SNES_DSP_MODE21)
type = SNES_DSP1_MODE21_LEG;
else
- type = SNES_DSP1_LEG;
+ type = SNES_DSP1_LEG;
}
break;
case ADDON_DSP1B:
diff --git a/src/mess/machine/sns_slot.h b/src/mess/machine/sns_slot.h
index 9c4189d7686..51f2aa708d0 100644
--- a/src/mess/machine/sns_slot.h
+++ b/src/mess/machine/sns_slot.h
@@ -107,12 +107,12 @@ public:
virtual ~device_sns_cart_interface();
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_l) { return 0xff; } // ROM access in range [00-7f]
- virtual DECLARE_READ8_MEMBER(read_h) { return 0xff; } // ROM access in range [80-ff]
- virtual DECLARE_READ8_MEMBER(read_ram) { UINT32 mask = m_nvram_size - 1; return m_nvram[offset & mask]; } // NVRAM access
- virtual DECLARE_WRITE8_MEMBER(write_l) {} // used by carts with subslots
- virtual DECLARE_WRITE8_MEMBER(write_h) {} // used by carts with subslots
- virtual DECLARE_WRITE8_MEMBER(write_ram) { UINT32 mask = m_nvram_size - 1; m_nvram[offset & mask] = data; return; } // NVRAM access
+ virtual DECLARE_READ8_MEMBER(read_l) { return 0xff; } // ROM access in range [00-7f]
+ virtual DECLARE_READ8_MEMBER(read_h) { return 0xff; } // ROM access in range [80-ff]
+ virtual DECLARE_READ8_MEMBER(read_ram) { UINT32 mask = m_nvram_size - 1; return m_nvram[offset & mask]; } // NVRAM access
+ virtual DECLARE_WRITE8_MEMBER(write_l) {} // used by carts with subslots
+ virtual DECLARE_WRITE8_MEMBER(write_h) {} // used by carts with subslots
+ virtual DECLARE_WRITE8_MEMBER(write_ram) { UINT32 mask = m_nvram_size - 1; m_nvram[offset & mask] = data; return; } // NVRAM access
virtual DECLARE_READ8_MEMBER(chip_read) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(chip_write) {}
@@ -194,7 +194,7 @@ public:
virtual DECLARE_READ8_MEMBER(chip_read);
virtual DECLARE_WRITE8_MEMBER(chip_write);
- // in order to support legacy dumps + add-on CPU dump appended at the end of the file, we
+ // in order to support legacy dumps + add-on CPU dump appended at the end of the file, we
// check if the required data is present and update bank map accordingly
void setup_addon_from_fullpath();
diff --git a/src/mess/machine/sns_spc7110.c b/src/mess/machine/sns_spc7110.c
index 7fd037f26df..713a2ad4d5f 100644
--- a/src/mess/machine/sns_spc7110.c
+++ b/src/mess/machine/sns_spc7110.c
@@ -61,7 +61,7 @@ void sns_rom_spc7110_device::spc7110_start()
m_r480a = 0x00;
m_r480b = 0x00;
m_r480c = 0x00;
-
+
m_r4811 = 0x00;
m_r4812 = 0x00;
m_r4813 = 0x00;
@@ -70,11 +70,11 @@ void sns_rom_spc7110_device::spc7110_start()
m_r4816 = 0x00;
m_r4817 = 0x00;
m_r4818 = 0x00;
-
+
m_r481x = 0x00;
m_r4814_latch = 0;
m_r4815_latch = 0;
-
+
m_r4820 = 0x00;
m_r4821 = 0x00;
m_r4822 = 0x00;
@@ -91,7 +91,7 @@ void sns_rom_spc7110_device::spc7110_start()
m_r482d = 0x00;
m_r482e = 0x00;
m_r482f = 0x00;
-
+
m_r4830 = 0x00;
m_r4831 = 0;
m_dx_offset = spc7110_datarom_addr(0 * 0x100000, 0x200000); // we would need the rom length here...
@@ -100,7 +100,7 @@ void sns_rom_spc7110_device::spc7110_start()
m_r4833 = 2;
m_fx_offset = spc7110_datarom_addr(2 * 0x100000, 0x200000); // we would need the rom length here...
m_r4834 = 0x00;
-
+
m_r4840 = 0x00;
m_r4841 = 0x00;
m_r4842 = 0x00;
@@ -167,19 +167,19 @@ void sns_rom_spc7110_device::device_start()
void sns_rom_spc7110rtc_device::device_start()
{
spc7110_start();
-
+
// RTC
m_rtc_state = RTCS_Inactive;
m_rtc_mode = RTCM_Linear;
m_rtc_index = 0;
m_rtc_offset = 0;
-
+
// at this stage, rtc_ram is not yet allocated. this will be fixed when converting RTC to be a separate device.
// spc7110_update_time(0);
// set basetime for RTC
machine().current_datetime(m_rtc_basetime);
-
+
save_item(NAME(m_rtc_state));
save_item(NAME(m_rtc_mode));
save_item(NAME(m_rtc_index));
@@ -936,7 +936,7 @@ void sns_rom_spc7110_device::spc7110_update_time(UINT8 offset)
system_time curtime;
machine().current_datetime(curtime);
INT64 diff = curtime.time - m_rtc_basetime.time - offset;
-// printf("diff %llx\n", diff);
+// printf("diff %llx\n", diff);
bool update = TRUE;
// TEST: can we go beyond 24hrs of rounding?!? I doubt it will ever go beyond 3600, but I could be wrong...
@@ -984,37 +984,37 @@ void sns_rom_spc7110_device::spc7110_update_time(UINT8 offset)
UINT8 days = spc7110_months[month % 12];
// check for feb 29th
- if (days == 28)
+ if (days == 28)
{
bool leap = FALSE;
- if ((year % 4) == 0)
+ if ((year % 4) == 0)
{
if(year % 100 || !(year % 400))
leap = TRUE;
}
- if (leap)
+ if (leap)
days++;
}
// are we below end of month?
- if (day < days)
+ if (day < days)
continue;
// otherwise we have to increase month!
day = 0;
month++;
// are we below end of year?
- if (month < 12)
+ if (month < 12)
continue;
// otherwise we have to increase year!
month = 0;
year++;
}
-
+
day++;
month++;
year %= 100;
-
+
m_rtc_ram[0] = second % 10;
m_rtc_ram[1] = second / 10;
m_rtc_ram[2] = minute % 10;
@@ -1608,14 +1608,14 @@ READ8_MEMBER(sns_rom_spc7110_device::read_l)
{
if (offset < 0x400000)
return m_rom[rom_bank_map[offset / 0x8000] * 0x8000 + (offset & 0x7fff)];
-
+
return 0xff;
}
READ8_MEMBER(sns_rom_spc7110_device::read_h)
{
UINT16 address = offset & 0xfffff;
-
+
if (offset < 0x400000)
return m_rom[rom_bank_map[offset / 0x8000] * 0x8000 + (offset & 0x7fff)];
else
@@ -1634,7 +1634,7 @@ READ8_MEMBER(sns_rom_spc7110_device::read_h)
break;
}
}
-
+
return 0xff;
}
@@ -1648,4 +1648,3 @@ WRITE8_MEMBER( sns_rom_spc7110_device::write_ram )
{
m_ram[offset & 0x1fff] = data;
}
-
diff --git a/src/mess/machine/sns_upd.c b/src/mess/machine/sns_upd.c
index 09c115556d2..f78a5ade6fc 100644
--- a/src/mess/machine/sns_upd.c
+++ b/src/mess/machine/sns_upd.c
@@ -237,7 +237,7 @@ READ8_MEMBER( sns_rom_setadsp_device::chip_read )
{
if (offset >= 0x600000 && offset < 0x680000 && (offset & 0xffff) < 0x4000)
m_upd96050->snesdsp_read((offset & 0x01) ? FALSE : TRUE);
-
+
if (offset >= 0x680000 && offset < 0x700000 && (offset & 0xffff) < 0x8000)
{
UINT16 address = offset & 0xffff;
@@ -518,4 +518,3 @@ const rom_entry *sns_rom_seta11dsp_legacy_device::device_rom_region() const
{
return ROM_NAME( snes_st011 );
}
-
diff --git a/src/mess/machine/sns_upd.h b/src/mess/machine/sns_upd.h
index 4726ab587ce..f937aa0a10c 100644
--- a/src/mess/machine/sns_upd.h
+++ b/src/mess/machine/sns_upd.h
@@ -119,7 +119,7 @@ class sns_rom20_necdsp1_legacy_device : public sns_rom20_necdsp_device
public:
// construction/destruction
sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_config_complete() { m_shortname = "dsp1leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
@@ -131,7 +131,7 @@ class sns_rom20_necdsp1b_legacy_device : public sns_rom20_necdsp_device
public:
// construction/destruction
sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_config_complete() { m_shortname = "dsp1bleg"; }
virtual machine_config_constructor device_mconfig_additions() const;
@@ -143,7 +143,7 @@ class sns_rom20_necdsp2_legacy_device : public sns_rom20_necdsp_device
public:
// construction/destruction
sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_config_complete() { m_shortname = "dsp2leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
@@ -155,7 +155,7 @@ class sns_rom20_necdsp3_legacy_device : public sns_rom20_necdsp_device
public:
// construction/destruction
sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_config_complete() { m_shortname = "dsp3leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
@@ -167,7 +167,7 @@ class sns_rom20_necdsp4_legacy_device : public sns_rom20_necdsp_device
public:
// construction/destruction
sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_config_complete() { m_shortname = "dsp4leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
@@ -179,7 +179,7 @@ class sns_rom21_necdsp1_legacy_device : public sns_rom21_necdsp_device
public:
// construction/destruction
sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_config_complete() { m_shortname = "dsp1leg_hi"; }
virtual machine_config_constructor device_mconfig_additions() const;
@@ -191,7 +191,7 @@ class sns_rom_seta10dsp_legacy_device : public sns_rom_setadsp_device
public:
// construction/destruction
sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_config_complete() { m_shortname = "seta10leg"; }
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/super80.c b/src/mess/machine/super80.c
index a694b932ee9..8f25391b1f4 100644
--- a/src/mess/machine/super80.c
+++ b/src/mess/machine/super80.c
@@ -253,4 +253,4 @@ QUICKLOAD_LOAD( super80 )
}
return IMAGE_INIT_PASS;
-} \ No newline at end of file
+}
diff --git a/src/mess/machine/tandy2kb.c b/src/mess/machine/tandy2kb.c
index 3212774f62d..530914ead2e 100644
--- a/src/mess/machine/tandy2kb.c
+++ b/src/mess/machine/tandy2kb.c
@@ -259,8 +259,8 @@ tandy2k_keyboard_device::tandy2k_keyboard_device(const machine_config &mconfig,
//-------------------------------------------------
void tandy2k_keyboard_device::device_config_complete()
-{
- m_shortname = "tandy2kb";
+{
+ m_shortname = "tandy2kb";
// inherit a copy of the static data
const tandy2k_keyboard_interface *intf = reinterpret_cast<const tandy2k_keyboard_interface *>(static_config());
diff --git a/src/mess/machine/thomflop.c b/src/mess/machine/thomflop.c
index bbcc47d0ba4..6f4103ebabd 100644
--- a/src/mess/machine/thomflop.c
+++ b/src/mess/machine/thomflop.c
@@ -1937,4 +1937,3 @@ void thomson_state::thomson_index_callback(device_t *device, int state)
break;
}
}
-
diff --git a/src/mess/machine/thomson.c b/src/mess/machine/thomson.c
index 3ebccf4cff9..312bca1d5e4 100644
--- a/src/mess/machine/thomson.c
+++ b/src/mess/machine/thomson.c
@@ -480,8 +480,8 @@ WRITE8_MEMBER( thomson_state::to7_timer_port_out )
thom_set_mode_point( data & 1 ); /* bit 0: video bank switch */
thom_set_caps_led( (data & 8) ? 1 : 0 ) ; /* bit 3: keyboard led */
thom_set_border_color( ((data & 0x10) ? 1 : 0) | /* bits 4-6: border color */
- ((data & 0x20) ? 2 : 0) |
- ((data & 0x40) ? 4 : 0) );
+ ((data & 0x20) ? 2 : 0) |
+ ((data & 0x40) ? 4 : 0) );
}
@@ -1571,9 +1571,9 @@ WRITE8_MEMBER( thomson_state::to770_timer_port_out )
thom_set_mode_point( data & 1 ); /* bit 0: video bank switch */
thom_set_caps_led( (data & 8) ? 1 : 0 ) ; /* bit 3: keyboard led */
thom_set_border_color( ((data & 0x10) ? 1 : 0) | /* 4-bit border color */
- ((data & 0x20) ? 2 : 0) |
- ((data & 0x40) ? 4 : 0) |
- ((data & 0x04) ? 0 : 8) );
+ ((data & 0x20) ? 2 : 0) |
+ ((data & 0x40) ? 4 : 0) |
+ ((data & 0x04) ? 0 : 8) );
}
diff --git a/src/mess/machine/ti99/mecmouse.h b/src/mess/machine/ti99/mecmouse.h
index 5481134d92d..895ffe07830 100644
--- a/src/mess/machine/ti99/mecmouse.h
+++ b/src/mess/machine/ti99/mecmouse.h
@@ -30,7 +30,7 @@ protected:
virtual void device_reset(void);
virtual ioport_constructor device_input_ports() const;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
-
+
private:
int m_last_select;
bool m_read_y_axis;
diff --git a/src/mess/machine/ti99/ti_fdc.h b/src/mess/machine/ti99/ti_fdc.h
index b3fd1a8fe7e..5d1361e8a18 100644
--- a/src/mess/machine/ti99/ti_fdc.h
+++ b/src/mess/machine/ti99/ti_fdc.h
@@ -37,7 +37,7 @@ protected:
virtual const rom_entry *device_rom_region() const;
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
-
+
private:
void handle_hold(void);
void set_all_geometries(floppy_type_t type);
diff --git a/src/mess/machine/vic1011.c b/src/mess/machine/vic1011.c
index 03640c6d5e5..6ca9048db7e 100644
--- a/src/mess/machine/vic1011.c
+++ b/src/mess/machine/vic1011.c
@@ -93,18 +93,18 @@ void vic1011_device::device_start()
UINT8 vic1011_device::vic20_pb_r(address_space &space, offs_t offset)
{
/*
-
+
bit description
-
+
0 Sin
- 1
- 2
- 3
+ 1
+ 2
+ 3
4 DCDin
- 5
+ 5
6 CTS
7 DSR
-
+
*/
UINT8 data = 0;
@@ -125,18 +125,18 @@ UINT8 vic1011_device::vic20_pb_r(address_space &space, offs_t offset)
void vic1011_device::vic20_pb_w(address_space &space, offs_t offset, UINT8 data)
{
/*
-
+
bit description
-
- 0
+
+ 0
1 RTS
2 DTR
- 3
- 4
+ 3
+ 4
5 DCDout
- 6
- 7
-
+ 6
+ 7
+
*/
m_rs232->rts_w(BIT(data, 1));
diff --git a/src/mess/mess.lst b/src/mess/mess.lst
index 8b20eb049b6..dcd2ac05ebd 100644
--- a/src/mess/mess.lst
+++ b/src/mess/mess.lst
@@ -2205,4 +2205,3 @@ nd80z
binbug
dg680
besta88
-
diff --git a/src/mess/video/crt.c b/src/mess/video/crt.c
index 557b4b7ef17..9340ad87d53 100644
--- a/src/mess/video/crt.c
+++ b/src/mess/video/crt.c
@@ -50,14 +50,14 @@ const device_type CRT = &device_creator<crt_device>;
crt_device::crt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, CRT, "CRT Video", tag, owner, clock),
- m_list(NULL),
- m_list_head(NULL),
- m_decay_counter(0),
- m_num_intensity_levels(0),
- m_window_offset_x(0),
- m_window_offset_y(0),
- m_window_width(0),
- m_window_height(0)
+ m_list(NULL),
+ m_list_head(NULL),
+ m_decay_counter(0),
+ m_num_intensity_levels(0),
+ m_window_offset_x(0),
+ m_window_offset_y(0),
+ m_window_width(0),
+ m_window_height(0)
{
}
diff --git a/src/mess/video/crt.h b/src/mess/video/crt.h
index eb8f0d3a7c7..22bce59a399 100644
--- a/src/mess/video/crt.h
+++ b/src/mess/video/crt.h
@@ -33,10 +33,10 @@ struct crt_interface
struct crt_point
{
- crt_point() :
- intensity(0),
- next(0) {}
-
+ crt_point() :
+ intensity(0),
+ next(0) {}
+
int intensity; /* current intensity of the pixel */
/* a node is not in the list when (intensity == -1) */
int next; /* index of next pixel in list */
@@ -55,23 +55,23 @@ protected:
virtual void device_start();
public:
- void plot(int x, int y);
- void eof();
- void update(bitmap_ind16 &bitmap);
+ void plot(int x, int y);
+ void eof();
+ void update(bitmap_ind16 &bitmap);
private:
crt_point *m_list; /* array of (crt_window_width*crt_window_height) point */
int *m_list_head; /* head of the list of lit pixels (index in the array) */
- /* keep a separate list for each display line (makes the video code slightly faster) */
+ /* keep a separate list for each display line (makes the video code slightly faster) */
int m_decay_counter; /* incremented each frame (tells for how many frames the CRT has decayed between two screen refresh) */
/* CRT window */
int m_num_intensity_levels;
int m_window_offset_x;
- int m_window_offset_y;
+ int m_window_offset_y;
int m_window_width;
- int m_window_height;
+ int m_window_height;
};
extern const device_type CRT;
diff --git a/src/mess/video/crtc_ega.c b/src/mess/video/crtc_ega.c
index dad20909cd8..ad2daba6c4b 100644
--- a/src/mess/video/crtc_ega.c
+++ b/src/mess/video/crtc_ega.c
@@ -739,9 +739,9 @@ void crtc_ega_device::device_reset()
m_vert_blank_start = 0;
m_line_counter = 0;
m_raster_counter = 0;
- m_horiz_pix_total = 0;
+ m_horiz_pix_total = 0;
m_vert_pix_total = 0;
- m_max_visible_x = 0;
+ m_max_visible_x = 0;
m_max_visible_y = 0;
m_hsync_on_pos = 0;
m_vsync_on_pos = 0;
diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c
index 8fb2e99faeb..2f556082123 100644
--- a/src/osd/windows/input.c
+++ b/src/osd/windows/input.c
@@ -1603,16 +1603,16 @@ static BOOL CALLBACK dinput_joystick_enum(LPCDIDEVICEINSTANCE instance, LPVOID r
{
FPTR offset = (FPTR)(&((DIJOYSTATE2 *)NULL)->rgbButtons[butnum]);
char *name = dinput_device_item_name(devinfo, offset, default_button_name(butnum), NULL);
-
+
input_item_id itemid;
-
+
if (butnum < INPUT_MAX_BUTTONS)
itemid = (input_item_id) (ITEM_ID_BUTTON1 + butnum);
else if (butnum < INPUT_MAX_BUTTONS + INPUT_MAX_ADD_SWITCH)
itemid = (input_item_id) (ITEM_ID_ADD_SWITCH1 - INPUT_MAX_BUTTONS + butnum);
else
itemid = ITEM_ID_OTHER_SWITCH;
-
+
devinfo->device->add_item(name, itemid, generic_button_get_state, &devinfo->joystick.state.rgbButtons[butnum]);
osd_free(name);
}
diff --git a/src/tools/unidasm.c b/src/tools/unidasm.c
index 0c5db61fe5a..f16a21427fe 100644
--- a/src/tools/unidasm.c
+++ b/src/tools/unidasm.c
@@ -328,7 +328,7 @@ static const dasm_table_entry dasm_table[] =
{ "spc700", _8bit, 0, CPU_DISASSEMBLE_NAME(spc700) },
{ "ssem", _32le, 0, CPU_DISASSEMBLE_NAME(ssem) },
{ "ssp1601", _16be, -1, CPU_DISASSEMBLE_NAME(ssp1601) },
-// { "superfx", _8bit, 0, CPU_DISASSEMBLE_NAME(superfx) },
+// { "superfx", _8bit, 0, CPU_DISASSEMBLE_NAME(superfx) },
{ "t11", _16le, 0, CPU_DISASSEMBLE_NAME(t11) },
// { "t90", _8bit, 0, CPU_DISASSEMBLE_NAME(t90) },
{ "tlcs900", _8bit, 0, CPU_DISASSEMBLE_NAME(tlcs900) },
diff --git a/src/version.c b/src/version.c
index 494be9582ac..fb61217d299 100644
--- a/src/version.c
+++ b/src/version.c
@@ -38,4 +38,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.148u1 ("__DATE__")";
+const char build_version[] = "0.148u2 ("__DATE__")";