summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2014-11-26 10:37:58 +0100
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2014-11-26 10:37:58 +0100
commitebeaa953a3a6ae98842b4a169bc95e5f3c673d8c (patch)
tree41959790c00308fc3cac9c71176709f53683151d
parent18b8ce2f9467ae23672cea11f4a3fc5e42e24b9c (diff)
Cleanups and version bumpmame0156
-rw-r--r--hash/apfimag_cass.xml2
-rw-r--r--hash/cgenie_cass.xml2
-rw-r--r--hash/compclr2_flop.xml2
-rw-r--r--hash/epson_cpm.xml4
-rw-r--r--hash/jupace_cass.xml6
-rw-r--r--hash/leapster.xml8
-rw-r--r--hash/m5_cass.xml12
-rw-r--r--hash/pc98.xml70
-rw-r--r--hash/svi318_cass.xml8
-rw-r--r--hash/to7_cart.xml80
-rw-r--r--hash/tvc_cass.xml14
-rw-r--r--hash/vsmile_cart.xml36
-rw-r--r--src/emu/bus/a2bus/a2bus.h14
-rw-r--r--src/emu/bus/a2bus/a2eext80col.c1
-rw-r--r--src/emu/bus/a2bus/a2estd80col.c1
-rw-r--r--src/emu/bus/a2bus/a2swyft.c3
-rw-r--r--src/emu/bus/a2bus/ramcard128k.c13
-rw-r--r--src/emu/bus/a2bus/ramcard16k.c11
-rw-r--r--src/emu/bus/astrocde/exp.h2
-rw-r--r--src/emu/bus/astrocde/ram.c12
-rw-r--r--src/emu/bus/astrocde/ram.h20
-rw-r--r--src/emu/bus/astrocde/rom.c13
-rw-r--r--src/emu/bus/astrocde/rom.h10
-rw-r--r--src/emu/bus/astrocde/slot.c3
-rw-r--r--src/emu/bus/centronics/epson_lx810l.h10
-rw-r--r--src/emu/bus/coco/coco_dwsock.c171
-rw-r--r--src/emu/bus/coco/coco_dwsock.h39
-rw-r--r--src/emu/bus/cpc/playcity.c3
-rw-r--r--src/emu/bus/cpc/playcity.h21
-rw-r--r--src/emu/bus/gameboy/gb_slot.c6
-rw-r--r--src/emu/bus/isa/mda.c2
-rw-r--r--src/emu/bus/isa/xsu_cards.c10
-rw-r--r--src/emu/bus/pce/pce_slot.c2
-rw-r--r--src/emu/bus/pet/hsg.c2
-rw-r--r--src/emu/bus/pet/hsg.h2
-rw-r--r--src/emu/bus/spc1000/fdd.c8
-rw-r--r--src/emu/bus/spc1000/fdd.h6
-rw-r--r--src/emu/bus/spc1000/vdp.c2
-rw-r--r--src/emu/bus/spc1000/vdp.h2
-rw-r--r--src/emu/cpu/cp1610/cp1610.c4
-rw-r--r--src/emu/cpu/cp1610/cp1610.h8
-rw-r--r--src/emu/cpu/powerpc/ppc.h2
-rw-r--r--src/emu/cpu/rsp/rsp.h2
-rw-r--r--src/emu/cpu/rsp/rspcp2.c30
-rw-r--r--src/emu/cpu/rsp/rspcp2.h38
-rw-r--r--src/emu/cpu/rsp/rspcp2d.c58
-rw-r--r--src/emu/cpu/rsp/rspcp2d.h4
-rw-r--r--src/emu/cpu/rsp/rspcp2s.c33
-rw-r--r--src/emu/cpu/rsp/rspcp2s.h66
-rw-r--r--src/emu/cpu/rsp/rspdrc.c10
-rw-r--r--src/emu/cpu/upd7810/upd7810.c14
-rw-r--r--src/emu/machine/i6300esb.c8
-rw-r--r--src/emu/machine/i6300esb.h2
-rw-r--r--src/emu/machine/i82875p.h4
-rw-r--r--src/emu/machine/intelfsh.c6
-rw-r--r--src/emu/machine/intelfsh.h4
-rw-r--r--src/emu/machine/lpc-acpi.c2
-rw-r--r--src/emu/machine/lpc-rtc.c4
-rw-r--r--src/emu/machine/lpc-rtc.h2
-rw-r--r--src/emu/machine/lpc.c1
-rw-r--r--src/emu/machine/lpc.h1
-rw-r--r--src/emu/machine/omti5100.c4
-rw-r--r--src/emu/machine/omti5100.h2
-rw-r--r--src/emu/machine/pci.c22
-rw-r--r--src/emu/machine/pci.h2
-rw-r--r--src/emu/machine/pla.c14
-rw-r--r--src/emu/machine/pla.h4
-rw-r--r--src/emu/memory.c2
-rw-r--r--src/emu/memory.h2
-rw-r--r--src/emu/romload.c2
-rw-r--r--src/emu/sound/sn76477.h12
-rw-r--r--src/emu/video/315_5124.h2
-rw-r--r--src/emu/video/315_5313.c2
-rw-r--r--src/emu/video/snes_ppu.c25
-rw-r--r--src/lib/formats/flopimg.c16
-rw-r--r--src/lib/formats/flopimg.h4
-rw-r--r--src/lib/formats/spc1000_cas.c8
-rw-r--r--src/lib/formats/victor9k_dsk.c60
-rw-r--r--src/lib/util/plaparse.c40
-rw-r--r--src/lib/web/mongoose.c2
-rw-r--r--src/lib/winpcap/Packet32.h194
-rw-r--r--src/lib/winpcap/Win32-Extensions.h48
-rw-r--r--src/lib/winpcap/bittypes.h22
-rw-r--r--src/lib/winpcap/ip6_misc.h138
-rw-r--r--src/lib/winpcap/pcap-bpf.h4
-rw-r--r--src/lib/winpcap/pcap-namedb.h6
-rw-r--r--src/lib/winpcap/pcap-stdinc.h6
-rw-r--r--src/lib/winpcap/pcap.h6
-rw-r--r--src/lib/winpcap/pcap/bluetooth.h6
-rw-r--r--src/lib/winpcap/pcap/bpf.h360
-rw-r--r--src/lib/winpcap/pcap/namedb.h22
-rw-r--r--src/lib/winpcap/pcap/pcap.h300
-rw-r--r--src/lib/winpcap/pcap/sll.h68
-rw-r--r--src/lib/winpcap/pcap/usb.h8
-rw-r--r--src/lib/winpcap/pcap/vlan.h8
-rw-r--r--src/lib/winpcap/remote-ext.h417
-rw-r--r--src/mame/drivers/airbustr.c10
-rw-r--r--src/mame/drivers/alinvade.c14
-rw-r--r--src/mame/drivers/alpha68k.c74
-rw-r--r--src/mame/drivers/arkanoid.c24
-rw-r--r--src/mame/drivers/astrcorp.c16
-rw-r--r--src/mame/drivers/atetris.c14
-rw-r--r--src/mame/drivers/cobra.c4
-rw-r--r--src/mame/drivers/cv1k.c1
-rw-r--r--src/mame/drivers/cybertnk.c2
-rw-r--r--src/mame/drivers/darius.c18
-rw-r--r--src/mame/drivers/dec0.c2
-rw-r--r--src/mame/drivers/dragrace.c2
-rw-r--r--src/mame/drivers/dreamwld.c6
-rw-r--r--src/mame/drivers/fcrash.c4
-rw-r--r--src/mame/drivers/gts3.c2
-rw-r--r--src/mame/drivers/gts3a.c4
-rw-r--r--src/mame/drivers/gts80b.c38
-rw-r--r--src/mame/drivers/harddriv.c111
-rw-r--r--src/mame/drivers/lethal.c2
-rw-r--r--src/mame/drivers/lindbergh.c24
-rw-r--r--src/mame/drivers/maygay1b.c14
-rw-r--r--src/mame/drivers/naomi.c24
-rw-r--r--src/mame/drivers/pacman.c42
-rw-r--r--src/mame/drivers/peplus.c8
-rw-r--r--src/mame/drivers/pse.c49
-rw-r--r--src/mame/drivers/raiden2.c2
-rw-r--r--src/mame/drivers/sbrkout.c2
-rw-r--r--src/mame/drivers/segacoin.c6
-rw-r--r--src/mame/drivers/segas16b.c14
-rw-r--r--src/mame/drivers/segas18.c10
-rw-r--r--src/mame/drivers/segaufo.c62
-rw-r--r--src/mame/drivers/sfbonus.c6
-rw-r--r--src/mame/drivers/suna8.c6
-rw-r--r--src/mame/drivers/supduck.c16
-rw-r--r--src/mame/drivers/tnzs.c1
-rw-r--r--src/mame/drivers/twin16.c2
-rw-r--r--src/mame/drivers/videopin.c48
-rw-r--r--src/mame/includes/atetris.h6
-rw-r--r--src/mame/includes/exidy440.h2
-rw-r--r--src/mame/includes/harddriv.h38
-rw-r--r--src/mame/includes/konamigx.h48
-rw-r--r--src/mame/includes/mario.h2
-rw-r--r--src/mame/includes/segas18.h2
-rw-r--r--src/mame/includes/suna8.h4
-rw-r--r--src/mame/includes/tnzs.h2
-rw-r--r--src/mame/machine/315-5881_crypt.c2
-rw-r--r--src/mame/machine/315-5881_crypt.h2
-rw-r--r--src/mame/machine/315_5296.h2
-rw-r--r--src/mame/machine/harddriv.c2
-rw-r--r--src/mame/machine/naomim2.c5
-rw-r--r--src/mame/machine/naomim2.h2
-rw-r--r--src/mame/machine/naomim4.c2
-rw-r--r--src/mame/machine/segabb.c2
-rw-r--r--src/mame/machine/slapstic.c2
-rw-r--r--src/mame/machine/stvprot.c4
-rw-r--r--src/mame/mame.lst53
-rw-r--r--src/mame/video/cps1.c2
-rw-r--r--src/mame/video/dooyong.c2
-rw-r--r--src/mame/video/exidy440.c2
-rw-r--r--src/mame/video/harddriv.c8
-rw-r--r--src/mame/video/model3.c34
-rw-r--r--src/mame/video/psychic5.c2
-rw-r--r--src/mame/video/rdpspn16.c2
-rw-r--r--src/mame/video/sshangha.c2
-rw-r--r--src/mess/audio/dave.c2
-rw-r--r--src/mess/drivers/apple2.c82
-rw-r--r--src/mess/drivers/apple2e.c557
-rw-r--r--src/mess/drivers/apple2gs.c2
-rw-r--r--src/mess/drivers/comp4.c6
-rw-r--r--src/mess/drivers/dvk_ksm.c38
-rw-r--r--src/mess/drivers/ec184x.c6
-rw-r--r--src/mess/drivers/gamate.c2
-rw-r--r--src/mess/drivers/iskr103x.c2
-rw-r--r--src/mess/drivers/leapster.c46
-rw-r--r--src/mess/drivers/merlin.c12
-rw-r--r--src/mess/drivers/ngen.c8
-rw-r--r--src/mess/drivers/pc9801.c16
-rw-r--r--src/mess/drivers/pcd.c4
-rw-r--r--src/mess/drivers/px4.c6
-rw-r--r--src/mess/drivers/px8.c2
-rw-r--r--src/mess/drivers/simon.c10
-rw-r--r--src/mess/drivers/spc1000.c4
-rwxr-xr-xsrc/mess/drivers/ti85.c32
-rw-r--r--src/mess/drivers/ticalc1x.c4
-rw-r--r--src/mess/drivers/tk2000.c58
-rw-r--r--src/mess/includes/pet.h2
-rwxr-xr-xsrc/mess/includes/ti85.h10
-rw-r--r--src/mess/includes/victor9k.h2
-rw-r--r--src/mess/includes/wswan.h16
-rw-r--r--src/mess/includes/xerox820.h2
-rw-r--r--src/mess/machine/coco.c26
-rw-r--r--src/mess/machine/gamecom.c4
-rw-r--r--src/mess/machine/hec2hrp.c1
-rw-r--r--src/mess/machine/ie15_kbd.c10
-rw-r--r--src/mess/machine/ms7004.c200
-rwxr-xr-xsrc/mess/machine/ti85.c69
-rw-r--r--src/mess/machine/victor9k_fdc.c4
-rw-r--r--src/mess/machine/victor9kb.c2
-rw-r--r--src/mess/machine/wswan.c346
-rw-r--r--src/mess/machine/x820kb.c24
-rw-r--r--src/mess/mess.lst1
-rw-r--r--src/mess/tools/castool/main.c4
-rw-r--r--src/mess/video/apple2.c80
-rw-r--r--src/mess/video/apple2.h6
-rw-r--r--src/mess/video/wswan_video.c360
-rw-r--r--src/mess/video/wswan_video.h6
-rw-r--r--src/osd/modules/debugger/qt/debugqtdasmwindow.c8
-rw-r--r--src/osd/modules/debugger/qt/debugqtlogwindow.c4
-rw-r--r--src/osd/modules/debugger/qt/debugqtmainwindow.c12
-rw-r--r--src/osd/modules/debugger/qt/debugqtmainwindow.h8
-rw-r--r--src/osd/modules/debugger/qt/debugqtmemorywindow.c14
-rw-r--r--src/osd/modules/debugger/qt/debugqtview.c14
-rw-r--r--src/osd/modules/debugger/qt/debugqtview.h4
-rw-r--r--src/osd/osdnet.c7
-rw-r--r--src/version.c2
211 files changed, 2895 insertions, 2946 deletions
diff --git a/hash/apfimag_cass.xml b/hash/apfimag_cass.xml
index 7406f39ee38..53f797942ab 100644
--- a/hash/apfimag_cass.xml
+++ b/hash/apfimag_cass.xml
@@ -3,7 +3,7 @@
<softwarelist name="apfimag_cass" description="APF Imagination cassettes">
-<!-- To load a tape, just start APF Imagination with the BASIC cart inserted, and type CLOAD followed by <Return>
+<!-- To load a tape, just start APF Imagination with the BASIC cart inserted, and type CLOAD followed by <Return>
(by default mapped to your ']' key). Then start the tape from the Internal UI and press <Return>.
If you don't press <Return>, the system won't read the tape (this is fairly unusual but it's the way the system works)
diff --git a/hash/cgenie_cass.xml b/hash/cgenie_cass.xml
index a8c71fa66c5..136d427bc5a 100644
--- a/hash/cgenie_cass.xml
+++ b/hash/cgenie_cass.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
-<!--
+<!--
TODO:
* document basic tapes when they are fixed!
diff --git a/hash/compclr2_flop.xml b/hash/compclr2_flop.xml
index 334da88777b..a8280e733c4 100644
--- a/hash/compclr2_flop.xml
+++ b/hash/compclr2_flop.xml
@@ -187,7 +187,7 @@
</dataarea>
</part>
</software>
-
+
<software name="asteroida" cloneof="asteroid">
<description>Asteroids (Alt)</description>
<year>19??</year>
diff --git a/hash/epson_cpm.xml b/hash/epson_cpm.xml
index e4fbb181306..1f0580c5cdc 100644
--- a/hash/epson_cpm.xml
+++ b/hash/epson_cpm.xml
@@ -5,7 +5,7 @@
<softwarelist name="epson_cpm" description="Epson CPM systems floppy disks">
- <!-- This disk is used to boot the intelligent TF-20 floppy drive -->
+ <!-- This disk is used to boot the intelligent TF-20 floppy drive -->
<software name="tf20boot">
<description>TF-20 boot disk</description>
@@ -19,7 +19,7 @@
</part>
</software>
- <!-- The following disks are part of the vfloppy distribution -->
+ <!-- The following disks are part of the vfloppy distribution -->
<software name="arcs">
<description>Archivers</description>
diff --git a/hash/jupace_cass.xml b/hash/jupace_cass.xml
index d0ec2ca049b..859c34eda9c 100644
--- a/hash/jupace_cass.xml
+++ b/hash/jupace_cass.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
-<!--
+<!--
- TODO:
- * update to latest TOSEC (2014-10-31)
+ TODO:
+ * update to latest TOSEC (2014-10-31)
* add usage instructions
* check which games work and which don't and fix the supported flag accordingly
-->
diff --git a/hash/leapster.xml b/hash/leapster.xml
index 5fa949315a5..3979d79ff00 100644
--- a/hash/leapster.xml
+++ b/hash/leapster.xml
@@ -41,7 +41,7 @@
-
+
<softwarelist name="leapster" description="LeapFrog Leapster cartridges">
<software name="findnemo" supported="no">
@@ -65,7 +65,7 @@
</dataarea>
</part>
</software>
-
+
<software name="spdrman" supported="no">
<description>Spider-Man - Schachmatt den Schildersaboteuren! (German)</description>
<year>2003</year>
@@ -98,7 +98,7 @@
</dataarea>
</part>
</software>
-
+
<software name="demo" supported="no">
<description>Demo - Herbst 2004 II (German)</description>
<year>2003</year>
@@ -120,7 +120,7 @@
</dataarea>
</part>
</software>
-
+
<software name="disprinz" supported="no">
<description>Disney Prinzessinnen - Zauberhaftes Lernen (German)</description>
<year>2003</year>
diff --git a/hash/m5_cass.xml b/hash/m5_cass.xml
index 457d2c3b2e4..63c519c0869 100644
--- a/hash/m5_cass.xml
+++ b/hash/m5_cass.xml
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
-<!--
- Cassettes that load with CHAIN cannot auto-start correctly.
- Mount the BASIC-I cart first, then the cassette to load + run them.
-
- Other tapes should auto-load and run.
+<!--
+ Cassettes that load with CHAIN cannot auto-start correctly.
+ Mount the BASIC-I cart first, then the cassette to load + run them.
+
+ Other tapes should auto-load and run.
-->
<softwarelist name="m5_cass" description="Sord M5 cassettes">
@@ -220,7 +220,7 @@
<year>19??</year>
<publisher>&lt;unknown&gt;</publisher>
<info name="usage" value="Mount together with &quot;BASIC-I&quot; and load with CHAIN"/>
- <!--<sharedfeat name="requirement" value="m5_cart:basici"/>-->
+ <!--<sharedfeat name="requirement" value="m5_cart:basici"/>-->
<part name="cass1" interface="m5_cass">
<dataarea name="cass" size="3278">
diff --git a/hash/pc98.xml b/hash/pc98.xml
index 06005465de4..05b7d68f37e 100644
--- a/hash/pc98.xml
+++ b/hash/pc98.xml
@@ -5,7 +5,7 @@
This software list collects disks from many different sources, including the 13GB pack with ~90 rar files floating around since 2011
Origin for many of the disks is Japanese BBS and/or P2P, so it is hard to properly credits whoever dumped them
- A huge credit goes however to Tokugawa Boards people (Ben, pete_j, Starscream the 2nd, delicious, Ashura, fa123, kobushi, Trickless, etc.)
+ A huge credit goes however to Tokugawa Boards people (Ben, pete_j, Starscream the 2nd, delicious, Ashura, fa123, kobushi, Trickless, etc.)
for sharing and dumping a lot of disks and for the researches on the disks
-->
@@ -46740,7 +46740,7 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?)
</dataarea>
</part>
</software>
-
+
<software name="paradox" supported="no">
<description>Paradox</description>
<year>19??</year>
@@ -48823,7 +48823,7 @@ Requires MS-DOS 5.00H plus an unknown procedure (HDD install?)
-<!--
+<!--
Game Packs, hopefully to be replaced with real disk images of the single games eventually
@@ -56883,7 +56883,7 @@ SPACE EMPIRE
-<!--
+<!--
Coverdisks
@@ -57841,7 +57841,7 @@ SPACE EMPIRE
-<!--
+<!--
Game and Software Packs / Collections
@@ -58323,7 +58323,7 @@ SPACE EMPIRE
</software>
-<!--
+<!--
Bio 100% Freeware software
@@ -58622,10 +58622,10 @@ SPACE EMPIRE
</software>
-<!--
+<!--
VECTOR Freeware software
-
+
These were available for download at Vector's homepage
The disk images below have been created by users to launch the games in emulators
@@ -62437,35 +62437,35 @@ Same as Police Quest 2 - Quest for Glory stand-alone disks
-<!-- <software name="">
- <description>lodoss tou senki - custom (turbo program?) / ロードス島戦記カスタム</description>
- <year>19??</year>
- <publisher>&lt;unknown&gt;</publisher>
- <part name="flop1" interface="floppy_5_25">
- <feature name="part_id" value="Disk A"/>
- <dataarea name="flop" size="1265664">
- <rom name="custom_program.fdi" size="1265664" crc="b78832f3" sha1="853bbf51085570147777460b2481be3149c710e4" offset="0" />
- </dataarea>
- </part>
- <part name="flop2" interface="floppy_5_25">
- <feature name="part_id" value="Disk A"/>
- <dataarea name="flop" size="1265664">
- <rom name="custom_scenario.fdi" size="1265664" crc="8e8ee17d" sha1="f8b900cfdf557af018634003a6382aa7c35faab6" offset="0" /> <!- - same as in lodoss? - ->
- </dataarea>
- </part>
- </software>
+<!-- <software name="">
+ <description>lodoss tou senki - custom (turbo program?) / ロードス島戦記カスタム</description>
+ <year>19??</year>
+ <publisher>&lt;unknown&gt;</publisher>
+ <part name="flop1" interface="floppy_5_25">
+ <feature name="part_id" value="Disk A"/>
+ <dataarea name="flop" size="1265664">
+ <rom name="custom_program.fdi" size="1265664" crc="b78832f3" sha1="853bbf51085570147777460b2481be3149c710e4" offset="0" />
+ </dataarea>
+ </part>
+ <part name="flop2" interface="floppy_5_25">
+ <feature name="part_id" value="Disk A"/>
+ <dataarea name="flop" size="1265664">
+ <rom name="custom_scenario.fdi" size="1265664" crc="8e8ee17d" sha1="f8b900cfdf557af018634003a6382aa7c35faab6" offset="0" /> <!- - same as in lodoss? - ->
+ </dataarea>
+ </part>
+ </software>
-->
-<!-- <software name="">
- <description>morita shougi ii + hanyuu data / 森田将棋2+ 羽生 データ</description>
- <year>19??</year>
- <publisher>&lt;unknown&gt;</publisher>
- <part name="flop1" interface="floppy_5_25">
- <dataarea name="flop" size="1281968">
- <rom name="morita2p.d88" size="1281968" crc="99effa5b" sha1="c7c4a60e71b7112d94b85eb4fe0d156fae2c0c35" offset="0" />
- </dataarea>
- </part>
- </software>
+<!-- <software name="">
+ <description>morita shougi ii + hanyuu data / 森田将棋2+ 羽生 データ</description>
+ <year>19??</year>
+ <publisher>&lt;unknown&gt;</publisher>
+ <part name="flop1" interface="floppy_5_25">
+ <dataarea name="flop" size="1281968">
+ <rom name="morita2p.d88" size="1281968" crc="99effa5b" sha1="c7c4a60e71b7112d94b85eb4fe0d156fae2c0c35" offset="0" />
+ </dataarea>
+ </part>
+ </software>
-->
diff --git a/hash/svi318_cass.xml b/hash/svi318_cass.xml
index 312a7c83f5e..49209738bf3 100644
--- a/hash/svi318_cass.xml
+++ b/hash/svi318_cass.xml
@@ -2207,7 +2207,7 @@ Ballonies (198x)
</software>
<!-- Joystick -->
-
+
<software name="joysti01">
<description>Joystick 01</description>
<year>1985</year>
@@ -2339,9 +2339,9 @@ Ballonies (198x)
</dataarea>
</part>
</software>
-
+
<!-- MKOD -->
-
+
<software name="mkod01">
<description>MKOD Collection 01</description>
<year>19??</year>
@@ -2569,7 +2569,7 @@ Ballonies (198x)
</dataarea>
</part>
</software>
-
+
<!-- BASIC Collections -->
<software name="basicc01">
diff --git a/hash/to7_cart.xml b/hash/to7_cart.xml
index f113e754604..8acdc7b8f76 100644
--- a/hash/to7_cart.xml
+++ b/hash/to7_cart.xml
@@ -28,7 +28,7 @@
</dataarea>
</part>
</software>
-
+
<software name="6809langb" cloneof="6809lang">
<description>6809 Language Module (v1.0)</description>
<year>1984</year>
@@ -52,7 +52,7 @@
</dataarea>
</part>
</software>
-
+
<software name="airbus">
<description>Airbus</description>
<year>1984</year>
@@ -64,7 +64,7 @@
</dataarea>
</part>
</software>
-
+
<software name="atomium">
<description>Atomium</description>
<year>1982</year>
@@ -76,7 +76,7 @@
</dataarea>
</part>
</software>
-
+
<software name="basic">
<description>BASIC (v1.0)</description>
<year>1982</year>
@@ -88,7 +88,7 @@
</dataarea>
</part>
</software>
-
+
<software name="blitz">
<description>Blitz!</description>
<year>1984</year>
@@ -104,15 +104,15 @@
<software name="budgfami">
<description>Budget Familial</description>
<year>1982</year>
- <publisher>Answare</publisher>
-
+ <publisher>Answare</publisher>
+
<part name="cart" interface="to7_cart">
<dataarea name="rom" size="16384">
<rom name="bf.7001.bin" size="16384" crc="193a8b14" sha1="82d3f56cd9c27ee80decf722a9e107761b42851e" offset="0x0000" />
</dataarea>
</part>
</software>
-
+
<software name="caractr2">
<description>Caractor II</description>
<year>1984</year>
@@ -124,7 +124,7 @@
</dataarea>
</part>
</software>
-
+
<software name="caractor">
<description>Caractor</description>
<year>1983</year>
@@ -136,7 +136,7 @@
</dataarea>
</part>
</software>
-
+
<software name="choplift">
<description>Choplifter</description>
<year>1985</year>
@@ -160,7 +160,7 @@
</dataarea>
</part>
</software>
-
+
<software name="clrpaint">
<description>Colorpaint</description>
<year>1985</year>
@@ -184,7 +184,7 @@
</dataarea>
</part>
</software>
-
+
<software name="controle">
<description>Controle Aerien</description>
<year>1984</year>
@@ -196,7 +196,7 @@
</dataarea>
</part>
</software>
-
+
<software name="crypto">
<description>Crypto</description>
<year>1982</year>
@@ -245,7 +245,7 @@
</dataarea>
</part>
</software>
-
+
<software name="gemini">
<description>Gemini</description>
<year>1982</year>
@@ -256,8 +256,8 @@
<rom name="gemini (1982)(vifi-nathan)(fr).bin" size="4096" crc="c20c1d82" sha1="92ee16ef7d14b241e8df390b0e6192810a8eda40" offset="0x0000" />
</dataarea>
</part>
- </software>
-
+ </software>
+
<software name="gerfiche">
<description>Gerez vos Fiches</description>
<year>1984</year>
@@ -280,8 +280,8 @@
<rom name="gerez vos fiches (answare) (inconnus) (1984) (memo7).bin" size="16384" crc="f3ad6a2c" sha1="396427d6fcf22a69c5de6a4873e20a5b3b7062f9" offset="0x0000" />
</dataarea>
</part>
- </software>
-
+ </software>
+
<software name="gerteque">
<description>Gerez Votre Bibliotheque-Discotheque-Videotheque</description>
<year>1983</year>
@@ -292,8 +292,8 @@
<rom name="gerez votre bibliotheque-discotheque-videotheque (1983)(answare)(fr).bin" size="8192" crc="cb6f0f85" sha1="56ce86e414a7debdadac4a416bad4c70d289be95" offset="0x0000" />
</dataarea>
</part>
- </software>
-
+ </software>
+
<software name="chiflett">
<description>Les Chiffres et les Lettres</description>
<year>1984</year>
@@ -305,7 +305,7 @@
</dataarea>
</part>
</software>
-
+
<software name="logicod">
<description>Logicod</description>
<year>1982</year>
@@ -317,7 +317,7 @@
</dataarea>
</part>
</software>
-
+
<software name="logo">
<description>LOGO (v1.0)</description>
<year>1984</year>
@@ -353,7 +353,7 @@
</dataarea>
</part>
</software>
-
+
<software name="lsegedl">
<description>LSEG-EDL (v3.51)</description>
<year>1985</year>
@@ -401,7 +401,7 @@
</dataarea>
</part>
</software>
-
+
<software name="melodia">
<description>Melodia</description>
<year>1982</year>
@@ -450,7 +450,7 @@
</dataarea>
</part>
</software>
-
+
<software name="pictor">
<description>Pictor</description>
<year>1983</year>
@@ -464,17 +464,17 @@
</software>
<!--
- <software name="polyphon">
- <description>Polyphonia</description>
- <year>19??</year>
- <publisher>&lt;unknown&gt;</publisher>
-
- <part name="cart" interface="to7_cart">
- <dataarea name="rom" size="16384">
- <rom name="polyphonia.bin" size="16384" crc="a38e60e0" sha1="a69569db7ca416159fc7e1921a60b38d40da8c8d" offset="0x0000" />
- </dataarea>
- </part>
- </software>
+ <software name="polyphon">
+ <description>Polyphonia</description>
+ <year>19??</year>
+ <publisher>&lt;unknown&gt;</publisher>
+
+ <part name="cart" interface="to7_cart">
+ <dataarea name="rom" size="16384">
+ <rom name="polyphonia.bin" size="16384" crc="a38e60e0" sha1="a69569db7ca416159fc7e1921a60b38d40da8c8d" offset="0x0000" />
+ </dataarea>
+ </part>
+ </software>
-->
<software name="praxitel">
@@ -488,7 +488,7 @@
</dataarea>
</part>
</software>
-
+
<software name="prolog">
<description>Prolog (v1.0)</description>
<year>1986</year>
@@ -500,7 +500,7 @@
</dataarea>
</part>
</software>
-
+
<software name="quest">
<description>Quest</description>
<year>1983</year>
@@ -512,7 +512,7 @@
</dataarea>
</part>
</software>
-
+
<software name="scriptor">
<description>Scriptor</description>
<year>1984</year>
@@ -560,7 +560,7 @@
</dataarea>
</part>
</software>
-
+
<software name="threshld">
<description>Threshold</description>
<year>1984</year>
diff --git a/hash/tvc_cass.xml b/hash/tvc_cass.xml
index 7b265e3f822..89fecbecbad 100644
--- a/hash/tvc_cass.xml
+++ b/hash/tvc_cass.xml
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
-<!--
- If you want to use these cassettes, you must remove the hbf floppy interface from the slot devices.
- After doing so, mount the cassette and load with the "LOAD" command. In most cases the program will
- auto-start.
+<!--
+ If you want to use these cassettes, you must remove the hbf floppy interface from the slot devices.
+ After doing so, mount the cassette and load with the "LOAD" command. In most cases the program will
+ auto-start.
- NOTE: The multipart sets in TOSEC are from floppy-based games and cannot be loaded via cassette.
- So, they are not listed here.
+ NOTE: The multipart sets in TOSEC are from floppy-based games and cannot be loaded via cassette.
+ So, they are not listed here.
-->
<softwarelist name="tvc_cass" description="Videoton TVC cassettes">
<software name="advgame">
@@ -1388,7 +1388,7 @@
</dataarea>
</part>
</software>
-
+
<software name="labirnt1">
<description>Labirintus (Zoltán Gugi)</description>
<year>198?</year>
diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml
index 1a1e316d1b3..fa2284d1ca2 100644
--- a/hash/vsmile_cart.xml
+++ b/hash/vsmile_cart.xml
@@ -10,7 +10,7 @@ NOTE: This list is here only to document available dumps and it's not used (yet)
V.Smile Motion: 80-08**** (Smartridges are orange)
V.Smile Smartbook Software: 80-089*** (Smartridges are red)
V.Smile: 80-09**** (Smartridges are purple, some are gray because of plastic defects)
-V.Smile Baby 80-099*** (Smartridges are yellow, incompatible with TV based V.Smile consoles)
+V.Smile Baby 80-099*** (Smartridges are yellow, incompatible with TV based V.Smile consoles)
Addons (w/ yellow Smartridges)
@@ -25,7 +25,7 @@ V.Smile PC Pal Island 80-036822(SP) (cart)
V.Smile Art Studio 80-67000(US)
V.Smile Art Studio 80-67003(UK)
-V.Smile Zeichenatelier (Magic Malboard) 80-67004(GE)
+V.Smile Zeichenatelier (Magic Malboard) 80-67004(GE)
V.Smile Studio De Dessin 80-67005(FR)
V.Smile Estudio de Arte ORG 80-67022(SP)
V.Smile Estudio de Arte PINK 80-67057(SP)
@@ -40,7 +40,7 @@ V.Smile Gimnasio Interactivo 80-91327(SP)
Language:
********0 = US (White labels on back)
-********1 = Italy Apparently distributed by company 'Giochi Preziosi'
+********1 = Italy Apparently distributed by company 'Giochi Preziosi'
********2 = Netherlands (Red or White labels on back)
********3 = UK (Red labels on back)
********4 = Germany (Blue labels on back)
@@ -49,8 +49,8 @@ Language:
********7 = Spain (Green labels on back)
80-084000(US) | Action Mania
- (IT) | ?????
-80-084002(NL) | Sports Games
+ (IT) | ?????
+80-084002(NL) | Sports Games
80-084003(UK) | Action Mania
80-084004(GE) | Sportskanone
80-084005(FR) | Sporti Folies
@@ -143,7 +143,7 @@ Language:
80-084322(NL) | TinkerBell
80-084323(UK) | TinkerBell
80-084324(GE) | TinkerBell
-80-084325(FR) | La fee Clochette
+80-084325(FR) | La fee Clochette
80-084326(PT) | Sininho (84336 on cart)
80-084327(SP) | Campanilla
-
@@ -160,7 +160,7 @@ Language:
80-084364(GE) | Meister Manny's Werkzeugkiste
80-084365(FR) | Manny Et Ses Outils
80-084366(PT) | Manny Maozinhas (84376 on cart)
-80-084367(SP) | Manny Manitas
+80-084367(SP) | Manny Manitas
-
80-084380(US) | Winnie the Pooh - The Honey Hunt
(IT) | Winnie the Pooh - e la caccia al miele ???
@@ -186,8 +186,8 @@ Language:
80-084425(FR) | Toy Story 3
80-084427(SP) | Toy Story 3
-
-80-084440(US) | Monsters vs. Aliens
-80-084442(NL) | Monsters vs. Aliens
+80-084440(US) | Monsters vs. Aliens
+80-084442(NL) | Monsters vs. Aliens
80-084443(UK) | Monsters vs. Aliens
80-084444(GE) | Monsters vs. Aliens
80-084445(FR) | Monsters vs. Aliens
@@ -299,7 +299,7 @@ Oldest Smartidges start here
80-092004(GE) | Abenteuer im ABC Park
80-092005(FR) | ABC Land Aventure
80-092006(PT) | ABC Adventure (EAN is 3417768920162 cart#92016)
-80-092007(SP) | Aventuras en el Parque Alfabeto (purple)
+80-092007(SP) | Aventuras en el Parque Alfabeto (purple)
80-092007(SP) | Aventuras en el Parque Alfabeto (translucent) (No # on label)
-
80-092020(US) | The Adventures of Little Red Riding Hood
@@ -308,12 +308,12 @@ Oldest Smartidges start here
80-092025(FR) | Les aventures du Le Petit Chaperon Rouge
-
80-092040(US) | Learnin' Wheels (blue car with guy driving)
-80-092043(UK) | Learnin' Wheels
+80-092043(UK) | Learnin' Wheels
80-092044(GE) | Freds Zahlen Rally (note to self, guy in blue car wrong serial#) 80-092924(GE) on label
80-092045(FR) | Apprenti' Pilote
-
80-092060(US) | Winnie The Pooh: The Honey Hunt
- (IT) | Winnie the Pooh - e la caccia al miele
+ (IT) | Winnie the Pooh - e la caccia al miele
80-092062(NL) | Winnie de Poeh - De winderwereld van Poeh
80-092063(UK) | Winnie The Pooh: The Honey Hunt
80-092064(GE) | Pooh - Die Honigjagd
@@ -344,12 +344,12 @@ Oldest Smartidges start here
80-092107(SP) | Rey Leon - La Gran Aventura de Simba
-
80-092120(US) | The Little Mermaid - Ariel's Majestic Journey
-80-092121(IT) | Sirenetta - Ariel e le
+80-092121(IT) | Sirenetta - Ariel e le
80-092122(NL) | De Kleine Zeemeermin - De Wunderwereld von Ariel
80-092123(UK) | The Little Mermaid - Ariel's Majestic Journey
80-092124(GE) | Arielle die Meerjungfrau - Arielles aufregendes Abenteuer
80-092125(FR) | La Petite Sirene - Ariel devient une princesse
-80-092126(PT) |
+80-092126(PT) |
80-092127(SP) | La Sirenita - El Vieje Fantastico de Ariel
-
80-092140(US) | Spider-Man & Friends - Secret Missions
@@ -370,7 +370,7 @@ Oldest Smartidges start here
(IT) | Scooby-Doo! - Avventura e Funland
80-092162(NL) | Scooby-Doo griezelen in het pretpark
80-092163(UK) | Scooby-Doo! - Funland Frenzy
-80-092163-103(UK) | Scooby-Doo! - Funland Frenzy
+80-092163-103(UK) | Scooby-Doo! - Funland Frenzy
80-092163-293(UK) | Scooby-Doo! - Funland Frenzy (Yellow, only Scooby on label might be motion version)
80-092165(FR) | Scooby-Doo! - Panique a Funland
80-092165(FR) | Scooby-Doo! - Panique a Funland (translucent purple, packin)
@@ -379,7 +379,7 @@ Oldest Smartidges start here
80-092180(US) | Care Bears - A Lesson in Caring
80-092183(UK) | Care Bears - A Lesson in Caring
80-092184(GE) | Gluecksbarchis <- existance not proven
-80-092185(FR) | Les Bisounours - Le Monde Merveilleux des Bisounours
+80-092185(FR) | Les Bisounours - Le Monde Merveilleux des Bisounours
80-092187(SP) | Osos Amorosos - Una Leccion de Amor
-
80-092200(US) | Aladdin - Aladdin's Wonders of the World
@@ -570,12 +570,12 @@ Oldest Smartidges start here
80-092827(SP) | Campeonato de Futbol
-
80-092840(US) | Wall-E
- (IT) | Wall-E (GPZ07996)
+ (IT) | Wall-E (GPZ07996)
80-092842(NL) | Wall-E
80-092843(UK) | Wall-E
80-092844(GE) | Wall-E
80-092845(FR) | Wall-E
-80-092847(SP) | Wall-E
+80-092847(SP) | Wall-E
-
80-092860(US) | Shrek the Third: Arthur's School Day Adventure
(IT) | Shrek Terzo L'Advventura Do Artu in un Giorno di Scuola
diff --git a/src/emu/bus/a2bus/a2bus.h b/src/emu/bus/a2bus/a2bus.h
index 7444df4151c..a440ef0c83c 100644
--- a/src/emu/bus/a2bus/a2bus.h
+++ b/src/emu/bus/a2bus/a2bus.h
@@ -16,13 +16,13 @@
#include "emu.h"
// /INH special addresses
-#define INH_START_INVALID 0xffff;
-#define INH_END_INVALID 0x0000;
+#define INH_START_INVALID 0xffff;
+#define INH_END_INVALID 0x0000;
-// /INH types
-#define INH_NONE 0x00
-#define INH_READ 0x01
-#define INH_WRITE 0x02
+// /INH types
+#define INH_NONE 0x00
+#define INH_READ 0x01
+#define INH_WRITE 0x02
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
@@ -120,7 +120,7 @@ protected:
devcb_write_line m_out_irq_cb;
devcb_write_line m_out_nmi_cb;
- devcb_write8 m_out_inh_cb;
+ devcb_write8 m_out_inh_cb;
device_a2bus_card_interface *m_device_list[8];
const char *m_cputag;
diff --git a/src/emu/bus/a2bus/a2eext80col.c b/src/emu/bus/a2bus/a2eext80col.c
index b6bd2443489..f4ffbb0505e 100644
--- a/src/emu/bus/a2bus/a2eext80col.c
+++ b/src/emu/bus/a2bus/a2eext80col.c
@@ -71,4 +71,3 @@ UINT8 *a2eaux_ext80col_device::get_auxbank_ptr()
{
return &m_ram[0];
}
-
diff --git a/src/emu/bus/a2bus/a2estd80col.c b/src/emu/bus/a2bus/a2estd80col.c
index 5bffdc11af6..2bfcef11a8c 100644
--- a/src/emu/bus/a2bus/a2estd80col.c
+++ b/src/emu/bus/a2bus/a2estd80col.c
@@ -78,4 +78,3 @@ UINT8 *a2eaux_std80col_device::get_auxbank_ptr()
{
return &m_ram[0];
}
-
diff --git a/src/emu/bus/a2bus/a2swyft.c b/src/emu/bus/a2bus/a2swyft.c
index 1547814ec68..a7e011bd1c3 100644
--- a/src/emu/bus/a2bus/a2swyft.c
+++ b/src/emu/bus/a2bus/a2swyft.c
@@ -74,7 +74,7 @@ void a2bus_swyft_device::device_reset()
{
m_rombank = 0;
- m_inh_state = INH_READ; // read-enable the ROM
+ m_inh_state = INH_READ; // read-enable the ROM
recalc_slot_inh();
}
@@ -146,4 +146,3 @@ int a2bus_swyft_device::inh_type()
{
return m_inh_state;
}
-
diff --git a/src/emu/bus/a2bus/ramcard128k.c b/src/emu/bus/a2bus/ramcard128k.c
index e78dde368e9..3b05128e186 100644
--- a/src/emu/bus/a2bus/ramcard128k.c
+++ b/src/emu/bus/a2bus/ramcard128k.c
@@ -126,11 +126,11 @@ void a2bus_ssramcard_device::do_io(int offset)
}
#if 0
- printf("LC: (ofs %x) new state %c%c dxxx=%04x main=%05x\n",
- offset,
- (m_inh_state & INH_READ) ? 'R' : 'x',
- (m_inh_state & INH_WRITE) ? 'W' : 'x',
- m_dxxx_bank, m_main_bank);
+ printf("LC: (ofs %x) new state %c%c dxxx=%04x main=%05x\n",
+ offset,
+ (m_inh_state & INH_READ) ? 'R' : 'x',
+ (m_inh_state & INH_WRITE) ? 'W' : 'x',
+ m_dxxx_bank, m_main_bank);
#endif
}
@@ -157,7 +157,7 @@ void a2bus_ssramcard_device::write_c0nx(address_space &space, UINT8 offset, UINT
UINT8 a2bus_ssramcard_device::read_inh_rom(address_space &space, UINT16 offset)
{
- assert(m_inh_state & INH_READ); // this should never happen
+ assert(m_inh_state & INH_READ); // this should never happen
if (offset < 0xe000)
{
@@ -188,4 +188,3 @@ int a2bus_ssramcard_device::inh_type()
{
return m_inh_state;
}
-
diff --git a/src/emu/bus/a2bus/ramcard16k.c b/src/emu/bus/a2bus/ramcard16k.c
index dc731cfb06e..a25ba79423f 100644
--- a/src/emu/bus/a2bus/ramcard16k.c
+++ b/src/emu/bus/a2bus/ramcard16k.c
@@ -107,10 +107,10 @@ void a2bus_ramcard_device::do_io(int offset)
}
#if 0
- printf("LC: new state %c%c dxxx=%04x\n",
- (m_inh_state & INH_READ) ? 'R' : 'x',
- (m_inh_state & INH_WRITE) ? 'W' : 'x',
- m_dxxx_bank);
+ printf("LC: new state %c%c dxxx=%04x\n",
+ (m_inh_state & INH_READ) ? 'R' : 'x',
+ (m_inh_state & INH_WRITE) ? 'W' : 'x',
+ m_dxxx_bank);
#endif
}
@@ -137,7 +137,7 @@ void a2bus_ramcard_device::write_c0nx(address_space &space, UINT8 offset, UINT8
UINT8 a2bus_ramcard_device::read_inh_rom(address_space &space, UINT16 offset)
{
- assert(m_inh_state & INH_READ); // this should never happen
+ assert(m_inh_state & INH_READ); // this should never happen
if (offset < 0xe000)
{
@@ -168,4 +168,3 @@ int a2bus_ramcard_device::inh_type()
{
return m_inh_state;
}
-
diff --git a/src/emu/bus/astrocde/exp.h b/src/emu/bus/astrocde/exp.h
index bbd8c0b6465..3acbe2590d0 100644
--- a/src/emu/bus/astrocde/exp.h
+++ b/src/emu/bus/astrocde/exp.h
@@ -34,7 +34,7 @@ public:
virtual void device_start();
bool get_card_mounted() { return m_card_mounted; }
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
diff --git a/src/emu/bus/astrocde/ram.c b/src/emu/bus/astrocde/ram.c
index 41f79e176e9..4aae888cba6 100644
--- a/src/emu/bus/astrocde/ram.c
+++ b/src/emu/bus/astrocde/ram.c
@@ -19,7 +19,7 @@
mapped to the cartridge memory starting at $2000. So it would be possible to
load a cartridge program from tape into the expansion memory, then flip the range
switch and run it as a cartridge. This is useful for cartridge development.
-
+
Blue RAM -- available in 4K, 16K, and 32K. These also use an INS8154 chip,
(not yet implemented) which has an additional $80 bytes of RAM mapped
immediately after the end of the expansion address space. This memory
@@ -29,17 +29,17 @@
past this range)
16K: $6000 to $9FFF
32K: $6000 to $DFFF
-
+
VIPER System 1 -- This is available in 16K only. It also includes a keyboard (not implemented).
16K: $6000 to $9FFF
-
+
Lil' WHITE RAM -- This is available in 32K only. Attempts to read and write
to memory outside of its address range ($D000 to $FFFF) are mapped to the expansion
memory $5000 to $7FFF. The current implementation won't allow the shadow RAM area
to be accessed when RAM protect is on, but there is no known software that will
access the upper range of the expansion RAM when RAM protect is enabled.
32K: $5000 to $CFFF
-
+
R&L 64K RAM Board -- This is a highly configurable kit. RAM can be installed in
2K increments. So, the entire 44K expansion memory can be filled. It is also
possible to override the rest of the memory map with RAM (not implemented).
@@ -48,7 +48,7 @@
installing switches. The ranges are $0000 to $0FFF (first 4K), $0000 to $3FFF (first 16K),
and $0000 to $FFFF (all 64K). The current implementation is for 44K expansion memory mapped from
$5000 to $FFFF, with only a single write protect covering this entire range.
-
+
***********************************************************************************************************/
@@ -209,5 +209,3 @@ WRITE8_MEMBER(astrocade_rl64ram_device::write)
if (!m_write_prot->read())
m_ram[offset] = data;
}
-
-
diff --git a/src/emu/bus/astrocde/ram.h b/src/emu/bus/astrocde/ram.h
index 8434249cdee..c99fec58aa2 100644
--- a/src/emu/bus/astrocde/ram.h
+++ b/src/emu/bus/astrocde/ram.h
@@ -37,7 +37,7 @@ class astrocade_blueram_16k_device : public astrocade_blueram_4k_device
public:
// construction/destruction
astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual void device_start() { m_ram.resize(0x4000); save_item(NAME(m_ram)); }
};
@@ -48,7 +48,7 @@ class astrocade_blueram_32k_device : public astrocade_blueram_4k_device
public:
// construction/destruction
astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual void device_start() { m_ram.resize(0x8000); save_item(NAME(m_ram)); }
};
@@ -60,7 +60,7 @@ class astrocade_viper_sys1_device : public device_t,
public:
// construction/destruction
astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start() { m_ram.resize(0x4000); save_item(NAME(m_ram)); }
virtual void device_reset() {}
@@ -69,7 +69,7 @@ public:
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
-
+
private:
dynamic_buffer m_ram;
required_ioport m_write_prot;
@@ -83,16 +83,16 @@ class astrocade_whiteram_device : public device_t,
public:
// construction/destruction
astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start() { m_ram.resize(0x8000); save_item(NAME(m_ram)); }
virtual void device_reset() {}
virtual ioport_constructor device_input_ports() const;
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
-
+
private:
dynamic_buffer m_ram;
required_ioport m_write_prot;
@@ -106,16 +106,16 @@ class astrocade_rl64ram_device : public device_t,
public:
// construction/destruction
astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start() { m_ram.resize(0xb000); save_item(NAME(m_ram)); }
virtual void device_reset() {}
virtual ioport_constructor device_input_ports() const;
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read);
virtual DECLARE_WRITE8_MEMBER(write);
-
+
private:
dynamic_buffer m_ram;
required_ioport m_write_prot;
diff --git a/src/emu/bus/astrocde/rom.c b/src/emu/bus/astrocde/rom.c
index 3f76b024df0..25ef8123666 100644
--- a/src/emu/bus/astrocde/rom.c
+++ b/src/emu/bus/astrocde/rom.c
@@ -80,21 +80,20 @@ READ8_MEMBER(astrocade_rom_device::read_rom)
READ8_MEMBER(astrocade_rom_256k_device::read_rom)
{
- if (offset < 0x1000) // 0x2000-0x2fff
+ if (offset < 0x1000) // 0x2000-0x2fff
return m_rom[offset + 0x1000 * 0x3f];
- else if (offset < 0x1fc0) // 0x3000-0x3fbf
+ else if (offset < 0x1fc0) // 0x3000-0x3fbf
return m_rom[(offset & 0xfff) + (0x1000 * m_base_bank)];
- else // 0x3fc0-0x3fff
+ else // 0x3fc0-0x3fff
return m_base_bank = offset & 0x3f;
}
READ8_MEMBER(astrocade_rom_512k_device::read_rom)
{
- if (offset < 0x1000) // 0x2000-0x2fff
+ if (offset < 0x1000) // 0x2000-0x2fff
return m_rom[offset + 0x1000 * 0x7f];
- else if (offset < 0x1f80) // 0x3000-0x3fbf
+ else if (offset < 0x1f80) // 0x3000-0x3fbf
return m_rom[(offset & 0xfff) + (0x1000 * m_base_bank)];
- else // 0x3fc0-0x3fff
+ else // 0x3fc0-0x3fff
return m_base_bank = offset & 0x7f;
}
-
diff --git a/src/emu/bus/astrocde/rom.h b/src/emu/bus/astrocde/rom.h
index 4c30038dfce..64fd9f3d7ac 100644
--- a/src/emu/bus/astrocde/rom.h
+++ b/src/emu/bus/astrocde/rom.h
@@ -31,13 +31,13 @@ class astrocade_rom_256k_device : public astrocade_rom_device
public:
// construction/destruction
astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual void device_start();
virtual void device_reset();
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
-
+
private:
UINT8 m_base_bank;
};
@@ -49,13 +49,13 @@ class astrocade_rom_512k_device : public astrocade_rom_device
public:
// construction/destruction
astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual void device_start();
virtual void device_reset();
-
+
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
-
+
private:
UINT8 m_base_bank;
};
diff --git a/src/emu/bus/astrocde/slot.c b/src/emu/bus/astrocde/slot.c
index 08895cbd569..5b70beff977 100644
--- a/src/emu/bus/astrocde/slot.c
+++ b/src/emu/bus/astrocde/slot.c
@@ -207,7 +207,7 @@ void astrocade_cart_slot_device::get_default_card_software(astring &result)
const char *slot_string = "rom";
UINT32 size = core_fsize(m_file);
int type = ASTROCADE_STD;
-
+
if (size == 0x40000)
type = ASTROCADE_256K;
if (size == 0x80000)
@@ -236,4 +236,3 @@ READ8_MEMBER(astrocade_cart_slot_device::read_rom)
else
return 0xff;
}
-
diff --git a/src/emu/bus/centronics/epson_lx810l.h b/src/emu/bus/centronics/epson_lx810l.h
index 29f80e803e4..6c40abf50fb 100644
--- a/src/emu/bus/centronics/epson_lx810l.h
+++ b/src/emu/bus/centronics/epson_lx810l.h
@@ -28,15 +28,15 @@
// ======================> epson_lx810l_t
class epson_lx810l_t : public device_t,
- public device_centronics_peripheral_interface
+ public device_centronics_peripheral_interface
{
public:
// construction/destruction
epson_lx810l_t(const machine_config &mconfig, const char *tag,
- device_t *owner, UINT32 clock);
+ device_t *owner, UINT32 clock);
epson_lx810l_t(const machine_config &mconfig, device_type type,
- const char *name, const char *tag, device_t *owner,
- UINT32 clock, const char *shortname, const char *source);
+ const char *name, const char *tag, device_t *owner,
+ UINT32 clock, const char *shortname, const char *source);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
@@ -103,7 +103,7 @@ class epson_ap2000_t : public epson_lx810l_t
public:
// construction/destruction
epson_ap2000_t(const machine_config &mconfig, const char *tag,
- device_t *owner, UINT32 clock);
+ device_t *owner, UINT32 clock);
// optional information overrides
virtual const rom_entry *device_rom_region() const;
diff --git a/src/emu/bus/coco/coco_dwsock.c b/src/emu/bus/coco/coco_dwsock.c
index aff17ae2929..c0228bef3cc 100644
--- a/src/emu/bus/coco/coco_dwsock.c
+++ b/src/emu/bus/coco/coco_dwsock.c
@@ -24,8 +24,8 @@ const device_type COCO_DWSOCK = &device_creator<beckerport_device>;
INPUT_PORTS_START( coco_drivewire )
PORT_START(DRIVEWIRE_PORT_TAG)
- PORT_CONFNAME( 0xffff, 65504, "Drivewire Server TCP Port")
- PORT_CHANGED_MEMBER(DEVICE_SELF, beckerport_device, drivewire_port_changed, NULL )
+ PORT_CONFNAME( 0xffff, 65504, "Drivewire Server TCP Port")
+ PORT_CHANGED_MEMBER(DEVICE_SELF, beckerport_device, drivewire_port_changed, NULL )
PORT_CONFSETTING( 65500, "65500" )
PORT_CONFSETTING( 65501, "65501" )
PORT_CONFSETTING( 65502, "65502" )
@@ -52,7 +52,7 @@ ioport_constructor beckerport_device::device_input_ports() const
//-------------------------------------------------
INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed)
{
- this->update_port();
+ this->update_port();
}
//**************************************************************************
@@ -64,18 +64,18 @@ INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed)
//-------------------------------------------------
beckerport_device::beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__),
- m_dwconfigport(*this, DRIVEWIRE_PORT_TAG)
+ : device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__),
+ m_dwconfigport(*this, DRIVEWIRE_PORT_TAG)
{
- m_pSocket = NULL;
- m_head = 0;
- m_rx_pending = 0;
+ m_pSocket = NULL;
+ m_head = 0;
+ m_rx_pending = 0;
}
beckerport_device::~beckerport_device()
{
- if (m_pSocket != NULL)
- device_stop();
+ if (m_pSocket != NULL)
+ device_stop();
}
/*-------------------------------------------------
@@ -84,22 +84,22 @@ beckerport_device::~beckerport_device()
void beckerport_device::device_start(void)
{
- char chAddress[64];
+ char chAddress[64];
- /* format address string for opening the port */
- snprintf(chAddress, sizeof(chAddress), "socket.%s:%d", m_hostname, m_dwtcpport);
+ /* format address string for opening the port */
+ snprintf(chAddress, sizeof(chAddress), "socket.%s:%d", m_hostname, m_dwtcpport);
- fprintf(stderr, "Connecting to Drivewire server on %s:%d... ", m_hostname, m_dwtcpport);
+ fprintf(stderr, "Connecting to Drivewire server on %s:%d... ", m_hostname, m_dwtcpport);
- UINT64 filesize; // unused
- file_error filerr = osd_open(chAddress, 0, &m_pSocket, &filesize);
- if (filerr != FILERR_NONE)
- {
- fprintf(stderr, "Error: osd_open returned error %i!\n", (int) filerr);
- return;
- }
+ UINT64 filesize; // unused
+ file_error filerr = osd_open(chAddress, 0, &m_pSocket, &filesize);
+ if (filerr != FILERR_NONE)
+ {
+ fprintf(stderr, "Error: osd_open returned error %i!\n", (int) filerr);
+ return;
+ }
- fprintf(stderr, "Connected!\n");
+ fprintf(stderr, "Connected!\n");
}
/*-------------------------------------------------
@@ -108,12 +108,12 @@ void beckerport_device::device_start(void)
void beckerport_device::device_stop(void)
{
- if (m_pSocket != NULL)
- {
- printf("Closing connection to Drivewire server\n");
- osd_close(m_pSocket);
- m_pSocket = NULL;
- }
+ if (m_pSocket != NULL)
+ {
+ printf("Closing connection to Drivewire server\n");
+ osd_close(m_pSocket);
+ m_pSocket = NULL;
+ }
}
/*-------------------------------------------------
@@ -132,40 +132,40 @@ void beckerport_device::device_config_complete(void)
READ8_MEMBER(beckerport_device::read)
{
- unsigned char data = 0x5a;
-
- if (m_pSocket == NULL)
- return data;
-
- switch (offset)
- {
- case DWS_STATUS:
- if (!m_rx_pending)
- {
- /* Try to read from dws */
- file_error filerr = osd_read(m_pSocket, m_buf, 0, sizeof(m_buf), &m_rx_pending);
- if (filerr != FILERR_NONE && filerr != FILERR_FAILURE) // FILERR_FAILURE means no data available, so don't throw error message
- fprintf(stderr, "coco_dwsock.c: beckerport_device::read() socket read operation failed with file_error %i\n", filerr);
- else
- m_head = 0;
- }
- //printf("beckerport_device: status read. %i bytes remaining.\n", m_rx_pending);
- data = (m_rx_pending > 0) ? 2 : 0;
- break;
- case DWS_DATA:
- if (!m_rx_pending) {
- fprintf(stderr, "coco_dwsock.c: beckerport_device::read() buffer underrun\n");
- break;
- }
- data = m_buf[m_head++];
- m_rx_pending--;
- //printf("beckerport_device: data read 1 byte (0x%02x). %i bytes remaining.\n", data&0xff, m_rx_pending);
- break;
- default:
- fprintf(stderr, "%s: read from bad offset %d\n", __FILE__, offset);
- }
-
- return (int)data;
+ unsigned char data = 0x5a;
+
+ if (m_pSocket == NULL)
+ return data;
+
+ switch (offset)
+ {
+ case DWS_STATUS:
+ if (!m_rx_pending)
+ {
+ /* Try to read from dws */
+ file_error filerr = osd_read(m_pSocket, m_buf, 0, sizeof(m_buf), &m_rx_pending);
+ if (filerr != FILERR_NONE && filerr != FILERR_FAILURE) // FILERR_FAILURE means no data available, so don't throw error message
+ fprintf(stderr, "coco_dwsock.c: beckerport_device::read() socket read operation failed with file_error %i\n", filerr);
+ else
+ m_head = 0;
+ }
+ //printf("beckerport_device: status read. %i bytes remaining.\n", m_rx_pending);
+ data = (m_rx_pending > 0) ? 2 : 0;
+ break;
+ case DWS_DATA:
+ if (!m_rx_pending) {
+ fprintf(stderr, "coco_dwsock.c: beckerport_device::read() buffer underrun\n");
+ break;
+ }
+ data = m_buf[m_head++];
+ m_rx_pending--;
+ //printf("beckerport_device: data read 1 byte (0x%02x). %i bytes remaining.\n", data&0xff, m_rx_pending);
+ break;
+ default:
+ fprintf(stderr, "%s: read from bad offset %d\n", __FILE__, offset);
+ }
+
+ return (int)data;
}
/*-------------------------------------------------
@@ -174,26 +174,26 @@ READ8_MEMBER(beckerport_device::read)
WRITE8_MEMBER(beckerport_device::write)
{
- char d = (char)data;
- file_error filerr;
-
- if (m_pSocket == NULL)
- return;
-
- switch (offset)
- {
- case DWS_STATUS:
- //printf("beckerport_write: error: write (0x%02x) to status register\n", d);
- break;
- case DWS_DATA:
- filerr = osd_write(m_pSocket, &d, 0, 1, NULL);
- if (filerr != FILERR_NONE)
- fprintf(stderr, "coco_dwsock.c: beckerport_device::write() socket write operation failed with file_error %i\n", filerr);
- //printf("beckerport_write: data write one byte (0x%02x)\n", d & 0xff);
- break;
- default:
- fprintf(stderr, "%s: write to bad offset %d\n", __FILE__, offset);
- }
+ char d = (char)data;
+ file_error filerr;
+
+ if (m_pSocket == NULL)
+ return;
+
+ switch (offset)
+ {
+ case DWS_STATUS:
+ //printf("beckerport_write: error: write (0x%02x) to status register\n", d);
+ break;
+ case DWS_DATA:
+ filerr = osd_write(m_pSocket, &d, 0, 1, NULL);
+ if (filerr != FILERR_NONE)
+ fprintf(stderr, "coco_dwsock.c: beckerport_device::write() socket write operation failed with file_error %i\n", filerr);
+ //printf("beckerport_write: data write one byte (0x%02x)\n", d & 0xff);
+ break;
+ default:
+ fprintf(stderr, "%s: write to bad offset %d\n", __FILE__, offset);
+ }
}
/*-------------------------------------------------
@@ -202,8 +202,7 @@ WRITE8_MEMBER(beckerport_device::write)
void beckerport_device::update_port(void)
{
- device_stop();
- m_dwtcpport = m_dwconfigport->read_safe(65504);
- device_start();
+ device_stop();
+ m_dwtcpport = m_dwconfigport->read_safe(65504);
+ device_start();
}
-
diff --git a/src/emu/bus/coco/coco_dwsock.h b/src/emu/bus/coco/coco_dwsock.h
index 9abbc240244..0006a091cdc 100644
--- a/src/emu/bus/coco/coco_dwsock.h
+++ b/src/emu/bus/coco/coco_dwsock.h
@@ -23,33 +23,33 @@
class beckerport_device : public device_t
{
public:
- beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- virtual ~beckerport_device();
+ beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ virtual ~beckerport_device();
- // optional information overrides
- virtual ioport_constructor device_input_ports() const;
+ // optional information overrides
+ virtual ioport_constructor device_input_ports() const;
- virtual void device_start(void);
- virtual void device_stop(void);
- virtual void device_config_complete(void);
+ virtual void device_start(void);
+ virtual void device_stop(void);
+ virtual void device_config_complete(void);
- void update_port(void);
+ void update_port(void);
- // driver update handlers
- DECLARE_INPUT_CHANGED_MEMBER(drivewire_port_changed);
+ // driver update handlers
+ DECLARE_INPUT_CHANGED_MEMBER(drivewire_port_changed);
- virtual DECLARE_READ8_MEMBER(read);
- virtual DECLARE_WRITE8_MEMBER(write);
+ virtual DECLARE_READ8_MEMBER(read);
+ virtual DECLARE_WRITE8_MEMBER(write);
- // types
- enum dwsock_ports {
- DWS_STATUS,
- DWS_DATA
- };
+ // types
+ enum dwsock_ports {
+ DWS_STATUS,
+ DWS_DATA
+ };
private:
- /* IP hostname */
- const char * m_hostname;
+ /* IP hostname */
+ const char * m_hostname;
/* IP port */
required_ioport m_dwconfigport;
@@ -69,4 +69,3 @@ extern const device_type COCO_DWSOCK;
typedef device_type_iterator<&device_creator<beckerport_device>, beckerport_device> beckerport_device_iterator;
#endif /* _DWSOCK_H_ */
-
diff --git a/src/emu/bus/cpc/playcity.c b/src/emu/bus/cpc/playcity.c
index e6803ffb049..161213b1582 100644
--- a/src/emu/bus/cpc/playcity.c
+++ b/src/emu/bus/cpc/playcity.c
@@ -1,4 +1,4 @@
-/*
+/*
PlayCity expansion device
Z80 CTC
@@ -158,4 +158,3 @@ void cpc_playcity_device::update_ymz_clock()
m_ymz2->ay_set_clock(clk);
popmessage("YMZ clocks set to %d Hz",clk);
}
-
diff --git a/src/emu/bus/cpc/playcity.h b/src/emu/bus/cpc/playcity.h
index 0f904da3bc3..0c35887e345 100644
--- a/src/emu/bus/cpc/playcity.h
+++ b/src/emu/bus/cpc/playcity.h
@@ -1,15 +1,15 @@
-/*
+/*
PlayCity expansion device
- I/O ports:
- * F880 - Z80CTC channel 0 (input is system clock (4MHz), output to YMZ294 clock)
- * F881 - Z80CTC channel 1 (input from CRTC CURSOR, output to /NMI)
- * F882 - Z80CTC channel 2 (input is system clock (4MHz), output to channel 3 input)
- * F883 - Z80CTC channel 3 (input is channel 2 output)
- * F884 - YMZ294 #1 (right) data
- * F888 - YMZ294 #2 (left) data
- * F984 - YMZ294 #1 (right) register select
- * F988 - YMZ294 #2 (left) register select
+ I/O ports:
+ * F880 - Z80CTC channel 0 (input is system clock (4MHz), output to YMZ294 clock)
+ * F881 - Z80CTC channel 1 (input from CRTC CURSOR, output to /NMI)
+ * F882 - Z80CTC channel 2 (input is system clock (4MHz), output to channel 3 input)
+ * F883 - Z80CTC channel 3 (input is channel 2 output)
+ * F884 - YMZ294 #1 (right) data
+ * F888 - YMZ294 #2 (left) data
+ * F984 - YMZ294 #1 (right) register select
+ * F988 - YMZ294 #2 (left) register select
*/
#ifndef CPC_PLAYCITY_H_
@@ -64,4 +64,3 @@ extern const device_type CPC_PLAYCITY;
#endif /* CPC_PLAYCITY_H_ */
-
diff --git a/src/emu/bus/gameboy/gb_slot.c b/src/emu/bus/gameboy/gb_slot.c
index 728905746ed..5caab4688c8 100644
--- a/src/emu/bus/gameboy/gb_slot.c
+++ b/src/emu/bus/gameboy/gb_slot.c
@@ -557,11 +557,11 @@ int base_gb_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
/* Check if we're dealing with the multigame variant of the MBC1 mapper */
if (type == GB_MBC_MBC1)
- { // bomberman collection korea
+ { // bomberman collection korea
if (ROM[0x134] == 0x42 && ROM[0x135] == 0x4f && ROM[0x136] == 0x4d && ROM[0x137] == 0x53)
type = GB_MBC_MBC1_COL;
-// if (ROM[0x13f] == 0x42 && ROM[0x140] == 0x32 && ROM[0x141] == 0x43 && ROM[0x142] == 0x4B)
-// type = GB_MBC_MBC1_COL;
+// if (ROM[0x13f] == 0x42 && ROM[0x140] == 0x32 && ROM[0x141] == 0x43 && ROM[0x142] == 0x4B)
+// type = GB_MBC_MBC1_COL;
// genjin collection
if (ROM[0x134] == 0x47 && ROM[0x135] == 0x45 && ROM[0x136] == 0x4e && ROM[0x137] == 0x43)
type = GB_MBC_MBC1_COL;
diff --git a/src/emu/bus/isa/mda.c b/src/emu/bus/isa/mda.c
index eb93ab93a75..fc2953061fc 100644
--- a/src/emu/bus/isa/mda.c
+++ b/src/emu/bus/isa/mda.c
@@ -968,7 +968,7 @@ MC6845_UPDATE_ROW( isa8_ec1840_0002_device::crtc_update_row )
{
if (m_update_row_type == -1)
return;
-
+
switch (m_update_row_type)
{
case MDA_LOWRES_TEXT_INTEN:
diff --git a/src/emu/bus/isa/xsu_cards.c b/src/emu/bus/isa/xsu_cards.c
index 992eaf222d6..d6b9a607d1d 100644
--- a/src/emu/bus/isa/xsu_cards.c
+++ b/src/emu/bus/isa/xsu_cards.c
@@ -39,13 +39,13 @@ SLOT_INTERFACE_START( mc1502_isa8_cards )
SLOT_INTERFACE_END
SLOT_INTERFACE_START( ec184x_isa8_cards )
- SLOT_INTERFACE("ec1840.0002", ISA8_EC1840_0002) // MDA with downloadable font
- SLOT_INTERFACE("ec1841.0002", ISA8_EC1841_0002) // CGA with downloadable font
+ SLOT_INTERFACE("ec1840.0002", ISA8_EC1840_0002) // MDA with downloadable font
+ SLOT_INTERFACE("ec1841.0002", ISA8_EC1841_0002) // CGA with downloadable font
SLOT_INTERFACE("ec1841.0003", ISA8_FDC_XT)
/*
- SLOT_INTERFACE("ec1841.0010", ISA8_EC1841_0010) // 8089-based HDC
- SLOT_INTERFACE("ec1841.0003", ISA8_EC1841_0003) // FDC + mouse port
- SLOT_INTERFACE("ec1841.0004", ISA8_EC1841_0004) // BSC-like serial ports + parallel port
+ SLOT_INTERFACE("ec1841.0010", ISA8_EC1841_0010) // 8089-based HDC
+ SLOT_INTERFACE("ec1841.0003", ISA8_EC1841_0003) // FDC + mouse port
+ SLOT_INTERFACE("ec1841.0004", ISA8_EC1841_0004) // BSC-like serial ports + parallel port
*/
SLOT_INTERFACE("mda", ISA8_MDA)
SLOT_INTERFACE("hdc", ISA8_HDC_EC1841)
diff --git a/src/emu/bus/pce/pce_slot.c b/src/emu/bus/pce/pce_slot.c
index 45eded53d3e..7ed13a71e6c 100644
--- a/src/emu/bus/pce/pce_slot.c
+++ b/src/emu/bus/pce/pce_slot.c
@@ -6,7 +6,7 @@
TODO:
- reimplement cart mirroring in a better way
-
+
***********************************************************************************************************/
diff --git a/src/emu/bus/pet/hsg.c b/src/emu/bus/pet/hsg.c
index 649fba69803..a5499eb2960 100644
--- a/src/emu/bus/pet/hsg.c
+++ b/src/emu/bus/pet/hsg.c
@@ -13,7 +13,7 @@
TODO:
- http://www.6502.org/users/sjgray/computer/hsg/index.html
+ http://www.6502.org/users/sjgray/computer/hsg/index.html
- version A (EF9365, 512x512 interlaced, 1 page)
- version B (EF9366, 512x256 non-interlaced, 2 pages)
diff --git a/src/emu/bus/pet/hsg.h b/src/emu/bus/pet/hsg.h
index b82d6a94dce..c99e360e739 100644
--- a/src/emu/bus/pet/hsg.h
+++ b/src/emu/bus/pet/hsg.h
@@ -26,7 +26,7 @@
// ======================> cbm8000_hsg_t
class cbm8000_hsg_t : public device_t,
- public device_pet_expansion_card_interface
+ public device_pet_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/spc1000/fdd.c b/src/emu/bus/spc1000/fdd.c
index 1a9cbb33f81..ebe1c6e90d3 100644
--- a/src/emu/bus/spc1000/fdd.c
+++ b/src/emu/bus/spc1000/fdd.c
@@ -34,18 +34,18 @@ WRITE8_MEMBER(spc1000_fdd_exp_device::i8255_c_w)
READ8_MEMBER( spc1000_fdd_exp_device::tc_r )
{
logerror("%s: tc_r\n", space.machine().describe_context());
-
+
// toggle tc on read
m_fdc->tc_w(true);
m_timer_tc->adjust(attotime::zero);
-
+
return 0xff;
}
WRITE8_MEMBER( spc1000_fdd_exp_device::control_w )
{
logerror("%s: control_w(%02x)\n", space.machine().describe_context(), data);
-
+
// bit 0, motor on signal
if (m_fd0)
m_fd0->mon_w(!BIT(data, 0));
@@ -150,7 +150,7 @@ void spc1000_fdd_exp_device::device_start()
{
m_timer_tc = timer_alloc(TIMER_TC);
m_timer_tc->adjust(attotime::never);
-
+
m_fd0 = subdevice<floppy_connector>("upd765:0")->get_device();
m_fd1 = subdevice<floppy_connector>("upd765:1")->get_device();
}
diff --git a/src/emu/bus/spc1000/fdd.h b/src/emu/bus/spc1000/fdd.h
index b06dc8fa971..7ee6f56a50c 100644
--- a/src/emu/bus/spc1000/fdd.h
+++ b/src/emu/bus/spc1000/fdd.h
@@ -36,7 +36,7 @@ public:
DECLARE_WRITE8_MEMBER(i8255_b_w);
DECLARE_READ8_MEMBER(i8255_c_r);
DECLARE_WRITE8_MEMBER(i8255_c_w);
-
+
private:
// internal state
required_device<z80_device> m_cpu;
@@ -47,11 +47,11 @@ private:
floppy_image_device *m_fd1;
emu_timer *m_timer_tc;
-
+
UINT8 m_i8255_0_pc;
UINT8 m_i8255_1_pc;
UINT8 m_i8255_portb;
-
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
static const device_timer_id TIMER_TC = 0;
};
diff --git a/src/emu/bus/spc1000/vdp.c b/src/emu/bus/spc1000/vdp.c
index 511a7937bb0..539bfe5a8bb 100644
--- a/src/emu/bus/spc1000/vdp.c
+++ b/src/emu/bus/spc1000/vdp.c
@@ -19,7 +19,7 @@ WRITE_LINE_MEMBER(spc1000_vdp_exp_device::vdp_interrupt)
static MACHINE_CONFIG_FRAGMENT(scp1000_vdp)
- MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock?
+ MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock?
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(spc1000_vdp_exp_device, vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC("tms_screen")
diff --git a/src/emu/bus/spc1000/vdp.h b/src/emu/bus/spc1000/vdp.h
index 8fbc10ad4e1..f4cd47e9b81 100644
--- a/src/emu/bus/spc1000/vdp.h
+++ b/src/emu/bus/spc1000/vdp.h
@@ -30,7 +30,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write);
DECLARE_WRITE_LINE_MEMBER(vdp_interrupt);
-
+
private:
// internal state
required_device<tms9928a_device> m_vdp;
diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c
index 36f30e4ebe4..7b11d6a3681 100644
--- a/src/emu/cpu/cp1610/cp1610.c
+++ b/src/emu/cpu/cp1610/cp1610.c
@@ -1009,11 +1009,11 @@ void cp1610_cpu_device::cp1610_besc(int dir)
* S Z C OV 1 000 s1e e p ppp ppp ppp ppp ppp
* - - - - BEXT ADDR, eeee
***************************************************/
- void cp1610_cpu_device::cp1610_bext(int ext, int dir)
+ void cp1610_cpu_device::cp1610_bext(int ext, int dir)
{
UINT16 offset = cp1610_readop(m_r[7]);
m_r[7]++;
-
+
if (m_read_bext(ext))
{
m_r[7] += (offset ^ dir);
diff --git a/src/emu/cpu/cp1610/cp1610.h b/src/emu/cpu/cp1610/cp1610.h
index 9d6121f8cd1..bc7b05d9765 100644
--- a/src/emu/cpu/cp1610/cp1610.h
+++ b/src/emu/cpu/cp1610/cp1610.h
@@ -35,8 +35,8 @@ enum
#define MCFG_CP1610_BEXT_CALLBACK(_read) \
downcast<cp1610_cpu_device *>(device)->set_bext_callback(DEVCB_##_read);
-
-
+
+
class cp1610_cpu_device : public cpu_device
{
public:
@@ -47,7 +47,7 @@ public:
{
m_read_bext.set_callback(rd);
}
-
+
protected:
// device-level overrides
virtual void device_start();
@@ -87,7 +87,7 @@ private:
int m_mask_interrupts;
address_space *m_program;
int m_icount;
-
+
devcb_read8 m_read_bext;
void cp1610_illegal();
diff --git a/src/emu/cpu/powerpc/ppc.h b/src/emu/cpu/powerpc/ppc.h
index ccab255971f..b41363e93d3 100644
--- a/src/emu/cpu/powerpc/ppc.h
+++ b/src/emu/cpu/powerpc/ppc.h
@@ -217,7 +217,7 @@ public:
static void set_bus_frequency(device_t &device, UINT32 bus_frequency) { downcast<ppc_device &>(device).c_bus_frequency = bus_frequency; }
void ppc_set_dcstore_callback(write32_delegate callback);
-
+
void ppcdrc_set_options(UINT32 options);
void ppcdrc_add_fastram(offs_t start, offs_t end, UINT8 readonly, void *base);
void ppcdrc_add_hotspot(offs_t pc, UINT32 opcode, UINT32 cycles);
diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h
index 1e8380cc968..c4bf16ccdf3 100644
--- a/src/emu/cpu/rsp/rsp.h
+++ b/src/emu/cpu/rsp/rsp.h
@@ -269,7 +269,7 @@ protected:
direct_read_data *m_direct;
private:
- rsp_cop2 *m_cop2;
+ rsp_cop2 *m_cop2;
UINT32 *m_dmem32;
UINT16 *m_dmem16;
diff --git a/src/emu/cpu/rsp/rspcp2.c b/src/emu/cpu/rsp/rspcp2.c
index 7dca6014eb6..4f7ab80a51b 100644
--- a/src/emu/cpu/rsp/rspcp2.c
+++ b/src/emu/cpu/rsp/rspcp2.c
@@ -27,14 +27,14 @@ extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
Helpful Defines
***************************************************************************/
-#define VDREG ((op >> 6) & 0x1f)
-#define VS1REG ((op >> 11) & 0x1f)
-#define VS2REG ((op >> 16) & 0x1f)
-#define EL ((op >> 21) & 0xf)
+#define VDREG ((op >> 6) & 0x1f)
+#define VS1REG ((op >> 11) & 0x1f)
+#define VS2REG ((op >> 16) & 0x1f)
+#define EL ((op >> 21) & 0xf)
-#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
-#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
-#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
+#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
+#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
+#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
#define VREG_B(reg, offset) m_v[(reg)].b[(offset)^1]
#define VREG_S(reg, offset) m_v[(reg)].s[(offset)]
@@ -56,11 +56,11 @@ extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
#define ZERO 3
#define CLIP2 4
-#define ACCUM(x) m_accum[x].q
-#define ACCUM_H(x) (UINT16)m_accum[x].w[3]
-#define ACCUM_M(x) (UINT16)m_accum[x].w[2]
-#define ACCUM_L(x) (UINT16)m_accum[x].w[1]
-#define ACCUM_LL(x) (UINT16)m_accum[x].w[0]
+#define ACCUM(x) m_accum[x].q
+#define ACCUM_H(x) (UINT16)m_accum[x].w[3]
+#define ACCUM_M(x) (UINT16)m_accum[x].w[2]
+#define ACCUM_L(x) (UINT16)m_accum[x].w[1]
+#define ACCUM_LL(x) (UINT16)m_accum[x].w[0]
#define SET_ACCUM_H(v, x) m_accum[x].w[3] = v;
#define SET_ACCUM_M(v, x) m_accum[x].w[2] = v;
@@ -123,9 +123,9 @@ static const int vector_elements_2[16][8] =
};
rsp_cop2::rsp_cop2(rsp_device &rsp, running_machine &machine)
- : m_rsp(rsp)
- , m_machine(machine)
- , m_reciprocal_res(0)
+ : m_rsp(rsp)
+ , m_machine(machine)
+ , m_reciprocal_res(0)
, m_reciprocal_high(0)
, m_dp_allowed(0)
{
diff --git a/src/emu/cpu/rsp/rspcp2.h b/src/emu/cpu/rsp/rspcp2.h
index df33c13baf6..9b00b5a57f5 100644
--- a/src/emu/cpu/rsp/rspcp2.h
+++ b/src/emu/cpu/rsp/rspcp2.h
@@ -126,36 +126,36 @@ public:
virtual void mtc2();
virtual void ctc2();
- virtual void handle_cop2(UINT32 op);
+ virtual void handle_cop2(UINT32 op);
- void log_instruction_execution();
- virtual void cfunc_unimplemented_opcode() { }
+ void log_instruction_execution();
+ virtual void cfunc_unimplemented_opcode() { }
protected:
- virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) { return TRUE; }
+ virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc) { return TRUE; }
- UINT16 SATURATE_ACCUM(int accum, int slice, UINT16 negative, UINT16 positive);
- UINT16 SATURATE_ACCUM1(int accum, UINT16 negative, UINT16 positive);
+ UINT16 SATURATE_ACCUM(int accum, int slice, UINT16 negative, UINT16 positive);
+ UINT16 SATURATE_ACCUM1(int accum, UINT16 negative, UINT16 positive);
- UINT32 m_op;
+ UINT32 m_op;
- rsp_device& m_rsp;
+ rsp_device& m_rsp;
running_machine& m_machine;
- UINT32 m_vres[8]; /* used for temporary vector results */
+ UINT32 m_vres[8]; /* used for temporary vector results */
- VECTOR_REG m_v[32];
+ VECTOR_REG m_v[32];
- ACCUMULATOR_REG m_accum[8];
- UINT16 m_vflag[6][8];
+ ACCUMULATOR_REG m_accum[8];
+ UINT16 m_vflag[6][8];
- INT32 m_reciprocal_res;
- UINT32 m_reciprocal_high;
- INT32 m_dp_allowed;
+ INT32 m_reciprocal_res;
+ UINT32 m_reciprocal_high;
+ INT32 m_dp_allowed;
private:
- void handle_lwc2(UINT32 op);
- void handle_swc2(UINT32 op);
- void handle_vector_ops(UINT32 op);
+ void handle_lwc2(UINT32 op);
+ void handle_swc2(UINT32 op);
+ void handle_vector_ops(UINT32 op);
};
-#endif /* __RSPCP2_H__ */ \ No newline at end of file
+#endif /* __RSPCP2_H__ */
diff --git a/src/emu/cpu/rsp/rspcp2d.c b/src/emu/cpu/rsp/rspcp2d.c
index cc33779e5f4..0abc3e10f1f 100644
--- a/src/emu/cpu/rsp/rspcp2d.c
+++ b/src/emu/cpu/rsp/rspcp2d.c
@@ -28,14 +28,14 @@ extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
Helpful Defines
***************************************************************************/
-#define VDREG ((op >> 6) & 0x1f)
-#define VS1REG ((op >> 11) & 0x1f)
-#define VS2REG ((op >> 16) & 0x1f)
-#define EL ((op >> 21) & 0xf)
+#define VDREG ((op >> 6) & 0x1f)
+#define VS1REG ((op >> 11) & 0x1f)
+#define VS2REG ((op >> 16) & 0x1f)
+#define EL ((op >> 21) & 0xf)
-#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
-#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
-#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
+#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
+#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
+#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
#define VREG_B(reg, offset) m_v[(reg)].b[(offset)^1]
#define W_VREG_S(reg, offset) m_v[(reg)].s[(offset)]
@@ -60,16 +60,16 @@ static void cfunc_ctc2(void *param);
#define ACCUM_M(x) (UINT16)m_accum[x].w[2]
#define ACCUM_L(x) (UINT16)m_accum[x].w[1]
#define ACCUM_LL(x) (UINT16)m_accum[x].w[0]
-#define ACCUM(x) m_accum[x].q
+#define ACCUM(x) m_accum[x].q
#define SET_ACCUM_H(v, x) m_accum[x].w[3] = v;
#define SET_ACCUM_M(v, x) m_accum[x].w[2] = v;
#define SET_ACCUM_L(v, x) m_accum[x].w[1] = v;
#define SET_ACCUM_LL(v, x) m_accum[x].w[0] = v;
-#define SET_ACCUM(v, x) m_accum[x].q = v;
+#define SET_ACCUM(v, x) m_accum[x].q = v;
-#define GET_VS1(out, i) out = VREG_S(vs1reg, i)
-#define GET_VS2(out, i) out = VREG_S(vs2reg, VEC_EL_2(el, i))
+#define GET_VS1(out, i) out = VREG_S(vs1reg, i)
+#define GET_VS2(out, i) out = VREG_S(vs2reg, VEC_EL_2(el, i))
#define CARRY_FLAG(x) (m_vflag[CARRY][x & 7] != 0 ? 0xffff : 0)
#define COMPARE_FLAG(x) (m_vflag[COMPARE][x & 7] != 0 ? 0xffff : 0)
@@ -96,10 +96,10 @@ static void cfunc_ctc2(void *param);
#define CLEAR_CLIP2_FLAG(x) { m_vflag[CLIP2][x & 7] = 0; }
#define CACHE_VALUES() \
- const int op = m_op; \
- const int vdreg = VDREG; \
- const int vs1reg = VS1REG; \
- const int vs2reg = VS2REG; \
+ const int op = m_op; \
+ const int vdreg = VDREG; \
+ const int vs1reg = VS1REG; \
+ const int vs2reg = VS2REG; \
const int el = EL;
#define WRITEBACK_RESULT() { \
@@ -2105,7 +2105,7 @@ void rsp_cop2_drc::vsaw()
W_VREG_S(vdreg, i) = ACCUM_L(i);
}
break;
- default: // Unsupported
+ default: // Unsupported
{
for (int i = 0; i < 8; i++)
{
@@ -3465,8 +3465,8 @@ int rsp_cop2_drc::generate_vector_opcode(drcuml_block *block, rsp_device::compil
UML_CALLC(block, cfunc_vmov, this);
return TRUE;
- case 0x34: /* VRSQ */
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ case 0x34: /* VRSQ */
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
UML_CALLC(block, cfunc_vrsq, this);
return TRUE;
@@ -3480,8 +3480,8 @@ int rsp_cop2_drc::generate_vector_opcode(drcuml_block *block, rsp_device::compil
UML_CALLC(block, cfunc_vrsqh, this);
return TRUE;
- case 0x37: /* VNOP */
- case 0x3F: /* VNULL */
+ case 0x37: /* VNOP */
+ case 0x3F: /* VNULL */
return TRUE;
default:
@@ -3708,27 +3708,27 @@ int rsp_cop2_drc::generate_cop2(drcuml_block *block, rsp_device::compiler_state
case 0x00: /* MFCz */
if (RTREG != 0)
{
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_mfc2, this); // callc mfc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_mfc2, this); // callc mfc2
}
return TRUE;
case 0x02: /* CFCz */
if (RTREG != 0)
{
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_cfc2, this); // callc cfc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_cfc2, this); // callc cfc2
}
return TRUE;
case 0x04: /* MTCz */
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_mtc2, this); // callc mtc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_mtc2, this); // callc mtc2
return TRUE;
case 0x06: /* CTCz */
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_ctc2, this); // callc ctc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_ctc2, this); // callc ctc2
return TRUE;
case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17:
@@ -3736,4 +3736,4 @@ int rsp_cop2_drc::generate_cop2(drcuml_block *block, rsp_device::compiler_state
return generate_vector_opcode(block, compiler, desc);
}
return FALSE;
-} \ No newline at end of file
+}
diff --git a/src/emu/cpu/rsp/rspcp2d.h b/src/emu/cpu/rsp/rspcp2d.h
index 51c00dc53f3..96eb7a9a32b 100644
--- a/src/emu/cpu/rsp/rspcp2d.h
+++ b/src/emu/cpu/rsp/rspcp2d.h
@@ -104,7 +104,7 @@ public:
virtual void ctc2();
private:
- virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
+ virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
};
-#endif /* __RSPCP2D_H__ */ \ No newline at end of file
+#endif /* __RSPCP2D_H__ */
diff --git a/src/emu/cpu/rsp/rspcp2s.c b/src/emu/cpu/rsp/rspcp2s.c
index 5f53bb927c6..4f59ecc555d 100644
--- a/src/emu/cpu/rsp/rspcp2s.c
+++ b/src/emu/cpu/rsp/rspcp2s.c
@@ -26,14 +26,14 @@ using namespace uml;
Helpful Defines
***************************************************************************/
-#define VDREG ((op >> 6) & 0x1f)
-#define VS1REG ((op >> 11) & 0x1f)
-#define VS2REG ((op >> 16) & 0x1f)
-#define EL ((op >> 21) & 0xf)
+#define VDREG ((op >> 6) & 0x1f)
+#define VS1REG ((op >> 11) & 0x1f)
+#define VS2REG ((op >> 16) & 0x1f)
+#define EL ((op >> 21) & 0xf)
-#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
-#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
-#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
+#define RSVAL (m_rsp.m_rsp_state->r[RSREG])
+#define RTVAL (m_rsp.m_rsp_state->r[RTREG])
+#define RDVAL (m_rsp.m_rsp_state->r[RDREG])
#define EXTRACT16(reg, value, element) \
switch((element) & 7) \
@@ -2322,9 +2322,8 @@ inline void rsp_cop2_simd::vsaw()
m_xv[VDREG] = m_accum_l;
break;
}
- default: // Unsupported, writes 0 to VD
+ default: // Unsupported, writes 0 to VD
{
-
}
}
}
@@ -3602,27 +3601,27 @@ int rsp_cop2_simd::generate_cop2(drcuml_block *block, rsp_device::compiler_state
case 0x00: /* MFCz */
if (RTREG != 0)
{
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_mfc2, this); // callc mfc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_mfc2, this); // callc mfc2
}
return TRUE;
case 0x02: /* CFCz */
if (RTREG != 0)
{
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_cfc2, this); // callc cfc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_cfc2, this); // callc cfc2
}
return TRUE;
case 0x04: /* MTCz */
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_mtc2, this); // callc mtc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_mtc2, this); // callc mtc2
return TRUE;
case 0x06: /* CTCz */
- UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
- UML_CALLC(block, cfunc_ctc2, this); // callc ctc2
+ UML_MOV(block, mem(&m_op), desc->opptr.l[0]); // mov [arg0],desc->opptr.l
+ UML_CALLC(block, cfunc_ctc2, this); // callc ctc2
return TRUE;
case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17:
diff --git a/src/emu/cpu/rsp/rspcp2s.h b/src/emu/cpu/rsp/rspcp2s.h
index 4c0e5d9a557..f040ca9c52a 100644
--- a/src/emu/cpu/rsp/rspcp2s.h
+++ b/src/emu/cpu/rsp/rspcp2s.h
@@ -111,48 +111,48 @@ public:
#endif
private:
- virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
-
- UINT16 ACCUM_H(int x);
- UINT16 ACCUM_M(int x);
- UINT16 ACCUM_L(int x);
- UINT16 ACCUM_LL(int x);
- UINT16 CARRY_FLAG(const int x);
- UINT16 COMPARE_FLAG(const int x);
- UINT16 CLIP1_FLAG(const int x);
- UINT16 ZERO_FLAG(const int x);
- UINT16 CLIP2_FLAG(const int x);
- UINT16 SATURATE_ACCUM(int accum, int slice, UINT16 negative, UINT16 positive);
-
- __m128i m_accum_h;
- __m128i m_accum_m;
- __m128i m_accum_l;
- __m128i m_accum_ll;
+ virtual int generate_vector_opcode(drcuml_block *block, rsp_device::compiler_state *compiler, const opcode_desc *desc);
+
+ UINT16 ACCUM_H(int x);
+ UINT16 ACCUM_M(int x);
+ UINT16 ACCUM_L(int x);
+ UINT16 ACCUM_LL(int x);
+ UINT16 CARRY_FLAG(const int x);
+ UINT16 COMPARE_FLAG(const int x);
+ UINT16 CLIP1_FLAG(const int x);
+ UINT16 ZERO_FLAG(const int x);
+ UINT16 CLIP2_FLAG(const int x);
+ UINT16 SATURATE_ACCUM(int accum, int slice, UINT16 negative, UINT16 positive);
+
+ __m128i m_accum_h;
+ __m128i m_accum_m;
+ __m128i m_accum_l;
+ __m128i m_accum_ll;
// Mirror of v[] for now, to be used in parallel as
// more vector ops are transitioned over
- __m128i m_xv[32];
- __m128i m_xvflag[6];
+ __m128i m_xv[32];
+ __m128i m_xvflag[6];
#if SIMUL_SIMD
- UINT32 m_old_r[35];
- UINT8 m_old_dmem[4096];
+ UINT32 m_old_r[35];
+ UINT8 m_old_dmem[4096];
- UINT32 m_scalar_r[35];
- UINT8 m_scalar_dmem[4096];
+ UINT32 m_scalar_r[35];
+ UINT8 m_scalar_dmem[4096];
- INT32 m_old_reciprocal_res;
- UINT32 m_old_reciprocal_high;
- INT32 m_old_dp_allowed;
+ INT32 m_old_reciprocal_res;
+ UINT32 m_old_reciprocal_high;
+ INT32 m_old_dp_allowed;
- INT32 m_scalar_reciprocal_res;
- UINT32 m_scalar_reciprocal_high;
- INT32 m_scalar_dp_allowed;
+ INT32 m_scalar_reciprocal_res;
+ UINT32 m_scalar_reciprocal_high;
+ INT32 m_scalar_dp_allowed;
- INT32 m_simd_reciprocal_res;
- UINT32 m_simd_reciprocal_high;
- INT32 m_simd_dp_allowed;
+ INT32 m_simd_reciprocal_res;
+ UINT32 m_simd_reciprocal_high;
+ INT32 m_simd_dp_allowed;
#endif
};
-#endif /* __RSPCP2S_H__ */ \ No newline at end of file
+#endif /* __RSPCP2S_H__ */
diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c
index dbc81187796..44a0a22542a 100644
--- a/src/emu/cpu/rsp/rspdrc.c
+++ b/src/emu/cpu/rsp/rspdrc.c
@@ -786,16 +786,16 @@ void rsp_device::generate_branch(drcuml_block *block, compiler_state *compiler,
/* update the cycles and jump through the hash table to the target */
if (desc->targetpc != BRANCH_TARGET_DYNAMIC)
{
- generate_update_cycles(block, &compiler_temp, desc->targetpc, TRUE); // <subtract cycles>
+ generate_update_cycles(block, &compiler_temp, desc->targetpc, TRUE); // <subtract cycles>
if (desc->flags & OPFLAG_INTRABLOCK_BRANCH)
- UML_JMP(block, desc->targetpc | 0x80000000); // jmp desc->targetpc
+ UML_JMP(block, desc->targetpc | 0x80000000); // jmp desc->targetpc
else
- UML_HASHJMP(block, 0, desc->targetpc, *m_nocode); // hashjmp <mode>,desc->targetpc,nocode
+ UML_HASHJMP(block, 0, desc->targetpc, *m_nocode); // hashjmp <mode>,desc->targetpc,nocode
}
else
{
- generate_update_cycles(block, &compiler_temp, mem(&m_rsp_state->jmpdest), TRUE); // <subtract cycles>
- UML_HASHJMP(block, 0, mem(&m_rsp_state->jmpdest), *m_nocode); // hashjmp <mode>,<rsreg>,nocode
+ generate_update_cycles(block, &compiler_temp, mem(&m_rsp_state->jmpdest), TRUE); // <subtract cycles>
+ UML_HASHJMP(block, 0, mem(&m_rsp_state->jmpdest), *m_nocode); // hashjmp <mode>,<rsreg>,nocode
}
}
diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c
index 057daf35f84..3737ac94703 100644
--- a/src/emu/cpu/upd7810/upd7810.c
+++ b/src/emu/cpu/upd7810/upd7810.c
@@ -1345,17 +1345,17 @@ void upd7810_device::handle_timers(int cycles)
IRR |= INTFE1;
/* Conditions When ECNT Causes a CO0 Output Change */
if (((0x00 == (ETMM & 0x30)) && (ETM0 == ECNT)) || /* set CO0 if ECNT == ETM0 */
- /* ((0x10 == (ETMM & 0x30)) prohibited */
- ((0x20 == (ETMM & 0x30)) && (ETM0 == ECNT)) || /* set CO0 if ECNT == ETM0 or at falling CI input */
- ((0x30 == (ETMM & 0x30)) && (ETM0 == ECNT || ETM1 == ECNT))) /* latch CO0 if ECNT == ETM0 or ECNT == ETM1 */
+ /* ((0x10 == (ETMM & 0x30)) prohibited */
+ ((0x20 == (ETMM & 0x30)) && (ETM0 == ECNT)) || /* set CO0 if ECNT == ETM0 or at falling CI input */
+ ((0x30 == (ETMM & 0x30)) && (ETM0 == ECNT || ETM1 == ECNT))) /* latch CO0 if ECNT == ETM0 or ECNT == ETM1 */
{
upd7810_co0_output_change();
}
/* Conditions When ECNT Causes a CO1 Output Change */
if (((0x00 == (ETMM & 0xc0)) && (ETM1 == ECNT)) || /* set CO1 if ECNT == ETM1 */
- /* ((0x40 == (ETMM & 0xc0)) prohibited */
- ((0x80 == (ETMM & 0xc0)) && (ETM1 == ECNT)) || /* set CO1 if ECNT == ETM1 or at falling CI input */
- ((0xc0 == (ETMM & 0xc0)) && (ETM0 == ECNT || ETM1 == ECNT))) /* latch CO1 if ECNT == ETM0 or ECNT == ETM1 */
+ /* ((0x40 == (ETMM & 0xc0)) prohibited */
+ ((0x80 == (ETMM & 0xc0)) && (ETM1 == ECNT)) || /* set CO1 if ECNT == ETM1 or at falling CI input */
+ ((0xc0 == (ETMM & 0xc0)) && (ETM0 == ECNT || ETM1 == ECNT))) /* latch CO1 if ECNT == ETM0 or ECNT == ETM1 */
{
upd7810_co1_output_change();
}
@@ -1816,7 +1816,7 @@ void upd7810_device::device_reset()
m_itf = 0;
m_nmi = 0;
m_int1 = 0;
- m_int2 = 1; /* physical (inverted) INT2 line state */
+ m_int2 = 1; /* physical (inverted) INT2 line state */
m_txs = 0;
m_rxs = 0;
diff --git a/src/emu/machine/i6300esb.c b/src/emu/machine/i6300esb.c
index 8dcfbd6cec5..725c03534e0 100644
--- a/src/emu/machine/i6300esb.c
+++ b/src/emu/machine/i6300esb.c
@@ -86,8 +86,8 @@ ADDRESS_MAP_END
i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, I6300ESB_LPC, "i6300ESB southbridge ISA/LPC bridge", tag, owner, clock, "i6300esb_lpc", __FILE__),
- acpi(*this, "acpi"),
- rtc (*this, "rtc")
+ acpi(*this, "acpi"),
+ rtc (*this, "rtc")
{
}
@@ -661,7 +661,7 @@ void i6300esb_lpc_device::map_bios(address_space *memory_space, UINT32 start, UI
{
// Ignore idsel, a16 inversion for now
UINT32 mask = m_region->bytes() - 1;
- memory_space->install_rom(start, end, m_region->base() + (start & mask));
+ memory_space->install_rom(start, end, m_region->base() + (start & mask));
}
void i6300esb_lpc_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
@@ -750,5 +750,3 @@ void i6300esb_lpc_device::map_extra(UINT64 memory_window_start, UINT64 memory_wi
if(rtc_conf & 4)
rtc->map_extdevice(memory_window_start, memory_window_end, 0, memory_space, io_window_start, io_window_end, 0, io_space);
}
-
-
diff --git a/src/emu/machine/i6300esb.h b/src/emu/machine/i6300esb.h
index 79a7bb376b3..3f7bb286678 100644
--- a/src/emu/machine/i6300esb.h
+++ b/src/emu/machine/i6300esb.h
@@ -19,7 +19,7 @@ public:
virtual void reset_all_mappings();
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
virtual DECLARE_ADDRESS_MAP(config_map, 32);
diff --git a/src/emu/machine/i82875p.h b/src/emu/machine/i82875p.h
index 138b489c02e..998c1e51ed9 100644
--- a/src/emu/machine/i82875p.h
+++ b/src/emu/machine/i82875p.h
@@ -5,7 +5,7 @@
#include "pci.h"
-#define MCFG_I82875P_HOST_ADD(_tag, _subdevice_id, _cpu_tag, _ram_size) \
+#define MCFG_I82875P_HOST_ADD(_tag, _subdevice_id, _cpu_tag, _ram_size) \
MCFG_PCI_HOST_ADD(_tag, I82875P_HOST, 0x80862578, 0x02, _subdevice_id) \
downcast<i82875p_host_device *>(device)->set_cpu_tag(_cpu_tag); \
downcast<i82875p_host_device *>(device)->set_ram_size(_ram_size);
@@ -21,7 +21,7 @@ public:
void set_ram_size(int ram_size);
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
virtual DECLARE_ADDRESS_MAP(config_map, 32);
diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c
index c7c2fe6d6c2..8d15e34ff2c 100644
--- a/src/emu/machine/intelfsh.c
+++ b/src/emu/machine/intelfsh.c
@@ -379,7 +379,7 @@ intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, cons
fujitsu_29f160t_device::fujitsu_29f160t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29F160T, "Fujitsu 29F160 Flash", tag, owner, clock, FLASH_FUJITSU_29F160T, "fujitsu_29f160t", __FILE__) { }
-
+
fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, FUJITSU_29F016A, "Fujitsu 29F016A Flash", tag, owner, clock, FLASH_FUJITSU_29F016A, "fujitsu_29f016a", __FILE__) { }
@@ -400,10 +400,10 @@ amd_29f040_device::amd_29f040_device(const machine_config &mconfig, const char *
amd_29f080_device::amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F080 Flash", tag, owner, clock, FLASH_AMD_29F080, "amd_29f080", __FILE__) { }
-
+
amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F400 Flash", tag, owner, clock, FLASH_AMD_29F400T, "amd_29f400t", __FILE__) { }
-
+
amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F800 Flash", tag, owner, clock, FLASH_AMD_29F080, "amd_29f800t", __FILE__) { }
diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h
index 0f95237fd55..95fce17b2ee 100644
--- a/src/emu/machine/intelfsh.h
+++ b/src/emu/machine/intelfsh.h
@@ -39,7 +39,7 @@
#define MCFG_FUJITSU_29F160T_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, FUJITSU_29F160T, 0)
-
+
#define MCFG_FUJITSU_29F016A_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, FUJITSU_29F016A, 0)
@@ -161,7 +161,7 @@ protected:
UINT8 m_maker_id;
bool m_sector_is_4k;
bool m_sector_is_16k;
- bool m_top_boot_sector;
+ bool m_top_boot_sector;
UINT8 m_page_size;
// internal state
diff --git a/src/emu/machine/lpc-acpi.c b/src/emu/machine/lpc-acpi.c
index e30c6d36094..5493fa5ecf6 100644
--- a/src/emu/machine/lpc-acpi.c
+++ b/src/emu/machine/lpc-acpi.c
@@ -40,7 +40,7 @@ lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, const char *tag,
}
void lpc_acpi_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
io_space->install_device(io_offset, io_window_end, *this, &lpc_acpi_device::map);
}
diff --git a/src/emu/machine/lpc-rtc.c b/src/emu/machine/lpc-rtc.c
index c296504d1a6..0f51234c3a2 100644
--- a/src/emu/machine/lpc-rtc.c
+++ b/src/emu/machine/lpc-rtc.c
@@ -18,13 +18,13 @@ lpc_rtc_device::lpc_rtc_device(const machine_config &mconfig, const char *tag, d
}
void lpc_rtc_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
io_space->install_device(io_offset, io_window_end, *this, &lpc_rtc_device::map);
}
void lpc_rtc_device::map_extdevice(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
io_space->install_device(io_offset, io_window_end, *this, &lpc_rtc_device::extmap);
}
diff --git a/src/emu/machine/lpc-rtc.h b/src/emu/machine/lpc-rtc.h
index 9135d1a590b..b2d4ea3155f 100644
--- a/src/emu/machine/lpc-rtc.h
+++ b/src/emu/machine/lpc-rtc.h
@@ -14,7 +14,7 @@ public:
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
virtual void map_extdevice(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
DECLARE_READ8_MEMBER( index_r);
DECLARE_WRITE8_MEMBER( index_w);
diff --git a/src/emu/machine/lpc.c b/src/emu/machine/lpc.c
index 7921542adf1..fd9aeee275e 100644
--- a/src/emu/machine/lpc.c
+++ b/src/emu/machine/lpc.c
@@ -4,4 +4,3 @@ lpc_device::lpc_device(const machine_config &mconfig, device_type type, const ch
device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
}
-
diff --git a/src/emu/machine/lpc.h b/src/emu/machine/lpc.h
index 7cb9587da59..75af5ffb612 100644
--- a/src/emu/machine/lpc.h
+++ b/src/emu/machine/lpc.h
@@ -12,4 +12,3 @@ public:
};
#endif
-
diff --git a/src/emu/machine/omti5100.c b/src/emu/machine/omti5100.c
index 84d00f178e9..8e4e8fcfa53 100644
--- a/src/emu/machine/omti5100.c
+++ b/src/emu/machine/omti5100.c
@@ -51,7 +51,7 @@ const rom_entry *omti5100_device::device_rom_region() const
//-------------------------------------------------
static MACHINE_CONFIG_FRAGMENT( omti5100_z8 )
-// MCFG_CPU_ADD("z8", Z8681, XTAL_20MHz / 3 /* ??? */)
+// MCFG_CPU_ADD("z8", Z8681, XTAL_20MHz / 3 /* ??? */)
MACHINE_CONFIG_END
machine_config_constructor omti5100_device::device_mconfig_additions() const
@@ -70,7 +70,7 @@ machine_config_constructor omti5100_device::device_mconfig_additions() const
omti5100_device::omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, OMTI5100, "OMTI 5100 SCSI/SASI Controller", tag, owner, clock, "omti5100", __FILE__),
-// m_cpu(*this, "z8"),
+// m_cpu(*this, "z8"),
m_bsy_w(*this),
m_cd_w(*this),
m_io_w(*this),
diff --git a/src/emu/machine/omti5100.h b/src/emu/machine/omti5100.h
index ede9493880f..ecb8d460d2c 100644
--- a/src/emu/machine/omti5100.h
+++ b/src/emu/machine/omti5100.h
@@ -88,7 +88,7 @@ protected:
virtual void device_reset();
private:
-// required_device<z8681_device> m_cpu;
+// required_device<z8681_device> m_cpu;
devcb_write_line m_bsy_w;
devcb_write_line m_cd_w;
diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c
index 1e823dc319f..abad1e64426 100644
--- a/src/emu/machine/pci.c
+++ b/src/emu/machine/pci.c
@@ -226,11 +226,11 @@ void pci_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end
}
map_extra(memory_window_start, memory_window_end, memory_offset, memory_space,
- io_window_start, io_window_end, io_offset, io_space);
+ io_window_start, io_window_end, io_offset, io_space);
}
void pci_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
}
@@ -291,15 +291,15 @@ void agp_device::device_reset()
pci_bridge_device::pci_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: pci_device(mconfig, PCI_BRIDGE, "PCI-PCI Bridge", tag, owner, clock, "pci_bridge", __FILE__),
- device_memory_interface(mconfig, *this),
- configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
+ device_memory_interface(mconfig, *this),
+ configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
{
}
pci_bridge_device::pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: pci_device(mconfig, type, name, tag, owner, clock, shortname, source),
- device_memory_interface(mconfig, *this),
- configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
+ device_memory_interface(mconfig, *this),
+ configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20)
{
}
@@ -373,15 +373,15 @@ void pci_bridge_device::reset_all_mappings()
void pci_bridge_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space)
{
for(int i = all_devices.count()-1; i>=0; i--)
if(all_devices[i] != this)
all_devices[i]->map_device(memory_window_start, memory_window_end, memory_offset, memory_space,
- io_window_start, io_window_end, io_offset, io_space);
+ io_window_start, io_window_end, io_offset, io_space);
map_extra(memory_window_start, memory_window_end, memory_offset, memory_space,
- io_window_start, io_window_end, io_offset, io_space);
+ io_window_start, io_window_end, io_offset, io_space);
}
@@ -458,7 +458,7 @@ void pci_host_device::regenerate_mapping()
io_space->unmap_readwrite(io_window_start, io_window_end);
map_device(memory_window_start, memory_window_end, memory_offset, memory_space,
- io_window_start, io_window_end, io_offset, io_space);
+ io_window_start, io_window_end, io_offset, io_space);
}
READ32_MEMBER(pci_host_device::config_address_r)
@@ -492,7 +492,7 @@ UINT32 pci_host_device::config_read(UINT8 bus, UINT8 device, UINT16 reg, UINT32
}
} else
abort();
-
+
return data;
}
diff --git a/src/emu/machine/pci.h b/src/emu/machine/pci.h
index ea6d861311c..a10b28d1a8a 100644
--- a/src/emu/machine/pci.h
+++ b/src/emu/machine/pci.h
@@ -37,7 +37,7 @@ public:
virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space,
- UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
+ UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space);
void map_config(UINT8 device, address_space *config_space);
diff --git a/src/emu/machine/pla.c b/src/emu/machine/pla.c
index 09c799fa1ee..4d0a3978161 100644
--- a/src/emu/machine/pla.c
+++ b/src/emu/machine/pla.c
@@ -59,7 +59,7 @@ void pla_device::device_start()
m_cache.resize(csize);
for (int i = 0; i < csize; i++)
m_cache[i] = read(i);
-
+
m_cache_size = csize;
}
@@ -72,19 +72,19 @@ void pla_device::parse_fusemap()
{
jed_data jed;
int result = JEDERR_NONE;
-
+
// read pla file
switch (m_format)
{
case PLA_FMT_JEDBIN:
result = jedbin_parse(region()->base(), region()->bytes(), &jed);
break;
-
+
case PLA_FMT_BERKELEY:
result = pla_parse(region()->base(), region()->bytes(), &jed);
break;
}
-
+
if (result != JEDERR_NONE)
{
for (int p = 0; p < m_terms; p++)
@@ -92,11 +92,11 @@ void pla_device::parse_fusemap()
m_term[p].and_mask = 0;
m_term[p].or_mask = 0;
}
-
+
logerror("%s PLA parse error %d!\n", tag(), result);
return;
}
-
+
// parse it
UINT32 fusenum = 0;
@@ -148,7 +148,7 @@ UINT32 pla_device::read(UINT32 input)
// try the cache first
if (input < m_cache_size)
return m_cache[input];
-
+
for (int i = 0; i < CACHE2_SIZE; ++i)
{
UINT64 cache2_entry = m_cache2[i];
diff --git a/src/emu/machine/pla.h b/src/emu/machine/pla.h
index 96a33aaae43..411b1bec15b 100644
--- a/src/emu/machine/pla.h
+++ b/src/emu/machine/pla.h
@@ -99,7 +99,7 @@ public:
static void set_num_terms(device_t &device, UINT32 t) { downcast<pla_device &>(device).m_terms = t; }
static void set_inputmask(device_t &device, UINT32 mask) { downcast<pla_device &>(device).m_input_mask = mask; } // UINT32!
static void set_format(device_t &device, int format) { downcast<pla_device &>(device).m_format = format; }
-
+
UINT32 inputs() { return m_inputs; }
UINT32 outputs() { return m_outputs; }
@@ -113,7 +113,7 @@ private:
void parse_fusemap();
int m_format;
-
+
UINT32 m_inputs;
UINT32 m_outputs;
UINT32 m_terms;
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 078e07a8420..e8bddfe42e9 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -3435,7 +3435,7 @@ UINT16 *address_table::subtable_open(offs_t l1index)
for (int i=0; i<size; i++)
subptr[i] = subentry;
m_table[l1index] = newentry;
- UINT32 subkey = subentry + (subentry << 8) + (subentry << 16) + (subentry << 24);
+ UINT32 subkey = subentry + (subentry << 8) + (subentry << 16) + (subentry << 24);
m_subtable[newentry - SUBTABLE_BASE].m_checksum = subkey * (((1 << level2_bits())/4));
subentry = newentry;
}
diff --git a/src/emu/memory.h b/src/emu/memory.h
index b433baa541a..e90cc58394c 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -649,7 +649,7 @@ public:
m_endianness(endianness),
m_bitwidth(width),
m_bytewidth(width <= 8 ? 1 : width <= 16 ? 2 : width <= 32 ? 4 : 8)
- { }
+ { }
// getters
memory_share *next() const { return m_next; }
diff --git a/src/emu/romload.c b/src/emu/romload.c
index 3b177c5ac8e..279a3755b8f 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -537,7 +537,7 @@ static void region_post_process(romload_private *romdata, const char *rgntag, bo
return;
LOG(("+ datawidth=%dbit endian=%s\n", region->bitwidth(),
- region->endianness() == ENDIANNESS_LITTLE ? "little" : "big"));
+ region->endianness() == ENDIANNESS_LITTLE ? "little" : "big"));
/* if the region is inverted, do that now */
if (invert)
diff --git a/src/emu/sound/sn76477.h b/src/emu/sound/sn76477.h
index 07260c66b89..f0a4faefd85 100644
--- a/src/emu/sound/sn76477.h
+++ b/src/emu/sound/sn76477.h
@@ -116,7 +116,7 @@ public:
dev.m_vco_voltage = volt;
dev.m_vco_cap = cap;
dev.m_vco_res = res;
- }
+ }
static void set_pitch_voltage(device_t &device, double volt) { downcast<sn76477_device &>(device).m_pitch_voltage = volt; }
static void set_slf_params(device_t &device, double cap, double res)
{
@@ -137,16 +137,16 @@ public:
dev.m_mixer_a = a;
dev.m_mixer_b = b;
dev.m_mixer_c = c;
- }
+ }
static void set_envelope_params(device_t &device, UINT32 env1, UINT32 env2)
{
sn76477_device &dev = downcast<sn76477_device &>(device);
dev.m_envelope_1 = env1;
dev.m_envelope_2 = env2;
- }
+ }
static void set_enable(device_t &device, UINT32 enable) { downcast<sn76477_device &>(device).m_enable = enable; }
-
-
+
+
/* these functions take 0 or 1 as a logic input */
WRITE_LINE_MEMBER( enable_w ); /* active LO, 0 = enabled, 1 = disabled */
WRITE_LINE_MEMBER( mixer_a_w );
@@ -257,7 +257,7 @@ private:
UINT32 m_mixer_c;
UINT32 m_envelope_1;
UINT32 m_envelope_2;
-
+
/* others */
sound_stream *m_channel; /* returned by stream_create() */
int m_our_sample_rate; /* from machine.sample_rate() */
diff --git a/src/emu/video/315_5124.h b/src/emu/video/315_5124.h
index 8c852db7b9f..fc1b1366000 100644
--- a/src/emu/video/315_5124.h
+++ b/src/emu/video/315_5124.h
@@ -62,7 +62,7 @@ public:
sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source, int xscroll_hpos = X_SCROLL_HPOS_5124);
static void set_signal_type(device_t &device, bool is_pal) { downcast<sega315_5124_device &>(device).m_is_pal = is_pal; }
-
+
template<class _Object> static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast<sega315_5124_device &>(device).m_int_cb.set_callback(object); }
diff --git a/src/emu/video/315_5313.c b/src/emu/video/315_5313.c
index b71d67c8ba2..bdfbe924db1 100644
--- a/src/emu/video/315_5313.c
+++ b/src/emu/video/315_5313.c
@@ -2503,7 +2503,7 @@ void sega315_5313_device::render_videobuffer_to_screenbuffer(int scanline)
{
UINT16 *lineptr;
-
+
if (!m_use_alt_timing)
{
diff --git a/src/emu/video/snes_ppu.c b/src/emu/video/snes_ppu.c
index e41f2f00bd3..900d1f07a83 100644
--- a/src/emu/video/snes_ppu.c
+++ b/src/emu/video/snes_ppu.c
@@ -361,11 +361,10 @@ void snes_ppu_device::device_start()
void snes_ppu_device::device_reset()
{
-
#if SNES_LAYER_DEBUG
memset(&m_debug_options, 0, sizeof(m_debug_options));
#endif
-
+
/* Inititialize registers/variables */
m_update_windows = 1;
m_beam.latch_vert = 0;
@@ -376,32 +375,32 @@ void snes_ppu_device::device_reset()
m_mode = 0;
m_ppu1_version = 1; // 5C77 chip version number, read by STAT77, only '1' is known
m_ppu2_version = 3; // 5C78 chip version number, read by STAT78, only '2' & '3' encountered so far.
-
+
m_cgram_address = 0;
m_read_ophct = 0;
m_read_opvct = 0;
m_vmadd = 0;
-
+
PPU_REG(VMAIN) = 0x80;
// what about other regs?
-
+
/* Inititialize mosaic table */
for (int j = 0; j < 16; j++)
{
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);
-
+
m_stat78 = 0;
// other initializations to 0
@@ -419,7 +418,7 @@ void snes_ppu_device::device_reset()
memset(m_scanlines[i].layer, 0, SNES_SCR_WIDTH);
memset(m_scanlines[i].blend_exception, 0, SNES_SCR_WIDTH);
}
-
+
for (int i = 0; i < 6; i++)
{
m_layer[i].window1_enabled = 0;
@@ -439,10 +438,10 @@ void snes_ppu_device::device_reset()
m_layer[i].sub_bg_enabled = 0;
m_layer[i].hoffs = 0;
m_layer[i].voffs = 0;
-
+
memset(m_clipmasks[i], 0, SNES_SCR_WIDTH);
}
-
+
for (int i = 0; i < ARRAY_LENGTH(m_oam_spritelist); i++)
{
m_oam_spritelist[i].tile = 0;
@@ -456,7 +455,7 @@ void snes_ppu_device::device_reset()
m_oam_spritelist[i].height = 0;
m_oam_spritelist[i].width = 0;
}
-
+
for (int i = 0; i < ARRAY_LENGTH(m_oam_tilelist); i++)
{
m_oam_tilelist[i].x = 0;
diff --git a/src/lib/formats/flopimg.c b/src/lib/formats/flopimg.c
index 1e0f42a5b35..d22a97c1c06 100644
--- a/src/lib/formats/flopimg.c
+++ b/src/lib/formats/flopimg.c
@@ -1307,14 +1307,14 @@ void floppy_image_format_t::fixup_crcs(UINT32 *buffer, gen_crc_info *crcs)
for(int i=0; i != MAX_CRC_COUNT; i++)
if(crcs[i].write != -1) {
switch(crcs[i].type) {
- case CRC_AMIGA: fixup_crc_amiga(buffer, crcs+i); break;
- case CRC_CBM: fixup_crc_cbm(buffer, crcs+i); break;
- case CRC_CCITT: fixup_crc_ccitt(buffer, crcs+i); break;
- case CRC_CCITT_FM: fixup_crc_ccitt_fm(buffer, crcs+i); break;
- case CRC_MACHEAD: fixup_crc_machead(buffer, crcs+i); break;
- case CRC_FCS: fixup_crc_fcs(buffer, crcs+i); break;
- case CRC_VICTOR_HDR: fixup_crc_victor_header(buffer, crcs+i); break;
- case CRC_VICTOR_DATA: fixup_crc_victor_data(buffer, crcs+i); break;
+ case CRC_AMIGA: fixup_crc_amiga(buffer, crcs+i); break;
+ case CRC_CBM: fixup_crc_cbm(buffer, crcs+i); break;
+ case CRC_CCITT: fixup_crc_ccitt(buffer, crcs+i); break;
+ case CRC_CCITT_FM: fixup_crc_ccitt_fm(buffer, crcs+i); break;
+ case CRC_MACHEAD: fixup_crc_machead(buffer, crcs+i); break;
+ case CRC_FCS: fixup_crc_fcs(buffer, crcs+i); break;
+ case CRC_VICTOR_HDR: fixup_crc_victor_header(buffer, crcs+i); break;
+ case CRC_VICTOR_DATA: fixup_crc_victor_data(buffer, crcs+i); break;
}
if(crcs[i].fixup_mfm_clock) {
int offset = crcs[i].write + crc_cells_size(crcs[i].type);
diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h
index b53744578df..30562e0371e 100644
--- a/src/lib/formats/flopimg.h
+++ b/src/lib/formats/flopimg.h
@@ -348,8 +348,8 @@ protected:
CRC_CBM_START, //!< Start a CBM checksum calculation (xor of original data values, gcr5-encoded), p1 = crc id
CRC_MACHEAD_START, //!< Start of the mac gcr6 sector header checksum calculation (xor of pre-encode 6-bits values, gcr6-encoded)
CRC_FCS_START, //!< Start a Compucolor File Control System checksum calculation, p1 = crc id
- CRC_VICTOR_HDR_START, //!< Start a Victor 9000 checksum calculation, p1 = crc id
- CRC_VICTOR_DATA_START, //!< Start a Victor 9000 checksum calculation, p1 = crc id
+ CRC_VICTOR_HDR_START, //!< Start a Victor 9000 checksum calculation, p1 = crc id
+ CRC_VICTOR_DATA_START, //!< Start a Victor 9000 checksum calculation, p1 = crc id
CRC_END, //!< End the checksum, p1 = crc id
CRC, //!< Write a checksum in the apporpriate format, p1 = crc id
diff --git a/src/lib/formats/spc1000_cas.c b/src/lib/formats/spc1000_cas.c
index 03debc584dc..b02c287d02b 100644
--- a/src/lib/formats/spc1000_cas.c
+++ b/src/lib/formats/spc1000_cas.c
@@ -10,7 +10,7 @@ Tape formats:
TAP: This is a series of 0x30 and 0x31 bytes, representing binary
0 and 1. It includes the header and leaders.
-CAS: Files in this format consist of a 16 bytes header (SPC-1000.CASfmt )
+CAS: Files in this format consist of a 16 bytes header (SPC-1000.CASfmt )
followed by cassette bits packed together (each byte of a .cas file
are 8 bits, most significant bit first)
@@ -74,12 +74,12 @@ static int spc1000_handle_tap(INT16 *buffer, const UINT8 *bytes)
static int spc1000_handle_cas(INT16 *buffer, const UINT8 *bytes)
{
UINT32 sample_count = 0;
-
+
/* data (skipping first 16 bytes, which is CAS header) */
for (UINT32 i = 0x10; i < spc1000_image_size; i++)
for (int j = 0; j < 8; j++)
sample_count += spc1000_output_bit(buffer, sample_count, (bytes[i] >> (7 - j)) & 1);
-
+
return sample_count;
}
@@ -112,7 +112,7 @@ static int spc1000_tap_calculate_size_in_samples(const UINT8 *bytes, int length)
static int spc1000_cas_calculate_size_in_samples(const UINT8 *bytes, int length)
{
spc1000_image_size = length;
-
+
return spc1000_handle_cas(NULL, bytes);
}
diff --git a/src/lib/formats/victor9k_dsk.c b/src/lib/formats/victor9k_dsk.c
index db2a75b21e7..beb5141ba1c 100644
--- a/src/lib/formats/victor9k_dsk.c
+++ b/src/lib/formats/victor9k_dsk.c
@@ -2,42 +2,42 @@
// copyright-holders:Curt Coder
/*********************************************************************
- formats/victor9k_dsk.c
+ formats/victor9k_dsk.c
- Victor 9000 sector disk image format
+ Victor 9000 sector disk image format
*********************************************************************/
/*
- Sector format
- -------------
-
- Header sync
- Sector header (header ID, track ID, sector ID, and checksum)
- Gap 1
- Data Sync
- Data field (data sync, data ID, data bytes, and checksum)
- Gap 2
-
- Track format
- ------------
-
- ZONE LOWER HEAD UPPER HEAD SECTORS ROTATIONAL RPM
- NUMBER TRACKS TRACKS PER TRACK PERIOD (MS)
-
- 0 0-3 unused 19 237.9 252
- 1 4-15 0-7 18 224.5 267
- 2 16-26 8-18 17 212.2 283
- 3 27-37 19-29 16 199.9 300
- 4 38-48 30-40 15 187.6 320
- 5 49-59 41-51 14 175.3 342
- 6 60-70 52-62 13 163.0 368
- 7 71-79 63-74 12 149.6 401
- 8 unused 75-79 11 144.0 417
-
- Interleave factor 3
- cell 2.13 usec
+ Sector format
+ -------------
+
+ Header sync
+ Sector header (header ID, track ID, sector ID, and checksum)
+ Gap 1
+ Data Sync
+ Data field (data sync, data ID, data bytes, and checksum)
+ Gap 2
+
+ Track format
+ ------------
+
+ ZONE LOWER HEAD UPPER HEAD SECTORS ROTATIONAL RPM
+ NUMBER TRACKS TRACKS PER TRACK PERIOD (MS)
+
+ 0 0-3 unused 19 237.9 252
+ 1 4-15 0-7 18 224.5 267
+ 2 16-26 8-18 17 212.2 283
+ 3 27-37 19-29 16 199.9 300
+ 4 38-48 30-40 15 187.6 320
+ 5 49-59 41-51 14 175.3 342
+ 6 60-70 52-62 13 163.0 368
+ 7 71-79 63-74 12 149.6 401
+ 8 unused 75-79 11 144.0 417
+
+ Interleave factor 3
+ cell 2.13 usec
*/
diff --git a/src/lib/util/plaparse.c b/src/lib/util/plaparse.c
index f0317f25411..5053cd5c08e 100644
--- a/src/lib/util/plaparse.c
+++ b/src/lib/util/plaparse.c
@@ -64,7 +64,7 @@ static bool iscrlf(char c)
static UINT32 suck_number(const UINT8 **src, const UINT8 *srcend)
{
UINT32 value = 0;
-
+
// find first digit
while (*src < srcend && !iscrlf(**src) && !isdigit(**src))
(*src)++;
@@ -94,7 +94,7 @@ static bool process_terms(jed_data *data, const UINT8 **src, const UINT8 *srcend
UINT32 curinput = 0;
UINT32 curoutput = 0;
bool outputs = false;
-
+
// symbols for 0, 1, dont_care, no_meaning
// PLA format documentation also describes them as simply 0, 1, 2, 3
static const char symbols[] = { "01-~" };
@@ -106,7 +106,7 @@ static bool process_terms(jed_data *data, const UINT8 **src, const UINT8 *srcend
// and-matrix
if (strrchr(symbols, **src))
curinput++;
-
+
switch (**src)
{
case '0':
@@ -146,7 +146,7 @@ static bool process_terms(jed_data *data, const UINT8 **src, const UINT8 *srcend
if (LOG_PARSE) printf(" ");
}
break;
-
+
default:
break;
}
@@ -175,7 +175,7 @@ static bool process_terms(jed_data *data, const UINT8 **src, const UINT8 *srcend
{
outputs = false;
if (LOG_PARSE) printf("\n");
-
+
if (curinput != pinfo->inputs || curoutput != pinfo->outputs)
return false;
@@ -185,7 +185,7 @@ static bool process_terms(jed_data *data, const UINT8 **src, const UINT8 *srcend
(*src)++;
}
-
+
return true;
}
@@ -206,32 +206,32 @@ static bool process_field(jed_data *data, const UINT8 **src, const UINT8 *srcend
KW_TERMS,
KW_PHASE,
KW_END,
-
+
KW_INVALID
};
-
+
// find keyword
char dest[0x10];
memset(dest, 0, ARRAY_LENGTH(dest));
const UINT8 *seek = *src;
int destptr = 0;
-
+
while (seek < srcend && isalpha(*seek) && destptr < ARRAY_LENGTH(dest) - 1)
{
dest[destptr] = tolower(*seek);
seek++;
destptr++;
}
-
+
UINT8 find = 0;
while (strlen(keywords[find]) && strcmp(dest, keywords[find]))
find++;
-
+
if (find == KW_INVALID)
return false;
-
+
(*src) += strlen(keywords[find]);
-
+
// handle it
switch (find)
{
@@ -261,7 +261,7 @@ static bool process_field(jed_data *data, const UINT8 **src, const UINT8 *srcend
if (LOG_PARSE) printf("Terms: %u\n", pinfo->terms);
break;
-
+
// output polarity (optional)
case KW_PHASE:
if (LOG_PARSE) printf("Phase...\n");
@@ -283,7 +283,7 @@ static bool process_field(jed_data *data, const UINT8 **src, const UINT8 *srcend
if (LOG_PARSE) printf("End of file\n");
break;
}
-
+
return true;
}
@@ -298,7 +298,7 @@ int pla_parse(const void *data, size_t length, jed_data *result)
{
const UINT8 *src = (const UINT8 *)data;
const UINT8 *srcend = src + length;
-
+
parse_info pinfo;
memset(&pinfo, 0, sizeof(pinfo));
@@ -321,24 +321,24 @@ int pla_parse(const void *data, size_t length, jed_data *result)
if (!process_field(result, &src, srcend, &pinfo))
return JEDERR_INVALID_DATA;
break;
-
+
// terms
case '0': case '1': case '-': case '~':
if (!process_terms(result, &src, srcend, &pinfo))
return JEDERR_INVALID_DATA;
break;
-
+
default:
src++;
break;
}
}
-
+
// write output polarity
if (pinfo.xorptr > 0)
{
if (LOG_PARSE) printf("Polarity: ");
-
+
for (int i = 0; i < pinfo.outputs; i++)
{
int bit = pinfo.xorval[i/32] >> (i & 31) & 1;
diff --git a/src/lib/web/mongoose.c b/src/lib/web/mongoose.c
index 3482875b7b8..aec23c6dc40 100644
--- a/src/lib/web/mongoose.c
+++ b/src/lib/web/mongoose.c
@@ -5169,7 +5169,7 @@ static void *mmap(void *addr, int64_t len, int prot, int flags, int fd,
p = malloc(len);
if (!p)
- return NULL;
+ return NULL;
curpos = lseek(fd, 0, SEEK_CUR);
lseek(fd, offset, SEEK_SET);
diff --git a/src/lib/winpcap/Packet32.h b/src/lib/winpcap/Packet32.h
index 64be055d96c..505bab7bd99 100644
--- a/src/lib/winpcap/Packet32.h
+++ b/src/lib/winpcap/Packet32.h
@@ -12,9 +12,9 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Politecnico di Torino, CACE Technologies
- * nor the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
+ * 3. Neither the name of the Politecnico di Torino, CACE Technologies
+ * nor the names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -32,7 +32,7 @@
*/
/** @ingroup packetapi
- * @{
+ * @{
*/
/** @defgroup packet32h Packet.dll definitions and data structures
@@ -70,19 +70,19 @@ typedef struct _AirpcapHandle *PAirpcapHandle;
/// Alignment macro. Defines the alignment size.
#define Packet_ALIGNMENT sizeof(int)
-/// Alignment macro. Rounds up to the next even multiple of Packet_ALIGNMENT.
+/// Alignment macro. Rounds up to the next even multiple of Packet_ALIGNMENT.
#define Packet_WORDALIGN(x) (((x)+(Packet_ALIGNMENT-1))&~(Packet_ALIGNMENT-1))
-#define NdisMediumNull -1 ///< Custom linktype: NDIS doesn't provide an equivalent
-#define NdisMediumCHDLC -2 ///< Custom linktype: NDIS doesn't provide an equivalent
-#define NdisMediumPPPSerial -3 ///< Custom linktype: NDIS doesn't provide an equivalent
-#define NdisMediumBare80211 -4 ///< Custom linktype: NDIS doesn't provide an equivalent
-#define NdisMediumRadio80211 -5 ///< Custom linktype: NDIS doesn't provide an equivalent
-#define NdisMediumPpi -6 ///< Custom linktype: NDIS doesn't provide an equivalent
+#define NdisMediumNull -1 ///< Custom linktype: NDIS doesn't provide an equivalent
+#define NdisMediumCHDLC -2 ///< Custom linktype: NDIS doesn't provide an equivalent
+#define NdisMediumPPPSerial -3 ///< Custom linktype: NDIS doesn't provide an equivalent
+#define NdisMediumBare80211 -4 ///< Custom linktype: NDIS doesn't provide an equivalent
+#define NdisMediumRadio80211 -5 ///< Custom linktype: NDIS doesn't provide an equivalent
+#define NdisMediumPpi -6 ///< Custom linktype: NDIS doesn't provide an equivalent
// Loopback behaviour definitions
-#define NPF_DISABLE_LOOPBACK 1 ///< Drop the packets sent by the NPF driver
-#define NPF_ENABLE_LOOPBACK 2 ///< Capture the packets sent by the NPF driver
+#define NPF_DISABLE_LOOPBACK 1 ///< Drop the packets sent by the NPF driver
+#define NPF_ENABLE_LOOPBACK 2 ///< Capture the packets sent by the NPF driver
/*!
\brief Network type structure.
@@ -91,8 +91,8 @@ typedef struct _AirpcapHandle *PAirpcapHandle;
*/
typedef struct NetType
{
- UINT LinkType; ///< The MAC of the current network adapter (see function PacketGetNetType() for more information)
- ULONGLONG LinkSpeed; ///< The speed of the network in bits per second
+ UINT LinkType; ///< The MAC of the current network adapter (see function PacketGetNetType() for more information)
+ ULONGLONG LinkSpeed; ///< The speed of the network in bits per second
}NetType;
@@ -103,12 +103,12 @@ typedef struct NetType
/*!
\brief A BPF pseudo-assembly program.
- The program will be injected in the kernel by the PacketSetBPF() function and applied to every incoming packet.
+ The program will be injected in the kernel by the PacketSetBPF() function and applied to every incoming packet.
*/
-struct bpf_program
+struct bpf_program
{
- UINT bf_len; ///< Indicates the number of instructions of the program, i.e. the number of struct bpf_insn that will follow.
- struct bpf_insn *bf_insns; ///< A pointer to the first instruction of the program.
+ UINT bf_len; ///< Indicates the number of instructions of the program, i.e. the number of struct bpf_insn that will follow.
+ struct bpf_insn *bf_insns; ///< A pointer to the first instruction of the program.
};
/*!
@@ -116,12 +116,12 @@ struct bpf_program
bpf_insn contains a single instruction for the BPF register-machine. It is used to send a filter program to the driver.
*/
-struct bpf_insn
+struct bpf_insn
{
- USHORT code; ///< Instruction type and addressing mode.
- UCHAR jt; ///< Jump if true
- UCHAR jf; ///< Jump if false
- int k; ///< Generic field used for various purposes.
+ USHORT code; ///< Instruction type and addressing mode.
+ UCHAR jt; ///< Jump if true
+ UCHAR jf; ///< Jump if false
+ int k; ///< Generic field used for various purposes.
};
/*!
@@ -129,16 +129,16 @@ struct bpf_insn
It is used by packet.dll to return statistics about a capture session.
*/
-struct bpf_stat
+struct bpf_stat
{
- UINT bs_recv; ///< Number of packets that the driver received from the network adapter
- ///< from the beginning of the current capture. This value includes the packets
+ UINT bs_recv; ///< Number of packets that the driver received from the network adapter
+ ///< from the beginning of the current capture. This value includes the packets
///< lost by the driver.
- UINT bs_drop; ///< number of packets that the driver lost from the beginning of a capture.
- ///< Basically, a packet is lost when the the buffer of the driver is full.
+ UINT bs_drop; ///< number of packets that the driver lost from the beginning of a capture.
+ ///< Basically, a packet is lost when the the buffer of the driver is full.
///< In this situation the packet cannot be stored and the driver rejects it.
- UINT ps_ifdrop; ///< drops by interface. XXX not yet supported
- UINT bs_capt; ///< number of packets that pass the filter, find place in the kernel buffer and
+ UINT ps_ifdrop; ///< drops by interface. XXX not yet supported
+ UINT bs_capt; ///< number of packets that pass the filter, find place in the kernel buffer and
///< thus reach the application.
};
@@ -147,17 +147,17 @@ struct bpf_stat
This structure defines the header associated with every packet delivered to the application.
*/
-struct bpf_hdr
+struct bpf_hdr
{
- struct timeval bh_tstamp; ///< The timestamp associated with the captured packet.
+ struct timeval bh_tstamp; ///< The timestamp associated with the captured packet.
///< It is stored in a TimeVal structure.
- UINT bh_caplen; ///< Length of captured portion. The captured portion <b>can be different</b>
+ UINT bh_caplen; ///< Length of captured portion. The captured portion <b>can be different</b>
///< from the original packet, because it is possible (with a proper filter)
///< to instruct the driver to capture only a portion of the packets.
- UINT bh_datalen; ///< Original length of packet
- USHORT bh_hdrlen; ///< Length of bpf header (this struct plus alignment padding). In some cases,
+ UINT bh_datalen; ///< Original length of packet
+ USHORT bh_hdrlen; ///< Length of bpf header (this struct plus alignment padding). In some cases,
///< a padding could be added between the end of this structure and the packet
- ///< data for performance reasons. This filed can be used to retrieve the actual data
+ ///< data for performance reasons. This filed can be used to retrieve the actual data
///< of the packet.
};
@@ -169,11 +169,11 @@ struct bpf_hdr
packet in a dump file. This makes straightforward sending WinPcap dump files to the network.
*/
struct dump_bpf_hdr{
- struct timeval ts; ///< Time stamp of the packet
- UINT caplen; ///< Length of captured portion. The captured portion can smaller than the
- ///< the original packet, because it is possible (with a proper filter) to
- ///< instruct the driver to capture only a portion of the packets.
- UINT len; ///< Length of the original packet (off wire).
+ struct timeval ts; ///< Time stamp of the packet
+ UINT caplen; ///< Length of captured portion. The captured portion can smaller than the
+ ///< the original packet, because it is possible (with a proper filter) to
+ ///< instruct the driver to capture only a portion of the packets.
+ UINT len; ///< Length of the original packet (off wire).
};
@@ -181,39 +181,39 @@ struct dump_bpf_hdr{
struct bpf_stat;
-#define DOSNAMEPREFIX TEXT("Packet_") ///< Prefix added to the adapters device names to create the WinPcap devices
-#define MAX_LINK_NAME_LENGTH 64 //< Maximum length of the devices symbolic links
+#define DOSNAMEPREFIX TEXT("Packet_") ///< Prefix added to the adapters device names to create the WinPcap devices
+#define MAX_LINK_NAME_LENGTH 64 //< Maximum length of the devices symbolic links
#define NMAX_PACKET 65535
/*!
\brief Addresses of a network adapter.
- This structure is used by the PacketGetNetInfoEx() function to return the IP addresses associated with
+ This structure is used by the PacketGetNetInfoEx() function to return the IP addresses associated with
an adapter.
*/
typedef struct npf_if_addr {
- struct sockaddr_storage IPAddress; ///< IP address.
- struct sockaddr_storage SubnetMask; ///< Netmask for that address.
- struct sockaddr_storage Broadcast; ///< Broadcast address.
+ struct sockaddr_storage IPAddress; ///< IP address.
+ struct sockaddr_storage SubnetMask; ///< Netmask for that address.
+ struct sockaddr_storage Broadcast; ///< Broadcast address.
}npf_if_addr;
-#define ADAPTER_NAME_LENGTH 256 + 12 ///< Maximum length for the name of an adapter. The value is the same used by the IP Helper API.
-#define ADAPTER_DESC_LENGTH 128 ///< Maximum length for the description of an adapter. The value is the same used by the IP Helper API.
-#define MAX_MAC_ADDR_LENGTH 8 ///< Maximum length for the link layer address of an adapter. The value is the same used by the IP Helper API.
-#define MAX_NETWORK_ADDRESSES 16 ///< Maximum length for the link layer address of an adapter. The value is the same used by the IP Helper API.
+#define ADAPTER_NAME_LENGTH 256 + 12 ///< Maximum length for the name of an adapter. The value is the same used by the IP Helper API.
+#define ADAPTER_DESC_LENGTH 128 ///< Maximum length for the description of an adapter. The value is the same used by the IP Helper API.
+#define MAX_MAC_ADDR_LENGTH 8 ///< Maximum length for the link layer address of an adapter. The value is the same used by the IP Helper API.
+#define MAX_NETWORK_ADDRESSES 16 ///< Maximum length for the link layer address of an adapter. The value is the same used by the IP Helper API.
typedef struct WAN_ADAPTER_INT WAN_ADAPTER; ///< Describes an opened wan (dialup, VPN...) network adapter using the NetMon API
typedef WAN_ADAPTER *PWAN_ADAPTER; ///< Describes an opened wan (dialup, VPN...) network adapter using the NetMon API
-#define INFO_FLAG_NDIS_ADAPTER 0 ///< Flag for ADAPTER_INFO: this is a traditional ndis adapter
-#define INFO_FLAG_NDISWAN_ADAPTER 1 ///< Flag for ADAPTER_INFO: this is a NdisWan adapter, and it's managed by WANPACKET
-#define INFO_FLAG_DAG_CARD 2 ///< Flag for ADAPTER_INFO: this is a DAG card
-#define INFO_FLAG_DAG_FILE 6 ///< Flag for ADAPTER_INFO: this is a DAG file
-#define INFO_FLAG_DONT_EXPORT 8 ///< Flag for ADAPTER_INFO: when this flag is set, the adapter will not be listed or openend by winpcap. This allows to prevent exporting broken network adapters, like for example FireWire ones.
-#define INFO_FLAG_AIRPCAP_CARD 16 ///< Flag for ADAPTER_INFO: this is an airpcap card
-#define INFO_FLAG_NPFIM_DEVICE 32
+#define INFO_FLAG_NDIS_ADAPTER 0 ///< Flag for ADAPTER_INFO: this is a traditional ndis adapter
+#define INFO_FLAG_NDISWAN_ADAPTER 1 ///< Flag for ADAPTER_INFO: this is a NdisWan adapter, and it's managed by WANPACKET
+#define INFO_FLAG_DAG_CARD 2 ///< Flag for ADAPTER_INFO: this is a DAG card
+#define INFO_FLAG_DAG_FILE 6 ///< Flag for ADAPTER_INFO: this is a DAG file
+#define INFO_FLAG_DONT_EXPORT 8 ///< Flag for ADAPTER_INFO: when this flag is set, the adapter will not be listed or openend by winpcap. This allows to prevent exporting broken network adapters, like for example FireWire ones.
+#define INFO_FLAG_AIRPCAP_CARD 16 ///< Flag for ADAPTER_INFO: this is an airpcap card
+#define INFO_FLAG_NPFIM_DEVICE 32
/*!
\brief Describes an opened network adapter.
@@ -221,27 +221,27 @@ typedef WAN_ADAPTER *PWAN_ADAPTER; ///< Describes an opened wan (dialup, VPN...)
This structure is the most important for the functioning of packet.dll, but the great part of its fields
should be ignored by the user, since the library offers functions that avoid to cope with low-level parameters
*/
-typedef struct _ADAPTER {
- HANDLE hFile; ///< \internal Handle to an open instance of the NPF driver.
+typedef struct _ADAPTER {
+ HANDLE hFile; ///< \internal Handle to an open instance of the NPF driver.
CHAR SymbolicLink[MAX_LINK_NAME_LENGTH]; ///< \internal A string containing the name of the network adapter currently opened.
- int NumWrites; ///< \internal Number of times a packets written on this adapter will be repeated
+ int NumWrites; ///< \internal Number of times a packets written on this adapter will be repeated
///< on the wire.
- HANDLE ReadEvent; ///< A notification event associated with the read calls on the adapter.
+ HANDLE ReadEvent; ///< A notification event associated with the read calls on the adapter.
///< It can be passed to standard Win32 functions (like WaitForSingleObject
- ///< or WaitForMultipleObjects) to wait until the driver's buffer contains some
- ///< data. It is particularly useful in GUI applications that need to wait
+ ///< or WaitForMultipleObjects) to wait until the driver's buffer contains some
+ ///< data. It is particularly useful in GUI applications that need to wait
///< concurrently on several events. In Windows NT/2000 the PacketSetMinToCopy()
///< function can be used to define the minimum amount of data in the kernel buffer
- ///< that will cause the event to be signalled.
-
- UINT ReadTimeOut; ///< \internal The amount of time after which a read on the driver will be released and
+ ///< that will cause the event to be signalled.
+
+ UINT ReadTimeOut; ///< \internal The amount of time after which a read on the driver will be released and
///< ReadEvent will be signaled, also if no packets were captured
CHAR Name[ADAPTER_NAME_LENGTH];
PWAN_ADAPTER pWanAdapter;
- UINT Flags; ///< Adapter's flags. Tell if this adapter must be treated in a different way, using the Netmon API or the dagc API.
+ UINT Flags; ///< Adapter's flags. Tell if this adapter must be treated in a different way, using the Netmon API or the dagc API.
#ifdef HAVE_AIRPCAP_API
- PAirpcapHandle AirpcapAd;
+ PAirpcapHandle AirpcapAd;
#endif // HAVE_AIRPCAP_API
#ifdef HAVE_NPFIM_API
@@ -249,11 +249,11 @@ typedef struct _ADAPTER {
#endif // HAVE_NPFIM_API
#ifdef HAVE_DAG_API
- dagc_t *pDagCard; ///< Pointer to the dagc API adapter descriptor for this adapter
- PCHAR DagBuffer; ///< Pointer to the buffer with the packets that is received from the DAG card
- struct timeval DagReadTimeout; ///< Read timeout. The dagc API requires a timeval structure
- unsigned DagFcsLen; ///< Length of the frame check sequence attached to any packet by the card. Obtained from the registry
- DWORD DagFastProcess; ///< True if the user requests fast capture processing on this card. Higher level applications can use this value to provide a faster but possibly unprecise capture (for example, libpcap doesn't convert the timestamps).
+ dagc_t *pDagCard; ///< Pointer to the dagc API adapter descriptor for this adapter
+ PCHAR DagBuffer; ///< Pointer to the buffer with the packets that is received from the DAG card
+ struct timeval DagReadTimeout; ///< Read timeout. The dagc API requires a timeval structure
+ unsigned DagFcsLen; ///< Length of the frame check sequence attached to any packet by the card. Obtained from the registry
+ DWORD DagFastProcess; ///< True if the user requests fast capture processing on this card. Higher level applications can use this value to provide a faster but possibly unprecise capture (for example, libpcap doesn't convert the timestamps).
#endif // HAVE_DAG_API
} ADAPTER, *LPADAPTER;
@@ -262,31 +262,31 @@ typedef struct _ADAPTER {
This structure defines the header associated with every packet delivered to the application.
*/
-typedef struct _PACKET {
- HANDLE hEvent; ///< \deprecated Still present for compatibility with old applications.
- OVERLAPPED OverLapped; ///< \deprecated Still present for compatibility with old applications.
- PVOID Buffer; ///< Buffer with containing the packets. See the PacketReceivePacket() for
+typedef struct _PACKET {
+ HANDLE hEvent; ///< \deprecated Still present for compatibility with old applications.
+ OVERLAPPED OverLapped; ///< \deprecated Still present for compatibility with old applications.
+ PVOID Buffer; ///< Buffer with containing the packets. See the PacketReceivePacket() for
///< details about the organization of the data in this buffer
- UINT Length; ///< Length of the buffer
- DWORD ulBytesReceived; ///< Number of valid bytes present in the buffer, i.e. amount of data
+ UINT Length; ///< Length of the buffer
+ DWORD ulBytesReceived; ///< Number of valid bytes present in the buffer, i.e. amount of data
///< received by the last call to PacketReceivePacket()
- BOOLEAN bIoComplete; ///< \deprecated Still present for compatibility with old applications.
+ BOOLEAN bIoComplete; ///< \deprecated Still present for compatibility with old applications.
} PACKET, *LPPACKET;
/*!
\brief Structure containing an OID request.
- It is used by the PacketRequest() function to send an OID to the interface card driver.
- It can be used, for example, to retrieve the status of the error counters on the adapter, its MAC address,
+ It is used by the PacketRequest() function to send an OID to the interface card driver.
+ It can be used, for example, to retrieve the status of the error counters on the adapter, its MAC address,
the list of the multicast groups defined on it, and so on.
*/
struct _PACKET_OID_DATA {
- ULONG Oid; ///< OID code. See the Microsoft DDK documentation or the file ntddndis.h
+ ULONG Oid; ///< OID code. See the Microsoft DDK documentation or the file ntddndis.h
///< for a complete list of valid codes.
- ULONG Length; ///< Length of the data field
- UCHAR Data[1]; ///< variable-lenght field that contains the information passed to or received
+ ULONG Length; ///< Length of the data field
+ UCHAR Data[1]; ///< variable-lenght field that contains the information passed to or received
///< from the adapter.
-};
+};
typedef struct _PACKET_OID_DATA PACKET_OID_DATA, *PPACKET_OID_DATA;
#ifdef __cplusplus
@@ -299,16 +299,16 @@ extern "C" {
/*
BOOLEAN QueryWinPcapRegistryStringA(CHAR *SubKeyName,
- CHAR *Value,
- UINT *pValueLen,
- CHAR *DefaultVal);
+ CHAR *Value,
+ UINT *pValueLen,
+ CHAR *DefaultVal);
BOOLEAN QueryWinPcapRegistryStringW(WCHAR *SubKeyName,
- WCHAR *Value,
- UINT *pValueLen,
- WCHAR *DefaultVal);
+ WCHAR *Value,
+ UINT *pValueLen,
+ WCHAR *DefaultVal);
*/
-
+
//---------------------------------------------------------------------------
// EXPORTED FUNCTIONS
//---------------------------------------------------------------------------
@@ -350,10 +350,10 @@ PAirpcapHandle PacketGetAirPcapHandle(LPADAPTER AdapterObject);
//
// Used by PacketStartOemEx
//
-#define PACKET_START_OEM_NO_NETMON 0x00000001
+#define PACKET_START_OEM_NO_NETMON 0x00000001
#ifdef __cplusplus
}
-#endif
+#endif
#endif //__PACKET32
diff --git a/src/lib/winpcap/Win32-Extensions.h b/src/lib/winpcap/Win32-Extensions.h
index ad3be25cfaf..b698c1e287b 100644
--- a/src/lib/winpcap/Win32-Extensions.h
+++ b/src/lib/winpcap/Win32-Extensions.h
@@ -12,9 +12,9 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Politecnico di Torino, CACE Technologies
- * nor the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
+ * 3. Neither the name of the Politecnico di Torino, CACE Technologies
+ * nor the names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -45,9 +45,9 @@ extern "C" {
*/
struct pcap_send_queue
{
- u_int maxlen; ///< Maximum size of the the queue, in bytes. This variable contains the size of the buffer field.
- u_int len; ///< Current size of the queue, in bytes.
- char *buffer; ///< Buffer containing the packets to be sent.
+ u_int maxlen; ///< Maximum size of the the queue, in bytes. This variable contains the size of the buffer field.
+ u_int len; ///< Current size of the queue, in bytes.
+ char *buffer; ///< Buffer containing the packets to be sent.
};
typedef struct pcap_send_queue pcap_send_queue;
@@ -60,26 +60,26 @@ typedef struct pcap_send_queue pcap_send_queue;
typedef struct _AirpcapHandle *PAirpcapHandle;
#endif
-#define BPF_MEM_EX_IMM 0xc0
-#define BPF_MEM_EX_IND 0xe0
+#define BPF_MEM_EX_IMM 0xc0
+#define BPF_MEM_EX_IND 0xe0
/*used for ST*/
-#define BPF_MEM_EX 0xc0
-#define BPF_TME 0x08
-
-#define BPF_LOOKUP 0x90
-#define BPF_EXECUTE 0xa0
-#define BPF_INIT 0xb0
-#define BPF_VALIDATE 0xc0
-#define BPF_SET_ACTIVE 0xd0
-#define BPF_RESET 0xe0
-#define BPF_SET_MEMORY 0x80
-#define BPF_GET_REGISTER_VALUE 0x70
-#define BPF_SET_REGISTER_VALUE 0x60
-#define BPF_SET_WORKING 0x50
-#define BPF_SET_ACTIVE_READ 0x40
-#define BPF_SET_AUTODELETION 0x30
-#define BPF_SEPARATION 0xff
+#define BPF_MEM_EX 0xc0
+#define BPF_TME 0x08
+
+#define BPF_LOOKUP 0x90
+#define BPF_EXECUTE 0xa0
+#define BPF_INIT 0xb0
+#define BPF_VALIDATE 0xc0
+#define BPF_SET_ACTIVE 0xd0
+#define BPF_RESET 0xe0
+#define BPF_SET_MEMORY 0x80
+#define BPF_GET_REGISTER_VALUE 0x70
+#define BPF_SET_REGISTER_VALUE 0x60
+#define BPF_SET_WORKING 0x50
+#define BPF_SET_ACTIVE_READ 0x40
+#define BPF_SET_AUTODELETION 0x30
+#define BPF_SEPARATION 0xff
/* Prototypes */
pcap_send_queue* pcap_sendqueue_alloc(u_int memsize);
diff --git a/src/lib/winpcap/bittypes.h b/src/lib/winpcap/bittypes.h
index c9d3b177c09..d9fed096fcb 100644
--- a/src/lib/winpcap/bittypes.h
+++ b/src/lib/winpcap/bittypes.h
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -13,7 +13,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -45,7 +45,7 @@ typedef signed int int8_t;
#endif /* HAVE_U_INT8_T */
-#ifndef HAVE_U_INT16_T
+#ifndef HAVE_U_INT16_T
#if SIZEOF_SHORT == 2
typedef unsigned short u_int16_t;
@@ -104,33 +104,33 @@ typedef unsigned short u_int64_t;
#ifndef PRId64
#ifdef _MSC_EXTENSIONS
-#define PRId64 "I64d"
+#define PRId64 "I64d"
#else /* _MSC_EXTENSIONS */
-#define PRId64 "lld"
+#define PRId64 "lld"
#endif /* _MSC_EXTENSIONS */
#endif /* PRId64 */
#ifndef PRIo64
#ifdef _MSC_EXTENSIONS
-#define PRIo64 "I64o"
+#define PRIo64 "I64o"
#else /* _MSC_EXTENSIONS */
-#define PRIo64 "llo"
+#define PRIo64 "llo"
#endif /* _MSC_EXTENSIONS */
#endif /* PRIo64 */
#ifndef PRIx64
#ifdef _MSC_EXTENSIONS
-#define PRIx64 "I64x"
+#define PRIx64 "I64x"
#else /* _MSC_EXTENSIONS */
-#define PRIx64 "llx"
+#define PRIx64 "llx"
#endif /* _MSC_EXTENSIONS */
#endif /* PRIx64 */
#ifndef PRIu64
#ifdef _MSC_EXTENSIONS
-#define PRIu64 "I64u"
+#define PRIu64 "I64u"
#else /* _MSC_EXTENSIONS */
-#define PRIu64 "llu"
+#define PRIu64 "llu"
#endif /* _MSC_EXTENSIONS */
#endif /* PRIu64 */
diff --git a/src/lib/winpcap/ip6_misc.h b/src/lib/winpcap/ip6_misc.h
index 562fa6184e7..b25068801d1 100644
--- a/src/lib/winpcap/ip6_misc.h
+++ b/src/lib/winpcap/ip6_misc.h
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1993, 1994, 1997
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that: (1) source code distributions
@@ -30,28 +30,28 @@
#include <ws2tcpip.h>
#ifndef __MINGW32__
-#define IN_MULTICAST(a) IN_CLASSD(a)
+#define IN_MULTICAST(a) IN_CLASSD(a)
#endif
-#define IN_EXPERIMENTAL(a) ((((u_int32_t) (a)) & 0xf0000000) == 0xf0000000)
+#define IN_EXPERIMENTAL(a) ((((u_int32_t) (a)) & 0xf0000000) == 0xf0000000)
-#define IN_LOOPBACKNET 127
+#define IN_LOOPBACKNET 127
#if defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF)
/* IPv6 address */
struct in6_addr
- {
- union
- {
- u_int8_t u6_addr8[16];
- u_int16_t u6_addr16[8];
- u_int32_t u6_addr32[4];
- } in6_u;
-#define s6_addr in6_u.u6_addr8
-#define s6_addr16 in6_u.u6_addr16
-#define s6_addr32 in6_u.u6_addr32
-#define s6_addr64 in6_u.u6_addr64
- };
+ {
+ union
+ {
+ u_int8_t u6_addr8[16];
+ u_int16_t u6_addr16[8];
+ u_int32_t u6_addr32[4];
+ } in6_u;
+#define s6_addr in6_u.u6_addr8
+#define s6_addr16 in6_u.u6_addr16
+#define s6_addr32 in6_u.u6_addr32
+#define s6_addr64 in6_u.u6_addr64
+ };
#define IN6ADDR_ANY_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }
@@ -59,27 +59,27 @@ struct in6_addr
#if (defined _MSC_VER) || (defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF))
-typedef unsigned short sa_family_t;
+typedef unsigned short sa_family_t;
#endif
#if defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF)
-#define __SOCKADDR_COMMON(sa_prefix) \
- sa_family_t sa_prefix##family
+#define __SOCKADDR_COMMON(sa_prefix) \
+ sa_family_t sa_prefix##family
/* Ditto, for IPv6. */
struct sockaddr_in6
- {
- __SOCKADDR_COMMON (sin6_);
- u_int16_t sin6_port; /* Transport layer port # */
- u_int32_t sin6_flowinfo; /* IPv6 flow information */
- struct in6_addr sin6_addr; /* IPv6 address */
- };
+ {
+ __SOCKADDR_COMMON (sin6_);
+ u_int16_t sin6_port; /* Transport layer port # */
+ u_int32_t sin6_flowinfo; /* IPv6 flow information */
+ struct in6_addr sin6_addr; /* IPv6 address */
+ };
#define IN6_IS_ADDR_V4MAPPED(a) \
((((u_int32_t *) (a))[0] == 0) && (((u_int32_t *) (a))[1] == 0) && \
- (((u_int32_t *) (a))[2] == htonl (0xffff)))
+ (((u_int32_t *) (a))[2] == htonl (0xffff)))
#define IN6_IS_ADDR_MULTICAST(a) (((u_int8_t *) (a))[0] == 0xff)
@@ -88,7 +88,7 @@ struct sockaddr_in6
#define IN6_IS_ADDR_LOOPBACK(a) \
(((u_int32_t *) (a))[0] == 0 && ((u_int32_t *) (a))[1] == 0 && \
- ((u_int32_t *) (a))[2] == 0 && ((u_int32_t *) (a))[3] == htonl (1))
+ ((u_int32_t *) (a))[2] == 0 && ((u_int32_t *) (a))[3] == htonl (1))
#endif /* __MINGW32__ */
#define ip6_vfc ip6_ctlun.ip6_un2_vfc
@@ -104,60 +104,60 @@ struct sockaddr_in6
#define nd_rd_reserved nd_rd_hdr.icmp6_data32[0]
/*
- * IPV6 extension headers
+ * IPV6 extension headers
*/
-#define IPPROTO_HOPOPTS 0 /* IPv6 hop-by-hop options */
-#define IPPROTO_IPV6 41 /* IPv6 header. */
-#define IPPROTO_ROUTING 43 /* IPv6 routing header */
-#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */
-#define IPPROTO_ESP 50 /* encapsulating security payload */
-#define IPPROTO_AH 51 /* authentication header */
-#define IPPROTO_ICMPV6 58 /* ICMPv6 */
-#define IPPROTO_NONE 59 /* IPv6 no next header */
-#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */
-#define IPPROTO_PIM 103 /* Protocol Independent Multicast. */
-
-#define IPV6_RTHDR_TYPE_0 0
+#define IPPROTO_HOPOPTS 0 /* IPv6 hop-by-hop options */
+#define IPPROTO_IPV6 41 /* IPv6 header. */
+#define IPPROTO_ROUTING 43 /* IPv6 routing header */
+#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */
+#define IPPROTO_ESP 50 /* encapsulating security payload */
+#define IPPROTO_AH 51 /* authentication header */
+#define IPPROTO_ICMPV6 58 /* ICMPv6 */
+#define IPPROTO_NONE 59 /* IPv6 no next header */
+#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */
+#define IPPROTO_PIM 103 /* Protocol Independent Multicast. */
+
+#define IPV6_RTHDR_TYPE_0 0
/* Option types and related macros */
-#define IP6OPT_PAD1 0x00 /* 00 0 00000 */
-#define IP6OPT_PADN 0x01 /* 00 0 00001 */
-#define IP6OPT_JUMBO 0xC2 /* 11 0 00010 = 194 */
-#define IP6OPT_JUMBO_LEN 6
-#define IP6OPT_ROUTER_ALERT 0x05 /* 00 0 00101 */
+#define IP6OPT_PAD1 0x00 /* 00 0 00000 */
+#define IP6OPT_PADN 0x01 /* 00 0 00001 */
+#define IP6OPT_JUMBO 0xC2 /* 11 0 00010 = 194 */
+#define IP6OPT_JUMBO_LEN 6
+#define IP6OPT_ROUTER_ALERT 0x05 /* 00 0 00101 */
-#define IP6OPT_RTALERT_LEN 4
-#define IP6OPT_RTALERT_MLD 0 /* Datagram contains an MLD message */
-#define IP6OPT_RTALERT_RSVP 1 /* Datagram contains an RSVP message */
-#define IP6OPT_RTALERT_ACTNET 2 /* contains an Active Networks msg */
-#define IP6OPT_MINLEN 2
+#define IP6OPT_RTALERT_LEN 4
+#define IP6OPT_RTALERT_MLD 0 /* Datagram contains an MLD message */
+#define IP6OPT_RTALERT_RSVP 1 /* Datagram contains an RSVP message */
+#define IP6OPT_RTALERT_ACTNET 2 /* contains an Active Networks msg */
+#define IP6OPT_MINLEN 2
-#define IP6OPT_BINDING_UPDATE 0xc6 /* 11 0 00110 */
-#define IP6OPT_BINDING_ACK 0x07 /* 00 0 00111 */
-#define IP6OPT_BINDING_REQ 0x08 /* 00 0 01000 */
-#define IP6OPT_HOME_ADDRESS 0xc9 /* 11 0 01001 */
-#define IP6OPT_EID 0x8a /* 10 0 01010 */
+#define IP6OPT_BINDING_UPDATE 0xc6 /* 11 0 00110 */
+#define IP6OPT_BINDING_ACK 0x07 /* 00 0 00111 */
+#define IP6OPT_BINDING_REQ 0x08 /* 00 0 01000 */
+#define IP6OPT_HOME_ADDRESS 0xc9 /* 11 0 01001 */
+#define IP6OPT_EID 0x8a /* 10 0 01010 */
-#define IP6OPT_TYPE(o) ((o) & 0xC0)
-#define IP6OPT_TYPE_SKIP 0x00
-#define IP6OPT_TYPE_DISCARD 0x40
-#define IP6OPT_TYPE_FORCEICMP 0x80
-#define IP6OPT_TYPE_ICMP 0xC0
+#define IP6OPT_TYPE(o) ((o) & 0xC0)
+#define IP6OPT_TYPE_SKIP 0x00
+#define IP6OPT_TYPE_DISCARD 0x40
+#define IP6OPT_TYPE_FORCEICMP 0x80
+#define IP6OPT_TYPE_ICMP 0xC0
-#define IP6OPT_MUTABLE 0x20
+#define IP6OPT_MUTABLE 0x20
#if defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF)
#ifndef EAI_ADDRFAMILY
struct addrinfo {
- int ai_flags; /* AI_PASSIVE, AI_CANONNAME */
- int ai_family; /* PF_xxx */
- int ai_socktype; /* SOCK_xxx */
- int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
- size_t ai_addrlen; /* length of ai_addr */
- char *ai_canonname; /* canonical name for hostname */
- struct sockaddr *ai_addr; /* binary address */
- struct addrinfo *ai_next; /* next structure in linked list */
+ int ai_flags; /* AI_PASSIVE, AI_CANONNAME */
+ int ai_family; /* PF_xxx */
+ int ai_socktype; /* SOCK_xxx */
+ int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+ size_t ai_addrlen; /* length of ai_addr */
+ char *ai_canonname; /* canonical name for hostname */
+ struct sockaddr *ai_addr; /* binary address */
+ struct addrinfo *ai_next; /* next structure in linked list */
};
#endif
#endif /* __MINGW32__ */
diff --git a/src/lib/winpcap/pcap-bpf.h b/src/lib/winpcap/pcap-bpf.h
index 5fe129dbb49..b272e63002a 100644
--- a/src/lib/winpcap/pcap-bpf.h
+++ b/src/lib/winpcap/pcap-bpf.h
@@ -1,10 +1,10 @@
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from the Stanford/CMU enet packet filter,
* (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
+ * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
* Berkeley Laboratory.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/winpcap/pcap-namedb.h b/src/lib/winpcap/pcap-namedb.h
index 80a2f004012..c1e255ca22a 100644
--- a/src/lib/winpcap/pcap-namedb.h
+++ b/src/lib/winpcap/pcap-namedb.h
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1994, 1996
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -12,8 +12,8 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
- * This product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
+ * This product includes software developed by the Computer Systems
+ * Engineering Group at Lawrence Berkeley Laboratory.
* 4. Neither the name of the University nor of the Laboratory may be used
* to endorse or promote products derived from this software without
* specific prior written permission.
diff --git a/src/lib/winpcap/pcap-stdinc.h b/src/lib/winpcap/pcap-stdinc.h
index ae67996495e..66dda2e3c25 100644
--- a/src/lib/winpcap/pcap-stdinc.h
+++ b/src/lib/winpcap/pcap-stdinc.h
@@ -39,7 +39,7 @@
#endif
/*
- * Avoids a compiler warning in case this was already defined
+ * Avoids a compiler warning in case this was already defined
* (someone defined _WINSOCKAPI_ when including 'windows.h', in order
* to prevent it from including 'winsock.h')
*/
@@ -67,7 +67,7 @@
#endif
#if defined(_MSC_VER) && (_MSC_VER < 1700)
-#define inline __inline
+#define inline __inline
#endif
#ifdef __MINGW32__
@@ -90,6 +90,6 @@ typedef __int64 intptr_t;
typedef _W64 int intptr_t;
#endif
#define _INTPTR_T_DEFINED
-#endif
+#endif
#endif /*__MINGW32__*/
diff --git a/src/lib/winpcap/pcap.h b/src/lib/winpcap/pcap.h
index 935f9494c10..8540af309c4 100644
--- a/src/lib/winpcap/pcap.h
+++ b/src/lib/winpcap/pcap.h
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -12,8 +12,8 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
- * This product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
+ * This product includes software developed by the Computer Systems
+ * Engineering Group at Lawrence Berkeley Laboratory.
* 4. Neither the name of the University nor of the Laboratory may be used
* to endorse or promote products derived from this software without
* specific prior written permission.
diff --git a/src/lib/winpcap/pcap/bluetooth.h b/src/lib/winpcap/pcap/bluetooth.h
index 7bf65df034f..45354b3cca4 100644
--- a/src/lib/winpcap/pcap/bluetooth.h
+++ b/src/lib/winpcap/pcap/bluetooth.h
@@ -11,8 +11,8 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- * products derived from this software without specific prior written
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -32,7 +32,7 @@
*
* @(#) $Header: /tcpdump/master/libpcap/pcap/bluetooth.h,v 1.1 2007/09/22 02:10:17 guy Exp $
*/
-
+
#ifndef _PCAP_BLUETOOTH_STRUCTS_H__
#define _PCAP_BLUETOOTH_STRUCTS_H__
diff --git a/src/lib/winpcap/pcap/bpf.h b/src/lib/winpcap/pcap/bpf.h
index 9f4ca33e350..da117a161b8 100644
--- a/src/lib/winpcap/pcap/bpf.h
+++ b/src/lib/winpcap/pcap/bpf.h
@@ -1,10 +1,10 @@
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from the Stanford/CMU enet packet filter,
* (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
+ * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
* Berkeley Laboratory.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,13 +64,13 @@ extern "C" {
typedef long bpf_int32;
typedef unsigned long bpf_u_int32;
#else
-typedef int bpf_int32;
-typedef u_int bpf_u_int32;
+typedef int bpf_int32;
+typedef u_int bpf_u_int32;
#endif
/*
- * Alignment macros. BPF_WORDALIGN rounds up to the next
- * even multiple of BPF_ALIGNMENT.
+ * Alignment macros. BPF_WORDALIGN rounds up to the next
+ * even multiple of BPF_ALIGNMENT.
*/
#ifndef __NetBSD__
#define BPF_ALIGNMENT sizeof(bpf_int32)
@@ -89,9 +89,9 @@ struct bpf_program {
u_int bf_len;
struct bpf_insn *bf_insns;
};
-
+
/*
- * Struct return by BIOCVERSION. This represents the version number of
+ * Struct return by BIOCVERSION. This represents the version number of
* the filter language described by the instruction encodings below.
* bpf understands a program iff kernel_major == filter_major &&
* kernel_minor >= filter_minor, that is, if the value returned by the
@@ -125,17 +125,17 @@ struct bpf_version {
* These are the types that are the same on all platforms, and that
* have been defined by <net/bpf.h> for ages.
*/
-#define DLT_NULL 0 /* BSD loopback encapsulation */
-#define DLT_EN10MB 1 /* Ethernet (10Mb) */
-#define DLT_EN3MB 2 /* Experimental Ethernet (3Mb) */
-#define DLT_AX25 3 /* Amateur Radio AX.25 */
-#define DLT_PRONET 4 /* Proteon ProNET Token Ring */
-#define DLT_CHAOS 5 /* Chaos */
-#define DLT_IEEE802 6 /* 802.5 Token Ring */
-#define DLT_ARCNET 7 /* ARCNET, with BSD-style header */
-#define DLT_SLIP 8 /* Serial Line IP */
-#define DLT_PPP 9 /* Point-to-point Protocol */
-#define DLT_FDDI 10 /* FDDI */
+#define DLT_NULL 0 /* BSD loopback encapsulation */
+#define DLT_EN10MB 1 /* Ethernet (10Mb) */
+#define DLT_EN3MB 2 /* Experimental Ethernet (3Mb) */
+#define DLT_AX25 3 /* Amateur Radio AX.25 */
+#define DLT_PRONET 4 /* Proteon ProNET Token Ring */
+#define DLT_CHAOS 5 /* Chaos */
+#define DLT_IEEE802 6 /* 802.5 Token Ring */
+#define DLT_ARCNET 7 /* ARCNET, with BSD-style header */
+#define DLT_SLIP 8 /* Serial Line IP */
+#define DLT_PPP 9 /* Point-to-point Protocol */
+#define DLT_FDDI 10 /* FDDI */
/*
* These are types that are different on some platforms, and that
@@ -146,12 +146,12 @@ struct bpf_version {
* XXX - DLT_ATM_RFC1483 is 13 in BSD/OS, and DLT_RAW is 14 in BSD/OS,
* but I don't know what the right #define is for BSD/OS.
*/
-#define DLT_ATM_RFC1483 11 /* LLC-encapsulated ATM */
+#define DLT_ATM_RFC1483 11 /* LLC-encapsulated ATM */
#ifdef __OpenBSD__
-#define DLT_RAW 14 /* raw IP */
+#define DLT_RAW 14 /* raw IP */
#else
-#define DLT_RAW 12 /* raw IP */
+#define DLT_RAW 12 /* raw IP */
#endif
/*
@@ -162,12 +162,12 @@ struct bpf_version {
*/
#if defined(__NetBSD__) || defined(__FreeBSD__)
#ifndef DLT_SLIP_BSDOS
-#define DLT_SLIP_BSDOS 13 /* BSD/OS Serial Line IP */
-#define DLT_PPP_BSDOS 14 /* BSD/OS Point-to-point Protocol */
+#define DLT_SLIP_BSDOS 13 /* BSD/OS Serial Line IP */
+#define DLT_PPP_BSDOS 14 /* BSD/OS Point-to-point Protocol */
#endif
#else
-#define DLT_SLIP_BSDOS 15 /* BSD/OS Serial Line IP */
-#define DLT_PPP_BSDOS 16 /* BSD/OS Point-to-point Protocol */
+#define DLT_SLIP_BSDOS 15 /* BSD/OS Serial Line IP */
+#define DLT_PPP_BSDOS 16 /* BSD/OS Point-to-point Protocol */
#endif
/*
@@ -176,21 +176,21 @@ struct bpf_version {
* 18 is used for DLT_PFSYNC in OpenBSD; don't use it for anything else.
*/
-#define DLT_ATM_CLIP 19 /* Linux Classical-IP over ATM */
+#define DLT_ATM_CLIP 19 /* Linux Classical-IP over ATM */
/*
* Apparently Redback uses this for its SmartEdge 400/800. I hope
* nobody else decided to use it, too.
*/
-#define DLT_REDBACK_SMARTEDGE 32
+#define DLT_REDBACK_SMARTEDGE 32
/*
* These values are defined by NetBSD; other platforms should refrain from
* using them for other purposes, so that NetBSD savefiles with link
* types of 50 or 51 can be read as this type on all platforms.
*/
-#define DLT_PPP_SERIAL 50 /* PPP over serial with HDLC encapsulation */
-#define DLT_PPP_ETHER 51 /* PPP over Ethernet */
+#define DLT_PPP_SERIAL 50 /* PPP over serial with HDLC encapsulation */
+#define DLT_PPP_ETHER 51 /* PPP over Ethernet */
/*
* The Axent Raptor firewall - now the Symantec Enterprise Firewall - uses
@@ -199,7 +199,7 @@ struct bpf_version {
* Ethernet type, and 36 bytes that appear to be 0 in at least one capture
* I've seen.
*/
-#define DLT_SYMANTEC_FIREWALL 99
+#define DLT_SYMANTEC_FIREWALL 99
/*
* Values between 100 and 103 are used in capture file headers as
@@ -221,10 +221,10 @@ struct bpf_version {
* libpcap 0.5 defined it as DLT_CHDLC; we define DLT_CHDLC as well,
* for source compatibility with programs written for libpcap 0.5.
*/
-#define DLT_C_HDLC 104 /* Cisco HDLC */
-#define DLT_CHDLC DLT_C_HDLC
+#define DLT_C_HDLC 104 /* Cisco HDLC */
+#define DLT_CHDLC DLT_C_HDLC
-#define DLT_IEEE802_11 105 /* IEEE 802.11 wireless */
+#define DLT_IEEE802_11 105 /* IEEE 802.11 wireless */
/*
* 106 is reserved for Linux Classical IP over ATM; it's like DLT_RAW,
@@ -239,7 +239,7 @@ struct bpf_version {
* DLT_FR and DLT_FRELAY packets start with the Q.922 Frame Relay header
* (DLCI, etc.).
*/
-#define DLT_FRELAY 107
+#define DLT_FRELAY 107
/*
* OpenBSD DLT_LOOP, for loopback devices; it's like DLT_NULL, except
@@ -249,9 +249,9 @@ struct bpf_version {
* we don't use 12 for it in OSes other than OpenBSD.
*/
#ifdef __OpenBSD__
-#define DLT_LOOP 12
+#define DLT_LOOP 12
#else
-#define DLT_LOOP 108
+#define DLT_LOOP 108
#endif
/*
@@ -260,9 +260,9 @@ struct bpf_version {
* than OpenBSD.
*/
#ifdef __OpenBSD__
-#define DLT_ENC 13
+#define DLT_ENC 13
#else
-#define DLT_ENC 109
+#define DLT_ENC 109
#endif
/*
@@ -275,22 +275,22 @@ struct bpf_version {
/*
* This is for Linux cooked sockets.
*/
-#define DLT_LINUX_SLL 113
+#define DLT_LINUX_SLL 113
/*
* Apple LocalTalk hardware.
*/
-#define DLT_LTALK 114
+#define DLT_LTALK 114
/*
* Acorn Econet.
*/
-#define DLT_ECONET 115
+#define DLT_ECONET 115
/*
* Reserved for use with OpenBSD ipfilter.
*/
-#define DLT_IPFILTER 116
+#define DLT_IPFILTER 116
/*
* OpenBSD DLT_PFLOG; DLT_PFLOG is 17 in OpenBSD, but that's DLT_LANE8023
@@ -299,33 +299,33 @@ struct bpf_version {
* XXX: is there a conflict with DLT_PFSYNC 18 as well?
*/
#ifdef __OpenBSD__
-#define DLT_OLD_PFLOG 17
-#define DLT_PFSYNC 18
+#define DLT_OLD_PFLOG 17
+#define DLT_PFSYNC 18
#endif
-#define DLT_PFLOG 117
+#define DLT_PFLOG 117
/*
* Registered for Cisco-internal use.
*/
-#define DLT_CISCO_IOS 118
+#define DLT_CISCO_IOS 118
/*
* For 802.11 cards using the Prism II chips, with a link-layer
* header including Prism monitor mode information plus an 802.11
* header.
*/
-#define DLT_PRISM_HEADER 119
+#define DLT_PRISM_HEADER 119
/*
* Reserved for Aironet 802.11 cards, with an Aironet link-layer header
* (see Doug Ambrisko's FreeBSD patches).
*/
-#define DLT_AIRONET_HEADER 120
+#define DLT_AIRONET_HEADER 120
/*
* Reserved for Siemens HiPath HDLC.
*/
-#define DLT_HHDLC 121
+#define DLT_HHDLC 121
/*
* This is for RFC 2625 IP-over-Fibre Channel.
@@ -335,7 +335,7 @@ struct bpf_version {
* where the link-layer header starts with an RFC 2625 Network_Header
* field.
*/
-#define DLT_IP_OVER_FC 122
+#define DLT_IP_OVER_FC 122
/*
* This is for Full Frontal ATM on Solaris with SunATM, with a
@@ -351,9 +351,9 @@ struct bpf_version {
* and the like don't have to infer the presence or absence of a
* pseudo-header and the form of the pseudo-header.
*/
-#define DLT_SUNATM 123 /* Solaris+SunATM */
+#define DLT_SUNATM 123 /* Solaris+SunATM */
-/*
+/*
* Reserved as per request from Kent Dahlgren <kent@praesum.com>
* for private use.
*/
@@ -366,7 +366,7 @@ struct bpf_version {
* including radio information, used by some recent BSD drivers as
* well as the madwifi Atheros driver for Linux.
*/
-#define DLT_IEEE802_11_RADIO 127 /* 802.11 plus radiotap radio header */
+#define DLT_IEEE802_11_RADIO 127 /* 802.11 plus radiotap radio header */
/*
* Reserved for the TZSP encapsulation, as per request from
@@ -389,7 +389,7 @@ struct bpf_version {
*
* We therefore have to have separate DLT_ values for them.
*/
-#define DLT_ARCNET_LINUX 129 /* ARCNET */
+#define DLT_ARCNET_LINUX 129 /* ARCNET */
/*
* Juniper-private data link types, as per request from
@@ -411,31 +411,31 @@ struct bpf_version {
* <dieter@apple.com>. The header that's presented is an Ethernet-like
* header:
*
- * #define FIREWIRE_EUI64_LEN 8
- * struct firewire_header {
- * u_char firewire_dhost[FIREWIRE_EUI64_LEN];
- * u_char firewire_shost[FIREWIRE_EUI64_LEN];
- * u_short firewire_type;
- * };
+ * #define FIREWIRE_EUI64_LEN 8
+ * struct firewire_header {
+ * u_char firewire_dhost[FIREWIRE_EUI64_LEN];
+ * u_char firewire_shost[FIREWIRE_EUI64_LEN];
+ * u_short firewire_type;
+ * };
*
* with "firewire_type" being an Ethernet type value, rather than,
* for example, raw GASP frames being handed up.
*/
-#define DLT_APPLE_IP_OVER_IEEE1394 138
+#define DLT_APPLE_IP_OVER_IEEE1394 138
/*
* Various SS7 encapsulations, as per a request from Jeff Morriss
* <jeff.morriss[AT]ulticom.com> and subsequent discussions.
*/
-#define DLT_MTP2_WITH_PHDR 139 /* pseudo-header with various info, followed by MTP2 */
-#define DLT_MTP2 140 /* MTP2, without pseudo-header */
-#define DLT_MTP3 141 /* MTP3, without pseudo-header or MTP2 */
-#define DLT_SCCP 142 /* SCCP, without pseudo-header or MTP2 or MTP3 */
+#define DLT_MTP2_WITH_PHDR 139 /* pseudo-header with various info, followed by MTP2 */
+#define DLT_MTP2 140 /* MTP2, without pseudo-header */
+#define DLT_MTP3 141 /* MTP3, without pseudo-header or MTP2 */
+#define DLT_SCCP 142 /* SCCP, without pseudo-header or MTP2 or MTP3 */
/*
* DOCSIS MAC frames.
*/
-#define DLT_DOCSIS 143
+#define DLT_DOCSIS 143
/*
* Linux-IrDA packets. Protocol defined at http://www.irda.org.
@@ -452,13 +452,13 @@ struct bpf_version {
* issue and define a real DLT_IRDA...
* Jean II
*/
-#define DLT_LINUX_IRDA 144
+#define DLT_LINUX_IRDA 144
/*
* Reserved for IBM SP switch and IBM Next Federation switch.
*/
-#define DLT_IBM_SP 145
-#define DLT_IBM_SN 146
+#define DLT_IBM_SP 145
+#define DLT_IBM_SN 146
/*
* Reserved for private use. If you have some link-layer header type
@@ -485,34 +485,34 @@ struct bpf_version {
* Instead, ask "tcpdump-workers@lists.tcpdump.org" for a new DLT_ value,
* as per the comment above, and use the type you're given.
*/
-#define DLT_USER0 147
-#define DLT_USER1 148
-#define DLT_USER2 149
-#define DLT_USER3 150
-#define DLT_USER4 151
-#define DLT_USER5 152
-#define DLT_USER6 153
-#define DLT_USER7 154
-#define DLT_USER8 155
-#define DLT_USER9 156
-#define DLT_USER10 157
-#define DLT_USER11 158
-#define DLT_USER12 159
-#define DLT_USER13 160
-#define DLT_USER14 161
-#define DLT_USER15 162
+#define DLT_USER0 147
+#define DLT_USER1 148
+#define DLT_USER2 149
+#define DLT_USER3 150
+#define DLT_USER4 151
+#define DLT_USER5 152
+#define DLT_USER6 153
+#define DLT_USER7 154
+#define DLT_USER8 155
+#define DLT_USER9 156
+#define DLT_USER10 157
+#define DLT_USER11 158
+#define DLT_USER12 159
+#define DLT_USER13 160
+#define DLT_USER14 161
+#define DLT_USER15 162
/*
* For future use with 802.11 captures - defined by AbsoluteValue
* Systems to store a number of bits of link-layer information
* including radio information:
*
- * http://www.shaftnet.org/~pizza/software/capturefrm.txt
+ * http://www.shaftnet.org/~pizza/software/capturefrm.txt
*
* but it might be used by some non-AVS drivers now or in the
* future.
*/
-#define DLT_IEEE802_11_RADIO_AVS 163 /* 802.11 plus AVS radio header */
+#define DLT_IEEE802_11_RADIO_AVS 163 /* 802.11 plus AVS radio header */
/*
* Juniper-private data link type, as per request from
@@ -525,7 +525,7 @@ struct bpf_version {
/*
* Reserved for BACnet MS/TP.
*/
-#define DLT_BACNET_MS_TP 165
+#define DLT_BACNET_MS_TP 165
/*
* Another PPP variant as per request from Karsten Keil <kkeil@suse.de>.
@@ -541,14 +541,14 @@ struct bpf_version {
* The first byte of the PPP header (0xff03) is modified to accomodate
* the direction - 0x00 = IN, 0x01 = OUT.
*/
-#define DLT_PPP_PPPD 166
+#define DLT_PPP_PPPD 166
/*
* Names for backwards compatibility with older versions of some PPP
* software; new software should use DLT_PPP_PPPD.
*/
-#define DLT_PPP_WITH_DIRECTION DLT_PPP_PPPD
-#define DLT_LINUX_PPP_WITHDIRECTION DLT_PPP_PPPD
+#define DLT_PPP_WITH_DIRECTION DLT_PPP_PPPD
+#define DLT_LINUX_PPP_WITHDIRECTION DLT_PPP_PPPD
/*
* Juniper-private data link type, as per request from
@@ -559,16 +559,16 @@ struct bpf_version {
#define DLT_JUNIPER_PPPOE 167
#define DLT_JUNIPER_PPPOE_ATM 168
-#define DLT_GPRS_LLC 169 /* GPRS LLC */
-#define DLT_GPF_T 170 /* GPF-T (ITU-T G.7041/Y.1303) */
-#define DLT_GPF_F 171 /* GPF-F (ITU-T G.7041/Y.1303) */
+#define DLT_GPRS_LLC 169 /* GPRS LLC */
+#define DLT_GPF_T 170 /* GPF-T (ITU-T G.7041/Y.1303) */
+#define DLT_GPF_F 171 /* GPF-F (ITU-T G.7041/Y.1303) */
/*
* Requested by Oolan Zimmer <oz@gcom.com> for use in Gcom's T1/E1 line
* monitoring equipment.
*/
-#define DLT_GCOM_T1E1 172
-#define DLT_GCOM_SERIAL 173
+#define DLT_GCOM_T1E1 172
+#define DLT_GCOM_SERIAL 173
/*
* Juniper-private data link type, as per request from
@@ -583,8 +583,8 @@ struct bpf_version {
* http://www.endace.com/support/EndaceRecordFormat.pdf) in front of
* the link-layer header.
*/
-#define DLT_ERF_ETH 175 /* Ethernet */
-#define DLT_ERF_POS 176 /* Packet-over-SONET */
+#define DLT_ERF_ETH 175 /* Ethernet */
+#define DLT_ERF_POS 176 /* Packet-over-SONET */
/*
* Requested by Daniele Orlandi <daniele@orlandi.com> for raw LAPD
@@ -592,11 +592,11 @@ struct bpf_version {
* includes additional information before the LAPD header, so it's
* not necessarily a generic LAPD header.
*/
-#define DLT_LINUX_LAPD 177
+#define DLT_LINUX_LAPD 177
/*
* Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
+ * Hannes Gredler <hannes@juniper.net>.
* The DLT_ are used for prepending meta-information
* like interface index, interface name
* before standard Ethernet, PPP, Frelay & C-HDLC Frames
@@ -613,7 +613,7 @@ struct bpf_version {
/*
* Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
+ * Hannes Gredler <hannes@juniper.net>.
* The DLT_ is used for internal communication with a
* voice Adapter Card (PIC)
*/
@@ -639,25 +639,25 @@ struct bpf_version {
* USB packets, beginning with a USB setup header; requested by
* Paolo Abeni <paolo.abeni@email.it>.
*/
-#define DLT_USB 186
+#define DLT_USB 186
/*
* Bluetooth HCI UART transport layer (part H:4); requested by
* Paolo Abeni.
*/
-#define DLT_BLUETOOTH_HCI_H4 187
+#define DLT_BLUETOOTH_HCI_H4 187
/*
* IEEE 802.16 MAC Common Part Sublayer; requested by Maria Cruz
* <cruz_petagay@bah.com>.
*/
-#define DLT_IEEE802_16_MAC_CPS 188
+#define DLT_IEEE802_16_MAC_CPS 188
/*
* USB packets, beginning with a Linux USB header; requested by
* Paolo Abeni <paolo.abeni@email.it>.
*/
-#define DLT_USB_LINUX 189
+#define DLT_USB_LINUX 189
/*
* Controller Area Network (CAN) v. 2.0B packets.
@@ -672,23 +672,23 @@ struct bpf_version {
* IEEE 802.15.4, with address fields padded, as is done by Linux
* drivers; requested by Juergen Schimmer.
*/
-#define DLT_IEEE802_15_4_LINUX 191
+#define DLT_IEEE802_15_4_LINUX 191
/*
* Per Packet Information encapsulated packets.
* DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
*/
-#define DLT_PPI 192
+#define DLT_PPI 192
/*
* Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header;
* requested by Charles Clancy.
*/
-#define DLT_IEEE802_16_MAC_CPS_RADIO 193
+#define DLT_IEEE802_16_MAC_CPS_RADIO 193
/*
* Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
+ * Hannes Gredler <hannes@juniper.net>.
* The DLT_ is used for internal communication with a
* integrated service module (ISM).
*/
@@ -698,38 +698,38 @@ struct bpf_version {
* IEEE 802.15.4, exactly as it appears in the spec (no padding, no
* nothing); requested by Mikko Saarnivala <mikko.saarnivala@sensinode.com>.
*/
-#define DLT_IEEE802_15_4 195
+#define DLT_IEEE802_15_4 195
/*
* Various link-layer types, with a pseudo-header, for SITA
* (http://www.sita.aero/); requested by Fulko Hew (fulko.hew@gmail.com).
*/
-#define DLT_SITA 196
+#define DLT_SITA 196
/*
* Various link-layer types, with a pseudo-header, for Endace DAG cards;
* encapsulates Endace ERF records. Requested by Stephen Donnelly
* <stephen@endace.com>.
*/
-#define DLT_ERF 197
+#define DLT_ERF 197
/*
* Special header prepended to Ethernet packets when capturing from a
* u10 Networks board. Requested by Phil Mulholland
* <phil@u10networks.com>.
*/
-#define DLT_RAIF1 198
+#define DLT_RAIF1 198
/*
* IPMB packet for IPMI, beginning with the I2C slave address, followed
* by the netFn and LUN, etc.. Requested by Chanthy Toeung
* <chanthy.toeung@ca.kontron.com>.
*/
-#define DLT_IPMB 199
+#define DLT_IPMB 199
/*
* Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
+ * Hannes Gredler <hannes@juniper.net>.
* The DLT_ is used for capturing data on a secure tunnel interface.
*/
#define DLT_JUNIPER_ST 200
@@ -738,23 +738,23 @@ struct bpf_version {
* Bluetooth HCI UART transport layer (part H:4), with pseudo-header
* that includes direction information; requested by Paolo Abeni.
*/
-#define DLT_BLUETOOTH_HCI_H4_WITH_PHDR 201
+#define DLT_BLUETOOTH_HCI_H4_WITH_PHDR 201
/*
* AX.25 packet with a 1-byte KISS header; see
*
- * http://www.ax25.net/kiss.htm
+ * http://www.ax25.net/kiss.htm
*
* as per Richard Stearn <richard@rns-stearn.demon.co.uk>.
*/
-#define DLT_AX25_KISS 202
+#define DLT_AX25_KISS 202
/*
* LAPD packets from an ISDN channel, starting with the address field,
* with no pseudo-header.
* Requested by Varuna De Silva <varunax@gmail.com>.
*/
-#define DLT_LAPD 203
+#define DLT_LAPD 203
/*
* Variants of various link-layer headers, with a one-byte direction
@@ -762,10 +762,10 @@ struct bpf_version {
* non-zero (any non-zero value) means "sent by this host" - as per
* Will Barker <w.barker@zen.co.uk>.
*/
-#define DLT_PPP_WITH_DIR 204 /* PPP - don't confuse with DLT_PPP_WITH_DIRECTION */
-#define DLT_C_HDLC_WITH_DIR 205 /* Cisco HDLC */
-#define DLT_FRELAY_WITH_DIR 206 /* Frame Relay */
-#define DLT_LAPB_WITH_DIR 207 /* LAPB */
+#define DLT_PPP_WITH_DIR 204 /* PPP - don't confuse with DLT_PPP_WITH_DIRECTION */
+#define DLT_C_HDLC_WITH_DIR 205 /* Cisco HDLC */
+#define DLT_FRELAY_WITH_DIR 206 /* Frame Relay */
+#define DLT_LAPB_WITH_DIR 207 /* LAPB */
/*
* 208 is reserved for an as-yet-unspecified proprietary link-layer
@@ -776,39 +776,39 @@ struct bpf_version {
* IPMB with a Linux-specific pseudo-header; as requested by Alexey Neyman
* <avn@pigeonpoint.com>.
*/
-#define DLT_IPMB_LINUX 209
+#define DLT_IPMB_LINUX 209
/*
* FlexRay automotive bus - http://www.flexray.com/ - as requested
* by Hannes Kaelber <hannes.kaelber@x2e.de>.
*/
-#define DLT_FLEXRAY 210
+#define DLT_FLEXRAY 210
/*
* Media Oriented Systems Transport (MOST) bus for multimedia
* transport - http://www.mostcooperation.com/ - as requested
* by Hannes Kaelber <hannes.kaelber@x2e.de>.
*/
-#define DLT_MOST 211
+#define DLT_MOST 211
/*
* Local Interconnect Network (LIN) bus for vehicle networks -
* http://www.lin-subbus.org/ - as requested by Hannes Kaelber
* <hannes.kaelber@x2e.de>.
*/
-#define DLT_LIN 212
+#define DLT_LIN 212
/*
* X2E-private data link type used for serial line capture,
* as requested by Hannes Kaelber <hannes.kaelber@x2e.de>.
*/
-#define DLT_X2E_SERIAL 213
+#define DLT_X2E_SERIAL 213
/*
* X2E-private data link type used for the Xoraya data logger
* family, as requested by Hannes Kaelber <hannes.kaelber@x2e.de>.
*/
-#define DLT_X2E_XORAYA 214
+#define DLT_X2E_XORAYA 214
/*
* IEEE 802.15.4, exactly as it appears in the spec (no padding, no
@@ -819,7 +819,7 @@ struct bpf_version {
*
* Requested by Max Filippov <jcmvbkbc@gmail.com>.
*/
-#define DLT_IEEE802_15_4_NONASK_PHY 215
+#define DLT_IEEE802_15_4_NONASK_PHY 215
/*
@@ -827,7 +827,7 @@ struct bpf_version {
* a member of that class. A class value of 0 indicates a regular
* DLT_/LINKTYPE_ value.
*/
-#define DLT_CLASS(x) ((x) & 0x03ff0000)
+#define DLT_CLASS(x) ((x) & 0x03ff0000)
/*
* NetBSD-specific generic "raw" link type. The class value indicates
@@ -836,10 +836,10 @@ struct bpf_version {
* do not assume that they correspond to AF_ values for your operating
* system.
*/
-#define DLT_CLASS_NETBSD_RAWAF 0x02240000
-#define DLT_NETBSD_RAWAF(af) (DLT_CLASS_NETBSD_RAWAF | (af))
-#define DLT_NETBSD_RAWAF_AF(x) ((x) & 0x0000ffff)
-#define DLT_IS_NETBSD_RAWAF(x) (DLT_CLASS(x) == DLT_CLASS_NETBSD_RAWAF)
+#define DLT_CLASS_NETBSD_RAWAF 0x02240000
+#define DLT_NETBSD_RAWAF(af) (DLT_CLASS_NETBSD_RAWAF | (af))
+#define DLT_NETBSD_RAWAF_AF(x) ((x) & 0x0000ffff)
+#define DLT_IS_NETBSD_RAWAF(x) (DLT_CLASS(x) == DLT_CLASS_NETBSD_RAWAF)
/*
@@ -847,64 +847,64 @@ struct bpf_version {
*/
/* instruction classes */
#define BPF_CLASS(code) ((code) & 0x07)
-#define BPF_LD 0x00
-#define BPF_LDX 0x01
-#define BPF_ST 0x02
-#define BPF_STX 0x03
-#define BPF_ALU 0x04
-#define BPF_JMP 0x05
-#define BPF_RET 0x06
-#define BPF_MISC 0x07
+#define BPF_LD 0x00
+#define BPF_LDX 0x01
+#define BPF_ST 0x02
+#define BPF_STX 0x03
+#define BPF_ALU 0x04
+#define BPF_JMP 0x05
+#define BPF_RET 0x06
+#define BPF_MISC 0x07
/* ld/ldx fields */
-#define BPF_SIZE(code) ((code) & 0x18)
-#define BPF_W 0x00
-#define BPF_H 0x08
-#define BPF_B 0x10
-#define BPF_MODE(code) ((code) & 0xe0)
-#define BPF_IMM 0x00
-#define BPF_ABS 0x20
-#define BPF_IND 0x40
-#define BPF_MEM 0x60
-#define BPF_LEN 0x80
-#define BPF_MSH 0xa0
+#define BPF_SIZE(code) ((code) & 0x18)
+#define BPF_W 0x00
+#define BPF_H 0x08
+#define BPF_B 0x10
+#define BPF_MODE(code) ((code) & 0xe0)
+#define BPF_IMM 0x00
+#define BPF_ABS 0x20
+#define BPF_IND 0x40
+#define BPF_MEM 0x60
+#define BPF_LEN 0x80
+#define BPF_MSH 0xa0
/* alu/jmp fields */
-#define BPF_OP(code) ((code) & 0xf0)
-#define BPF_ADD 0x00
-#define BPF_SUB 0x10
-#define BPF_MUL 0x20
-#define BPF_DIV 0x30
-#define BPF_OR 0x40
-#define BPF_AND 0x50
-#define BPF_LSH 0x60
-#define BPF_RSH 0x70
-#define BPF_NEG 0x80
-#define BPF_JA 0x00
-#define BPF_JEQ 0x10
-#define BPF_JGT 0x20
-#define BPF_JGE 0x30
-#define BPF_JSET 0x40
-#define BPF_SRC(code) ((code) & 0x08)
-#define BPF_K 0x00
-#define BPF_X 0x08
+#define BPF_OP(code) ((code) & 0xf0)
+#define BPF_ADD 0x00
+#define BPF_SUB 0x10
+#define BPF_MUL 0x20
+#define BPF_DIV 0x30
+#define BPF_OR 0x40
+#define BPF_AND 0x50
+#define BPF_LSH 0x60
+#define BPF_RSH 0x70
+#define BPF_NEG 0x80
+#define BPF_JA 0x00
+#define BPF_JEQ 0x10
+#define BPF_JGT 0x20
+#define BPF_JGE 0x30
+#define BPF_JSET 0x40
+#define BPF_SRC(code) ((code) & 0x08)
+#define BPF_K 0x00
+#define BPF_X 0x08
/* ret - BPF_K and BPF_X also apply */
-#define BPF_RVAL(code) ((code) & 0x18)
-#define BPF_A 0x10
+#define BPF_RVAL(code) ((code) & 0x18)
+#define BPF_A 0x10
/* misc */
#define BPF_MISCOP(code) ((code) & 0xf8)
-#define BPF_TAX 0x00
-#define BPF_TXA 0x80
+#define BPF_TAX 0x00
+#define BPF_TXA 0x80
/*
* The instruction data structure.
*/
struct bpf_insn {
- u_short code;
- u_char jt;
- u_char jf;
+ u_short code;
+ u_char jt;
+ u_char jf;
bpf_u_int32 k;
};
diff --git a/src/lib/winpcap/pcap/namedb.h b/src/lib/winpcap/pcap/namedb.h
index 9002c750937..5ab9e0d67d5 100644
--- a/src/lib/winpcap/pcap/namedb.h
+++ b/src/lib/winpcap/pcap/namedb.h
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1994, 1996
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -12,8 +12,8 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
- * This product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
+ * This product includes software developed by the Computer Systems
+ * Engineering Group at Lawrence Berkeley Laboratory.
* 4. Neither the name of the University nor of the Laboratory may be used
* to endorse or promote products derived from this software without
* specific prior written permission.
@@ -54,7 +54,7 @@ struct pcap_etherent {
#ifndef PCAP_ETHERS_FILE
#define PCAP_ETHERS_FILE "/etc/ethers"
#endif
-struct pcap_etherent *pcap_next_etherent(FILE *);
+struct pcap_etherent *pcap_next_etherent(FILE *);
u_char *pcap_ether_hostton(const char*);
u_char *pcap_ether_aton(const char *);
@@ -64,23 +64,23 @@ struct addrinfo *pcap_nametoaddrinfo(const char *);
#endif
bpf_u_int32 pcap_nametonetaddr(const char *);
-int pcap_nametoport(const char *, int *, int *);
-int pcap_nametoportrange(const char *, int *, int *, int *);
-int pcap_nametoproto(const char *);
-int pcap_nametoeproto(const char *);
-int pcap_nametollc(const char *);
+int pcap_nametoport(const char *, int *, int *);
+int pcap_nametoportrange(const char *, int *, int *, int *);
+int pcap_nametoproto(const char *);
+int pcap_nametoeproto(const char *);
+int pcap_nametollc(const char *);
/*
* If a protocol is unknown, PROTO_UNDEF is returned.
* Also, pcap_nametoport() returns the protocol along with the port number.
* If there are ambiguous entried in /etc/services (i.e. domain
* can be either tcp or udp) PROTO_UNDEF is returned.
*/
-#define PROTO_UNDEF -1
+#define PROTO_UNDEF -1
/* XXX move these to pcap-int.h? */
int __pcap_atodn(const char *, bpf_u_int32 *);
int __pcap_atoin(const char *, bpf_u_int32 *);
-u_short __pcap_nametodnaddr(const char *);
+u_short __pcap_nametodnaddr(const char *);
#ifdef __cplusplus
}
diff --git a/src/lib/winpcap/pcap/pcap.h b/src/lib/winpcap/pcap/pcap.h
index ad8fc40ac1f..07695d070c3 100644
--- a/src/lib/winpcap/pcap/pcap.h
+++ b/src/lib/winpcap/pcap/pcap.h
@@ -1,7 +1,7 @@
/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
/*
* Copyright (c) 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -13,8 +13,8 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
- * This product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
+ * This product includes software developed by the Computer Systems
+ * Engineering Group at Lawrence Berkeley Laboratory.
* 4. Neither the name of the University nor of the Laboratory may be used
* to endorse or promote products derived from this software without
* specific prior written permission.
@@ -38,13 +38,13 @@
#define lib_pcap_pcap_h
#if defined(WIN32)
- #include <pcap-stdinc.h>
+ #include <pcap-stdinc.h>
#elif defined(MSDOS)
- #include <sys/types.h>
- #include <sys/socket.h> /* u_int, u_char etc. */
+ #include <sys/types.h>
+ #include <sys/socket.h> /* u_int, u_char etc. */
#else /* UN*X */
- #include <sys/types.h>
- #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
#endif /* WIN32/MSDOS/UN*X */
#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H
@@ -80,8 +80,8 @@ extern "C" {
* predates the bpf typedefs for 64-bit support.
*/
#if BPF_RELEASE - 0 < 199406
-typedef int bpf_int32;
-typedef u_int bpf_u_int32;
+typedef int bpf_int32;
+typedef u_int bpf_u_int32;
#endif
typedef struct pcap pcap_t;
@@ -105,23 +105,23 @@ typedef struct pcap_addr pcap_addr_t;
*
* Instead:
*
- * introduce a new structure for the new format, if the layout
- * of the structure changed;
+ * introduce a new structure for the new format, if the layout
+ * of the structure changed;
*
- * send mail to "tcpdump-workers@lists.tcpdump.org", requesting
- * a new magic number for your new capture file format, and, when
- * you get the new magic number, put it in "savefile.c";
+ * send mail to "tcpdump-workers@lists.tcpdump.org", requesting
+ * a new magic number for your new capture file format, and, when
+ * you get the new magic number, put it in "savefile.c";
*
- * use that magic number for save files with the changed file
- * header;
+ * use that magic number for save files with the changed file
+ * header;
*
- * make the code in "savefile.c" capable of reading files with
- * the old file header as well as files with the new file header
- * (using the magic number to determine the header format).
+ * make the code in "savefile.c" capable of reading files with
+ * the old file header as well as files with the new file header
+ * (using the magic number to determine the header format).
*
* Then supply the changes as a patch at
*
- * http://sourceforge.net/projects/libpcap/
+ * http://sourceforge.net/projects/libpcap/
*
* so that future versions of libpcap and programs that use it (such as
* tcpdump) will be able to read your new capture file format.
@@ -130,26 +130,26 @@ struct pcap_file_header {
bpf_u_int32 magic;
u_short version_major;
u_short version_minor;
- bpf_int32 thiszone; /* gmt to local correction */
- bpf_u_int32 sigfigs; /* accuracy of timestamps */
- bpf_u_int32 snaplen; /* max length saved portion of each pkt */
- bpf_u_int32 linktype; /* data link type (LINKTYPE_*) */
+ bpf_int32 thiszone; /* gmt to local correction */
+ bpf_u_int32 sigfigs; /* accuracy of timestamps */
+ bpf_u_int32 snaplen; /* max length saved portion of each pkt */
+ bpf_u_int32 linktype; /* data link type (LINKTYPE_*) */
};
/*
* Macros for the value returned by pcap_datalink_ext().
- *
+ *
* If LT_FCS_LENGTH_PRESENT(x) is true, the LT_FCS_LENGTH(x) macro
* gives the FCS length of packets in the capture.
*/
-#define LT_FCS_LENGTH_PRESENT(x) ((x) & 0x04000000)
-#define LT_FCS_LENGTH(x) (((x) & 0xF0000000) >> 28)
-#define LT_FCS_DATALINK_EXT(x) ((((x) & 0xF) << 28) | 0x04000000)
+#define LT_FCS_LENGTH_PRESENT(x) ((x) & 0x04000000)
+#define LT_FCS_LENGTH(x) (((x) & 0xF0000000) >> 28)
+#define LT_FCS_DATALINK_EXT(x) ((((x) & 0xF) << 28) | 0x04000000)
typedef enum {
- PCAP_D_INOUT = 0,
- PCAP_D_IN,
- PCAP_D_OUT
+ PCAP_D_INOUT = 0,
+ PCAP_D_IN,
+ PCAP_D_OUT
} pcap_direction_t;
/*
@@ -165,22 +165,22 @@ typedef enum {
* that's not what the underlying packet capture mechanism supplies.
*/
struct pcap_pkthdr {
- struct timeval ts; /* time stamp */
- bpf_u_int32 caplen; /* length of portion present */
- bpf_u_int32 len; /* length this packet (off wire) */
+ struct timeval ts; /* time stamp */
+ bpf_u_int32 caplen; /* length of portion present */
+ bpf_u_int32 len; /* length this packet (off wire) */
};
/*
* As returned by the pcap_stats()
*/
struct pcap_stat {
- u_int ps_recv; /* number of packets received */
- u_int ps_drop; /* number of packets dropped */
- u_int ps_ifdrop; /* drops by interface XXX not yet supported */
+ u_int ps_recv; /* number of packets received */
+ u_int ps_drop; /* number of packets dropped */
+ u_int ps_ifdrop; /* drops by interface XXX not yet supported */
#ifdef HAVE_REMOTE
- u_int ps_capt; /* number of packets that are received by the application; please get rid off the Win32 ifdef */
- u_int ps_sent; /* number of packets sent by the server on the network */
- u_int ps_netdrop; /* number of packets lost on the network */
+ u_int ps_capt; /* number of packets that are received by the application; please get rid off the Win32 ifdef */
+ u_int ps_sent; /* number of packets sent by the server on the network */
+ u_int ps_netdrop; /* number of packets lost on the network */
#endif /* HAVE_REMOTE */
};
@@ -189,32 +189,32 @@ struct pcap_stat {
* As returned by the pcap_stats_ex()
*/
struct pcap_stat_ex {
- u_long rx_packets; /* total packets received */
- u_long tx_packets; /* total packets transmitted */
- u_long rx_bytes; /* total bytes received */
- u_long tx_bytes; /* total bytes transmitted */
- u_long rx_errors; /* bad packets received */
- u_long tx_errors; /* packet transmit problems */
- u_long rx_dropped; /* no space in Rx buffers */
- u_long tx_dropped; /* no space available for Tx */
- u_long multicast; /* multicast packets received */
- u_long collisions;
-
- /* detailed rx_errors: */
- u_long rx_length_errors;
- u_long rx_over_errors; /* receiver ring buff overflow */
- u_long rx_crc_errors; /* recv'd pkt with crc error */
- u_long rx_frame_errors; /* recv'd frame alignment error */
- u_long rx_fifo_errors; /* recv'r fifo overrun */
- u_long rx_missed_errors; /* recv'r missed packet */
-
- /* detailed tx_errors */
- u_long tx_aborted_errors;
- u_long tx_carrier_errors;
- u_long tx_fifo_errors;
- u_long tx_heartbeat_errors;
- u_long tx_window_errors;
- };
+ u_long rx_packets; /* total packets received */
+ u_long tx_packets; /* total packets transmitted */
+ u_long rx_bytes; /* total bytes received */
+ u_long tx_bytes; /* total bytes transmitted */
+ u_long rx_errors; /* bad packets received */
+ u_long tx_errors; /* packet transmit problems */
+ u_long rx_dropped; /* no space in Rx buffers */
+ u_long tx_dropped; /* no space available for Tx */
+ u_long multicast; /* multicast packets received */
+ u_long collisions;
+
+ /* detailed rx_errors: */
+ u_long rx_length_errors;
+ u_long rx_over_errors; /* receiver ring buff overflow */
+ u_long rx_crc_errors; /* recv'd pkt with crc error */
+ u_long rx_frame_errors; /* recv'd frame alignment error */
+ u_long rx_fifo_errors; /* recv'r fifo overrun */
+ u_long rx_missed_errors; /* recv'r missed packet */
+
+ /* detailed tx_errors */
+ u_long tx_aborted_errors;
+ u_long tx_carrier_errors;
+ u_long tx_fifo_errors;
+ u_long tx_heartbeat_errors;
+ u_long tx_window_errors;
+ };
#endif
/*
@@ -222,27 +222,27 @@ struct pcap_stat_ex {
*/
struct pcap_if {
struct pcap_if *next;
- char *name; /* name to hand to "pcap_open_live()" */
- char *description; /* textual description of interface, or NULL */
+ char *name; /* name to hand to "pcap_open_live()" */
+ char *description; /* textual description of interface, or NULL */
struct pcap_addr *addresses;
- bpf_u_int32 flags; /* PCAP_IF_ interface flags */
+ bpf_u_int32 flags; /* PCAP_IF_ interface flags */
};
-#define PCAP_IF_LOOPBACK 0x00000001 /* interface is loopback */
+#define PCAP_IF_LOOPBACK 0x00000001 /* interface is loopback */
/*
* Representation of an interface address.
*/
struct pcap_addr {
struct pcap_addr *next;
- struct sockaddr *addr; /* address */
- struct sockaddr *netmask; /* netmask for that address */
- struct sockaddr *broadaddr; /* broadcast address for that address */
- struct sockaddr *dstaddr; /* P2P destination address for that address */
+ struct sockaddr *addr; /* address */
+ struct sockaddr *netmask; /* netmask for that address */
+ struct sockaddr *broadaddr; /* broadcast address for that address */
+ struct sockaddr *dstaddr; /* P2P destination address for that address */
};
typedef void (*pcap_handler)(u_char *, const struct pcap_pkthdr *,
- const u_char *);
+ const u_char *);
/*
* Error codes for the pcap API.
@@ -250,39 +250,39 @@ typedef void (*pcap_handler)(u_char *, const struct pcap_pkthdr *,
* failure of a call that returns these codes by checking for a
* negative value.
*/
-#define PCAP_ERROR -1 /* generic error code */
-#define PCAP_ERROR_BREAK -2 /* loop terminated by pcap_breakloop */
-#define PCAP_ERROR_NOT_ACTIVATED -3 /* the capture needs to be activated */
-#define PCAP_ERROR_ACTIVATED -4 /* the operation can't be performed on already activated captures */
-#define PCAP_ERROR_NO_SUCH_DEVICE -5 /* no such device exists */
-#define PCAP_ERROR_RFMON_NOTSUP -6 /* this device doesn't support rfmon (monitor) mode */
-#define PCAP_ERROR_NOT_RFMON -7 /* operation supported only in monitor mode */
-#define PCAP_ERROR_PERM_DENIED -8 /* no permission to open the device */
-#define PCAP_ERROR_IFACE_NOT_UP -9 /* interface isn't up */
+#define PCAP_ERROR -1 /* generic error code */
+#define PCAP_ERROR_BREAK -2 /* loop terminated by pcap_breakloop */
+#define PCAP_ERROR_NOT_ACTIVATED -3 /* the capture needs to be activated */
+#define PCAP_ERROR_ACTIVATED -4 /* the operation can't be performed on already activated captures */
+#define PCAP_ERROR_NO_SUCH_DEVICE -5 /* no such device exists */
+#define PCAP_ERROR_RFMON_NOTSUP -6 /* this device doesn't support rfmon (monitor) mode */
+#define PCAP_ERROR_NOT_RFMON -7 /* operation supported only in monitor mode */
+#define PCAP_ERROR_PERM_DENIED -8 /* no permission to open the device */
+#define PCAP_ERROR_IFACE_NOT_UP -9 /* interface isn't up */
/*
* Warning codes for the pcap API.
* These will all be positive and non-zero, so they won't look like
* errors.
*/
-#define PCAP_WARNING 1 /* generic warning code */
-#define PCAP_WARNING_PROMISC_NOTSUP 2 /* this device doesn't support promiscuous mode */
-
-char *pcap_lookupdev(char *);
-int pcap_lookupnet(const char *, bpf_u_int32 *, bpf_u_int32 *, char *);
-
-pcap_t *pcap_create(const char *, char *);
-int pcap_set_snaplen(pcap_t *, int);
-int pcap_set_promisc(pcap_t *, int);
-int pcap_can_set_rfmon(pcap_t *);
-int pcap_set_rfmon(pcap_t *, int);
-int pcap_set_timeout(pcap_t *, int);
-int pcap_set_buffer_size(pcap_t *, int);
-int pcap_activate(pcap_t *);
-
-pcap_t *pcap_open_live(const char *, int, int, int, char *);
-pcap_t *pcap_open_dead(int, int);
-pcap_t *pcap_open_offline(const char *, char *);
+#define PCAP_WARNING 1 /* generic warning code */
+#define PCAP_WARNING_PROMISC_NOTSUP 2 /* this device doesn't support promiscuous mode */
+
+char *pcap_lookupdev(char *);
+int pcap_lookupnet(const char *, bpf_u_int32 *, bpf_u_int32 *, char *);
+
+pcap_t *pcap_create(const char *, char *);
+int pcap_set_snaplen(pcap_t *, int);
+int pcap_set_promisc(pcap_t *, int);
+int pcap_can_set_rfmon(pcap_t *);
+int pcap_set_rfmon(pcap_t *, int);
+int pcap_set_timeout(pcap_t *, int);
+int pcap_set_buffer_size(pcap_t *, int);
+int pcap_activate(pcap_t *);
+
+pcap_t *pcap_open_live(const char *, int, int, int, char *);
+pcap_t *pcap_open_dead(int, int);
+pcap_t *pcap_open_offline(const char *, char *);
#if defined(WIN32)
pcap_t *pcap_hopen_offline(intptr_t, char *);
#if !defined(LIBPCAP_EXPORTS)
@@ -292,69 +292,69 @@ pcap_t *pcap_hopen_offline(intptr_t, char *);
static pcap_t *pcap_fopen_offline(FILE *, char *);
#endif
#else /*WIN32*/
-pcap_t *pcap_fopen_offline(FILE *, char *);
+pcap_t *pcap_fopen_offline(FILE *, char *);
#endif /*WIN32*/
-void pcap_close(pcap_t *);
-int pcap_loop(pcap_t *, int, pcap_handler, u_char *);
-int pcap_dispatch(pcap_t *, int, pcap_handler, u_char *);
+void pcap_close(pcap_t *);
+int pcap_loop(pcap_t *, int, pcap_handler, u_char *);
+int pcap_dispatch(pcap_t *, int, pcap_handler, u_char *);
const u_char*
pcap_next(pcap_t *, struct pcap_pkthdr *);
-int pcap_next_ex(pcap_t *, struct pcap_pkthdr **, const u_char **);
-void pcap_breakloop(pcap_t *);
-int pcap_stats(pcap_t *, struct pcap_stat *);
-int pcap_setfilter(pcap_t *, struct bpf_program *);
-int pcap_setdirection(pcap_t *, pcap_direction_t);
-int pcap_getnonblock(pcap_t *, char *);
-int pcap_setnonblock(pcap_t *, int, char *);
-int pcap_inject(pcap_t *, const void *, size_t);
-int pcap_sendpacket(pcap_t *, const u_char *, int);
+int pcap_next_ex(pcap_t *, struct pcap_pkthdr **, const u_char **);
+void pcap_breakloop(pcap_t *);
+int pcap_stats(pcap_t *, struct pcap_stat *);
+int pcap_setfilter(pcap_t *, struct bpf_program *);
+int pcap_setdirection(pcap_t *, pcap_direction_t);
+int pcap_getnonblock(pcap_t *, char *);
+int pcap_setnonblock(pcap_t *, int, char *);
+int pcap_inject(pcap_t *, const void *, size_t);
+int pcap_sendpacket(pcap_t *, const u_char *, int);
const char *pcap_statustostr(int);
const char *pcap_strerror(int);
-char *pcap_geterr(pcap_t *);
-void pcap_perror(pcap_t *, char *);
-int pcap_compile(pcap_t *, struct bpf_program *, const char *, int,
- bpf_u_int32);
-int pcap_compile_nopcap(int, int, struct bpf_program *,
- const char *, int, bpf_u_int32);
-void pcap_freecode(struct bpf_program *);
-int pcap_offline_filter(struct bpf_program *, const struct pcap_pkthdr *,
- const u_char *);
-int pcap_datalink(pcap_t *);
-int pcap_datalink_ext(pcap_t *);
-int pcap_list_datalinks(pcap_t *, int **);
-int pcap_set_datalink(pcap_t *, int);
-void pcap_free_datalinks(int *);
-int pcap_datalink_name_to_val(const char *);
+char *pcap_geterr(pcap_t *);
+void pcap_perror(pcap_t *, char *);
+int pcap_compile(pcap_t *, struct bpf_program *, const char *, int,
+ bpf_u_int32);
+int pcap_compile_nopcap(int, int, struct bpf_program *,
+ const char *, int, bpf_u_int32);
+void pcap_freecode(struct bpf_program *);
+int pcap_offline_filter(struct bpf_program *, const struct pcap_pkthdr *,
+ const u_char *);
+int pcap_datalink(pcap_t *);
+int pcap_datalink_ext(pcap_t *);
+int pcap_list_datalinks(pcap_t *, int **);
+int pcap_set_datalink(pcap_t *, int);
+void pcap_free_datalinks(int *);
+int pcap_datalink_name_to_val(const char *);
const char *pcap_datalink_val_to_name(int);
const char *pcap_datalink_val_to_description(int);
-int pcap_snapshot(pcap_t *);
-int pcap_is_swapped(pcap_t *);
-int pcap_major_version(pcap_t *);
-int pcap_minor_version(pcap_t *);
+int pcap_snapshot(pcap_t *);
+int pcap_is_swapped(pcap_t *);
+int pcap_major_version(pcap_t *);
+int pcap_minor_version(pcap_t *);
/* XXX */
-FILE *pcap_file(pcap_t *);
-int pcap_fileno(pcap_t *);
+FILE *pcap_file(pcap_t *);
+int pcap_fileno(pcap_t *);
pcap_dumper_t *pcap_dump_open(pcap_t *, const char *);
pcap_dumper_t *pcap_dump_fopen(pcap_t *, FILE *fp);
-FILE *pcap_dump_file(pcap_dumper_t *);
-long pcap_dump_ftell(pcap_dumper_t *);
-int pcap_dump_flush(pcap_dumper_t *);
-void pcap_dump_close(pcap_dumper_t *);
-void pcap_dump(u_char *, const struct pcap_pkthdr *, const u_char *);
+FILE *pcap_dump_file(pcap_dumper_t *);
+long pcap_dump_ftell(pcap_dumper_t *);
+int pcap_dump_flush(pcap_dumper_t *);
+void pcap_dump_close(pcap_dumper_t *);
+void pcap_dump(u_char *, const struct pcap_pkthdr *, const u_char *);
-int pcap_findalldevs(pcap_if_t **, char *);
-void pcap_freealldevs(pcap_if_t *);
+int pcap_findalldevs(pcap_if_t **, char *);
+void pcap_freealldevs(pcap_if_t *);
const char *pcap_lib_version(void);
/* XXX this guy lives in the bpf tree */
-u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
-int bpf_validate(const struct bpf_insn *f, int len);
-char *bpf_image(const struct bpf_insn *, int);
-void bpf_dump(const struct bpf_program *, int);
+u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
+int bpf_validate(const struct bpf_insn *f, int len);
+char *bpf_image(const struct bpf_insn *, int);
+void bpf_dump(const struct bpf_program *, int);
#if defined(WIN32)
@@ -391,14 +391,14 @@ u_long pcap_mac_packets (void);
* UN*X definitions
*/
-int pcap_get_selectable_fd(pcap_t *);
+int pcap_get_selectable_fd(pcap_t *);
#endif /* WIN32/MSDOS/UN*X */
#ifdef HAVE_REMOTE
/* Includes most of the public stuff that is needed for the remote capture */
#include <remote-ext.h>
-#endif /* HAVE_REMOTE */
+#endif /* HAVE_REMOTE */
#ifdef __cplusplus
}
diff --git a/src/lib/winpcap/pcap/sll.h b/src/lib/winpcap/pcap/sll.h
index e9d5452af7d..eca83e833ba 100644
--- a/src/lib/winpcap/pcap/sll.h
+++ b/src/lib/winpcap/pcap/sll.h
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from the Stanford/CMU enet packet filter,
* (net/enet.c) distributed as part of 4.3BSD, and code contributed
@@ -42,22 +42,22 @@
* For captures on Linux cooked sockets, we construct a fake header
* that includes:
*
- * a 2-byte "packet type" which is one of:
+ * a 2-byte "packet type" which is one of:
*
- * LINUX_SLL_HOST packet was sent to us
- * LINUX_SLL_BROADCAST packet was broadcast
- * LINUX_SLL_MULTICAST packet was multicast
- * LINUX_SLL_OTHERHOST packet was sent to somebody else
- * LINUX_SLL_OUTGOING packet was sent *by* us;
+ * LINUX_SLL_HOST packet was sent to us
+ * LINUX_SLL_BROADCAST packet was broadcast
+ * LINUX_SLL_MULTICAST packet was multicast
+ * LINUX_SLL_OTHERHOST packet was sent to somebody else
+ * LINUX_SLL_OUTGOING packet was sent *by* us;
*
- * a 2-byte Ethernet protocol field;
+ * a 2-byte Ethernet protocol field;
*
- * a 2-byte link-layer type;
+ * a 2-byte link-layer type;
*
- * a 2-byte link-layer address length;
+ * a 2-byte link-layer address length;
*
- * an 8-byte source link-layer address, whose actual length is
- * specified by the previous value.
+ * an 8-byte source link-layer address, whose actual length is
+ * specified by the previous value.
*
* All fields except for the link-layer address are in network byte order.
*
@@ -79,15 +79,15 @@
/*
* A DLT_LINUX_SLL fake link-layer header.
*/
-#define SLL_HDR_LEN 16 /* total header length */
-#define SLL_ADDRLEN 8 /* length of address field */
+#define SLL_HDR_LEN 16 /* total header length */
+#define SLL_ADDRLEN 8 /* length of address field */
struct sll_header {
- u_int16_t sll_pkttype; /* packet type */
- u_int16_t sll_hatype; /* link-layer address type */
- u_int16_t sll_halen; /* link-layer address length */
- u_int8_t sll_addr[SLL_ADDRLEN]; /* link-layer address */
- u_int16_t sll_protocol; /* protocol */
+ u_int16_t sll_pkttype; /* packet type */
+ u_int16_t sll_hatype; /* link-layer address type */
+ u_int16_t sll_halen; /* link-layer address length */
+ u_int8_t sll_addr[SLL_ADDRLEN]; /* link-layer address */
+ u_int16_t sll_protocol; /* protocol */
};
/*
@@ -96,11 +96,11 @@ struct sll_header {
* available even on systems other than Linux, and so that they
* don't change even if the PACKET_ values change.
*/
-#define LINUX_SLL_HOST 0
-#define LINUX_SLL_BROADCAST 1
-#define LINUX_SLL_MULTICAST 2
-#define LINUX_SLL_OTHERHOST 3
-#define LINUX_SLL_OUTGOING 4
+#define LINUX_SLL_HOST 0
+#define LINUX_SLL_BROADCAST 1
+#define LINUX_SLL_MULTICAST 2
+#define LINUX_SLL_OTHERHOST 3
+#define LINUX_SLL_OUTGOING 4
/*
* The LINUX_SLL_ values for "sll_protocol"; these correspond to the
@@ -108,22 +108,22 @@ struct sll_header {
* available even on systems other than Linux. We assume, for now,
* that the ETH_P_ values won't change in Linux; if they do, then:
*
- * if we don't translate them in "pcap-linux.c", capture files
- * won't necessarily be readable if captured on a system that
- * defines ETH_P_ values that don't match these values;
+ * if we don't translate them in "pcap-linux.c", capture files
+ * won't necessarily be readable if captured on a system that
+ * defines ETH_P_ values that don't match these values;
*
- * if we do translate them in "pcap-linux.c", that makes life
- * unpleasant for the BPF code generator, as the values you test
- * for in the kernel aren't the values that you test for when
- * reading a capture file, so the fixup code run on BPF programs
- * handed to the kernel ends up having to do more work.
+ * if we do translate them in "pcap-linux.c", that makes life
+ * unpleasant for the BPF code generator, as the values you test
+ * for in the kernel aren't the values that you test for when
+ * reading a capture file, so the fixup code run on BPF programs
+ * handed to the kernel ends up having to do more work.
*
* Add other values here as necessary, for handling packet types that
* might show up on non-Ethernet, non-802.x networks. (Not all the ones
* in the Linux "if_ether.h" will, I suspect, actually show up in
* captures.)
*/
-#define LINUX_SLL_P_802_3 0x0001 /* Novell 802.3 frames without 802.2 LLC header */
-#define LINUX_SLL_P_802_2 0x0004 /* 802.2 frames (not D/I/X Ethernet) */
+#define LINUX_SLL_P_802_3 0x0001 /* Novell 802.3 frames without 802.2 LLC header */
+#define LINUX_SLL_P_802_2 0x0004 /* 802.2 frames (not D/I/X Ethernet) */
#endif
diff --git a/src/lib/winpcap/pcap/usb.h b/src/lib/winpcap/pcap/usb.h
index adcd19c0584..337a5f2b9b8 100644
--- a/src/lib/winpcap/pcap/usb.h
+++ b/src/lib/winpcap/pcap/usb.h
@@ -11,8 +11,8 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- * products derived from this software without specific prior written
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -32,11 +32,11 @@
*
* @(#) $Header: /tcpdump/master/libpcap/pcap/usb.h,v 1.6 2007/09/22 02:06:08 guy Exp $
*/
-
+
#ifndef _PCAP_USB_STRUCTS_H__
#define _PCAP_USB_STRUCTS_H__
-/*
+/*
* possible transfer mode
*/
#define URB_TRANSFER_IN 0x80
diff --git a/src/lib/winpcap/pcap/vlan.h b/src/lib/winpcap/pcap/vlan.h
index b0cb7949be1..90b7884cada 100644
--- a/src/lib/winpcap/pcap/vlan.h
+++ b/src/lib/winpcap/pcap/vlan.h
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,10 +37,10 @@
#define lib_pcap_vlan_h
struct vlan_tag {
- u_int16_t vlan_tpid; /* ETH_P_8021Q */
- u_int16_t vlan_tci; /* VLAN TCI */
+ u_int16_t vlan_tpid; /* ETH_P_8021Q */
+ u_int16_t vlan_tci; /* VLAN TCI */
};
-#define VLAN_TAG_LEN 4
+#define VLAN_TAG_LEN 4
#endif
diff --git a/src/lib/winpcap/remote-ext.h b/src/lib/winpcap/remote-ext.h
index 35a2fff6c2b..7c05c56bd38 100644
--- a/src/lib/winpcap/remote-ext.h
+++ b/src/lib/winpcap/remote-ext.h
@@ -2,32 +2,32 @@
* Copyright (c) 2002 - 2003
* NetGroup, Politecnico di Torino (Italy)
* All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
* are met:
- *
- * 1. Redistributions of source code must retain the above copyright
+ *
+ * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Politecnico di Torino nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Politecnico di Torino nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
*/
@@ -49,135 +49,135 @@ extern "C" {
#endif
/*!
- \file remote-ext.h
+ \file remote-ext.h
- The goal of this file it to include most of the new definitions that should be
- placed into the pcap.h file.
+ The goal of this file it to include most of the new definitions that should be
+ placed into the pcap.h file.
- It includes all new definitions (structures and functions like pcap_open().
- Some of the functions are not really a remote feature, but, right now,
- they are placed here.
+ It includes all new definitions (structures and functions like pcap_open().
+ Some of the functions are not really a remote feature, but, right now,
+ they are placed here.
*/
// All this stuff is public
/*! \addtogroup remote_struct
- \{
+ \{
*/
/*!
- \brief Defines the maximum buffer size in which address, port, interface names are kept.
+ \brief Defines the maximum buffer size in which address, port, interface names are kept.
- In case the adapter name or such is larger than this value, it is truncated.
- This is not used by the user; however it must be aware that an hostname / interface
- name longer than this value will be truncated.
+ In case the adapter name or such is larger than this value, it is truncated.
+ This is not used by the user; however it must be aware that an hostname / interface
+ name longer than this value will be truncated.
*/
#define PCAP_BUF_SIZE 1024
/*! \addtogroup remote_source_ID
- \{
+ \{
*/
/*!
- \brief Internal representation of the type of source in use (file,
- remote/local interface).
+ \brief Internal representation of the type of source in use (file,
+ remote/local interface).
- This indicates a file, i.e. the user want to open a capture from a local file.
+ This indicates a file, i.e. the user want to open a capture from a local file.
*/
#define PCAP_SRC_FILE 2
/*!
- \brief Internal representation of the type of source in use (file,
- remote/local interface).
+ \brief Internal representation of the type of source in use (file,
+ remote/local interface).
- This indicates a local interface, i.e. the user want to open a capture from
- a local interface. This does not involve the RPCAP protocol.
+ This indicates a local interface, i.e. the user want to open a capture from
+ a local interface. This does not involve the RPCAP protocol.
*/
#define PCAP_SRC_IFLOCAL 3
/*!
- \brief Internal representation of the type of source in use (file,
- remote/local interface).
+ \brief Internal representation of the type of source in use (file,
+ remote/local interface).
- This indicates a remote interface, i.e. the user want to open a capture from
- an interface on a remote host. This does involve the RPCAP protocol.
+ This indicates a remote interface, i.e. the user want to open a capture from
+ an interface on a remote host. This does involve the RPCAP protocol.
*/
#define PCAP_SRC_IFREMOTE 4
/*!
- \}
+ \}
*/
/*! \addtogroup remote_source_string
- The formats allowed by the pcap_open() are the following:
- - file://path_and_filename [opens a local file]
- - rpcap://devicename [opens the selected device devices available on the local host, without using the RPCAP protocol]
- - rpcap://host/devicename [opens the selected device available on a remote host]
- - rpcap://host:port/devicename [opens the selected device available on a remote host, using a non-standard port for RPCAP]
- - adaptername [to open a local adapter; kept for compability, but it is strongly discouraged]
- - (NULL) [to open the first local adapter; kept for compability, but it is strongly discouraged]
-
- The formats allowed by the pcap_findalldevs_ex() are the following:
- - file://folder/ [lists all the files in the given folder]
- - rpcap:// [lists all local adapters]
- - rpcap://host:port/ [lists the devices available on a remote host]
-
- Referring to the 'host' and 'port' paramters, they can be either numeric or literal. Since
- IPv6 is fully supported, these are the allowed formats:
-
- - host (literal): e.g. host.foo.bar
- - host (numeric IPv4): e.g. 10.11.12.13
- - host (numeric IPv4, IPv6 style): e.g. [10.11.12.13]
- - host (numeric IPv6): e.g. [1:2:3::4]
- - port: can be either numeric (e.g. '80') or literal (e.g. 'http')
-
- Here you find some allowed examples:
- - rpcap://host.foo.bar/devicename [everything literal, no port number]
- - rpcap://host.foo.bar:1234/devicename [everything literal, with port number]
- - rpcap://10.11.12.13/devicename [IPv4 numeric, no port number]
- - rpcap://10.11.12.13:1234/devicename [IPv4 numeric, with port number]
- - rpcap://[10.11.12.13]:1234/devicename [IPv4 numeric with IPv6 format, with port number]
- - rpcap://[1:2:3::4]/devicename [IPv6 numeric, no port number]
- - rpcap://[1:2:3::4]:1234/devicename [IPv6 numeric, with port number]
- - rpcap://[1:2:3::4]:http/devicename [IPv6 numeric, with literal port number]
-
- \{
+ The formats allowed by the pcap_open() are the following:
+ - file://path_and_filename [opens a local file]
+ - rpcap://devicename [opens the selected device devices available on the local host, without using the RPCAP protocol]
+ - rpcap://host/devicename [opens the selected device available on a remote host]
+ - rpcap://host:port/devicename [opens the selected device available on a remote host, using a non-standard port for RPCAP]
+ - adaptername [to open a local adapter; kept for compability, but it is strongly discouraged]
+ - (NULL) [to open the first local adapter; kept for compability, but it is strongly discouraged]
+
+ The formats allowed by the pcap_findalldevs_ex() are the following:
+ - file://folder/ [lists all the files in the given folder]
+ - rpcap:// [lists all local adapters]
+ - rpcap://host:port/ [lists the devices available on a remote host]
+
+ Referring to the 'host' and 'port' paramters, they can be either numeric or literal. Since
+ IPv6 is fully supported, these are the allowed formats:
+
+ - host (literal): e.g. host.foo.bar
+ - host (numeric IPv4): e.g. 10.11.12.13
+ - host (numeric IPv4, IPv6 style): e.g. [10.11.12.13]
+ - host (numeric IPv6): e.g. [1:2:3::4]
+ - port: can be either numeric (e.g. '80') or literal (e.g. 'http')
+
+ Here you find some allowed examples:
+ - rpcap://host.foo.bar/devicename [everything literal, no port number]
+ - rpcap://host.foo.bar:1234/devicename [everything literal, with port number]
+ - rpcap://10.11.12.13/devicename [IPv4 numeric, no port number]
+ - rpcap://10.11.12.13:1234/devicename [IPv4 numeric, with port number]
+ - rpcap://[10.11.12.13]:1234/devicename [IPv4 numeric with IPv6 format, with port number]
+ - rpcap://[1:2:3::4]/devicename [IPv6 numeric, no port number]
+ - rpcap://[1:2:3::4]:1234/devicename [IPv6 numeric, with port number]
+ - rpcap://[1:2:3::4]:http/devicename [IPv6 numeric, with literal port number]
+
+ \{
*/
/*!
- \brief String that will be used to determine the type of source in use (file,
- remote/local interface).
+ \brief String that will be used to determine the type of source in use (file,
+ remote/local interface).
- This string will be prepended to the interface name in order to create a string
- that contains all the information required to open the source.
+ This string will be prepended to the interface name in order to create a string
+ that contains all the information required to open the source.
- This string indicates that the user wants to open a capture from a local file.
+ This string indicates that the user wants to open a capture from a local file.
*/
#define PCAP_SRC_FILE_STRING "file://"
/*!
- \brief String that will be used to determine the type of source in use (file,
- remote/local interface).
+ \brief String that will be used to determine the type of source in use (file,
+ remote/local interface).
- This string will be prepended to the interface name in order to create a string
- that contains all the information required to open the source.
+ This string will be prepended to the interface name in order to create a string
+ that contains all the information required to open the source.
- This string indicates that the user wants to open a capture from a network interface.
- This string does not necessarily involve the use of the RPCAP protocol. If the
- interface required resides on the local host, the RPCAP protocol is not involved
- and the local functions are used.
+ This string indicates that the user wants to open a capture from a network interface.
+ This string does not necessarily involve the use of the RPCAP protocol. If the
+ interface required resides on the local host, the RPCAP protocol is not involved
+ and the local functions are used.
*/
#define PCAP_SRC_IF_STRING "rpcap://"
/*!
- \}
+ \}
*/
@@ -185,137 +185,137 @@ extern "C" {
/*!
- \addtogroup remote_open_flags
- \{
+ \addtogroup remote_open_flags
+ \{
*/
/*!
- \brief Defines if the adapter has to go in promiscuous mode.
-
- It is '1' if you have to open the adapter in promiscuous mode, '0' otherwise.
- Note that even if this parameter is false, the interface could well be in promiscuous
- mode for some other reason (for example because another capture process with
- promiscuous mode enabled is currently using that interface).
- On on Linux systems with 2.2 or later kernels (that have the "any" device), this
- flag does not work on the "any" device; if an argument of "any" is supplied,
- the 'promisc' flag is ignored.
+ \brief Defines if the adapter has to go in promiscuous mode.
+
+ It is '1' if you have to open the adapter in promiscuous mode, '0' otherwise.
+ Note that even if this parameter is false, the interface could well be in promiscuous
+ mode for some other reason (for example because another capture process with
+ promiscuous mode enabled is currently using that interface).
+ On on Linux systems with 2.2 or later kernels (that have the "any" device), this
+ flag does not work on the "any" device; if an argument of "any" is supplied,
+ the 'promisc' flag is ignored.
*/
-#define PCAP_OPENFLAG_PROMISCUOUS 1
+#define PCAP_OPENFLAG_PROMISCUOUS 1
/*!
- \brief Defines if the data trasfer (in case of a remote
- capture) has to be done with UDP protocol.
-
- If it is '1' if you want a UDP data connection, '0' if you want
- a TCP data connection; control connection is always TCP-based.
- A UDP connection is much lighter, but it does not guarantee that all
- the captured packets arrive to the client workstation. Moreover,
- it could be harmful in case of network congestion.
- This flag is meaningless if the source is not a remote interface.
- In that case, it is simply ignored.
+ \brief Defines if the data trasfer (in case of a remote
+ capture) has to be done with UDP protocol.
+
+ If it is '1' if you want a UDP data connection, '0' if you want
+ a TCP data connection; control connection is always TCP-based.
+ A UDP connection is much lighter, but it does not guarantee that all
+ the captured packets arrive to the client workstation. Moreover,
+ it could be harmful in case of network congestion.
+ This flag is meaningless if the source is not a remote interface.
+ In that case, it is simply ignored.
*/
-#define PCAP_OPENFLAG_DATATX_UDP 2
+#define PCAP_OPENFLAG_DATATX_UDP 2
/*!
- \brief Defines if the remote probe will capture its own generated traffic.
+ \brief Defines if the remote probe will capture its own generated traffic.
- In case the remote probe uses the same interface to capture traffic and to send
- data back to the caller, the captured traffic includes the RPCAP traffic as well.
- If this flag is turned on, the RPCAP traffic is excluded from the capture, so that
- the trace returned back to the collector is does not include this traffic.
+ In case the remote probe uses the same interface to capture traffic and to send
+ data back to the caller, the captured traffic includes the RPCAP traffic as well.
+ If this flag is turned on, the RPCAP traffic is excluded from the capture, so that
+ the trace returned back to the collector is does not include this traffic.
*/
-#define PCAP_OPENFLAG_NOCAPTURE_RPCAP 4
+#define PCAP_OPENFLAG_NOCAPTURE_RPCAP 4
/*!
- \brief Defines if the local adapter will capture its own generated traffic.
+ \brief Defines if the local adapter will capture its own generated traffic.
- This flag tells the underlying capture driver to drop the packets that were sent by itself.
- This is usefult when building applications like bridges, that should ignore the traffic
- they just sent.
+ This flag tells the underlying capture driver to drop the packets that were sent by itself.
+ This is usefult when building applications like bridges, that should ignore the traffic
+ they just sent.
*/
-#define PCAP_OPENFLAG_NOCAPTURE_LOCAL 8
+#define PCAP_OPENFLAG_NOCAPTURE_LOCAL 8
/*!
- \brief This flag configures the adapter for maximum responsiveness.
+ \brief This flag configures the adapter for maximum responsiveness.
- In presence of a large value for nbytes, WinPcap waits for the arrival of several packets before
- copying the data to the user. This guarantees a low number of system calls, i.e. lower processor usage,
- i.e. better performance, which is good for applications like sniffers. If the user sets the
- PCAP_OPENFLAG_MAX_RESPONSIVENESS flag, the capture driver will copy the packets as soon as the application
- is ready to receive them. This is suggested for real time applications (like, for example, a bridge)
- that need the best responsiveness.*/
-#define PCAP_OPENFLAG_MAX_RESPONSIVENESS 16
+ In presence of a large value for nbytes, WinPcap waits for the arrival of several packets before
+ copying the data to the user. This guarantees a low number of system calls, i.e. lower processor usage,
+ i.e. better performance, which is good for applications like sniffers. If the user sets the
+ PCAP_OPENFLAG_MAX_RESPONSIVENESS flag, the capture driver will copy the packets as soon as the application
+ is ready to receive them. This is suggested for real time applications (like, for example, a bridge)
+ that need the best responsiveness.*/
+#define PCAP_OPENFLAG_MAX_RESPONSIVENESS 16
/*!
- \}
+ \}
*/
/*!
- \addtogroup remote_samp_methods
- \{
+ \addtogroup remote_samp_methods
+ \{
*/
/*!
- \brief No sampling has to be done on the current capture.
+ \brief No sampling has to be done on the current capture.
- In this case, no sampling algorithms are applied to the current capture.
+ In this case, no sampling algorithms are applied to the current capture.
*/
-#define PCAP_SAMP_NOSAMP 0
+#define PCAP_SAMP_NOSAMP 0
/*!
- \brief It defines that only 1 out of N packets must be returned to the user.
+ \brief It defines that only 1 out of N packets must be returned to the user.
- In this case, the 'value' field of the 'pcap_samp' structure indicates the
- number of packets (minus 1) that must be discarded before one packet got accepted.
- In other words, if 'value = 10', the first packet is returned to the caller, while
- the following 9 are discarded.
+ In this case, the 'value' field of the 'pcap_samp' structure indicates the
+ number of packets (minus 1) that must be discarded before one packet got accepted.
+ In other words, if 'value = 10', the first packet is returned to the caller, while
+ the following 9 are discarded.
*/
-#define PCAP_SAMP_1_EVERY_N 1
+#define PCAP_SAMP_1_EVERY_N 1
/*!
- \brief It defines that we have to return 1 packet every N milliseconds.
+ \brief It defines that we have to return 1 packet every N milliseconds.
- In this case, the 'value' field of the 'pcap_samp' structure indicates the 'waiting
- time' in milliseconds before one packet got accepted.
- In other words, if 'value = 10', the first packet is returned to the caller; the next
- returned one will be the first packet that arrives when 10ms have elapsed.
+ In this case, the 'value' field of the 'pcap_samp' structure indicates the 'waiting
+ time' in milliseconds before one packet got accepted.
+ In other words, if 'value = 10', the first packet is returned to the caller; the next
+ returned one will be the first packet that arrives when 10ms have elapsed.
*/
#define PCAP_SAMP_FIRST_AFTER_N_MS 2
/*!
- \}
+ \}
*/
/*!
- \addtogroup remote_auth_methods
- \{
+ \addtogroup remote_auth_methods
+ \{
*/
/*!
- \brief It defines the NULL authentication.
+ \brief It defines the NULL authentication.
- This value has to be used within the 'type' member of the pcap_rmtauth structure.
- The 'NULL' authentication has to be equal to 'zero', so that old applications
- can just put every field of struct pcap_rmtauth to zero, and it does work.
+ This value has to be used within the 'type' member of the pcap_rmtauth structure.
+ The 'NULL' authentication has to be equal to 'zero', so that old applications
+ can just put every field of struct pcap_rmtauth to zero, and it does work.
*/
#define RPCAP_RMTAUTH_NULL 0
/*!
- \brief It defines the username/password authentication.
+ \brief It defines the username/password authentication.
- With this type of authentication, the RPCAP protocol will use the username/
- password provided to authenticate the user on the remote machine. If the
- authentication is successful (and the user has the right to open network devices)
- the RPCAP connection will continue; otherwise it will be dropped.
+ With this type of authentication, the RPCAP protocol will use the username/
+ password provided to authenticate the user on the remote machine. If the
+ authentication is successful (and the user has the right to open network devices)
+ the RPCAP connection will continue; otherwise it will be dropped.
- This value has to be used within the 'type' member of the pcap_rmtauth structure.
+ This value has to be used within the 'type' member of the pcap_rmtauth structure.
*/
#define RPCAP_RMTAUTH_PWD 1
/*!
- \}
+ \}
*/
@@ -323,71 +323,71 @@ extern "C" {
/*!
- \brief This structure keeps the information needed to autheticate
- the user on a remote machine.
-
- The remote machine can either grant or refuse the access according
- to the information provided.
- In case the NULL authentication is required, both 'username' and
- 'password' can be NULL pointers.
-
- This structure is meaningless if the source is not a remote interface;
- in that case, the functions which requires such a structure can accept
- a NULL pointer as well.
+ \brief This structure keeps the information needed to autheticate
+ the user on a remote machine.
+
+ The remote machine can either grant or refuse the access according
+ to the information provided.
+ In case the NULL authentication is required, both 'username' and
+ 'password' can be NULL pointers.
+
+ This structure is meaningless if the source is not a remote interface;
+ in that case, the functions which requires such a structure can accept
+ a NULL pointer as well.
*/
struct pcap_rmtauth
{
/*!
- \brief Type of the authentication required.
+ \brief Type of the authentication required.
- In order to provide maximum flexibility, we can support different types
- of authentication based on the value of this 'type' variable. The currently
- supported authentication methods are defined into the
- \link remote_auth_methods Remote Authentication Methods Section\endlink.
+ In order to provide maximum flexibility, we can support different types
+ of authentication based on the value of this 'type' variable. The currently
+ supported authentication methods are defined into the
+ \link remote_auth_methods Remote Authentication Methods Section\endlink.
*/
int type;
/*!
- \brief Zero-terminated string containing the username that has to be
- used on the remote machine for authentication.
-
- This field is meaningless in case of the RPCAP_RMTAUTH_NULL authentication
- and it can be NULL.
+ \brief Zero-terminated string containing the username that has to be
+ used on the remote machine for authentication.
+
+ This field is meaningless in case of the RPCAP_RMTAUTH_NULL authentication
+ and it can be NULL.
*/
char *username;
/*!
- \brief Zero-terminated string containing the password that has to be
- used on the remote machine for authentication.
-
- This field is meaningless in case of the RPCAP_RMTAUTH_NULL authentication
- and it can be NULL.
+ \brief Zero-terminated string containing the password that has to be
+ used on the remote machine for authentication.
+
+ This field is meaningless in case of the RPCAP_RMTAUTH_NULL authentication
+ and it can be NULL.
*/
char *password;
};
/*!
- \brief This structure defines the information related to sampling.
+ \brief This structure defines the information related to sampling.
- In case the sampling is requested, the capturing device should read
- only a subset of the packets coming from the source. The returned packets depend
- on the sampling parameters.
+ In case the sampling is requested, the capturing device should read
+ only a subset of the packets coming from the source. The returned packets depend
+ on the sampling parameters.
- \warning The sampling process is applied <strong>after</strong> the filtering process.
- In other words, packets are filtered first, then the sampling process selects a
- subset of the 'filtered' packets and it returns them to the caller.
+ \warning The sampling process is applied <strong>after</strong> the filtering process.
+ In other words, packets are filtered first, then the sampling process selects a
+ subset of the 'filtered' packets and it returns them to the caller.
*/
struct pcap_samp
{
/*!
- Method used for sampling. Currently, the supported methods are listed in the
- \link remote_samp_methods Sampling Methods Section\endlink.
+ Method used for sampling. Currently, the supported methods are listed in the
+ \link remote_samp_methods Sampling Methods Section\endlink.
*/
int method;
/*!
- This value depends on the sampling method defined. For its meaning, please check
- at the \link remote_samp_methods Sampling Methods Section\endlink.
+ This value depends on the sampling method defined. For its meaning, please check
+ at the \link remote_samp_methods Sampling Methods Section\endlink.
*/
int value;
};
@@ -400,7 +400,7 @@ struct pcap_samp
/*!
- \}
+ \}
*/ // end of public documentation
@@ -410,8 +410,8 @@ struct pcap_samp
/** \name New WinPcap functions
- This section lists the new functions that are able to help considerably in writing
- WinPcap programs because of their easiness of use.
+ This section lists the new functions that are able to help considerably in writing
+ WinPcap programs because of their easiness of use.
*/
//\{
pcap_t *pcap_open(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *errbuf);
@@ -427,7 +427,7 @@ struct pcap_samp *pcap_setsampling(pcap_t *p);
/** \name Remote Capture functions
*/
-//\{
+//\{
SOCKET pcap_remoteact_accept(const char *address, const char *port, const char *hostlist, char *connectinghost, struct pcap_rmtauth *auth, char *errbuf);
int pcap_remoteact_list(char *hostlist, char sep, int size, char *errbuf);
int pcap_remoteact_close(const char *host, char *errbuf);
@@ -441,4 +441,3 @@ void pcap_remoteact_cleanup();
#endif
-
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 64644ed46bb..e5aa4c28840 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -581,17 +581,17 @@ void airbustr_state::machine_reset()
static MACHINE_CONFIG_START( airbustr, airbustr_state )
/* basic machine hardware */
- MCFG_CPU_ADD("master", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("master", Z80, XTAL_12MHz/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(master_map)
MCFG_CPU_IO_MAP(master_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", airbustr_state, airbustr_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("slave", Z80, XTAL_12MHz/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(slave_map)
MCFG_CPU_IO_MAP(slave_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", airbustr_state, slave_interrupt) /* nmi signal from master cpu */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", airbustr_state, irq0_line_hold) // nmi are caused by sub cpu writing a sound command
@@ -622,7 +622,7 @@ static MACHINE_CONFIG_START( airbustr, airbustr_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1")) // DSW-1 connected to port A
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2")) // DSW-2 connected to port B
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -630,7 +630,7 @@ static MACHINE_CONFIG_START( airbustr, airbustr_state )
MCFG_SOUND_ROUTE(2, "mono", 0.25)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/4, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/4, OKIM6295_PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alinvade.c b/src/mame/drivers/alinvade.c
index bbbefd61466..7f7a987487c 100644
--- a/src/mame/drivers/alinvade.c
+++ b/src/mame/drivers/alinvade.c
@@ -1,20 +1,20 @@
/*
tiny bartop b&w Space Invaders type game with colour overlay
-
+
Driver by David Haywood and Mariusz Wojcieszek
TODO:
- 16 bytes are protected in the c*** range. I'm guessing they used a PROM to protect a
simple sub-routine because:
- * It attempts to jsr from RAM to that area with a 0x10 byte offset (i.e. ROM copies a code snippet to RAM; when it executes
+ * It attempts to jsr from RAM to that area with a 0x10 byte offset (i.e. ROM copies a code snippet to RAM; when it executes
it code executes jsr 0xc400 then self-modifies it to 0xc410, rinse and repeat ... up to 0xc7f0 and rolls back);
- * After that the program has an amusing left-over located at 0xe000-0xe00f (yup, NOPs + a RTS), with the
+ * After that the program has an amusing left-over located at 0xe000-0xe00f (yup, NOPs + a RTS), with the
exact same number of times as above;
It's unknown at current stage what it really protects tho, game seems working for all I can see ... -AS
- Sound is entirely guesswork.
-
+
*/
#include "emu.h"
@@ -28,10 +28,10 @@ public:
alinvade_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
- , m_videoram(*this, "videoram")
+ , m_videoram(*this, "videoram")
, m_discrete(*this, "discrete")
{ }
-
+
DECLARE_READ8_MEMBER(irqmask_r);
DECLARE_WRITE8_MEMBER(irqmask_w);
DECLARE_WRITE8_MEMBER(sound_w);
@@ -90,7 +90,7 @@ WRITE8_MEMBER(alinvade_state::irqmask_w)
{
if((!(irqff & 1)) && (data & 1)) // f/f, active high? If the above actually returns 0xff this could be active low ...
irqmask^= 1;
-
+
irqff = data;
}
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index 3e2a654874d..74f5f6a4bcb 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -1876,7 +1876,7 @@ static ADDRESS_MAP_START( i8748_portmap, AS_IO, 8, alpha68k_state )
// AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVWRITE_LEGACY("adpcm", saiyugoub1_adpcm_control_w)
ADDRESS_MAP_END
-// Pixel clock, assuming that it can't be 4 MHz because 4 MHz / 15,20 KHz = 263 HTOTAL (VERY unlikely).
+// Pixel clock, assuming that it can't be 4 MHz because 4 MHz / 15,20 KHz = 263 HTOTAL (VERY unlikely).
#define ALPHA68K_PIXEL_CLOCK XTAL_24MHz/4
#define ALPHA68K_HTOTAL 394
#define ALPHA68K_HBEND 0
@@ -1909,10 +1909,10 @@ static MACHINE_CONFIG_START( sstingry, alpha68k_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ALPHA68K_PIXEL_CLOCK,ALPHA68K_HTOTAL,ALPHA68K_HBEND,ALPHA68K_HBSTART,ALPHA68K_VTOTAL,ALPHA68K_VBEND,ALPHA68K_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_sstingry)
MCFG_SCREEN_PALETTE("palette")
@@ -1958,10 +1958,10 @@ static MACHINE_CONFIG_START( kyros, alpha68k_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ALPHA68K_PIXEL_CLOCK,ALPHA68K_HTOTAL,ALPHA68K_HBEND,ALPHA68K_HBSTART,ALPHA68K_VTOTAL,ALPHA68K_VBEND,ALPHA68K_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_kyros)
MCFG_SCREEN_PALETTE("palette")
@@ -2006,10 +2006,10 @@ static MACHINE_CONFIG_START( jongbou, alpha68k_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ALPHA68K_PIXEL_CLOCK,ALPHA68K_HTOTAL,ALPHA68K_HBEND,ALPHA68K_HBSTART,ALPHA68K_VTOTAL,ALPHA68K_VBEND,ALPHA68K_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_kyros)
MCFG_SCREEN_PALETTE("palette")
@@ -2043,10 +2043,10 @@ static MACHINE_CONFIG_START( alpha68k_I, alpha68k_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ALPHA68K_PIXEL_CLOCK,ALPHA68K_HTOTAL,ALPHA68K_HBEND,ALPHA68K_HBSTART,ALPHA68K_VTOTAL,ALPHA68K_VBEND,ALPHA68K_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_alpha68k_I)
MCFG_SCREEN_PALETTE("palette")
@@ -2088,10 +2088,10 @@ static MACHINE_CONFIG_START( alpha68k_II, alpha68k_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ALPHA68K_PIXEL_CLOCK,ALPHA68K_HTOTAL,ALPHA68K_HBEND,ALPHA68K_HBSTART,ALPHA68K_VTOTAL,ALPHA68K_VBEND,ALPHA68K_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_alpha68k_II)
MCFG_SCREEN_PALETTE("palette")
@@ -2141,10 +2141,10 @@ static MACHINE_CONFIG_START( alpha68k_II_gm, alpha68k_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ALPHA68K_PIXEL_CLOCK,ALPHA68K_HTOTAL,ALPHA68K_HBEND,ALPHA68K_HBSTART,ALPHA68K_VTOTAL,ALPHA68K_VBEND,ALPHA68K_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_alpha68k_II)
MCFG_SCREEN_PALETTE("palette")
@@ -2187,10 +2187,10 @@ static MACHINE_CONFIG_START( alpha68k_V, alpha68k_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ALPHA68K_PIXEL_CLOCK,ALPHA68K_HTOTAL,ALPHA68K_HBEND,ALPHA68K_HBSTART,ALPHA68K_VTOTAL,ALPHA68K_VBEND,ALPHA68K_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_alpha68k_V)
MCFG_SCREEN_PALETTE("palette")
@@ -2233,10 +2233,10 @@ static MACHINE_CONFIG_START( alpha68k_V_sb, alpha68k_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ALPHA68K_PIXEL_CLOCK,ALPHA68K_HTOTAL,ALPHA68K_HBEND,ALPHA68K_HBSTART,ALPHA68K_VTOTAL,ALPHA68K_VBEND,ALPHA68K_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_alpha68k_V_sb)
MCFG_SCREEN_PALETTE("palette")
@@ -2278,10 +2278,10 @@ static MACHINE_CONFIG_START( tnextspc, alpha68k_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ALPHA68K_PIXEL_CLOCK,ALPHA68K_HTOTAL,ALPHA68K_HBEND,ALPHA68K_HBSTART,ALPHA68K_VTOTAL,ALPHA68K_VBEND,ALPHA68K_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(alpha68k_state, screen_update_alpha68k_I)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 81021915b92..7ad631dcaa2 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -1248,10 +1248,10 @@ static MACHINE_CONFIG_START( arkanoid, arkanoid_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ARKANOID_PIXEL_CLOCK,ARKANOID_HTOTAL,ARKANOID_HBEND,ARKANOID_HBSTART,ARKANOID_VTOTAL,ARKANOID_VBEND,ARKANOID_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(arkanoid_state, screen_update_arkanoid)
MCFG_SCREEN_PALETTE("palette")
@@ -1282,10 +1282,10 @@ static MACHINE_CONFIG_START( hexa, arkanoid_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ARKANOID_PIXEL_CLOCK,ARKANOID_HTOTAL,ARKANOID_HBEND,ARKANOID_HBSTART,ARKANOID_VTOTAL,ARKANOID_VBEND,ARKANOID_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(arkanoid_state, screen_update_hexa)
MCFG_SCREEN_PALETTE("palette")
@@ -1338,10 +1338,10 @@ static MACHINE_CONFIG_START( brixian, arkanoid_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-// MCFG_SCREEN_SIZE(32*8, 32*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+// MCFG_SCREEN_SIZE(32*8, 32*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_RAW_PARAMS(ARKANOID_PIXEL_CLOCK,ARKANOID_HTOTAL,ARKANOID_HBEND,ARKANOID_HBSTART,ARKANOID_VTOTAL,ARKANOID_VBEND,ARKANOID_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(arkanoid_state, screen_update_hexa)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/astrcorp.c b/src/mame/drivers/astrcorp.c
index 47661198ad7..65aa35433c1 100644
--- a/src/mame/drivers/astrcorp.c
+++ b/src/mame/drivers/astrcorp.c
@@ -491,10 +491,10 @@ static MACHINE_CONFIG_START( showhand, astrocorp_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(58.846) // measured on pcb
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
-// MCFG_SCREEN_SIZE(320, 240)
-// MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
+// MCFG_SCREEN_REFRESH_RATE(58.846) // measured on pcb
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+// MCFG_SCREEN_SIZE(320, 240)
+// MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
MCFG_SCREEN_RAW_PARAMS(ASTROCORP_PIXEL_CLOCK,ASTROCORP_HTOTAL,ASTROCORP_HBEND,320,ASTROCORP_VTOTAL,ASTROCORP_VBEND,ASTROCORP_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(astrocorp_state, screen_update_astrocorp)
MCFG_SCREEN_PALETTE("palette")
@@ -545,10 +545,10 @@ static MACHINE_CONFIG_START( skilldrp, astrocorp_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(58.846)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
-// MCFG_SCREEN_SIZE(0x200, 0x100)
-// MCFG_SCREEN_VISIBLE_AREA(0, 0x200-1, 0, 0xf0-1)
+// MCFG_SCREEN_REFRESH_RATE(58.846)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+// MCFG_SCREEN_SIZE(0x200, 0x100)
+// MCFG_SCREEN_VISIBLE_AREA(0, 0x200-1, 0, 0xf0-1)
MCFG_SCREEN_RAW_PARAMS(ASTROCORP_PIXEL_CLOCK,ASTROCORP_HTOTAL,ASTROCORP_HBEND,512,ASTROCORP_VTOTAL,ASTROCORP_VBEND,ASTROCORP_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(astrocorp_state, screen_update_astrocorp)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index 2f127984bdb..e7ce16b9ea0 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -9,7 +9,7 @@
Known bugs:
* the bootlegs don't actually have the slapstic. The additional
- hardware needs to be emulated.
+ hardware needs to be emulated.
****************************************************************************
@@ -364,7 +364,7 @@ static MACHINE_CONFIG_START( atetrisb2, atetris_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,BOOTLEG_CLOCK/8)
MCFG_CPU_PROGRAM_MAP(atetrisb2_map)
-
+
MCFG_SLAPSTIC_ADD("slapstic")
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -401,15 +401,15 @@ static MACHINE_CONFIG_DERIVED( atetrisb3, atetrisb2 )
MCFG_CPU_REPLACE("maincpu", M6502, MASTER_CLOCK/8)
MCFG_CPU_PROGRAM_MAP(atetrisb3_map)
-
+
//8749 at 10 MHz instead of slapstic
MCFG_SOUND_REPLACE("sn1", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
+
MCFG_SOUND_REPLACE("sn2", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
+
MCFG_SOUND_REPLACE("sn3", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -500,11 +500,11 @@ ROM_START( atetrisb3 )
ROM_REGION( 0x10000, "gfx1", 0 )
ROM_LOAD( "gfx.bin", 0x0000, 0x10000, CRC(84a1939f) SHA1(d8577985fc8ed4e74f74c68b7c00c4855b7c3270) )
-
+
// 8749 (10 MHz OSC) instead of the slapstic, needs to be hooked up.
ROM_REGION( 0x0800, "user1", 0 )
ROM_LOAD( "8749h.bin", 0x0000, 0x0800, CRC(a66a9c47) SHA1(fbebd755a5e826c7d94ebcafdff2f9a01c9fd1a5) )
-
+
// currently unused
ROM_REGION( 0x0020, "proms", 0 )
ROM_LOAD( "82s123.bin", 0x00000, 0x0020, CRC(79656af3) SHA1(bf55f100806520b291157c03999606367dd14ecc) )
diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c
index f6ec50c7432..53960cd628c 100644
--- a/src/mame/drivers/cobra.c
+++ b/src/mame/drivers/cobra.c
@@ -634,7 +634,7 @@ public:
DECLARE_READ64_MEMBER(main_mpc106_r);
DECLARE_WRITE64_MEMBER(main_mpc106_w);
DECLARE_WRITE32_MEMBER(main_cpu_dc_store);
-
+
DECLARE_READ32_MEMBER(sub_comram_r);
DECLARE_WRITE32_MEMBER(sub_comram_w);
DECLARE_READ32_MEMBER(sub_sound_r);
@@ -665,7 +665,7 @@ public:
DECLARE_READ64_MEMBER(gfx_fifo_r);
DECLARE_WRITE64_MEMBER(gfx_buf_w);
DECLARE_WRITE32_MEMBER(gfx_cpu_dc_store);
-
+
DECLARE_WRITE8_MEMBER(sub_jvs_w);
DECLARE_WRITE_LINE_MEMBER(ide_interrupt);
diff --git a/src/mame/drivers/cv1k.c b/src/mame/drivers/cv1k.c
index b0045de328f..bb58730894f 100644
--- a/src/mame/drivers/cv1k.c
+++ b/src/mame/drivers/cv1k.c
@@ -847,7 +847,6 @@ DRIVER_INIT_MEMBER(cv1k_state,espgal2)
READ64_MEMBER( cv1k_state::mushitam_speedup_r )
{
-
if (m_maincpu->pc()== 0xc04a0da) m_maincpu->spin_until_time( attotime::from_usec(10)); // mushitam / mushitama
return m_ram[0x0022f0/8];
}
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index d4d2bfed8ef..dd82c096db0 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -207,7 +207,7 @@ public:
required_shared_ptr<UINT16> m_tilemap1scroll;
required_shared_ptr<UINT16> m_tilemap2scroll;
required_shared_ptr<UINT16> m_roadram;
-
+
tilemap_t *m_tilemap0_tilemap;
tilemap_t *m_tilemap1_tilemap;
tilemap_t *m_tilemap2_tilemap;
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 17b9ec163d3..9f64d990c40 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -574,43 +574,43 @@ static INPUT_PORTS_START( darius )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("DSW") /* DSW */
- PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0002, 0x0002, "Autofire" ) PORT_DIPLOCATION("SW1:2")
+ PORT_DIPNAME( 0x0002, 0x0002, "Autofire" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x0002, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0000, "Fast" )
PORT_SERVICE_DIPLOC( 0x0004, IP_ACTIVE_LOW, "SW1:3" )
- PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:4")
+ PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:4")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0008, DEF_STR( On ) )
- PORT_DIPNAME( 0x0030, 0x0030, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:5,6")
+ PORT_DIPNAME( 0x0030, 0x0030, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:5,6")
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0010, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0020, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0030, DEF_STR( 1C_1C ) )
- PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:7,8")
+ PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:7,8")
PORT_DIPSETTING( 0x00c0, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x0080, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x0040, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) )
- PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
+ PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0200, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0300, DEF_STR( Medium ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4")
+ PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4")
PORT_DIPSETTING( 0x0800, "every 600k" )
PORT_DIPSETTING( 0x0c00, "600k only" )
PORT_DIPSETTING( 0x0400, "800k only" )
PORT_DIPSETTING( 0x0000, DEF_STR( None ) )
- PORT_DIPNAME( 0x3000, 0x3000, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6")
+ PORT_DIPNAME( 0x3000, 0x3000, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6")
PORT_DIPSETTING( 0x3000, "3" )
PORT_DIPSETTING( 0x2000, "4" )
PORT_DIPSETTING( 0x1000, "5" )
PORT_DIPSETTING( 0x0000, "6" )
- PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:8")
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 7c0cb65366c..36f69bf3fb3 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -1256,7 +1256,7 @@ WRITE_LINE_MEMBER(dec0_state::sound_irq2)
/******************************************************************************/
-/* This is guesswork, in order to get ~57,41 Hz.
+/* This is guesswork, in order to get ~57,41 Hz.
* If real Pixel Clock isn't 5 MHz then htotal/vtotal is different too ... */
#define DEC0_PIXEL_CLOCK XTAL_20MHz/4
#define DEC0_HTOTAL 320
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index 13f8f0bc7e9..6fff274c8eb 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -369,7 +369,7 @@ ROM_START( dragrace )
ROM_LOAD( "8516dr.l0", 0x400, 0x200, CRC(d1e74af1) SHA1(f55a3bfd7d152ac9af128697f55c9a0c417779f5) )
ROM_LOAD( "8518dr.n0", 0x600, 0x200, CRC(b1369028) SHA1(598a8779982d532c9f34345e793a79fcb29cac62) )
- ROM_REGION( 0x100, "sync", 0 ) /* sync prom located at L8, it's a 82s129 */
+ ROM_REGION( 0x100, "sync", 0 ) /* sync prom located at L8, it's a 82s129 */
ROM_LOAD( "l8.bin", 0x000, 0x100, CRC(3610b453) SHA1(9e33ee04f22a9174c29fafb8e71781fa330a7a08) )
ROM_END
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 7a925536567..77972d67651 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -372,11 +372,11 @@ UINT32 dreamwld_state::screen_update_dreamwld(screen_device &screen, bitmap_ind1
READ32_MEMBER(dreamwld_state::dreamwld_protdata_r)
{
-// static int count = 0;
+// static int count = 0;
-// printf("protection read %04x\n", count);
-// count++;
+// printf("protection read %04x\n", count);
+// count++;
UINT8 *protdata = memregion("user1")->base();
size_t protsize = memregion("user1")->bytes();
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index ee9c81571e8..baf11ea6a11 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -2789,7 +2789,7 @@ DRIVER_INIT_MEMBER(cps_state, sf2b)
{
/* bootleg sprite ram */
m_bootleg_sprite_ram = (UINT16*)m_maincpu->space(AS_PROGRAM).install_ram(0x700000, 0x703fff);
- m_maincpu->space(AS_PROGRAM).install_ram(0x704000, 0x707fff, m_bootleg_sprite_ram);
+ m_maincpu->space(AS_PROGRAM).install_ram(0x704000, 0x707fff, m_bootleg_sprite_ram);
DRIVER_INIT_CALL(cps1);
}
@@ -2914,7 +2914,7 @@ GAME( 1992, sf2mdt, sf2ce, sf2mdt, sf2mdt, cps_state, sf2mdt, ROT0,
GAME( 1992, sf2mdta, sf2ce, sf2mdt, sf2mdt, cps_state, sf2mdta, ROT0, "bootleg", "Street Fighter II': Magic Delta Turbo (bootleg, set 2)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE ) // 920313 - based on World version
GAME( 1992, sf2mdtb, sf2ce, sf2mdt, sf2mdtb, cps_state, sf2mdtb, ROT0, "bootleg", "Street Fighter II': Magic Delta Turbo (bootleg, set 3)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE ) // 920313 - based on World version
-GAME( 1992, sf2b, sf2, sf2b, sf2mdt, cps_state, sf2b, ROT0, "bootleg", "Street Fighter II: The World Warrior (bootleg)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE ) //910204 - based on World version
+GAME( 1992, sf2b, sf2, sf2b, sf2mdt, cps_state, sf2b, ROT0, "bootleg", "Street Fighter II: The World Warrior (bootleg)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE ) //910204 - based on World version
GAME( 1992, sf2m9, sf2ce, sf2m1, sf2, cps_state, dinopic, ROT0, "bootleg", "Street Fighter II': Champion Edition (M9, bootleg)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE ) // 920313 ETC
diff --git a/src/mame/drivers/gts3.c b/src/mame/drivers/gts3.c
index d796e5edf23..7e4b89d7226 100644
--- a/src/mame/drivers/gts3.c
+++ b/src/mame/drivers/gts3.c
@@ -247,7 +247,7 @@ WRITE8_MEMBER( gts3_state::u4b_w )
m_lampclk = clk_bit;
-// printf("B=%s=%X ",machine().describe_context(),data&0xe0);
+// printf("B=%s=%X ",machine().describe_context(),data&0xe0);
}
READ8_MEMBER( gts3_state::u4a_r )
diff --git a/src/mame/drivers/gts3a.c b/src/mame/drivers/gts3a.c
index ecb96111b2b..f65aea92a41 100644
--- a/src/mame/drivers/gts3a.c
+++ b/src/mame/drivers/gts3a.c
@@ -5,7 +5,7 @@
PINBALL
Gottlieb System 3
Dot Matrix Display
-
+
You need to pick "Pixel Aspect (4:1)" video option in the tab menu.
Status:
@@ -256,7 +256,7 @@ WRITE8_MEMBER( gts3a_state::u4b_w )
m_lampclk = clk_bit;
-// printf("B=%s=%X ",machine().describe_context(),data&0xe0);
+// printf("B=%s=%X ",machine().describe_context(),data&0xe0);
}
READ8_MEMBER( gts3a_state::u4a_r )
diff --git a/src/mame/drivers/gts80b.c b/src/mame/drivers/gts80b.c
index d29f5b8bcb2..0a14a0bb530 100644
--- a/src/mame/drivers/gts80b.c
+++ b/src/mame/drivers/gts80b.c
@@ -252,22 +252,22 @@ static INPUT_PORTS_START( gts80b )
INPUT_PORTS_END
static const UINT16 patterns[] = {
- /* 0x00-0x07 */ 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
- /* 0x08-0x0f */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
- /* 0x10-0x17 */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
- /* 0x18-0x1f */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
- /* 0x20-0x27 */ 0x0000, 0x0309, 0x0220, 0x2A4E, 0x2A6D, 0x6E65, 0x135D, 0x0400,
- /* 0x28-0x2f */ 0x1400, 0x4100, 0x7F40, 0x2A40, 0x0000, 0x0840, 0x0000, 0x4400,
- /* 0x30-0x37 */ 0x003f, 0x2200, 0x085B, 0x084f, 0x0866, 0x086D, 0x087D, 0x0007,
- /* 0x38-0x3f */ 0x087F, 0x086F, 0x0009, 0x4001, 0x4408, 0x0848, 0x1108, 0x2803,
- /* 0x40-0x47 */ 0x205F, 0x0877, 0x2A0F, 0x0039, 0x220F, 0x0079, 0x0071, 0x083D,
- /* 0x48-0x4f */ 0x0876, 0x2209, 0x001E, 0x1470, 0x0038, 0x0536, 0x1136, 0x003f,
- /* 0x50-0x57 */ 0x0873, 0x103F, 0x1873, 0x086D, 0x2201, 0x003E, 0x4430, 0x5036,
- /* 0x58-0x5f */ 0x5500, 0x2500, 0x4409, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
- /* 0x60-0x67 */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
- /* 0x68-0x6f */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
- /* 0x70-0x77 */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
- /* 0x78-0x7f */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+ /* 0x00-0x07 */ 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+ /* 0x08-0x0f */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+ /* 0x10-0x17 */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+ /* 0x18-0x1f */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+ /* 0x20-0x27 */ 0x0000, 0x0309, 0x0220, 0x2A4E, 0x2A6D, 0x6E65, 0x135D, 0x0400,
+ /* 0x28-0x2f */ 0x1400, 0x4100, 0x7F40, 0x2A40, 0x0000, 0x0840, 0x0000, 0x4400,
+ /* 0x30-0x37 */ 0x003f, 0x2200, 0x085B, 0x084f, 0x0866, 0x086D, 0x087D, 0x0007,
+ /* 0x38-0x3f */ 0x087F, 0x086F, 0x0009, 0x4001, 0x4408, 0x0848, 0x1108, 0x2803,
+ /* 0x40-0x47 */ 0x205F, 0x0877, 0x2A0F, 0x0039, 0x220F, 0x0079, 0x0071, 0x083D,
+ /* 0x48-0x4f */ 0x0876, 0x2209, 0x001E, 0x1470, 0x0038, 0x0536, 0x1136, 0x003f,
+ /* 0x50-0x57 */ 0x0873, 0x103F, 0x1873, 0x086D, 0x2201, 0x003E, 0x4430, 0x5036,
+ /* 0x58-0x5f */ 0x5500, 0x2500, 0x4409, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+ /* 0x60-0x67 */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+ /* 0x68-0x6f */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+ /* 0x70-0x77 */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+ /* 0x78-0x7f */ 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
};
READ8_MEMBER( gts80b_state::port1a_r )
@@ -410,9 +410,9 @@ static MACHINE_CONFIG_DERIVED( gts80b_s, gts80b )
MACHINE_CONFIG_END
//static MACHINE_CONFIG_DERIVED( gts80b_ss, gts80b )
-// MCFG_GOTTLIEB_SOUND_R1_ADD("r1sound")
-// //MCFG_GOTTLIEB_SOUND_R1_ADD_VOTRAX("r1sound") // votrax crashes
-// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+// MCFG_GOTTLIEB_SOUND_R1_ADD("r1sound")
+// //MCFG_GOTTLIEB_SOUND_R1_ADD_VOTRAX("r1sound") // votrax crashes
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
//MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gts80b_s1, gts80b )
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 6dff6221e9a..596a4930ea8 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -342,7 +342,7 @@ const device_type HARDDRIV_DEVICE = &device_creator<harddriv_state>;
harddriv_state::harddriv_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, HARDDRIV_DEVICE, "Hard Drivin' PCB Family", tag, owner, clock, "harddriv_pcb", __FILE__),
-/* device_video_interface(mconfig, *this, false), */
+/* device_video_interface(mconfig, *this, false), */
m_maincpu(*this, "maincpu"),
m_gsp(*this, "gsp"),
m_msp(*this, "msp"),
@@ -433,32 +433,32 @@ harddriv_state::harddriv_state(const machine_config &mconfig, const char *tag, d
m_ds3xdsp_sdata(0),
m_ds3xdsp_internal_timer(*this, "ds3xdsp_timer"),
m_adc_control(0),
- m_adc8_select(0),
- m_adc8_data(0),
- m_adc12_select(0),
- m_adc12_byte(0),
- m_adc12_data(0),
- m_hdc68k_last_wheel(0),
- m_hdc68k_last_port1(0),
- m_hdc68k_wheel_edge(0),
- m_hdc68k_shifter_state(0),
- m_st68k_sloop_bank(0),
- m_st68k_last_alt_sloop_offset(0),
- m_next_msp_sync(0),
+ m_adc8_select(0),
+ m_adc8_data(0),
+ m_adc12_select(0),
+ m_adc12_byte(0),
+ m_adc12_data(0),
+ m_hdc68k_last_wheel(0),
+ m_hdc68k_last_port1(0),
+ m_hdc68k_wheel_edge(0),
+ m_hdc68k_shifter_state(0),
+ m_st68k_sloop_bank(0),
+ m_st68k_last_alt_sloop_offset(0),
+ m_next_msp_sync(0),
m_soundflag(0),
- m_mainflag(0),
- m_sounddata(0),
- m_maindata(0),
- m_dacmute(0),
- m_cramen(0),
- m_irq68k(0),
- m_sound_rom_offs(0),
- m_rombase(0),
- m_romsize(0),
- m_last_bio_cycles(0),
- m_vram_mask(0),
- m_shiftreg_enable(0),
- m_gsp_shiftreg_source(0),
+ m_mainflag(0),
+ m_sounddata(0),
+ m_maindata(0),
+ m_dacmute(0),
+ m_cramen(0),
+ m_irq68k(0),
+ m_sound_rom_offs(0),
+ m_rombase(0),
+ m_romsize(0),
+ m_last_bio_cycles(0),
+ m_vram_mask(0),
+ m_shiftreg_enable(0),
+ m_gsp_shiftreg_source(0),
m_gfx_finescroll(0),
m_gfx_palettebank(0),
m_dac(*this, "dac"),
@@ -526,7 +526,6 @@ public:
WRITE16_MEMBER( harddriv_state::watchdog_reset16_w )
{
-
}
static ADDRESS_MAP_START( driver_68k_map, AS_PROGRAM, 16, harddriv_state )
@@ -876,7 +875,7 @@ static INPUT_PORTS_START( harddriv )
PORT_START("mainpcb:12BADC3") /* b80000 - 12 bit ADC 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
+
INPUT_PORTS_END
@@ -964,7 +963,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( racedriv_pan )
PORT_INCLUDE( racedriv )
-
+
PORT_START("leftpcb:IN0") /* 600000 */
PORT_DIPNAME( 0x01, 0x01, "Diagnostic jumper (Left)" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
@@ -1509,7 +1508,7 @@ MACHINE_CONFIG_END
/* Driver board with MSP (used by Hard Drivin' cockpit) */
static MACHINE_CONFIG_FRAGMENT( driver_msp )
- MCFG_FRAGMENT_ADD( driver_nomsp )
+ MCFG_FRAGMENT_ADD( driver_nomsp )
/* basic machine hardware */
MCFG_CPU_ADD("msp", TMS34010, XTAL_50MHz)
@@ -1526,7 +1525,7 @@ MACHINE_CONFIG_END
/* Multisync board without MSP (used by STUN Runner, Steel Talons, Race Drivin' compact) */
static MACHINE_CONFIG_FRAGMENT( multisync_nomsp )
- MCFG_FRAGMENT_ADD( driver_nomsp )
+ MCFG_FRAGMENT_ADD( driver_nomsp )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1547,7 +1546,7 @@ MACHINE_CONFIG_END
/* Multisync board with MSP (used by Hard Drivin' compact) */
static MACHINE_CONFIG_FRAGMENT( multisync_msp )
- MCFG_FRAGMENT_ADD( multisync_nomsp )
+ MCFG_FRAGMENT_ADD( multisync_nomsp )
/* basic machine hardware */
MCFG_CPU_ADD("msp", TMS34010, XTAL_50MHz)
@@ -1564,7 +1563,7 @@ MACHINE_CONFIG_END
/* Multisync II board (used by Hard Drivin's Airborne) */
static MACHINE_CONFIG_FRAGMENT( multisync2 )
- MCFG_FRAGMENT_ADD( multisync_nomsp )
+ MCFG_FRAGMENT_ADD( multisync_nomsp )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1697,14 +1696,14 @@ MACHINE_CONFIG_END
*************************************/
static MACHINE_CONFIG_FRAGMENT( harddriv )
- MCFG_FRAGMENT_ADD( driver_msp )
+ MCFG_FRAGMENT_ADD( driver_msp )
/* basic machine hardware */ /* original driver board with MSP */
MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
MCFG_FRAGMENT_ADD( driversnd ) /* driver sound board */
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( harddrivc )
- MCFG_FRAGMENT_ADD( multisync_msp )
+ MCFG_FRAGMENT_ADD( multisync_msp )
/* basic machine hardware */ /* multisync board with MSP */
MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
@@ -1712,7 +1711,7 @@ static MACHINE_CONFIG_FRAGMENT( harddrivc )
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( racedriv )
- MCFG_FRAGMENT_ADD( driver_nomsp )
+ MCFG_FRAGMENT_ADD( driver_nomsp )
/* basic machine hardware */ /* original driver board without MSP */
MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
@@ -1722,7 +1721,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( racedrivc )
- MCFG_FRAGMENT_ADD( multisync_nomsp )
+ MCFG_FRAGMENT_ADD( multisync_nomsp )
/* basic machine hardware */ /* multisync board without MSP */
MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
@@ -1733,12 +1732,12 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( racedrivc_panorama_side )
- MCFG_FRAGMENT_ADD( multisync_nomsp )
+ MCFG_FRAGMENT_ADD( multisync_nomsp )
/* basic machine hardware */ /* multisync board without MSP */
MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
-// MCFG_FRAGMENT_ADD( dsk ) /* DSK board */
-// MCFG_FRAGMENT_ADD( driversnd ) /* driver sound board */
+// MCFG_FRAGMENT_ADD( dsk ) /* DSK board */
+// MCFG_FRAGMENT_ADD( driversnd ) /* driver sound board */
MACHINE_CONFIG_END
WRITE_LINE_MEMBER(harddriv_state::sound_int_write_line)
@@ -1750,7 +1749,7 @@ WRITE_LINE_MEMBER(harddriv_state::sound_int_write_line)
static MACHINE_CONFIG_FRAGMENT( stunrun )
- MCFG_FRAGMENT_ADD( multisync_nomsp )
+ MCFG_FRAGMENT_ADD( multisync_nomsp )
/* basic machine hardware */ /* multisync board without MSP */
MCFG_CPU_MODIFY("gsp")
@@ -1770,7 +1769,7 @@ static MACHINE_CONFIG_FRAGMENT( stunrun )
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( steeltal )
- MCFG_FRAGMENT_ADD( multisync_msp )
+ MCFG_FRAGMENT_ADD( multisync_msp )
/* basic machine hardware */ /* multisync board with MSP */
MCFG_FRAGMENT_ADD( ds3 ) /* DS III board */
@@ -1793,7 +1792,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( strtdriv )
- MCFG_FRAGMENT_ADD( multisync_nomsp )
+ MCFG_FRAGMENT_ADD( multisync_nomsp )
/* basic machine hardware */ /* multisync board */
MCFG_FRAGMENT_ADD( ds3 ) /* DS III board */
@@ -1805,7 +1804,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( hdrivair )
- MCFG_FRAGMENT_ADD( multisync2 )
+ MCFG_FRAGMENT_ADD( multisync2 )
/* basic machine hardware */ /* multisync II board */
MCFG_FRAGMENT_ADD( ds3 ) /* DS IV board */
@@ -1833,7 +1832,7 @@ void harddriv_board_device_state::device_start()
/* Compact */
void harddrivc_board_device_state::device_start()
-{
+{
init_harddrivc();
harddriv_state::device_start();
}
@@ -2090,12 +2089,12 @@ static MACHINE_CONFIG_START( racedriv_panorama_machine, harddriv_new_state )
MCFG_DEVICE_ADD("leftpcb", RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE, 0)
MCFG_DEVICE_ADD("rightpcb", RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE, 0)
-// MCFG_QUANTUM_TIME(attotime::from_hz(100000))
+// MCFG_QUANTUM_TIME(attotime::from_hz(100000))
MCFG_DEVICE_MODIFY("mainpcb:duartn68681")
MCFG_MC68681_A_TX_CALLBACK(WRITELINE(racedriv_board_device_state,tx_a ))
- MCFG_TIMER_DRIVER_ADD_PERIODIC("hack_timer", harddriv_new_state, hack_timer, attotime::from_hz(60))
-// MCFG_QUANTUM_TIME(attotime::from_hz(60000))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("hack_timer", harddriv_new_state, hack_timer, attotime::from_hz(60))
+// MCFG_QUANTUM_TIME(attotime::from_hz(60000))
MACHINE_CONFIG_END
// this is an ugly hack, otherwise MAME's core can't seem to handle partial updates if you have multiple screens with different update frequencies.
@@ -2155,7 +2154,7 @@ ROM_START( harddriv )
ROM_LOAD( "harddriv.200e", 0x000000, 0x000800, CRC(aed020f7) SHA1(494fc2eb74b4924c07f18bef5e69efd5476deec2) )
ROM_REGION( 0x800, "mainpcb:210e", 0 )
- ROM_LOAD( "harddriv.210e", 0x000000, 0x000800, CRC(4a91835b) SHA1(96f0087ba7e577748758a2fbe61225048862bb65) )
+ ROM_LOAD( "harddriv.210e", 0x000000, 0x000800, CRC(4a91835b) SHA1(96f0087ba7e577748758a2fbe61225048862bb65) )
ROM_END
@@ -4204,7 +4203,7 @@ ROM_START( racedrivpan )
ROM_REGION( 0x800, "mainpcb:210e", 0 )
ROM_LOAD( "racedriv.210e", 0x000000, 0x000800, CRC(3d7c732e) SHA1(e7de81d4a54327514fdd339e93c888c63a344d2c) )
-
+
/* Left PCB ( Multisync PCB (A046901) )*/
ROM_REGION( 0x200000, "leftpcb:maincpu", 0 ) /* 2MB for 68000 code */
ROM_LOAD16_BYTE( "088-2002.bin", 0x000000, 0x010000, CRC(77724070) SHA1(5862f30f7e2ab9c0beb06cf5599bcb1ff97f3a47) )
@@ -4233,7 +4232,7 @@ ROM_START( racedrivpan )
ROM_LOAD16_BYTE( "088-1022.bin", 0x40001, 0x10000, CRC(4f1e1c5d) SHA1(3e72813129cae9e9bf084bfb1b747aa46b92591e) )
ROM_REGION( 0x800, "leftpcb:200e", 0 ) // set to display left monitor, controls not calibrated with valid values (don't think they need to be)
- ROM_LOAD( "leftpcb_200e", 0x000000, 0x000800, CRC(a618d02e) SHA1(cc1068fe4f6ec9a26b6e8fdbe05f4364a64559c1) )
+ ROM_LOAD( "leftpcb_200e", 0x000000, 0x000800, CRC(a618d02e) SHA1(cc1068fe4f6ec9a26b6e8fdbe05f4364a64559c1) )
ROM_REGION( 0x800, "leftpcb:210e", 0 )
ROM_LOAD( "leftpcb_210e", 0x000000, 0x000800, CRC(108ea834) SHA1(d7aec78287647dc52f92143cdb6d7765de0b4e39) )
@@ -4265,7 +4264,7 @@ ROM_START( racedrivpan )
ROM_LOAD16_BYTE( "088-1022.bin", 0x40001, 0x10000, CRC(4f1e1c5d) SHA1(3e72813129cae9e9bf084bfb1b747aa46b92591e) )
ROM_REGION( 0x800, "rightpcb:200e", 0 ) // set to display right monitor, controls not calibrated with valid values (don't think they need to be)
- ROM_LOAD( "rightpcb_200e", 0x000000, 0x000800, CRC(6f1b7094) SHA1(6194a5b99aebe43f02c8d267290207b32c5bdbbd) )
+ ROM_LOAD( "rightpcb_200e", 0x000000, 0x000800, CRC(6f1b7094) SHA1(6194a5b99aebe43f02c8d267290207b32c5bdbbd) )
ROM_REGION( 0x800, "rightpcb:210e", 0 )
ROM_LOAD( "rightpcb_210e", 0x000000, 0x000800, CRC(108ea834) SHA1(d7aec78287647dc52f92143cdb6d7765de0b4e39) )
ROM_END
@@ -5078,9 +5077,9 @@ void harddriv_state::init_racedrivc_panorama_side()
m_gsp_protection = m_gsp->space(AS_PROGRAM).install_write_handler(gsp_protection, gsp_protection + 0x0f, write16_delegate(FUNC(harddriv_state::hdgsp_protection_w), this));
/* set up gsp speedup handler (todo, work these out) */
-// m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM).install_write_handler(0xfff76f60, 0xfff76f6f, write16_delegate(FUNC(harddriv_state::rdgsp_speedup1_w), this));
-// m_gsp->space(AS_PROGRAM).install_read_handler(0xfff76f60, 0xfff76f6f, read16_delegate(FUNC(harddriv_state::rdgsp_speedup1_r), this));
-// m_gsp_speedup_pc = 0xfff43a00;
+// m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM).install_write_handler(0xfff76f60, 0xfff76f6f, write16_delegate(FUNC(harddriv_state::rdgsp_speedup1_w), this));
+// m_gsp->space(AS_PROGRAM).install_read_handler(0xfff76f60, 0xfff76f6f, read16_delegate(FUNC(harddriv_state::rdgsp_speedup1_r), this));
+// m_gsp_speedup_pc = 0xfff43a00;
/* set up adsp speedup handlers */
m_adsp->space(AS_DATA).install_read_handler(0x1fff, 0x1fff, read16_delegate(FUNC(harddriv_state::hdadsp_speedup_r), this));
@@ -5301,5 +5300,3 @@ GAME( 1993, strtdriv, 0, strtdriv_machine, strtdriv, driver_device, 0, RO
GAME( 1993, hdrivair, 0, hdrivair_machine, hdrivair, driver_device, 0, ROT0, "Atari Games", "Hard Drivin's Airborne (prototype)", GAME_IMPERFECT_SOUND )
GAME( 1993, hdrivairp, hdrivair, hdrivairp_machine, hdrivair, driver_device, 0,ROT0, "Atari Games", "Hard Drivin's Airborne (prototype, early rev)", GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
-
-
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index e53e7bcf7ee..e96cd8f8dcf 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -359,7 +359,7 @@ static ADDRESS_MAP_START( le_main, AS_PROGRAM, 8, lethal_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( bank4000_map, AS_PROGRAM, 8, lethal_state )
- // VRD = 0 or 1, CBNK = 0
+ // VRD = 0 or 1, CBNK = 0
AM_RANGE(0x0840, 0x084f) AM_MIRROR(0x8000) AM_DEVREADWRITE("k053244", k05324x_device, k053244_r, k053244_w)
AM_RANGE(0x0880, 0x089f) AM_MIRROR(0x8000) AM_DEVREADWRITE("k054000", k054000_device, read, write)
AM_RANGE(0x08c6, 0x08c6) AM_MIRROR(0x8000) AM_WRITE(sound_cmd_w)
diff --git a/src/mame/drivers/lindbergh.c b/src/mame/drivers/lindbergh.c
index 2ddac448b4c..5c985b1c493 100644
--- a/src/mame/drivers/lindbergh.c
+++ b/src/mame/drivers/lindbergh.c
@@ -246,19 +246,19 @@ public:
#if 0
static ADDRESS_MAP_START(lindbergh_map, AS_PROGRAM, 32, lindbergh_state)
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
- // AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff)
- // AM_RANGE(0x000c0000, 0x000cffff) AM_ROM AM_REGION("vid_bios", 0)
+ // AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff)
+ // AM_RANGE(0x000c0000, 0x000cffff) AM_ROM AM_REGION("vid_bios", 0)
// 0xd0000 - 0xdffff tested, wants 0x414d ("AM") in there
AM_RANGE(0x000f0000, 0x000fffff) AM_ROM AM_REGION("mb_bios", 0xf0000)
-// AM_RANGE(0xfd000000, 0xfd3fffff) AM_ROM AM_REGION("jvs_bios", 0) /* Hack to see the data */
+// AM_RANGE(0xfd000000, 0xfd3fffff) AM_ROM AM_REGION("jvs_bios", 0) /* Hack to see the data */
AM_RANGE(0xfff00000, 0xffffffff) AM_ROM AM_REGION("mb_bios", 0) /* System BIOS */
ADDRESS_MAP_END
static ADDRESS_MAP_START(lindbergh_io, AS_IO, 32, lindbergh_state)
-// AM_IMPORT_FROM(pcat32_io_common)
+// AM_IMPORT_FROM(pcat32_io_common)
-// AM_RANGE(0x00e8, 0x00ef) AM_NOP
-// AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write)
+// AM_RANGE(0x00e8, 0x00ef) AM_NOP
+// AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_legacy_device, read, write)
ADDRESS_MAP_END
#endif
@@ -277,14 +277,14 @@ void lindbergh_state::machine_reset()
static MACHINE_CONFIG_START(lindbergh, lindbergh_state)
// MCFG_CPU_ADD("maincpu", PENTIUM, 2800000000U) /* Actually Celeron D at 2,8 GHz */
MCFG_CPU_ADD("maincpu", PENTIUM4, 28000000U*5) /* Actually Celeron D at 2,8 GHz */
-// MCFG_CPU_PROGRAM_MAP(lindbergh_map)
-// MCFG_CPU_IO_MAP(lindbergh_io)
-// MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+// MCFG_CPU_PROGRAM_MAP(lindbergh_map)
+// MCFG_CPU_IO_MAP(lindbergh_io)
+// MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
-// MCFG_FRAGMENT_ADD( pcat_common )
-// MCFG_FRAGMENT_ADD( pcvideo_vga )
+// MCFG_FRAGMENT_ADD( pcat_common )
+// MCFG_FRAGMENT_ADD( pcvideo_vga )
-// MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
+// MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_ROOT_ADD( ":pci")
MCFG_I82875P_HOST_ADD( ":pci:00.0", 0x103382c0, ":maincpu", 512*1024*1024)
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index 1f807380b46..b83b157e9af 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -167,7 +167,7 @@ WRITE8_MEMBER(maygay1b_state::m1_pia_portb_w)
int i;
for (i=0; i<8; i++)
{
- if ( data & (1 << i) )
+ if ( data & (1 << i) )
{
output_set_indexed_value("triac", i, data & (1 << i));
}
@@ -377,12 +377,12 @@ WRITE8_MEMBER(maygay1b_state::m1_latch_w)
break;
case 2: // Enable
{
- if ( m_NMIENABLE == 0 && ( data & 1 ))
+ if ( m_NMIENABLE == 0 && ( data & 1 ))
{
m_NMIENABLE = (data & 1);
cpu0_nmi();
}
- m_NMIENABLE = (data & 1);
+ m_NMIENABLE = (data & 1);
}
break;
case 3: // RTS
@@ -495,7 +495,7 @@ READ8_MEMBER(maygay1b_state::m1_firq_nec_r)
READ8_MEMBER(maygay1b_state::nec_reset_r)
{
m_upd7759->reset_w(0);
- m_upd7759->reset_w(1);
+ m_upd7759->reset_w(1);
return 0xff;
}
@@ -504,7 +504,7 @@ WRITE8_MEMBER(maygay1b_state::nec_bank0_w)
m_upd7759->set_bank_base(0x00000);
m_upd7759->port_w(space, 0, data);
m_upd7759->start_w(0);
- m_upd7759->start_w(1);
+ m_upd7759->start_w(1);
}
WRITE8_MEMBER(maygay1b_state::nec_bank1_w)
@@ -512,7 +512,7 @@ WRITE8_MEMBER(maygay1b_state::nec_bank1_w)
m_upd7759->set_bank_base(0x20000);
m_upd7759->port_w(space, 0, data);
m_upd7759->start_w(0);
- m_upd7759->start_w(1);
+ m_upd7759->start_w(1);
}
static ADDRESS_MAP_START( m1_nec_memmap, AS_PROGRAM, 8, maygay1b_state )
@@ -665,7 +665,7 @@ MACHINE_CONFIG_DERIVED( maygay_m1_nec, maygay_m1 )
MCFG_CPU_PROGRAM_MAP(m1_nec_memmap)
MCFG_DEVICE_REMOVE("msm6376")
-
+
MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 55f8737927a..4b28ade6d07 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -341,7 +341,7 @@ Sega Strike Fighter (Rev A, set 2) 840-0035C 23786A 20 (64Mb)
Sega Tetris 840-0018C 22909 6 (64Mb) present 315-6213 317-0268-COM
Slashout 840-0041C 23341 17 (64Mb) ? 315-6213 317-0286-COM joystick + 4 buttons
Spawn In the Demon's Hand (Rev B) 841-0005C 22977B 10 (64Mb) ? 315-6213 317-5051-COM joystick + 4 buttons
-Super Major League '99 840-0012C 22059 21 (64Mb) ? 315-6213 ?
+Super Major League '99 840-0012C 22059 21 (64Mb) ? 315-6213 ?
The Typing of the Dead (Rev A) 840-0026C 23021A 20 (64Mb) present 315-6213 not present
Touch de UNO! / Unou Nouryoku Check Machine 840-0008C 22073 4 (64Mb) present 315-6213 317-0255-JPN requires special JVS board with touch input and printer
Toy Fighter / Waffupu 840-0011C 22035 10 (64Mb) present 315-6212 317-0257-COM joystick + 3 buttons
@@ -7835,16 +7835,16 @@ ROM_START( kingrt66 )
ROM_REGION( 0xa800000, "rom_board", ROMREGION_ERASEFF)
ROM_LOAD( "epr-23819a.ic22", 0x0000000, 0x00400000, CRC(92f11b29) SHA1(b33f7eefb849754cfe194be1d48d770ed77ff69a) )
- ROM_LOAD("mpr-23808.ic1", 0x00800000, 0x01000000, CRC(e911bc86) SHA1(0dc658851e20425b2e697e538bb4297a221f6ae8) )
- ROM_LOAD("mpr-23809.ic2", 0x01800000, 0x01000000, CRC(2716aba0) SHA1(4c245874da244926bf9ac6636af4fa67e07a21e8) )
- ROM_LOAD("mpr-23810.ic3", 0x02800000, 0x01000000, CRC(2226accb) SHA1(c4dc71e87c2ccd866f4180129181b7ced8caf22c) )
- ROM_LOAD("mpr-23811.ic4", 0x03800000, 0x01000000, CRC(bbad4a93) SHA1(724c3376102b2dc79b852af1e90748b2e0023b82) )
- ROM_LOAD("mpr-23812.ic5", 0x04800000, 0x01000000, CRC(7beabe22) SHA1(d3cd926fc768d480ff45f1e30024bb0e31bd7d2c) )
- ROM_LOAD("mpr-23813.ic6", 0x05800000, 0x01000000, CRC(fe0b94ea) SHA1(0e46dff932036bec49c78a612bcfd27e07b516e8) )
- ROM_LOAD("mpr-23814.ic7", 0x06800000, 0x01000000, CRC(0cdf7325) SHA1(41668f873b7842dac1bc85aa2b6bd6512edc9b64) )
- ROM_LOAD("mpr-23815.ic8", 0x07800000, 0x01000000, CRC(ef327ab8) SHA1(9dfc564084a75b9c3935374347f1709d2e86e469) )
- ROM_LOAD("mpr-23816.ic9", 0x08800000, 0x01000000, CRC(bbaf0765) SHA1(3b79a4eff504b2156bea8b86c6cdd8e41e7bf268) )
- ROM_LOAD("mpr-23817.ic10", 0x09800000, 0x01000000, CRC(e179cfb6) SHA1(1120036238439f8ac1041150396e4b60e4a243bc) )
+ ROM_LOAD("mpr-23808.ic1", 0x00800000, 0x01000000, CRC(e911bc86) SHA1(0dc658851e20425b2e697e538bb4297a221f6ae8) )
+ ROM_LOAD("mpr-23809.ic2", 0x01800000, 0x01000000, CRC(2716aba0) SHA1(4c245874da244926bf9ac6636af4fa67e07a21e8) )
+ ROM_LOAD("mpr-23810.ic3", 0x02800000, 0x01000000, CRC(2226accb) SHA1(c4dc71e87c2ccd866f4180129181b7ced8caf22c) )
+ ROM_LOAD("mpr-23811.ic4", 0x03800000, 0x01000000, CRC(bbad4a93) SHA1(724c3376102b2dc79b852af1e90748b2e0023b82) )
+ ROM_LOAD("mpr-23812.ic5", 0x04800000, 0x01000000, CRC(7beabe22) SHA1(d3cd926fc768d480ff45f1e30024bb0e31bd7d2c) )
+ ROM_LOAD("mpr-23813.ic6", 0x05800000, 0x01000000, CRC(fe0b94ea) SHA1(0e46dff932036bec49c78a612bcfd27e07b516e8) )
+ ROM_LOAD("mpr-23814.ic7", 0x06800000, 0x01000000, CRC(0cdf7325) SHA1(41668f873b7842dac1bc85aa2b6bd6512edc9b64) )
+ ROM_LOAD("mpr-23815.ic8", 0x07800000, 0x01000000, CRC(ef327ab8) SHA1(9dfc564084a75b9c3935374347f1709d2e86e469) )
+ ROM_LOAD("mpr-23816.ic9", 0x08800000, 0x01000000, CRC(bbaf0765) SHA1(3b79a4eff504b2156bea8b86c6cdd8e41e7bf268) )
+ ROM_LOAD("mpr-23817.ic10", 0x09800000, 0x01000000, CRC(e179cfb6) SHA1(1120036238439f8ac1041150396e4b60e4a243bc) )
ROM_REGION( 4, "rom_key", ROMREGION_ERASE00 )
ROM_END
@@ -8948,7 +8948,7 @@ ROM_END
/* 0039 */ GAME( 2000, gram2000, naomi, naomim1, naomi, naomi_state, gram2000,ROT0, "Sega", "Giant Gram 2000 (JPN, USA, EXP, KOR, AUS)", GAME_FLAGS )
/* 0040 */ GAME( 2000, wwfroyal, naomi, naomim2, naomi, naomi_state, naomi, ROT0, "Sega", "WWF Royal Rumble (JPN, USA, EXP, KOR, AUS)", GAME_FLAGS )
/* 0041 */ GAME( 2000, slasho, naomi, naomim2, naomi, naomi_state, naomi, ROT0, "Sega", "Slashout (JPN, USA, EXP, KOR, AUS)", GAME_FLAGS )
-// 0042 Ferrari F355 Challenge 2 (twin) - identical to 834-????? listed above.
+// 0042 Ferrari F355 Challenge 2 (twin) - identical to 834-????? listed above.
/* 0043 */ GAME( 2000, crackndj, naomi, naomim2, crackndj,naomi_state, naomi, ROT0, "Sega", "Crackin' DJ", GAME_FLAGS )
/* 0044 */ GAME( 2000, csmasho, csmash, naomim2, naomi, naomi_state, naomi, ROT0, "Sega", "Cosmic Smash (JPN, USA, EXP, KOR, AUS)", GAME_FLAGS )
/* 0044 */ GAME( 2000, csmash, naomi, naomim2, naomi, naomi_state, naomi, ROT0, "Sega", "Cosmic Smash (JPN, USA, EXP, KOR, AUS) (Rev A)", GAME_FLAGS )
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 3a43123679c..25e8f7bfbe3 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -4081,30 +4081,30 @@ ROM_END
- 256*4 = 1024 bit
-
- +--\/--+
- A6 |01 16| Vcc
- A5 |02 15| A7
- A4 |03 14| /CE2
- A3 |04 13| /CE1
- A0 |05 12| D0
- A1 |06 11| D1
- A2 |07 10| D2
- GND|08 09| D3
- +------+
-
- NEC Fujitsu Fairchild Intersil Mitsubishi
- ------ ------- --------- -------- ----------
- uPB423 MB7052 93427 IM5623 M54700
- MB7114
-
- Signetics MMI TI Harris Raytheon AMD National Intel OKI
+ 256*4 = 1024 bit
+
+ +--\/--+
+ A6 |01 16| Vcc
+ A5 |02 15| A7
+ A4 |03 14| /CE2
+ A3 |04 13| /CE1
+ A0 |05 12| D0
+ A1 |06 11| D1
+ A2 |07 10| D2
+ GND|08 09| D3
+ +------+
+
+ NEC Fujitsu Fairchild Intersil Mitsubishi
+ ------ ------- --------- -------- ----------
+ uPB423 MB7052 93427 IM5623 M54700
+ MB7114
+
+ Signetics MMI TI Harris Raytheon AMD National Intel OKI
------------ ------ -------- -------- -------- ------ -------- ----- --------
- 82S129 6301-1 TBP24S10 HM7611-5 29661 27S21 74S287 3621 MBL8521A
+ 82S129 6301-1 TBP24S10 HM7611-5 29661 27S21 74S287 3621 MBL8521A
82S129A 63S141 TBP34S10 HM7611A 27S21A
82S27 27S11
-
+
Dumps and docs by Robbie.
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 29762477a4c..68f36f7fff6 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -142,7 +142,7 @@ Super PE+
XnnnnnnP Poker Data. Contains poker game + paytable percentages
Data roms will not work with every Program rom. Incompatible combos report: Incompatible Data EPROM
X000055P is a good example, it works with 19 XP000xxx Program roms. Others may be as few as 2.
- XMPnnnnn Multi-Poker Programs. Different options for each set, but all use the same XMnnnnnP data
+ XMPnnnnn Multi-Poker Programs. Different options for each set, but all use the same XMnnnnnP data
XMP00002 through XMP00006 & XMP00024 Use the XM000xxP Multi-Poker Data
XMP00014, XMP00017 & XMP00030 Use the WING Board add-on and use the XnnnnnnP Poker Data (Not all are compatible!)
XMP00013, XMP00022 & XMP00026 Use the WING Board add-on & CG2346 + CAPX2346 for Spanish paytables
@@ -226,7 +226,7 @@ public:
required_device<screen_device> m_screen;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT8> m_cmos_ram;
required_shared_ptr<UINT8> m_program_ram;
required_shared_ptr<UINT8> m_s3000_ram;
@@ -237,7 +237,7 @@ public:
required_shared_ptr<UINT8> m_sd000_ram;
required_shared_ptr<UINT8> m_sf000_ram;
required_shared_ptr<UINT8> m_io_port;
-
+
tilemap_t *m_bg_tilemap;
UINT8 m_wingboard;
UINT8 m_doorcycle;
@@ -265,7 +265,7 @@ public:
UINT8 m_bv_data_bit;
UINT8 m_bv_loop_count;
UINT16 id023_data;
-
+
DECLARE_WRITE8_MEMBER(peplus_bgcolor_w);
DECLARE_WRITE8_MEMBER(peplus_crtc_display_w);
DECLARE_WRITE8_MEMBER(peplus_duart_w);
diff --git a/src/mame/drivers/pse.c b/src/mame/drivers/pse.c
index d00f3fcc29c..c886dbdeb08 100644
--- a/src/mame/drivers/pse.c
+++ b/src/mame/drivers/pse.c
@@ -2,7 +2,7 @@
Project Support Engineering Games
- Game Name DATA
+ Game Name DATA
--------------------------------
Maneater (1975) YES
Knights in Armor (1976) YES
@@ -114,51 +114,50 @@ ROM_START( dpatrol )
ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
ROM_REGION( 0x0800, "roms", ROMREGION_ERASE00 )
- ROM_LOAD( "bd1.d2", 0x0000, 0x0400, CRC(e4c8e4ab) SHA1(0b989ca9369139f212dcea1d1461998f20057db8)) // computer program game code. 6341-1 or 82S181 according to Desert Patrol schematics
- ROM_LOAD( "bd1.e2", 0x0000, 0x0400, CRC(256b3320) SHA1(712573e3d9625a84c54bbe2e3edafb8879a14b2e)) // computer program game code. 6341-1 or 82S181 according to Desert Patrol schematics
+ ROM_LOAD( "bd1.d2", 0x0000, 0x0400, CRC(e4c8e4ab) SHA1(0b989ca9369139f212dcea1d1461998f20057db8)) // computer program game code. 6341-1 or 82S181 according to Desert Patrol schematics
+ ROM_LOAD( "bd1.e2", 0x0000, 0x0400, CRC(256b3320) SHA1(712573e3d9625a84c54bbe2e3edafb8879a14b2e)) // computer program game code. 6341-1 or 82S181 according to Desert Patrol schematics
- ROM_LOAD( "bd2.l4", 0x0000, 0x0200, CRC(bc87c648) SHA1(c4709d155aa50cc87146abd152a11de618cfd64c)) // prom 1 contains aircraft target images and explosion image. pcb has 82S141; schematics show 6341-1
- ROM_LOAD( "bd2.l1", 0x0000, 0x0800, CRC(f1e8ba9e) SHA1(605db3fdbaff4ba13729371ad0c4fbab3889378e)) // prom 2 contains parachute and man, falling man. pcb has 82S141; schematics show 6341-1
+ ROM_LOAD( "bd2.l4", 0x0000, 0x0200, CRC(bc87c648) SHA1(c4709d155aa50cc87146abd152a11de618cfd64c)) // prom 1 contains aircraft target images and explosion image. pcb has 82S141; schematics show 6341-1
+ ROM_LOAD( "bd2.l1", 0x0000, 0x0800, CRC(f1e8ba9e) SHA1(605db3fdbaff4ba13729371ad0c4fbab3889378e)) // prom 2 contains parachute and man, falling man. pcb has 82S141; schematics show 6341-1
- ROM_LOAD( "bd2.h7", 0x0000, 0x0020, NO_DUMP) // contains prom address codes and image speeds. Each image has its own speed and address block in the image PROM. chip is 82S123
+ ROM_LOAD( "bd2.h7", 0x0000, 0x0020, NO_DUMP) // contains prom address codes and image speeds. Each image has its own speed and address block in the image PROM. chip is 82S123
- ROM_LOAD( "bd3.d1", 0x0000, 0x0020, NO_DUMP ) // data in prom is organized to produce the waveform of a human scream. Chip type is 8574 or MM6301-0J
+ ROM_LOAD( "bd3.d1", 0x0000, 0x0020, NO_DUMP ) // data in prom is organized to produce the waveform of a human scream. Chip type is 8574 or MM6301-0J
ROM_END
/*
ROM_START( knightar )
- ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
+ ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
- ROM_REGION( 0x0020, "roms", ROMREGION_ERASE00 )
- ROM_LOAD( "1.m1" ) // Man rom stores image characters of knights. 82S115P or 8205R according to KIA schematics
- ROM_LOAD( "2.m2" ) // Horse rom stores image characters of horses. 82S115P or 8205R according to KIA schematics
+ ROM_REGION( 0x0020, "roms", ROMREGION_ERASE00 )
+ ROM_LOAD( "1.m1" ) // Man rom stores image characters of knights. 82S115P or 8205R according to KIA schematics
+ ROM_LOAD( "2.m2" ) // Horse rom stores image characters of horses. 82S115P or 8205R according to KIA schematics
ROM_END
*/
/*
ROM_START( gametree )
- ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
+ ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
- ROM_REGION( 0x0020, "roms", ROMREGION_ERASE00 )
- ROM_LOAD( "bd1.d2" ) // computer program game code. 6341-1 or 82S181 according to Game Tree schematics
- ROM_LOAD( "bd1.e2" ) // computer program game code. 6341-1 or 82S181 according to Game Tree schematics
+ ROM_REGION( 0x0020, "roms", ROMREGION_ERASE00 )
+ ROM_LOAD( "bd1.d2" ) // computer program game code. 6341-1 or 82S181 according to Game Tree schematics
+ ROM_LOAD( "bd1.e2" ) // computer program game code. 6341-1 or 82S181 according to Game Tree schematics
- ROM_LOAD( "bd2.f12" ) // prom 1 contains squirrel and squirrel point value. 82S141 or 6341-1 according to Game Tree layout
- ROM_LOAD( "bd2.f14" ) // prom 1 contains squirrel and squirrel point value. 82S141 or 6341-1 according to Game Tree layout
+ ROM_LOAD( "bd2.f12" ) // prom 1 contains squirrel and squirrel point value. 82S141 or 6341-1 according to Game Tree layout
+ ROM_LOAD( "bd2.f14" ) // prom 1 contains squirrel and squirrel point value. 82S141 or 6341-1 according to Game Tree layout
- ROM_LOAD( "bd2.e12" ) // prom 2 contains other targets (rabbit and turkey) and point values
- ROM_LOAD( "bd2.e14" ) // prom 2 82S141 or 6341-1 according to Game Tree layout.
+ ROM_LOAD( "bd2.e12" ) // prom 2 contains other targets (rabbit and turkey) and point values
+ ROM_LOAD( "bd2.e14" ) // prom 2 82S141 or 6341-1 according to Game Tree layout.
- ROM_LOAD( "bd2.a2" ) // contains prom address codes and image speeds. Each has its own speed and address block in the image prom.
+ ROM_LOAD( "bd2.a2" ) // contains prom address codes and image speeds. Each has its own speed and address block in the image prom.
- ROM_LOAD( "bd2.a3" ) // contains prom address codes and image speeds. 82S123 or 6331-1 according to Game Tree layout.
+ ROM_LOAD( "bd2.a3" ) // contains prom address codes and image speeds. 82S123 or 6331-1 according to Game Tree layout.
ROM_END
*/
-GAME( 1977, dpatrol, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Desert Patrol [TTL]", GAME_IS_SKELETON )
-//GAME( 1976, knightar, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Knights in Armor [TTL]", GAME_IS_SKELETON )
-//GAME( 1978, gametree, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Game Tree [TTL]", GAME_IS_SKELETON )
-
+GAME( 1977, dpatrol, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Desert Patrol [TTL]", GAME_IS_SKELETON )
+//GAME( 1976, knightar, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Knights in Armor [TTL]", GAME_IS_SKELETON )
+//GAME( 1978, gametree, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Game Tree [TTL]", GAME_IS_SKELETON )
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 85da54edcd3..ea24dae528a 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -1368,7 +1368,7 @@ static MACHINE_CONFIG_START( raiden2, raiden2_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
-#if 1
+#if 1
MCFG_SCREEN_REFRESH_RATE(55.47) /* verified on pcb */
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500) /* not accurate */)
MCFG_SCREEN_SIZE(44*8, 34*8)
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index 2f11c083dd6..a6ebbcbc9d0 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -6,7 +6,7 @@
Games supported:
* Super Breakout
- * Super Breakout (Canyon and Vertical Breakout, prototype) - built from original source code
+ * Super Breakout (Canyon and Vertical Breakout, prototype) - built from original source code
Known issues:
* none at this time
diff --git a/src/mame/drivers/segacoin.c b/src/mame/drivers/segacoin.c
index 6a34018ef1b..080fcb7000c 100644
--- a/src/mame/drivers/segacoin.c
+++ b/src/mame/drivers/segacoin.c
@@ -3,14 +3,14 @@
/***************************************************************************
Sega Z80 Coin Pusher hardware
-
+
1992 - Western Dream
* 2 x Z80 (prg, sound), 3 x YM3438 (6ch), ..
Hexagon shaped cab, with a toy train riding circles in the top compartment.
6 players, each with a coin pusher, and a LED roulette on the back panel.
-
+
more...
-
+
TODO:
- everything
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index b6205d6c881..782ad296284 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -6174,14 +6174,14 @@ ROM_START( tturf )
ROM_LOAD16_BYTE( "epr-12326.a5", 0x00001, 0x20000, CRC(f998862b) SHA1(69902ab0162eb42e1d6a9792651a5d41cb77477d) )
ROM_REGION( 0x30000, "gfx1", 0 ) // tiles
- ROM_LOAD( "opr-12268.a14", 0x00000, 0x10000, CRC(e0dac07f) SHA1(c7f6de42eb93a8f34afdc300628735b5f40a34c2) ) // ROMS are Toshiba TMM24512AF one time programmable roms
- ROM_LOAD( "opr-12269.a15", 0x10000, 0x10000, CRC(457a8790) SHA1(b701e1a1745cefb31083c8a3daa3b23181f89576) ) // Some ROM boards might have standard EPR numbers with
- ROM_LOAD( "opr-12270.a16", 0x20000, 0x10000, CRC(69fc025b) SHA1(20be1242de27f1b997d43890051cc5d5ac8a127a) ) // standard EPROM chips instead
+ ROM_LOAD( "opr-12268.a14", 0x00000, 0x10000, CRC(e0dac07f) SHA1(c7f6de42eb93a8f34afdc300628735b5f40a34c2) ) // ROMS are Toshiba TMM24512AF one time programmable roms
+ ROM_LOAD( "opr-12269.a15", 0x10000, 0x10000, CRC(457a8790) SHA1(b701e1a1745cefb31083c8a3daa3b23181f89576) ) // Some ROM boards might have standard EPR numbers with
+ ROM_LOAD( "opr-12270.a16", 0x20000, 0x10000, CRC(69fc025b) SHA1(20be1242de27f1b997d43890051cc5d5ac8a127a) ) // standard EPROM chips instead
ROM_REGION16_BE( 0x100000, "sprites", 0 ) // sprites
- ROM_LOAD16_BYTE( "opr-12279.b1", 0x00001, 0x10000, CRC(7a169fb1) SHA1(1ec6da0d2cfcf727e61f61c847fd8b975b64f944) ) // ROMS are Toshiba TMM24512AF one time programmable roms
- ROM_LOAD16_BYTE( "opr-12283.b5", 0x00000, 0x10000, CRC(ae0fa085) SHA1(ae9af92d4dd0c8a0f064d24e647522b588fbd7f7) ) // Some ROM boards might have standard EPR numbers with
- ROM_LOAD16_BYTE( "opr-12278.b2", 0x40001, 0x10000, CRC(961d06b7) SHA1(b1a9dea63785bfa2c0e7b931387b91dfcd27d79b) ) // standard EPROM chips instead
+ ROM_LOAD16_BYTE( "opr-12279.b1", 0x00001, 0x10000, CRC(7a169fb1) SHA1(1ec6da0d2cfcf727e61f61c847fd8b975b64f944) ) // ROMS are Toshiba TMM24512AF one time programmable roms
+ ROM_LOAD16_BYTE( "opr-12283.b5", 0x00000, 0x10000, CRC(ae0fa085) SHA1(ae9af92d4dd0c8a0f064d24e647522b588fbd7f7) ) // Some ROM boards might have standard EPR numbers with
+ ROM_LOAD16_BYTE( "opr-12278.b2", 0x40001, 0x10000, CRC(961d06b7) SHA1(b1a9dea63785bfa2c0e7b931387b91dfcd27d79b) ) // standard EPROM chips instead
ROM_LOAD16_BYTE( "opr-12282.b6", 0x40000, 0x10000, CRC(e8671ee1) SHA1(a3732938c370f1936d867aae9c3d1e9bbfb57ede) )
ROM_LOAD16_BYTE( "opr-12277.b3", 0x80001, 0x10000, CRC(f16b6ba2) SHA1(00cc04c7b5aad82d51d2d252e1e57bcdc5e2c9e3) )
ROM_LOAD16_BYTE( "opr-12281.b7", 0x80000, 0x10000, CRC(1ef1077f) SHA1(8ce6fd7d32a20b93b3f91aaa43fe22720da7236f) )
@@ -6917,7 +6917,7 @@ GAME( 1987, timescan, 0, system16b, timescan, segas16b_state,
GAME( 1994, toryumon, 0, system16b_5797, toryumon, segas16b_state,generic_5797, ROT0, "Sega", "Toryumon", 0 )
-GAME( 1989, tturf, 0, system16b_i8751, tturf, segas16b_state,tturf_5704, ROT0, "Sega / Sunsoft", "Tough Turf (set 2, Japan, 8751 317-0104)", 0 )
+GAME( 1989, tturf, 0, system16b_i8751, tturf, segas16b_state,tturf_5704, ROT0, "Sega / Sunsoft", "Tough Turf (set 2, Japan, 8751 317-0104)", 0 )
GAME( 1989, tturfu, tturf, system16b_i8751, tturf, segas16b_state,generic_5358, ROT0, "Sega / Sunsoft", "Tough Turf (set 1, US, 8751 317-0099)", 0)
GAME( 1988, wb3, 0, system16b_i8751, wb3, segas16b_state,wb3_5704, ROT0, "Sega / Westone", "Wonder Boy III - Monster Lair (set 6, World, System 16B, 8751 317-0098)", 0 )
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index f6029ef0916..9fa5195bd3f 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -912,22 +912,22 @@ static INPUT_PORTS_START( hamaway )
PORT_INCLUDE( system18_generic )
PORT_MODIFY("DSW")
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
+ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:3,4")
+ PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:3,4")
PORT_DIPSETTING( 0x08, "1" )
PORT_DIPSETTING( 0x04, "2" )
PORT_DIPSETTING( 0x0c, "3" )
PORT_DIPSETTING( 0x00, "5" )
//"SW2:5" is unknown - Not listed in the service mode
//"SW2:6" is unknown - Not listed in the service mode
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "2 Credits to Start" ) PORT_DIPLOCATION("SW2:8")
+ PORT_DIPNAME( 0x80, 0x80, "2 Credits to Start" ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
@@ -1887,7 +1887,7 @@ ROM_START( hamaway )
ROM_LOAD16_BYTE( "c18.bin", 0x080001, 0x40000, CRC(0f8fe8bb) SHA1(e6f68442b8d4def29b106458496a47344f70d511) )
ROM_LOAD16_BYTE( "11.bin", 0x080000, 0x40000, CRC(2b5eacbc) SHA1(ba3690501588b9c88a31022b44bc3c82b44ae26b) )
ROM_LOAD16_BYTE( "c19.bin", 0x100001, 0x40000, CRC(3c616caa) SHA1(d48a6239b7a52ac13971f7513a65a17af492bfdf) ) // 11xxxxxxxxxxxxxxxx = 0xFF
- ROM_LOAD16_BYTE( "12.bin", 0x100000, 0x40000, CRC(c7bbd579) SHA1(ab87bfdad66ea241cb23c9bbfea05f5a1574d6c9) ) // 1ST AND 2ND HALF IDENTICAL (but ok, because pairing ROM has no data in the 2nd half anyway)
+ ROM_LOAD16_BYTE( "12.bin", 0x100000, 0x40000, CRC(c7bbd579) SHA1(ab87bfdad66ea241cb23c9bbfea05f5a1574d6c9) ) // 1ST AND 2ND HALF IDENTICAL (but ok, because pairing ROM has no data in the 2nd half anyway)
ROM_REGION( 0x210000, "soundcpu", ROMREGION_ERASEFF ) // sound CPU
ROM_LOAD( "c16.bin", 0x010000, 0x40000, CRC(913cc18c) SHA1(4bf4ec14937586c3ae77fcad57dcb21f6433ef81) )
diff --git a/src/mame/drivers/segaufo.c b/src/mame/drivers/segaufo.c
index 63ac036d559..5a164d4471f 100644
--- a/src/mame/drivers/segaufo.c
+++ b/src/mame/drivers/segaufo.c
@@ -8,7 +8,7 @@
1st gen
* ?
- # UFO Catcher (1985)
-
+
2nd gen:
* ?
- # UFO Catcher DX (1987)
@@ -21,7 +21,7 @@
- UFO Catcher Mini (1991) (1P)
- # UFO Catcher Sega Sonic (1991)
- # School Kids (1993)
-
+
4th gen - EX brd
* Z80, 2 Sega 315-5296(I/O), 315-5338A, YM3438, NEC uPD71054C, optional NEC uPD7759C
- # Dream Palace (1992)
@@ -32,7 +32,7 @@
- UFO Catcher 800 (1998) (1P)
- # Baby UFO (1998)
- # Prize Sensor (1998)
-
+
More games were released after 2000, assumed to be on more modern hardware.
TODO:
@@ -57,7 +57,7 @@
/* simulation parameters */
// x/y/z cabinet dimensions per player (motor range)
-#define CABINET_WIDTH 400
+#define CABINET_WIDTH 400
#define CABINET_DEPTH 400
#define CABINET_HEIGHT 300
@@ -85,7 +85,7 @@ public:
required_device<sega_315_5296_device> m_io1;
required_device<sega_315_5296_device> m_io2;
optional_device<upd7759_device> m_upd;
-
+
struct Player
{
struct Motor
@@ -96,9 +96,9 @@ public:
float speed;
} motor[4];
} m_player[2];
-
+
UINT8 m_stepper;
-
+
void motor_tick(int p, int m);
DECLARE_WRITE_LINE_MEMBER(pit_out0);
@@ -121,7 +121,7 @@ public:
DECLARE_WRITE8_MEMBER(ex_ufo800_lamps_w);
DECLARE_READ8_MEMBER(ex_upd_busy_r);
DECLARE_WRITE8_MEMBER(ex_upd_start_w);
-
+
virtual void machine_reset();
virtual void machine_start();
TIMER_DEVICE_CALLBACK_MEMBER(simulate_xyz);
@@ -135,10 +135,10 @@ void ufo_state::motor_tick(int p, int m)
float delta = m_player[p].motor[m].speed;
if (m_player[p].motor[m].direction)
delta = -delta;
-
+
if (m_player[p].motor[m].running)
m_player[p].motor[m].position += delta;
-
+
if (m_player[p].motor[m].position < 0)
m_player[p].motor[m].position = 0;
if (m_player[p].motor[m].position > 1)
@@ -163,7 +163,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ufo_state::update_info)
for (int p = 0; p < 2; p++)
for (int m = 0; m < 4; m++)
output_set_indexed_value("counter", p*4 + m, (UINT8)(m_player[p].motor[m].position * 100));
-
+
#if 0
char msg1[0x100] = {0};
char msg2[0x100] = {0};
@@ -226,7 +226,7 @@ READ8_MEMBER(ufo_state::crane_limits_r)
// d6: crane open sensor (reflective sticker on the stepper motor rotation disc)
if (m_player[p].motor[3].position >= 0.97)
ret ^= 0x40;
-
+
// d7: prize sensor (mirror?)
ret |= (ioport(p ? "IN2" : "IN1")->read() & 0x80);
@@ -249,23 +249,23 @@ WRITE8_MEMBER(ufo_state::stepper_w)
// d0-d3: p1, d4-d7: p2
UINT8 cur = data >> (p*4) & 0xf;
UINT8 prev = m_stepper >> (p*4) & 0xf;
-
+
for (int i = 0; i < 4; i++)
{
if (sequence[i] == prev && sequence[(i+1) & 3] == cur)
{
m_player[p].motor[3].running = 1;
motor_tick(p, 3);
-
+
// change direction after each quarter rotate
if (m_player[p].motor[3].position <= 0 || m_player[p].motor[3].position >= 1)
m_player[p].motor[3].direction ^= 1;
-
+
break;
}
}
}
-
+
m_stepper = data;
}
@@ -281,7 +281,7 @@ WRITE8_MEMBER(ufo_state::cp_digits_w)
{
static const UINT8 lut_7448[0x10] =
{ 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7c,0x07,0x7f,0x67,0x58,0x4c,0x62,0x69,0x78,0x00 };
-
+
// d0-d3: cpanel digit
// other bits: ?
output_set_digit_value(offset & 1, lut_7448[data & 0xf]);
@@ -290,7 +290,7 @@ WRITE8_MEMBER(ufo_state::cp_digits_w)
WRITE8_MEMBER(ufo_state::crane_xyz_w)
{
int p = offset & 1;
-
+
// d0: x/z axis (0:x, 1:z + halt x/y)
// d1: x/z direction
// d2: y direction
@@ -315,7 +315,7 @@ WRITE8_MEMBER(ufo_state::ufo_lamps_w)
// 10 = red, green
output_set_lamp_value(10, data & 3);
output_set_lamp_value(11, data >> 2 & 3);
-
+
// d4,d5: ?
// d6,d7: coincounters
coin_counter_w(machine(), 0, data & 0x40); // 100 Y
@@ -346,7 +346,7 @@ READ8_MEMBER(ufo_state::ex_crane_limits_r)
ret ^= (m_player[p].motor[m].position >= 1) << shift;
ret ^= (m_player[p].motor[m].position <= 0) << (shift+1);
}
-
+
return ret;
}
@@ -354,17 +354,17 @@ READ8_MEMBER(ufo_state::ex_crane_open_r)
{
// d0-d3: p1, d4-d7: p2
UINT8 ret = 0xff;
-
+
for (int p = 0; p < 2; p++)
{
// d0: crane open sensor
if (m_player[p].motor[3].position >= 0.97)
ret ^= (1 << (p*4));
-
+
// d1: coincounter is plugged in (ufo800 gives error 14 otherwise)
// d2,d3: ?
}
-
+
return ret;
}
@@ -382,7 +382,7 @@ WRITE8_MEMBER(ufo_state::ex_cp_lamps_w)
// d0,d1,d4,d5: p1/p2 button lamps
for (int i = 0; i < 4; i++)
output_set_lamp_value(i, ~data >> ((i&1) + (i&2) * 2) & 1);
-
+
// d2,d3,d6,d7: p1/p2 coincounters
for (int i = 0; i < 4; i++)
coin_counter_w(machine(), i, data >> (2 + (i&1) + (i&2) * 2) & 1);
@@ -391,7 +391,7 @@ WRITE8_MEMBER(ufo_state::ex_cp_lamps_w)
WRITE8_MEMBER(ufo_state::ex_crane_xyz_w)
{
int p = offset & 1;
-
+
// more straightforward setup than on UFO board hardware
// d0: move left
// d1: move right
@@ -464,13 +464,13 @@ static ADDRESS_MAP_START( ex_ufo21_portmap, AS_IO, 8, ufo_state )
AM_RANGE(0x60, 0x60) AM_WRITE(ex_upd_start_w) AM_READNOP
AM_RANGE(0x61, 0x61) AM_READ(ex_upd_busy_r)
AM_RANGE(0x64, 0x65) AM_WRITE(ex_ufo21_lamps_w) AM_READNOP
-// AM_RANGE(0x68, 0x68) AM_WRITENOP // ?
+// AM_RANGE(0x68, 0x68) AM_WRITENOP // ?
AM_IMPORT_FROM( ufo_portmap )
ADDRESS_MAP_END
static ADDRESS_MAP_START( ex_ufo800_portmap, AS_IO, 8, ufo_state )
-// AM_RANGE(0x60, 0x67) AM_NOP // unused?
-// AM_RANGE(0x68, 0x68) AM_WRITENOP // ?
+// AM_RANGE(0x60, 0x67) AM_NOP // unused?
+// AM_RANGE(0x68, 0x68) AM_WRITENOP // ?
AM_IMPORT_FROM( ufo_portmap )
ADDRESS_MAP_END
@@ -723,7 +723,7 @@ void ufo_state::machine_start()
// init/zerofill/register for savestates
static const float motor_speeds[4] =
{ 1.0f/CABINET_WIDTH, 1.0f/CABINET_DEPTH, 1.0f/CABINET_HEIGHT, 1.0f/CRANE_SIZE };
-
+
for (int m = 0; m < 4; m++)
{
for (int p = 0; p < 2; p++)
@@ -742,7 +742,7 @@ void ufo_state::machine_start()
save_item(NAME(m_player[1].motor[m].direction), m);
save_item(NAME(m_player[1].motor[m].position), m);
}
-
+
m_stepper = 0;
save_item(NAME(m_stepper));
}
@@ -761,7 +761,7 @@ static MACHINE_CONFIG_START( newufo, ufo_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("motor_timer", ufo_state, simulate_xyz, attotime::from_hz(MOTOR_SPEED))
MCFG_TIMER_DRIVER_ADD_PERIODIC("update_timer", ufo_state, update_info, attotime::from_hz(60))
-
+
MCFG_DEVICE_ADD("io1", SEGA_315_5296, XTAL_16MHz)
// all ports set to input
MCFG_315_5296_IN_PORTA_CB(READ8(ufo_state, crane_limits_r))
diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c
index 3b5980874be..820cd4ccd8c 100644
--- a/src/mame/drivers/sfbonus.c
+++ b/src/mame/drivers/sfbonus.c
@@ -297,7 +297,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
required_shared_ptr<UINT8> m_nvram;
required_shared_ptr<UINT8> m_1800_regs;
required_shared_ptr<UINT8> m_vregs;
@@ -305,7 +305,7 @@ public:
required_shared_ptr<UINT8> m_2c01_regs;
required_shared_ptr<UINT8> m_3000_regs;
required_shared_ptr<UINT8> m_3800_regs;
-
+
bitmap_ind16 *m_temp_reel_bitmap;
tilemap_t *m_tilemap;
tilemap_t *m_reel_tilemap;
@@ -318,7 +318,7 @@ public:
UINT8 *m_reel3_ram;
UINT8 *m_reel4_ram;
UINT8* m_videoram;
-
+
DECLARE_WRITE8_MEMBER(sfbonus_videoram_w);
DECLARE_WRITE8_MEMBER(sfbonus_bank_w);
DECLARE_READ8_MEMBER(sfbonus_2800_r);
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index c319820e726..14e1f59fb40 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1860,7 +1860,7 @@ static MACHINE_CONFIG_START( rranger, suna8_state )
MCFG_CPU_IO_MAP(rranger_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", suna8_state, irq0_line_hold) /* IRQ & NMI ! */
- MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(rranger_sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(suna8_state, irq0_line_hold, 4*60) /* NMI = retn */
@@ -1883,13 +1883,13 @@ static MACHINE_CONFIG_START( rranger, suna8_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym1", YM2203, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna8_state, rranger_play_samples_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(suna8_state, suna8_samples_number_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
- MCFG_SOUND_ADD("ym2", YM2203, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM2203, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
diff --git a/src/mame/drivers/supduck.c b/src/mame/drivers/supduck.c
index c17db6b6aba..68e9a6fe6cb 100644
--- a/src/mame/drivers/supduck.c
+++ b/src/mame/drivers/supduck.c
@@ -177,7 +177,7 @@ TILE_GET_INFO_MEMBER(supduck_state::get_fore_tile_info)
int color = (data & 0x0f00)>>8;
int flags = (data & 0x2000) ? TILE_FLIPX : 0;
- flags |=(data & 0x1000) ? TILE_FLIPY : 0;
+ flags |=(data & 0x1000) ? TILE_FLIPY : 0;
SET_TILE_INFO_MEMBER(1, code, color, flags);
@@ -185,7 +185,6 @@ TILE_GET_INFO_MEMBER(supduck_state::get_fore_tile_info)
TILE_GET_INFO_MEMBER(supduck_state::get_back_tile_info)
{
-
UINT16 *videoram = m_back_videoram;
int data = videoram[tile_index];
@@ -195,7 +194,7 @@ TILE_GET_INFO_MEMBER(supduck_state::get_back_tile_info)
int color = (data & 0x0f00)>>8;
int flags = (data & 0x2000) ? TILE_FLIPX : 0;
- flags |=(data & 0x1000) ? TILE_FLIPY : 0;
+ flags |=(data & 0x1000) ? TILE_FLIPY : 0;
SET_TILE_INFO_MEMBER(2, code, color, flags);
}
@@ -244,7 +243,6 @@ void supduck_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect
WRITE16_MEMBER(supduck_state::supduck_4000_w)
{
-
}
WRITE16_MEMBER(supduck_state::supduck_paletteram_w)
@@ -298,7 +296,7 @@ WRITE16_MEMBER(supduck_state::supduck_scroll_w)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, supduck_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_WRITENOP
- AM_RANGE(0xfe0000, 0xfe1fff) AM_RAM AM_SHARE("spriteram")
+ AM_RANGE(0xfe0000, 0xfe1fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0xfe4000, 0xfe4001) AM_READ_PORT("P1_P2") AM_WRITE( supduck_4000_w )
AM_RANGE(0xfe4002, 0xfe4003) AM_READ_PORT("SYSTEM") AM_WRITE( supduck_4002_w )
@@ -306,7 +304,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, supduck_state )
AM_RANGE(0xfe8000, 0xfe8007) AM_WRITE(supduck_scroll_w)
AM_RANGE(0xfe800e, 0xfe800f) AM_WRITENOP // watchdog or irqack
-
+
AM_RANGE(0xfec000, 0xfecfff) AM_RAM_WRITE(text_videoram_w) AM_SHARE("textvideoram")
AM_RANGE(0xff0000, 0xff3fff) AM_RAM_WRITE(back_videoram_w) AM_SHARE("backvideoram")
AM_RANGE(0xff4000, 0xff7fff) AM_RAM_WRITE(fore_videoram_w) AM_SHARE("forevideoram")
@@ -444,7 +442,7 @@ static const gfx_layout vramlayout_bionicc=
};
// same as the ROM tilemap layout from tigeroad
-static const gfx_layout tile_layout =
+static const gfx_layout tile_layout =
{
32, 32,
RGN_FRAC(1, 2),
@@ -512,7 +510,7 @@ static MACHINE_CONFIG_START( supduck, supduck_state )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", supduck)
MCFG_PALETTE_ADD("palette", 0x800/2)
-// MCFG_PALETTE_FORMAT(xRGBRRRRGGGGBBBB) // can't use this, the RGB bits are the lowest bits with this format, for this game they're the highest bits
+// MCFG_PALETTE_FORMAT(xRGBRRRRGGGGBBBB) // can't use this, the RGB bits are the lowest bits with this format, for this game they're the highest bits
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -562,7 +560,7 @@ ROM_START( supduck )
ROM_REGION( 0x80000, "oki", 0 )
ROM_LOAD( "2.su12", 0x00000, 0x20000, CRC(745d42fb) SHA1(f9aee3ddbad3cc2f3a7002ee0d762eb041967e1e) ) // static sample data
-
+
ROM_REGION( 0x80000, "okibank", 0 )
ROM_LOAD( "1.su13", 0x00000, 0x80000, CRC(7fb1ed42) SHA1(77ec86a6454398e329066aa060e9b6a39085ce71) ) // banked sample data
ROM_END
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index cff3d300544..be38c2da691 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -2695,4 +2695,3 @@ GAME( 1988, kabukizj, kabukiz, kabukiz, kabukizj, tnzs_state, kabukiz, RO
GAME( 1989, insectx, 0, insectx, insectx, tnzs_state, insectx, ROT0, "Taito Corporation Japan", "Insector X (World)", 0 )
GAME( 1989, insectxj, insectx, insectx, insectxj, tnzs_state, insectx, ROT0, "Taito Corporation", "Insector X (Japan)", 0 )
-
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index 66642c843d6..c7d5a49a9f0 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -85,7 +85,7 @@ WRITE16_MEMBER(twin16_state::CPUA_register_w)
{
int rising_edge = ~old & m_CPUA_register;
int falling_edge = old & ~m_CPUA_register;
-
+
if (rising_edge & 0x08)
m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff);
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index 79f8bd1cd27..43c732033d3 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -235,26 +235,26 @@ static INPUT_PORTS_START( videopin )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("DSW") /* IN1 */
- PORT_DIPNAME( 0xc0, 0x80, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW:8,7")
+ PORT_DIPNAME( 0xc0, 0x80, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW:8,7")
PORT_DIPSETTING( 0xc0, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_DIPNAME( 0x30, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("DSW:6,5")
+ PORT_DIPNAME( 0x30, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("DSW:6,5")
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x10, DEF_STR( German ) )
PORT_DIPSETTING( 0x20, DEF_STR( French ) )
PORT_DIPSETTING( 0x30, DEF_STR( Spanish ) )
- PORT_DIPNAME( 0x08, 0x08, "Balls" ) PORT_DIPLOCATION("DSW:4")
+ PORT_DIPNAME( 0x08, 0x08, "Balls" ) PORT_DIPLOCATION("DSW:4")
PORT_DIPSETTING( 0x08, "3" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_DIPNAME( 0x04, 0x00, "Replay" ) PORT_DIPLOCATION("DSW:3")
+ PORT_DIPNAME( 0x04, 0x00, "Replay" ) PORT_DIPLOCATION("DSW:3")
PORT_DIPSETTING( 0x04, "Off (award 80000 points instead)" )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x00, "Extra Ball" ) PORT_DIPLOCATION("DSW:2")
+ PORT_DIPNAME( 0x02, 0x00, "Extra Ball" ) PORT_DIPLOCATION("DSW:2")
PORT_DIPSETTING( 0x02, "Off (award 50000 points instead)" )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x01, 0x01, "Replay Level" ) PORT_DIPLOCATION("DSW:1")
+ PORT_DIPNAME( 0x01, 0x01, "Replay Level" ) PORT_DIPLOCATION("DSW:1")
PORT_DIPSETTING( 0x00, "180000 (3 balls) / 300000 (5 balls)" )
PORT_DIPSETTING( 0x01, "210000 (3 balls) / 350000 (5 balls)" )
@@ -275,13 +275,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( solarwar )
PORT_INCLUDE( videopin )
PORT_MODIFY("DSW")
- PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW:8,7")
+ PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW:8,7")
PORT_DIPSETTING( 0xc0, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
PORT_DIPUNKNOWN_DIPLOC( 0x30, 0x30, "DSW:6,5" )
- PORT_DIPNAME( 0x01, 0x01, "Replay Level" ) PORT_DIPLOCATION("DSW:1")
+ PORT_DIPNAME( 0x01, 0x01, "Replay Level" ) PORT_DIPLOCATION("DSW:1")
PORT_DIPSETTING( 0x00, "180000 (3 balls) / 300000 (5 balls)" )
PORT_DIPSETTING( 0x01, "300000 (3 balls) / 500000 (5 balls)" )
INPUT_PORTS_END
@@ -410,23 +410,23 @@ ROM_END
ROM_START( solarwar )
ROM_REGION( 0x10000, "maincpu", 0 )
- ROM_LOAD_NIB_LOW ( "36159-01.e0", 0x2000, 0x0400, CRC(0db9f0fc) SHA1(191429a25b43727694f75c0ae9cbff705fbc4d77) )
- ROM_LOAD_NIB_HIGH( "36154-01.k0", 0x2000, 0x0400, CRC(64629efc) SHA1(4da3870c35e693ed334502ea17ae023a0073ff85) )
- ROM_LOAD_NIB_LOW ( "36160-01.d0", 0x2400, 0x0400, CRC(63a25dee) SHA1(cff0f1c4d381eb99a30f2fe09ff6f42ca994a19f) )
- ROM_LOAD_NIB_HIGH( "36155-01.j0", 0x2400, 0x0400, CRC(5fa64f47) SHA1(64e37380be0df761ba81c516592fef87bba30b91) )
- ROM_LOAD_NIB_LOW ( "36167-01.h1", 0x2800, 0x0400, CRC(5a85bca8) SHA1(7af9895c2e567d569ed60305fa1245081e346fc1) )
- ROM_LOAD_NIB_HIGH( "36166-01.h1", 0x2800, 0x0400, CRC(6ce095a6) SHA1(e3bb534487d3cd0cecccff47c0742de8f951b46c) )
- ROM_LOAD_NIB_LOW ( "36161-01.c0", 0x2c00, 0x0400, CRC(a9e2e08f) SHA1(5539a86d4fb69735182762e21cf3cc26d16eff80) )
- ROM_LOAD_NIB_HIGH( "36157-01.h0", 0x2c00, 0x0400, CRC(30b6eb18) SHA1(ae819dd97c6a7e26981731e7706cbfa3699b6a0b) )
- ROM_LOAD_NIB_LOW ( "36169-01.e1", 0x3000, 0x0400, CRC(f702127c) SHA1(7fb83c616671e4ea9697282a04662ec035d5d8ed) )
- ROM_LOAD_NIB_HIGH( "36164-01.k1", 0x3000, 0x0400, CRC(3dcded96) SHA1(eacdf017b08a7c3305fd79430fbbf07292d0cfa0) )
- ROM_LOAD_NIB_LOW ( "36163-02.a0", 0x3400, 0x0400, CRC(3e176619) SHA1(9b6a9a5fa02b1d87bdaa43fad8971ff3317b132d) )
- ROM_LOAD_NIB_HIGH( "36156-02.h0", 0x3400, 0x0400, CRC(e51363fb) SHA1(c01b263dfd6d448a18ff855a93aa4e48afc6d725) )
- ROM_LOAD_NIB_LOW ( "36168-01.f1", 0x3800, 0x0400, CRC(5ccbcf7e) SHA1(10f8932265abe6e62e9f243c653d7fad770a2ff5) )
- ROM_LOAD_NIB_HIGH( "36165-01.j1", 0x3800, 0x0400, CRC(e2ee4f7d) SHA1(be2f602a5bcfe404509ac8d6914a03213573b0a6) )
- ROM_LOAD_NIB_LOW ( "36162-02.b0", 0x3c00, 0x0400, CRC(cec1baaa) SHA1(15c130b01a7b8b9aa07e01f7c84c4c26494f39d8) )
+ ROM_LOAD_NIB_LOW ( "36159-01.e0", 0x2000, 0x0400, CRC(0db9f0fc) SHA1(191429a25b43727694f75c0ae9cbff705fbc4d77) )
+ ROM_LOAD_NIB_HIGH( "36154-01.k0", 0x2000, 0x0400, CRC(64629efc) SHA1(4da3870c35e693ed334502ea17ae023a0073ff85) )
+ ROM_LOAD_NIB_LOW ( "36160-01.d0", 0x2400, 0x0400, CRC(63a25dee) SHA1(cff0f1c4d381eb99a30f2fe09ff6f42ca994a19f) )
+ ROM_LOAD_NIB_HIGH( "36155-01.j0", 0x2400, 0x0400, CRC(5fa64f47) SHA1(64e37380be0df761ba81c516592fef87bba30b91) )
+ ROM_LOAD_NIB_LOW ( "36167-01.h1", 0x2800, 0x0400, CRC(5a85bca8) SHA1(7af9895c2e567d569ed60305fa1245081e346fc1) )
+ ROM_LOAD_NIB_HIGH( "36166-01.h1", 0x2800, 0x0400, CRC(6ce095a6) SHA1(e3bb534487d3cd0cecccff47c0742de8f951b46c) )
+ ROM_LOAD_NIB_LOW ( "36161-01.c0", 0x2c00, 0x0400, CRC(a9e2e08f) SHA1(5539a86d4fb69735182762e21cf3cc26d16eff80) )
+ ROM_LOAD_NIB_HIGH( "36157-01.h0", 0x2c00, 0x0400, CRC(30b6eb18) SHA1(ae819dd97c6a7e26981731e7706cbfa3699b6a0b) )
+ ROM_LOAD_NIB_LOW ( "36169-01.e1", 0x3000, 0x0400, CRC(f702127c) SHA1(7fb83c616671e4ea9697282a04662ec035d5d8ed) )
+ ROM_LOAD_NIB_HIGH( "36164-01.k1", 0x3000, 0x0400, CRC(3dcded96) SHA1(eacdf017b08a7c3305fd79430fbbf07292d0cfa0) )
+ ROM_LOAD_NIB_LOW ( "36163-02.a0", 0x3400, 0x0400, CRC(3e176619) SHA1(9b6a9a5fa02b1d87bdaa43fad8971ff3317b132d) )
+ ROM_LOAD_NIB_HIGH( "36156-02.h0", 0x3400, 0x0400, CRC(e51363fb) SHA1(c01b263dfd6d448a18ff855a93aa4e48afc6d725) )
+ ROM_LOAD_NIB_LOW ( "36168-01.f1", 0x3800, 0x0400, CRC(5ccbcf7e) SHA1(10f8932265abe6e62e9f243c653d7fad770a2ff5) )
+ ROM_LOAD_NIB_HIGH( "36165-01.j1", 0x3800, 0x0400, CRC(e2ee4f7d) SHA1(be2f602a5bcfe404509ac8d6914a03213573b0a6) )
+ ROM_LOAD_NIB_LOW ( "36162-02.b0", 0x3c00, 0x0400, CRC(cec1baaa) SHA1(15c130b01a7b8b9aa07e01f7c84c4c26494f39d8) )
ROM_RELOAD( 0xfc00, 0x0400 )
- ROM_LOAD_NIB_HIGH( "36158-02.f0", 0x3c00, 0x0400, CRC(2606b87e) SHA1(ea72e36837eccf29cd5c82fe9a6a018a1a94730c) )
+ ROM_LOAD_NIB_HIGH( "36158-02.f0", 0x3c00, 0x0400, CRC(2606b87e) SHA1(ea72e36837eccf29cd5c82fe9a6a018a1a94730c) )
ROM_RELOAD( 0xfc00, 0x0400 )
ROM_REGION( 0x0200, "gfx1", 0 ) /* tiles */
diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h
index 027dd5bf1a1..6408235614f 100644
--- a/src/mame/includes/atetris.h
+++ b/src/mame/includes/atetris.h
@@ -23,17 +23,17 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
optional_device<atari_slapstic_device> m_slapstic_device;
-
+
required_shared_ptr<UINT8> m_nvram;
required_shared_ptr<UINT8> m_videoram;
-
+
UINT8 *m_slapstic_source;
UINT8 *m_slapstic_base;
UINT8 m_current_bank;
UINT8 m_nvram_write_enable;
emu_timer *m_interrupt_timer;
tilemap_t *m_bg_tilemap;
-
+
DECLARE_WRITE8_MEMBER(irq_ack_w);
DECLARE_READ8_MEMBER(slapstic_r);
DECLARE_WRITE8_MEMBER(coincount_w);
diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h
index d47b5ce9279..f6731c62db7 100644
--- a/src/mame/includes/exidy440.h
+++ b/src/mame/includes/exidy440.h
@@ -80,7 +80,7 @@ public:
DECLARE_VIDEO_START(exidy440);
DECLARE_VIDEO_START(topsecex);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int scroll_offset, int check_collision);
- void update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int scroll_offset, int check_collision);
+ void update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int scroll_offset, int check_collision);
UINT32 screen_update_exidy440(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_topsecex(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(exidy440_vblank_interrupt);
diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h
index 2ac368ec555..012a6bedcc7 100644
--- a/src/mame/includes/harddriv.h
+++ b/src/mame/includes/harddriv.h
@@ -38,7 +38,7 @@ extern const device_type HDRIVAIRP_BOARD_DEVICE;
class harddriv_state : public device_t
- /* public device_video_interface */
+ /* public device_video_interface */
{
public:
harddriv_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -253,24 +253,24 @@ public:
void steeltal_init_common(offs_t ds3_transfer_pc, int proto_sloop);
void init_strtdriv(void);
-
+
void init_harddriv(void);
-
+
void init_harddrivc(void);
void init_racedriv(void);
- void init_racedrivb1(void);
+ void init_racedrivb1(void);
void init_racedrivc(void);
void init_racedrivc1(void);
-
+
void init_hdrivair(void);
void init_hdrivairp(void);
-
+
void init_steeltal(void);
void init_steeltal1(void);
void init_steeltalp(void);
-
+
void init_stunrun(void);
void init_racedrivc_panorama_side();
@@ -461,7 +461,7 @@ public:
TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_driver);
TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_multisync);
-
+
UINT8 m_sound_int_state;
UINT8 m_video_int_state;
@@ -487,7 +487,7 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_start();
-// virtual void device_reset();
+// virtual void device_reset();
};
/* Hard Drivin' Compact */
@@ -500,7 +500,7 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_start();
-// virtual void device_reset();
+// virtual void device_reset();
};
/* Race Drivin' */
@@ -514,7 +514,7 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_start();
-// virtual void device_reset();
+// virtual void device_reset();
};
class racedrivb1_board_device_state : public racedriv_board_device_state
@@ -538,7 +538,7 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_start();
-// virtual void device_reset();
+// virtual void device_reset();
};
class racedrivc1_board_device_state : public racedrivc_board_device_state
@@ -573,7 +573,7 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_start();
-// virtual void device_reset();
+// virtual void device_reset();
};
/* Steel Talons */
@@ -586,7 +586,7 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_start();
-// virtual void device_reset();
+// virtual void device_reset();
};
class steeltal1_board_device_state : public steeltal_board_device_state
@@ -623,7 +623,7 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_start();
-// virtual void device_reset();
+// virtual void device_reset();
};
/* Hard Drivin' Airbourne */
@@ -636,7 +636,7 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_start();
-// virtual void device_reset();
+// virtual void device_reset();
};
class hdrivairp_board_device_state : public hdrivair_board_device_state
@@ -645,11 +645,7 @@ public:
hdrivairp_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
hdrivair_board_device_state(mconfig, tag, owner, clock)
{};
-
+
protected:
virtual void device_start();
};
-
-
-
-
diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h
index b0bc8c01441..44a09468286 100644
--- a/src/mame/includes/konamigx.h
+++ b/src/mame/includes/konamigx.h
@@ -67,7 +67,7 @@ public:
optional_shared_ptr<UINT16> m_k053936_0_linectrl_16;
optional_shared_ptr<UINT32> m_konamigx_type3_psac2_bank;
optional_shared_ptr<UINT32> m_generic_paletteram_32;
-
+
optional_ioport m_an0, m_an1, m_light0_x, m_light0_y, m_light1_x, m_light1_y, m_eepromout;
DECLARE_WRITE32_MEMBER(esc_w);
@@ -167,16 +167,16 @@ public:
void fantjour_dma_install();
void konamigx_mixer_primode(int mode);
-
+
typedef void (konamigx_state::*esc_cb)(address_space &space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4);
-
+
void tkmmpzdm_esc(address_space &space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4);
void dragoonj_esc(address_space &space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4);
void sal2_esc(address_space &space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4);
void sexyparo_esc(address_space &space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4);
void tbyahhoo_esc(address_space &space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4);
void daiskiss_esc(address_space &space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4);
-
+
inline int K053247GX_combine_c18(int attrib);
inline int K055555GX_decode_objcolor(int c18);
inline int K055555GX_decode_inpri(int c18);
@@ -193,17 +193,17 @@ public:
int m_gx_cfgport;
int m_suspension_active, m_resume_trigger;
int m_last_prot_op, m_last_prot_clk;
-
+
UINT8 m_esc_program[4096];
esc_cb m_esc_cb;
-
+
UINT16 m_prot_data[0x20];
-
+
UINT16 *m_gx_spriteram;
-
+
// mirrored K054338 settings
int *m_K054338_shdRGB;
-
+
// 1st-Tier GX/MW Variables
// frequently used registers
int m_k053247_vrcbk[4];
@@ -213,8 +213,8 @@ public:
int m_vinmix, m_vmixon, m_osinmix, m_osmixon;
UINT8 m_gx_wrport1_0, m_gx_wrport1_1;
UINT16 m_gx_wrport2;
-
- // 2nd-Tier GX/MW Graphics Variables
+
+ // 2nd-Tier GX/MW Graphics Variables
UINT8 *m_gx_objzbuf, *m_gx_shdzbuf;
int m_layer_colorbase[4];
INT32 m_gx_tilebanks[8], m_gx_oldbanks[8];
@@ -229,27 +229,27 @@ public:
int m_konamigx_palformat;
bitmap_rgb32 *m_dualscreen_left_tempbitmap;
bitmap_rgb32 *m_dualscreen_right_tempbitmap;
-
+
/* On Type-1 the K053936 output is rendered to these temporary bitmaps as raw data
- the 'voxel' effect to give the pixels height is a post-process operation on the
- output of the K053936 (this can clearly be seen in videos as large chunks of
- scenary flicker when in the distance due to single pixels in the K053936 output
- becoming visible / invisible due to drawing precision.
+ the 'voxel' effect to give the pixels height is a post-process operation on the
+ output of the K053936 (this can clearly be seen in videos as large chunks of
+ scenary flicker when in the distance due to single pixels in the K053936 output
+ becoming visible / invisible due to drawing precision.
- -- however, progress on this has stalled as our K053936 doesn't seem to give
- the right output for post processing, I suspect the game is using some
- unsupported flipping modes (probably due to the way it's hooked up to the
- rest of the chips) which is causing entirely the wrong output.
+ -- however, progress on this has stalled as our K053936 doesn't seem to give
+ the right output for post processing, I suspect the game is using some
+ unsupported flipping modes (probably due to the way it's hooked up to the
+ rest of the chips) which is causing entirely the wrong output.
- -- furthermore video\k053936.c contains an implementation of
- the K053936_zoom_draw named K053936GP_zoom_draw that's only used in konamigx ...
+ -- furthermore video\k053936.c contains an implementation of
+ the K053936_zoom_draw named K053936GP_zoom_draw that's only used in konamigx ...
- */
+ */
bitmap_ind16 *m_gxtype1_roz_dstbitmap;
bitmap_ind16 *m_gxtype1_roz_dstbitmap2;
rectangle m_gxtype1_roz_dstbitmapclip;
-
+
int m_konamigx_type3_psac2_actual_bank;
//int m_konamigx_type3_psac2_actual_last_bank = 0;
};
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index 4cc1f790c06..6d723d0a2ba 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -36,7 +36,7 @@ class mario_state : public driver_device
public:
mario_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
-
+
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_gfxdecode(*this, "gfxdecode"),
diff --git a/src/mame/includes/segas18.h b/src/mame/includes/segas18.h
index 02d45bdf6e6..84b2cf134d7 100644
--- a/src/mame/includes/segas18.h
+++ b/src/mame/includes/segas18.h
@@ -96,7 +96,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(set_grayscale);
DECLARE_WRITE_LINE_MEMBER(set_vdp_enable);
-
+
protected:
// timer IDs
enum
diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h
index 2b886eebe95..7b4774de0cc 100644
--- a/src/mame/includes/suna8.h
+++ b/src/mame/includes/suna8.h
@@ -17,7 +17,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
-
+
m_prot_opcode_toggle(0)
{ }
@@ -46,7 +46,7 @@ public:
UINT8 m_write_disable;
UINT8 m_prot_opcode_toggle;
UINT8* m_decrypt;
-
+
enum GFXBANK_TYPE_T
{
GFXBANK_TYPE_SPARKMAN,
diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h
index 31ac67c3ee3..23fb3c25b49 100644
--- a/src/mame/includes/tnzs.h
+++ b/src/mame/includes/tnzs.h
@@ -33,7 +33,7 @@ public:
m_dac(*this, "dac"),
m_samples(*this, "samples"),
m_palette(*this, "palette"),
- m_mainbank(*this, "mainbank")
+ m_mainbank(*this, "mainbank")
{ }
/* video-related */
diff --git a/src/mame/machine/315-5881_crypt.c b/src/mame/machine/315-5881_crypt.c
index c19b431aef7..be4ac0e7961 100644
--- a/src/mame/machine/315-5881_crypt.c
+++ b/src/mame/machine/315-5881_crypt.c
@@ -814,4 +814,4 @@ void sega_315_5881_crypt_device::line_fill()
}
}
}
-} \ No newline at end of file
+}
diff --git a/src/mame/machine/315-5881_crypt.h b/src/mame/machine/315-5881_crypt.h
index 6d667aef807..6b73ffd0700 100644
--- a/src/mame/machine/315-5881_crypt.h
+++ b/src/mame/machine/315-5881_crypt.h
@@ -17,7 +17,7 @@ class sega_315_5881_crypt_device : public device_t
public:
// construction/destruction
sega_315_5881_crypt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
UINT16 do_decrypt(UINT8 *&base);
void set_addr_low(UINT16 data);
diff --git a/src/mame/machine/315_5296.h b/src/mame/machine/315_5296.h
index d9c43a01118..5f85f5c0d2c 100644
--- a/src/mame/machine/315_5296.h
+++ b/src/mame/machine/315_5296.h
@@ -100,7 +100,7 @@ public:
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
-
+
UINT8 debug_peek_output(offs_t offset) { return m_output_latch[offset & 7]; }
protected:
diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c
index 3d138b8f954..e50ca399769 100644
--- a/src/mame/machine/harddriv.c
+++ b/src/mame/machine/harddriv.c
@@ -222,7 +222,7 @@ READ16_MEMBER( harddriv_state::hd68k_port0_r )
0x8000 = SW1 #1
*/
screen_device &scr = m_gsp->screen();
-
+
int temp = (ioport("SW1")->read_safe(0xff) << 8) | ioport("IN0")->read_safe(0xff);
if (get_hblank(scr)) temp ^= 0x0002;
temp ^= 0x0018; /* both EOCs always high for now */
diff --git a/src/mame/machine/naomim2.c b/src/mame/machine/naomim2.c
index ff07cbdfdbf..5c08011e8e4 100644
--- a/src/mame/machine/naomim2.c
+++ b/src/mame/machine/naomim2.c
@@ -150,7 +150,6 @@ void naomi_m2_board::board_setup_address(UINT32 address, bool is_dma)
void naomi_m2_board::board_get_buffer(UINT8 *&base, UINT32 &limit)
{
-
if(rom_cur_address & 0x40000000) {
if(rom_cur_address == 0x4001fffe) {
m_cryptdevice->do_decrypt(base);
@@ -178,8 +177,6 @@ void naomi_m2_board::board_advance(UINT32 size)
void naomi_m2_board::board_write(offs_t offset, UINT16 data)
{
-
-
if(offset & 0x40000000) {
if((offset & 0x0f000000) == 0x02000000) {
offset &= RAM_SIZE-1;
@@ -188,7 +185,6 @@ void naomi_m2_board::board_write(offs_t offset, UINT16 data)
return;
}
switch(offset & 0x1fffffff) {
-
case 0x1fff8: m_cryptdevice->set_addr_low(data); return;
case 0x1fffa: m_cryptdevice->set_addr_high(data); return;
case 0x1fffc: m_cryptdevice->set_subkey(data); return;
@@ -219,4 +215,3 @@ machine_config_constructor naomi_m2_board::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( naomim2 );
}
-
diff --git a/src/mame/machine/naomim2.h b/src/mame/machine/naomim2.h
index 4efce0fcbe8..4b7202efbec 100644
--- a/src/mame/machine/naomim2.h
+++ b/src/mame/machine/naomim2.h
@@ -34,7 +34,7 @@ private:
const char *key_tag;
-
+
required_device<sega_315_5881_crypt_device> m_cryptdevice;
};
diff --git a/src/mame/machine/naomim4.c b/src/mame/machine/naomim4.c
index e7f29c01759..eee229ce47a 100644
--- a/src/mame/machine/naomim4.c
+++ b/src/mame/machine/naomim4.c
@@ -192,7 +192,7 @@ void naomi_m4_board::enc_fill()
UINT16 dec = iv;
iv = decrypt_one_round(enc ^ iv, subkey1);
dec ^= decrypt_one_round(iv, subkey2);
-
+
buffer[buffer_actual_size++] = dec;
buffer[buffer_actual_size++] = dec >> 8;
diff --git a/src/mame/machine/segabb.c b/src/mame/machine/segabb.c
index 8620c8857e1..48244d1c7e6 100644
--- a/src/mame/machine/segabb.c
+++ b/src/mame/machine/segabb.c
@@ -21,7 +21,7 @@ void sega_lindbergh_baseboard_device::device_start()
pci_device::device_start();
add_map( 128*1024, M_MEM, FUNC(sega_lindbergh_baseboard_device::map1));
add_map( 1024*1024, M_MEM, FUNC(sega_lindbergh_baseboard_device::map2));
- add_map(2*1024*1024, M_MEM, FUNC(sega_lindbergh_baseboard_device::map3));
+ add_map(2*1024*1024, M_MEM, FUNC(sega_lindbergh_baseboard_device::map3));
}
void sega_lindbergh_baseboard_device::device_reset()
diff --git a/src/mame/machine/slapstic.c b/src/mame/machine/slapstic.c
index 0bd919c2222..60f6a26233d 100644
--- a/src/mame/machine/slapstic.c
+++ b/src/mame/machine/slapstic.c
@@ -235,12 +235,10 @@ atari_slapstic_device::atari_slapstic_device(const machine_config &mconfig, cons
void atari_slapstic_device::device_start()
{
-
}
void atari_slapstic_device::device_reset()
{
-
}
/*************************************
diff --git a/src/mame/machine/stvprot.c b/src/mame/machine/stvprot.c
index 378ecca0136..ec28a1ca8b0 100644
--- a/src/mame/machine/stvprot.c
+++ b/src/mame/machine/stvprot.c
@@ -572,7 +572,7 @@ UINT32 ffreveng_prot_read_callback( address_space &space, int protaddr, UINT32 k
*
*************************************/
-// the naomi hookup of 315-5881 reads 16-bits at a time, here we seem to read 32?
+// the naomi hookup of 315-5881 reads 16-bits at a time, here we seem to read 32?
READ32_MEMBER( stv_state::common_prot_r )
{
@@ -671,7 +671,7 @@ void stv_state::install_astrass_protection()
{
install_common_protection();
m_prot_readback = astrass_prot_read_callback;
-// m_cryptdevice->set_key(0x00000000);
+// m_cryptdevice->set_key(0x00000000);
}
void stv_state::install_ffreveng_protection()
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 5bdf7d5e3d6..4d334899ffe 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -104,7 +104,7 @@ mspacmanbg // bootleg
mspacmanbgd // bootleg
mspacmanbcc // bootleg
mspacmanblt // bootleg
-clubpacm // Miky
+clubpacm // Miky
woodpeck // (c) 1981 Amenip (Palcom Queen River)
woodpeca // (c) 1981 Amenip Nova Games Ltd.
mspacmab // bootleg
@@ -442,7 +442,7 @@ ckongalc // bootleg (Alca)
bigkong // bootleg
monkeyd // bootleg
dking // Crazy Kong Bootleg
-ckongdks // Spanish Crazy Kong bootleg
+ckongdks // Spanish Crazy Kong bootleg
ckongpt2 // (c) 1981 Falcon
ckongpt2a // (c) 1981 Falcon
ckongpt2j // (c) 1981 Falcon
@@ -710,7 +710,7 @@ griffon // bootleg (Videotron)
nextfase // bootleg
phoenixs // bootleg (Sonic)
avefenix // bootleg (Video Game)
-avefenixrf // bootleg (Recreativos Franco)
+avefenixrf // bootleg (Recreativos Franco)
pleiads // (c) 1981 Tehkan
pleiadsb2 // bootleg
pleiadbl // bootleg
@@ -1478,7 +1478,7 @@ claybust // (c) 1978 Model Racing
gunchamp // (c) 1980 Model Racing
gunchamps // (c) 1980 Model Racing (sshot.c)
spaceatt // (c) 1978 Video Games GMBH
-galmonst // (c) Laguna S.A.
+galmonst // (c) Laguna S.A.
spaceat2 // (c) 1980 Zenitone-Microsec Ltd
spacecom // bootleg
sinvzen // Zenitone-Microsec Ltd
@@ -1650,7 +1650,7 @@ tron // (c) 1982
tron2 // (c) 1982
tron3 // (c) 1982
tron4 // (c) 1982
-tronger // (c) 1982
+tronger // (c) 1982
kroozr // (c) 1982
domino // (c) 1982
wacko // (c) 1982
@@ -1800,7 +1800,7 @@ horizon // (c) 1985
youjyudn // (c) 1986 (Japan)
vigilant // (c) 1988 (World)
-vigilantb // (c) 1988 (World)
+vigilantb // (c) 1988 (World)
vigilant1 // (c) 1988 (World)
vigilantu // (c) 1988 (US)
vigilantu2 // (c) 1988 (US)
@@ -2089,7 +2089,7 @@ kicknrun // A87 (c) 1986 Taito Corporation
kicknrunu // A87 (c) 1986 Taito Corporation
mexico86 // bootleg (Micro Research)
darius // A96 (c) 1986 Taito Corporation Japan (World)
-dariusu // A96 (c) 1986 Taito America Corporation (US)
+dariusu // A96 (c) 1986 Taito America Corporation (US)
dariusj // A96 (c) 1986 Taito Corporation (Japan)
dariuso // A96 (c) 1986 Taito Corporation (Japan)
dariuse // A96 (c) 1986 Taito Corporation (Japan)
@@ -2280,7 +2280,7 @@ tubeit // ??? no copyright message
cubybop // ??? no copyright message
plgirls // (c) 1992 Hot-B.
plgirls2 // (c) 1993 Hot-B.
-plgirls2b //
+plgirls2b //
lagirl // plgirls bootleg?
// Taito H-System games
@@ -2853,7 +2853,7 @@ crusherm // (c) 1999 Takumi
tjumpman // (c) 1999 Namco
mushisam // (c) 2004 Cave (AMI license) - 2004/10/12.MASTER VER.
-mushisama // (c) 2004 Cave (AMI license) - 2004/10/12 MASTER VER.
+mushisama // (c) 2004 Cave (AMI license) - 2004/10/12 MASTER VER.
mushisamb // (c) 2004 Cave (AMI license) - 2004/10/12 MASTER VER
espgal2 // (c) 2005 Cave (AMI license) - 2005/11/14 MASTER VER
ibara // (c) 2005 Cave (AMI license) - 2005/03/22 MASTER VER..
@@ -3029,7 +3029,7 @@ bionicc // 3/1987 (c) 1987 (Euro)
bionicc1 // 3/1987 (c) 1987 (US)
bionicc2 // 3/1987 (c) 1987 (US)
topsecrt // 3/1987 (c) 1987 (Japan)
-supduck // (c) Comad
+supduck // (c) Comad
1943 // 6/1987 (c) 1987 (Euro)
1943u // 6/1987 (c) 1987 (US) Rev C
1943j // 6/1987 (c) 1987 (Japan) Rev B
@@ -3220,7 +3220,7 @@ sf2dongb // hack
sf2mdt // bootleg
sf2mdta // bootleg
sf2mdtb // bootleg
-sf2b // bootleg
+sf2b // bootleg
cworld2j // 11/06/1992 (c) 1992 (Japan)
varth // 14/07/1992 (c) 1992 (World)
varthr1 // 12/06/1992 (c) 1992 (World)
@@ -4587,7 +4587,7 @@ ddux // (c) 1989 (FD1094, decrypted)
dduxj // (c) 1989 (FD1094, decrypted)
ddux1 // (c) 1989 (8751)
dunkshot // (c) 1986 (FD1094, decrypted)
-dunkshoto // (c) 1986 (FD1094, decrypted)
+dunkshoto // (c) 1986 (FD1094, decrypted)
eswat // (c) 1989 (FD1094, decrypted)
eswatu // (c) 1989 (FD1094, decrypted)
eswatj // (c) 1989 (FD1094, decrypted)
@@ -5262,7 +5262,7 @@ ssf2mdb // MegaDrive-based hack
aladmdb // MegaDrive-based hack
mk3mdb // MegaDrive-based hack
srmdb // MegaDrive-based hack
-sonic2mb // MegaDrive-based hack
+sonic2mb // MegaDrive-based hack
// Sega Naomi-based (Dreamcast) systems
naomi // 1998.?? Naomi BIOS
@@ -5842,7 +5842,7 @@ zerotrgta // (c) 1985 Data East Corporation
gekitsui // (c) 1985 Data East Corporation (Japan)
tryout // (c) 1985 Data East Corporation (Japan)
firetrap // (c) 1986 Data East USA (US)
-firetrapa // (c) 1986 Data East USA (US)
+firetrapa // (c) 1986 Data East USA (US)
firetrapj // (c) 1986 Wood Place Inc. (Japan)
firetrapbl // bootleg
metlclsh // (c) 1985 Data East
@@ -6457,7 +6457,7 @@ tmntu // GX963 (c) 1989 (US)
tmntua // GX963 (c) 1989 (US)
tmht // GX963 (c) 1989 (UK)
tmhta // GX963 (c) 1989 (UK)
-tmhtb // GX963 (c) 1989 (UK?)
+tmhtb // GX963 (c) 1989 (UK?)
tmntj // GX963 (c) 1990 (Japan)
tmht2p // GX963 (c) 1989 (UK)
tmht2pa // GX963 (c) 1989 (UK)
@@ -6861,7 +6861,7 @@ skydiver // 009787 1978/06 [6800]
// Smokey Joe // 030926 1978/07 [6502]
sbrkout3 // 033442-033452 1978/09 [6502]
sbrkout // 033453-033455 1978/09 [6502]
-sbrkoutc // unrealeased proto
+sbrkoutc // unrealeased proto
atarifb // 033xxx 1978/10 [6502]
atarifb1 // 033xxx 1978/10 [6502]
orbit // 033689-033702 1978/11 [6800]
@@ -7929,7 +7929,7 @@ ninjakd2 // UPL-????? (c) 1987
ninjakd2a // UPL-????? (c) 1987
ninjakd2b // UPL-????? (c) 1987
rdaction // UPL-87003?(c) 1987 + World Games license
-jt104 // hack?
+jt104 // hack?
mnight // UPL-????? (c) 1987 distributed by Kawakus
arkarea // UPL-87007 (c) 1988 (Arcade TV Game List - P.67, Right, 2 from top)
robokid // UPL-88013 (c) 1988
@@ -8322,7 +8322,7 @@ supdrapob // bootleg
sbagman // (c) 1984
sbagmans // (c) 1984 + Stern license
botanic // (c) 1983
-botanicf // (c) 1984
+botanicf // (c) 1984
squaitsa // (c) 1985
tankbust // (c) 1985
@@ -8375,7 +8375,7 @@ goodejan // (c) 1991 Seibu/Tecmo
goodejana // (c) 1991 Seibu/Tecmo
raiden2 // (c) 1993 Seibu Kaihatsu + Fabtek license
-raiden2sw // (c) 1993 Seibu Kaihats
+raiden2sw // (c) 1993 Seibu Kaihats
raiden2u // (c) 1993 Seibu Kaihatsu + Fabtek license
raiden2hk // (c) 1993 Seibu Kaihatsu + Metrotainment license
raiden2j // (c) 1993 Seibu Kaihatsu
@@ -8721,7 +8721,7 @@ baryon // (c) 1997 SemiCom
baryona // (c) 1997 SemiCom
dreamwld // (c) 2000 SemiCom
rolcrush // (c) 1999 Trust
-cutefght // (c) 1998 SemiCom
+cutefght // (c) 1998 SemiCom
// SH2 board
s1945ii // (c) 1997
@@ -8836,7 +8836,7 @@ radikalb // (c) 1998 - Ref ???
// SH-4 hardware
atvtrack // (c) 2002 - Ref 020419
atvtracka // (c) 2002 - Ref 020419
-smashdrv // (c) 2000
+smashdrv // (c) 2000
/*
Remaining Gaelco Games:
@@ -9317,7 +9317,7 @@ speedbal // (c) 1987
musicbal // (c) 1987
sauro // (c) 1987
saurop // (c) 1987
-saurorr // (c) 1987
+saurorr // (c) 1987
trckydoc // (c) 1987
trckydoca // (c) 1987
@@ -9588,7 +9588,7 @@ cafebrk // "528" Mahjong Cafe Break (C) 1999 Nakanihon / Dynax
jongtei // "532" Mahjong Jong-Tei (C) 1999 Dynax
seljan2 // "557" 1996 Dynax / Face
realbrk // "600" Billiard Academy Real Break 1998 (Europe)
-realbrko // "600" Billiard Academy Real Break 1998 (Europe)
+realbrko // "600" Billiard Academy Real Break 1998 (Europe)
realbrkk // "600" Billiard Academy Real Break 1998 (Korea)
janshinp // "700j" 1996 Dynax / Sigma
dtoyoken // "700d" 1996 Dynax / Sigma
@@ -9749,7 +9749,7 @@ drgw2 // (c) 1997 Dragon World 2
dw2v100x //
drgw2c //
drgw2j //
-drgw2hk //
+drgw2hk //
drgw3 // (c) 1998 Dragon World 3
drgw3105 //
drgw3100 //
@@ -9850,10 +9850,10 @@ espgal // (c) 2003 Espgaluda
// IGS PGM2 Platform
orleg2 // (c) 2007
orleg2o //
-orleg2oa //
+orleg2oa //
kov2nl // (c) 2008
kov2nlo //
-kov2nloa //
+kov2nloa //
ddpdojh //
kov3 //
@@ -31864,4 +31864,3 @@ amusco // 1987, Amusco.
cocoloco // 198?, Petaco S.A.
alinvade
-
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index 87961ef2488..7e0f5e712ae 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -1525,7 +1525,7 @@ static const struct CPS1config cps1_config_table[]=
{"sf2mdt", CPS_B_21_DEF, mapper_S9263B, 0x36, 0, 0, 1 },
{"sf2mdta", CPS_B_21_DEF, mapper_S9263B, 0x36, 0, 0, 1 },
{"sf2mdtb", CPS_B_21_DEF, mapper_S9263B, 0x36, 0, 0, 1 },
- {"sf2b", CPS_B_17, mapper_STF29, 0x36, 0, 0, 1 },
+ {"sf2b", CPS_B_17, mapper_STF29, 0x36, 0, 0, 1 },
{"varth", CPS_B_04, mapper_VA63B }, /* CPSB test has been patched out (60=0008) register is also written to, possibly leftover from development */ // wrong, this set uses VA24B, dumped but equations still not added
{"varthr1", CPS_B_04, mapper_VA63B }, /* CPSB test has been patched out (60=0008) register is also written to, possibly leftover from development */ // wrong, this set uses VA24B, dumped but equations still not added
{"varthu", CPS_B_04, mapper_VA63B }, /* CPSB test has been patched out (60=0008) register is also written to, possibly leftover from development */
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index 3f6c14b5a49..988eea425fa 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -185,7 +185,7 @@ inline void dooyong_state::get_tile_info(tile_data &tileinfo, int tile_index,
flags = TILE_FLIPYX((attr & 0x06) >> 1);
}
else
- { /* primella/popbingo */
+ { /* primella/popbingo */
/* Tiles take two bytes in ROM:
MSB LSB
[offs + 0x00] YXCC CCcc (Y flip, X flip, bits 3-0 of color code, bits 9-8 of gfx code)
diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c
index 0acdad454a3..455ab6add53 100644
--- a/src/mame/video/exidy440.c
+++ b/src/mame/video/exidy440.c
@@ -381,7 +381,7 @@ void exidy440_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c
*
*************************************/
-void exidy440_state::update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int scroll_offset, int check_collision)
+void exidy440_state::update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int scroll_offset, int check_collision)
{
/* draw any dirty scanlines from the VRAM directly */
int sy = scroll_offset + cliprect.min_y;
diff --git a/src/mame/video/harddriv.c b/src/mame/video/harddriv.c
index 0a9a5d4cbbb..ba7f80083e3 100644
--- a/src/mame/video/harddriv.c
+++ b/src/mame/video/harddriv.c
@@ -410,9 +410,9 @@ static void display_speedups(void)
TMS340X0_SCANLINE_IND16_CB_MEMBER(harddriv_state::scanline_driver)
{
UINT8 *vram_base = &m_gsp_vram[(params->rowaddr << 12) & m_vram_mask];
-
+
if (!vram_base) return;
-
+
UINT16 *dest = &bitmap.pix16(scanline);
int coladdr = (params->yoffset << 9) + ((params->coladdr & 0xff) << 4) - 15 + (m_gfx_finescroll & 0x0f);
int x;
@@ -429,8 +429,8 @@ TMS340X0_SCANLINE_IND16_CB_MEMBER(harddriv_state::scanline_multisync)
{
UINT8 *vram_base = &m_gsp_vram[(params->rowaddr << 11) & m_vram_mask];
- if (!vram_base) return;
-
+ if (!vram_base) return;
+
UINT16 *dest = &bitmap.pix16(scanline);
int coladdr = (params->yoffset << 9) + ((params->coladdr & 0xff) << 3) - 7 + (m_gfx_finescroll & 0x07);
int x;
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index c9e995046ba..fe63211117b 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -11,8 +11,8 @@
#define TRI_PARAM_TEXTURE_ENABLE 0x8
#define TRI_PARAM_ALPHA_TEST 0x10
-#define TRI_BUFFER_SIZE 35000
-#define TRI_ALPHA_BUFFER_SIZE 15000
+#define TRI_BUFFER_SIZE 35000
+#define TRI_ALPHA_BUFFER_SIZE 15000
struct model3_polydata
{
@@ -412,11 +412,11 @@ WRITE64_MEMBER(model3_state::model3_tile_w)
0xF1180000: ?
0xF1180004: ?
- 0xF1180008: ? lostwsga: writes 0x7f010000
- lemans24, magtruck, von2, lamachin: writes 0xee000000
- bass, vs2, harley, scud, skichamp, fvipers2, eca: writes 0xef000000
- srally2, swtrilgy: writes 0x70010000
- daytona2: writes 0x4f010000
+ 0xF1180008: ? lostwsga: writes 0x7f010000
+ lemans24, magtruck, von2, lamachin: writes 0xee000000
+ bass, vs2, harley, scud, skichamp, fvipers2, eca: writes 0xef000000
+ srally2, swtrilgy: writes 0x70010000
+ daytona2: writes 0x4f010000
0xF1180010: VBL IRQ acknowledge
@@ -855,7 +855,7 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw
-------- -xxxxx-- -------- -------- Polygon transparency (0 = fully transparent)
-------- -------x -------- -------- 1 = disable lighting
-------- -------- xxxxx--- -------- Polygon luminosity
- -------- -------- -----x-- -------- Texture enable
+ -------- -------- -----x-- -------- Texture enable
-------- -------- ------xx x------- Texture format
-------- -------- -------- -------x Alpha enable?
-------- ------x- -------- -xxxxxx- ?
@@ -1033,7 +1033,7 @@ void model3_state::real3d_display_list_end()
int ti = m_viewport_tri_index[i];
int tia = m_viewport_tri_alpha_index[i];
if (i < 3)
- {
+ {
ticount = m_viewport_tri_index[i+1] - ti;
tiacount = m_viewport_tri_alpha_index[i+1] - tia;
}
@@ -1331,7 +1331,7 @@ m3_triangle *model3_state::push_triangle(bool alpha)
return NULL;
//fatalerror("push_triangle: tri buffer max exceeded");
}
-
+
m_tri_buffer_ptr++;
return &m_tri_buffer[i];
}
@@ -1575,8 +1575,8 @@ void model3_state::draw_model(UINT32 addr)
}
for (i=2; i < num_vertices; i++)
- {
- bool alpha = (header[6] & 0x1) || (header[6] & 0x80000000); // put to alpha buffer if there's any transparency involved
+ {
+ bool alpha = (header[6] & 0x1) || (header[6] & 0x80000000); // put to alpha buffer if there's any transparency involved
m3_triangle* tri = push_triangle(alpha);
// bail out if tri buffer is maxed out (happens during harley boot)
@@ -1859,7 +1859,7 @@ void model3_renderer::clear_zb()
cliprect.min_y = 0;
cliprect.max_x = 495;
cliprect.max_y = 383;
-
+
float zvalue = 10000000000.0f;
m_zb->fill(*(int*)&zvalue, cliprect);
}
@@ -1877,7 +1877,7 @@ void model3_renderer::draw_opaque_triangles(const m3_triangle* tris, int num_tri
cliprect.max_x = 495;
cliprect.max_y = 383;
-// printf("draw opaque: %d\n", num_tris);
+// printf("draw opaque: %d\n", num_tris);
vertex_t v[3];
@@ -1897,7 +1897,7 @@ void model3_renderer::draw_opaque_triangles(const m3_triangle* tris, int num_tri
v[i].p[3] = tri->v[i].v * 256.0f;
v[i].p[4] = tri->v[i].i;
}
-
+
model3_polydata &extra = object_data_alloc();
extra.texture = tri->texture;
extra.transparency = tri->transparency;
@@ -1931,7 +1931,7 @@ void model3_renderer::draw_alpha_triangles(const m3_triangle* tris, int num_tris
cliprect.max_x = 495;
cliprect.max_y = 383;
-// printf("draw alpha: %d\n", num_tris);
+// printf("draw alpha: %d\n", num_tris);
vertex_t v[3];
@@ -1951,7 +1951,7 @@ void model3_renderer::draw_alpha_triangles(const m3_triangle* tris, int num_tris
v[i].p[3] = tri->v[i].v * 256.0f;
v[i].p[4] = tri->v[i].i;
}
-
+
model3_polydata &extra = object_data_alloc();
extra.texture = tri->texture;
extra.transparency = tri->transparency;
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index 6950623770b..504943a4bca 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -129,7 +129,7 @@ WRITE8_MEMBER(psychic5_state::fg_videoram_w)
}
WRITE8_MEMBER( psychic5_state::bg_videoram_w )
-{
+{
m_bg_videoram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
diff --git a/src/mame/video/rdpspn16.c b/src/mame/video/rdpspn16.c
index 8a1f23faac4..a10d737009d 100644
--- a/src/mame/video/rdpspn16.c
+++ b/src/mame/video/rdpspn16.c
@@ -209,7 +209,7 @@ void n64_rdp::SpanDraw1Cycle(INT32 scanline, const extent_t &extent, const rdp_p
dzpix = object.MiscState.PrimitiveDZ;
dzinc = 0;
}
-
+
if (object.MiscState.FBSize < 2 || object.MiscState.FBSize > 4)
fatalerror("unsupported FBSize %d\n", object.MiscState.FBSize);
diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c
index acae667e5a7..bb2d4a195b3 100644
--- a/src/mame/video/sshangha.c
+++ b/src/mame/video/sshangha.c
@@ -35,7 +35,7 @@ UINT32 sshangha_state::screen_update_sshangha(screen_device &screen, bitmap_rgb3
// I'm pretty sure only the original has the 2nd spriteram, used for the Japanese text on the 2nd scene (non-scrolling text) in the intro of the quest (3rd in JPN) mode
if (m_spriteram2 != NULL)
m_sprgen2->draw_sprites(bitmap, cliprect, m_spriteram2, 0x800, true);
-
+
// flip screen
address_space &space = machine().driver_data()->generic_space();
UINT16 flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
diff --git a/src/mess/audio/dave.c b/src/mess/audio/dave.c
index 0c8b4a2cab5..1dfc93e1cad 100644
--- a/src/mess/audio/dave.c
+++ b/src/mess/audio/dave.c
@@ -97,7 +97,7 @@ void dave_device::device_start()
save_item(NAME(m_mame_volumes));
for (int i = 0; i < ARRAY_LENGTH(m_period); i++)
- m_period[i] = (STEP * machine().sample_rate()) / 125000;
+ m_period[i] = (STEP * machine().sample_rate()) / 125000;
for (int i = 0; i < ARRAY_LENGTH(m_count); i++)
m_count[i] = (STEP * machine().sample_rate()) / 125000;
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c
index 413cab064cc..e5406ff4efa 100644
--- a/src/mess/drivers/apple2.c
+++ b/src/mess/drivers/apple2.c
@@ -2,13 +2,13 @@
// copyright-holders:R. Belmont
/***************************************************************************
- apple2.c - Apple II/II Plus and clones
+ apple2.c - Apple II/II Plus and clones
- Next generation driver written in September/October 2014 by R. Belmont.
- Thanks to the original Apple II series driver's authors: Mike Balfour, Nathan Woods, and R. Belmont
- Special thanks to the Apple II Documentation Project/Antoine Vignau and Peter Ferrie.
-
-II: original base model. RAM sizes of 4, 8, 12, 16, 20, 24, 32, 36, and 48 KB possible.
+ Next generation driver written in September/October 2014 by R. Belmont.
+ Thanks to the original Apple II series driver's authors: Mike Balfour, Nathan Woods, and R. Belmont
+ Special thanks to the Apple II Documentation Project/Antoine Vignau and Peter Ferrie.
+
+II: original base model. RAM sizes of 4, 8, 12, 16, 20, 24, 32, 36, and 48 KB possible.
8K of ROM at $E000-$FFFF, empty sockets for $D000-$D7FF and $D800-$DFFF.
Programmer's Aid #1 was sold by Apple for $D000-$D7FF, some third-party ROMs
were also available.
@@ -19,25 +19,25 @@ II: original base model. RAM sizes of 4, 8, 12, 16, 20, 24, 32, 36, and 48 KB p
ROM contains original non-autostart Monitor and Integer BASIC; apparently
Autostart + Integer is also possible.
-
-II Plus: RAM options reduced to 16/32/48 KB.
+
+II Plus: RAM options reduced to 16/32/48 KB.
ROM expanded to 12KB from $D000-$FFFF containing Applesoft BASIC and
the Autostart Monitor. Applesoft is a licensed version of Microsoft's
6502 BASIC as also found in Commodore and many other computers.
-
-
+
+
Users of both models often connected the SHIFT key to the paddle #2 button
(mapped to $C063) in order to inform properly written software that characters
were to be intended upper/lower case.
-
+
Both models commonly included a RAM "language card" in slot 0 which added 16K
of RAM which could be banked into the $D000-$FFFF space to replace the ROMs.
This allowed running Applesoft on a II and Integer BASIC on a II Plus.
A II Plus with this card installed is often called a "64K Apple II"; this is
the base configuration required to run ProDOS and some larger games.
-
-************************************************************************/
-
+
+************************************************************************/
+
#include "emu.h"
#include "machine/bankdev.h"
#include "machine/ram.h"
@@ -212,7 +212,7 @@ WRITE_LINE_MEMBER(napple2_state::a2bus_inh_w)
{
// assume no cards are pulling /INH
m_inh_slot = -1;
-
+
// scan the slots to figure out which card(s) are INHibiting stuff
for (int i = 0; i <= 7; i++)
{
@@ -226,7 +226,7 @@ WRITE_LINE_MEMBER(napple2_state::a2bus_inh_w)
{
if (m_inh_bank != 1)
{
- m_upperbank->set_bank(1);
+ m_upperbank->set_bank(1);
m_inh_bank = 1;
}
}
@@ -234,7 +234,7 @@ WRITE_LINE_MEMBER(napple2_state::a2bus_inh_w)
{
if (m_inh_bank != 0)
{
- m_upperbank->set_bank(0);
+ m_upperbank->set_bank(0);
m_inh_bank = 0;
}
}
@@ -248,7 +248,7 @@ WRITE_LINE_MEMBER(napple2_state::a2bus_inh_w)
// if no slots are inhibiting, make sure ROM is fully switched in
if ((m_inh_slot == -1) && (m_inh_bank != 0))
{
- m_upperbank->set_bank(0);
+ m_upperbank->set_bank(0);
m_inh_bank = 0;
}
}
@@ -315,7 +315,7 @@ void napple2_state::machine_reset()
m_anykeydown = false;
}
-/***************************************************************************
+/***************************************************************************
VIDEO
***************************************************************************/
@@ -332,16 +332,16 @@ TIMER_DEVICE_CALLBACK_MEMBER(napple2_state::apple2_interrupt)
m_video->m_sysconfig = m_sysconfig->read();
// check reset
- if (m_resetdip) // if reset DIP is present, use it
+ if (m_resetdip) // if reset DIP is present, use it
{
if (m_resetdip->read() & 1)
- { // CTRL-RESET
+ { // CTRL-RESET
if ((m_kbspecial->read() & 0x88) == 0x88)
{
m_maincpu->reset();
}
}
- else // plain RESET
+ else // plain RESET
{
if (m_kbspecial->read() & 0x80)
{
@@ -349,7 +349,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(napple2_state::apple2_interrupt)
}
}
}
- else // no DIP, so always plain RESET
+ else // no DIP, so always plain RESET
{
if (m_kbspecial->read() & 0x80)
{
@@ -383,8 +383,8 @@ UINT32 napple2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
m_video->hgr_update(screen, bitmap, cliprect, 0, 191);
}
}
- else // lo-res
- {
+ else // lo-res
+ {
if (m_video->m_mix)
{
m_video->lores_update(screen, bitmap, cliprect, 0, 159);
@@ -404,7 +404,7 @@ UINT32 napple2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
return 0;
}
-/***************************************************************************
+/***************************************************************************
I/O
***************************************************************************/
// most softswitches don't care about read vs write, so handle them here
@@ -440,12 +440,12 @@ void napple2_state::do_io(address_space &space, int offset)
m_video->m_mix = true; break;
case 0x54: // set page 1
- m_page2 = false;
+ m_page2 = false;
m_video->m_page2 = false;
break;
case 0x55: // set page 2
- m_page2 = true;
+ m_page2 = true;
m_video->m_page2 = true;
break;
@@ -479,7 +479,7 @@ void napple2_state::do_io(address_space &space, int offset)
case 0x5f: // AN3 on
m_an3 = true; break;
- case 0x68: // IIgs STATE register, which ProDOS touches
+ case 0x68: // IIgs STATE register, which ProDOS touches
break;
case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77:
@@ -510,15 +510,15 @@ READ8_MEMBER(napple2_state::c000_r)
case 0x68:
return m_cassette->input() > 0.0 ? 0x80 : 0;
- case 0x61: // button 0
+ case 0x61: // button 0
case 0x69:
return (m_joybuttons->read() & 0x10) ? 0x80 : 0;
- case 0x62: // button 1
+ case 0x62: // button 1
case 0x6a:
return (m_joybuttons->read() & 0x20) ? 0x80 : 0;
- case 0x63: // button 2
+ case 0x63: // button 2
case 0x6b:
// check if SHIFT key mod configured
if (m_sysconfig->read() & 0x04)
@@ -527,11 +527,11 @@ READ8_MEMBER(napple2_state::c000_r)
}
return (m_joybuttons->read() & 0x40) ? 0x80 : 0;
- case 0x64: // joy 1 X axis
+ case 0x64: // joy 1 X axis
case 0x6c:
return (space.machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
- case 0x65: // joy 1 Y axis
+ case 0x65: // joy 1 Y axis
case 0x6d:
return (space.machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
@@ -666,10 +666,10 @@ READ8_MEMBER(napple2_state::inh_r)
{
if (m_inh_slot != -1)
{
- return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000);
+ return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000);
}
- assert(0); // hitting inh_r with invalid m_inh_slot should not be possible
+ assert(0); // hitting inh_r with invalid m_inh_slot should not be possible
return read_floatingbus();
}
@@ -942,7 +942,7 @@ WRITE_LINE_MEMBER(napple2_state::ay3600_data_ready_w)
if (m_transchar != 0)
{
m_strobe = 0x80;
-// printf("new char = %04x (%02x)\n", m_lastchar&0x3f, m_transchar);
+// printf("new char = %04x (%02x)\n", m_lastchar&0x3f, m_transchar);
}
}
}
@@ -1021,7 +1021,7 @@ INPUT_PORTS_START( apple2_sysconfig )
PORT_CONFSETTING(0x02, "Green")
PORT_CONFSETTING(0x03, "Amber")
- PORT_CONFNAME(0x04, 0x04, "Shift key mod") // default to installed
+ PORT_CONFNAME(0x04, 0x04, "Shift key mod") // default to installed
PORT_CONFSETTING(0x00, "Not present")
PORT_CONFSETTING(0x04, "Installed")
INPUT_PORTS_END
@@ -1053,7 +1053,7 @@ static INPUT_PORTS_START( apple2_common )
PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
- PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
+ PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR(':') PORT_CHAR('*')
PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('-') PORT_CHAR('=')
@@ -1186,7 +1186,7 @@ INPUT_PORTS_END
static SLOT_INTERFACE_START(apple2_slot0_cards)
SLOT_INTERFACE("lang", A2BUS_RAMCARD16K) /* Apple II RAM Language Card */
- SLOT_INTERFACE("ssram", A2BUS_RAMCARD128K) /* Saturn Systems 128K extended language card */
+ SLOT_INTERFACE("ssram", A2BUS_RAMCARD128K) /* Saturn Systems 128K extended language card */
SLOT_INTERFACE_END
static SLOT_INTERFACE_START(apple2_cards)
@@ -1277,7 +1277,7 @@ static MACHINE_CONFIG_START( apple2_common, napple2_state )
MCFG_AY3600_SHIFT_CB(READLINE(napple2_state, ay3600_shift_r))
MCFG_AY3600_CONTROL_CB(READLINE(napple2_state, ay3600_control_r))
MCFG_AY3600_DATA_READY_CB(WRITELINE(napple2_state, ay3600_data_ready_w))
- MCFG_AY3600_AKO_CB(WRITELINE(napple2_state, ay3600_ako_w))
+ MCFG_AY3600_AKO_CB(WRITELINE(napple2_state, ay3600_ako_w))
/* repeat timer. 15 Hz from page 90 of "The Apple II Circuit Description */
MCFG_TIMER_DRIVER_ADD_PERIODIC("repttmr", napple2_state, ay3600_repeat, attotime::from_hz(15))
diff --git a/src/mess/drivers/apple2e.c b/src/mess/drivers/apple2e.c
index be7e8693462..3439d62f659 100644
--- a/src/mess/drivers/apple2e.c
+++ b/src/mess/drivers/apple2e.c
@@ -4,88 +4,88 @@
apple2e.c - Apple IIe/IIc/IIc Plus and clones
- Next generation driver written in September/October 2014 by R. Belmont.
- Thanks to the original Apple II series driver's authors: Mike Balfour, Nathan Woods, and R. Belmont
- Special thanks to the Apple II Documentation Project/Antoine Vignau and Peter Ferrie.
-
-
- IIe: base of this driver. 64K RAM, slot 0 language card emulation without the double-read requirement,
+ Next generation driver written in September/October 2014 by R. Belmont.
+ Thanks to the original Apple II series driver's authors: Mike Balfour, Nathan Woods, and R. Belmont
+ Special thanks to the Apple II Documentation Project/Antoine Vignau and Peter Ferrie.
+
+
+ IIe: base of this driver. 64K RAM, slot 0 language card emulation without the double-read requirement,
lowercase and SHIFT key on button 2, Open and Solid Apple buttons on joy buttons 0 and 1,
auxiliary slot, built-in 80 column support if extra RAM added.
-
- Physical slot 0 was eliminated thanks to the built-in language card.
-
- Most of the write-only softswitches gained readback locations, necessary to make interrupt-driven
- software possible.
-
- Base 80-column card: 1K RAM, allows 80 columns and double-lo-res,
- no double-hi-res.
-
- Extended 80-column card: 64K RAM (including a second language card),
- allows 80 columns, double-lo-res, and double-hi-res.
-
- Revision A motherboards (very rare) don't support double-hi-res; it's unclear
- if double-lo-res works or not. We emulate the much more common Rev B or later
- board.
-
- IIe enhanced: 65C02 CPU with more instructions, MouseText in the character generator.
-
- IIe platinum: Like enhanced but with added numeric keypad and extended 80-column card
- included in the box. Keypad CLEAR generates ESC by default, one hardware mod
- made it generate CTRL-X instead. (new keyboard encoder ROM?)
-
- NOTE: On real IIe and IIe enhanced h/w, pressing SHIFT and paddle button 2 will
- short out the power supply and cause a safety shutdown. (We don't emulate
- this "feature", and it was relatively rare in real life as Apple joysticks only
- had buttons 0 and 1 normally).
-
- IIc: IIe enhanced shrunken into a pizzabox with a Disk II compatible
- half-height drive included in the case.
-
- No slots, but included functionality equivalent to the following slots
- on the motherboard:
+
+ Physical slot 0 was eliminated thanks to the built-in language card.
+
+ Most of the write-only softswitches gained readback locations, necessary to make interrupt-driven
+ software possible.
+
+ Base 80-column card: 1K RAM, allows 80 columns and double-lo-res,
+ no double-hi-res.
+
+ Extended 80-column card: 64K RAM (including a second language card),
+ allows 80 columns, double-lo-res, and double-hi-res.
+
+ Revision A motherboards (very rare) don't support double-hi-res; it's unclear
+ if double-lo-res works or not. We emulate the much more common Rev B or later
+ board.
+
+ IIe enhanced: 65C02 CPU with more instructions, MouseText in the character generator.
+
+ IIe platinum: Like enhanced but with added numeric keypad and extended 80-column card
+ included in the box. Keypad CLEAR generates ESC by default, one hardware mod
+ made it generate CTRL-X instead. (new keyboard encoder ROM?)
+
+ NOTE: On real IIe and IIe enhanced h/w, pressing SHIFT and paddle button 2 will
+ short out the power supply and cause a safety shutdown. (We don't emulate
+ this "feature", and it was relatively rare in real life as Apple joysticks only
+ had buttons 0 and 1 normally).
+
+ IIc: IIe enhanced shrunken into a pizzabox with a Disk II compatible
+ half-height drive included in the case.
+
+ No slots, but included functionality equivalent to the following slots
+ on the motherboard:
- 2 Super Serial Cards (modem and printer ports)
- extended 80 column card / 128K RAM
- Disk II IWM controller
- Apple II Mouse card (firmware entry points are compatible,
but the hardware implementation omits the 68705 and is quite different!)
-
+
Has a 40/80 column switch and a QWERTY/DVORAK switch.
-
- IIc (UniDisk 3.5): IIc with ROM doubled to 32K and the ROMSWITCH register
- added to page between the original 16K ROM and the new added 16K. The
- extra firmware space was dedicated to implementing the Protocol Converter,
- later renamed "SmartPort", which communicates with "smart" packet devices
- over the IWM bus.
-
- Partial AppleTalk code also exists in this ROM but it doesn't work and
- was not completed.
-
- IIc (Original Memory Expansion):
- Removes AppleTalk and adds support for a memory expansion card with up
- to 1 MB; this is identical both in hardware and firmware to the "Slinky"
- memory expansion card for the Apple IIe (a2bus/a2memexp.c).
-
- IIc (Revised Memory Expansion, Rev. 3):
- Fixes several nasty bugs in the Original Memory Expansion version. Not
- currently dumped.
-
- IIc (Rev 4):
- Fixes memory size detection for memory cards with less than 1MB. Fixes
- several screen hole errors introduced in Rev 3, and fixes Terminal Mode
- wherein the firmware can be put into a built-in terminal mode for simple
- tests with a modem.
-
- IIc Plus:
- Like IIc with memory expansion, but with licensed built-in Zip Chip which
- runs the 65C02 at 4 MHz turbo speed with a small cache RAM.
-
- The machine has an internal "Apple 3.5" drive plus a custom gate array
- which emulates the functionality of the UniDisk 3.5's on-board 65C02.
- This gets around the fact that 1 MHz isn't sufficient to handle direct
- Woz-style control of a double-density 3.5" drive.
-
- External drive port allows IIgs-style daisy-chaining.
+
+ IIc (UniDisk 3.5): IIc with ROM doubled to 32K and the ROMSWITCH register
+ added to page between the original 16K ROM and the new added 16K. The
+ extra firmware space was dedicated to implementing the Protocol Converter,
+ later renamed "SmartPort", which communicates with "smart" packet devices
+ over the IWM bus.
+
+ Partial AppleTalk code also exists in this ROM but it doesn't work and
+ was not completed.
+
+ IIc (Original Memory Expansion):
+ Removes AppleTalk and adds support for a memory expansion card with up
+ to 1 MB; this is identical both in hardware and firmware to the "Slinky"
+ memory expansion card for the Apple IIe (a2bus/a2memexp.c).
+
+ IIc (Revised Memory Expansion, Rev. 3):
+ Fixes several nasty bugs in the Original Memory Expansion version. Not
+ currently dumped.
+
+ IIc (Rev 4):
+ Fixes memory size detection for memory cards with less than 1MB. Fixes
+ several screen hole errors introduced in Rev 3, and fixes Terminal Mode
+ wherein the firmware can be put into a built-in terminal mode for simple
+ tests with a modem.
+
+ IIc Plus:
+ Like IIc with memory expansion, but with licensed built-in Zip Chip which
+ runs the 65C02 at 4 MHz turbo speed with a small cache RAM.
+
+ The machine has an internal "Apple 3.5" drive plus a custom gate array
+ which emulates the functionality of the UniDisk 3.5's on-board 65C02.
+ This gets around the fact that 1 MHz isn't sufficient to handle direct
+ Woz-style control of a double-density 3.5" drive.
+
+ External drive port allows IIgs-style daisy-chaining.
----------------------------------
@@ -163,27 +163,27 @@ Address bus A0-A11 is Y0-Y11
#define A2_AUXSLOT_TAG "auxbus"
#define A2_VIDEO_TAG "a2video"
-#define A2_0000_TAG "r00bank"
-#define A2_0200_TAG "r02bank"
-#define A2_0400_TAG "r04bank"
-#define A2_0800_TAG "r08bank"
-#define A2_2000_TAG "r20bank"
-#define A2_4000_TAG "r40bank"
-#define A2_C100_TAG "c1bank"
-#define A2_C300_TAG "c3bank"
-#define A2_C400_TAG "c4bank"
-#define A2_C800_TAG "c8bank"
+#define A2_0000_TAG "r00bank"
+#define A2_0200_TAG "r02bank"
+#define A2_0400_TAG "r04bank"
+#define A2_0800_TAG "r08bank"
+#define A2_2000_TAG "r20bank"
+#define A2_4000_TAG "r40bank"
+#define A2_C100_TAG "c1bank"
+#define A2_C300_TAG "c3bank"
+#define A2_C400_TAG "c4bank"
+#define A2_C800_TAG "c8bank"
#define A2_LCBANK_TAG "lcbank"
#define MOUSE_BUTTON_TAG "mse_button"
#define MOUSE_XAXIS_TAG "mse_x"
#define MOUSE_YAXIS_TAG "mse_y"
-#define CNXX_UNCLAIMED -1
-#define CNXX_INTROM -2
+#define CNXX_UNCLAIMED -1
+#define CNXX_INTROM -2
#define IRQ_SLOT 0
-#define IRQ_VBL 1
+#define IRQ_VBL 1
#define IRQ_MOUSEXY 2
class apple2e_state : public driver_device
@@ -430,7 +430,7 @@ WRITE_LINE_MEMBER(apple2e_state::a2bus_inh_w)
{
// assume no cards are pulling /INH
m_inh_slot = -1;
-
+
// scan the slots to figure out which card(s) are INHibiting stuff
for (int i = 0; i <= 7; i++)
{
@@ -444,7 +444,7 @@ WRITE_LINE_MEMBER(apple2e_state::a2bus_inh_w)
{
if (m_inh_bank != 1)
{
- m_upperbank->set_bank(1);
+ m_upperbank->set_bank(1);
m_inh_bank = 1;
}
}
@@ -452,7 +452,7 @@ WRITE_LINE_MEMBER(apple2e_state::a2bus_inh_w)
{
if (m_inh_bank != 0)
{
- m_upperbank->set_bank(0);
+ m_upperbank->set_bank(0);
m_inh_bank = 0;
}
}
@@ -466,7 +466,7 @@ WRITE_LINE_MEMBER(apple2e_state::a2bus_inh_w)
// if no slots are inhibiting, make sure ROM is fully switched in
if ((m_inh_slot == -1) && (m_inh_bank != 0))
{
- m_upperbank->set_bank(0);
+ m_upperbank->set_bank(0);
m_inh_bank = 0;
}
}
@@ -485,7 +485,7 @@ READ8_MEMBER(apple2e_state::memexp_r)
{
if (m_exp_liveptr <= m_exp_addrmask)
{
- retval = m_exp_ram[m_exp_liveptr];
+ retval = m_exp_ram[m_exp_liveptr];
}
else
{
@@ -569,7 +569,7 @@ void apple2e_state::machine_start()
m_cassette_out = 0;
if (m_cassette)
{
- m_cassette->output(-1.0f);
+ m_cassette->output(-1.0f);
}
m_upperbank->set_bank(0);
m_lcbank->set_bank(0);
@@ -587,7 +587,7 @@ void apple2e_state::machine_start()
m_exp_addrmask = m_ram_size - (128*1024) - 1;
m_exp_ram = m_ram_ptr + (128*1024);
}
- else // no expansion
+ else // no expansion
{
m_exp_addrmask = 0;
m_exp_ram = NULL;
@@ -612,13 +612,13 @@ void apple2e_state::machine_start()
m_aux_ptr = m_auxslotdevice->get_vram_ptr();
m_aux_bank_ptr = m_auxslotdevice->get_auxbank_ptr();
}
- else // IIc has 128K right on the motherboard
+ else // IIc has 128K right on the motherboard
{
m_auxslotdevice = NULL;
if (m_ram_size >= (128*1024))
{
- m_aux_ptr = &m_ram_ptr[0x10000];
+ m_aux_ptr = &m_ram_ptr[0x10000];
m_aux_bank_ptr = m_aux_ptr;
}
}
@@ -749,7 +749,7 @@ void apple2e_state::raise_irq(int irq)
if (m_irqmask)
{
- m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE);
+ m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE);
}
}
@@ -760,11 +760,11 @@ void apple2e_state::lower_irq(int irq)
if (!m_irqmask)
{
- m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE);
+ m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE);
}
}
-/***************************************************************************
+/***************************************************************************
VIDEO
***************************************************************************/
@@ -779,7 +779,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(apple2e_state::apple2_interrupt)
if (m_isiic)
{
- update_iic_mouse();
+ update_iic_mouse();
}
if (scanline == 192)
@@ -828,11 +828,11 @@ UINT32 apple2e_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
{
if (m_video->m_dhires)
{
- m_video->dhgr_update(screen, bitmap, cliprect, 0, 159);
+ m_video->dhgr_update(screen, bitmap, cliprect, 0, 159);
}
else
{
- m_video->hgr_update(screen, bitmap, cliprect, 0, 159);
+ m_video->hgr_update(screen, bitmap, cliprect, 0, 159);
}
m_video->text_update(screen, bitmap, cliprect, 160, 191);
}
@@ -848,8 +848,8 @@ UINT32 apple2e_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
}
}
}
- else // lo-res
- {
+ else // lo-res
+ {
if (m_video->m_mix)
{
if (m_video->m_dhires)
@@ -867,11 +867,11 @@ UINT32 apple2e_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
{
if (m_video->m_dhires)
{
- m_video->dlores_update(screen, bitmap, cliprect, 0, 191);
+ m_video->dlores_update(screen, bitmap, cliprect, 0, 191);
}
else
{
- m_video->lores_update(screen, bitmap, cliprect, 0, 191);
+ m_video->lores_update(screen, bitmap, cliprect, 0, 191);
}
}
}
@@ -886,7 +886,7 @@ UINT32 apple2e_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
return 0;
}
-/***************************************************************************
+/***************************************************************************
I/O
***************************************************************************/
void apple2e_state::auxbank_update()
@@ -954,16 +954,16 @@ void apple2e_state::update_slotrom_banks()
m_c100bank->set_bank(cxswitch);
m_c400bank->set_bank(cxswitch);
-// printf("intcxrom %d cnxx_slot %d isiic %d romswitch %d\n", m_intcxrom, m_cnxx_slot, m_isiic, m_romswitch);
+// printf("intcxrom %d cnxx_slot %d isiic %d romswitch %d\n", m_intcxrom, m_cnxx_slot, m_isiic, m_romswitch);
if ((m_intcxrom) || (m_cnxx_slot < 0) || (m_isiic))
{
if (m_romswitch)
{
- m_c800bank->set_bank(2);
+ m_c800bank->set_bank(2);
}
else
{
- m_c800bank->set_bank(1);
+ m_c800bank->set_bank(1);
}
}
else
@@ -975,16 +975,16 @@ void apple2e_state::update_slotrom_banks()
{
if (m_romswitch)
{
- m_c300bank->set_bank(2);
+ m_c300bank->set_bank(2);
}
else
{
- m_c300bank->set_bank(1);
+ m_c300bank->set_bank(1);
}
}
else
{
- m_c300bank->set_bank(0);
+ m_c300bank->set_bank(0);
}
}
@@ -1018,27 +1018,27 @@ void apple2e_state::lc_update(int offset)
{
if (m_lcram)
{
- m_lcbank->set_bank(1);
+ m_lcbank->set_bank(1);
}
else
{
if (m_romswitch)
{
- m_lcbank->set_bank(2);
+ m_lcbank->set_bank(2);
}
else
{
- m_lcbank->set_bank(0);
+ m_lcbank->set_bank(0);
}
}
}
#if 0
- printf("LC: new state %c%c dxxx=%04x altzp=%d\n",
- m_lcram ? 'R' : 'x',
- m_lcwriteenable ? 'W' : 'x',
- m_lcram2 ? 0x1000 : 0x0000,
- m_altzp);
+ printf("LC: new state %c%c dxxx=%04x altzp=%d\n",
+ m_lcram ? 'R' : 'x',
+ m_lcwriteenable ? 'W' : 'x',
+ m_lcram2 ? 0x1000 : 0x0000,
+ m_altzp);
#endif
}
@@ -1055,35 +1055,35 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic)
{
switch (offset)
{
- case 0x58: // DisXY
+ case 0x58: // DisXY
m_xy = false; break;
- case 0x59: // EnbXY
+ case 0x59: // EnbXY
m_xy = true; break;
- case 0x5a: // DisVBL
+ case 0x5a: // DisVBL
m_vblmask = false; break;
- case 0x5b: // EnVBL
+ case 0x5b: // EnVBL
m_vblmask = true; break;
- case 0x5c: // RisX0Edge
+ case 0x5c: // RisX0Edge
m_x0edge = false; break;
- case 0x5d: // FalX0Edge
+ case 0x5d: // FalX0Edge
m_x0edge = true; break;
- case 0x5e: // RisY0Edge
+ case 0x5e: // RisY0Edge
if (!m_ioudis)
{
- m_y0edge = false;
+ m_y0edge = false;
}
break;
- case 0x5f: // FalY0Edge
+ case 0x5f: // FalY0Edge
if (!m_ioudis)
{
- m_y0edge = true;
+ m_y0edge = true;
}
break;
}
@@ -1091,14 +1091,14 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic)
if (m_ioudis)
{
- switch (offset)
+ switch (offset)
{
- case 0x5e: // SETDHIRES
- m_video->m_dhires = true;
+ case 0x5e: // SETDHIRES
+ m_video->m_dhires = true;
break;
- case 0x5f: // CLRDHIRES
- m_video->m_dhires = false;
+ case 0x5f: // CLRDHIRES
+ m_video->m_dhires = false;
break;
}
}
@@ -1111,7 +1111,7 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic)
case 0x20:
if (m_cassette)
{
- m_cassette_state ^= 1;
+ m_cassette_state ^= 1;
m_cassette->output(m_cassette_state ? 1.0f : -1.0f);
}
break;
@@ -1127,11 +1127,11 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic)
{
if (m_romswitch)
{
- m_lcbank->set_bank(2);
+ m_lcbank->set_bank(2);
}
else
{
- m_lcbank->set_bank(0);
+ m_lcbank->set_bank(0);
}
}
}
@@ -1142,7 +1142,7 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic)
m_speaker->level_w(m_speaker_state);
break;
- case 0x48: // (IIc only) clear mouse X/Y interrupt flags
+ case 0x48: // (IIc only) clear mouse X/Y interrupt flags
m_xirq = m_yirq = false;
lower_irq(IRQ_MOUSEXY);
break;
@@ -1160,24 +1160,24 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic)
m_video->m_mix = true; break;
case 0x54: // set page 1
- m_page2 = false;
+ m_page2 = false;
m_video->m_page2 = false;
auxbank_update();
break;
case 0x55: // set page 2
- m_page2 = true;
+ m_page2 = true;
m_video->m_page2 = true;
auxbank_update();
break;
case 0x56: // select lo-res
- m_video->m_hires = false;
+ m_video->m_hires = false;
auxbank_update();
break;
case 0x57: // select hi-res
- m_video->m_hires = true;
+ m_video->m_hires = true;
auxbank_update();
break;
@@ -1205,10 +1205,10 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic)
case 0x5f: // AN3 on
m_an3 = true; break;
- case 0x68: // IIgs STATE register, which ProDOS touches
+ case 0x68: // IIgs STATE register, which ProDOS touches
break;
- // trigger joypad read
+ // trigger joypad read
case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77:
case 0x78: case 0x79: case 0x7a: case 0x7b: case 0x7c: case 0x7d: case 0x7e: case 0x7f:
if (is_iic)
@@ -1238,22 +1238,22 @@ READ8_MEMBER(apple2e_state::c000_r)
case 0x00: // keyboard latch
return m_transchar | m_strobe;
- case 0x02: // RAMRDOFF
+ case 0x02: // RAMRDOFF
m_ramrd = false;
auxbank_update();
break;
- case 0x03: // RAMRDON
+ case 0x03: // RAMRDON
m_ramrd = true;
auxbank_update();
break;
- case 0x04: // RAMWRTOFF
+ case 0x04: // RAMWRTOFF
m_ramwrt = false;
auxbank_update();
break;
- case 0x05: // RAMWRTON
+ case 0x05: // RAMWRTON
m_ramwrt = true;
auxbank_update();
break;
@@ -1265,76 +1265,76 @@ READ8_MEMBER(apple2e_state::c000_r)
return rv;
}
- case 0x11: // read LCRAM2 (LC Dxxx bank)
+ case 0x11: // read LCRAM2 (LC Dxxx bank)
return m_lcram2 ? 0x80 : 0x00;
- case 0x12: // read LCRAM (is LC readable?)
+ case 0x12: // read LCRAM (is LC readable?)
return m_lcram ? 0x80 : 0x00;
- case 0x13: // read RAMRD
+ case 0x13: // read RAMRD
return m_ramrd ? 0x80 : 0x00;
- case 0x14: // read RAMWRT
+ case 0x14: // read RAMWRT
return m_ramwrt ? 0x80 : 0x00;
- case 0x15: // read INTCXROM
+ case 0x15: // read INTCXROM
return m_intcxrom ? 0x80 : 0x00;
- case 0x16: // read ALTZP
+ case 0x16: // read ALTZP
return m_altzp ? 0x80 : 0x00;
- case 0x17: // read SLOTC3ROM
+ case 0x17: // read SLOTC3ROM
return m_slotc3rom ? 0x80 : 0x00;
- case 0x18: // read 80STORE
+ case 0x18: // read 80STORE
return m_80store ? 0x80 : 0x00;
- case 0x19: // read VBLBAR
+ case 0x19: // read VBLBAR
return space.machine().first_screen()->vblank() ? 0x00 : 0x80;
- case 0x1a: // read TEXT
+ case 0x1a: // read TEXT
return m_video->m_graphics ? 0x00 : 0x80;
- case 0x1b: // read MIXED
+ case 0x1b: // read MIXED
return m_video->m_mix ? 0x80 : 0x00;
- case 0x1c: // read PAGE2
+ case 0x1c: // read PAGE2
return m_page2 ? 0x80 : 0x00;
- case 0x1d: // read HIRES
+ case 0x1d: // read HIRES
return m_video->m_hires ? 0x80 : 0x00;
- case 0x1e: // read ALTCHARSET
+ case 0x1e: // read ALTCHARSET
return m_video->m_altcharset ? 0x80 : 0x00;
- case 0x1f: // read 80COL
+ case 0x1f: // read 80COL
return m_video->m_80col ? 0x80 : 0x00;
case 0x60: // cassette in
case 0x68:
if (m_cassette)
{
- return m_cassette->input() > 0.0 ? 0x80 : 0;
+ return m_cassette->input() > 0.0 ? 0x80 : 0;
}
return 0;
- case 0x61: // button 0 or Open Apple
+ case 0x61: // button 0 or Open Apple
case 0x69:
return ((m_joybuttons->read() & 0x10) || (m_kbspecial->read() & 0x10)) ? 0x80 : 0;
- case 0x62: // button 1 or Solid Apple
+ case 0x62: // button 1 or Solid Apple
case 0x6a:
return ((m_joybuttons->read() & 0x20) || (m_kbspecial->read() & 0x20)) ? 0x80 : 0;
- case 0x63: // button 2 or SHIFT key
+ case 0x63: // button 2 or SHIFT key
case 0x6b:
return ((m_joybuttons->read() & 0x40) || (m_kbspecial->read() & 0x06)) ? 0x80 : 0;
- case 0x64: // joy 1 X axis
+ case 0x64: // joy 1 X axis
case 0x6c:
return (space.machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
- case 0x65: // joy 1 Y axis
+ case 0x65: // joy 1 Y axis
case 0x6d:
return (space.machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
@@ -1346,10 +1346,10 @@ READ8_MEMBER(apple2e_state::c000_r)
case 0x6f:
return (space.machine().time().as_double() < m_joystick_y2_time) ? 0x80 : 0;
- case 0x7e: // read IOUDIS
+ case 0x7e: // read IOUDIS
return m_ioudis ? 0x80 : 0x00;
- case 0x7f: // read DHIRES
+ case 0x7f: // read DHIRES
return m_video->m_dhires ? 0x00 : 0x80;
default:
@@ -1366,79 +1366,79 @@ WRITE8_MEMBER(apple2e_state::c000_w)
switch (offset)
{
- case 0x00: // 80STOREOFF
+ case 0x00: // 80STOREOFF
m_80store = false;
auxbank_update();
break;
- case 0x01: // 80STOREON
+ case 0x01: // 80STOREON
m_80store = true;
auxbank_update();
break;
- case 0x02: // RAMRDOFF
+ case 0x02: // RAMRDOFF
m_ramrd = false;
auxbank_update();
break;
- case 0x03: // RAMRDON
+ case 0x03: // RAMRDON
m_ramrd = true;
auxbank_update();
break;
- case 0x04: // RAMWRTOFF
+ case 0x04: // RAMWRTOFF
m_ramwrt = false;
auxbank_update();
break;
- case 0x05: // RAMWRTON
+ case 0x05: // RAMWRTON
m_ramwrt = true;
auxbank_update();
break;
- case 0x06: // INTCXROMOFF
+ case 0x06: // INTCXROMOFF
m_intcxrom = false;
update_slotrom_banks();
break;
- case 0x07: // INTCXROMON
+ case 0x07: // INTCXROMON
m_intcxrom = true;
update_slotrom_banks();
break;
- case 0x08: // ALTZPOFF
+ case 0x08: // ALTZPOFF
m_altzp = false;
auxbank_update();
break;
- case 0x09: // ALTZPON
+ case 0x09: // ALTZPON
m_altzp = true;
auxbank_update();
break;
- case 0x0a: // SETINTC3ROM
+ case 0x0a: // SETINTC3ROM
m_slotc3rom = false;
update_slotrom_banks();
break;
- case 0x0b: // SETSLOTC3ROM
+ case 0x0b: // SETSLOTC3ROM
m_slotc3rom = true;
update_slotrom_banks();
break;
- case 0x0c: // 80COLOFF
+ case 0x0c: // 80COLOFF
m_video->m_80col = false;
break;
- case 0x0d: // 80COLON
+ case 0x0d: // 80COLON
m_video->m_80col = true;
break;
- case 0x0e: // ALTCHARSETOFF
+ case 0x0e: // ALTCHARSETOFF
m_video->m_altcharset = false;
break;
- case 0x0f: // ALTCHARSETON
+ case 0x0f: // ALTCHARSETON
m_video->m_altcharset = true;
break;
@@ -1446,10 +1446,10 @@ WRITE8_MEMBER(apple2e_state::c000_w)
m_strobe = 0;
break;
- case 0x20: // cassette output
+ case 0x20: // cassette output
if (m_cassette)
{
- m_cassette_out ^= 1;
+ m_cassette_out ^= 1;
m_cassette->output(m_cassette_out ? 1.0f : -1.0f);
}
break;
@@ -1463,13 +1463,13 @@ WRITE8_MEMBER(apple2e_state::c000_w)
// card may have banked auxram; get a new bank pointer
m_aux_bank_ptr = m_auxslotdevice->get_auxbank_ptr();
}
- do_io(space, offset, false); // make sure it also side-effect resets the paddles as documented
+ do_io(space, offset, false); // make sure it also side-effect resets the paddles as documented
break;
- case 0x7e: // SETIOUDIS
+ case 0x7e: // SETIOUDIS
m_ioudis = true; break;
- case 0x7f: // CLRIOUDIS
+ case 0x7f: // CLRIOUDIS
m_ioudis = false; break;
default:
@@ -1487,114 +1487,114 @@ READ8_MEMBER(apple2e_state::c000_iic_r)
case 0x00: // keyboard latch
return m_transchar | m_strobe;
- case 0x02: // RAMRDOFF
+ case 0x02: // RAMRDOFF
m_ramrd = false;
auxbank_update();
break;
- case 0x03: // RAMRDON
+ case 0x03: // RAMRDON
m_ramrd = true;
auxbank_update();
break;
- case 0x04: // RAMWRTOFF
+ case 0x04: // RAMWRTOFF
m_ramwrt = false;
auxbank_update();
break;
- case 0x05: // RAMWRTON
+ case 0x05: // RAMWRTON
m_ramwrt = true;
auxbank_update();
break;
- case 0x10: // read any key down, reset keyboard strobe
+ case 0x10: // read any key down, reset keyboard strobe
{
UINT8 rv = m_transchar | m_anykeydown;
m_strobe = 0;
return rv;
}
- case 0x11: // read LCRAM2 (LC Dxxx bank)
+ case 0x11: // read LCRAM2 (LC Dxxx bank)
return m_lcram2 ? 0x80 : 0x00;
- break;
+ break;
- case 0x12: // read LCRAM (is LC readable?)
+ case 0x12: // read LCRAM (is LC readable?)
return m_lcram ? 0x80 : 0x00;
break;
- case 0x13: // read RAMRD
+ case 0x13: // read RAMRD
return m_ramrd ? 0x80 : 0x00;
- case 0x14: // read RAMWRT
+ case 0x14: // read RAMWRT
return m_ramwrt ? 0x80 : 0x00;
- case 0x15: // read & reset mouse X0 interrupt flag
+ case 0x15: // read & reset mouse X0 interrupt flag
lower_irq(IRQ_MOUSEXY);
return m_xirq ? 0x80 : 0x00;
- case 0x16: // read ALTZP
+ case 0x16: // read ALTZP
return m_altzp ? 0x80 : 0x00;
- case 0x17: // read & reset mouse Y0 interrupt flag
+ case 0x17: // read & reset mouse Y0 interrupt flag
lower_irq(IRQ_MOUSEXY);
return m_yirq ? 0x80 : 0x00;
- case 0x18: // read 80STORE
+ case 0x18: // read 80STORE
return m_80store ? 0x80 : 0x00;
- case 0x19: // read VBL
+ case 0x19: // read VBL
return m_vbl ? 0x80 : 0x00;
- case 0x1a: // read TEXT
+ case 0x1a: // read TEXT
return m_video->m_graphics ? 0x00 : 0x80;
- case 0x1b: // read MIXED
+ case 0x1b: // read MIXED
return m_video->m_mix ? 0x80 : 0x00;
- case 0x1c: // read PAGE2
+ case 0x1c: // read PAGE2
return m_page2 ? 0x80 : 0x00;
- case 0x1d: // read HIRES
+ case 0x1d: // read HIRES
return m_video->m_hires ? 0x80 : 0x00;
- case 0x1e: // read ALTCHARSET
+ case 0x1e: // read ALTCHARSET
return m_video->m_altcharset ? 0x80 : 0x00;
- case 0x1f: // read 80COL
+ case 0x1f: // read 80COL
return m_video->m_80col ? 0x80 : 0x00;
- case 0x40: // read XYMask (IIc only)
+ case 0x40: // read XYMask (IIc only)
return m_xy ? 0x80 : 0x00;
- case 0x41: // read VBL mask (IIc only)
+ case 0x41: // read VBL mask (IIc only)
return m_vblmask ? 0x80 : 0x00;
- case 0x42: // read X0Edge (IIc only)
+ case 0x42: // read X0Edge (IIc only)
return m_x0edge ? 0x80 : 0x00;
- case 0x43: // read Y0Edge (IIc only)
+ case 0x43: // read Y0Edge (IIc only)
return m_y0edge ? 0x80 : 0x00;
case 0x60: // 40/80 column switch (IIc only)
return (m_sysconfig->read() & 0x04) ? 0x80 : 0;
- case 0x61: // button 0 or Open Apple or mouse button 1
+ case 0x61: // button 0 or Open Apple or mouse button 1
case 0x69:
return ((m_joybuttons->read() & 0x10) || (m_kbspecial->read() & 0x10)) ? 0x80 : 0;
- case 0x62: // button 1 or Solid Apple
+ case 0x62: // button 1 or Solid Apple
case 0x6a:
return ((m_joybuttons->read() & 0x20) || (m_kbspecial->read() & 0x20)) ? 0x80 : 0;
- case 0x63: // mouse button 2 (no other function on IIc)
+ case 0x63: // mouse button 2 (no other function on IIc)
case 0x6b:
return m_mouseb->read() ? 0 : 0x80;
- case 0x64: // joy 1 X axis
+ case 0x64: // joy 1 X axis
case 0x6c:
return (space.machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0;
- case 0x65: // joy 1 Y axis
+ case 0x65: // joy 1 Y axis
case 0x6d:
return (space.machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0;
@@ -1606,12 +1606,12 @@ READ8_MEMBER(apple2e_state::c000_iic_r)
case 0x6f:
return m_y1 ? 0x80 : 0;
- case 0x7e: // read IOUDIS
+ case 0x7e: // read IOUDIS
m_vbl = false;
lower_irq(IRQ_VBL);
return m_ioudis ? 0x80 : 0x00;
- case 0x7f: // read DHIRES
+ case 0x7f: // read DHIRES
return m_video->m_dhires ? 0x00 : 0x80;
default:
@@ -1628,79 +1628,79 @@ WRITE8_MEMBER(apple2e_state::c000_iic_w)
switch (offset)
{
- case 0x00: // 80STOREOFF
+ case 0x00: // 80STOREOFF
m_80store = false;
auxbank_update();
break;
- case 0x01: // 80STOREON
+ case 0x01: // 80STOREON
m_80store = true;
auxbank_update();
break;
- case 0x02: // RAMRDOFF
+ case 0x02: // RAMRDOFF
m_ramrd = false;
auxbank_update();
break;
- case 0x03: // RAMRDON
+ case 0x03: // RAMRDON
m_ramrd = true;
auxbank_update();
break;
- case 0x04: // RAMWRTOFF
+ case 0x04: // RAMWRTOFF
m_ramwrt = false;
auxbank_update();
break;
- case 0x05: // RAMWRTON
+ case 0x05: // RAMWRTON
m_ramwrt = true;
auxbank_update();
break;
- case 0x06: // INTCXROMOFF
+ case 0x06: // INTCXROMOFF
m_intcxrom = false;
update_slotrom_banks();
break;
- case 0x07: // INTCXROMON
+ case 0x07: // INTCXROMON
m_intcxrom = true;
update_slotrom_banks();
break;
- case 0x08: // ALTZPOFF
+ case 0x08: // ALTZPOFF
m_altzp = false;
auxbank_update();
break;
- case 0x09: // ALTZPON
+ case 0x09: // ALTZPON
m_altzp = true;
auxbank_update();
break;
- case 0x0a: // SETINTC3ROM
+ case 0x0a: // SETINTC3ROM
m_slotc3rom = false;
update_slotrom_banks();
break;
- case 0x0b: // SETSLOTC3ROM
+ case 0x0b: // SETSLOTC3ROM
m_slotc3rom = true;
update_slotrom_banks();
break;
- case 0x0c: // 80COLOFF
+ case 0x0c: // 80COLOFF
m_video->m_80col = false;
break;
- case 0x0d: // 80COLON
+ case 0x0d: // 80COLON
m_video->m_80col = true;
break;
- case 0x0e: // ALTCHARSETOFF
+ case 0x0e: // ALTCHARSETOFF
m_video->m_altcharset = false;
break;
- case 0x0f: // ALTCHARSETON
+ case 0x0f: // ALTCHARSETON
m_video->m_altcharset = true;
break;
@@ -1714,12 +1714,12 @@ WRITE8_MEMBER(apple2e_state::c000_iic_w)
lower_irq(IRQ_VBL);
break;
- case 0x7e: // SETIOUDIS
- m_ioudis = true;
+ case 0x7e: // SETIOUDIS
+ m_ioudis = true;
break;
- case 0x7f: // CLRIOUDIS
- m_ioudis = false;
+ case 0x7f: // CLRIOUDIS
+ m_ioudis = false;
break;
default:
@@ -1835,7 +1835,7 @@ READ8_MEMBER(apple2e_state::c080_r)
}
else
{
- if (m_slotdevice[slot] != NULL)
+ if (m_slotdevice[slot] != NULL)
{
return m_slotdevice[slot]->read_c0nx(space, offset % 0x10);
}
@@ -1867,7 +1867,7 @@ WRITE8_MEMBER(apple2e_state::c080_w)
UINT8 apple2e_state::read_slot_rom(address_space &space, int slotbias, int offset)
{
- int slotnum = ((offset>>8) & 0xf) + slotbias;
+ int slotnum = ((offset>>8) & 0xf) + slotbias;
if (m_slotdevice[slotnum] != NULL)
{
@@ -1970,10 +1970,10 @@ READ8_MEMBER(apple2e_state::inh_r)
{
if (m_inh_slot != -1)
{
- return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000);
+ return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000);
}
- assert(0); // hitting inh_r with invalid m_inh_slot should not be possible
+ assert(0); // hitting inh_r with invalid m_inh_slot should not be possible
return read_floatingbus();
}
@@ -1989,9 +1989,9 @@ READ8_MEMBER(apple2e_state::lc_r)
{
if (m_altzp)
{
- if (m_aux_bank_ptr)
- {
- if (offset < 0x1000)
+ if (m_aux_bank_ptr)
+ {
+ if (offset < 0x1000)
{
if (m_lcram2)
{
@@ -2004,15 +2004,15 @@ READ8_MEMBER(apple2e_state::lc_r)
}
return m_aux_bank_ptr[(offset & 0x1fff) + 0xe000];
- }
- else
- {
- return read_floatingbus();
+ }
+ else
+ {
+ return read_floatingbus();
}
}
else
{
- if (offset < 0x1000)
+ if (offset < 0x1000)
{
if (m_lcram2)
{
@@ -2038,8 +2038,8 @@ WRITE8_MEMBER(apple2e_state::lc_w)
if (m_altzp)
{
if (m_aux_bank_ptr)
- {
- if (offset < 0x1000)
+ {
+ if (offset < 0x1000)
{
if (m_lcram2)
{
@@ -2057,7 +2057,7 @@ WRITE8_MEMBER(apple2e_state::lc_w)
}
else
{
- if (offset < 0x1000)
+ if (offset < 0x1000)
{
if (m_lcram2)
{
@@ -2295,8 +2295,8 @@ static ADDRESS_MAP_START( laser128_map, AS_PROGRAM, 8, apple2e_state )
AM_RANGE(0x2000, 0x3fff) AM_DEVICE(A2_2000_TAG, address_map_bank_device, amap8)
AM_RANGE(0x4000, 0xbfff) AM_DEVICE(A2_4000_TAG, address_map_bank_device, amap8)
AM_RANGE(0xc000, 0xc07f) AM_READWRITE(c000_r, c000_w)
-// AM_RANGE(0xc098, 0xc09b) AM_DEVREADWRITE(IIC_ACIA1_TAG, mos6551_device, read, write)
-// AM_RANGE(0xc0a8, 0xc0ab) AM_DEVREADWRITE(IIC_ACIA2_TAG, mos6551_device, read, write)
+// AM_RANGE(0xc098, 0xc09b) AM_DEVREADWRITE(IIC_ACIA1_TAG, mos6551_device, read, write)
+// AM_RANGE(0xc0a8, 0xc0ab) AM_DEVREADWRITE(IIC_ACIA2_TAG, mos6551_device, read, write)
AM_RANGE(0xc0d0, 0xc0d3) AM_READWRITE(memexp_r, memexp_w)
AM_RANGE(0xc0e0, 0xc0ef) AM_DEVREADWRITE(LASER128_UDC_TAG, applefdc_base_device, read, write)
AM_RANGE(0xc080, 0xc0ff) AM_READWRITE(c080_r, c080_w)
@@ -2309,20 +2309,20 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( r0000bank_map, AS_PROGRAM, 8, apple2e_state )
AM_RANGE(0x0000, 0x01ff) AM_READWRITE(ram0000_r, ram0000_w)
- AM_RANGE(0x0200, 0x03ff) AM_READWRITE(auxram0000_r, auxram0000_w)
+ AM_RANGE(0x0200, 0x03ff) AM_READWRITE(auxram0000_r, auxram0000_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( r0200bank_map, AS_PROGRAM, 8, apple2e_state )
- AM_RANGE(0x0000, 0x01ff) AM_READWRITE(ram0200_r, ram0200_w) // wr 0 rd 0
+ AM_RANGE(0x0000, 0x01ff) AM_READWRITE(ram0200_r, ram0200_w) // wr 0 rd 0
AM_RANGE(0x0200, 0x03ff) AM_READWRITE(auxram0200_r, ram0200_w) // wr 0 rd 1
AM_RANGE(0x0400, 0x05ff) AM_READWRITE(ram0200_r, auxram0200_w) // wr 1 rd 0
AM_RANGE(0x0600, 0x07ff) AM_READWRITE(auxram0200_r, auxram0200_w) // wr 1 rd 1
ADDRESS_MAP_END
static ADDRESS_MAP_START( r0400bank_map, AS_PROGRAM, 8, apple2e_state )
- AM_RANGE(0x0000, 0x03ff) AM_READWRITE(ram0400_r, ram0400_w) // wr 0 rd 0
- AM_RANGE(0x0400, 0x07ff) AM_READWRITE(auxram0400_r, ram0400_w) // wr 0 rd 1
- AM_RANGE(0x0800, 0x0bff) AM_READWRITE(ram0400_r, auxram0400_w) // wr 1 rd 0
+ AM_RANGE(0x0000, 0x03ff) AM_READWRITE(ram0400_r, ram0400_w) // wr 0 rd 0
+ AM_RANGE(0x0400, 0x07ff) AM_READWRITE(auxram0400_r, ram0400_w) // wr 0 rd 1
+ AM_RANGE(0x0800, 0x0bff) AM_READWRITE(ram0400_r, auxram0400_w) // wr 1 rd 0
AM_RANGE(0x0c00, 0x0fff) AM_READWRITE(auxram0400_r, auxram0400_w) // wr 1 rd 1
ADDRESS_MAP_END
@@ -2330,21 +2330,21 @@ static ADDRESS_MAP_START( r0800bank_map, AS_PROGRAM, 8, apple2e_state )
AM_RANGE(0x0000, 0x17ff) AM_READWRITE(ram0800_r, ram0800_w)
AM_RANGE(0x2000, 0x37ff) AM_READWRITE(auxram0800_r, ram0800_w)
AM_RANGE(0x4000, 0x57ff) AM_READWRITE(ram0800_r, auxram0800_w)
- AM_RANGE(0x6000, 0x77ff) AM_READWRITE(auxram0800_r, auxram0800_w)
+ AM_RANGE(0x6000, 0x77ff) AM_READWRITE(auxram0800_r, auxram0800_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( r2000bank_map, AS_PROGRAM, 8, apple2e_state )
AM_RANGE(0x0000, 0x1fff) AM_READWRITE(ram2000_r, ram2000_w)
AM_RANGE(0x2000, 0x3fff) AM_READWRITE(auxram2000_r, ram2000_w)
AM_RANGE(0x4000, 0x5fff) AM_READWRITE(ram2000_r, auxram2000_w)
- AM_RANGE(0x6000, 0x7fff) AM_READWRITE(auxram2000_r, auxram2000_w)
+ AM_RANGE(0x6000, 0x7fff) AM_READWRITE(auxram2000_r, auxram2000_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( r4000bank_map, AS_PROGRAM, 8, apple2e_state )
AM_RANGE(0x00000, 0x07fff) AM_READWRITE(ram4000_r, ram4000_w)
AM_RANGE(0x08000, 0x0ffff) AM_READWRITE(auxram4000_r, ram4000_w)
AM_RANGE(0x10000, 0x17fff) AM_READWRITE(ram4000_r, auxram4000_w)
- AM_RANGE(0x18000, 0x1ffff) AM_READWRITE(auxram4000_r, auxram4000_w)
+ AM_RANGE(0x18000, 0x1ffff) AM_READWRITE(auxram4000_r, auxram4000_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( c100bank_map, AS_PROGRAM, 8, apple2e_state )
@@ -2372,7 +2372,7 @@ static ADDRESS_MAP_START( c800bank_map, AS_PROGRAM, 8, apple2e_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( inhbank_map, AS_PROGRAM, 8, apple2e_state )
- AM_RANGE(0x0000, 0x2fff) AM_DEVICE(A2_LCBANK_TAG, address_map_bank_device, amap8)
+ AM_RANGE(0x0000, 0x2fff) AM_DEVICE(A2_LCBANK_TAG, address_map_bank_device, amap8)
AM_RANGE(0x3000, 0x5fff) AM_READWRITE(inh_r, inh_w)
ADDRESS_MAP_END
@@ -2424,10 +2424,10 @@ WRITE_LINE_MEMBER(apple2e_state::ay3600_data_ready_w)
trans |= (m_kbspecial->read() & 0x01) ? 0x0000 : 0x0200; // caps lock is bit 9 (active low)
if (m_isiic)
- {
+ {
if (m_sysconfig->read() & 0x08)
{
- trans += 0x400; // go to DVORAK half of the ROM
+ trans += 0x400; // go to DVORAK half of the ROM
}
}
@@ -2459,7 +2459,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(apple2e_state::ay3600_repeat)
}
else
{
- m_strobe = 0x80;
+ m_strobe = 0x80;
}
}
}
@@ -3169,7 +3169,7 @@ static MACHINE_CONFIG_START( apple2e, apple2e_state )
MCFG_AY3600_SHIFT_CB(READLINE(apple2e_state, ay3600_shift_r))
MCFG_AY3600_CONTROL_CB(READLINE(apple2e_state, ay3600_control_r))
MCFG_AY3600_DATA_READY_CB(WRITELINE(apple2e_state, ay3600_data_ready_w))
- MCFG_AY3600_AKO_CB(WRITELINE(apple2e_state, ay3600_ako_w))
+ MCFG_AY3600_AKO_CB(WRITELINE(apple2e_state, ay3600_ako_w))
/* repeat timer. 15 Hz from page 7-15 of "Understanding the Apple IIe" */
MCFG_TIMER_DRIVER_ADD_PERIODIC("repttmr", apple2e_state, ay3600_repeat, attotime::from_hz(15))
@@ -3215,8 +3215,8 @@ static MACHINE_CONFIG_DERIVED( tk3000, apple2e )
MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
MCFG_CPU_PROGRAM_MAP(apple2e_map)
-// MCFG_CPU_ADD("subcpu", Z80, 1021800) // schematics are illegible on where the clock comes from, but it *seems* to be the same as the 65C02 clock
-// MCFG_CPU_PROGRAM_MAP(tk3000_kbd_map)
+// MCFG_CPU_ADD("subcpu", Z80, 1021800) // schematics are illegible on where the clock comes from, but it *seems* to be the same as the 65C02 clock
+// MCFG_CPU_PROGRAM_MAP(tk3000_kbd_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( apple2ep, apple2e )
@@ -3597,4 +3597,3 @@ COMP( 1985, apple2c0, apple2c, 0, apple2c_iwm, apple2c, driver_device,
COMP( 1986, apple2c3, apple2c, 0, apple2c_mem, apple2c, driver_device, 0, "Apple Computer", "Apple //c (Original Memory Expansion)", GAME_SUPPORTS_SAVE )
COMP( 1986, apple2c4, apple2c, 0, apple2c_mem, apple2c, driver_device, 0, "Apple Computer", "Apple //c (rev 4)", GAME_SUPPORTS_SAVE )
COMP( 1988, apple2cp, apple2c, 0, apple2cp, apple2c, driver_device, 0, "Apple Computer", "Apple //c Plus", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE )
-
diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c
index ba62948018f..d5d35416be3 100644
--- a/src/mess/drivers/apple2gs.c
+++ b/src/mess/drivers/apple2gs.c
@@ -143,7 +143,7 @@ PALETTE_INIT_MEMBER(apple2gs_state,apple2gs)
{
int i;
-// PALETTE_INIT_NAME(apple2)(palette);
+// PALETTE_INIT_NAME(apple2)(palette);
for (i = 0; i < 16; i++)
{
diff --git a/src/mess/drivers/comp4.c b/src/mess/drivers/comp4.c
index 2f29b3d28de..6259553bfa7 100644
--- a/src/mess/drivers/comp4.c
+++ b/src/mess/drivers/comp4.c
@@ -4,11 +4,11 @@
Milton Bradley Comp IV
* TMC0904NL CP0904A (die labeled 4A0970D-04A)
-
+
This is a handheld Mastermind game; a code-breaking game where the player
needs to find out the correct sequence of colours (numbers in our case).
It is known as Logic 5 in Europe, and as Pythaligoras in Japan.
-
+
Press the R key to start, followed by a set of unique numbers and E.
Refer to the official manual for more information.
@@ -63,7 +63,7 @@ READ8_MEMBER(comp4_state::read_k)
for (int i = 0; i < 3; i++)
if (m_o & (1 << (i + 1)))
k |= m_button_matrix[i]->read();
-
+
return k;
}
diff --git a/src/mess/drivers/dvk_ksm.c b/src/mess/drivers/dvk_ksm.c
index 778cc6b6ba1..73413043813 100644
--- a/src/mess/drivers/dvk_ksm.c
+++ b/src/mess/drivers/dvk_ksm.c
@@ -18,15 +18,15 @@
F4 + 0..9 on numeric keypad = setup mode. 0 changes serial port speed,
1..9 toggle one of mode bits:
- 1 XON/XOFF 0: Off 1: On
- 2 Character set 0: N0/N1 2: N2
- 3 Auto LF 0: Off 1: On
- 4 Auto repeat 0: On 1: Off
- 5 Auto wraparound 0: On 1: Off
- 6 Interpret controls 0: Interpret 1: Display
- 7 Parity check 0: Off 1: On
- 8 Parity bits 0: None 1: Even
- 9 Stop bits
+ 1 XON/XOFF 0: Off 1: On
+ 2 Character set 0: N0/N1 2: N2
+ 3 Auto LF 0: Off 1: On
+ 4 Auto repeat 0: On 1: Off
+ 5 Auto wraparound 0: On 1: Off
+ 6 Interpret controls 0: Interpret 1: Display
+ 7 Parity check 0: Off 1: On
+ 8 Parity bits 0: None 1: Even
+ 9 Stop bits
N0/N1 charset has regular ASCII in C0 page and Cyrillic in C1 page,
switching between them via SI/SO. N2 charset has uppercase Cyrillic
@@ -39,9 +39,9 @@
Terminfo description would be something like
ksm|DVK KSM,
- am, bw, dch1=\EP, ich1=\EQ,
- acsc=hRiTjXkClJmFnNqUtEuPv\174wKxW.M\054Q\055S\053\136~_{@}Z0\177,
- use=vt52,
+ am, bw, dch1=\EP, ich1=\EQ,
+ acsc=hRiTjXkClJmFnNqUtEuPv\174wKxW.M\054Q\055S\053\136~_{@}Z0\177,
+ use=vt52,
To do:
- make Caps Lock work
@@ -220,8 +220,8 @@ WRITE8_MEMBER(ksm_state::ksm_ppi_portc_w)
WRITE_LINE_MEMBER(ksm_state::write_keyboard_clock)
{
-// KSM never sends data to keyboard
-// m_i8251kbd->write_txc(state);
+// KSM never sends data to keyboard
+// m_i8251kbd->write_txc(state);
m_i8251kbd->write_rxc(state);
}
@@ -284,7 +284,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ksm_state::scanline_callback)
{
UINT16 y = m_screen->vpos();
UINT16 offset;
-
+
DBG_LOG(2,"scanline_cb",
("addr %02x frame %" I64FMT "d x %.4d y %.3d row %.2d\n",
m_video.line, m_screen->frame_number(), m_screen->hpos(), y, y%11));
@@ -384,8 +384,8 @@ MACHINE_CONFIG_END
/*
- Assumes that SRAM is at 0x2000, which is where technical manual puts it.
- Chargen has 1 missing pixel in 'G' character.
+ Assumes that SRAM is at 0x2000, which is where technical manual puts it.
+ Chargen has 1 missing pixel in 'G' character.
*/
ROM_START( dvk_ksm )
ROM_REGION(0x1000, "maincpu", ROMREGION_ERASE00)
@@ -397,8 +397,8 @@ ROM_START( dvk_ksm )
ROM_END
/*
- Assumes that SRAM is at 0x2100, otherwise identical.
- Chargen has no missing pixels in 'G' character.
+ Assumes that SRAM is at 0x2100, otherwise identical.
+ Chargen has no missing pixels in 'G' character.
*/
ROM_START( dvk_ksm01 )
ROM_REGION(0x1000, "maincpu", ROMREGION_ERASE00)
diff --git a/src/mess/drivers/ec184x.c b/src/mess/drivers/ec184x.c
index 16b9026a4f8..44f366d325b 100644
--- a/src/mess/drivers/ec184x.c
+++ b/src/mess/drivers/ec184x.c
@@ -232,7 +232,7 @@ static MACHINE_CONFIG_START( ec1840, ec184x_state )
MCFG_DEVICE_INPUT_DEFAULTS(ec1840)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ec184x_isa8_cards, "ec1840.0002", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ec184x_isa8_cards, "ec1841.0003", false) // actually ec1840.0003 -- w/o mouse port
+ MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ec184x_isa8_cards, "ec1841.0003", false) // actually ec1840.0003 -- w/o mouse port
MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", ec184x_isa8_cards, NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", ec184x_isa8_cards, NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", ec184x_isa8_cards, NULL, false)
@@ -258,8 +258,8 @@ static MACHINE_CONFIG_START( ec1841, ec184x_state )
MCFG_EC1841_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(ec1841)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ec184x_isa8_cards, "ec1841.0002", false) // cga
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ec184x_isa8_cards, "ec1841.0003", false) // fdc + mouse port
+ MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ec184x_isa8_cards, "ec1841.0002", false) // cga
+ MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ec184x_isa8_cards, "ec1841.0003", false) // fdc + mouse port
MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", ec184x_isa8_cards, "hdc", false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", ec184x_isa8_cards, NULL, false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", ec184x_isa8_cards, NULL, false)
diff --git a/src/mess/drivers/gamate.c b/src/mess/drivers/gamate.c
index 1728c3eedae..57adbc5a5e9 100644
--- a/src/mess/drivers/gamate.c
+++ b/src/mess/drivers/gamate.c
@@ -67,7 +67,7 @@ WRITE8_MEMBER( gamate_state::video_w )
case 5: video.y=data;break;
case 7:
if (video.bitmap.write) {
- if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/)
+ if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/)
video.bitmap.data[video.bitmap.page2][video.y][video.x]=data;
else
logerror("%.6f %04x video bitmap x %x invalid\n",machine().time().as_double(), m_maincpu->pc(), video.x);
diff --git a/src/mess/drivers/iskr103x.c b/src/mess/drivers/iskr103x.c
index c3dae58dadf..25717bc57d7 100644
--- a/src/mess/drivers/iskr103x.c
+++ b/src/mess/drivers/iskr103x.c
@@ -77,7 +77,7 @@ static MACHINE_CONFIG_START( iskr1030m, iskr103x_state )
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(iskr1030m)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", iskr103x_isa8_cards, "cga_iskr1030m", false) // actually MDA?
+ MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", iskr103x_isa8_cards, "cga_iskr1030m", false) // actually MDA?
MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", iskr103x_isa8_cards, "fdc_xt", false)
MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", iskr103x_isa8_cards, NULL, false) // hdc is WIP
MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", iskr103x_isa8_cards, NULL, false)
diff --git a/src/mess/drivers/leapster.c b/src/mess/drivers/leapster.c
index ab8814a8d11..4ecebe4b2fe 100644
--- a/src/mess/drivers/leapster.c
+++ b/src/mess/drivers/leapster.c
@@ -1,33 +1,33 @@
-/*
+/*
LeapFrog - Leapster
- educational system from 2003, software is all developed in MXFlash
+ educational system from 2003, software is all developed in MXFlash
+
+ hwspecs
- hwspecs
-
CPU:
- Custom ASIC (ARCTangent 5.1 CPU @ 96MHz)
+ Custom ASIC (ARCTangent 5.1 CPU @ 96MHz)
- Memory:
- Leapster: 2MB onboard RAM, 256 bytes NVRAM.
- Leapster2: 16MB RAM, 128kbytes NVRAM
+ Memory:
+ Leapster: 2MB onboard RAM, 256 bytes NVRAM.
+ Leapster2: 16MB RAM, 128kbytes NVRAM
Media type:
- Cartridges of 4-16MB with between 2 and 512kb NVRAM
-
- Graphics:
- 4Mb ATI chip.
+ Cartridges of 4-16MB with between 2 and 512kb NVRAM
+
+ Graphics:
+ 4Mb ATI chip.
Audio:
- Custom
+ Custom
Screen:
- 160x160 CSTN with touchscreen.
+ 160x160 CSTN with touchscreen.
-
- The Leapster 2 also has
- USB 1.1 (client only) + full-sized SD slot.
+
+ The Leapster 2 also has
+ USB 1.1 (client only) + full-sized SD slot.
*/
@@ -81,7 +81,7 @@ PCB - Handheld-Console:
| |
+------------| |------------+
| | C A R T R I D G E - S L O T | |
- | | | |
+ | | | |
| +-----------------------------+ |
| |
|ASY 310-10069 +-------------------+ |
@@ -160,7 +160,7 @@ B1: 24L002B
(GND)<- A2-| |-SCL
VSS-| |-SDA
+-----+
-
+
@@ -194,11 +194,11 @@ PCB - LEAPSTER-TV:
| | C A R T R I D G E - S L O T | |
| +-----------------------------+ |
\ /
- +-----------------------------------------------+
+ +-----------------------------------------------+
+
+
+
-
-
-
diff --git a/src/mess/drivers/merlin.c b/src/mess/drivers/merlin.c
index 1dba611ab9d..7934b30c4b8 100644
--- a/src/mess/drivers/merlin.c
+++ b/src/mess/drivers/merlin.c
@@ -2,7 +2,7 @@
Parker Bros Merlin handheld computer game
* TMS1100NLL MP3404A-N2 (has internal ROM)
-
+
To start a game, press NEW GAME, followed by a number:
1: Tic-Tac-Toe
2: Music Machine
@@ -10,15 +10,15 @@
4: Blackjack 13
5: Magic Square
6: Mindbender
-
+
Refer to the official manual for more information on the games.
-
-
+
+
Other handhelds assumed to be on similar hardware:
- Dr. Smith - by Tomy, released in Japan (basically a white version of Merlin,
let's assume for now that the ROM contents is identical)
- Master Merlin
-
+
Another sequel, called Split Second, looks like different hardware.
@@ -96,7 +96,7 @@ SG = same game, CT = comp turn, NG = new game, HM = hit me */
READ8_MEMBER(merlin_state::read_k)
{
UINT8 k = 0;
-
+
// read selected button rows
for (int i = 0; i < 4; i++)
if (m_o & (1 << i))
diff --git a/src/mess/drivers/ngen.c b/src/mess/drivers/ngen.c
index d0faccdd97f..f70dfa31bcc 100644
--- a/src/mess/drivers/ngen.c
+++ b/src/mess/drivers/ngen.c
@@ -1,8 +1,8 @@
/*
- Convergent NGen series
+ Convergent NGen series
- 10-11-14 - Skeleton driver
+ 10-11-14 - Skeleton driver
*/
@@ -115,7 +115,7 @@ WRITE16_MEMBER(ngen_state::cpu_peripheral_cb)
m_maincpu->device_t::memory().space(AS_IO).install_readwrite_handler(addr, addr + 0x3ff, read16_delegate(FUNC(ngen_state::peripheral_r), this), write16_delegate(FUNC(ngen_state::peripheral_w), this));
logerror("Mapped peripherals to I/O 0x%04x\n",addr);
}
- break;
+ break;
case 4:
m_middle = data;
break;
@@ -301,7 +301,7 @@ WRITE_LINE_MEMBER( ngen_state::dma_hrq_changed )
void ngen_state::set_dma_channel(int channel, int state)
{
- if(!state)
+ if(!state)
m_dma_channel = channel;
else if(m_dma_channel == channel)
m_dma_channel = -1;
diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c
index eef97ba228a..458954ef945 100644
--- a/src/mess/drivers/pc9801.c
+++ b/src/mess/drivers/pc9801.c
@@ -17,7 +17,7 @@
- rewrite using slot devices
- some later SWs put "Invalid command byte 05" (Absolutely Mahjong on Epson logo)
- investigate on POR bit
- - test 2dd more
+ - test 2dd more
TODO (PC-9801RS):
- extra features;
@@ -607,8 +607,8 @@ public:
DECLARE_WRITE8_MEMBER(pc9801rs_access_ctrl_w);
DECLARE_WRITE8_MEMBER(pc9801rs_nmi_w);
DECLARE_READ8_MEMBER(pc9801rs_midi_r);
-// DECLARE_READ8_MEMBER(winram_r);
-// DECLARE_WRITE8_MEMBER(winram_w);
+// DECLARE_READ8_MEMBER(winram_r);
+// DECLARE_WRITE8_MEMBER(winram_w);
// DECLARE_READ8_MEMBER(pc9801_ext_opna_r);
// DECLARE_WRITE8_MEMBER(pc9801_ext_opna_w);
DECLARE_READ8_MEMBER(pic_r);
@@ -2122,14 +2122,14 @@ WRITE8_MEMBER(pc9801_state::pc9821_ext2_video_ff_w)
/*READ8_MEMBER(pc9801_state::winram_r)
{
- offset = (offset & 0x1ffff) | (m_pc9821_window_bank & 0xfe) * 0x10000;
- return
+ offset = (offset & 0x1ffff) | (m_pc9821_window_bank & 0xfe) * 0x10000;
+ return
}
WRITE8_MEMBER(pc9801_state::winram_w)
{
- offset = (offset & 0x1ffff) | (m_pc9821_window_bank & 0xfe) * 0x10000;
+ offset = (offset & 0x1ffff) | (m_pc9821_window_bank & 0xfe) * 0x10000;
}*/
static ADDRESS_MAP_START( pc9821_map, AS_PROGRAM, 32, pc9801_state )
@@ -3222,7 +3222,7 @@ ROM_START( pc9801ux )
ROM_LOAD( "font_ux.rom", 0x000000, 0x046800, BAD_DUMP CRC(19a76eeb) SHA1(96a006e8515157a624599c2b53a581ae0dd560fd) )
LOAD_KANJI_ROMS
-// LOAD_IDE_ROM
+// LOAD_IDE_ROM
ROM_END
/*
@@ -3325,7 +3325,7 @@ ROM_START( pc9801vm )
ROM_LOAD( "font_vm.rom", 0x000000, 0x046800, BAD_DUMP CRC(456d9fc7) SHA1(78ba9960f135372825ab7244b5e4e73a810002ff) )
LOAD_KANJI_ROMS
-// LOAD_IDE_ROM
+// LOAD_IDE_ROM
ROM_END
/*
diff --git a/src/mess/drivers/pcd.c b/src/mess/drivers/pcd.c
index 19ec2338741..2ca91c48c20 100644
--- a/src/mess/drivers/pcd.c
+++ b/src/mess/drivers/pcd.c
@@ -128,9 +128,9 @@ static ADDRESS_MAP_START( pcd_io, AS_IO, 16, pcd_state )
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf840, 0xf841) AM_DEVREADWRITE8("pic1", pic8259_device, read, write, 0xff00)
AM_RANGE(0xf900, 0xf907) AM_DEVREADWRITE8("fdc", wd2793_t, read, write, 0x00ff)
-// AM_RANGE(0xf940, 0xf941) // sasi controller here?
+// AM_RANGE(0xf940, 0xf941) // sasi controller here?
AM_RANGE(0xf980, 0xf981) AM_READWRITE8(crt_data_r, crt_data_w, 0x00ff) AM_READ8(crt_status_r, 0xff00)
-// AM_RANGE(0xfa00, 0xfa7f) // pcs4-n (peripheral chip select)
+// AM_RANGE(0xfa00, 0xfa7f) // pcs4-n (peripheral chip select)
ADDRESS_MAP_END
diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c
index 12a94451bf4..a07843f409d 100644
--- a/src/mess/drivers/px4.c
+++ b/src/mess/drivers/px4.c
@@ -45,7 +45,7 @@
// TYPE DEFINITIONS
//**************************************************************************
-class px4_state : public driver_device, public device_serial_interface
+class px4_state : public driver_device, public device_serial_interface
{
public:
px4_state(const machine_config &mconfig, device_type type, const char *tag) :
@@ -60,7 +60,7 @@ public:
m_speaker(*this, "speaker"),
m_sio(*this, "sio"),
m_rs232(*this, "rs232"),
- m_caps1(*this, "capsule1"), m_caps2(*this, "capsule2"),
+ m_caps1(*this, "capsule1"), m_caps2(*this, "capsule2"),
m_caps1_rom(NULL), m_caps2_rom(NULL),
m_ctrl1(0), m_icrb(0), m_bankr(0),
m_isr(0), m_ier(0), m_str(0), m_sior(0xbf),
@@ -565,7 +565,7 @@ READ8_MEMBER( px4_state::sior_r )
{
case 1: m_sior = (dec_2_bcd(m_time.local_time.year) >> 4) & 0xf; break;
case 2: m_sior = dec_2_bcd(m_time.local_time.year) & 0xf; break;
- case 3: m_sior = dec_2_bcd(m_time.local_time.month + 1); break;
+ case 3: m_sior = dec_2_bcd(m_time.local_time.month + 1); break;
case 4: m_sior = dec_2_bcd(m_time.local_time.mday); break;
case 5: m_sior = dec_2_bcd(m_time.local_time.hour); break;
case 6: m_sior = dec_2_bcd(m_time.local_time.minute); break;
diff --git a/src/mess/drivers/px8.c b/src/mess/drivers/px8.c
index 38403ae531a..662a1bfeba3 100644
--- a/src/mess/drivers/px8.c
+++ b/src/mess/drivers/px8.c
@@ -801,7 +801,7 @@ static MACHINE_CONFIG_START( px8, px8_state )
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
-
+
// software
MCFG_SOFTWARE_LIST_ADD("epson_cpm_list", "epson_cpm")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/simon.c b/src/mess/drivers/simon.c
index e423973d172..48d1d4b2545 100644
--- a/src/mess/drivers/simon.c
+++ b/src/mess/drivers/simon.c
@@ -3,14 +3,14 @@
/***************************************************************************
Milton Bradley Simon
-
+
Revision A hardware:
* TMS1000 (has internal ROM), DS75494 lamp driver
-
+
Newer revisions have a smaller 16-pin MB4850 chip instead of the TMS1000.
This one has been decapped too, but we couldn't find an internal ROM.
It is possibly a cost-reduced custom ASIC specifically for Simon.
-
+
Other games assumed to be on similar hardware:
- Pocket Simon, but there's a chance it only exists with MB4850 chip
- Super Simon (TMS1100)
@@ -61,7 +61,7 @@ public:
READ8_MEMBER(simon_state::read_k)
{
UINT8 k = 0;
-
+
// read selected button rows
for (int i = 0; i < 4; i++)
{
@@ -82,7 +82,7 @@ WRITE16_MEMBER(simon_state::write_r)
// R7 -> 75494 IN2 -> blue lamp
for (int i = 0; i < 4; i++)
output_set_lamp_value(i, data >> (4 + i) & 1);
-
+
// R8 -> 75494 IN0 -> speaker
m_speaker->level_w(data >> 8 & 1);
diff --git a/src/mess/drivers/spc1000.c b/src/mess/drivers/spc1000.c
index d9791d912a4..fe6b4a9d3b1 100644
--- a/src/mess/drivers/spc1000.c
+++ b/src/mess/drivers/spc1000.c
@@ -391,7 +391,7 @@ void spc1000_state::machine_reset()
READ8_MEMBER(spc1000_state::mc6847_videoram_r)
{
- if (offset == ~0)
+ if (offset == ~0)
return 0xff;
// m_GMODE layout: CSS|NA|PS2|PS1|~A/G|GM0|GM1|NA
@@ -416,7 +416,7 @@ READ8_MEMBER( spc1000_state::porta_r )
data |= (m_cass->input() > 0.0038) ? 0x80 : 0;
data |= ((m_cass->get_state() & CASSETTE_MASK_UISTATE) == CASSETTE_PLAY) ? 0x00 : 0x40;
data &= ~(m_io_joy->read() & 0x3f);
-
+
return data;
}
diff --git a/src/mess/drivers/ti85.c b/src/mess/drivers/ti85.c
index ca7e6658d3e..24938ff9a7d 100755
--- a/src/mess/drivers/ti85.c
+++ b/src/mess/drivers/ti85.c
@@ -170,13 +170,13 @@ TI-83PlusSE ports:
2: ?
3: ON status, LCD power
4: Interrupt status
- 5: Memory page 3
+ 5: Memory page 3
6: Memory page 1
7: Memory page 2
10: Controll port for the display controller
11: Data port for the display controller
- 15: Asic Version
-
+ 15: Asic Version
+
TI-85 ports:
0: Video buffer offset (write only)
1: Keypad
@@ -296,7 +296,7 @@ static ADDRESS_MAP_START( ti83pse_io, AS_IO, 8, ti85_state )
AM_RANGE(0x0015, 0x0015) AM_READ(ti83pse_port_0015_r)
AM_RANGE(0x0020, 0x0020) AM_READWRITE(ti83pse_port_0020_r, ti83pse_port_0020_w )
AM_RANGE(0x0021, 0x0021) AM_READWRITE(ti83pse_port_0021_r, ti83pse_port_0021_w )
-
+
AM_RANGE(0x0030, 0x0030) AM_READWRITE(ti83pse_ctimer1_setup_r, ti83pse_ctimer1_setup_w )
AM_RANGE(0x0031, 0x0031) AM_READWRITE(ti83pse_ctimer1_loop_r, ti83pse_ctimer1_loop_w )
AM_RANGE(0x0032, 0x0032) AM_READWRITE(ti83pse_ctimer1_count_r, ti83pse_ctimer1_count_w )
@@ -306,7 +306,7 @@ static ADDRESS_MAP_START( ti83pse_io, AS_IO, 8, ti85_state )
AM_RANGE(0x0036, 0x0036) AM_READWRITE(ti83pse_ctimer3_setup_r, ti83pse_ctimer3_setup_w )
AM_RANGE(0x0037, 0x0037) AM_READWRITE(ti83pse_ctimer3_loop_r, ti83pse_ctimer3_loop_w )
AM_RANGE(0x0038, 0x0038) AM_READWRITE(ti83pse_ctimer3_count_r, ti83pse_ctimer3_count_w )
-
+
AM_RANGE(0x0055, 0x0055) AM_READ(ti84pse_port_0055_r)
AM_RANGE(0x0056, 0x0056) AM_READ(ti84pse_port_0056_r)
ADDRESS_MAP_END
@@ -713,7 +713,7 @@ static MACHINE_CONFIG_DERIVED( ti83p, ti81 )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
+
MCFG_AMD_29F400T_ADD("flash")
//MCFG_TI83PSERIAL_ADD( "tiserial" )
@@ -721,18 +721,18 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ti83pse, ti83p )
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( 15000000)
+ MCFG_CPU_CLOCK( 15000000)
MCFG_CPU_IO_MAP(ti83pse_io)
-
+
MCFG_DEVICE_MODIFY("membank1")
MCFG_DEVICE_PROGRAM_MAP(ti83pse_banked_mem)
MCFG_DEVICE_MODIFY("membank2")
MCFG_DEVICE_PROGRAM_MAP(ti83pse_banked_mem)
-
+
MCFG_DEVICE_MODIFY("membank3")
MCFG_DEVICE_PROGRAM_MAP(ti83pse_banked_mem)
-
+
MCFG_DEVICE_MODIFY("membank4")
MCFG_DEVICE_PROGRAM_MAP(ti83pse_banked_mem)
@@ -743,7 +743,7 @@ static MACHINE_CONFIG_DERIVED( ti83pse, ti83p )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ti84p, ti83pse )
- MCFG_DEVICE_MODIFY("membank1")
+ MCFG_DEVICE_MODIFY("membank1")
MCFG_DEVICE_PROGRAM_MAP(ti84p_banked_mem)
MCFG_DEVICE_MODIFY("membank2")
@@ -756,7 +756,7 @@ static MACHINE_CONFIG_DERIVED( ti84p, ti83pse )
MCFG_DEVICE_PROGRAM_MAP(ti84p_banked_mem)
MCFG_MACHINE_START_OVERRIDE(ti85_state, ti84p )
- MCFG_DEVICE_REPLACE("flash", AMD_29F800T , 0)
+ MCFG_DEVICE_REPLACE("flash", AMD_29F800T , 0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ti84pse, ti83pse )
@@ -909,10 +909,10 @@ ROM_START (ti84pse)
ROM_END
ROM_START (ti84p)
- ROM_REGION (0x100000, "flash",0)
- ROM_DEFAULT_BIOS("b100v255mp")
- ROM_SYSTEM_BIOS( 0, "b100v255mp", "Boot 1.00 OS V 2.55MP" )
- ROMX_LOAD( "ti84pb100v255mp.bin", 0x00000, 0x100000, CRC(4AF31251) SHA1(8F67269346644B87E7CD0F353F5F4030E787CF57), ROM_BIOS(1) )
+ ROM_REGION (0x100000, "flash",0)
+ ROM_DEFAULT_BIOS("b100v255mp")
+ ROM_SYSTEM_BIOS( 0, "b100v255mp", "Boot 1.00 OS V 2.55MP" )
+ ROMX_LOAD( "ti84pb100v255mp.bin", 0x00000, 0x100000, CRC(4AF31251) SHA1(8F67269346644B87E7CD0F353F5F4030E787CF57), ROM_BIOS(1) )
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
diff --git a/src/mess/drivers/ticalc1x.c b/src/mess/drivers/ticalc1x.c
index 1b87c1a4738..2b5ad7adcda 100644
--- a/src/mess/drivers/ticalc1x.c
+++ b/src/mess/drivers/ticalc1x.c
@@ -3,7 +3,7 @@
/***************************************************************************
Texas Instruments TMS1xxx/0970/0980 handheld calculators
-
+
Texas Instruments WIZ-A-TRON
* TMC0907NL DP0907BS (die labeled 0970F-07B)
@@ -61,7 +61,7 @@ READ8_MEMBER(ticalc1x_state::read_k)
for (int i = 0; i < 4; i++)
if (m_o & (1 << (i + 1)))
k |= m_button_matrix[i]->read();
-
+
return k;
}
diff --git a/src/mess/drivers/tk2000.c b/src/mess/drivers/tk2000.c
index b2c83428363..66874015335 100644
--- a/src/mess/drivers/tk2000.c
+++ b/src/mess/drivers/tk2000.c
@@ -2,18 +2,18 @@
// copyright-holders:R. Belmont
/***************************************************************************
- tk2000.c - Microdigital TK2000
-
+ tk2000.c - Microdigital TK2000
+
Driver by R. Belmont
-
+
This system is only vaguely Apple II compatible.
The keyboard works entirely differently, which is a big deal.
-
+
$C05A - banks RAM from c100-ffff
$C05B - banks ROM from c100-ffff
-
-************************************************************************/
-
+
+************************************************************************/
+
#include "emu.h"
#include "machine/bankdev.h"
#include "machine/ram.h"
@@ -129,7 +129,7 @@ void tk2000_state::machine_reset()
m_strobe = 0;
}
-/***************************************************************************
+/***************************************************************************
VIDEO
***************************************************************************/
@@ -158,7 +158,7 @@ UINT32 tk2000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
return 0;
}
-/***************************************************************************
+/***************************************************************************
I/O
***************************************************************************/
// most softswitches don't care about read vs write, so handle them here
@@ -181,27 +181,27 @@ void tk2000_state::do_io(address_space &space, int offset)
m_speaker->level_w(m_speaker_state);
break;
- case 0x50: // monochrome
+ case 0x50: // monochrome
break;
- case 0x51: // color
+ case 0x51: // color
break;
case 0x54: // set page 1
- m_page2 = false;
+ m_page2 = false;
m_video->m_page2 = false;
break;
case 0x55: // set page 2
- m_page2 = true;
+ m_page2 = true;
m_video->m_page2 = true;
break;
- case 0x5a: // ROM
+ case 0x5a: // ROM
m_upperbank->set_bank(0);
break;
- case 0x5b: // RAM
+ case 0x5b: // RAM
m_upperbank->set_bank(1);
break;
@@ -240,7 +240,7 @@ WRITE8_MEMBER(tk2000_state::c000_w)
{
switch (offset)
{
- case 0x00: // write row mask for keyboard scan
+ case 0x00: // write row mask for keyboard scan
switch (data)
{
case 0:
@@ -255,10 +255,10 @@ WRITE8_MEMBER(tk2000_state::c000_w)
case 0x40: m_strobe = m_row6->read(); break;
case 0x80: m_strobe = m_row7->read(); break;
}
- break;
+ break;
case 0x5f:
- m_strobe = m_kbspecial->read();
+ m_strobe = m_kbspecial->read();
break;
default:
@@ -454,22 +454,22 @@ ADDRESS_MAP_END
INPUT PORTS
***************************************************************************/
-/*
- TK2000 matrix:
-
- 0 1 2 3 4 5 6 7
+/*
+ TK2000 matrix:
+
+ 0 1 2 3 4 5 6 7
0SHIF B V C X Z
- 1 G F D S A
+ 1 G F D S A
2 SPC T R E W Q
- 3 LFT 5 4 3 2 1
- 4 RGT 6 7 8 9 0
- 5 DWN Y U I O P
- 6 UP H J K L :
+ 3 LFT 5 4 3 2 1
+ 4 RGT 6 7 8 9 0
+ 5 DWN Y U I O P
+ 6 UP H J K L :
7 RTN N M , . ?
-
+
write row mask 1/2/4/8/10/20/40/80 to $C000
read column at $C010
-
+
If $C05F is written, the Ctrl key is read in bit 0 of $C010 immediately afterwards.
*/
static INPUT_PORTS_START( tk2000 )
diff --git a/src/mess/includes/pet.h b/src/mess/includes/pet.h
index 0335faf4b58..d4572a99c05 100644
--- a/src/mess/includes/pet.h
+++ b/src/mess/includes/pet.h
@@ -236,7 +236,7 @@ public:
class cbm8096_state : public pet80_state
{
public:
- cbm8096_state(const machine_config &mconfig, device_type type, const char *tag) :
+ cbm8096_state(const machine_config &mconfig, device_type type, const char *tag) :
pet80_state(mconfig, type, tag)
{ }
};
diff --git a/src/mess/includes/ti85.h b/src/mess/includes/ti85.h
index e967101f034..88cc93f3cd7 100755
--- a/src/mess/includes/ti85.h
+++ b/src/mess/includes/ti85.h
@@ -181,7 +181,7 @@ public:
TIMER_CALLBACK_MEMBER(ti85_timer_callback);
TIMER_CALLBACK_MEMBER(ti83_timer1_callback);
TIMER_CALLBACK_MEMBER(ti83_timer2_callback);
-
+
//crystal timers
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
void ti83pse_count( UINT8 timer, UINT8 data);
@@ -207,8 +207,8 @@ public:
DECLARE_WRITE8_MEMBER( ti83pse_ctimer3_loop_w );
DECLARE_READ8_MEMBER( ti83pse_ctimer3_count_r );
DECLARE_WRITE8_MEMBER( ti83pse_ctimer3_count_w );
-
-
+
+
void update_ti85_memory ();
void update_ti83p_memory ();
void update_ti83pse_memory ();
@@ -218,9 +218,9 @@ public:
void ti86_setup_snapshot (UINT8 * data);
DECLARE_SNAPSHOT_LOAD_MEMBER( ti8x );
DECLARE_DIRECT_UPDATE_MEMBER( ti83p_direct_update_handler );
-
+
ti83pse_timer m_ctimer[3];
-
+
//address_space &asic;
};
diff --git a/src/mess/includes/victor9k.h b/src/mess/includes/victor9k.h
index 088b5943ee2..08030027cdc 100644
--- a/src/mess/includes/victor9k.h
+++ b/src/mess/includes/victor9k.h
@@ -48,7 +48,7 @@
#define RS232_B_TAG "rs232b"
#define SCREEN_TAG "screen"
#define VICTOR9K_KEYBOARD_TAG "victor9kb"
-#define FDC_TAG "fdc"
+#define FDC_TAG "fdc"
class victor9k_state : public driver_device
{
diff --git a/src/mess/includes/wswan.h b/src/mess/includes/wswan.h
index 418b44f5021..391dd901b98 100644
--- a/src/mess/includes/wswan.h
+++ b/src/mess/includes/wswan.h
@@ -40,9 +40,9 @@ public:
m_cart(*this, "cartslot"),
m_cursx(*this, "CURSX"),
m_cursy(*this, "CURSY"),
- m_buttons(*this, "BUTTONS")
+ m_buttons(*this, "BUTTONS")
{ }
-
+
required_device<cpu_device> m_maincpu;
required_device<wswan_video_device> m_vdp;
required_device<wswan_sound_device> m_sound;
@@ -50,7 +50,7 @@ public:
DECLARE_READ8_MEMBER(bios_r);
DECLARE_READ8_MEMBER(port_r);
DECLARE_WRITE8_MEMBER(port_w);
-
+
UINT8 m_ws_portram[256];
UINT8 m_internal_eeprom[INTERNAL_EEPROM_SIZE];
UINT8 m_system_type;
@@ -58,7 +58,7 @@ public:
UINT8 *m_ws_bios_bank;
UINT8 m_bios_disabled;
UINT8 m_rotate;
-
+
void set_irq_line(int irq);
void dma_sound_cb();
void common_start();
@@ -67,7 +67,7 @@ public:
DECLARE_PALETTE_INIT(wswan);
DECLARE_MACHINE_START(wscolor);
DECLARE_PALETTE_INIT(wscolor);
-
+
protected:
/* Interrupt flags */
static const UINT8 WSWAN_IFLAG_STX = 0x01;
@@ -78,7 +78,7 @@ protected:
static const UINT8 WSWAN_IFLAG_VBLTMR = 0x20;
static const UINT8 WSWAN_IFLAG_VBL = 0x40;
static const UINT8 WSWAN_IFLAG_HBLTMR = 0x80;
-
+
/* Interrupts */
static const UINT8 WSWAN_INT_STX = 0;
static const UINT8 WSWAN_INT_KEY = 1;
@@ -88,11 +88,11 @@ protected:
static const UINT8 WSWAN_INT_VBLTMR = 5;
static const UINT8 WSWAN_INT_VBL = 6;
static const UINT8 WSWAN_INT_HBLTMR = 7;
-
+
required_ioport m_cursx;
required_ioport m_cursy;
required_ioport m_buttons;
-
+
void register_save();
void handle_irqs();
void clear_irq_line(int irq);
diff --git a/src/mess/includes/xerox820.h b/src/mess/includes/xerox820.h
index 8de4a25daac..797e5689b6e 100644
--- a/src/mess/includes/xerox820.h
+++ b/src/mess/includes/xerox820.h
@@ -36,7 +36,7 @@
#define SASIBUS_TAG "sasi"
#define RS232_A_TAG "rs232a"
#define RS232_B_TAG "rs232b"
-#define KEYBOARD_TAG "kb"
+#define KEYBOARD_TAG "kb"
#define XEROX820_VIDEORAM_SIZE 0x1000
#define XEROX820_VIDEORAM_MASK 0x0fff
diff --git a/src/mess/machine/coco.c b/src/mess/machine/coco.c
index d701d4f8baf..656785d5f16 100644
--- a/src/mess/machine/coco.c
+++ b/src/mess/machine/coco.c
@@ -681,11 +681,11 @@ void coco_state::update_sound(void)
/* determine the sound mux status */
soundmux_status_t status = soundmux_status();
- /* the SC77526 DAC chip internally biases the AC-coupled sound inputs for Cassette and Cartridge at the midpoint of the 3.9v output range */
- bool bCassSoundEnable = (status == (SOUNDMUX_ENABLE | SOUNDMUX_SEL1));
- bool bCartSoundEnable = (status == (SOUNDMUX_ENABLE | SOUNDMUX_SEL2));
- UINT8 cassette_sound = (bCassSoundEnable ? 0x40 : 0);
- UINT8 cart_sound = (bCartSoundEnable ? 0x40 : 0);
+ /* the SC77526 DAC chip internally biases the AC-coupled sound inputs for Cassette and Cartridge at the midpoint of the 3.9v output range */
+ bool bCassSoundEnable = (status == (SOUNDMUX_ENABLE | SOUNDMUX_SEL1));
+ bool bCartSoundEnable = (status == (SOUNDMUX_ENABLE | SOUNDMUX_SEL2));
+ UINT8 cassette_sound = (bCassSoundEnable ? 0x40 : 0);
+ UINT8 cart_sound = (bCartSoundEnable ? 0x40 : 0);
/* determine the value to send to the DAC */
m_dac_output = (m_pia_1->a_output() & 0xFC) >> 2;
@@ -1161,10 +1161,10 @@ WRITE8_MEMBER( coco_state::ff60_write )
READ8_MEMBER( coco_state::ff40_read )
{
- if (offset >= 1 && offset <= 2 && m_beckerportconfig->read_safe(0) == 1)
- {
- return m_beckerport->read(space, offset-1, mem_mask);
- }
+ if (offset >= 1 && offset <= 2 && m_beckerportconfig->read_safe(0) == 1)
+ {
+ return m_beckerport->read(space, offset-1, mem_mask);
+ }
return m_cococart->read(space, offset, mem_mask);
}
@@ -1177,10 +1177,10 @@ READ8_MEMBER( coco_state::ff40_read )
WRITE8_MEMBER( coco_state::ff40_write )
{
- if (offset >= 1 && offset <= 2 && m_beckerportconfig->read_safe(0) == 1)
- {
- return m_beckerport->write(space, offset-1, data, mem_mask);
- }
+ if (offset >= 1 && offset <= 2 && m_beckerportconfig->read_safe(0) == 1)
+ {
+ return m_beckerport->write(space, offset-1, data, mem_mask);
+ }
m_cococart->write(space, offset, data, mem_mask);
}
diff --git a/src/mess/machine/gamecom.c b/src/mess/machine/gamecom.c
index 39b346f7da0..bbf2338da24 100644
--- a/src/mess/machine/gamecom.c
+++ b/src/mess/machine/gamecom.c
@@ -192,8 +192,8 @@ READ8_MEMBER( gamecom_state::gamecom_pio_r )
READ8_MEMBER( gamecom_state::gamecom_internal_r )
{
// ToDo: Read from vblank bit
-// if(SM8521_LCV == offset + 0x20)
-// popmessage("Read from vblank bit, TODO");
+// if(SM8521_LCV == offset + 0x20)
+// popmessage("Read from vblank bit, TODO");
return m_p_ram[offset + 0x20];
}
diff --git a/src/mess/machine/hec2hrp.c b/src/mess/machine/hec2hrp.c
index 1677ab0aed1..48ad1016dcd 100644
--- a/src/mess/machine/hec2hrp.c
+++ b/src/mess/machine/hec2hrp.c
@@ -878,4 +878,3 @@ MACHINE_CONFIG_FRAGMENT( hector_audio )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-
diff --git a/src/mess/machine/ie15_kbd.c b/src/mess/machine/ie15_kbd.c
index 7e9b748059f..8a3438e0750 100644
--- a/src/mess/machine/ie15_kbd.c
+++ b/src/mess/machine/ie15_kbd.c
@@ -170,10 +170,10 @@ void ie15_keyboard_device::device_reset()
/*
Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 Y11 Y12 Y13 Y14 Y15 Y16 Y17 Y18 Y19 Y20 Y21 Y22 Y23 Y24
--
-;+ 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0 -= 7 8 9 ТАБ ГТ СБР СТР СТС f1 f2 f3
-ЙJ ЦC УU КK ЕE НN ГG Ш[ Щ] ЗZ ХH :* 4 5 6 ПС ВК АР1 С1 АР2 f4 f5 f6
-ФF ЫY ВW АA ПP РR ОO ЛL ДD ЖV Э\ .> ЗБ 1 2 3 ПРД ПРМ ПРС f7 f8 f9
-ЯQ Ч^ СS МM ИI ТT ЬX БB Ю@ ,< /? _ SPC 0 , fA fB fC
+;+ 1! 2" 3# 4$ 5% 6& 7' 8( 9) 0 -= 7 8 9 ?????? ???? ?????? ?????? ?????? f1 f2 f3
+??J ??C ??U ??K ??E ??N ??G ??[ ??] ??Z ??H :* 4 5 6 ???? ???? ????1 ??1 ????2 f4 f5 f6
+??F ??Y ??W ??A ??P ??R ??O ??L ??D ??V ??\ .> ???? 1 2 3 ?????? ?????? ?????? f7 f8 f9
+??Q ??^ ??S ??M ??I ??T ??X ??B ??@ ,< /? _ SPC 0 , fA fB fC
rom:
@@ -310,7 +310,7 @@ static INPUT_PORTS_START( ie15_keyboard )
PORT_START("TERM_LINEC")
PORT_BIT(0x000001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL)
-// PORT_BIT(0x000002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+// PORT_BIT(0x000002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
PORT_BIT(0x000002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("SetUp") PORT_CODE(KEYCODE_RSHIFT) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(RSHIFT))
PORT_BIT(0x000004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("SetUp") PORT_CODE(KEYCODE_PRTSCR) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(PRTSCR))
INPUT_PORTS_END
diff --git a/src/mess/machine/ms7004.c b/src/mess/machine/ms7004.c
index b145479db2b..da8108bcad4 100644
--- a/src/mess/machine/ms7004.c
+++ b/src/mess/machine/ms7004.c
@@ -87,94 +87,94 @@ const rom_entry *ms7004_device::device_rom_region() const
// INPUT_PORTS( ms7004 )
//-------------------------------------------------
/*
-bit sig XSn ВРn
---- --- --- ---
-0 8 16 15
-1 9 15 14
-2 10 14 13
-3 11 13 12
-4 12 19 16
-5 13 12 11
-6 14 11 10
-7 15 10 9
-8 16 9 8
-9 17 8 7
-10 18 7 6
-11 19 6 5
-12 20 3 1
-13 21 1 2
-14 22 4 3
-15 23 5 4
-
-0xc9 KEY_LANGLE_RANGLE 'резервная клавиша'
-0xbc KEY_DELETE ЗБ
-0xbd KEY_RETURN ВК
-0xbf KEY_TILDE '; +'
-0xc4 - 'Ъ'
-0xca - '/ ?'
-0xed KEY_PERIOD 'Ю @'
-0xf1 - '_'
+bit sig XSn ????n
+--- --- --- ---
+0 8 16 15
+1 9 15 14
+2 10 14 13
+3 11 13 12
+4 12 19 16
+5 13 12 11
+6 14 11 10
+7 15 10 9
+8 16 9 8
+9 17 8 7
+10 18 7 6
+11 19 6 5
+12 20 3 1
+13 21 1 2
+14 22 4 3
+15 23 5 4
+
+0xc9 KEY_LANGLE_RANGLE '?????????????????? ??????????????'
+0xbc KEY_DELETE ????
+0xbd KEY_RETURN ????
+0xbf KEY_TILDE '; +'
+0xc4 - '??'
+0xca - '/ ?'
+0xed KEY_PERIOD '?? @'
+0xf1 - '_'
<...>
-0x56 KEY_F1 СТОП КАДР
-0x57 KEY_F2 ПЕЧАТЬ КАДРА
-0x58 KEY_F3 ПАУЗА
-0x59 KEY_F4 УСТ РЕЖИМА
-0x5a KEY_F5 Ф5
-
-0x64 KEY_F6 ПРЕРЫВ
-0x65 KEY_F7 ПРОДОЛЖ
-0x66 KEY_F8 ОТМЕН
-0x67 KEY_F9 ОСНОВН КАДР
-0x69 KEY_F10 ВЫХОД
-
-0x71 KEY_F11 Ф11 (АР2)
-0x72 KEY_F12 Ф12 (ВШ)
-0x73 KEY_F13 Ф13 (ПС)
-0x74 KEY_F14 ДОП ВАРИАНТ
-
-0x7c KEY_HELP ПМ
-0x7d KEY_MENU ИСП
-
-0x80 KEY_F17 Ф17
-0x81 KEY_F18 Ф18
-0x82 KEY_F19 Ф19
-0x83 KEY_F20 Ф20
-
-0xb0 KEY_LOCK ФКС
-0xae KEY_SHIFT ВР
-0xaf KEY_CTRL СУ
-
-0xb1 KEY_META КМП
-0xb2 - РУС/ЛАТ
-
-0x8a KEY_FIND НТ
-0x8b KEY_INSERT_HERE ВСТ
-0x8c KEY_REMOVE УДАЛ
-0x8d KEY_SELECT ВЫБР
-0x8e KEY_PREV_SCREEN ПРЕД КАДР
-0x8f KEY_NEXT_SCREEN СЛЕД КАДР
+0x56 KEY_F1 ???????? ????????
+0x57 KEY_F2 ???????????? ??????????
+0x58 KEY_F3 ??????????
+0x59 KEY_F4 ?????? ????????????
+0x5a KEY_F5 ??5
+
+0x64 KEY_F6 ????????????
+0x65 KEY_F7 ??????????????
+0x66 KEY_F8 ??????????
+0x67 KEY_F9 ???????????? ????????
+0x69 KEY_F10 ??????????
+
+0x71 KEY_F11 ??11 (????2)
+0x72 KEY_F12 ??12 (????)
+0x73 KEY_F13 ??13 (????)
+0x74 KEY_F14 ?????? ??????????????
+
+0x7c KEY_HELP ????
+0x7d KEY_MENU ??????
+
+0x80 KEY_F17 ??17
+0x81 KEY_F18 ??18
+0x82 KEY_F19 ??19
+0x83 KEY_F20 ??20
+
+0xb0 KEY_LOCK ??????
+0xae KEY_SHIFT ????
+0xaf KEY_CTRL ????
+
+0xb1 KEY_META ??????
+0xb2 - ??????/??????
+
+0x8a KEY_FIND ????
+0x8b KEY_INSERT_HERE ??????
+0x8c KEY_REMOVE ????????
+0x8d KEY_SELECT ????????
+0x8e KEY_PREV_SCREEN ???????? ????????
+0x8f KEY_NEXT_SCREEN ???????? ????????
nothing sends '@' or '`'
-`/~ sends ^/~
-2/@ sends 2/"
-6/^ sends 6/&
-7/& sends 7/'
-8/ * sends 8/(
-9/( sends 9/)
-0/) sends 0/0
--/_ sends _/_
-+/= sends -/=
-;/: sends ;/+
-'/" sends :/ *
-
-F10 sends ^C
-F11 sends ESC
-F12 sends ^H
+`/~ sends ^/~
+2/@ sends 2/"
+6/^ sends 6/&
+7/& sends 7/'
+8/ * sends 8/(
+9/( sends 9/)
+0/) sends 0/0
+-/_ sends _/_
++/= sends -/=
+;/: sends ;/+
+'/" sends :/ *
+
+F10 sends ^C
+F11 sends ESC
+F12 sends ^H
*/
INPUT_PORTS_START( ms7004 )
- PORT_START("KBD12") // vertical row 1
+ PORT_START("KBD12") // vertical row 1
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Print Screen (F2)") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Hold Screen (F1)") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) // '{' / '|'
@@ -184,7 +184,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Caps Lock") PORT_CODE(KEYCODE_CAPSLOCK) // what
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("LShift") PORT_CODE(KEYCODE_LSHIFT)
- PORT_START("KBD13") // vertical row 2
+ PORT_START("KBD13") // vertical row 2
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Setup (F3)") PORT_CODE(KEYCODE_F3)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Data / Talk (F4)") PORT_CODE(KEYCODE_F4)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("1") PORT_CODE(KEYCODE_1)
@@ -194,7 +194,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Rus/Lat") PORT_CODE(KEYCODE_ESC)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Compose") PORT_CODE(KEYCODE_LALT)
- PORT_START("KBD14") // vertical row 3
+ PORT_START("KBD14") // vertical row 3
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Break (F5)") PORT_CODE(KEYCODE_F5)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("2") PORT_CODE(KEYCODE_2)
@@ -204,7 +204,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Q") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START("KBD15") // vertical row 4
+ PORT_START("KBD15") // vertical row 4
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("3") PORT_CODE(KEYCODE_3)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("4") PORT_CODE(KEYCODE_4)
@@ -214,7 +214,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START("KBD11") // vertical row 5
+ PORT_START("KBD11") // vertical row 5
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Interrupt (F6)") PORT_CODE(KEYCODE_F6)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("5") PORT_CODE(KEYCODE_5)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("E") PORT_CODE(KEYCODE_E)
@@ -224,7 +224,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START("KBD10") // vertical row 6
+ PORT_START("KBD10") // vertical row 6
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Resume (F7)") PORT_CODE(KEYCODE_F7)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("6") PORT_CODE(KEYCODE_6)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("N") PORT_CODE(KEYCODE_N)
@@ -234,7 +234,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("I") PORT_CODE(KEYCODE_I)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Space") PORT_CODE(KEYCODE_SPACE)
- PORT_START("KBD9") // vertical row 7
+ PORT_START("KBD9") // vertical row 7
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Cancel (F8)") PORT_CODE(KEYCODE_F8)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Main Screen (F9)") PORT_CODE(KEYCODE_F9)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("7") PORT_CODE(KEYCODE_7)
@@ -244,7 +244,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("X") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("B") PORT_CODE(KEYCODE_B)
- PORT_START("KBD8") // vertical row 8
+ PORT_START("KBD8") // vertical row 8
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Exit (F10)") PORT_CODE(KEYCODE_F10)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("9") PORT_CODE(KEYCODE_9)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("8") PORT_CODE(KEYCODE_8)
@@ -254,7 +254,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) // '@'
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(",") PORT_CODE(KEYCODE_COMMA)
- PORT_START("KBD7") // vertical row 9
+ PORT_START("KBD7") // vertical row 9
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("ESC (F11)") PORT_CODE(KEYCODE_F11)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("0") PORT_CODE(KEYCODE_0)
@@ -264,27 +264,27 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("\\") PORT_CODE(KEYCODE_BACKSLASH)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("/") PORT_CODE(KEYCODE_SLASH)
- PORT_START("KBD6") // vertical row 10
+ PORT_START("KBD6") // vertical row 10
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("BS (F12)") PORT_CODE(KEYCODE_F12)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("LF (F13)") PORT_CODE(KEYCODE_PRTSCR)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) // '}'
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("'") PORT_CODE(KEYCODE_QUOTE) // ':'
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) // 'ъ'
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) // '??'
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME(".") PORT_CODE(KEYCODE_STOP)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("-") PORT_CODE(KEYCODE_MINUS)
- PORT_START("KBD5") // vertical row 11
+ PORT_START("KBD5") // vertical row 11
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Additional Options (F14)") PORT_CODE(KEYCODE_PAUSE)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Delete <X") PORT_CODE(KEYCODE_BACKSPACE)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) // ???
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) // ???
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("RShift") PORT_CODE(KEYCODE_RSHIFT)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START("KBD3") // vertical row 12
+ PORT_START("KBD3") // vertical row 12
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Help (F15)") PORT_CODE(KEYCODE_RALT)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Insert Here") PORT_CODE(KEYCODE_HOME)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Find") PORT_CODE(KEYCODE_INSERT)
@@ -294,7 +294,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Left") PORT_CODE(KEYCODE_LEFT)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START("KBD2") // vertical row 13
+ PORT_START("KBD2") // vertical row 13
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Remove") PORT_CODE(KEYCODE_PGUP)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Next [v]") PORT_CODE(KEYCODE_PGDN)
@@ -304,7 +304,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START("KBD1") // vertical row 14
+ PORT_START("KBD1") // vertical row 14
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Do (F16)") PORT_CODE(KEYCODE_RCONTROL)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("PF1") PORT_CODE(KEYCODE_NUMLOCK)
@@ -314,7 +314,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Num 2") PORT_CODE(KEYCODE_2_PAD)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Num 0") PORT_CODE(KEYCODE_0_PAD)
- PORT_START("KBD0") // vertical row 15
+ PORT_START("KBD0") // vertical row 15
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F17")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F18")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("PF2") PORT_CODE(KEYCODE_SLASH_PAD)
@@ -324,7 +324,7 @@ INPUT_PORTS_START( ms7004 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Num 6") PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Num 3") PORT_CODE(KEYCODE_3_PAD)
- PORT_START("KBD4") // vertical row 16
+ PORT_START("KBD4") // vertical row 16
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F19")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("F20")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("PF4") PORT_CODE(KEYCODE_MINUS_PAD)
@@ -355,7 +355,7 @@ ioport_constructor ms7004_device::device_input_ports() const
ms7004_device::ms7004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MS7004, "MS7004 keyboard", tag, owner, clock, "ms7004", __FILE__),
-// device_serial_interface(mconfig, *this),
+// device_serial_interface(mconfig, *this),
m_maincpu(*this, MS7004_CPU_TAG),
m_speaker(*this, MS7004_SPK_TAG),
m_i8243(*this, "i8243"),
@@ -458,7 +458,7 @@ WRITE8_MEMBER( ms7004_device::i8243_port_w )
DBG_LOG(2,0,( "%s: 8243 port %d data %02xH\n",
tag(), offset + 4, data));
-
+
if (data) {
switch(offset << 4 | data) {
case 0x01: sense = m_kbd0->read(); break;
diff --git a/src/mess/machine/ti85.c b/src/mess/machine/ti85.c
index 90c8577394d..6e6702de6e5 100755
--- a/src/mess/machine/ti85.c
+++ b/src/mess/machine/ti85.c
@@ -155,20 +155,18 @@ void ti85_state::update_ti83p_memory ()
//address_space &space = m_maincpu->space(AS_PROGRAM);
m_membank1->set_bank(m_booting ? 0x1f : 0); //Always flash page 0, well allmost
-
+
if (m_ti83p_port4 & 1)
{
-
m_membank2->set_bank(m_ti8x_memory_page_1 & 0xfe);
- m_membank3->set_bank(m_ti8x_memory_page_1);
+ m_membank3->set_bank(m_ti8x_memory_page_1);
m_membank4->set_bank(m_ti8x_memory_page_2);
-
+
}
else
{
-
m_membank2->set_bank(m_ti8x_memory_page_1);
m_membank3->set_bank(m_ti8x_memory_page_2);
@@ -181,23 +179,21 @@ void ti85_state::update_ti83p_memory ()
void ti85_state::update_ti83pse_memory ()
{
//address_space &space = m_maincpu->space(AS_PROGRAM);
-
+
m_membank1->set_bank(m_booting ? (m_model==TI84P ? 0x3f : 0x7f) : 0);
-
+
if (m_ti83p_port4 & 1)
- {
-
+ {
m_membank2->set_bank(m_ti8x_memory_page_1 & 0xfe);
-
+
m_membank3->set_bank(m_ti8x_memory_page_1 | 1);
m_membank4->set_bank(m_ti8x_memory_page_2);
-
+
}
else
{
-
m_membank2->set_bank(m_ti8x_memory_page_1);
m_membank3->set_bank(m_ti8x_memory_page_2);
@@ -277,12 +273,12 @@ DIRECT_UPDATE_MEMBER(ti85_state::ti83p_direct_update_handler)
{
if (m_booting)
{
- if (((m_ti83p_port4 & 1) && (address >= 0x4000 && address < 0xc000)) || (address >= 0x4000 && address < 0x8000))
- {
- m_booting = false;
+ if (((m_ti83p_port4 & 1) && (address >= 0x4000 && address < 0xc000)) || (address >= 0x4000 && address < 0x8000))
+ {
+ m_booting = false;
update_ti83p_memory();
}
- }
+ }
return address;
}
@@ -294,19 +290,19 @@ MACHINE_RESET_MEMBER(ti85_state,ti83p)
m_PCR = 0xc0;
- m_ti8x_memory_page_1 = 0;
+ m_ti8x_memory_page_1 = 0;
m_ti8x_memory_page_2 = 0;
m_ti8x_memory_page_3 = 0;
m_ti83p_port4 = 1;
m_booting = true;
if (m_model == TI83P)
- {
- update_ti83p_memory();
- }
- else
- {
- update_ti83pse_memory();
- }
+ {
+ update_ti83p_memory();
+ }
+ else
+ {
+ update_ti83pse_memory();
+ }
}
MACHINE_START_MEMBER(ti85_state,ti83p)
@@ -336,7 +332,7 @@ MACHINE_START_MEMBER(ti85_state,ti83p)
m_booting = true;
- ti85_state::update_ti83p_memory();
+ ti85_state::update_ti83p_memory();
machine().scheduler().timer_pulse(attotime::from_hz(256), timer_expired_delegate(FUNC(ti85_state::ti83_timer1_callback),this));
@@ -345,7 +341,7 @@ MACHINE_START_MEMBER(ti85_state,ti83p)
/* save states and debugging */
save_item(NAME(m_timer_interrupt_status));
- save_item(NAME(m_timer_interrupt_mask));
+ save_item(NAME(m_timer_interrupt_mask));
save_item(NAME(m_ti8x_memory_page_1));
save_item(NAME(m_ti8x_memory_page_2));
save_item(NAME(m_ti8x_memory_page_3));
@@ -400,21 +396,21 @@ void ti85_state::ti8xpse_init_common()
MACHINE_START_MEMBER(ti85_state,ti83pse)
{
- m_model = TI84PSE;
+ m_model = TI84PSE;
- ti8xpse_init_common();
+ ti8xpse_init_common();
}
MACHINE_START_MEMBER(ti85_state,ti84pse)
{
- m_model = TI83PSE;
+ m_model = TI83PSE;
- ti8xpse_init_common();
+ ti8xpse_init_common();
}
MACHINE_START_MEMBER(ti85_state,ti84p)
{
- m_model = TI84P;
+ m_model = TI84P;
ti8xpse_init_common();
}
@@ -572,7 +568,7 @@ READ8_MEMBER(ti85_state::ti83_port_0003_r )
data |= 0x08;
data |= m_timer_interrupt_status;
-
+
return data;
}
@@ -606,7 +602,7 @@ READ8_MEMBER(ti85_state::ti83p_port_0004_r )
data |= m_timer_interrupt_status;
data |= m_ctimer_interrupt_status;
-
+
return data;
}
@@ -758,7 +754,7 @@ WRITE8_MEMBER(ti85_state::ti83p_int_mask_w)
//m_LCD_mask = (data&0x08) >> 2;
m_ON_interrupt_mask = data & 0x01;
m_ON_interrupt_status &= m_ON_interrupt_mask;
-
+
m_timer_interrupt_mask = data & 0x06;
m_timer_interrupt_status &= m_timer_interrupt_mask;
@@ -796,7 +792,6 @@ WRITE8_MEMBER(ti85_state::ti83pse_port_0005_w)
WRITE8_MEMBER(ti85_state::ti83pse_port_0006_w)
{
-
if ((m_model == TI84P) && (data < 0x80))
{
m_ti8x_memory_page_1 = data & 0x3f;
@@ -873,7 +868,7 @@ void ti85_state::ti83pse_count( UINT8 timer, UINT8 data)
if (m_ctimer[timer].setup)
{
- switch (m_ctimer[timer].setup & 0x07)
+ switch (m_ctimer[timer].setup & 0x07)
{
case 0x00:
m_ctimer[timer].divsor = 3.0;
@@ -914,7 +909,7 @@ void ti85_state::ti83pse_count( UINT8 timer, UINT8 data)
m_crystal_timer3->adjust(attotime::zero, 0, attotime::from_hz( 32768.0/m_ctimer[timer].divsor));
m_crystal_timer3->enable(true);
break;
-
+
}
}
}
diff --git a/src/mess/machine/victor9k_fdc.c b/src/mess/machine/victor9k_fdc.c
index 87308971d3a..9d16f9ca244 100644
--- a/src/mess/machine/victor9k_fdc.c
+++ b/src/mess/machine/victor9k_fdc.c
@@ -13,8 +13,8 @@
TODO:
- - disk error 2 (cannot find block header?)
- - 8048 spindle speed control
+ - disk error 2 (cannot find block header?)
+ - 8048 spindle speed control
- read PLL
- write logic
diff --git a/src/mess/machine/victor9kb.c b/src/mess/machine/victor9kb.c
index d4b5c4e57ee..34047e4aa26 100644
--- a/src/mess/machine/victor9kb.c
+++ b/src/mess/machine/victor9kb.c
@@ -355,7 +355,7 @@ WRITE8_MEMBER( victor9k_keyboard_device::kb_p2_w )
bit description
P20 ?
- P21 KBRDY
+ P21 KBRDY
P22 ?
P23 KBDATA
diff --git a/src/mess/machine/wswan.c b/src/mess/machine/wswan.c
index afa8ce8077f..e0e2a351f85 100644
--- a/src/mess/machine/wswan.c
+++ b/src/mess/machine/wswan.c
@@ -155,11 +155,11 @@ void wswan_state::register_save()
save_item(NAME(m_internal_eeprom));
save_item(NAME(m_bios_disabled));
save_item(NAME(m_rotate));
-
+
save_item(NAME(m_sound_dma.source));
save_item(NAME(m_sound_dma.size));
save_item(NAME(m_sound_dma.enable));
-
+
if (m_cart->exists())
m_cart->save_nvram();
}
@@ -168,18 +168,18 @@ void wswan_state::common_start()
{
m_ws_bios_bank = auto_alloc_array(machine(), UINT8, 0x10000);
memcpy(m_ws_bios_bank + 0xffc0, ws_fake_bios_code, 0x40);
-
+
register_save();
-
+
machine().device<nvram_device>("nvram")->set_base(m_internal_eeprom, INTERNAL_EEPROM_SIZE);
-
+
if (m_cart->exists())
{
// ROM
m_maincpu->space(AS_PROGRAM).install_read_handler(0x20000, 0x2ffff, read8_delegate(FUNC(ws_cart_slot_device::read_rom20),(ws_cart_slot_device*)m_cart));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x30000, 0x3ffff, read8_delegate(FUNC(ws_cart_slot_device::read_rom30),(ws_cart_slot_device*)m_cart));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x40000, 0xeffff, read8_delegate(FUNC(ws_cart_slot_device::read_rom40),(ws_cart_slot_device*)m_cart));
-
+
// SRAM
if (m_cart->get_type() == WS_SRAM)
{
@@ -204,18 +204,18 @@ MACHINE_START_MEMBER(wswan_state, wscolor)
void wswan_state::machine_reset()
{
m_bios_disabled = 0;
-
+
if (m_cart->exists())
m_rotate = m_cart->get_is_rotated();
else
m_rotate = 0;
-
+
/* Intialize ports */
memcpy(m_ws_portram, ws_portram_init, 256);
-
+
render_target *target = machine().render().first_target();
target->set_view(m_rotate);
-
+
/* Initialize sound DMA */
memset(&m_sound_dma, 0, sizeof(m_sound_dma));
}
@@ -231,13 +231,13 @@ READ8_MEMBER( wswan_state::bios_r )
READ8_MEMBER( wswan_state::port_r )
{
UINT8 value = m_ws_portram[offset];
-
+
if (offset != 2)
logerror("PC=%X: port read %02X\n", m_maincpu->pc(), offset);
-
+
if (offset < 0x40 || (offset >= 0xa1 && offset < 0xb0))
return m_vdp->reg_r(space, offset);
-
+
switch (offset)
{
case 0x4a: // Sound DMA source address (low)
@@ -288,7 +288,7 @@ READ8_MEMBER( wswan_state::port_r )
value = m_cart->read_io(space, offset & 0x0f);
break;
}
-
+
return value;
}
@@ -297,49 +297,49 @@ WRITE8_MEMBER( wswan_state::port_w )
address_space &mem = m_maincpu->space(AS_PROGRAM);
UINT8 input;
logerror("PC=%X: port write %02X <- %02X\n", m_maincpu->pc(), offset, data);
-
+
if (offset < 0x40 || (offset >= 0xa1 && offset < 0xb0))
{
m_vdp->reg_w(space, offset, data);
return;
}
-
+
switch (offset)
{
case 0x40: /* DMA source address (low)
- Bit 0-7 - DMA source address bit 0-7
- */
+ Bit 0-7 - DMA source address bit 0-7
+ */
case 0x41: /* DMA source address (high)
- Bit 0-7 - DMA source address bit 8-15
- */
+ Bit 0-7 - DMA source address bit 8-15
+ */
case 0x42: /* DMA source bank
- Bit 0-7 - DMA source bank number
- */
+ Bit 0-7 - DMA source bank number
+ */
case 0x43: /* DMA destination bank
- Bit 0-7 - DMA destination bank number
- */
+ Bit 0-7 - DMA destination bank number
+ */
case 0x44: /* DMA destination address (low)
- Bit 0-7 - DMA destination address bit 0-7
- */
+ Bit 0-7 - DMA destination address bit 0-7
+ */
case 0x45: /* DMA destination address (high)
- Bit 0-7 - DMA destination address bit 8-15
- */
+ Bit 0-7 - DMA destination address bit 8-15
+ */
case 0x46: /* Size of copied data (low)
- Bit 0-7 - DMA size bit 0-7
- */
+ Bit 0-7 - DMA size bit 0-7
+ */
case 0x47: /* Size of copied data (high)
- Bit 0-7 - DMA size bit 8-15
- */
+ Bit 0-7 - DMA size bit 8-15
+ */
break;
case 0x48: /* DMA control
- Bit 0-6 - Unknown
- Bit 7 - DMA stop/start
- */
+ Bit 0-6 - Unknown
+ Bit 7 - DMA stop/start
+ */
if (data & 0x80)
{
UINT32 src, dst;
UINT16 length;
-
+
src = m_ws_portram[0x40] + (m_ws_portram[0x41] << 8) + (m_ws_portram[0x42] << 16);
dst = m_ws_portram[0x44] + (m_ws_portram[0x45] << 8) + (m_ws_portram[0x43] << 16);
length = m_ws_portram[0x46] + (m_ws_portram[0x47] << 8);
@@ -362,167 +362,167 @@ WRITE8_MEMBER( wswan_state::port_w )
}
break;
case 0x4a: /* Sound DMA source address (low)
- Bit 0-7 - Sound DMA source address bit 0-7
- */
+ Bit 0-7 - Sound DMA source address bit 0-7
+ */
m_sound_dma.source = (m_sound_dma.source & 0x0fff00) | data;
break;
case 0x4b: /* Sound DMA source address (high)
- Bit 0-7 - Sound DMA source address bit 8-15
- */
+ Bit 0-7 - Sound DMA source address bit 8-15
+ */
m_sound_dma.source = (m_sound_dma.source & 0x0f00ff) | (data << 8);
break;
case 0x4c: /* Sound DMA source memory segment
- Bit 0-3 - Sound DMA source address segment
- Bit 4-7 - Unknown
- */
+ Bit 0-3 - Sound DMA source address segment
+ Bit 4-7 - Unknown
+ */
m_sound_dma.source = (m_sound_dma.source & 0xffff) | ((data & 0x0f) << 16);
break;
case 0x4d: /* Unknown */
break;
case 0x4e: /* Sound DMA transfer size (low)
- Bit 0-7 - Sound DMA transfer size bit 0-7
- */
+ Bit 0-7 - Sound DMA transfer size bit 0-7
+ */
m_sound_dma.size = (m_sound_dma.size & 0xff00) | data;
break;
case 0x4f: /* Sound DMA transfer size (high)
- Bit 0-7 - Sound DMA transfer size bit 8-15
- */
+ Bit 0-7 - Sound DMA transfer size bit 8-15
+ */
m_sound_dma.size = (m_sound_dma.size & 0xff) | (data << 8);
break;
case 0x50: /* Unknown */
case 0x51: /* Unknown */
break;
case 0x52: /* Sound DMA start/stop
- Bit 0-6 - Unknown
- Bit 7 - Sound DMA stop/start
- */
+ Bit 0-6 - Unknown
+ Bit 7 - Sound DMA stop/start
+ */
m_sound_dma.enable = data;
break;
case 0x60:
m_vdp->reg_w(space, offset, data);
break;
case 0x80: /* Audio 1 freq (lo)
- Bit 0-7 - Audio channel 1 frequency bit 0-7
- */
+ Bit 0-7 - Audio channel 1 frequency bit 0-7
+ */
case 0x81: /* Audio 1 freq (hi)
- Bit 0-7 - Audio channel 1 frequency bit 8-15
- */
+ Bit 0-7 - Audio channel 1 frequency bit 8-15
+ */
case 0x82: /* Audio 2 freq (lo)
- Bit 0-7 - Audio channel 2 frequency bit 0-7
- */
+ Bit 0-7 - Audio channel 2 frequency bit 0-7
+ */
case 0x83: /* Audio 2 freq (hi)
- Bit 0-7 - Audio channel 2 frequency bit 8-15
- */
+ Bit 0-7 - Audio channel 2 frequency bit 8-15
+ */
case 0x84: /* Audio 3 freq (lo)
- Bit 0-7 - Audio channel 3 frequency bit 0-7
- */
+ Bit 0-7 - Audio channel 3 frequency bit 0-7
+ */
case 0x85: /* Audio 3 freq (hi)
- Bit 0-7 - Audio channel 3 frequency bit 8-15
- */
+ Bit 0-7 - Audio channel 3 frequency bit 8-15
+ */
case 0x86: /* Audio 4 freq (lo)
- Bit 0-7 - Audio channel 4 frequency bit 0-7
- */
+ Bit 0-7 - Audio channel 4 frequency bit 0-7
+ */
case 0x87: /* Audio 4 freq (hi)
- Bit 0-7 - Audio channel 4 frequency bit 8-15
- */
+ Bit 0-7 - Audio channel 4 frequency bit 8-15
+ */
case 0x88: /* Audio 1 volume
- Bit 0-3 - Right volume audio channel 1
- Bit 4-7 - Left volume audio channel 1
- */
+ Bit 0-3 - Right volume audio channel 1
+ Bit 4-7 - Left volume audio channel 1
+ */
case 0x89: /* Audio 2 volume
- Bit 0-3 - Right volume audio channel 2
- Bit 4-7 - Left volume audio channel 2
- */
+ Bit 0-3 - Right volume audio channel 2
+ Bit 4-7 - Left volume audio channel 2
+ */
case 0x8a: /* Audio 3 volume
- Bit 0-3 - Right volume audio channel 3
- Bit 4-7 - Left volume audio channel 3
- */
+ Bit 0-3 - Right volume audio channel 3
+ Bit 4-7 - Left volume audio channel 3
+ */
case 0x8b: /* Audio 4 volume
- Bit 0-3 - Right volume audio channel 4
- Bit 4-7 - Left volume audio channel 4
- */
+ Bit 0-3 - Right volume audio channel 4
+ Bit 4-7 - Left volume audio channel 4
+ */
case 0x8c: /* Sweep step
- Bit 0-7 - Sweep step
- */
+ Bit 0-7 - Sweep step
+ */
case 0x8d: /* Sweep time
- Bit 0-7 - Sweep time
- */
+ Bit 0-7 - Sweep time
+ */
case 0x8e: /* Noise control
- Bit 0-2 - Noise generator type
- Bit 3 - Reset
- Bit 4 - Enable
- Bit 5-7 - Unknown
- */
+ Bit 0-2 - Noise generator type
+ Bit 3 - Reset
+ Bit 4 - Enable
+ Bit 5-7 - Unknown
+ */
case 0x8f: /* Sample location
- Bit 0-7 - Sample address location 0 00xxxxxx xx000000
- */
+ Bit 0-7 - Sample address location 0 00xxxxxx xx000000
+ */
case 0x90: /* Audio control
- Bit 0 - Audio 1 enable
- Bit 1 - Audio 2 enable
- Bit 2 - Audio 3 enable
- Bit 3 - Audio 4 enable
- Bit 4 - Unknown
- Bit 5 - Audio 2 voice mode enable
- Bit 6 - Audio 3 sweep mode enable
- Bit 7 - Audio 4 noise mode enable
- */
+ Bit 0 - Audio 1 enable
+ Bit 1 - Audio 2 enable
+ Bit 2 - Audio 3 enable
+ Bit 3 - Audio 4 enable
+ Bit 4 - Unknown
+ Bit 5 - Audio 2 voice mode enable
+ Bit 6 - Audio 3 sweep mode enable
+ Bit 7 - Audio 4 noise mode enable
+ */
case 0x91: /* Audio output
- Bit 0 - Mono select
- Bit 1-2 - Output volume
- Bit 3 - External stereo
- Bit 4-6 - Unknown
- Bit 7 - External speaker (Read-only, set by hardware)
- */
+ Bit 0 - Mono select
+ Bit 1-2 - Output volume
+ Bit 3 - External stereo
+ Bit 4-6 - Unknown
+ Bit 7 - External speaker (Read-only, set by hardware)
+ */
case 0x92: /* Noise counter shift register (lo)
- Bit 0-7 - Noise counter shift register bit 0-7
- */
+ Bit 0-7 - Noise counter shift register bit 0-7
+ */
case 0x93: /* Noise counter shift register (hi)
- Bit 0-6 - Noise counter shift register bit 8-14
- bit 7 - Unknown
- */
+ Bit 0-6 - Noise counter shift register bit 8-14
+ bit 7 - Unknown
+ */
case 0x94: /* Master volume
- Bit 0-3 - Master volume
- Bit 4-7 - Unknown
- */
+ Bit 0-3 - Master volume
+ Bit 4-7 - Unknown
+ */
m_sound->port_w(space, offset, data);
break;
case 0xa0: /* Hardware type - this is probably read only
- Bit 0 - Enable cartridge slot and/or disable bios
- Bit 1 - Hardware type: 0 = WS, 1 = WSC
- Bit 2-7 - Unknown
- */
+ Bit 0 - Enable cartridge slot and/or disable bios
+ Bit 1 - Hardware type: 0 = WS, 1 = WSC
+ Bit 2-7 - Unknown
+ */
if ((data & 0x01) && !m_bios_disabled)
m_bios_disabled = 1;
break;
-
+
case 0xb0: /* Interrupt base vector
- Bit 0-7 - Interrupt base vector
- */
+ Bit 0-7 - Interrupt base vector
+ */
break;
case 0xb1: /* Communication byte
- Bit 0-7 - Communication byte
- */
+ Bit 0-7 - Communication byte
+ */
break;
case 0xb2: /* Interrupt enable
- Bit 0 - Serial transmit interrupt enable
- Bit 1 - Key press interrupt enable
- Bit 2 - RTC alarm interrupt enable
- Bit 3 - Serial receive interrupt enable
- Bit 4 - Drawing line detection interrupt enable
- Bit 5 - VBlank timer interrupt enable
- Bit 6 - VBlank interrupt enable
- Bit 7 - HBlank timer interrupt enable
- */
+ Bit 0 - Serial transmit interrupt enable
+ Bit 1 - Key press interrupt enable
+ Bit 2 - RTC alarm interrupt enable
+ Bit 3 - Serial receive interrupt enable
+ Bit 4 - Drawing line detection interrupt enable
+ Bit 5 - VBlank timer interrupt enable
+ Bit 6 - VBlank interrupt enable
+ Bit 7 - HBlank timer interrupt enable
+ */
break;
case 0xb3: /* serial communication control
- Bit 0 - Receive complete
- Bit 1 - Error
- Bit 2 - Send complete
- Bit 3-4 - Unknown
- Bit 5 - Send data interrupt generation
- Bit 6 - Connection speed: 0 = 9600 bps, 1 = 38400 bps
- bit 7 - Receive data interrupt generation
- */
+ Bit 0 - Receive complete
+ Bit 1 - Error
+ Bit 2 - Send complete
+ Bit 3-4 - Unknown
+ Bit 5 - Send data interrupt generation
+ Bit 6 - Connection speed: 0 = 9600 bps, 1 = 38400 bps
+ bit 7 - Receive data interrupt generation
+ */
// data |= 0x02;
m_ws_portram[0xb1] = 0xff;
if (data & 0x80)
@@ -536,13 +536,13 @@ WRITE8_MEMBER( wswan_state::port_w )
}
break;
case 0xb5: /* Read controls
- Bit 0-3 - Current state of input lines (read-only)
- Bit 4-6 - Select line of inputs to read
- 001 - Read Y cursors
- 010 - Read X cursors
- 100 - Read START,A,B buttons
- Bit 7 - Unknown
- */
+ Bit 0-3 - Current state of input lines (read-only)
+ Bit 4-6 - Select line of inputs to read
+ 001 - Read Y cursors
+ 010 - Read X cursors
+ 100 - Read START,A,B buttons
+ Bit 7 - Unknown
+ */
data = data & 0xf0;
switch (data)
{
@@ -576,43 +576,43 @@ WRITE8_MEMBER( wswan_state::port_w )
}
break;
case 0xb6: /* Interrupt acknowledge
- Bit 0 - Serial transmit interrupt acknowledge
- Bit 1 - Key press interrupt acknowledge
- Bit 2 - RTC alarm interrupt acknowledge
- Bit 3 - Serial receive interrupt acknowledge
- Bit 4 - Drawing line detection interrupt acknowledge
- Bit 5 - VBlank timer interrupt acknowledge
- Bit 6 - VBlank interrupt acknowledge
- Bit 7 - HBlank timer interrupt acknowledge
- */
+ Bit 0 - Serial transmit interrupt acknowledge
+ Bit 1 - Key press interrupt acknowledge
+ Bit 2 - RTC alarm interrupt acknowledge
+ Bit 3 - Serial receive interrupt acknowledge
+ Bit 4 - Drawing line detection interrupt acknowledge
+ Bit 5 - VBlank timer interrupt acknowledge
+ Bit 6 - VBlank interrupt acknowledge
+ Bit 7 - HBlank timer interrupt acknowledge
+ */
clear_irq_line(data);
data = m_ws_portram[0xb6];
break;
case 0xba: /* Internal EEPROM data (low)
- Bit 0-7 - Internal EEPROM data transfer bit 0-7
- */
+ Bit 0-7 - Internal EEPROM data transfer bit 0-7
+ */
case 0xbb: /* Internal EEPROM data (high)
- Bit 0-7 - Internal EEPROM data transfer bit 8-15
- */
+ Bit 0-7 - Internal EEPROM data transfer bit 8-15
+ */
break;
case 0xbc: /* Internal EEPROM address (low)
- Bit 0-7 - Internal EEPROM address bit 1-8
- */
+ Bit 0-7 - Internal EEPROM address bit 1-8
+ */
case 0xbd: /* Internal EEPROM address (high)
- Bit 0 - Internal EEPROM address bit 9(?)
- Bit 1-7 - Unknown
- Only 1KByte internal EEPROM??
- */
+ Bit 0 - Internal EEPROM address bit 9(?)
+ Bit 1-7 - Unknown
+ Only 1KByte internal EEPROM??
+ */
break;
case 0xbe: /* Internal EEPROM command
- Bit 0 - Read complete (read only)
- Bit 1 - Write complete (read only)
- Bit 2-3 - Unknown
- Bit 4 - Read
- Bit 5 - Write
- Bit 6 - Protect
- Bit 7 - Initialize
- */
+ Bit 0 - Read complete (read only)
+ Bit 1 - Write complete (read only)
+ Bit 2-3 - Unknown
+ Bit 4 - Read
+ Bit 5 - Write
+ Bit 6 - Protect
+ Bit 7 - Initialize
+ */
if (data & 0x20)
{
UINT16 addr = ( ( ( m_ws_portram[0xbd] << 8 ) | m_ws_portram[0xbc] ) << 1 ) & 0x1FF;
@@ -654,7 +654,7 @@ WRITE8_MEMBER( wswan_state::port_w )
logerror( "Write to unsupported port: %X - %X\n", offset, data );
break;
}
-
+
/* Update the port value */
m_ws_portram[offset] = data;
}
diff --git a/src/mess/machine/x820kb.c b/src/mess/machine/x820kb.c
index 0e89efc38f6..09ebd038dbc 100644
--- a/src/mess/machine/x820kb.c
+++ b/src/mess/machine/x820kb.c
@@ -36,10 +36,10 @@ Notes:
/*
- TODO:
+ TODO:
- - repeat
- - what are T0/T1/INT?
+ - repeat
+ - what are T0/T1/INT?
*/
@@ -307,16 +307,16 @@ WRITE8_MEMBER( xerox_820_keyboard_t::kb_p1_w )
{
/*
- bit description
+ bit description
- 0 A0
- 1 A1
- 2 A2
- 3 A3
- 4 KBSTB
- 5
- 6
- 7 ? (toggled if T1=0)
+ 0 A0
+ 1 A1
+ 2 A2
+ 3 A3
+ 4 KBSTB
+ 5
+ 6
+ 7 ? (toggled if T1=0)
*/
diff --git a/src/mess/mess.lst b/src/mess/mess.lst
index 82dc67d530f..5e3d5e10a11 100644
--- a/src/mess/mess.lst
+++ b/src/mess/mess.lst
@@ -2557,4 +2557,3 @@ minicom
gameking
leapster
leapstertv
-
diff --git a/src/mess/tools/castool/main.c b/src/mess/tools/castool/main.c
index 4038588b6b7..22564dcdf78 100644
--- a/src/mess/tools/castool/main.c
+++ b/src/mess/tools/castool/main.c
@@ -104,7 +104,7 @@ const struct SupportedCassetteFormats formats[] = {
{"sol20", sol20_cassette_formats ,"PTC SOL-20"},
{"sorcerer", sorcerer_cassette_formats ,"Exidy Sorcerer"},
{"sordm5", sordm5_cassette_formats ,"Sord M5"},
- {"spc1000", spc1000_cassette_formats ,"Samsung SPC-1000"},
+ {"spc1000", spc1000_cassette_formats ,"Samsung SPC-1000"},
{"svi", svi_cassette_formats ,"Spectravideo SVI-318 & SVI-328"},
{"to7", to7_cassette_formats ,"Thomson TO-series"},
{"trs80l2", trs80l2_cassette_formats ,"TRS-80 Level 2"},
@@ -120,7 +120,7 @@ const struct SupportedCassetteFormats formats[] = {
{"zx81_p", zx81_p_format ,"Sinclair ZX81"},
-
+
{NULL,NULL,NULL}
};
diff --git a/src/mess/video/apple2.c b/src/mess/video/apple2.c
index eb0e394c564..fbf21517aed 100644
--- a/src/mess/video/apple2.c
+++ b/src/mess/video/apple2.c
@@ -668,7 +668,7 @@ UINT32 apple2_state::screen_update_apple2(screen_device &screen, bitmap_ind16 &b
}
/*
- New implementation
+ New implementation
*/
const device_type APPLE2_VIDEO = &device_creator<a2_video_device>;
@@ -784,8 +784,8 @@ void a2_video_device::plot_text_character(bitmap_ind16 &bitmap, int xpos, int yp
{
if ((code >= 0x60) && (code <= 0x7f))
{
- code |= 0x80; // map to lowercase normal
- i = fg; // and flip the color
+ code |= 0x80; // map to lowercase normal
+ i = fg; // and flip the color
fg = bg;
bg = i;
}
@@ -1022,20 +1022,20 @@ void a2_video_device::dlores_update(screen_device &screen, bitmap_ind16 &bitmap,
{
UINT16 *vram = &bitmap.pix16(row + y, (col * 14));
- *vram++ = abits & (1 << 0) ? fg : 0;
- *vram++ = abits & (1 << 1) ? fg : 0;
- *vram++ = abits & (1 << 2) ? fg : 0;
- *vram++ = abits & (1 << 3) ? fg : 0;
- *vram++ = abits & (1 << 0) ? fg : 0;
- *vram++ = abits & (1 << 1) ? fg : 0;
- *vram++ = abits & (1 << 2) ? fg : 0;
- *vram++ = bits & (1 << 0) ? fg : 0;
- *vram++ = bits & (1 << 1) ? fg : 0;
- *vram++ = bits & (1 << 2) ? fg : 0;
- *vram++ = bits & (1 << 3) ? fg : 0;
- *vram++ = bits & (1 << 0) ? fg : 0;
- *vram++ = bits & (1 << 1) ? fg : 0;
- *vram++ = bits & (1 << 2) ? fg : 0;
+ *vram++ = abits & (1 << 0) ? fg : 0;
+ *vram++ = abits & (1 << 1) ? fg : 0;
+ *vram++ = abits & (1 << 2) ? fg : 0;
+ *vram++ = abits & (1 << 3) ? fg : 0;
+ *vram++ = abits & (1 << 0) ? fg : 0;
+ *vram++ = abits & (1 << 1) ? fg : 0;
+ *vram++ = abits & (1 << 2) ? fg : 0;
+ *vram++ = bits & (1 << 0) ? fg : 0;
+ *vram++ = bits & (1 << 1) ? fg : 0;
+ *vram++ = bits & (1 << 2) ? fg : 0;
+ *vram++ = bits & (1 << 3) ? fg : 0;
+ *vram++ = bits & (1 << 0) ? fg : 0;
+ *vram++ = bits & (1 << 1) ? fg : 0;
+ *vram++ = bits & (1 << 2) ? fg : 0;
}
bits = (code >> 4) & 0x0F;
@@ -1045,20 +1045,20 @@ void a2_video_device::dlores_update(screen_device &screen, bitmap_ind16 &bitmap,
{
UINT16 *vram = &bitmap.pix16(row + y, (col * 14));
- *vram++ = abits & (1 << 0) ? fg : 0;
- *vram++ = abits & (1 << 1) ? fg : 0;
- *vram++ = abits & (1 << 2) ? fg : 0;
- *vram++ = abits & (1 << 3) ? fg : 0;
- *vram++ = abits & (1 << 0) ? fg : 0;
- *vram++ = abits & (1 << 1) ? fg : 0;
- *vram++ = abits & (1 << 2) ? fg : 0;
- *vram++ = bits & (1 << 0) ? fg : 0;
- *vram++ = bits & (1 << 1) ? fg : 0;
- *vram++ = bits & (1 << 2) ? fg : 0;
- *vram++ = bits & (1 << 3) ? fg : 0;
- *vram++ = bits & (1 << 0) ? fg : 0;
- *vram++ = bits & (1 << 1) ? fg : 0;
- *vram++ = bits & (1 << 2) ? fg : 0;
+ *vram++ = abits & (1 << 0) ? fg : 0;
+ *vram++ = abits & (1 << 1) ? fg : 0;
+ *vram++ = abits & (1 << 2) ? fg : 0;
+ *vram++ = abits & (1 << 3) ? fg : 0;
+ *vram++ = abits & (1 << 0) ? fg : 0;
+ *vram++ = abits & (1 << 1) ? fg : 0;
+ *vram++ = abits & (1 << 2) ? fg : 0;
+ *vram++ = bits & (1 << 0) ? fg : 0;
+ *vram++ = bits & (1 << 1) ? fg : 0;
+ *vram++ = bits & (1 << 2) ? fg : 0;
+ *vram++ = bits & (1 << 3) ? fg : 0;
+ *vram++ = bits & (1 << 0) ? fg : 0;
+ *vram++ = bits & (1 << 1) ? fg : 0;
+ *vram++ = bits & (1 << 2) ? fg : 0;
}
}
}
@@ -1070,7 +1070,7 @@ void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, c
int row, col;
UINT32 start_address;
UINT32 address;
- UINT8 *aux_page = m_ram_ptr;
+ UINT8 *aux_page = m_ram_ptr;
int fg = 0;
int bg = 0;
@@ -1079,12 +1079,12 @@ void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, c
start_address = 0x400;
if (m_aux_ptr)
{
- aux_page = m_aux_ptr;
+ aux_page = m_aux_ptr;
}
}
else
{
- start_address = m_page2 ? 0x800 : 0x400;
+ start_address = m_page2 ? 0x800 : 0x400;
}
beginrow = MAX(beginrow, cliprect.min_y - (cliprect.min_y % 8));
@@ -1102,7 +1102,7 @@ void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, c
{
if (m_80col)
{
- for (col = 0; col < 40; col++)
+ for (col = 0; col < 40; col++)
{
/* calculate address */
address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col));
@@ -1115,7 +1115,7 @@ void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, c
}
else
{
- for (col = 0; col < 40; col++)
+ for (col = 0; col < 40; col++)
{
/* calculate address */
address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col));
@@ -1129,7 +1129,7 @@ void a2_video_device::text_update(screen_device &screen, bitmap_ind16 &bitmap, c
void a2_video_device::text_update_orig(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow)
{
int row, col;
- UINT32 start_address = m_page2 ? 0x800 : 0x400;
+ UINT32 start_address = m_page2 ? 0x800 : 0x400;
UINT32 address;
int fg = 0;
int bg = 0;
@@ -1147,7 +1147,7 @@ void a2_video_device::text_update_orig(screen_device &screen, bitmap_ind16 &bitm
for (row = beginrow; row <= endrow; row += 8)
{
- for (col = 0; col < 40; col++)
+ for (col = 0; col < 40; col++)
{
/* calculate address */
address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col));
@@ -1361,7 +1361,7 @@ void a2_video_device::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, c
vram = &m_ram_ptr[page];
if (m_aux_ptr)
{
- vaux = m_aux_ptr;
+ vaux = m_aux_ptr;
}
else
{
@@ -1462,5 +1462,3 @@ PALETTE_INIT_MEMBER(a2_video_device, apple2)
{
palette.set_pen_colors(0, apple2_palette, ARRAY_LENGTH(apple2_palette));
}
-
-
diff --git a/src/mess/video/apple2.h b/src/mess/video/apple2.h
index c109ccf9111..79ce9076777 100644
--- a/src/mess/video/apple2.h
+++ b/src/mess/video/apple2.h
@@ -1,7 +1,7 @@
/*********************************************************************
-
- video/apple2.h - Video handling for 8-bit Apple IIs
-
+
+ video/apple2.h - Video handling for 8-bit Apple IIs
+
*********************************************************************/
#ifndef __A2_VIDEO__
diff --git a/src/mess/video/wswan_video.c b/src/mess/video/wswan_video.c
index c4f6c72c8c5..5b52ccdab60 100644
--- a/src/mess/video/wswan_video.c
+++ b/src/mess/video/wswan_video.c
@@ -1,16 +1,16 @@
/***************************************************************************
-
+
wswan_video.c
-
+
File to handle video emulation of the Bandai WonderSwan VDP.
-
+
Anthony Kruize
Wilbert Pol
-
+
TODO:
- remove the redundant parts of m_regs
- split the Color VDP from the Mono VDP?
-
+
***************************************************************************/
#include "wswan_video.h"
@@ -32,7 +32,7 @@ void wswan_video_device::common_save()
save_item(NAME(m_palette_port));
save_item(NAME(m_pal));
save_item(NAME(m_regs));
-
+
save_item(NAME(m_layer_bg_enable));
save_item(NAME(m_layer_fg_enable));
save_item(NAME(m_sprites_enable));
@@ -79,10 +79,10 @@ void wswan_video_device::common_save()
void wswan_video_device::device_start()
{
machine().first_screen()->register_screen_bitmap(m_bitmap);
-
+
m_timer = timer_alloc(TIMER_SCANLINE);
m_timer->adjust(attotime::from_ticks(256, 3072000), 0, attotime::from_ticks(256, 3072000));
-
+
// bind callbacks
m_set_irq_cb.bind_relative_to(*owner());
m_snd_dma_cb.bind_relative_to(*owner());
@@ -166,7 +166,7 @@ void wswan_video_device::device_reset()
m_timer_vblank_mode = 0;
m_timer_vblank_reload = 0;
m_timer_vblank_count = 0; /* Vertical blank timer counter value */
-
+
memset(m_sprite_table_buffer, 0, sizeof(m_sprite_table_buffer));
memset(m_main_palette, 0, sizeof(m_main_palette));
memcpy(m_regs, vdp_regs_init, 256);
@@ -190,15 +190,15 @@ void wswan_video_device::device_timer(emu_timer &timer, device_timer_id id, int
void wswan_video_device::setup_palettes()
{
- if (m_color_mode)
+ if (m_color_mode)
{
- for (int i = 0; i < 16; i++)
- for (int j = 0; j < 16; j++)
+ for (int i = 0; i < 16; i++)
+ for (int j = 0; j < 16; j++)
m_pal[i][j] = ((m_palette_vram[(i << 5) + j * 2 + 1] << 8) | m_palette_vram[(i << 5) + j * 2]) & 0x0fff;
- }
- else
+ }
+ else
{
- for (int i = 0; i < 16; i++)
+ for (int i = 0; i < 16; i++)
{
m_pal[i][0] = (m_palette_port[(i << 1)] >> 0) & 0x07;
m_pal[i][1] = (m_palette_port[(i << 1)] >> 4) & 0x07;
@@ -212,8 +212,8 @@ void wswan_video_device::draw_background()
{
UINT16 map_addr = m_layer_bg_address + (((m_current_line + m_layer_bg_scroll_y) & 0xf8) << 3);
UINT8 start_column = (m_layer_bg_scroll_x >> 3);
-
- for (int column = 0; column < 29; column++)
+
+ for (int column = 0; column < 29; column++)
{
UINT32 plane0 = 0, plane1 = 0, plane2 = 0, plane3 = 0;
int x_offset, tile_line, tile_address;
@@ -221,34 +221,34 @@ void wswan_video_device::draw_background()
| m_vram[map_addr + (((start_column + column) & 0x1f) << 1)];
int tile_number = tile_data & 0x01ff;
int tile_palette = (tile_data >> 9) & 0x0f;
-
+
tile_line = (m_current_line + m_layer_bg_scroll_y) & 0x07;
if (tile_data & 0x8000) // vflip
tile_line = 7 - tile_line;
-
- if (m_colors_16)
+
+ if (m_colors_16)
{
tile_address = ((tile_data & 0x2000) ? 0x8000 : 0x4000) + (tile_number * 32) + (tile_line << 2);
- if (m_tile_packed)
+ if (m_tile_packed)
{
plane0 = (m_vram[tile_address + 0] << 24) | (m_vram[tile_address + 1] << 16) | (m_vram[tile_address + 2] << 8) | m_vram[tile_address + 3];
- }
- else
+ }
+ else
{
plane0 = m_vram[tile_address + 0];
plane1 = m_vram[tile_address + 1] << 1;
plane2 = m_vram[tile_address + 2] << 2;
plane3 = m_vram[tile_address + 3] << 3;
}
- }
- else
+ }
+ else
{
tile_address = 0x2000 + (tile_number * 16) + (tile_line << 1);
- if (m_tile_packed)
+ if (m_tile_packed)
{
plane0 = (m_vram[tile_address + 0] << 8) | m_vram[tile_address + 1];
- }
- else
+ }
+ else
{
plane0 = m_vram[tile_address + 0];
plane1 = m_vram[tile_address + 1] << 1;
@@ -256,24 +256,24 @@ void wswan_video_device::draw_background()
plane3 = 0;
}
}
-
- for (int x = 0; x < 8; x++)
+
+ for (int x = 0; x < 8; x++)
{
int col;
- if (m_tile_packed)
+ if (m_tile_packed)
{
- if (m_colors_16)
+ if (m_colors_16)
{
col = plane0 & 0x0f;
plane0 = plane0 >> 4;
- }
- else
+ }
+ else
{
col = plane0 & 0x03;
plane0 = plane0 >> 2;
}
- }
- else
+ }
+ else
{
col = (plane3 & 8) | (plane2 & 4) | (plane1 & 2) | (plane0 & 1);
plane3 = plane3 >> 1;
@@ -282,29 +282,29 @@ void wswan_video_device::draw_background()
plane0 = plane0 >> 1;
}
- if (tile_data & 0x4000)
+ if (tile_data & 0x4000)
x_offset = x + (column << 3) - (m_layer_bg_scroll_x & 0x07);
else
x_offset = 7 - x + (column << 3) - (m_layer_bg_scroll_x & 0x07);
- if (x_offset >= 0 && x_offset < WSWAN_X_PIXELS)
+ if (x_offset >= 0 && x_offset < WSWAN_X_PIXELS)
{
- if (m_colors_16)
+ if (m_colors_16)
{
- if (col)
+ if (col)
{
if (m_color_mode)
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
- else
+ else
{
/* Hmmmm, what should we do here... Is this correct?? */
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
}
}
- }
- else
+ }
+ else
{
- if (col || !(tile_palette & 4))
+ if (col || !(tile_palette & 4))
{
if (m_color_mode)
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
@@ -322,7 +322,7 @@ void wswan_video_device::draw_foreground_0()
UINT16 map_addr = m_layer_fg_address + (((m_current_line + m_layer_fg_scroll_y) & 0xf8) << 3);
UINT8 start_column = (m_layer_fg_scroll_x >> 3);
- for (int column = 0; column < 29; column++)
+ for (int column = 0; column < 29; column++)
{
UINT32 plane0 = 0, plane1 = 0, plane2 = 0, plane3 = 0;
int x_offset, tile_line, tile_address;
@@ -330,34 +330,34 @@ void wswan_video_device::draw_foreground_0()
| m_vram[map_addr + (((start_column + column) & 0x1f) << 1)];
int tile_number = tile_data & 0x01ff;
int tile_palette = (tile_data >> 9) & 0x0f;
-
+
tile_line = (m_current_line + m_layer_fg_scroll_y) & 0x07;
if (tile_data & 0x8000) // vflip
tile_line = 7 - tile_line;
-
- if (m_colors_16)
+
+ if (m_colors_16)
{
tile_address = ((tile_data & 0x2000) ? 0x8000 : 0x4000) + (tile_number * 32) + (tile_line << 2);
- if (m_tile_packed)
+ if (m_tile_packed)
{
plane0 = (m_vram[tile_address + 0] << 24) | (m_vram[tile_address + 1] << 16) | (m_vram[tile_address + 2] << 8) | m_vram[tile_address + 3];
- }
- else
+ }
+ else
{
plane0 = m_vram[tile_address + 0];
plane1 = m_vram[tile_address + 1] << 1;
plane2 = m_vram[tile_address + 2] << 2;
plane3 = m_vram[tile_address + 3] << 3;
}
- }
- else
+ }
+ else
{
tile_address = 0x2000 + (tile_number * 16) + (tile_line << 1);
- if (m_tile_packed)
+ if (m_tile_packed)
{
plane0 = (m_vram[tile_address + 0] << 8) | m_vram[tile_address + 1];
- }
- else
+ }
+ else
{
plane0 = m_vram[tile_address + 0];
plane1 = m_vram[tile_address + 1] << 1;
@@ -366,23 +366,23 @@ void wswan_video_device::draw_foreground_0()
}
}
- for (int x = 0; x < 8; x++ )
+ for (int x = 0; x < 8; x++ )
{
int col;
- if (m_tile_packed)
+ if (m_tile_packed)
{
- if (m_colors_16)
+ if (m_colors_16)
{
col = plane0 & 0x0f;
plane0 = plane0 >> 4;
- }
- else
+ }
+ else
{
col = plane0 & 0x03;
plane0 = plane0 >> 2;
}
- }
- else
+ }
+ else
{
col = (plane3 & 8) | (plane2 & 4) | (plane1 & 2) | (plane0 & 1);
plane3 = plane3 >> 1;
@@ -391,16 +391,16 @@ void wswan_video_device::draw_foreground_0()
plane0 = plane0 >> 1;
}
- if (tile_data & 0x4000)
+ if (tile_data & 0x4000)
x_offset = x + (column << 3) - (m_layer_fg_scroll_x & 0x07);
else
x_offset = 7 - x + (column << 3) - (m_layer_fg_scroll_x & 0x07);
- if (x_offset >= 0 && x_offset < WSWAN_X_PIXELS)
+ if (x_offset >= 0 && x_offset < WSWAN_X_PIXELS)
{
- if (m_colors_16)
+ if (m_colors_16)
{
- if (col)
+ if (col)
{
// if (m_color_mode) {
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
@@ -409,10 +409,10 @@ void wswan_video_device::draw_foreground_0()
// m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
// }
}
- }
- else
+ }
+ else
{
- if (col || !(tile_palette & 4))
+ if (col || !(tile_palette & 4))
{
if (m_color_mode)
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
@@ -429,8 +429,8 @@ void wswan_video_device::draw_foreground_2()
{
UINT16 map_addr = m_layer_fg_address + (((m_current_line + m_layer_fg_scroll_y) & 0xf8) << 3);
UINT8 start_column = (m_layer_fg_scroll_x >> 3);
-
- for (int column = 0; column < 29; column++)
+
+ for (int column = 0; column < 29; column++)
{
UINT32 plane0 = 0, plane1 = 0, plane2 = 0, plane3 = 0;
int x_offset, tile_line, tile_address;
@@ -438,35 +438,35 @@ void wswan_video_device::draw_foreground_2()
| m_vram[map_addr + (((start_column + column) & 0x1f) << 1)];
int tile_number = tile_data & 0x01ff;
int tile_palette = (tile_data >> 9) & 0x0f;
-
+
tile_line = (m_current_line + m_layer_fg_scroll_y) & 0x07;
if (tile_data & 0x8000) // vflip
tile_line = 7 - tile_line;
-
- if (m_colors_16)
+
+ if (m_colors_16)
{
tile_address = ((tile_data & 0x2000) ? 0x8000 : 0x4000) + (tile_number * 32) + (tile_line << 2);
- if (m_tile_packed)
+ if (m_tile_packed)
{
plane0 = (m_vram[tile_address + 0] << 24) | (m_vram[tile_address + 1] << 16) | (m_vram[tile_address + 2] << 8) | m_vram[tile_address + 3];
- }
- else
+ }
+ else
{
plane0 = m_vram[tile_address + 0];
plane1 = m_vram[tile_address + 1] << 1;
plane2 = m_vram[tile_address + 2] << 2;
plane3 = m_vram[tile_address + 3] << 3;
}
- }
- else
+ }
+ else
{
tile_address = 0x2000 + (tile_number * 16) + (tile_line << 1);
- if (m_tile_packed)
+ if (m_tile_packed)
{
plane0 = (m_vram[tile_address + 0] << 8) | m_vram[tile_address + 1];
- }
- else
+ }
+ else
{
plane0 = m_vram[tile_address + 0];
plane1 = m_vram[tile_address + 1] << 1;
@@ -475,23 +475,23 @@ void wswan_video_device::draw_foreground_2()
}
}
- for (int x = 0; x < 8; x++)
+ for (int x = 0; x < 8; x++)
{
int col;
- if (m_tile_packed)
+ if (m_tile_packed)
{
- if (m_colors_16)
+ if (m_colors_16)
{
col = plane0 & 0x0f;
plane0 = plane0 >> 4;
- }
- else
+ }
+ else
{
col = plane0 & 0x03;
plane0 = plane0 >> 2;
}
- }
- else
+ }
+ else
{
col = (plane3 & 8) | (plane2 & 4) | (plane1 & 2) | (plane0 & 1);
plane3 = plane3 >> 1;
@@ -500,16 +500,16 @@ void wswan_video_device::draw_foreground_2()
plane0 = plane0 >> 1;
}
- if (tile_data & 0x4000)
+ if (tile_data & 0x4000)
x_offset = x + (column << 3) - (m_layer_fg_scroll_x & 0x07);
else
x_offset = 7 - x + (column << 3) - (m_layer_fg_scroll_x & 0x07);
- if (x_offset >= 0 && x_offset >= m_window_fg_left && x_offset < m_window_fg_right && x_offset < WSWAN_X_PIXELS)
+ if (x_offset >= 0 && x_offset >= m_window_fg_left && x_offset < m_window_fg_right && x_offset < WSWAN_X_PIXELS)
{
- if (m_colors_16)
+ if (m_colors_16)
{
- if (col)
+ if (col)
{
if (m_color_mode)
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
@@ -517,10 +517,10 @@ void wswan_video_device::draw_foreground_2()
/* Hmmmm, what should we do here... Is this correct?? */
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
}
- }
- else
+ }
+ else
{
- if (col || !(tile_palette & 4))
+ if (col || !(tile_palette & 4))
{
if (m_color_mode)
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
@@ -537,8 +537,8 @@ void wswan_video_device::draw_foreground_3()
{
UINT16 map_addr = m_layer_fg_address + (((m_current_line + m_layer_fg_scroll_y) & 0xf8) << 3);
UINT8 start_column = (m_layer_fg_scroll_x >> 3);
-
- for (int column = 0; column < 29; column++)
+
+ for (int column = 0; column < 29; column++)
{
UINT32 plane0 = 0, plane1 = 0, plane2 = 0, plane3 = 0;
int x_offset, tile_line, tile_address;
@@ -550,30 +550,30 @@ void wswan_video_device::draw_foreground_3()
tile_line = (m_current_line + m_layer_fg_scroll_y) & 0x07;
if (tile_data & 0x8000) // vflip
tile_line = 7 - tile_line;
-
- if (m_colors_16)
+
+ if (m_colors_16)
{
tile_address = ((tile_data & 0x2000) ? 0x8000 : 0x4000) + (tile_number * 32) + (tile_line << 2);
- if (m_tile_packed)
+ if (m_tile_packed)
{
plane0 = (m_vram[tile_address + 0] << 24) | (m_vram[tile_address + 1] << 16) | (m_vram[tile_address + 2] << 8) | m_vram[tile_address + 3];
- }
- else
+ }
+ else
{
plane0 = m_vram[tile_address + 0];
plane1 = m_vram[tile_address + 1] << 1;
plane2 = m_vram[tile_address + 2] << 2;
plane3 = m_vram[tile_address + 3] << 3;
}
- }
- else
+ }
+ else
{
tile_address = 0x2000 + (tile_number * 16) + (tile_line << 1);
- if (m_tile_packed)
+ if (m_tile_packed)
{
plane0 = (m_vram[tile_address + 0] << 8) | m_vram[tile_address + 1];
- }
- else
+ }
+ else
{
plane0 = m_vram[tile_address + 0];
plane1 = m_vram[tile_address + 1] << 1;
@@ -582,23 +582,23 @@ void wswan_video_device::draw_foreground_3()
}
}
- for (int x = 0; x < 8; x++)
+ for (int x = 0; x < 8; x++)
{
int col;
- if (m_tile_packed)
+ if (m_tile_packed)
{
- if (m_colors_16)
+ if (m_colors_16)
{
col = plane0 & 0x0f;
plane0 = plane0 >> 4;
- }
- else
+ }
+ else
{
col = plane0 & 0x03;
plane0 = plane0 >> 2;
}
- }
- else
+ }
+ else
{
col = (plane3 & 8) | (plane2 & 4) | (plane1 & 2) | (plane0 & 1);
plane3 = plane3 >> 1;
@@ -607,16 +607,16 @@ void wswan_video_device::draw_foreground_3()
plane0 = plane0 >> 1;
}
- if (tile_data & 0x4000)
+ if (tile_data & 0x4000)
x_offset = x + (column << 3) - (m_layer_fg_scroll_x & 0x07);
else
x_offset = 7 - x + (column << 3) - (m_layer_fg_scroll_x & 0x07);
- if ((x_offset >= 0 && x_offset < m_window_fg_left) || (x_offset >= m_window_fg_right && x_offset < WSWAN_X_PIXELS))
+ if ((x_offset >= 0 && x_offset < m_window_fg_left) || (x_offset >= m_window_fg_right && x_offset < WSWAN_X_PIXELS))
{
- if (m_colors_16)
+ if (m_colors_16)
{
- if (col)
+ if (col)
{
if (m_color_mode)
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
@@ -624,10 +624,10 @@ void wswan_video_device::draw_foreground_3()
/* Hmmmm, what should we do here... Is this correct?? */
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
}
- }
- else
+ }
+ else
{
- if (col || !(tile_palette & 4))
+ if (col || !(tile_palette & 4))
{
if (m_color_mode)
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
@@ -645,14 +645,14 @@ void wswan_video_device::handle_sprites(int mask)
if (m_sprite_count == 0)
return;
- for (int i = m_sprite_first + m_sprite_count - 1; i >= m_sprite_first; i--)
+ for (int i = m_sprite_first + m_sprite_count - 1; i >= m_sprite_first; i--)
{
UINT16 tile_data = (m_sprite_table_buffer[i * 4 + 1] << 8) | m_sprite_table_buffer[i * 4];
UINT8 y = m_sprite_table_buffer[ i * 4 + 2 ];
UINT8 x = m_sprite_table_buffer[ i * 4 + 3 ];
int tile_line = (m_current_line - y) & 0xff;
- if ((tile_line >= 0) && (tile_line < 8) && ((tile_data & 0x2000) == mask))
+ if ((tile_line >= 0) && (tile_line < 8) && ((tile_data & 0x2000) == mask))
{
UINT32 plane0 = 0, plane1 = 0, plane2 = 0, plane3 = 0;
int x_offset, tile_address;
@@ -662,30 +662,30 @@ void wswan_video_device::handle_sprites(int mask)
if (tile_data & 0x8000)
tile_line = 7 - tile_line;
-
- if (m_colors_16)
+
+ if (m_colors_16)
{
tile_address = 0x4000 + (tile_number * 32) + (tile_line << 2);
- if (m_tile_packed)
+ if (m_tile_packed)
{
plane0 = (m_vram[tile_address + 0] << 24) | (m_vram[tile_address + 1] << 16) | (m_vram[tile_address + 2] << 8) | m_vram[tile_address + 3];
- }
- else
+ }
+ else
{
plane0 = m_vram[tile_address + 0];
plane1 = m_vram[tile_address + 1] << 1;
plane2 = m_vram[tile_address + 2] << 2;
plane3 = m_vram[tile_address + 3] << 3;
}
- }
- else
+ }
+ else
{
tile_address = 0x2000 + (tile_number * 16) + (tile_line << 1);
- if (m_tile_packed)
+ if (m_tile_packed)
{
plane0 = (m_vram[tile_address + 0] << 8) | m_vram[tile_address + 1];
- }
- else
+ }
+ else
{
plane0 = m_vram[tile_address + 0];
plane1 = m_vram[tile_address + 1] << 1;
@@ -693,38 +693,38 @@ void wswan_video_device::handle_sprites(int mask)
plane3 = 0;
}
}
-
- if (m_window_sprites_enable)
+
+ if (m_window_sprites_enable)
{
- if (tile_data & 0x1000)
+ if (tile_data & 0x1000)
{
if (m_current_line >= m_window_sprites_top && m_current_line <= m_window_sprites_bottom)
check_clip = 1;
- }
- else
+ }
+ else
{
if (m_current_line < m_window_sprites_top || m_current_line > m_window_sprites_bottom)
continue;
}
}
-
- for (int j = 0; j < 8; j++)
+
+ for (int j = 0; j < 8; j++)
{
int col;
- if (m_tile_packed)
+ if (m_tile_packed)
{
- if (m_colors_16)
+ if (m_colors_16)
{
col = plane0 & 0x0f;
plane0 = plane0 >> 4;
- }
- else
+ }
+ else
{
col = plane0 & 0x03;
plane0 = plane0 >> 2;
}
- }
- else
+ }
+ else
{
col = (plane3 & 8) | (plane2 & 4) | (plane1 & 2) | (plane0 & 1);
plane3 = plane3 >> 1;
@@ -740,26 +740,26 @@ void wswan_video_device::handle_sprites(int mask)
x_offset = x_offset & 0xff;
- if (m_window_sprites_enable)
+ if (m_window_sprites_enable)
{
- if (tile_data & 0x1000 && check_clip)
+ if (tile_data & 0x1000 && check_clip)
{
if (x_offset >= m_window_sprites_left && x_offset <= m_window_sprites_right)
continue;
- }
- else
+ }
+ else
{
- if (x_offset < m_window_sprites_left || x_offset > m_window_sprites_right)
+ if (x_offset < m_window_sprites_left || x_offset > m_window_sprites_right)
{
// continue;
}
}
}
- if (x_offset >= 0 && x_offset < WSWAN_X_PIXELS)
+ if (x_offset >= 0 && x_offset < WSWAN_X_PIXELS)
{
- if (m_colors_16)
+ if (m_colors_16)
{
- if (col)
+ if (col)
{
if (m_color_mode)
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
@@ -767,10 +767,10 @@ void wswan_video_device::handle_sprites(int mask)
/* Hmmmm, what should we do here... Is this correct?? */
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
}
- }
- else
+ }
+ else
{
- if (col || !(tile_palette & 4))
+ if (col || !(tile_palette & 4))
{
if (m_color_mode)
m_bitmap.pix16(m_current_line, x_offset) = m_pal[tile_palette][col];
@@ -788,9 +788,9 @@ void wswan_video_device::handle_sprites(int mask)
void wswan_video_device::refresh_scanline()
{
setup_palettes();
-
+
rectangle rec(0, WSWAN_X_PIXELS, m_current_line, m_current_line);
- if (m_lcd_control)
+ if (m_lcd_control)
{
/* Not sure if these background color checks and settings are correct */
if (m_color_mode && m_colors_16)
@@ -798,24 +798,24 @@ void wswan_video_device::refresh_scanline()
else
m_bitmap.fill(m_main_palette[m_bg_control & 0x07], rec);
}
- else
+ else
{
m_bitmap.fill(0, rec);
return;
}
-
+
// Draw background layer
if (m_layer_bg_enable)
draw_background();
-
+
// Draw sprites between background and foreground layers
if (m_sprites_enable)
handle_sprites(0);
-
+
// Draw foreground layer, taking window settings into account
- if (m_layer_fg_enable)
+ if (m_layer_fg_enable)
{
- switch (m_window_fg_mode)
+ switch (m_window_fg_mode)
{
case 0: // FG inside & outside window area
draw_foreground_0();
@@ -835,7 +835,7 @@ void wswan_video_device::refresh_scanline()
break;
}
}
-
+
// Draw sprites in front of foreground layer
if (m_sprites_enable)
handle_sprites(0x2000);
@@ -881,7 +881,7 @@ READ8_MEMBER(wswan_video_device::reg_r)
value = m_timer_vblank_count >> 8;
break;
}
-
+
return value;
}
@@ -900,7 +900,7 @@ WRITE8_MEMBER(wswan_video_device::reg_w)
m_palette_port[offset & 0x1f] = data;
return;
}
-
+
switch (offset)
{
case 0x00: // Display control
@@ -1140,7 +1140,7 @@ void wswan_video_device::scanline_interrupt()
{
if (m_current_line < 144)
refresh_scanline();
-
+
// Decrement 12kHz (HBlank) counter
if (m_timer_hblank_enable && m_timer_hblank_reload != 0)
{
@@ -1152,24 +1152,24 @@ void wswan_video_device::scanline_interrupt()
m_timer_hblank_count = m_timer_hblank_reload;
else
m_timer_hblank_reload = 0;
-
+
logerror( "trigerring hbltmr interrupt\n" );
m_set_irq_cb(WSWAN_VIDEO_IFLAG_HBLTMR);
}
}
-
+
// Handle Sound DMA
m_snd_dma_cb();
-
+
// m_current_line = (m_current_line + 1) % 159;
-
+
if (m_current_line == 144) // buffer sprite table
{
memcpy(m_sprite_table_buffer, &m_vram[m_sprite_table_address], 512);
m_sprite_first = m_sprite_first_latch; // always zero?
m_sprite_count = m_sprite_count_latch;
}
-
+
if (m_current_line == 144)
{
m_set_irq_cb(WSWAN_VIDEO_IFLAG_VBL);
@@ -1184,18 +1184,18 @@ void wswan_video_device::scanline_interrupt()
m_timer_vblank_count = m_timer_vblank_reload;
else
m_timer_vblank_reload = 0;
-
+
logerror("triggering vbltmr interrupt\n");
m_set_irq_cb(WSWAN_VIDEO_IFLAG_VBLTMR);
}
}
}
-
+
// m_current_line = (m_current_line + 1) % 159;
-
+
if (m_current_line == m_line_compare)
m_set_irq_cb(WSWAN_VIDEO_IFLAG_LCMP);
-
+
m_current_line = (m_current_line + 1) % 159;
}
diff --git a/src/mess/video/wswan_video.h b/src/mess/video/wswan_video.h
index 0ac0914f06a..132f8c2fb54 100644
--- a/src/mess/video/wswan_video.h
+++ b/src/mess/video/wswan_video.h
@@ -1,9 +1,9 @@
/**********************************************************************
wswan.h
-
+
File to handle video emulation of the Bandai WonderSwan.
-
+
Anthony Kruize
Wilbert Pol
@@ -74,7 +74,7 @@ protected:
void refresh_scanline();
void scanline_interrupt();
void common_save();
-
+
bitmap_ind16 m_bitmap;
UINT8 m_layer_bg_enable; /* Background layer on/off */
UINT8 m_layer_fg_enable; /* Foreground layer on/off */
diff --git a/src/osd/modules/debugger/qt/debugqtdasmwindow.c b/src/osd/modules/debugger/qt/debugqtdasmwindow.c
index 150699e41bf..ca9a5045d69 100644
--- a/src/osd/modules/debugger/qt/debugqtdasmwindow.c
+++ b/src/osd/modules/debugger/qt/debugqtdasmwindow.c
@@ -38,8 +38,8 @@ DasmWindow::DasmWindow(running_machine* machine, QWidget* parent) :
// The main disasm window
m_dasmView = new DebuggerView(DVT_DISASSEMBLY,
- m_machine,
- this);
+ m_machine,
+ this);
// Force a recompute of the disassembly region
downcast<debug_view_disasm*>(m_dasmView->view())->set_expression("curpc");
@@ -136,8 +136,8 @@ void DasmWindow::toggleBreakpointAtCursor(bool changedTo)
// Find an existing breakpoint at this address
INT32 bpindex = -1;
for (device_debug::breakpoint* bp = cpuinfo->breakpoint_first();
- bp != NULL;
- bp = bp->next())
+ bp != NULL;
+ bp = bp->next())
{
if (address == bp->address())
{
diff --git a/src/osd/modules/debugger/qt/debugqtlogwindow.c b/src/osd/modules/debugger/qt/debugqtlogwindow.c
index fffd6f1ba0c..d9bc1e12b51 100644
--- a/src/osd/modules/debugger/qt/debugqtlogwindow.c
+++ b/src/osd/modules/debugger/qt/debugqtlogwindow.c
@@ -25,8 +25,8 @@ LogWindow::LogWindow(running_machine* machine, QWidget* parent) :
// The main log view
m_logView = new DebuggerView(DVT_LOG,
- m_machine,
- this);
+ m_machine,
+ this);
// Layout
QVBoxLayout* vLayout = new QVBoxLayout(mainWindowFrame);
diff --git a/src/osd/modules/debugger/qt/debugqtmainwindow.c b/src/osd/modules/debugger/qt/debugqtmainwindow.c
index e997ce02fb4..4a5b9594636 100644
--- a/src/osd/modules/debugger/qt/debugqtmainwindow.c
+++ b/src/osd/modules/debugger/qt/debugqtmainwindow.c
@@ -27,8 +27,8 @@ MainWindow::MainWindow(running_machine* machine, QWidget* parent) :
// The log view
m_consoleView = new DebuggerView(DVT_CONSOLE,
- m_machine,
- mainWindowFrame);
+ m_machine,
+ mainWindowFrame);
m_consoleView->setFocusPolicy(Qt::NoFocus);
m_consoleView->setPreferBottom(true);
@@ -211,8 +211,8 @@ void MainWindow::toggleBreakpointAtCursor(bool changedTo)
// Find an existing breakpoint at this address
INT32 bpindex = -1;
for (device_debug::breakpoint* bp = cpuinfo->breakpoint_first();
- bp != NULL;
- bp = bp->next())
+ bp != NULL;
+ bp = bp->next())
{
if (address == bp->address())
{
@@ -287,8 +287,8 @@ void MainWindow::executeCommand(bool withClear)
// Send along the command
debug_console_execute_command(*m_machine,
- command.toLocal8Bit().data(),
- true);
+ command.toLocal8Bit().data(),
+ true);
// Add history & set the index to be the top of the stack
addToHistory(command);
diff --git a/src/osd/modules/debugger/qt/debugqtmainwindow.h b/src/osd/modules/debugger/qt/debugqtmainwindow.h
index 828dc362919..864f1c0f662 100644
--- a/src/osd/modules/debugger/qt/debugqtmainwindow.h
+++ b/src/osd/modules/debugger/qt/debugqtmainwindow.h
@@ -78,8 +78,8 @@ public:
m_machine(machine)
{
m_dasmView = new DebuggerView(DVT_DISASSEMBLY,
- m_machine,
- this);
+ m_machine,
+ this);
// Force a recompute of the disassembly region
downcast<debug_view_disasm*>(m_dasmView->view())->set_expression("curpc");
@@ -130,8 +130,8 @@ public:
m_machine(machine)
{
m_processorView = new DebuggerView(DVT_STATE,
- m_machine,
- this);
+ m_machine,
+ this);
m_processorView->setFocusPolicy(Qt::NoFocus);
QVBoxLayout* cvLayout = new QVBoxLayout(this);
diff --git a/src/osd/modules/debugger/qt/debugqtmemorywindow.c b/src/osd/modules/debugger/qt/debugqtmemorywindow.c
index 19d107617e9..979f324801d 100644
--- a/src/osd/modules/debugger/qt/debugqtmemorywindow.c
+++ b/src/osd/modules/debugger/qt/debugqtmemorywindow.c
@@ -234,8 +234,8 @@ void MemoryWindow::populateComboBox()
m_memoryComboBox->clear();
for (const debug_view_source* source = m_memTable->view()->first_source();
- source != NULL;
- source = source->next())
+ source != NULL;
+ source = source->next())
{
m_memoryComboBox->addItem(source->name());
}
@@ -300,12 +300,12 @@ void DebuggerMemView::mousePressEvent(QMouseEvent* event)
address_space* addressSpace = source->space();
const int nativeDataWidth = addressSpace->data_width() / 8;
const UINT64 memValue = debug_read_memory(*addressSpace,
- addressSpace->address_to_byte(address),
- nativeDataWidth,
- true);
+ addressSpace->address_to_byte(address),
+ nativeDataWidth,
+ true);
const offs_t pc = source->device()->debug()->track_mem_pc_from_space_address_data(addressSpace->spacenum(),
- address,
- memValue);
+ address,
+ memValue);
if (pc != (offs_t)(-1))
{
// TODO: You can specify a box that the tooltip stays alive within - might be good?
diff --git a/src/osd/modules/debugger/qt/debugqtview.c b/src/osd/modules/debugger/qt/debugqtview.c
index a26275f40ec..34146860f61 100644
--- a/src/osd/modules/debugger/qt/debugqtview.c
+++ b/src/osd/modules/debugger/qt/debugqtview.c
@@ -3,8 +3,8 @@
#include "debugqtview.h"
DebuggerView::DebuggerView(const debug_view_type& type,
- running_machine* machine,
- QWidget* parent) :
+ running_machine* machine,
+ QWidget* parent) :
QAbstractScrollArea(parent),
m_preferBottom(false),
m_view(NULL),
@@ -122,8 +122,8 @@ void DebuggerView::paintEvent(QPaintEvent* event)
if(textAttr & DCA_DISABLED)
{
fgColor.setRgb((fgColor.red() + bgColor.red()) >> 1,
- (fgColor.green() + bgColor.green()) >> 1,
- (fgColor.blue() + bgColor.blue()) >> 1);
+ (fgColor.green() + bgColor.green()) >> 1,
+ (fgColor.blue() + bgColor.blue()) >> 1);
}
if(textAttr & DCA_COMMENT)
{
@@ -141,8 +141,8 @@ void DebuggerView::paintEvent(QPaintEvent* event)
// There is a touchy interplay between font height, drawing difference, visible position, etc
// Fonts don't get drawn "down and to the left" like boxes, so some wiggling is needed.
painter.drawText(x*fontWidth,
- (y*fontHeight + (fontHeight*0.80)),
- QString(m_view->viewdata()[viewDataOffset].byte));
+ (y*fontHeight + (fontHeight*0.80)),
+ QString(m_view->viewdata()[viewDataOffset].byte));
viewDataOffset++;
}
}
@@ -254,7 +254,7 @@ void DebuggerView::paintEvent(QPaintEvent* event)
break;
text.append(QChar(viewdata[viewDataOffset + width].byte));
}
-
+
// Your characters are not guaranteed to take up the entire length x fontWidth x fontHeight, so fill before.
painter.fillRect(x*fontWidth, y*fontHeight, width*fontWidth, fontHeight, bgBrush);
diff --git a/src/osd/modules/debugger/qt/debugqtview.h b/src/osd/modules/debugger/qt/debugqtview.h
index fd78760d169..16ce1f48fbd 100644
--- a/src/osd/modules/debugger/qt/debugqtview.h
+++ b/src/osd/modules/debugger/qt/debugqtview.h
@@ -12,8 +12,8 @@ class DebuggerView : public QAbstractScrollArea
public:
DebuggerView(const debug_view_type& type,
- running_machine* machine,
- QWidget* parent=NULL);
+ running_machine* machine,
+ QWidget* parent=NULL);
virtual ~DebuggerView();
void paintEvent(QPaintEvent* event);
diff --git a/src/osd/osdnet.c b/src/osd/osdnet.c
index 2af841c0c2b..b727e6b676f 100644
--- a/src/osd/osdnet.c
+++ b/src/osd/osdnet.c
@@ -119,13 +119,12 @@ void osd_list_network_adapters(void)
printf("Available network adapters:\n");
const netdev_entry_t *entry = netdev_first();
- while(entry) {
- printf(" %s\n", entry->description);
+ while(entry) {
+ printf(" %s\n", entry->description);
entry = entry->m_next;
}
-
+
#else
printf("Network is not supported in this build\n");
#endif
}
-
diff --git a/src/version.c b/src/version.c
index 89d24016165..d3c690a7f3f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -9,4 +9,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.155 (" __DATE__")";
+const char build_version[] = "0.156 (" __DATE__")";