summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-06-24 07:36:50 +0200
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2015-06-24 07:36:50 +0200
commitd1583b9850d9fb45470648a515eb734e05fd926f (patch)
tree33a4d9934bd2ff6c41526abe0ba06c1d1ea73eb6
parent03a5bfa56fa4af400f6b9fb07a5e1333aa8fa52f (diff)
Cleanups and version bumpmame0163
-rw-r--r--src/emu/bus/apricot/expansion.h66
-rw-r--r--src/emu/bus/cpc/hd20.c11
-rw-r--r--src/emu/bus/cpc/hd20.h14
-rw-r--r--src/emu/bus/isa/hdc.c12
-rw-r--r--src/emu/cheat.c4
-rw-r--r--src/emu/cpu/hmcs40/hmcs40.c6
-rw-r--r--src/emu/cpu/hphybrid/hphybrid.c1586
-rw-r--r--src/emu/cpu/hphybrid/hphybrid.h128
-rw-r--r--src/emu/cpu/hphybrid/hphybrid_dasm.c404
-rw-r--r--src/emu/cpu/i86/i86.c4
-rw-r--r--src/emu/cpu/melps4/m58846.c6
-rw-r--r--src/emu/cpu/melps4/m58846.h2
-rw-r--r--src/emu/cpu/melps4/melps4.c24
-rw-r--r--src/emu/cpu/melps4/melps4.h4
-rw-r--r--src/emu/cpu/melps4/melps4op.inc6
-rw-r--r--src/emu/cpu/mn10200/mn10200.c1
-rw-r--r--src/emu/info.c20
-rw-r--r--src/emu/machine/6532riot.c2
-rw-r--r--src/emu/machine/6532riot.h2
-rw-r--r--src/emu/machine/netlist.h2
-rw-r--r--src/emu/machine/tms1024.c8
-rw-r--r--src/emu/machine/tms1024.h2
-rw-r--r--src/emu/netlist/devices/net_lib.c2
-rw-r--r--src/emu/netlist/devices/nld_system.h2
-rw-r--r--src/emu/netlist/devices/nld_truthtable.c6
-rw-r--r--src/emu/netlist/nl_base.c1
-rw-r--r--src/emu/netlist/nl_base.h9
-rw-r--r--src/emu/netlist/nl_config.h46
-rw-r--r--src/emu/netlist/nl_factory.c1
-rw-r--r--src/emu/netlist/nl_factory.h1
-rw-r--r--src/emu/netlist/nl_lists.h1
-rw-r--r--src/emu/netlist/nl_parser.h1
-rw-r--r--src/emu/netlist/nl_setup.c1
-rw-r--r--src/emu/netlist/nl_setup.h8
-rw-r--r--src/emu/netlist/nl_time.h1
-rw-r--r--src/emu/netlist/plib/pconfig.h4
-rw-r--r--src/emu/netlist/plib/plists.h17
-rw-r--r--src/emu/netlist/solver/mat_cr.h10
-rw-r--r--src/emu/netlist/solver/nld_ms_direct.h6
-rw-r--r--src/emu/netlist/solver/nld_ms_gmres.h26
-rw-r--r--src/emu/netlist/solver/nld_ms_sor_mat.h2
-rw-r--r--src/emu/netlist/solver/vector_base.h1
-rw-r--r--src/emu/netlist/tools/nl_convert.c24
-rw-r--r--src/emu/netlist/tools/nl_convert.h1
-rw-r--r--src/emu/softlist.c14
-rw-r--r--src/emu/sound/c352.c2
-rw-r--r--src/emu/sound/c352.h6
-rw-r--r--src/emu/sound/n63701x.c2
-rw-r--r--src/emu/sound/st0016.c2
-rw-r--r--src/emu/sound/tms5110r.inc92
-rw-r--r--src/emu/sound/x1_010.c2
-rw-r--r--src/emu/video/clgd542x.c4
-rw-r--r--src/emu/video/rgbsse.h10
-rw-r--r--src/emu/video/rgbvmx.h26
-rw-r--r--src/emu/video/vooddefs.h14
-rw-r--r--src/lib/formats/flopimg.c2
-rw-r--r--src/lib/formats/jvc_dsk.c2
-rw-r--r--src/lib/formats/svi_dsk.c3
-rw-r--r--src/lib/formats/trs80_dsk.c4
-rw-r--r--src/lib/formats/vdk_dsk.c2
-rw-r--r--src/lib/formats/wd177x_dsk.c1
-rw-r--r--src/lib/util/avhuff.c250
-rw-r--r--src/lib/util/aviio.c898
-rw-r--r--src/lib/util/bitmap.c156
-rw-r--r--src/lib/util/cdrom.c368
-rw-r--r--src/lib/util/chd.c966
-rw-r--r--src/lib/util/chdcd.c150
-rw-r--r--src/lib/util/chdcodec.c160
-rw-r--r--src/lib/util/corealloc.c10
-rw-r--r--src/lib/util/corefile.c16
-rw-r--r--src/lib/util/corestr.c20
-rw-r--r--src/lib/util/coreutil.c18
-rw-r--r--src/lib/util/cstrpool.c20
-rw-r--r--src/lib/util/delegate.c14
-rw-r--r--src/lib/util/delegate.h3
-rw-r--r--src/lib/util/flac.c14
-rw-r--r--src/lib/util/harddisk.c32
-rw-r--r--src/lib/util/hashing.c24
-rw-r--r--src/lib/util/huffman.c18
-rw-r--r--src/lib/util/jedparse.c12
-rw-r--r--src/lib/util/md5.c8
-rw-r--r--src/lib/util/opresolv.c18
-rw-r--r--src/lib/util/options.c30
-rw-r--r--src/lib/util/palette.c12
-rw-r--r--src/lib/util/plaparse.c12
-rw-r--r--src/lib/util/png.c36
-rw-r--r--src/lib/util/pool.c6
-rw-r--r--src/lib/util/sha1.c48
-rw-r--r--src/lib/util/tagmap.c4
-rw-r--r--src/lib/util/un7z.c6
-rw-r--r--src/lib/util/unicode.c16
-rw-r--r--src/lib/util/unzip.c130
-rw-r--r--src/lib/util/vbiparse.c34
-rw-r--r--src/lib/util/xmlfile.c158
-rw-r--r--src/lib/util/zippath.c232
-rw-r--r--src/mame/arcade.lst6
-rw-r--r--src/mame/audio/irem.c4
-rw-r--r--src/mame/audio/nl_kidniki.c86
-rw-r--r--src/mame/drivers/aleisttl.c2
-rw-r--r--src/mame/drivers/bionicc.c26
-rw-r--r--src/mame/drivers/cclimber.c4
-rw-r--r--src/mame/drivers/chsuper.c32
-rw-r--r--src/mame/drivers/darkseal.c2
-rw-r--r--src/mame/drivers/expro02.c44
-rw-r--r--src/mame/drivers/gaplus.c2
-rw-r--r--src/mame/drivers/goldstar.c2
-rw-r--r--src/mame/drivers/gradius3.c82
-rw-r--r--src/mame/drivers/grchamp.c2
-rw-r--r--src/mame/drivers/jankenmn.c4
-rw-r--r--src/mame/drivers/liberate.c4
-rw-r--r--src/mame/drivers/megasys1.c42
-rw-r--r--src/mame/drivers/model1.c8
-rw-r--r--src/mame/drivers/model3.c8
-rw-r--r--src/mame/drivers/namcos86.c2
-rw-r--r--src/mame/drivers/paradise.c72
-rw-r--r--src/mame/drivers/peplus.c4
-rw-r--r--src/mame/drivers/royalmah.c6
-rw-r--r--src/mame/drivers/segam1.c4
-rw-r--r--src/mame/drivers/segas32.c53
-rw-r--r--src/mame/drivers/seta.c58
-rw-r--r--src/mame/drivers/sidearms.c122
-rw-r--r--src/mame/drivers/slapshot.c2
-rw-r--r--src/mame/drivers/spacefb.c4
-rw-r--r--src/mame/drivers/sprcros2.c2
-rw-r--r--src/mame/drivers/srmp5.c2
-rw-r--r--src/mame/drivers/suna8.c2
-rw-r--r--src/mame/drivers/vamphalf.c4
-rw-r--r--src/mame/etc/doxy_driver.h9
-rw-r--r--src/mame/includes/cclimber.h2
-rw-r--r--src/mame/includes/gaplus.h2
-rw-r--r--src/mame/includes/ladybug.h2
-rw-r--r--src/mame/includes/namcos86.h2
-rw-r--r--src/mame/includes/nbmj8991.h2
-rw-r--r--src/mame/includes/segas32.h5
-rw-r--r--src/mame/includes/slapshot.h2
-rw-r--r--src/mame/includes/spacefb.h4
-rw-r--r--src/mame/includes/vastar.h2
-rw-r--r--src/mame/layout/chsuper.lay4
-rw-r--r--src/mame/machine/m1comm.c36
-rw-r--r--src/mame/machine/m1comm.h22
-rw-r--r--src/mame/nl.lst1
-rw-r--r--src/mame/video/gaplus.c4
-rw-r--r--src/mame/video/model3.c144
-rw-r--r--src/mame/video/n64.h12
-rw-r--r--src/mame/video/n64types.h12
-rw-r--r--src/mame/video/namcos86.c2
-rw-r--r--src/mame/video/nbmj8991.c8
-rw-r--r--src/mame/video/rdpfiltr.inc2
-rw-r--r--src/mame/video/rdptpipe.c4
-rw-r--r--src/mame/video/rdptpipe.h76
-rw-r--r--src/mame/video/segas32.c8
-rw-r--r--src/mame/video/snk68.c4
-rw-r--r--src/mame/video/spacefb.c2
-rw-r--r--src/mess/drivers/bbc.c2
-rw-r--r--src/mess/drivers/crvision.c2
-rw-r--r--src/mess/drivers/hh_tms1k.c10
-rw-r--r--src/mess/drivers/hp64k.c692
-rw-r--r--src/mess/drivers/i7000.c66
-rw-r--r--src/mess/drivers/rc759.c38
-rw-r--r--src/mess/drivers/xerox820.c8
-rw-r--r--src/mess/machine/apricotkb_hle.c4
-rw-r--r--src/mess/machine/ti99/990_dk.h4
-rw-r--r--src/version.c2
163 files changed, 4223 insertions, 4247 deletions
diff --git a/src/emu/bus/apricot/expansion.h b/src/emu/bus/apricot/expansion.h
index 91b3e8e31c8..38687db4399 100644
--- a/src/emu/bus/apricot/expansion.h
+++ b/src/emu/bus/apricot/expansion.h
@@ -2,42 +2,42 @@
// copyright-holders:Dirk Best
/***************************************************************************
- ACT Apricot Expansion Slot
+ ACT Apricot Expansion Slot
A B
- -12V 32 +12V
- +5V 31 +5V
- DB0 30 DB1
- DB2 29 DB3
- DB4 28 DB5
- DB6 27 DB7
- AB10 26 AB9
- AB11 25 AB12
- /AMWC 24 /MRDC
- /DMA2 23 DT/R
- /DMA1 22 /IORC
- /MWTC 21 /RES
- /IOWC 20 /AIOWC
- GND 19 GND
- /CLK5 18 DEN
- /IRDY 17 /MRDY
- /EXT1 16 /EXT2
- /INT3 15 /ALE
- AB6 14 /INT2
- AB8 13 AB7
- DB9 12 DB8
- DB11 11 DB10
- DB13 10 DB12
- DB15 9 DB14
- AB2 8 AB1
- AB4 7 AB3
- AB0 6 AB5
- AB14 5 AB13
- AB15 4 AB16
- AB17 3 AB18
- AB19 2 /BHE
- NMI 1 CLK15
+ -12V 32 +12V
+ +5V 31 +5V
+ DB0 30 DB1
+ DB2 29 DB3
+ DB4 28 DB5
+ DB6 27 DB7
+ AB10 26 AB9
+ AB11 25 AB12
+ /AMWC 24 /MRDC
+ /DMA2 23 DT/R
+ /DMA1 22 /IORC
+ /MWTC 21 /RES
+ /IOWC 20 /AIOWC
+ GND 19 GND
+ /CLK5 18 DEN
+ /IRDY 17 /MRDY
+ /EXT1 16 /EXT2
+ /INT3 15 /ALE
+ AB6 14 /INT2
+ AB8 13 AB7
+ DB9 12 DB8
+ DB11 11 DB10
+ DB13 10 DB12
+ DB15 9 DB14
+ AB2 8 AB1
+ AB4 7 AB3
+ AB0 6 AB5
+ AB14 5 AB13
+ AB15 4 AB16
+ AB17 3 AB18
+ AB19 2 /BHE
+ NMI 1 CLK15
***************************************************************************/
diff --git a/src/emu/bus/cpc/hd20.c b/src/emu/bus/cpc/hd20.c
index dec34db50dc..6a778bf6162 100644
--- a/src/emu/bus/cpc/hd20.c
+++ b/src/emu/bus/cpc/hd20.c
@@ -2,7 +2,7 @@
// copyright-holders:Barry Rodewald
/*
- Dobbertin HD20 hard disk
+ Dobbertin HD20 hard disk
*/
@@ -81,7 +81,7 @@ void cpc_hd20_device::device_reset()
READ8_MEMBER(cpc_hd20_device::hdc_r)
{
UINT8 ret = 0xff;
-
+
switch(offset)
{
case 0:
@@ -95,7 +95,7 @@ READ8_MEMBER(cpc_hd20_device::hdc_r)
ret = 0x01;
break;
}
-
+
return ret;
}
@@ -123,7 +123,6 @@ WRITE8_MEMBER(cpc_hd20_device::hdc_w)
WRITE_LINE_MEMBER(cpc_hd20_device::irq_w)
{
-// if(state)
-// m_hdc->set_ready();
+// if(state)
+// m_hdc->set_ready();
}
-
diff --git a/src/emu/bus/cpc/hd20.h b/src/emu/bus/cpc/hd20.h
index 7ff253a92cc..0926e6bd5be 100644
--- a/src/emu/bus/cpc/hd20.h
+++ b/src/emu/bus/cpc/hd20.h
@@ -2,13 +2,13 @@
// copyright-holders:Barry Rodewald
/*
- Dobbertin HD20 hard disk
+ Dobbertin HD20 hard disk
+
+ Fixed disk interface for the Amstrad CPC
+
+ Controller: Seagate ST11M XT HD Controller
+ Disk: 3.5" 20MB Seagate, Kyocera, NEC or Miniscribe (Geometry: 615 cylinders/4 heads/17 sectors)
- Fixed disk interface for the Amstrad CPC
-
- Controller: Seagate ST11M XT HD Controller
- Disk: 3.5" 20MB Seagate, Kyocera, NEC or Miniscribe (Geometry: 615 cylinders/4 heads/17 sectors)
-
*/
#ifndef HD20_H_
@@ -32,7 +32,7 @@ public:
DECLARE_READ8_MEMBER(hdc_r);
DECLARE_WRITE8_MEMBER(hdc_w);
DECLARE_WRITE_LINE_MEMBER(irq_w);
-
+
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/emu/bus/isa/hdc.c b/src/emu/bus/isa/hdc.c
index 7f839f818f3..45b6bc334dd 100644
--- a/src/emu/bus/isa/hdc.c
+++ b/src/emu/bus/isa/hdc.c
@@ -163,7 +163,7 @@ const device_type ST11M_HDC = &device_creator<st11m_device>;
xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, XT_HDC, "Generic PC-XT Fixed Disk Controller", tag, owner, clock, "xt_hdc", __FILE__),
- m_irq_handler(*this),
+ m_irq_handler(*this),
m_drq_handler(*this)
{
m_type = STANDARD;
@@ -171,14 +171,14 @@ xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, dev
xt_hdc_device::xt_hdc_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) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- m_irq_handler(*this),
+ m_irq_handler(*this),
m_drq_handler(*this)
{
}
ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
xt_hdc_device(mconfig, EC1841_HDC, "EC1841 Fixed Disk Controller", tag, owner, clock, "ec1481", __FILE__),
- m_irq_handler(*this),
+ m_irq_handler(*this),
m_drq_handler(*this)
{
m_type = EC1841;
@@ -186,7 +186,7 @@ ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, dev
st11m_device::st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
xt_hdc_device(mconfig, EC1841_HDC, "Seagate ST11M Fixed Disk Controller", tag, owner, clock, "st11m", __FILE__),
- m_irq_handler(*this),
+ m_irq_handler(*this),
m_drq_handler(*this)
{
m_type = ST11M;
@@ -250,7 +250,7 @@ hard_disk_file *xt_hdc_device::pc_hdc_file(int id)
void xt_hdc_device::pc_hdc_result(int set_error_info)
{
- if ( ( hdc_control & 0x02 ))
+ if ( ( hdc_control & 0x02 ))
{
// dip switch selected IRQ 5 or 2
m_irq_handler(1);
@@ -478,7 +478,7 @@ void xt_hdc_device::execute_write()
hdcdma_dst = hdcdma_data;
hdcdma_write = write_;
hdcdma_size = size;
-
+
if (!no_dma())
{
m_drq_handler(1);
diff --git a/src/emu/cheat.c b/src/emu/cheat.c
index c5cce57604b..08f86957eac 100644
--- a/src/emu/cheat.c
+++ b/src/emu/cheat.c
@@ -1135,7 +1135,7 @@ void cheat_manager::reload()
m_disabled = false;
// load the cheat file, if it's a system that has a software list then try softlist_name/shortname.xml first,
- // if it fails to load then try to load via crc32 - basename/crc32.xml ( eg. 01234567.xml )
+ // if it fails to load then try to load via crc32 - basename/crc32.xml ( eg. 01234567.xml )
image_interface_iterator iter(machine().root_device());
for (device_image_interface *image = iter.first(); image != NULL; image = iter.next())
if (image->exists())
@@ -1150,7 +1150,7 @@ void cheat_manager::reload()
load_cheats(filename.c_str());
break;
}
- // else we are loading outside the software list, try to load machine_basename/crc32.xml
+ // else we are loading outside the software list, try to load machine_basename/crc32.xml
else
{
UINT32 crc = image->crc();
diff --git a/src/emu/cpu/hmcs40/hmcs40.c b/src/emu/cpu/hmcs40/hmcs40.c
index dabc9740004..fdcaa430189 100644
--- a/src/emu/cpu/hmcs40/hmcs40.c
+++ b/src/emu/cpu/hmcs40/hmcs40.c
@@ -493,11 +493,11 @@ void hmcs40_cpu_device::execute_set_input(int line, int state)
}
else
m_timer->adjust(m_timer_halted_remain);
-
+
m_halt = state;
return;
}
-
+
if (line != 0 && line != 1)
return;
@@ -577,7 +577,7 @@ void hmcs40_cpu_device::execute_run()
m_icount = 0;
return;
}
-
+
while (m_icount > 0)
{
// LPU is handled 1 cycle later
diff --git a/src/emu/cpu/hphybrid/hphybrid.c b/src/emu/cpu/hphybrid/hphybrid.c
index 8a50c78368d..691e7d56711 100644
--- a/src/emu/cpu/hphybrid/hphybrid.c
+++ b/src/emu/cpu/hphybrid/hphybrid.c
@@ -9,39 +9,39 @@
#include "hphybrid.h"
enum {
- HPHYBRID_A,
- HPHYBRID_B,
- HPHYBRID_C,
- HPHYBRID_D,
- HPHYBRID_P,
- HPHYBRID_R,
- HPHYBRID_IV,
- HPHYBRID_PA,
- HPHYBRID_DMAPA,
- HPHYBRID_DMAMA,
- HPHYBRID_DMAC,
- HPHYBRID_I
+ HPHYBRID_A,
+ HPHYBRID_B,
+ HPHYBRID_C,
+ HPHYBRID_D,
+ HPHYBRID_P,
+ HPHYBRID_R,
+ HPHYBRID_IV,
+ HPHYBRID_PA,
+ HPHYBRID_DMAPA,
+ HPHYBRID_DMAMA,
+ HPHYBRID_DMAC,
+ HPHYBRID_I
};
-#define BIT_MASK(n) (1U << (n))
+#define BIT_MASK(n) (1U << (n))
// Macros to clear/set single bits
-#define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n))
-#define BIT_SET(w , n) ((w) |= BIT_MASK(n))
+#define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n))
+#define BIT_SET(w , n) ((w) |= BIT_MASK(n))
// Bits in m_flags
-#define HPHYBRID_C_BIT 0 // Carry/extend
-#define HPHYBRID_O_BIT 1 // Overflow
-#define HPHYBRID_CB_BIT 2 // Cb
-#define HPHYBRID_DB_BIT 3 // Db
-#define HPHYBRID_INTEN_BIT 4 // Interrupt enable
-#define HPHYBRID_DMAEN_BIT 5 // DMA enable
-#define HPHYBRID_DMADIR_BIT 6 // DMA direction (1 = OUT)
-#define HPHYBRID_HALT_BIT 7 // Halt flag
-#define HPHYBRID_IRH_BIT 8 // IRH requested
-#define HPHYBRID_IRL_BIT 9 // IRL requested
-#define HPHYBRID_IRH_SVC_BIT 10 // IRH in service
-#define HPHYBRID_IRL_SVC_BIT 11 // IRL in service
+#define HPHYBRID_C_BIT 0 // Carry/extend
+#define HPHYBRID_O_BIT 1 // Overflow
+#define HPHYBRID_CB_BIT 2 // Cb
+#define HPHYBRID_DB_BIT 3 // Db
+#define HPHYBRID_INTEN_BIT 4 // Interrupt enable
+#define HPHYBRID_DMAEN_BIT 5 // DMA enable
+#define HPHYBRID_DMADIR_BIT 6 // DMA direction (1 = OUT)
+#define HPHYBRID_HALT_BIT 7 // Halt flag
+#define HPHYBRID_IRH_BIT 8 // IRH requested
+#define HPHYBRID_IRL_BIT 9 // IRL requested
+#define HPHYBRID_IRH_SVC_BIT 10 // IRH in service
+#define HPHYBRID_IRL_SVC_BIT 11 // IRL in service
#define HPHYBRID_IV_MASK 0xfff0 // IV mask
@@ -53,99 +53,99 @@ const device_type HP_5061_3011 = &device_creator<hp_5061_3011_cpu_device>;
hp_hybrid_cpu_device::hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
- m_program_config("program", ENDIANNESS_BIG, 16, 16, -1),
- m_io_config("io", ENDIANNESS_BIG, 16, 6, -1)
+ m_program_config("program", ENDIANNESS_BIG, 16, 16, -1),
+ m_io_config("io", ENDIANNESS_BIG, 16, 6, -1)
{
}
void hp_hybrid_cpu_device::device_start()
{
- m_reg_A = 0;
- m_reg_B = 0;
- m_reg_P = HP_RESET_ADDR;
- m_reg_R = 0;
- m_reg_C = 0;
- m_reg_D = 0;
- m_reg_IV = 0;
- m_reg_PA[ 0 ] = 0;
- m_reg_PA[ 1 ] = 0;
- m_reg_PA[ 2 ] = 0;
- m_flags = 0;
- m_dmapa = 0;
- m_dmama = 0;
- m_dmac = 0;
- m_reg_I = 0;
-
- {
- state_add(HPHYBRID_A, "A", m_reg_A);
- state_add(HPHYBRID_B, "B", m_reg_B);
- state_add(HPHYBRID_C, "C", m_reg_C);
- state_add(HPHYBRID_D, "D", m_reg_D);
- state_add(HPHYBRID_P, "P", m_reg_P);
- state_add(STATE_GENPC, "GENPC", m_reg_P).noshow();
- state_add(HPHYBRID_R, "R", m_reg_R);
- state_add(STATE_GENSP, "GENSP", m_reg_R).noshow();
- state_add(HPHYBRID_IV, "IV", m_reg_IV);
- state_add(HPHYBRID_PA, "PA", m_reg_PA[ 0 ]);
- state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).noshow().formatstr("%9s");
- state_add(HPHYBRID_DMAPA , "DMAPA" , m_dmapa).noshow();
- state_add(HPHYBRID_DMAMA , "DMAMA" , m_dmama).noshow();
- state_add(HPHYBRID_DMAC , "DMAC" , m_dmac).noshow();
- state_add(HPHYBRID_I , "I" , m_reg_I).noshow();
- }
-
- m_program = &space(AS_PROGRAM);
- m_direct = &m_program->direct();
- m_io = &space(AS_IO);
-
- save_item(NAME(m_reg_A));
- save_item(NAME(m_reg_B));
- save_item(NAME(m_reg_C));
- save_item(NAME(m_reg_D));
- save_item(NAME(m_reg_P));
- save_item(NAME(m_reg_R));
- save_item(NAME(m_reg_IV));
- save_item(NAME(m_reg_PA[0]));
- save_item(NAME(m_reg_PA[1]));
- save_item(NAME(m_reg_PA[2]));
- save_item(NAME(m_flags));
- save_item(NAME(m_dmapa));
- save_item(NAME(m_dmama));
- save_item(NAME(m_dmac));
- save_item(NAME(m_reg_I));
-
- m_icountptr = &m_icount;
+ m_reg_A = 0;
+ m_reg_B = 0;
+ m_reg_P = HP_RESET_ADDR;
+ m_reg_R = 0;
+ m_reg_C = 0;
+ m_reg_D = 0;
+ m_reg_IV = 0;
+ m_reg_PA[ 0 ] = 0;
+ m_reg_PA[ 1 ] = 0;
+ m_reg_PA[ 2 ] = 0;
+ m_flags = 0;
+ m_dmapa = 0;
+ m_dmama = 0;
+ m_dmac = 0;
+ m_reg_I = 0;
+
+ {
+ state_add(HPHYBRID_A, "A", m_reg_A);
+ state_add(HPHYBRID_B, "B", m_reg_B);
+ state_add(HPHYBRID_C, "C", m_reg_C);
+ state_add(HPHYBRID_D, "D", m_reg_D);
+ state_add(HPHYBRID_P, "P", m_reg_P);
+ state_add(STATE_GENPC, "GENPC", m_reg_P).noshow();
+ state_add(HPHYBRID_R, "R", m_reg_R);
+ state_add(STATE_GENSP, "GENSP", m_reg_R).noshow();
+ state_add(HPHYBRID_IV, "IV", m_reg_IV);
+ state_add(HPHYBRID_PA, "PA", m_reg_PA[ 0 ]);
+ state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).noshow().formatstr("%9s");
+ state_add(HPHYBRID_DMAPA , "DMAPA" , m_dmapa).noshow();
+ state_add(HPHYBRID_DMAMA , "DMAMA" , m_dmama).noshow();
+ state_add(HPHYBRID_DMAC , "DMAC" , m_dmac).noshow();
+ state_add(HPHYBRID_I , "I" , m_reg_I).noshow();
+ }
+
+ m_program = &space(AS_PROGRAM);
+ m_direct = &m_program->direct();
+ m_io = &space(AS_IO);
+
+ save_item(NAME(m_reg_A));
+ save_item(NAME(m_reg_B));
+ save_item(NAME(m_reg_C));
+ save_item(NAME(m_reg_D));
+ save_item(NAME(m_reg_P));
+ save_item(NAME(m_reg_R));
+ save_item(NAME(m_reg_IV));
+ save_item(NAME(m_reg_PA[0]));
+ save_item(NAME(m_reg_PA[1]));
+ save_item(NAME(m_reg_PA[2]));
+ save_item(NAME(m_flags));
+ save_item(NAME(m_dmapa));
+ save_item(NAME(m_dmama));
+ save_item(NAME(m_dmac));
+ save_item(NAME(m_reg_I));
+
+ m_icountptr = &m_icount;
}
void hp_hybrid_cpu_device::device_reset()
{
- m_reg_P = HP_RESET_ADDR;
- m_reg_I = RM(m_reg_P);
- m_flags = 0;
+ m_reg_P = HP_RESET_ADDR;
+ m_reg_I = RM(m_reg_P);
+ m_flags = 0;
}
void hp_hybrid_cpu_device::execute_run()
{
- do {
- debugger_instruction_hook(this, m_reg_P);
+ do {
+ debugger_instruction_hook(this, m_reg_P);
- // Check for interrupts
- check_for_interrupts();
+ // Check for interrupts
+ check_for_interrupts();
- // TODO: check dma
- m_reg_I = execute_one(m_reg_I);
- } while (m_icount > 0);
+ // TODO: check dma
+ m_reg_I = execute_one(m_reg_I);
+ } while (m_icount > 0);
}
void hp_hybrid_cpu_device::execute_set_input(int inputnum, int state)
{
- if (inputnum < HPHYBRID_INT_LVLS) {
- if (state) {
- BIT_SET(m_flags , HPHYBRID_IRH_BIT + inputnum);
- } else {
- BIT_CLR(m_flags , HPHYBRID_IRH_BIT + inputnum);
- }
- }
+ if (inputnum < HPHYBRID_INT_LVLS) {
+ if (state) {
+ BIT_SET(m_flags , HPHYBRID_IRH_BIT + inputnum);
+ } else {
+ BIT_CLR(m_flags , HPHYBRID_IRH_BIT + inputnum);
+ }
+ }
}
/**
@@ -157,14 +157,14 @@ void hp_hybrid_cpu_device::execute_set_input(int inputnum, int state)
*/
UINT16 hp_hybrid_cpu_device::execute_one(UINT16 opcode)
{
- if ((opcode & 0x7fe0) == 0x7000) {
- // EXE
- m_icount -= 8;
- return RM(opcode & 0x1f);
- } else {
- m_reg_P = execute_one_sub(opcode);
- return RM(m_reg_P);
- }
+ if ((opcode & 0x7fe0) == 0x7000) {
+ // EXE
+ m_icount -= 8;
+ return RM(opcode & 0x1f);
+ } else {
+ m_reg_P = execute_one_sub(opcode);
+ return RM(m_reg_P);
+ }
}
/**
@@ -176,747 +176,747 @@ UINT16 hp_hybrid_cpu_device::execute_one(UINT16 opcode)
*/
UINT16 hp_hybrid_cpu_device::execute_one_sub(UINT16 opcode)
{
- UINT16 ea;
- UINT16 tmp;
-
- switch (opcode & 0x7800) {
- case 0x0000:
- // LDA
- m_icount -= 13;
- m_reg_A = RM(get_ea(opcode));
- break;
-
- case 0x0800:
- // LDB
- m_icount -= 13;
- m_reg_B = RM(get_ea(opcode));
- break;
-
- case 0x1000:
- // CPA
- m_icount -= 16;
- if (m_reg_A != RM(get_ea(opcode))) {
- // Skip next instruction
- return m_reg_P + 2;
- }
- break;
-
- case 0x1800:
- // CPB
- m_icount -= 16;
- if (m_reg_B != RM(get_ea(opcode))) {
- // Skip next instruction
- return m_reg_P + 2;
- }
- break;
-
- case 0x2000:
- // ADA
- m_icount -= 13;
- do_add(m_reg_A , RM(get_ea(opcode)));
- break;
-
- case 0x2800:
- // ADB
- m_icount -= 13;
- do_add(m_reg_B , RM(get_ea(opcode)));
- break;
-
- case 0x3000:
- // STA
- m_icount -= 13;
- WM(get_ea(opcode) , m_reg_A);
- break;
-
- case 0x3800:
- // STB
- m_icount -= 13;
- WM(get_ea(opcode) , m_reg_B);
- break;
-
- case 0x4000:
- // JSM
- m_icount -= 17;
- WM(++m_reg_R , m_reg_P);
- return get_ea(opcode);
-
- case 0x4800:
- // ISZ
- m_icount -= 19;
- ea = get_ea(opcode);
- tmp = RM(ea) + 1;
- WM(ea , tmp);
- if (tmp == 0) {
- // Skip next instruction
- return m_reg_P + 2;
- }
- break;
-
- case 0x5000:
- // AND
- m_icount -= 13;
- m_reg_A &= RM(get_ea(opcode));
- break;
-
- case 0x5800:
- // DSZ
- m_icount -= 19;
- ea = get_ea(opcode);
- tmp = RM(ea) - 1;
- WM(ea , tmp);
- if (tmp == 0) {
- // Skip next instruction
- return m_reg_P + 2;
- }
- break;
-
- case 0x6000:
- // IOR
- m_icount -= 13;
- m_reg_A |= RM(get_ea(opcode));
- break;
-
- case 0x6800:
- // JMP
- m_icount -= 8;
- return get_ea(opcode);
-
- default:
- switch (opcode & 0xfec0) {
- case 0x7400:
- // RZA
- // SZA
- m_icount -= 14;
- return get_skip_addr(opcode , m_reg_A == 0);
-
- case 0x7440:
- // RIA
- // SIA
- m_icount -= 14;
- return get_skip_addr(opcode , m_reg_A++ == 0);
-
- case 0x7480:
- // SFS
- // SFC
- m_icount -= 14;
- // TODO: read flag bit
- return get_skip_addr(opcode , true);
-
- case 0x7C00:
- // RZB
- // SZB
- m_icount -= 14;
- return get_skip_addr(opcode , m_reg_B == 0);
-
- case 0x7C40:
- // RIB
- // SIB
- m_icount -= 14;
- return get_skip_addr(opcode , m_reg_B++ == 0);
-
- case 0x7c80:
- // SSS
- // SSC
- m_icount -= 14;
- // TODO: read status bit
- return get_skip_addr(opcode , true);
-
- case 0x7cc0:
- // SHS
- // SHC
- m_icount -= 14;
- return get_skip_addr(opcode , !BIT(m_flags , HPHYBRID_HALT_BIT));
-
- default:
- switch (opcode & 0xfe00) {
- case 0x7600:
- // SLA
- // RLA
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_reg_A , 0);
-
- case 0x7e00:
- // SLB
- // RLB
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_reg_B , 0);
-
- case 0xf400:
- // SAP
- // SAM
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_reg_A , 15);
-
- case 0xf600:
- // SOC
- // SOS
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_flags , HPHYBRID_O_BIT);
-
- case 0xfc00:
- // SBP
- // SBM
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_reg_B , 15);
-
- case 0xfe00:
- // SEC
- // SES
- m_icount -= 14;
- return get_skip_addr_sc(opcode , m_flags , HPHYBRID_C_BIT);
-
- default:
- switch (opcode & 0xfff0) {
- case 0xf100:
- // AAR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- // A shift by 16 positions is equivalent to a shift by 15
- tmp = tmp > 15 ? 15 : tmp;
- m_reg_A = ((m_reg_A ^ 0x8000) >> tmp) - (0x8000 >> tmp);
- break;
-
- case 0xf900:
- // ABR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- tmp = tmp > 15 ? 15 : tmp;
- m_reg_B = ((m_reg_B ^ 0x8000) >> tmp) - (0x8000 >> tmp);
- break;
-
- case 0xf140:
- // SAR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_A >>= tmp;
- break;
-
- case 0xf940:
- // SBR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_B >>= tmp;
- break;
-
- case 0xf180:
- // SAL
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_A <<= tmp;
- break;
-
- case 0xf980:
- // SBL
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_B <<= tmp;
- break;
-
- case 0xf1c0:
- // RAR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_A = (m_reg_A >> tmp) | (m_reg_A << (16 - tmp));
- break;
-
- case 0xf9c0:
- // RBR
- tmp = (opcode & 0xf) + 1;
- m_icount -= (9 + tmp);
- m_reg_B = (m_reg_B >> tmp) | (m_reg_B << (16 - tmp));
- break;
-
- default:
- if ((opcode & 0xf760) == 0x7160) {
- // Place/withdraw instructions
- m_icount -= 23;
- do_pw(opcode);
- } else if ((opcode & 0xff80) == 0xf080) {
- // RET
- m_icount -= 16;
- if (BIT(opcode , 6)) {
- // Pop PA stack
- if (BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) {
- BIT_CLR(m_flags , HPHYBRID_IRH_SVC_BIT);
- memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
- } else if (BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
- BIT_CLR(m_flags , HPHYBRID_IRL_SVC_BIT);
- memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
- }
- }
- tmp = RM(m_reg_R--) + (opcode & 0x1f);
- return BIT(opcode , 5) ? tmp - 0x20 : tmp;
- } else {
- switch (opcode) {
- case 0x7100:
- // SDO
- m_icount -= 12;
- BIT_SET(m_flags , HPHYBRID_DMADIR_BIT);
- break;
-
- case 0x7108:
- // SDI
- m_icount -= 12;
- BIT_CLR(m_flags , HPHYBRID_DMADIR_BIT);
- break;
-
- case 0x7110:
- // EIR
- m_icount -= 12;
- BIT_SET(m_flags , HPHYBRID_INTEN_BIT);
- break;
-
- case 0x7118:
- // DIR
- m_icount -= 12;
- BIT_CLR(m_flags , HPHYBRID_INTEN_BIT);
- break;
-
- case 0x7120:
- // DMA
- m_icount -= 12;
- BIT_SET(m_flags , HPHYBRID_DMAEN_BIT);
- break;
-
- case 0x7138:
- // DDR
- m_icount -= 12;
- BIT_CLR(m_flags , HPHYBRID_DMAEN_BIT);
- break;
-
- case 0x7140:
- // DBL
- m_icount -= 12;
- BIT_CLR(m_flags , HPHYBRID_DB_BIT);
- break;
-
- case 0x7148:
- // CBL
- m_icount -= 12;
- BIT_CLR(m_flags , HPHYBRID_CB_BIT);
- break;
-
- case 0x7150:
- // DBU
- m_icount -= 12;
- BIT_SET(m_flags , HPHYBRID_DB_BIT);
- break;
-
- case 0x7158:
- // CBU
- m_icount -= 12;
- BIT_SET(m_flags , HPHYBRID_CB_BIT);
- break;
-
- case 0xf020:
- // TCA
- m_icount -= 9;
- m_reg_A = ~m_reg_A;
- do_add(m_reg_A , 1);
- break;
-
- case 0xf060:
- // CMA
- m_icount -= 9;
- m_reg_A = ~m_reg_A;
- break;
-
- case 0xf820:
- // TCB
- m_icount -= 9;
- m_reg_B = ~m_reg_B;
- do_add(m_reg_B , 1);
- break;
-
- case 0xf860:
- // CMB
- m_icount -= 9;
- m_reg_B = ~m_reg_B;
- break;
-
- default:
- // Unrecognized instructions: NOP
- // Execution time is fictional
- m_icount -= 6;
- }
- }
- }
- }
- }
- }
-
- return m_reg_P + 1;
+ UINT16 ea;
+ UINT16 tmp;
+
+ switch (opcode & 0x7800) {
+ case 0x0000:
+ // LDA
+ m_icount -= 13;
+ m_reg_A = RM(get_ea(opcode));
+ break;
+
+ case 0x0800:
+ // LDB
+ m_icount -= 13;
+ m_reg_B = RM(get_ea(opcode));
+ break;
+
+ case 0x1000:
+ // CPA
+ m_icount -= 16;
+ if (m_reg_A != RM(get_ea(opcode))) {
+ // Skip next instruction
+ return m_reg_P + 2;
+ }
+ break;
+
+ case 0x1800:
+ // CPB
+ m_icount -= 16;
+ if (m_reg_B != RM(get_ea(opcode))) {
+ // Skip next instruction
+ return m_reg_P + 2;
+ }
+ break;
+
+ case 0x2000:
+ // ADA
+ m_icount -= 13;
+ do_add(m_reg_A , RM(get_ea(opcode)));
+ break;
+
+ case 0x2800:
+ // ADB
+ m_icount -= 13;
+ do_add(m_reg_B , RM(get_ea(opcode)));
+ break;
+
+ case 0x3000:
+ // STA
+ m_icount -= 13;
+ WM(get_ea(opcode) , m_reg_A);
+ break;
+
+ case 0x3800:
+ // STB
+ m_icount -= 13;
+ WM(get_ea(opcode) , m_reg_B);
+ break;
+
+ case 0x4000:
+ // JSM
+ m_icount -= 17;
+ WM(++m_reg_R , m_reg_P);
+ return get_ea(opcode);
+
+ case 0x4800:
+ // ISZ
+ m_icount -= 19;
+ ea = get_ea(opcode);
+ tmp = RM(ea) + 1;
+ WM(ea , tmp);
+ if (tmp == 0) {
+ // Skip next instruction
+ return m_reg_P + 2;
+ }
+ break;
+
+ case 0x5000:
+ // AND
+ m_icount -= 13;
+ m_reg_A &= RM(get_ea(opcode));
+ break;
+
+ case 0x5800:
+ // DSZ
+ m_icount -= 19;
+ ea = get_ea(opcode);
+ tmp = RM(ea) - 1;
+ WM(ea , tmp);
+ if (tmp == 0) {
+ // Skip next instruction
+ return m_reg_P + 2;
+ }
+ break;
+
+ case 0x6000:
+ // IOR
+ m_icount -= 13;
+ m_reg_A |= RM(get_ea(opcode));
+ break;
+
+ case 0x6800:
+ // JMP
+ m_icount -= 8;
+ return get_ea(opcode);
+
+ default:
+ switch (opcode & 0xfec0) {
+ case 0x7400:
+ // RZA
+ // SZA
+ m_icount -= 14;
+ return get_skip_addr(opcode , m_reg_A == 0);
+
+ case 0x7440:
+ // RIA
+ // SIA
+ m_icount -= 14;
+ return get_skip_addr(opcode , m_reg_A++ == 0);
+
+ case 0x7480:
+ // SFS
+ // SFC
+ m_icount -= 14;
+ // TODO: read flag bit
+ return get_skip_addr(opcode , true);
+
+ case 0x7C00:
+ // RZB
+ // SZB
+ m_icount -= 14;
+ return get_skip_addr(opcode , m_reg_B == 0);
+
+ case 0x7C40:
+ // RIB
+ // SIB
+ m_icount -= 14;
+ return get_skip_addr(opcode , m_reg_B++ == 0);
+
+ case 0x7c80:
+ // SSS
+ // SSC
+ m_icount -= 14;
+ // TODO: read status bit
+ return get_skip_addr(opcode , true);
+
+ case 0x7cc0:
+ // SHS
+ // SHC
+ m_icount -= 14;
+ return get_skip_addr(opcode , !BIT(m_flags , HPHYBRID_HALT_BIT));
+
+ default:
+ switch (opcode & 0xfe00) {
+ case 0x7600:
+ // SLA
+ // RLA
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_reg_A , 0);
+
+ case 0x7e00:
+ // SLB
+ // RLB
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_reg_B , 0);
+
+ case 0xf400:
+ // SAP
+ // SAM
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_reg_A , 15);
+
+ case 0xf600:
+ // SOC
+ // SOS
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_flags , HPHYBRID_O_BIT);
+
+ case 0xfc00:
+ // SBP
+ // SBM
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_reg_B , 15);
+
+ case 0xfe00:
+ // SEC
+ // SES
+ m_icount -= 14;
+ return get_skip_addr_sc(opcode , m_flags , HPHYBRID_C_BIT);
+
+ default:
+ switch (opcode & 0xfff0) {
+ case 0xf100:
+ // AAR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ // A shift by 16 positions is equivalent to a shift by 15
+ tmp = tmp > 15 ? 15 : tmp;
+ m_reg_A = ((m_reg_A ^ 0x8000) >> tmp) - (0x8000 >> tmp);
+ break;
+
+ case 0xf900:
+ // ABR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ tmp = tmp > 15 ? 15 : tmp;
+ m_reg_B = ((m_reg_B ^ 0x8000) >> tmp) - (0x8000 >> tmp);
+ break;
+
+ case 0xf140:
+ // SAR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_A >>= tmp;
+ break;
+
+ case 0xf940:
+ // SBR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_B >>= tmp;
+ break;
+
+ case 0xf180:
+ // SAL
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_A <<= tmp;
+ break;
+
+ case 0xf980:
+ // SBL
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_B <<= tmp;
+ break;
+
+ case 0xf1c0:
+ // RAR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_A = (m_reg_A >> tmp) | (m_reg_A << (16 - tmp));
+ break;
+
+ case 0xf9c0:
+ // RBR
+ tmp = (opcode & 0xf) + 1;
+ m_icount -= (9 + tmp);
+ m_reg_B = (m_reg_B >> tmp) | (m_reg_B << (16 - tmp));
+ break;
+
+ default:
+ if ((opcode & 0xf760) == 0x7160) {
+ // Place/withdraw instructions
+ m_icount -= 23;
+ do_pw(opcode);
+ } else if ((opcode & 0xff80) == 0xf080) {
+ // RET
+ m_icount -= 16;
+ if (BIT(opcode , 6)) {
+ // Pop PA stack
+ if (BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) {
+ BIT_CLR(m_flags , HPHYBRID_IRH_SVC_BIT);
+ memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
+ } else if (BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
+ BIT_CLR(m_flags , HPHYBRID_IRL_SVC_BIT);
+ memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS);
+ }
+ }
+ tmp = RM(m_reg_R--) + (opcode & 0x1f);
+ return BIT(opcode , 5) ? tmp - 0x20 : tmp;
+ } else {
+ switch (opcode) {
+ case 0x7100:
+ // SDO
+ m_icount -= 12;
+ BIT_SET(m_flags , HPHYBRID_DMADIR_BIT);
+ break;
+
+ case 0x7108:
+ // SDI
+ m_icount -= 12;
+ BIT_CLR(m_flags , HPHYBRID_DMADIR_BIT);
+ break;
+
+ case 0x7110:
+ // EIR
+ m_icount -= 12;
+ BIT_SET(m_flags , HPHYBRID_INTEN_BIT);
+ break;
+
+ case 0x7118:
+ // DIR
+ m_icount -= 12;
+ BIT_CLR(m_flags , HPHYBRID_INTEN_BIT);
+ break;
+
+ case 0x7120:
+ // DMA
+ m_icount -= 12;
+ BIT_SET(m_flags , HPHYBRID_DMAEN_BIT);
+ break;
+
+ case 0x7138:
+ // DDR
+ m_icount -= 12;
+ BIT_CLR(m_flags , HPHYBRID_DMAEN_BIT);
+ break;
+
+ case 0x7140:
+ // DBL
+ m_icount -= 12;
+ BIT_CLR(m_flags , HPHYBRID_DB_BIT);
+ break;
+
+ case 0x7148:
+ // CBL
+ m_icount -= 12;
+ BIT_CLR(m_flags , HPHYBRID_CB_BIT);
+ break;
+
+ case 0x7150:
+ // DBU
+ m_icount -= 12;
+ BIT_SET(m_flags , HPHYBRID_DB_BIT);
+ break;
+
+ case 0x7158:
+ // CBU
+ m_icount -= 12;
+ BIT_SET(m_flags , HPHYBRID_CB_BIT);
+ break;
+
+ case 0xf020:
+ // TCA
+ m_icount -= 9;
+ m_reg_A = ~m_reg_A;
+ do_add(m_reg_A , 1);
+ break;
+
+ case 0xf060:
+ // CMA
+ m_icount -= 9;
+ m_reg_A = ~m_reg_A;
+ break;
+
+ case 0xf820:
+ // TCB
+ m_icount -= 9;
+ m_reg_B = ~m_reg_B;
+ do_add(m_reg_B , 1);
+ break;
+
+ case 0xf860:
+ // CMB
+ m_icount -= 9;
+ m_reg_B = ~m_reg_B;
+ break;
+
+ default:
+ // Unrecognized instructions: NOP
+ // Execution time is fictional
+ m_icount -= 6;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return m_reg_P + 1;
}
void hp_hybrid_cpu_device::state_string_export(const device_state_entry &entry, std::string &str)
{
- if (entry.index() == STATE_GENFLAGS) {
- strprintf(str, "%s %s %c %c",
- BIT(m_flags , HPHYBRID_DB_BIT) ? "Db":"..",
- BIT(m_flags , HPHYBRID_CB_BIT) ? "Cb":"..",
- BIT(m_flags , HPHYBRID_O_BIT) ? 'O':'.',
- BIT(m_flags , HPHYBRID_C_BIT) ? 'E':'.');
- }
+ if (entry.index() == STATE_GENFLAGS) {
+ strprintf(str, "%s %s %c %c",
+ BIT(m_flags , HPHYBRID_DB_BIT) ? "Db":"..",
+ BIT(m_flags , HPHYBRID_CB_BIT) ? "Cb":"..",
+ BIT(m_flags , HPHYBRID_O_BIT) ? 'O':'.',
+ BIT(m_flags , HPHYBRID_C_BIT) ? 'E':'.');
+ }
}
offs_t hp_hybrid_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options)
{
- extern CPU_DISASSEMBLE(hp_hybrid);
- return CPU_DISASSEMBLE_NAME(hp_hybrid)(this, buffer, pc, oprom, opram, options);
+ extern CPU_DISASSEMBLE(hp_hybrid);
+ return CPU_DISASSEMBLE_NAME(hp_hybrid)(this, buffer, pc, oprom, opram, options);
}
UINT16 hp_hybrid_cpu_device::get_ea(UINT16 opcode)
{
- UINT16 base;
- UINT16 off;
-
- if (BIT(opcode , 10)) {
- // Current page
- base = m_reg_P;
- } else {
- // Base page
- base = 0;
- }
-
- off = opcode & 0x3ff;
- if (off & 0x200) {
- off -= 0x400;
- }
-
- base += off;
-
- if (BIT(opcode , 15)) {
- // Indirect addressing
- m_icount -= 6;
- return RM(base);
- } else {
- // Direct addressing
- return base;
- }
+ UINT16 base;
+ UINT16 off;
+
+ if (BIT(opcode , 10)) {
+ // Current page
+ base = m_reg_P;
+ } else {
+ // Base page
+ base = 0;
+ }
+
+ off = opcode & 0x3ff;
+ if (off & 0x200) {
+ off -= 0x400;
+ }
+
+ base += off;
+
+ if (BIT(opcode , 15)) {
+ // Indirect addressing
+ m_icount -= 6;
+ return RM(base);
+ } else {
+ // Direct addressing
+ return base;
+ }
}
void hp_hybrid_cpu_device::do_add(UINT16& addend1 , UINT16 addend2)
{
- UINT32 tmp = addend1 + addend2;
+ UINT32 tmp = addend1 + addend2;
- if (BIT(tmp , 16)) {
- // Carry
- BIT_SET(m_flags , HPHYBRID_C_BIT);
- }
+ if (BIT(tmp , 16)) {
+ // Carry
+ BIT_SET(m_flags , HPHYBRID_C_BIT);
+ }
- if (BIT((tmp ^ addend1) & (tmp ^ addend2) , 15)) {
- // Overflow
- BIT_SET(m_flags , HPHYBRID_O_BIT);
- }
+ if (BIT((tmp ^ addend1) & (tmp ^ addend2) , 15)) {
+ // Overflow
+ BIT_SET(m_flags , HPHYBRID_O_BIT);
+ }
- addend1 = (UINT16)tmp;
+ addend1 = (UINT16)tmp;
}
UINT16 hp_hybrid_cpu_device::get_skip_addr(UINT16 opcode , bool condition) const
{
- bool skip_val = BIT(opcode , 8) != 0;
-
- if (condition == skip_val) {
- UINT16 off = opcode & 0x1f;
-
- if (BIT(opcode , 5)) {
- off -= 0x20;
- }
- return m_reg_P + off;
- } else {
- return m_reg_P + 1;
- }
+ bool skip_val = BIT(opcode , 8) != 0;
+
+ if (condition == skip_val) {
+ UINT16 off = opcode & 0x1f;
+
+ if (BIT(opcode , 5)) {
+ off -= 0x20;
+ }
+ return m_reg_P + off;
+ } else {
+ return m_reg_P + 1;
+ }
}
UINT16 hp_hybrid_cpu_device::get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n)
{
- bool val = BIT(v , n);
+ bool val = BIT(v , n);
- if (BIT(opcode , 7)) {
- if (BIT(opcode , 6)) {
- BIT_SET(v , n);
- } else {
- BIT_CLR(v , n);
- }
- }
+ if (BIT(opcode , 7)) {
+ if (BIT(opcode , 6)) {
+ BIT_SET(v , n);
+ } else {
+ BIT_CLR(v , n);
+ }
+ }
- return get_skip_addr(opcode , val);
+ return get_skip_addr(opcode , val);
}
void hp_hybrid_cpu_device::do_pw(UINT16 opcode)
{
- UINT16 tmp;
- UINT16 reg_addr = opcode & 7;
- UINT16 *ptr_reg;
- UINT16 b_mask;
-
- if (BIT(opcode , 3)) {
- ptr_reg = &m_reg_D;
- b_mask = BIT_MASK(HPHYBRID_DB_BIT);
- } else {
- ptr_reg = &m_reg_C;
- b_mask = BIT_MASK(HPHYBRID_CB_BIT);
- }
-
- if (BIT(opcode , 4)) {
- // Withdraw
- if (BIT(opcode , 11)) {
- // Byte
- UINT32 tmp_addr = (UINT32)(*ptr_reg);
- if (m_flags & b_mask) {
- tmp_addr |= 0x10000;
- }
- tmp = RM((UINT16)(tmp_addr >> 1));
- if (BIT(tmp_addr , 0)) {
- tmp &= 0xff;
- } else {
- tmp >>= 8;
- }
- } else {
- // Word
- tmp = RM(*ptr_reg);
- }
- WM(reg_addr , tmp);
-
- if (BIT(opcode , 7)) {
- // Post-decrement
- if ((*ptr_reg)-- == 0) {
- m_flags ^= b_mask;
- }
- } else {
- // Post-increment
- if (++(*ptr_reg) == 0) {
- m_flags ^= b_mask;
- }
- }
- } else {
- // Place
- if (BIT(opcode , 7)) {
- // Pre-decrement
- if ((*ptr_reg)-- == 0) {
- m_flags ^= b_mask;
- }
- } else {
- // Pre-increment
- if (++(*ptr_reg) == 0) {
- m_flags ^= b_mask;
- }
- }
- tmp = RM(reg_addr);
- if (BIT(opcode , 11)) {
- // Byte
- UINT32 tmp_addr = (UINT32)(*ptr_reg);
- if (m_flags & b_mask) {
- tmp_addr |= 0x10000;
- }
- WMB(tmp_addr , (UINT8)tmp);
- } else {
- // Word
- WM(*ptr_reg , tmp);
- }
- }
+ UINT16 tmp;
+ UINT16 reg_addr = opcode & 7;
+ UINT16 *ptr_reg;
+ UINT16 b_mask;
+
+ if (BIT(opcode , 3)) {
+ ptr_reg = &m_reg_D;
+ b_mask = BIT_MASK(HPHYBRID_DB_BIT);
+ } else {
+ ptr_reg = &m_reg_C;
+ b_mask = BIT_MASK(HPHYBRID_CB_BIT);
+ }
+
+ if (BIT(opcode , 4)) {
+ // Withdraw
+ if (BIT(opcode , 11)) {
+ // Byte
+ UINT32 tmp_addr = (UINT32)(*ptr_reg);
+ if (m_flags & b_mask) {
+ tmp_addr |= 0x10000;
+ }
+ tmp = RM((UINT16)(tmp_addr >> 1));
+ if (BIT(tmp_addr , 0)) {
+ tmp &= 0xff;
+ } else {
+ tmp >>= 8;
+ }
+ } else {
+ // Word
+ tmp = RM(*ptr_reg);
+ }
+ WM(reg_addr , tmp);
+
+ if (BIT(opcode , 7)) {
+ // Post-decrement
+ if ((*ptr_reg)-- == 0) {
+ m_flags ^= b_mask;
+ }
+ } else {
+ // Post-increment
+ if (++(*ptr_reg) == 0) {
+ m_flags ^= b_mask;
+ }
+ }
+ } else {
+ // Place
+ if (BIT(opcode , 7)) {
+ // Pre-decrement
+ if ((*ptr_reg)-- == 0) {
+ m_flags ^= b_mask;
+ }
+ } else {
+ // Pre-increment
+ if (++(*ptr_reg) == 0) {
+ m_flags ^= b_mask;
+ }
+ }
+ tmp = RM(reg_addr);
+ if (BIT(opcode , 11)) {
+ // Byte
+ UINT32 tmp_addr = (UINT32)(*ptr_reg);
+ if (m_flags & b_mask) {
+ tmp_addr |= 0x10000;
+ }
+ WMB(tmp_addr , (UINT8)tmp);
+ } else {
+ // Word
+ WM(*ptr_reg , tmp);
+ }
+ }
}
void hp_hybrid_cpu_device::check_for_interrupts(void)
{
- if (!BIT(m_flags , HPHYBRID_INTEN_BIT) || BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) {
- return;
- }
-
- int irqline;
-
- if (BIT(m_flags , HPHYBRID_IRH_BIT)) {
- // Service high-level interrupt
- BIT_SET(m_flags , HPHYBRID_IRH_SVC_BIT);
- irqline = HPHYBRID_IRH;
- } else if (BIT(m_flags , HPHYBRID_IRL_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
- // Service low-level interrupt
- BIT_SET(m_flags , HPHYBRID_IRL_SVC_BIT);
- irqline = HPHYBRID_IRL;
- } else {
- return;
- }
-
- // Get interrupt vector in low byte
- UINT8 vector = (UINT8)standard_irq_callback(irqline);
- UINT8 new_PA;
-
- // Get highest numbered 1
- // Don't know what happens if vector is 0, here we assume bit 7 = 1
- if (vector == 0) {
- new_PA = 7;
- } else {
- for (new_PA = 7; new_PA && !BIT(vector , 7); new_PA--, vector <<= 1) {
- }
- }
- if (irqline == HPHYBRID_IRH) {
- BIT_SET(new_PA , 3);
- }
-
- // Push PA stack
- memmove(&m_reg_PA[ 1 ] , &m_reg_PA[ 0 ] , HPHYBRID_INT_LVLS);
-
- CURRENT_PA = new_PA;
-
- // Is this correct? Patent @ pg 210 suggests that the whole interrupt recognition sequence
- // lasts for 32 cycles (6 are already accounted for in get_ea for one indirection)
- m_icount -= 26;
-
- // Do a double-indirect JSM IV,I instruction
- WM(++m_reg_R , m_reg_P);
- m_reg_P = RM(get_ea(0xc008));
- m_reg_I = RM(m_reg_P);
+ if (!BIT(m_flags , HPHYBRID_INTEN_BIT) || BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) {
+ return;
+ }
+
+ int irqline;
+
+ if (BIT(m_flags , HPHYBRID_IRH_BIT)) {
+ // Service high-level interrupt
+ BIT_SET(m_flags , HPHYBRID_IRH_SVC_BIT);
+ irqline = HPHYBRID_IRH;
+ } else if (BIT(m_flags , HPHYBRID_IRL_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
+ // Service low-level interrupt
+ BIT_SET(m_flags , HPHYBRID_IRL_SVC_BIT);
+ irqline = HPHYBRID_IRL;
+ } else {
+ return;
+ }
+
+ // Get interrupt vector in low byte
+ UINT8 vector = (UINT8)standard_irq_callback(irqline);
+ UINT8 new_PA;
+
+ // Get highest numbered 1
+ // Don't know what happens if vector is 0, here we assume bit 7 = 1
+ if (vector == 0) {
+ new_PA = 7;
+ } else {
+ for (new_PA = 7; new_PA && !BIT(vector , 7); new_PA--, vector <<= 1) {
+ }
+ }
+ if (irqline == HPHYBRID_IRH) {
+ BIT_SET(new_PA , 3);
+ }
+
+ // Push PA stack
+ memmove(&m_reg_PA[ 1 ] , &m_reg_PA[ 0 ] , HPHYBRID_INT_LVLS);
+
+ CURRENT_PA = new_PA;
+
+ // Is this correct? Patent @ pg 210 suggests that the whole interrupt recognition sequence
+ // lasts for 32 cycles (6 are already accounted for in get_ea for one indirection)
+ m_icount -= 26;
+
+ // Do a double-indirect JSM IV,I instruction
+ WM(++m_reg_R , m_reg_P);
+ m_reg_P = RM(get_ea(0xc008));
+ m_reg_I = RM(m_reg_P);
}
UINT16 hp_hybrid_cpu_device::RM(UINT16 addr)
{
- UINT16 tmp;
-
- if (addr <= HP_REG_LAST_ADDR) {
- // Memory mapped registers
- switch (addr) {
- case HP_REG_A_ADDR:
- return m_reg_A;
-
- case HP_REG_B_ADDR:
- return m_reg_B;
-
- case HP_REG_P_ADDR:
- return m_reg_P;
-
- case HP_REG_R_ADDR:
- return m_reg_R;
-
- case HP_REG_R4_ADDR:
- case HP_REG_R5_ADDR:
- case HP_REG_R6_ADDR:
- case HP_REG_R7_ADDR:
- return RIO(CURRENT_PA , addr - HP_REG_R4_ADDR);
-
- case HP_REG_IV_ADDR:
- // Correct?
- if (!BIT(m_flags , HPHYBRID_IRH_SVC_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
- return m_reg_IV;
- } else {
- return m_reg_IV | CURRENT_PA;
- }
-
- case HP_REG_PA_ADDR:
- return CURRENT_PA;
-
- case HP_REG_DMAPA_ADDR:
- tmp = m_dmapa & HP_REG_PA_MASK;
- if (BIT(m_flags , HPHYBRID_CB_BIT)) {
- BIT_SET(tmp , 15);
- }
- if (BIT(m_flags , HPHYBRID_DB_BIT)) {
- BIT_SET(tmp , 14);
- }
- return tmp;
-
- case HP_REG_DMAMA_ADDR:
- return m_dmama;
-
- case HP_REG_DMAC_ADDR:
- return m_dmac;
-
- case HP_REG_C_ADDR:
- return m_reg_C;
-
- case HP_REG_D_ADDR:
- return m_reg_D;
-
- default:
- // Unknown registers are returned as 0
- return 0;
- }
- } else {
- return m_direct->read_decrypted_word((offs_t)addr << 1);
- }
+ UINT16 tmp;
+
+ if (addr <= HP_REG_LAST_ADDR) {
+ // Memory mapped registers
+ switch (addr) {
+ case HP_REG_A_ADDR:
+ return m_reg_A;
+
+ case HP_REG_B_ADDR:
+ return m_reg_B;
+
+ case HP_REG_P_ADDR:
+ return m_reg_P;
+
+ case HP_REG_R_ADDR:
+ return m_reg_R;
+
+ case HP_REG_R4_ADDR:
+ case HP_REG_R5_ADDR:
+ case HP_REG_R6_ADDR:
+ case HP_REG_R7_ADDR:
+ return RIO(CURRENT_PA , addr - HP_REG_R4_ADDR);
+
+ case HP_REG_IV_ADDR:
+ // Correct?
+ if (!BIT(m_flags , HPHYBRID_IRH_SVC_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) {
+ return m_reg_IV;
+ } else {
+ return m_reg_IV | CURRENT_PA;
+ }
+
+ case HP_REG_PA_ADDR:
+ return CURRENT_PA;
+
+ case HP_REG_DMAPA_ADDR:
+ tmp = m_dmapa & HP_REG_PA_MASK;
+ if (BIT(m_flags , HPHYBRID_CB_BIT)) {
+ BIT_SET(tmp , 15);
+ }
+ if (BIT(m_flags , HPHYBRID_DB_BIT)) {
+ BIT_SET(tmp , 14);
+ }
+ return tmp;
+
+ case HP_REG_DMAMA_ADDR:
+ return m_dmama;
+
+ case HP_REG_DMAC_ADDR:
+ return m_dmac;
+
+ case HP_REG_C_ADDR:
+ return m_reg_C;
+
+ case HP_REG_D_ADDR:
+ return m_reg_D;
+
+ default:
+ // Unknown registers are returned as 0
+ return 0;
+ }
+ } else {
+ return m_direct->read_decrypted_word((offs_t)addr << 1);
+ }
}
void hp_hybrid_cpu_device::WM(UINT16 addr , UINT16 v)
{
- if (addr <= HP_REG_LAST_ADDR) {
- // Memory mapped registers
- switch (addr) {
- case HP_REG_A_ADDR:
- m_reg_A = v;
- break;
-
- case HP_REG_B_ADDR:
- m_reg_B = v;
- break;
-
- case HP_REG_P_ADDR:
- m_reg_P = v;
- break;
-
- case HP_REG_R_ADDR:
- m_reg_R = v;
- break;
-
- case HP_REG_R4_ADDR:
- case HP_REG_R5_ADDR:
- case HP_REG_R6_ADDR:
- case HP_REG_R7_ADDR:
- WIO(CURRENT_PA , addr - HP_REG_R4_ADDR , v);
- break;
-
- case HP_REG_IV_ADDR:
- m_reg_IV = v & HP_REG_IV_MASK;
- break;
-
- case HP_REG_PA_ADDR:
- CURRENT_PA = v & HP_REG_PA_MASK;
- break;
-
- case HP_REG_DMAPA_ADDR:
- m_dmapa = v & HP_REG_PA_MASK;
- break;
-
- case HP_REG_DMAMA_ADDR:
- m_dmama = v;
- break;
-
- case HP_REG_DMAC_ADDR:
- m_dmac = v;
- break;
-
- case HP_REG_C_ADDR:
- m_reg_C = v;
- break;
-
- case HP_REG_D_ADDR:
- m_reg_D = v;
- break;
-
- default:
- // Unknown registers are silently discarded
- break;
- }
- } else {
- m_program->write_word((offs_t)addr << 1 , v);
- }
+ if (addr <= HP_REG_LAST_ADDR) {
+ // Memory mapped registers
+ switch (addr) {
+ case HP_REG_A_ADDR:
+ m_reg_A = v;
+ break;
+
+ case HP_REG_B_ADDR:
+ m_reg_B = v;
+ break;
+
+ case HP_REG_P_ADDR:
+ m_reg_P = v;
+ break;
+
+ case HP_REG_R_ADDR:
+ m_reg_R = v;
+ break;
+
+ case HP_REG_R4_ADDR:
+ case HP_REG_R5_ADDR:
+ case HP_REG_R6_ADDR:
+ case HP_REG_R7_ADDR:
+ WIO(CURRENT_PA , addr - HP_REG_R4_ADDR , v);
+ break;
+
+ case HP_REG_IV_ADDR:
+ m_reg_IV = v & HP_REG_IV_MASK;
+ break;
+
+ case HP_REG_PA_ADDR:
+ CURRENT_PA = v & HP_REG_PA_MASK;
+ break;
+
+ case HP_REG_DMAPA_ADDR:
+ m_dmapa = v & HP_REG_PA_MASK;
+ break;
+
+ case HP_REG_DMAMA_ADDR:
+ m_dmama = v;
+ break;
+
+ case HP_REG_DMAC_ADDR:
+ m_dmac = v;
+ break;
+
+ case HP_REG_C_ADDR:
+ m_reg_C = v;
+ break;
+
+ case HP_REG_D_ADDR:
+ m_reg_D = v;
+ break;
+
+ default:
+ // Unknown registers are silently discarded
+ break;
+ }
+ } else {
+ m_program->write_word((offs_t)addr << 1 , v);
+ }
}
void hp_hybrid_cpu_device::WMB(UINT32 addr , UINT8 v)
{
- if (addr <= (HP_REG_LAST_ADDR * 2 + 1)) {
- // Cannot write bytes to registers
- } else {
- m_program->write_byte(addr , v);
- }
+ if (addr <= (HP_REG_LAST_ADDR * 2 + 1)) {
+ // Cannot write bytes to registers
+ } else {
+ m_program->write_byte(addr , v);
+ }
}
UINT16 hp_hybrid_cpu_device::RIO(UINT8 pa , UINT8 ic)
{
- return m_io->read_word(HP_MAKE_IOADDR(pa, ic) << 1);
+ return m_io->read_word(HP_MAKE_IOADDR(pa, ic) << 1);
}
void hp_hybrid_cpu_device::WIO(UINT8 pa , UINT8 ic , UINT16 v)
{
- m_io->write_word(HP_MAKE_IOADDR(pa, ic) << 1 , v);
+ m_io->write_word(HP_MAKE_IOADDR(pa, ic) << 1 , v);
}
hp_5061_3011_cpu_device::hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
diff --git a/src/emu/cpu/hphybrid/hphybrid.h b/src/emu/cpu/hphybrid/hphybrid.h
index 1d24a1cfd14..a4f7d3a1c79 100644
--- a/src/emu/cpu/hphybrid/hphybrid.h
+++ b/src/emu/cpu/hphybrid/hphybrid.h
@@ -24,7 +24,7 @@
// Input lines
#define HPHYBRID_IRH 0 // High-level interrupt
#define HPHYBRID_IRL 1 // Low-level interrupt
-#define HPHYBRID_INT_LVLS 2 // Levels of interrupt
+#define HPHYBRID_INT_LVLS 2 // Levels of interrupt
#define HPHYBRID_DMAR 2 // DMA request
#define HPHYBRID_HALT 3 // "Halt" input
@@ -66,76 +66,76 @@ class hp_hybrid_cpu_device : public cpu_device
{
public:
protected:
- hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
-
- // device-level overrides
- virtual void device_start();
- virtual void device_reset();
-
- // device_execute_interface overrides
- virtual UINT32 execute_min_cycles() const { return 6; }
- virtual UINT32 execute_max_cycles() const { return 25; }
- virtual UINT32 execute_input_lines() const { return 2; }
- virtual UINT32 execute_default_irq_vector() const { return 0xffff; }
- virtual void execute_run();
- virtual void execute_set_input(int inputnum, int state);
-
- UINT16 execute_one(UINT16 opcode);
- UINT16 execute_one_sub(UINT16 opcode);
-
- // device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
-
- // device_state_interface overrides
- void state_string_export(const device_state_entry &entry, std::string &str);
-
- // device_disasm_interface overrides
- virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
- virtual UINT32 disasm_max_opcode_bytes() const { return 2; }
- virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
+ hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
+
+ // device-level overrides
+ virtual void device_start();
+ virtual void device_reset();
+
+ // device_execute_interface overrides
+ virtual UINT32 execute_min_cycles() const { return 6; }
+ virtual UINT32 execute_max_cycles() const { return 25; }
+ virtual UINT32 execute_input_lines() const { return 2; }
+ virtual UINT32 execute_default_irq_vector() const { return 0xffff; }
+ virtual void execute_run();
+ virtual void execute_set_input(int inputnum, int state);
+
+ UINT16 execute_one(UINT16 opcode);
+ UINT16 execute_one_sub(UINT16 opcode);
+
+ // device_memory_interface overrides
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
+
+ // device_state_interface overrides
+ void state_string_export(const device_state_entry &entry, std::string &str);
+
+ // device_disasm_interface overrides
+ virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
+ virtual UINT32 disasm_max_opcode_bytes() const { return 2; }
+ virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
private:
- address_space_config m_program_config;
- address_space_config m_io_config;
-
- address_space *m_program;
- direct_read_data *m_direct;
- address_space *m_io;
- int m_icount;
-
- // State of processor
- UINT16 m_reg_A; // Register A
- UINT16 m_reg_B; // Register B
- UINT16 m_reg_P; // Register P
- UINT16 m_reg_R; // Register R
- UINT16 m_reg_C; // Register C
- UINT16 m_reg_D; // Register D
- UINT16 m_reg_IV; // Register IV
- UINT8 m_reg_PA[ HPHYBRID_INT_LVLS + 1 ]; // Stack of register PA (4 bit-long)
- UINT16 m_flags; // Flags (carry, overflow, cb, db, int en, dma en, dma dir)
- UINT8 m_dmapa; // DMA peripheral address (4 bits)
- UINT16 m_dmama; // DMA address
- UINT16 m_dmac; // DMA counter
- UINT16 m_reg_I; // Instruction register
-
- UINT16 get_ea(UINT16 opcode);
- void do_add(UINT16& addend1 , UINT16 addend2);
- UINT16 get_skip_addr(UINT16 opcode , bool condition) const;
- UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n);
- void do_pw(UINT16 opcode);
- void check_for_interrupts(void);
-
- UINT16 RM(UINT16 addr);
- void WM(UINT16 addr , UINT16 v);
- void WMB(UINT32 addr , UINT8 v);
- UINT16 RIO(UINT8 pa , UINT8 ic);
- void WIO(UINT8 pa , UINT8 ic , UINT16 v);
+ address_space_config m_program_config;
+ address_space_config m_io_config;
+
+ address_space *m_program;
+ direct_read_data *m_direct;
+ address_space *m_io;
+ int m_icount;
+
+ // State of processor
+ UINT16 m_reg_A; // Register A
+ UINT16 m_reg_B; // Register B
+ UINT16 m_reg_P; // Register P
+ UINT16 m_reg_R; // Register R
+ UINT16 m_reg_C; // Register C
+ UINT16 m_reg_D; // Register D
+ UINT16 m_reg_IV; // Register IV
+ UINT8 m_reg_PA[ HPHYBRID_INT_LVLS + 1 ]; // Stack of register PA (4 bit-long)
+ UINT16 m_flags; // Flags (carry, overflow, cb, db, int en, dma en, dma dir)
+ UINT8 m_dmapa; // DMA peripheral address (4 bits)
+ UINT16 m_dmama; // DMA address
+ UINT16 m_dmac; // DMA counter
+ UINT16 m_reg_I; // Instruction register
+
+ UINT16 get_ea(UINT16 opcode);
+ void do_add(UINT16& addend1 , UINT16 addend2);
+ UINT16 get_skip_addr(UINT16 opcode , bool condition) const;
+ UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n);
+ void do_pw(UINT16 opcode);
+ void check_for_interrupts(void);
+
+ UINT16 RM(UINT16 addr);
+ void WM(UINT16 addr , UINT16 v);
+ void WMB(UINT32 addr , UINT8 v);
+ UINT16 RIO(UINT8 pa , UINT8 ic);
+ void WIO(UINT8 pa , UINT8 ic , UINT16 v);
};
class hp_5061_3011_cpu_device : public hp_hybrid_cpu_device
{
public:
- hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
extern const device_type HP_5061_3011;
diff --git a/src/emu/cpu/hphybrid/hphybrid_dasm.c b/src/emu/cpu/hphybrid/hphybrid_dasm.c
index a74fb69963f..e9eddf49a96 100644
--- a/src/emu/cpu/hphybrid/hphybrid_dasm.c
+++ b/src/emu/cpu/hphybrid/hphybrid_dasm.c
@@ -11,84 +11,84 @@
typedef void (*fn_dis_param)(char *buffer , offs_t pc , UINT16 opcode);
typedef struct {
- UINT16 m_op_mask;
- UINT16 m_opcode;
- const char *m_mnemonic;
- fn_dis_param m_param_fn;
- UINT32 m_dasm_flags;
+ UINT16 m_op_mask;
+ UINT16 m_opcode;
+ const char *m_mnemonic;
+ fn_dis_param m_param_fn;
+ UINT32 m_dasm_flags;
} dis_entry_t;
static void addr_2_str(char *buffer , UINT16 addr , bool indirect)
{
- char *s = buffer + strlen(buffer);
+ char *s = buffer + strlen(buffer);
- s += sprintf(s , "$%04x" , addr);
+ s += sprintf(s , "$%04x" , addr);
- switch (addr) {
- case HP_REG_A_ADDR:
- strcpy(s , "(A)");
- break;
+ switch (addr) {
+ case HP_REG_A_ADDR:
+ strcpy(s , "(A)");
+ break;
- case HP_REG_B_ADDR:
- strcpy(s , "(B)");
- break;
+ case HP_REG_B_ADDR:
+ strcpy(s , "(B)");
+ break;
- case HP_REG_P_ADDR:
- strcpy(s , "(P)");
- break;
+ case HP_REG_P_ADDR:
+ strcpy(s , "(P)");
+ break;
- case HP_REG_R_ADDR:
- strcpy(s , "(R)");
- break;
+ case HP_REG_R_ADDR:
+ strcpy(s , "(R)");
+ break;
- case HP_REG_R4_ADDR:
- strcpy(s , "(R4)");
- break;
+ case HP_REG_R4_ADDR:
+ strcpy(s , "(R4)");
+ break;
- case HP_REG_R5_ADDR:
- strcpy(s , "(R5)");
- break;
+ case HP_REG_R5_ADDR:
+ strcpy(s , "(R5)");
+ break;
- case HP_REG_R6_ADDR:
- strcpy(s , "(R6)");
- break;
+ case HP_REG_R6_ADDR:
+ strcpy(s , "(R6)");
+ break;
- case HP_REG_R7_ADDR:
- strcpy(s , "(R7)");
- break;
+ case HP_REG_R7_ADDR:
+ strcpy(s , "(R7)");
+ break;
- case HP_REG_IV_ADDR:
- strcpy(s , "(IV)");
- break;
+ case HP_REG_IV_ADDR:
+ strcpy(s , "(IV)");
+ break;
- case HP_REG_PA_ADDR:
- strcpy(s , "(PA)");
- break;
+ case HP_REG_PA_ADDR:
+ strcpy(s , "(PA)");
+ break;
- case HP_REG_DMAPA_ADDR:
- strcpy(s , "(DMAPA)");
- break;
+ case HP_REG_DMAPA_ADDR:
+ strcpy(s , "(DMAPA)");
+ break;
- case HP_REG_DMAMA_ADDR:
- strcpy(s , "(DMAMA)");
- break;
+ case HP_REG_DMAMA_ADDR:
+ strcpy(s , "(DMAMA)");
+ break;
- case HP_REG_DMAC_ADDR:
- strcpy(s , "(DMAC)");
- break;
+ case HP_REG_DMAC_ADDR:
+ strcpy(s , "(DMAC)");
+ break;
- case HP_REG_C_ADDR:
- strcpy(s , "(C)");
- break;
+ case HP_REG_C_ADDR:
+ strcpy(s , "(C)");
+ break;
- case HP_REG_D_ADDR:
- strcpy(s , "(D)");
- break;
- }
+ case HP_REG_D_ADDR:
+ strcpy(s , "(D)");
+ break;
+ }
- if (indirect) {
- strcat(s , ",I");
- }
+ if (indirect) {
+ strcat(s , ",I");
+ }
}
static void param_none(char *buffer , offs_t pc , UINT16 opcode)
@@ -97,185 +97,185 @@ static void param_none(char *buffer , offs_t pc , UINT16 opcode)
static void param_loc(char *buffer , offs_t pc , UINT16 opcode)
{
- UINT16 base;
- UINT16 off;
-
- if (opcode & 0x0400) {
- // Current page
- base = pc;
- } else {
- // Base page
- base = 0;
- }
-
- off = opcode & 0x3ff;
- if (off & 0x200) {
- off -= 0x400;
- }
-
- addr_2_str(buffer , base + off , (opcode & 0x8000) != 0);
+ UINT16 base;
+ UINT16 off;
+
+ if (opcode & 0x0400) {
+ // Current page
+ base = pc;
+ } else {
+ // Base page
+ base = 0;
+ }
+
+ off = opcode & 0x3ff;
+ if (off & 0x200) {
+ off -= 0x400;
+ }
+
+ addr_2_str(buffer , base + off , (opcode & 0x8000) != 0);
}
static void param_addr32(char *buffer , offs_t pc , UINT16 opcode)
{
- addr_2_str(buffer , opcode & 0x1f , (opcode & 0x8000) != 0);
+ addr_2_str(buffer , opcode & 0x1f , (opcode & 0x8000) != 0);
}
static void param_skip(char *buffer , offs_t pc , UINT16 opcode)
{
- UINT16 off = opcode & 0x3f;
- if (off & 0x20) {
- off -= 0x40;
- }
- addr_2_str(buffer , pc + off , false);
+ UINT16 off = opcode & 0x3f;
+ if (off & 0x20) {
+ off -= 0x40;
+ }
+ addr_2_str(buffer , pc + off , false);
}
static void param_skip_sc(char *buffer , offs_t pc , UINT16 opcode)
{
- param_skip(buffer, pc, opcode);
-
- if (opcode & 0x80) {
- if (opcode & 0x40) {
- strcat(buffer , ",S");
- } else {
- strcat(buffer , ",C");
- }
- }
+ param_skip(buffer, pc, opcode);
+
+ if (opcode & 0x80) {
+ if (opcode & 0x40) {
+ strcat(buffer , ",S");
+ } else {
+ strcat(buffer , ",C");
+ }
+ }
}
static void param_ret(char *buffer , offs_t pc , UINT16 opcode)
{
- char *s = buffer + strlen(buffer);
+ char *s = buffer + strlen(buffer);
- int off = opcode & 0x3f;
+ int off = opcode & 0x3f;
- if (off & 0x20) {
- off -= 0x40;
- }
+ if (off & 0x20) {
+ off -= 0x40;
+ }
- s += sprintf(s , "%d" , off);
- if (opcode & 0x40) {
- strcpy(s , ",P");
- }
+ s += sprintf(s , "%d" , off);
+ if (opcode & 0x40) {
+ strcpy(s , ",P");
+ }
}
static void param_n16(char *buffer , offs_t pc , UINT16 opcode)
{
- char *s = buffer + strlen(buffer);
+ char *s = buffer + strlen(buffer);
- sprintf(s , "%u" , (opcode & 0xf) + 1);
+ sprintf(s , "%u" , (opcode & 0xf) + 1);
}
static void param_reg_id(char *buffer , offs_t pc , UINT16 opcode)
{
- addr_2_str(buffer, opcode & 7, false);
+ addr_2_str(buffer, opcode & 7, false);
- if (opcode & 0x80) {
- strcat(buffer , ",D");
- } else {
- strcat(buffer , ",I");
- }
+ if (opcode & 0x80) {
+ strcat(buffer , ",D");
+ } else {
+ strcat(buffer , ",I");
+ }
}
static const dis_entry_t dis_table[] = {
- // *** BPC Instructions ***
- {0xffff , 0x0000 , "NOP" , param_none , 0 },
- {0x7800 , 0x0000 , "LDA" , param_loc , 0 },
- {0x7800 , 0x0800 , "LDB" , param_loc , 0 },
- {0x7800 , 0x1000 , "CPA" , param_loc , 0 },
- {0x7800 , 0x1800 , "CPB" , param_loc , 0 },
- {0x7800 , 0x2000 , "ADA" , param_loc , 0 },
- {0x7800 , 0x2800 , "ADB" , param_loc , 0 },
- {0x7800 , 0x3000 , "STA" , param_loc , 0 },
- {0x7800 , 0x3800 , "STB" , param_loc , 0 },
- {0x7800 , 0x4000 , "JSM" , param_loc , DASMFLAG_STEP_OVER },
- {0x7800 , 0x4800 , "ISZ" , param_loc , 0 },
- {0x7800 , 0x5000 , "AND" , param_loc , 0 },
- {0x7800 , 0x5800 , "DSZ" , param_loc , 0 },
- {0x7800 , 0x6000 , "IOR" , param_loc , 0 },
- {0x7800 , 0x6800 , "JMP" , param_loc , 0 },
- {0x7fe0 , 0x7000 , "EXE" , param_addr32 , 0 },
- {0xffc0 , 0x7400 , "RZA" , param_skip , 0 },
- {0xffc0 , 0x7C00 , "RZB" , param_skip , 0 },
- {0xffc0 , 0x7440 , "RIA" , param_skip , 0 },
- {0xffc0 , 0x7C40 , "RIB" , param_skip , 0 },
- {0xffc0 , 0x7500 , "SZA" , param_skip , 0 },
- {0xffc0 , 0x7D00 , "SZB" , param_skip , 0 },
- {0xffc0 , 0x7540 , "SIA" , param_skip , 0 },
- {0xffc0 , 0x7D40 , "SIB" , param_skip , 0 },
- {0xffc0 , 0x7480 , "SFS" , param_skip , 0 },
- {0xffc0 , 0x7580 , "SFC" , param_skip , 0 },
- {0xffc0 , 0x7c80 , "SSS" , param_skip , 0 },
- {0xffc0 , 0x7d80 , "SSC" , param_skip , 0 },
- {0xffc0 , 0x7cc0 , "SHS" , param_skip , 0 },
- {0xffc0 , 0x7dc0 , "SHC" , param_skip , 0 },
- {0xff00 , 0x7600 , "SLA" , param_skip_sc , 0 },
- {0xff00 , 0x7e00 , "SLB" , param_skip_sc , 0 },
- {0xff00 , 0x7700 , "RLA" , param_skip_sc , 0 },
- {0xff00 , 0x7f00 , "RLB" , param_skip_sc , 0 },
- {0xff00 , 0xf400 , "SAP" , param_skip_sc , 0 },
- {0xff00 , 0xfc00 , "SBP" , param_skip_sc , 0 },
- {0xff00 , 0xf500 , "SAM" , param_skip_sc , 0 },
- {0xff00 , 0xfd00 , "SBM" , param_skip_sc , 0 },
- {0xff00 , 0xf600 , "SOC" , param_skip_sc , 0 },
- {0xff00 , 0xf700 , "SOS" , param_skip_sc , 0 },
- {0xff00 , 0xfe00 , "SEC" , param_skip_sc , 0 },
- {0xff00 , 0xff00 , "SES" , param_skip_sc , 0 },
- {0xffff , 0xf020 , "TCA" , param_none , 0 },
- {0xffff , 0xf820 , "TCB" , param_none , 0 },
- {0xffff , 0xf060 , "CMA" , param_none , 0 },
- {0xffff , 0xf860 , "CMB" , param_none , 0 },
- {0xff80 , 0xf080 , "RET" , param_ret , DASMFLAG_STEP_OUT },
- {0xfff0 , 0xf100 , "AAR" , param_n16 , 0 },
- {0xfff0 , 0xf900 , "ABR" , param_n16 , 0 },
- {0xffff , 0xf14f , "CLA" , param_none , 0 },
- {0xfff0 , 0xf140 , "SAR" , param_n16 , 0 },
- {0xffff , 0xf94f , "CLB" , param_none , 0 },
- {0xfff0 , 0xf940 , "SBR" , param_n16 , 0 },
- {0xfff0 , 0xf180 , "SAL" , param_n16 , 0 },
- {0xfff0 , 0xf980 , "SBL" , param_n16 , 0 },
- {0xfff0 , 0xf1c0 , "RAR" , param_n16 , 0 },
- {0xfff0 , 0xf9c0 , "RBR" , param_n16 , 0 },
- // *** IOC Instructions ***
- {0xffff , 0x7100 , "SDO" , param_none , 0 },
- {0xffff , 0x7108 , "SDI" , param_none , 0 },
- {0xffff , 0x7110 , "EIR" , param_none , 0 },
- {0xffff , 0x7118 , "DIR" , param_none , 0 },
- {0xffff , 0x7120 , "DMA" , param_none , 0 },
- {0xffff , 0x7128 , "PCM" , param_none , 0 },
- {0xffff , 0x7138 , "DDR" , param_none , 0 },
- {0xffff , 0x7140 , "DBL" , param_none , 0 },
- {0xffff , 0x7148 , "CBL" , param_none , 0 },
- {0xffff , 0x7150 , "DBU" , param_none , 0 },
- {0xffff , 0x7158 , "CBU" , param_none , 0 },
- {0xff78 , 0x7160 , "PWC" , param_reg_id , 0 },
- {0xff78 , 0x7168 , "PWD" , param_reg_id , 0 },
- {0xff78 , 0x7960 , "PBC" , param_reg_id , 0 },
- {0xff78 , 0x7968 , "PBD" , param_reg_id , 0 },
- {0xff78 , 0x7170 , "WWC" , param_reg_id , 0 },
- {0xff78 , 0x7178 , "WWD" , param_reg_id , 0 },
- {0xff78 , 0x7970 , "WBC" , param_reg_id , 0 },
- {0xff78 , 0x7978 , "WBD" , param_reg_id , 0 },
- // *** END ***
- {0 , 0 , NULL , NULL , 0 }
+ // *** BPC Instructions ***
+ {0xffff , 0x0000 , "NOP" , param_none , 0 },
+ {0x7800 , 0x0000 , "LDA" , param_loc , 0 },
+ {0x7800 , 0x0800 , "LDB" , param_loc , 0 },
+ {0x7800 , 0x1000 , "CPA" , param_loc , 0 },
+ {0x7800 , 0x1800 , "CPB" , param_loc , 0 },
+ {0x7800 , 0x2000 , "ADA" , param_loc , 0 },
+ {0x7800 , 0x2800 , "ADB" , param_loc , 0 },
+ {0x7800 , 0x3000 , "STA" , param_loc , 0 },
+ {0x7800 , 0x3800 , "STB" , param_loc , 0 },
+ {0x7800 , 0x4000 , "JSM" , param_loc , DASMFLAG_STEP_OVER },
+ {0x7800 , 0x4800 , "ISZ" , param_loc , 0 },
+ {0x7800 , 0x5000 , "AND" , param_loc , 0 },
+ {0x7800 , 0x5800 , "DSZ" , param_loc , 0 },
+ {0x7800 , 0x6000 , "IOR" , param_loc , 0 },
+ {0x7800 , 0x6800 , "JMP" , param_loc , 0 },
+ {0x7fe0 , 0x7000 , "EXE" , param_addr32 , 0 },
+ {0xffc0 , 0x7400 , "RZA" , param_skip , 0 },
+ {0xffc0 , 0x7C00 , "RZB" , param_skip , 0 },
+ {0xffc0 , 0x7440 , "RIA" , param_skip , 0 },
+ {0xffc0 , 0x7C40 , "RIB" , param_skip , 0 },
+ {0xffc0 , 0x7500 , "SZA" , param_skip , 0 },
+ {0xffc0 , 0x7D00 , "SZB" , param_skip , 0 },
+ {0xffc0 , 0x7540 , "SIA" , param_skip , 0 },
+ {0xffc0 , 0x7D40 , "SIB" , param_skip , 0 },
+ {0xffc0 , 0x7480 , "SFS" , param_skip , 0 },
+ {0xffc0 , 0x7580 , "SFC" , param_skip , 0 },
+ {0xffc0 , 0x7c80 , "SSS" , param_skip , 0 },
+ {0xffc0 , 0x7d80 , "SSC" , param_skip , 0 },
+ {0xffc0 , 0x7cc0 , "SHS" , param_skip , 0 },
+ {0xffc0 , 0x7dc0 , "SHC" , param_skip , 0 },
+ {0xff00 , 0x7600 , "SLA" , param_skip_sc , 0 },
+ {0xff00 , 0x7e00 , "SLB" , param_skip_sc , 0 },
+ {0xff00 , 0x7700 , "RLA" , param_skip_sc , 0 },
+ {0xff00 , 0x7f00 , "RLB" , param_skip_sc , 0 },
+ {0xff00 , 0xf400 , "SAP" , param_skip_sc , 0 },
+ {0xff00 , 0xfc00 , "SBP" , param_skip_sc , 0 },
+ {0xff00 , 0xf500 , "SAM" , param_skip_sc , 0 },
+ {0xff00 , 0xfd00 , "SBM" , param_skip_sc , 0 },
+ {0xff00 , 0xf600 , "SOC" , param_skip_sc , 0 },
+ {0xff00 , 0xf700 , "SOS" , param_skip_sc , 0 },
+ {0xff00 , 0xfe00 , "SEC" , param_skip_sc , 0 },
+ {0xff00 , 0xff00 , "SES" , param_skip_sc , 0 },
+ {0xffff , 0xf020 , "TCA" , param_none , 0 },
+ {0xffff , 0xf820 , "TCB" , param_none , 0 },
+ {0xffff , 0xf060 , "CMA" , param_none , 0 },
+ {0xffff , 0xf860 , "CMB" , param_none , 0 },
+ {0xff80 , 0xf080 , "RET" , param_ret , DASMFLAG_STEP_OUT },
+ {0xfff0 , 0xf100 , "AAR" , param_n16 , 0 },
+ {0xfff0 , 0xf900 , "ABR" , param_n16 , 0 },
+ {0xffff , 0xf14f , "CLA" , param_none , 0 },
+ {0xfff0 , 0xf140 , "SAR" , param_n16 , 0 },
+ {0xffff , 0xf94f , "CLB" , param_none , 0 },
+ {0xfff0 , 0xf940 , "SBR" , param_n16 , 0 },
+ {0xfff0 , 0xf180 , "SAL" , param_n16 , 0 },
+ {0xfff0 , 0xf980 , "SBL" , param_n16 , 0 },
+ {0xfff0 , 0xf1c0 , "RAR" , param_n16 , 0 },
+ {0xfff0 , 0xf9c0 , "RBR" , param_n16 , 0 },
+ // *** IOC Instructions ***
+ {0xffff , 0x7100 , "SDO" , param_none , 0 },
+ {0xffff , 0x7108 , "SDI" , param_none , 0 },
+ {0xffff , 0x7110 , "EIR" , param_none , 0 },
+ {0xffff , 0x7118 , "DIR" , param_none , 0 },
+ {0xffff , 0x7120 , "DMA" , param_none , 0 },
+ {0xffff , 0x7128 , "PCM" , param_none , 0 },
+ {0xffff , 0x7138 , "DDR" , param_none , 0 },
+ {0xffff , 0x7140 , "DBL" , param_none , 0 },
+ {0xffff , 0x7148 , "CBL" , param_none , 0 },
+ {0xffff , 0x7150 , "DBU" , param_none , 0 },
+ {0xffff , 0x7158 , "CBU" , param_none , 0 },
+ {0xff78 , 0x7160 , "PWC" , param_reg_id , 0 },
+ {0xff78 , 0x7168 , "PWD" , param_reg_id , 0 },
+ {0xff78 , 0x7960 , "PBC" , param_reg_id , 0 },
+ {0xff78 , 0x7968 , "PBD" , param_reg_id , 0 },
+ {0xff78 , 0x7170 , "WWC" , param_reg_id , 0 },
+ {0xff78 , 0x7178 , "WWD" , param_reg_id , 0 },
+ {0xff78 , 0x7970 , "WBC" , param_reg_id , 0 },
+ {0xff78 , 0x7978 , "WBD" , param_reg_id , 0 },
+ // *** END ***
+ {0 , 0 , NULL , NULL , 0 }
};
CPU_DISASSEMBLE(hp_hybrid)
{
- UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ];
- const dis_entry_t *p;
-
- for (p = dis_table; p->m_op_mask; p++) {
- if ((opcode & p->m_op_mask) == p->m_opcode) {
- strcpy(buffer , p->m_mnemonic);
- strcat(buffer , " ");
- p->m_param_fn(buffer , pc , opcode);
- return 1 | p->m_dasm_flags | DASMFLAG_SUPPORTED;
- }
- }
-
- // Unknown opcode
- strcpy(buffer , "???");
-
- return 1 | DASMFLAG_SUPPORTED;
+ UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ];
+ const dis_entry_t *p;
+
+ for (p = dis_table; p->m_op_mask; p++) {
+ if ((opcode & p->m_op_mask) == p->m_opcode) {
+ strcpy(buffer , p->m_mnemonic);
+ strcat(buffer , " ");
+ p->m_param_fn(buffer , pc , opcode);
+ return 1 | p->m_dasm_flags | DASMFLAG_SUPPORTED;
+ }
+ }
+
+ // Unknown opcode
+ strcpy(buffer , "???");
+
+ return 1 | DASMFLAG_SUPPORTED;
}
diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c
index 299d85b1f59..9ded05705f1 100644
--- a/src/emu/cpu/i86/i86.c
+++ b/src/emu/cpu/i86/i86.c
@@ -1915,9 +1915,9 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
break;
case 0xe4: // i_inal
- if (m_lock) m_lock_handler(1);
+ if (m_lock) m_lock_handler(1);
m_regs.b[AL] = read_port_byte( fetch() );
- if (m_lock) { m_lock_handler(0); m_lock = false; }
+ if (m_lock) { m_lock_handler(0); m_lock = false; }
CLK(IN_IMM8);
break;
diff --git a/src/emu/cpu/melps4/m58846.c b/src/emu/cpu/melps4/m58846.c
index 0bc2c8592b5..4d892d38307 100644
--- a/src/emu/cpu/melps4/m58846.c
+++ b/src/emu/cpu/melps4/m58846.c
@@ -76,7 +76,7 @@ void m58846_device::device_timer(emu_timer &timer, device_timer_id id, int param
{
if (id != 0)
return;
-
+
// timer 1: 7-bit fixed counter (manual specifically says 127)
if (++m_tmr_count[0] == 127)
{
@@ -84,7 +84,7 @@ void m58846_device::device_timer(emu_timer &timer, device_timer_id id, int param
m_irqflag[1] = true;
m_possible_irq = true;
}
-
+
// timer 2: 8-bit user defined counter with auto-reload
if (m_v & 8 && ++m_tmr_count[1] == 0)
{
@@ -107,7 +107,7 @@ void m58846_device::write_v(UINT8 data)
// d3: timer 2 enable
m_tmr_irq_enabled[0] = (data & 1) ? true : false;
m_possible_irq = true;
-
+
m_v = data;
}
diff --git a/src/emu/cpu/melps4/m58846.h b/src/emu/cpu/melps4/m58846.h
index 72d8253dd23..25d850b455e 100644
--- a/src/emu/cpu/melps4/m58846.h
+++ b/src/emu/cpu/melps4/m58846.h
@@ -33,7 +33,7 @@ protected:
// timers
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
virtual void write_v(UINT8 data);
-
+
emu_timer *m_timer;
void reset_timer();
};
diff --git a/src/emu/cpu/melps4/melps4.c b/src/emu/cpu/melps4/melps4.c
index 5b58d73bb55..9986407aad4 100644
--- a/src/emu/cpu/melps4/melps4.c
+++ b/src/emu/cpu/melps4/melps4.c
@@ -85,7 +85,7 @@ void melps4_cpu_device::device_start()
m_prgmask = (1 << m_prgwidth) - 1;
m_datamask = (1 << m_datawidth) - 1;
m_d_mask = (1 << m_d_pins) - 1;
-
+
// resolve callbacks
m_read_k.resolve_safe(0);
m_read_d.resolve_safe(0);
@@ -106,7 +106,7 @@ void melps4_cpu_device::device_start()
m_op = 0;
m_prev_op = 0;
m_bitmask = 0;
-
+
m_port_d = 0;
m_port_s = 0;
m_port_f = 0;
@@ -257,7 +257,7 @@ UINT8 melps4_cpu_device::read_gen_port(int port)
return m_port_s | m_read_s(port, 0xff);
case MELPS4_PORTF:
return m_port_f | (m_read_f(port, 0xff) & 0xf);
-
+
default:
break;
}
@@ -284,7 +284,7 @@ void melps4_cpu_device::write_gen_port(int port, UINT8 data)
case MELPS4_PORTU:
m_write_u(port, data & 1, 0xff);
break;
-
+
default:
break;
}
@@ -306,7 +306,7 @@ void melps4_cpu_device::write_d_pin(int bit, int state)
m_port_d = 0;
m_write_d(bit, 0, 0xffff);
}
-
+
// set/reset one port D pin
else
{
@@ -325,7 +325,7 @@ void melps4_cpu_device::write_d_pin(int bit, int state)
void melps4_cpu_device::execute_set_input(int line, int state)
{
state = (state) ? 1 : 0;
-
+
switch (line)
{
// external interrupt
@@ -338,7 +338,7 @@ void melps4_cpu_device::execute_set_input(int line, int state)
}
m_int_state = state;
break;
-
+
// timer input pin
case MELPS4_INPUT_LINE_T:
write_t_in(state);
@@ -353,14 +353,14 @@ void melps4_cpu_device::do_interrupt(int which)
{
m_inte = 0;
m_irqflag[which] = false;
-
+
m_icount--;
push_pc();
m_sms = m_sm;
m_sm = false;
m_op = 0; // fake nop
m_pc = m_int_page << 7 | (which * 2);
-
+
standard_irq_callback(which);
}
@@ -370,7 +370,7 @@ void melps4_cpu_device::check_interrupt()
return;
int which = 0;
-
+
// assume that lower irq vectors have higher priority
if (m_irqflag[0])
which = 0;
@@ -380,7 +380,7 @@ void melps4_cpu_device::check_interrupt()
which = 2;
else
return;
-
+
do_interrupt(which);
}
@@ -408,7 +408,7 @@ void melps4_cpu_device::execute_run()
// remember previous state
m_prev_op = m_op;
m_prev_pc = m_pc;
-
+
// Interrupts are not accepted during skips or LXY, LA, EI, DI, RT/RTS/RTI or any branch.
// Documentation is conflicting here: older docs say that it is allowed during skips,
// newer docs specifically say when interrupts are prohibited.
diff --git a/src/emu/cpu/melps4/melps4.h b/src/emu/cpu/melps4/melps4.h
index ac0724778f3..329ea035b13 100644
--- a/src/emu/cpu/melps4/melps4.h
+++ b/src/emu/cpu/melps4/melps4.h
@@ -191,7 +191,7 @@ protected:
UINT16 m_op;
UINT16 m_prev_op;
UINT8 m_bitmask; // opcode bit argument
-
+
UINT16 m_port_d; // last written port data
UINT8 m_port_s; // "
UINT8 m_port_f; // "
@@ -241,7 +241,7 @@ protected:
devcb_write8 m_write_g;
devcb_write8 m_write_u;
devcb_write_line m_write_t;
-
+
virtual void write_t_in(int state) { m_t_in_state = state; }
virtual void write_v(UINT8 data) { m_v = data; }
virtual void write_w(UINT8 data) { m_w = data; }
diff --git a/src/emu/cpu/melps4/melps4op.inc b/src/emu/cpu/melps4/melps4op.inc
index 382ecb1489b..f9afc5eda91 100644
--- a/src/emu/cpu/melps4/melps4op.inc
+++ b/src/emu/cpu/melps4/melps4op.inc
@@ -490,7 +490,7 @@ void melps4_cpu_device::op_b()
{
// B xy: branch
m_prohibit_irq = true;
-
+
// determine new page:
// - short call: subroutine page
// - short jump: current page, or sub. page + 1 when in sub. mode
@@ -503,9 +503,9 @@ void melps4_cpu_device::op_b()
}
else if (m_sm)
page = m_sm_page | (m_op >> 7 & 1);
-
+
m_pc = page << 7 | (m_op & 0x7f);
-
+
// if BA opcode was executed, set PC low 4 bits to A
if (m_ba_flag)
{
diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c
index 0fdb1edd946..bf00be5b984 100644
--- a/src/emu/cpu/mn10200/mn10200.c
+++ b/src/emu/cpu/mn10200/mn10200.c
@@ -539,7 +539,6 @@ void mn10200_device::execute_run()
{
while (m_cycles > 0)
{
-
// internal peripheral, external pin, or prev instruction may have changed irq state
while (m_possible_irq)
{
diff --git a/src/emu/info.c b/src/emu/info.c
index adb0f3468d4..d87cc529bb0 100644
--- a/src/emu/info.c
+++ b/src/emu/info.c
@@ -421,16 +421,16 @@ void info_xml_creator::output_devices()
if (shortnames.add(dev->shortname(), 0, FALSE) != TMERR_DUPLICATE)
output_one_device(*dev, temptag.c_str());
- // also, check for subdevices with ROMs (a few devices are missed otherwise, e.g. MPU401)
- device_iterator deviter2(*dev);
- for (device_t *device = deviter2.first(); device != NULL; device = deviter2.next())
- {
- if (device->owner() == dev && device->shortname()!= NULL && strlen(device->shortname())!=0)
- {
- if (shortnames.add(device->shortname(), 0, FALSE) != TMERR_DUPLICATE)
- output_one_device(*device, device->tag());
- }
- }
+ // also, check for subdevices with ROMs (a few devices are missed otherwise, e.g. MPU401)
+ device_iterator deviter2(*dev);
+ for (device_t *device = deviter2.first(); device != NULL; device = deviter2.next())
+ {
+ if (device->owner() == dev && device->shortname()!= NULL && strlen(device->shortname())!=0)
+ {
+ if (shortnames.add(device->shortname(), 0, FALSE) != TMERR_DUPLICATE)
+ output_one_device(*device, device->tag());
+ }
+ }
const_cast<machine_config &>(m_drivlist.config()).device_remove(&m_drivlist.config().root_device(), temptag.c_str());
}
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index 937c66db6f3..98bb8c2dacc 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -480,4 +480,4 @@ void riot6532_device::device_timer(emu_timer &timer, device_timer_id id, int par
default:
assert_always(FALSE, "Unknown id in riot6532_device::device_timer");
}
-} \ No newline at end of file
+}
diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h
index 75b3653489a..2825f31dc9d 100644
--- a/src/emu/machine/6532riot.h
+++ b/src/emu/machine/6532riot.h
@@ -113,7 +113,7 @@ private:
UINT8 m_timershift;
UINT8 m_timerstate;
emu_timer * m_timer;
-
+
enum
{
TIMER_END_CB
diff --git a/src/emu/machine/netlist.h b/src/emu/machine/netlist.h
index 3893807de07..191caca87ca 100644
--- a/src/emu/machine/netlist.h
+++ b/src/emu/machine/netlist.h
@@ -73,7 +73,7 @@ private:
pstring m_name;
};
-#define MEMREGION_SOURCE(_name) \
+#define MEMREGION_SOURCE(_name) \
setup.register_source(palloc(netlist_source_memregion_t, _name));
#define NETDEV_ANALOG_CALLBACK_MEMBER(_name) \
diff --git a/src/emu/machine/tms1024.c b/src/emu/machine/tms1024.c
index d728f7dfd28..f362349ef16 100644
--- a/src/emu/machine/tms1024.c
+++ b/src/emu/machine/tms1024.c
@@ -3,10 +3,10 @@
/*
Texas Instruments TMS1024/TMS1025 I/O expander
-
+
No documentation was available, just a pinout.
Other than more port pins, TMS1025 is assumed to be same as TMS1024.
-
+
TODO:
- writes to port 0
- what's the MS pin?
@@ -99,13 +99,13 @@ WRITE8_MEMBER(tms1024_device::write_s)
WRITE_LINE_MEMBER(tms1024_device::write_std)
{
state = (state) ? 1 : 0;
-
+
// output on rising edge
if (state && !m_std)
{
if (m_s != 0)
(*m_write_port[m_s-1])((offs_t)(m_s-1), m_h);
}
-
+
m_std = state;
}
diff --git a/src/emu/machine/tms1024.h b/src/emu/machine/tms1024.h
index e91c0ca5a2d..a7bdb4539bf 100644
--- a/src/emu/machine/tms1024.h
+++ b/src/emu/machine/tms1024.h
@@ -88,7 +88,7 @@ protected:
UINT8 m_h; // 4-bit data latch
UINT8 m_s; // 3-bit port select
UINT8 m_std; // strobe pin
-
+
// callbacks
devcb_write8 m_write_port1, m_write_port2, m_write_port3, m_write_port4, m_write_port5, m_write_port6, m_write_port7;
devcb_write8 *m_write_port[7];
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c
index a98004bb079..75acd004a85 100644
--- a/src/emu/netlist/devices/net_lib.c
+++ b/src/emu/netlist/devices/net_lib.c
@@ -54,7 +54,7 @@ void initialize_factory(factory_list_t &factory)
ENTRY(VCCS, VCCS, "-")
ENTRY(CCCS, CCCS, "-")
ENTRY(dummy_input, DUMMY_INPUT, "-")
- ENTRY(frontier, FRONTIER_DEV, "+I,G,Q") // not intended to be used directly
+ ENTRY(frontier, FRONTIER_DEV, "+I,G,Q") // not intended to be used directly
ENTRY(QBJT_EB, QBJT_EB, "model")
ENTRY(QBJT_switch, QBJT_SW, "model")
ENTRY(ttl_input, TTL_INPUT, "IN")
diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h
index 1da91d2a813..eb547c847e0 100644
--- a/src/emu/netlist/devices/nld_system.h
+++ b/src/emu/netlist/devices/nld_system.h
@@ -51,7 +51,7 @@
NET_C(_G, _name.G) \
NET_C(_OUT, _name.Q)
-#define OPTIMIZE_FRONTIER(_attach, _r_in, _r_out) \
+#define OPTIMIZE_FRONTIER(_attach, _r_in, _r_out) \
setup.register_frontier(# _attach, _r_in, _r_out);
#define RES_SWITCH(_name, _IN, _P1, _P2) \
diff --git a/src/emu/netlist/devices/nld_truthtable.c b/src/emu/netlist/devices/nld_truthtable.c
index c4030e8bff3..a5185c1fed1 100644
--- a/src/emu/netlist/devices/nld_truthtable.c
+++ b/src/emu/netlist/devices/nld_truthtable.c
@@ -238,11 +238,11 @@ void truthtable_desc_t::setup(const pstring_list_t &truthtable, UINT32 disabled_
}
-#define ENTRYX(_n,_m,_h) case (_n * 1000 + _m * 10 + _h): \
+#define ENTRYX(_n,_m,_h) case (_n * 1000 + _m * 10 + _h): \
{ typedef netlist_factory_truthtable_t<_n,_m,_h> xtype; \
- return palloc(xtype,name,classname,def_param); } break
+ return palloc(xtype,name,classname,def_param); } break
-#define ENTRYY(_n,_m) ENTRYX(_n,_m,0); ENTRYX(_n,_m,1)
+#define ENTRYY(_n,_m) ENTRYX(_n,_m,0); ENTRYX(_n,_m,1)
#define ENTRY(_n) ENTRYY(_n, 1); ENTRYY(_n, 2); ENTRYY(_n, 3); ENTRYY(_n, 4); ENTRYY(_n, 5); ENTRYY(_n, 6)
diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c
index 588b4e53f35..f5c585fc570 100644
--- a/src/emu/netlist/nl_base.c
+++ b/src/emu/netlist/nl_base.c
@@ -99,7 +99,6 @@ public:
const logic_family_desc_t *logic_family_desc_t::from_model(const pstring &model)
{
-
if (setup_t::model_value_str(model, "TYPE", "") == "TTL")
return &netlist_family_TTL;
if (setup_t::model_value_str(model, "TYPE", "") == "CD4000")
diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h
index b6347eb5fe8..a884370c647 100644
--- a/src/emu/netlist/nl_base.h
+++ b/src/emu/netlist/nl_base.h
@@ -170,9 +170,8 @@ typedef UINT8 netlist_sig_t;
// MACROS / netlist devices
//============================================================
-#define NETLIB_NAMESPACE_DEVICES_START() namespace netlist { namespace devices {
-
-#define NETLIB_NAMESPACE_DEVICES_END() }}
+#define NETLIB_NAMESPACE_DEVICES_START() namespace netlist { namespace devices {
+#define NETLIB_NAMESPACE_DEVICES_END() }}
#define NETLIB_NAME(_chip) nld_ ## _chip
@@ -292,7 +291,7 @@ namespace netlist
fatalerror_e(const char *format, va_list ap);
virtual ~fatalerror_e() throw() {}
- const pstring &text() { return m_text; }
+ const pstring &text() { return m_text; }
private:
pstring m_text;
};
@@ -432,7 +431,7 @@ namespace netlist
// -----------------------------------------------------------------------------
// netlist_owned_object_t
// -----------------------------------------------------------------------------
-
+
class owned_object_t : public object_t
{
NETLIST_PREVENT_COPYING(owned_object_t)
diff --git a/src/emu/netlist/nl_config.h b/src/emu/netlist/nl_config.h
index 439e779b1ce..debddd8b97c 100644
--- a/src/emu/netlist/nl_config.h
+++ b/src/emu/netlist/nl_config.h
@@ -17,42 +17,42 @@
/*
* The following options determine how object::update is called.
* NL_PMF_TYPE_VIRTUAL
- * Use stock virtual call
+ * Use stock virtual call
*
* NL_PMF_TYPE_GNUC_PMF
- * Use standard pointer to member function syntax
+ * Use standard pointer to member function syntax
*
- * NL_PMF_TYPE_GNUC_PMF_CONV
- * Use gnu extension and convert the pmf to a function pointer.
- * This is not standard compliant and needs
- * -Wno-pmf-conversions to compile.
+ * NL_PMF_TYPE_GNUC_PMF_CONV
+ * Use gnu extension and convert the pmf to a function pointer.
+ * This is not standard compliant and needs
+ * -Wno-pmf-conversions to compile.
*
- * NL_PMF_TYPE_INTERNAL
- * Use the same approach as MAME for deriving the function pointer.
- * This is compiler-dependant as well
+ * NL_PMF_TYPE_INTERNAL
+ * Use the same approach as MAME for deriving the function pointer.
+ * This is compiler-dependant as well
*
- * Benchmarks for ./nltool -c run -f src/mame/drivers/nl_pong.c -t 10 -n pong_fast
+ * Benchmarks for ./nltool -c run -f src/mame/drivers/nl_pong.c -t 10 -n pong_fast
*
- * NL_PMF_TYPE_INTERNAL: 215%
- * NL_PMF_TYPE_GNUC_PMF: 163%
- * NL_PMF_TYPE_GNUC_PMF_CONV: 215%
- * NL_PMF_TYPE_VIRTUAL: 213%
+ * NL_PMF_TYPE_INTERNAL: 215%
+ * NL_PMF_TYPE_GNUC_PMF: 163%
+ * NL_PMF_TYPE_GNUC_PMF_CONV: 215%
+ * NL_PMF_TYPE_VIRTUAL: 213%
*
- * The whole exercise was done to avoid virtual calls. In prior versions of
- * netlist, the INTERNAL and GNUC_PMF_CONV approach provided significant improvement.
- * Since than, ATTR_COLD was removed from functions declared as virtual.
- * This may explain that the recent benchmarks show no difference at all.
+ * The whole exercise was done to avoid virtual calls. In prior versions of
+ * netlist, the INTERNAL and GNUC_PMF_CONV approach provided significant improvement.
+ * Since than, ATTR_COLD was removed from functions declared as virtual.
+ * This may explain that the recent benchmarks show no difference at all.
*
- * Disappointing is the GNUC_PMF performance.
+ * Disappointing is the GNUC_PMF performance.
*/
// This will be autodetected
//#define NL_PMF_TYPE 3
-#define NL_PMF_TYPE_VIRTUAL 0
-#define NL_PMF_TYPE_GNUC_PMF 1
-#define NL_PMF_TYPE_GNUC_PMF_CONV 2
-#define NL_PMF_TYPE_INTERNAL 3
+#define NL_PMF_TYPE_VIRTUAL 0
+#define NL_PMF_TYPE_GNUC_PMF 1
+#define NL_PMF_TYPE_GNUC_PMF_CONV 2
+#define NL_PMF_TYPE_INTERNAL 3
#ifndef NL_PMF_TYPE
#if PHAS_PMF_INTERNAL
diff --git a/src/emu/netlist/nl_factory.c b/src/emu/netlist/nl_factory.c
index 7275a7bb772..a62c889baed 100644
--- a/src/emu/netlist/nl_factory.c
+++ b/src/emu/netlist/nl_factory.c
@@ -13,7 +13,6 @@
namespace netlist
{
-
// ----------------------------------------------------------------------------------------
// net_device_t_base_factory
// ----------------------------------------------------------------------------------------
diff --git a/src/emu/netlist/nl_factory.h b/src/emu/netlist/nl_factory.h
index e2cecebf7cd..2b29efca61f 100644
--- a/src/emu/netlist/nl_factory.h
+++ b/src/emu/netlist/nl_factory.h
@@ -16,7 +16,6 @@
namespace netlist
{
-
// -----------------------------------------------------------------------------
// net_dev class factory
// -----------------------------------------------------------------------------
diff --git a/src/emu/netlist/nl_lists.h b/src/emu/netlist/nl_lists.h
index 6aaaef22330..bea7508a7d8 100644
--- a/src/emu/netlist/nl_lists.h
+++ b/src/emu/netlist/nl_lists.h
@@ -19,7 +19,6 @@
namespace netlist
{
-
template <class _Element, class _Time>
class timed_queue
{
diff --git a/src/emu/netlist/nl_parser.h b/src/emu/netlist/nl_parser.h
index 1039e01997f..44074b8b9ca 100644
--- a/src/emu/netlist/nl_parser.h
+++ b/src/emu/netlist/nl_parser.h
@@ -14,7 +14,6 @@
namespace netlist
{
-
class parser_t : public ptokenizer
{
NETLIST_PREVENT_COPYING(parser_t)
diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c
index 68bc5452815..a135caf5598 100644
--- a/src/emu/netlist/nl_setup.c
+++ b/src/emu/netlist/nl_setup.c
@@ -39,7 +39,6 @@ NETLIST_END()
namespace netlist
{
-
setup_t::setup_t(netlist_t *netlist)
: m_netlist(netlist)
, m_proxy_cnt(0)
diff --git a/src/emu/netlist/nl_setup.h b/src/emu/netlist/nl_setup.h
index 2c6d341913c..ddc26ba8390 100644
--- a/src/emu/netlist/nl_setup.h
+++ b/src/emu/netlist/nl_setup.h
@@ -55,10 +55,9 @@
#define NETLIST_START(_name) \
ATTR_COLD void NETLIST_NAME(_name)(netlist::setup_t &setup) \
{
-
#define NETLIST_END() }
-#define LOCAL_SOURCE(_name) \
+#define LOCAL_SOURCE(_name) \
setup.register_source(palloc(netlist::source_proc_t, # _name, &NETLIST_NAME(_name)));
#define INCLUDE(_name) \
@@ -75,7 +74,6 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist::setup_t &setup)
namespace netlist
{
-
// Forward definition so we keep nl_factory.h out of the public
class factory_list_t;
@@ -282,8 +280,8 @@ namespace netlist
public:
source_proc_t(pstring name, void (*setup_func)(setup_t &))
: setup_t::source_t(),
- m_setup_func(setup_func),
- m_setup_func_name(name)
+ m_setup_func(setup_func),
+ m_setup_func_name(name)
{
}
diff --git a/src/emu/netlist/nl_time.h b/src/emu/netlist/nl_time.h
index 72079b8d17b..4473b67d2c8 100644
--- a/src/emu/netlist/nl_time.h
+++ b/src/emu/netlist/nl_time.h
@@ -27,7 +27,6 @@
namespace netlist
{
-
struct netlist_time
{
public:
diff --git a/src/emu/netlist/plib/pconfig.h b/src/emu/netlist/plib/pconfig.h
index cfb4fe8fb60..1918ec61fb6 100644
--- a/src/emu/netlist/plib/pconfig.h
+++ b/src/emu/netlist/plib/pconfig.h
@@ -145,10 +145,10 @@ public:
// construct from any member function pointer
class generic_class;
typedef void (*generic_function)();
-
+
#if (PSTANDALONE)
typedef std::size_t FPTR;
- #endif
+ #endif
template<typename _MemberFunctionType>
pmfp(_MemberFunctionType mfp)
diff --git a/src/emu/netlist/plib/plists.h b/src/emu/netlist/plib/plists.h
index 4193f4956cc..0f71a35c9e4 100644
--- a/src/emu/netlist/plib/plists.h
+++ b/src/emu/netlist/plib/plists.h
@@ -97,7 +97,7 @@ public:
plist_t() : std::vector<_ListClass>() {}
plist_t(const int numElements) : std::vector<_ListClass>(numElements) {}
- void add(const _ListClass &elem) { this->push_back(elem); }
+ void add(const _ListClass &elem) { this->push_back(elem); }
void clear_and_free()
{
for (_ListClass *i = this->data(); i < this->data() + this->size(); i++)
@@ -106,7 +106,7 @@ public:
}
this->clear();
}
- bool contains(const _ListClass &elem) const
+ bool contains(const _ListClass &elem) const
{
for (const _ListClass *i = this->data(); i < this->data() + this->size(); i++)
{
@@ -116,7 +116,7 @@ public:
return false;
}
- void remove(const _ListClass &elem)
+ void remove(const _ListClass &elem)
{
for (int i = 0; i < this->size(); i++)
{
@@ -127,12 +127,12 @@ public:
}
}
}
- void remove_at(const int pos)
+ void remove_at(const int pos)
{
this->erase(this->begin() + pos);
}
- int indexof(const _ListClass &elem) const
+ int indexof(const _ListClass &elem) const
{
for (int i = 0; i < this->size(); i++)
{
@@ -539,7 +539,6 @@ public:
pstring_list_t(const pstring &str, const pstring &onstr, bool ignore_empty = false)
: plist_t<pstring>()
{
-
int p = 0;
int pn;
@@ -607,9 +606,9 @@ static inline void psort_list(Class &sl)
{
for(int i = 0; i < (int) sl.size() - 1; i++)
{
- for(int j = i + 1; j < sl.size(); j++)
- if(sl[i] > sl[j])
- std::swap(sl[i], sl[j]);
+ for(int j = i + 1; j < sl.size(); j++)
+ if(sl[i] > sl[j])
+ std::swap(sl[i], sl[j]);
}
}
diff --git a/src/emu/netlist/solver/mat_cr.h b/src/emu/netlist/solver/mat_cr.h
index 9322a74c045..4972bc21a29 100644
--- a/src/emu/netlist/solver/mat_cr.h
+++ b/src/emu/netlist/solver/mat_cr.h
@@ -19,7 +19,7 @@ struct mat_cr_t
unsigned nz_num;
unsigned ia[_storage_N + 1];
unsigned ja[_storage_N * _storage_N];
- unsigned diag[_storage_N]; /* n */
+ unsigned diag[_storage_N]; /* n */
void mult_vec(const double * RESTRICT A, const double * RESTRICT x, double * RESTRICT res)
{
@@ -85,14 +85,14 @@ struct mat_cr_t
/*
* Solve a linear equation Ax = r
* where
- * A = L*U
+ * A = L*U
*
- * L unit lower triangular
- * U upper triangular
+ * L unit lower triangular
+ * U upper triangular
*
* ==> LUx = r
*
- * ==> Ux = L⁻¹r = w
+ * ==> Ux = L?????r = w
*
* ==> r = Lw
*
diff --git a/src/emu/netlist/solver/nld_ms_direct.h b/src/emu/netlist/solver/nld_ms_direct.h
index e8eb9898ed8..e9acd1d2415 100644
--- a/src/emu/netlist/solver/nld_ms_direct.h
+++ b/src/emu/netlist/solver/nld_ms_direct.h
@@ -250,7 +250,7 @@ ATTR_COLD void matrix_solver_direct_t<m_N, _storage_N>::vsetup(analog_net_t::lis
}
psort_list(t->m_nzrd);
- t->m_nz.add(k); // add diagonal
+ t->m_nz.add(k); // add diagonal
psort_list(t->m_nz);
}
@@ -388,8 +388,8 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
/* The code below is 30% faster than the original
* implementation which is given here for reference.
*
- * for (unsigned k = i + 1; k < kN; k++)
- * m_A[j][k] = m_A[j][k] + m_A[i][k] * f1;
+ * for (unsigned k = i + 1; k < kN; k++)
+ * m_A[j][k] = m_A[j][k] + m_A[i][k] * f1;
*/
double * RESTRICT d = &m_A[j][i+1];
const double * RESTRICT s = &m_A[i][i+1];
diff --git a/src/emu/netlist/solver/nld_ms_gmres.h b/src/emu/netlist/solver/nld_ms_gmres.h
index 6ed58ac4498..f3f5bf43d00 100644
--- a/src/emu/netlist/solver/nld_ms_gmres.h
+++ b/src/emu/netlist/solver/nld_ms_gmres.h
@@ -78,10 +78,10 @@ private:
double m_c[_storage_N + 1]; /* mr + 1 */
double m_g[_storage_N + 1]; /* mr + 1 */
- double * RESTRICT m_ht[_storage_N]; /* mr, (mr + 1) */
- double m_s[_storage_N]; /* mr + 1 */
- double * RESTRICT m_v[_storage_N + 1]; /*(mr + 1), n */
- //double m_y[_storage_N]; /* mr + 1 */
+ double * RESTRICT m_ht[_storage_N]; /* mr, (mr + 1) */
+ double m_s[_storage_N]; /* mr + 1 */
+ double * RESTRICT m_v[_storage_N + 1]; /*(mr + 1), n */
+ //double m_y[_storage_N]; /* mr + 1 */
double m_accuracy_mult;
@@ -234,7 +234,7 @@ ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(c
if (gsl>=failed)
{
//for (int k = 0; k < iN; k++)
- // this->m_nets[k]->m_cur_Analog = new_V[k];
+ // this->m_nets[k]->m_cur_Analog = new_V[k];
// Fallback to direct solver ...
this->m_gs_fail++;
return matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(newton_raphson);
@@ -264,11 +264,11 @@ ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(c
static inline void givens_mult( const double c, const double s, double * RESTRICT g0, double * RESTRICT g1 )
{
- const double tg0 = c * *g0 - s * *g1;
- const double tg1 = s * *g0 + c * *g1;
+ const double tg0 = c * *g0 - s * *g1;
+ const double tg1 = s * *g0 + c * *g1;
- *g0 = tg0;
- *g1 = tg1;
+ *g0 = tg0;
+ *g1 = tg1;
}
template <unsigned m_N, unsigned _storage_N>
@@ -289,10 +289,10 @@ int matrix_solver_GMRES_t<m_N, _storage_N>::solve_ilu_gmres (double * RESTRICT x
*
* Yousef Saad,
* Iterative Methods for Sparse Linear Systems,
- * Second Edition,
- * SIAM, 20003,
- * ISBN: 0898715342,
- * LC: QA188.S17.
+ * Second Edition,
+ * SIAM, 20003,
+ * ISBN: 0898715342,
+ * LC: QA188.S17.
*
*------------------------------------------------------------------------*/
diff --git a/src/emu/netlist/solver/nld_ms_sor_mat.h b/src/emu/netlist/solver/nld_ms_sor_mat.h
index dbb3c7563d4..8498633c4d9 100644
--- a/src/emu/netlist/solver/nld_ms_sor_mat.h
+++ b/src/emu/netlist/solver/nld_ms_sor_mat.h
@@ -175,7 +175,7 @@ ATTR_HOT inline int matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve_non_dynamic
s = s + nl_math::abs(this->m_A[k][i]);
akk = s / akk - 1.0;
if ( akk > lambdaN)
- lambdaN = akk;
+ lambdaN = akk;
if (akk < lambda1)
lambda1 = akk;
#endif
diff --git a/src/emu/netlist/solver/vector_base.h b/src/emu/netlist/solver/vector_base.h
index 3d3a1028b2a..e0ad8139296 100644
--- a/src/emu/netlist/solver/vector_base.h
+++ b/src/emu/netlist/solver/vector_base.h
@@ -17,7 +17,6 @@
template <unsigned _storage_N>
struct pvector
{
-
pvector(unsigned size)
: m_N(size) { }
diff --git a/src/emu/netlist/tools/nl_convert.c b/src/emu/netlist/tools/nl_convert.c
index 698bb6a5a4d..f1629308404 100644
--- a/src/emu/netlist/tools/nl_convert.c
+++ b/src/emu/netlist/tools/nl_convert.c
@@ -17,15 +17,15 @@ static plist_t<int> bubble(const pnamedlist_t<Class *> &sl)
ret[i] = i;
for(int i=0; i < sl.size()-1;i++)
- {
- for(int j=i+1; j < sl.size(); j++)
- {
- if(sl[ret[i]]->name() > sl[ret[j]]->name())
- {
- std::swap(ret[i], ret[j]);
- }
- }
- }
+ {
+ for(int j=i+1; j < sl.size(); j++)
+ {
+ if(sl[ret[i]]->name() > sl[ret[j]]->name())
+ {
+ std::swap(ret[i], ret[j]);
+ }
+ }
+ }
return ret;
}
@@ -179,7 +179,7 @@ nl_convert_base_t::unit_t nl_convert_base_t::m_units[] = {
{"M", "CAP_M(%g)", 1.0e-3 },
{"u", "CAP_U(%g)", 1.0e-6 }, /* eagle */
{"U", "CAP_U(%g)", 1.0e-6 },
- {"µ", "CAP_U(%g)", 1.0e-6 },
+ {"??", "CAP_U(%g)", 1.0e-6 },
{"N", "CAP_N(%g)", 1.0e-9 },
{"P", "CAP_P(%g)", 1.0e-12},
{"F", "%ge-15", 1.0e-15},
@@ -444,7 +444,7 @@ void nl_convert_eagle_t::convert(const pstring &contents)
pstring devname = token.str();
pstring pin = tok.get_string();
add_term(netname, devname + "." + pin);
- token = tok.get_token(); }
+ token = tok.get_token(); }
}
else
{
@@ -454,5 +454,3 @@ void nl_convert_eagle_t::convert(const pstring &contents)
}
}
-
-
diff --git a/src/emu/netlist/tools/nl_convert.h b/src/emu/netlist/tools/nl_convert.h
index 4a0efd020a7..d2e2d238718 100644
--- a/src/emu/netlist/tools/nl_convert.h
+++ b/src/emu/netlist/tools/nl_convert.h
@@ -164,7 +164,6 @@ public:
class eagle_tokenizer : public ptokenizer
{
-
public:
eagle_tokenizer(nl_convert_eagle_t &convert)
: ptokenizer(), m_convert(convert)
diff --git a/src/emu/softlist.c b/src/emu/softlist.c
index b9719d29a33..fdfd980aeea 100644
--- a/src/emu/softlist.c
+++ b/src/emu/softlist.c
@@ -557,13 +557,13 @@ void software_list_device::internal_validity_check(validity_checker &valid)
break;
}
- // Did we lost the software parts?
- if (swinfo->num_parts() == 0)
- {
- osd_printf_error("%s: %s has no part\n", filename(), swinfo->shortname());
- break;
- }
-
+ // Did we lost the software parts?
+ if (swinfo->num_parts() == 0)
+ {
+ osd_printf_error("%s: %s has no part\n", filename(), swinfo->shortname());
+ break;
+ }
+
// Second, since the xml is fine, run additional checks:
// check for duplicate names
diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c
index c164bc53413..15a3ba68273 100644
--- a/src/emu/sound/c352.c
+++ b/src/emu/sound/c352.c
@@ -489,7 +489,7 @@ void c352_device::device_start()
divider=332;
break;
}
-
+
m_sample_rate_base = clock() / divider;
m_stream = machine().sound().stream_alloc(*this, 0, 4, m_sample_rate_base);
diff --git a/src/emu/sound/c352.h b/src/emu/sound/c352.h
index 0717fd133df..75a00bbab71 100644
--- a/src/emu/sound/c352.h
+++ b/src/emu/sound/c352.h
@@ -26,7 +26,7 @@ enum
#define MCFG_C352_DIVIDER(_setting) \
c352_device::static_set_divider(*device, _setting);
-
+
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@@ -43,7 +43,7 @@ public:
// inline configuration helpers
static void static_set_divider(device_t &device, int setting);
-
+
DECLARE_READ16_MEMBER(read);
DECLARE_WRITE16_MEMBER(write);
@@ -108,7 +108,7 @@ private:
c352_ch_t m_c352_ch[32];
int m_sample_rate_base;
int m_divider;
-
+
long m_channel_l[2048*2];
long m_channel_r[2048*2];
long m_channel_l2[2048*2];
diff --git a/src/emu/sound/n63701x.c b/src/emu/sound/n63701x.c
index db90445f0cf..a1308c36713 100644
--- a/src/emu/sound/n63701x.c
+++ b/src/emu/sound/n63701x.c
@@ -47,7 +47,7 @@ namco_63701x_device::namco_63701x_device(const machine_config &mconfig, const ch
void namco_63701x_device::device_start()
{
m_stream = stream_alloc(0, 2, clock()/1000);
-
+
for (int i = 0; i < 2; i++)
{
save_item(NAME(m_voices[i].select), i);
diff --git a/src/emu/sound/st0016.c b/src/emu/sound/st0016.c
index d62332496cb..99328a93b4d 100644
--- a/src/emu/sound/st0016.c
+++ b/src/emu/sound/st0016.c
@@ -45,7 +45,7 @@ void st0016_device::device_start()
{
m_stream = stream_alloc(0, 2, 44100);
m_ram_read_cb.resolve_safe(0);
-
+
save_item(NAME(m_vpos));
save_item(NAME(m_frac));
save_item(NAME(m_lponce));
diff --git a/src/emu/sound/tms5110r.inc b/src/emu/sound/tms5110r.inc
index 40ec66b8f4d..41abe5caea4 100644
--- a/src/emu/sound/tms5110r.inc
+++ b/src/emu/sound/tms5110r.inc
@@ -39,19 +39,19 @@
*/
/* Chip types based on die marks from decap:
- chip type
- |||||| rom number
- |||||| |||||
- VVVVVV VVVVV
- T0280A 0281 = 1978 speak & spell, unknown difference to below, assumed same? uses old chirp
- T0280B 0281A = 1979 speak & spell, also == TMS5100, uses old chirp
- ?????? ????? (no decap; likely 'T0280D 0281D') = 1980 speak & spell, 1981 speak & spell compact, changed energy table, otherwise same as above, uses old chirp
- T0280F 2801A = 1980 speak & math, 1980 speak and read, uses old chirp
- ?????? ????? (no decap; likely 'T0280F 2802') = touch and tell, language translator; uses a unique chirp rom.
- ?????? ????? = TMS5110
- T0280F 5110A = TMS5110AN2L
-
-
+ chip type
+ |||||| rom number
+ |||||| |||||
+ VVVVVV VVVVV
+ T0280A 0281 = 1978 speak & spell, unknown difference to below, assumed same? uses old chirp
+ T0280B 0281A = 1979 speak & spell, also == TMS5100, uses old chirp
+ ?????? ????? (no decap; likely 'T0280D 0281D') = 1980 speak & spell, 1981 speak & spell compact, changed energy table, otherwise same as above, uses old chirp
+ T0280F 2801A = 1980 speak & math, 1980 speak and read, uses old chirp
+ ?????? ????? (no decap; likely 'T0280F 2802') = touch and tell, language translator; uses a unique chirp rom.
+ ?????? ????? = TMS5110
+ T0280F 5110A = TMS5110AN2L
+
+
*/
/* chip rom contents defines */
@@ -111,9 +111,9 @@ struct tms5100_coeffs
#define TI_0280_2801_PATENT_PITCH \
/* P */\
{ 0, 41, 43, 45, 47, 49, 51, 53, \
- 55, 58, 60, 63, 66, 70, 73, 76, \
- 79, 83, 87, 90, 94, 99, 103, 107, \
- 112, 118, 123, 129, 134, 140, 147, 153 },
+ 55, 58, 60, 63, 66, 70, 73, 76, \
+ 79, 83, 87, 90, 94, 99, 103, 107, \
+ 112, 118, 123, 129, 134, 140, 147, 153 },
#define TI_2802_PITCH \
/* P */\
@@ -155,14 +155,14 @@ struct tms5100_coeffs
#define TI_0280_PATENT_LPC \
/* K1 */\
{ -501, -497, -493, -488, -480, -471, -460, -446,\
- -427, -405, -378, -344, -305, -259, -206, -148,\
- -86, -21, 45, 110, 171, 227, 277, 320,\
- 357, 388, 413, 434, 451, 464, 474, 498 },\
+ -427, -405, -378, -344, -305, -259, -206, -148,\
+ -86, -21, 45, 110, 171, 227, 277, 320,\
+ 357, 388, 413, 434, 451, 464, 474, 498 },\
/* K2 */\
{ -349, -328, -305, -280, -252, -223, -192, -158,\
- -124, -88, -51, -14, 23, 60, 97, 133,\
- 167, 199, 230, 259, 286, 310, 333, 354,\
- 372, 389, 404, 417, 429, 439, 449, 506 },\
+ -124, -88, -51, -14, 23, 60, 97, 133,\
+ 167, 199, 230, 259, 286, 310, 333, 354,\
+ 372, 389, 404, 417, 429, 439, 449, 506 },\
/* K3 */\
{ -397, -365, -327, -282, -229, -170, -104, -36,\
35, 104, 169, 228, 281, 326, 364, 396 },\
@@ -188,17 +188,17 @@ struct tms5100_coeffs
#define TI_2801_2501E_LPC \
/* K1 */\
{ -501, -498, -495, -490, -485, -478, -469, -459,\
- -446, -431, -412, -389, -362, -331, -295, -253,\
- -207, -156, -102, -45, 13, 70, 126, 179,\
- 228, 272, 311, 345, 374, 399, 420, 437 },\
+ -446, -431, -412, -389, -362, -331, -295, -253,\
+ -207, -156, -102, -45, 13, 70, 126, 179,\
+ 228, 272, 311, 345, 374, 399, 420, 437 },\
/* K2 */\
{ -376, -357, -335, -312, -286, -258, -227, -195,\
- -161, -124, -87, -49, -10, 29, 68, 106,\
- 143, 178, 212, 243, 272, 299, 324, 346,\
- 366, 384, 400, 414, 427, 438, 448, 506 },\
+ -161, -124, -87, -49, -10, 29, 68, 106,\
+ 143, 178, 212, 243, 272, 299, 324, 346,\
+ 366, 384, 400, 414, 427, 438, 448, 506 },\
/* K3 */\
{ -407, -381, -349, -311, -268, -218, -162, -102,\
- -39, 25, 89, 149, 206, 257, 302, 341 },\
+ -39, 25, 89, 149, 206, 257, 302, 341 },\
/* K4 */\
{ -290, -252, -209, -163, -114, -62, -9, 44,\
97, 147, 194, 238, 278, 313, 344, 371 },\
@@ -207,7 +207,7 @@ struct tms5100_coeffs
49, 101, 150, 196, 239, 278, 313, 344 },\
/* K6 */\
{ -193, -152, -109, -65, -20, 26, 71, 115,\
- 158, 198, 235, 270, 301, 330, 355, 377 },\
+ 158, 198, 235, 270, 301, 330, 355, 377 },\
/* K7 */\
{ -254, -218, -180, -140, -97, -53, -8, 36,\
81, 124, 165, 204, 240, 274, 304, 332 },\
@@ -222,26 +222,26 @@ struct tms5100_coeffs
#define TI_2802_LPC \
/* K1 */\
{ -501, -498, -495, -490, -485, -478, -469, -459,\
- -446, -431, -412, -389, -362, -331, -295, -253,\
- -207, -156, -102, -45, 13, 70, 126, 179,\
- 228, 272, 311, 345, 374, 399, 420, 437},\
+ -446, -431, -412, -389, -362, -331, -295, -253,\
+ -207, -156, -102, -45, 13, 70, 126, 179,\
+ 228, 272, 311, 345, 374, 399, 420, 437},\
/* K2 */\
{ -376, -357, -335, -312, -286, -258, -227, -195,\
- -161, -124, -87, -49, -10, 29, 68, 106,\
- 143, 178, 212, 243, 272, 299, 324, 346,\
- 366, 384, 400, 414, 427, 438, 448, 506},\
+ -161, -124, -87, -49, -10, 29, 68, 106,\
+ 143, 178, 212, 243, 272, 299, 324, 346,\
+ 366, 384, 400, 414, 427, 438, 448, 506},\
/* K3 */\
{ -407, -381, -349, -311, -268, -218, -162, -102,\
- -39, 25, 89, 149, 206, 257, 302, 341},\
+ -39, 25, 89, 149, 206, 257, 302, 341},\
/* K4 */\
{ -289, -248, -202, -152, -98, -43, 14, 71,\
- 125, 177, 225, 269, 307, 341, 371, 506},\
+ 125, 177, 225, 269, 307, 341, 371, 506},\
/* K5 */\
{ -318, -283, -245, -202, -156, -107, -56, -3,\
49, 101, 150, 196, 239, 278, 313, 344},\
/* K6 */\
{ -193, -152, -109, -65, -20, 26, 71, 115,\
- 158, 198, 235, 270, 301, 330, 355, 377},\
+ 158, 198, 235, 270, 301, 330, 355, 377},\
/* K7 */\
{ -254, -218, -180, -140, -97, -53, -8, 36,\
81, 124, 165, 204, 240, 274, 304, 332},\
@@ -255,20 +255,20 @@ struct tms5100_coeffs
#define TI_5110_5220_LPC \
/* K1 */\
{ -501, -498, -497, -495, -493, -491, -488, -482,\
- -478, -474, -469, -464, -459, -452, -445, -437,\
- -412, -380, -339, -288, -227, -158, -81, -1,\
+ -478, -474, -469, -464, -459, -452, -445, -437,\
+ -412, -380, -339, -288, -227, -158, -81, -1,\
80, 157, 226, 287, 337, 379, 411, 436 },\
/* K2 */\
{ -328, -303, -274, -244, -211, -175, -138, -99,\
- -59, -18, 24, 64, 105, 143, 180, 215,\
- 248, 278, 306, 331, 354, 374, 392, 408,\
- 422, 435, 445, 455, 463, 470, 476, 506 },\
+ -59, -18, 24, 64, 105, 143, 180, 215,\
+ 248, 278, 306, 331, 354, 374, 392, 408,\
+ 422, 435, 445, 455, 463, 470, 476, 506 },\
/* K3 */\
{ -441, -387, -333, -279, -225, -171, -117, -63,\
-9, 45, 98, 152, 206, 260, 314, 368 },\
/* K4 */\
{ -328, -273, -217, -161, -106, -50, 5, 61,\
- 116, 172, 228, 283, 339, 394, 450, 506 },\
+ 116, 172, 228, 283, 339, 394, 450, 506 },\
/* K5 */\
{ -328, -282, -235, -189, -142, -96, -50, -3,\
43, 90, 136, 182, 229, 275, 322, 368 },\
@@ -469,7 +469,7 @@ static const struct tms5100_coeffs T0280F_2802_coeff =
/* interpolation coefficients */
{ 3, 3, 3, 2, 2, 1, 1, 0 }
};
-
+
/* TMS5110A:
(1984-90 era? early chips may be called TMS5110C; later chips past 1988 or so may be called TSP5110A)
The TMS5110A LPC coefficients were originally read from an actual TMS5110A
diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c
index 0d2abed892a..5d8377569bb 100644
--- a/src/emu/sound/x1_010.c
+++ b/src/emu/sound/x1_010.c
@@ -22,7 +22,7 @@ Registers:
Reg: Bits: Meaning:
0 7--- ---- Frequency divider flag (only downtown seems to set this)
- -654 3---
+ -654 3---
---- -2-- PCM/Waveform repeat flag (0:Ones 1:Repeat) (*1)
---- --1- Sound out select (0:PCM 1:Waveform)
---- ---0 Key on / off
diff --git a/src/emu/video/clgd542x.c b/src/emu/video/clgd542x.c
index aee97491ef1..854611d1c80 100644
--- a/src/emu/video/clgd542x.c
+++ b/src/emu/video/clgd542x.c
@@ -296,7 +296,7 @@ void cirrus_gd5428_device::start_bitblt()
else
{
UINT8 pixel = (vga.memory[m_blt_source_current % vga.svga_intf.vram_size] >> (7-(x % 8)) & 0x01) ? vga.gc.enable_set_reset : vga.gc.set_reset; // use GR0/1/10/11 background/foreground regs
-
+
copy_pixel(pixel, vga.memory[m_blt_dest_current % vga.svga_intf.vram_size]);
if((x % 8) == 7 && !(m_blt_mode & 0x40)) // don't increment if a pattern (it's only 8 bits)
m_blt_source_current++;
@@ -1403,7 +1403,7 @@ WRITE8_MEMBER(cirrus_gd5428_device::mem_w)
if(svga.rgb8_en)
{
if(data & (0x01 << (7-i)))
- vga.memory[((addr+offset)*8+i) % vga.svga_intf.vram_size] = vga.gc.enable_set_reset;
+ vga.memory[((addr+offset)*8+i) % vga.svga_intf.vram_size] = vga.gc.enable_set_reset;
}
else if(svga.rgb15_en || svga.rgb16_en)
{
diff --git a/src/emu/video/rgbsse.h b/src/emu/video/rgbsse.h
index 47716fd19e6..bc8251d5833 100644
--- a/src/emu/video/rgbsse.h
+++ b/src/emu/video/rgbsse.h
@@ -23,10 +23,10 @@ extern const struct _rgbsse_statics
{
__m128 dummy_for_alignment;
INT16 maxbyte[8];
- INT16 alpha_mask[8];
- INT16 red_mask[8];
- INT16 green_mask[8];
- INT16 blue_mask[8];
+ INT16 alpha_mask[8];
+ INT16 red_mask[8];
+ INT16 green_mask[8];
+ INT16 blue_mask[8];
INT16 scale_table[256][8];
} rgbsse_statics;
@@ -434,7 +434,7 @@ public:
}
protected:
- __m128i m_value;
+ __m128i m_value;
};
#endif /* __RGBSSE__ */
diff --git a/src/emu/video/rgbvmx.h b/src/emu/video/rgbvmx.h
index 5f1cb71acdb..3a85059c9a8 100644
--- a/src/emu/video/rgbvmx.h
+++ b/src/emu/video/rgbvmx.h
@@ -487,19 +487,19 @@ public:
}
protected:
- typedef vector unsigned char VECU8;
- typedef vector signed short VECS16;
- typedef vector unsigned short VECU16;
- typedef vector signed int VECS32;
- typedef vector unsigned int VECU32;
-
- vector VECU32 m_value;
-
- static const VECU8 alpha_perm;
- static const VECU8 red_perm;
- static const VECU8 green_perm;
- static const VECU8 blue_perm;
- static const VECS16 scale_table[256];
+ typedef vector unsigned char VECU8;
+ typedef vector signed short VECS16;
+ typedef vector unsigned short VECU16;
+ typedef vector signed int VECS32;
+ typedef vector unsigned int VECU32;
+
+ vector VECU32 m_value;
+
+ static const VECU8 alpha_perm;
+ static const VECU8 red_perm;
+ static const VECU8 green_perm;
+ static const VECU8 blue_perm;
+ static const VECS16 scale_table[256];
};
diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h
index a45640143d1..ff6b39bf478 100644
--- a/src/emu/video/vooddefs.h
+++ b/src/emu/video/vooddefs.h
@@ -1,4 +1,4 @@
- // license:BSD-3-Clause
+ // license:BSD-3-Clause
// copyright-holders:Aaron Giles
/***************************************************************************
@@ -2212,13 +2212,13 @@ INLINE UINT32 clampARGB(INT32 iterr, INT32 iterg, INT32 iterb, INT32 itera, UINT
//if (r == 0xfff)
rgbaint_t temp(colorint);
temp.cmpeq_imm(0xfff);
- // result.rgb.r = 0;
+ // result.rgb.r = 0;
temp.xor_imm(0xffffffff);
colorint.and_reg(temp);
//else if (r == 0x100)
temp.set(colorint);
temp.cmpeq_imm(0x100);
- // result.rgb.r = 0xff;
+ // result.rgb.r = 0xff;
colorint.or_reg(temp);
return colorint.to_rgba();
}
@@ -3842,15 +3842,15 @@ INLINE bool depthTest(UINT16 zaColorReg, stats_block *stats, INT32 destDepth, UI
\
/* perform alpha blending */ \
APPLY_ALPHA_BLEND(FBZMODE, ALPHAMODE, XX, DITHER, r, g, b, a); \
- } else { \
+ } else { \
/* perform fogging */ \
rgb_union preFog; \
preFog.u = color.u; \
applyFogging(VV, FOGMODE, FBZCOLORPATH, XX, DITHER4, fogdepth, color, ITERZ, ITERW, ITERAXXX); \
/* perform alpha blending */ \
alphaBlend(FBZMODE, ALPHAMODE, XX, DITHER, dest[XX], depth, preFog, color); \
- a = color.rgb.a; r = color.rgb.r; g = color.rgb.g; b = color.rgb.b; \
- } \
+ a = color.rgb.a; r = color.rgb.r; g = color.rgb.g; b = color.rgb.b; \
+ } \
/* modify the pixel for debugging purposes */ \
MODIFY_PIXEL(VV); \
\
@@ -4589,7 +4589,7 @@ static void raster_##name(void *destbase, INT32 y, const poly_extent *extent, co
} \
\
/* colorpath pipeline selects source colors and does blending */ \
- iterargb.u = clampARGB(iterr, iterg, iterb, itera, FBZCOLORPATH); \
+ iterargb.u = clampARGB(iterr, iterg, iterb, itera, FBZCOLORPATH); \
if (!combineColor(v, stats, FBZCOLORPATH, FBZMODE, ALPHAMODE, texel, iterz, iterw, iterargb, color)) \
goto skipdrawdepth; \
} \
diff --git a/src/lib/formats/flopimg.c b/src/lib/formats/flopimg.c
index 116edca5b1f..e2ee5122b2c 100644
--- a/src/lib/formats/flopimg.c
+++ b/src/lib/formats/flopimg.c
@@ -2565,7 +2565,7 @@ void floppy_image_format_t::extract_sectors_from_bitstream_fm_pc(const UINT8 *bi
}
// f8, f9, fa, fb
if(shift_reg == 0xf56a || shift_reg == 0xf56b ||
- shift_reg == 0xf56e || shift_reg == 0xf56f) { // data mark
+ shift_reg == 0xf56e || shift_reg == 0xf56f) { // data mark
if(dblk_count < 100)
dblk[dblk_count++] = i+1;
}
diff --git a/src/lib/formats/jvc_dsk.c b/src/lib/formats/jvc_dsk.c
index 20ee3508ee9..30ec8287f22 100644
--- a/src/lib/formats/jvc_dsk.c
+++ b/src/lib/formats/jvc_dsk.c
@@ -55,7 +55,7 @@ bool jvc_format::parse_header(io_generic *io, int &header_size, int &tracks, int
switch (header_size)
{
- case 5: emu_fatalerror("jvc_format: sector attribute flag unsupported\n");
+ case 5: emu_fatalerror("jvc_format: sector attribute flag unsupported\n");
break;
case 4: base_sector_id = header[3];
// no break
diff --git a/src/lib/formats/svi_dsk.c b/src/lib/formats/svi_dsk.c
index 0c76aace591..aaa6a45e709 100644
--- a/src/lib/formats/svi_dsk.c
+++ b/src/lib/formats/svi_dsk.c
@@ -118,7 +118,7 @@ bool svi_format::save(io_generic *io, floppy_image *image)
for (int head = 0; head < head_count; head++)
{
// skip track 0, head 0
- if (track == 0) { if (head_count == 1) break; else head++; }
+ if (track == 0) { if (head_count == 1) break; else head++; }
generate_bitstream_from_track(track, head, 2000, bitstream, track_size, image);
extract_sectors_from_bitstream_mfm_pc(bitstream, track_size, sectors, sector_data, sizeof(sector_data));
@@ -140,4 +140,3 @@ bool svi_format::supports_save() const
}
const floppy_format_type FLOPPY_SVI_FORMAT = &floppy_image_format_creator<svi_format>;
-
diff --git a/src/lib/formats/trs80_dsk.c b/src/lib/formats/trs80_dsk.c
index acd122144d1..4a0a2bf5e49 100644
--- a/src/lib/formats/trs80_dsk.c
+++ b/src/lib/formats/trs80_dsk.c
@@ -8,8 +8,8 @@
Used by Jeff Vavasour's TRS-80 Emulators
- TODO:
- - Gap sizes unverified
+ TODO:
+ - Gap sizes unverified
***************************************************************************/
diff --git a/src/lib/formats/vdk_dsk.c b/src/lib/formats/vdk_dsk.c
index 518d48ddd90..896815c26ad 100644
--- a/src/lib/formats/vdk_dsk.c
+++ b/src/lib/formats/vdk_dsk.c
@@ -102,7 +102,7 @@ bool vdk_format::save(io_generic *io, floppy_image *image)
header[0] = 'd';
header[1] = 'k';
header[2] = sizeof(header) % 0x100;
- header[3] = sizeof(header) / 0x100;
+ header[3] = sizeof(header) / 0x100;
header[4] = 0x10;
header[5] = 0x10;
header[6] = 'M';
diff --git a/src/lib/formats/wd177x_dsk.c b/src/lib/formats/wd177x_dsk.c
index 839b03b0dce..69458af0335 100644
--- a/src/lib/formats/wd177x_dsk.c
+++ b/src/lib/formats/wd177x_dsk.c
@@ -204,7 +204,6 @@ bool wd177x_format::load(io_generic *io, UINT32 form_factor, floppy_image *image
for(int track=0; track < f.track_count; track++)
for(int head=0; head < f.head_count; head++) {
-
if (f.encoding == floppy_image::FM)
desc[14].p1 = get_track_dam_fm(f, head, track);
else
diff --git a/src/lib/util/avhuff.c b/src/lib/util/avhuff.c
index cb00ab23336..d9fdecb46cc 100644
--- a/src/lib/util/avhuff.c
+++ b/src/lib/util/avhuff.c
@@ -174,11 +174,11 @@ inline UINT32 avhuff_decoder::deltarle_decoder::decode_one(bitstream_in &bitbuf)
//**************************************************************************
/**
- * @fn avhuff_encoder::avhuff_encoder()
+ * @fn avhuff_encoder::avhuff_encoder()
*
- * @brief -------------------------------------------------
- * avhuff_encoder - constructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * avhuff_encoder - constructor
+ * -------------------------------------------------.
*/
avhuff_encoder::avhuff_encoder()
@@ -189,17 +189,17 @@ m_flac_encoder.set_strip_metadata(true);
}
/**
- * @fn avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength)
+ * @fn avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength)
*
- * @brief -------------------------------------------------
- * encode_data - encode a block of data into a compressed data stream
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * encode_data - encode a block of data into a compressed data stream
+ * -------------------------------------------------.
*
- * @param source Source for the.
- * @param [in,out] dest If non-null, destination for the.
- * @param [in,out] complength The complength.
+ * @param source Source for the.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param [in,out] complength The complength.
*
- * @return An avhuff_error.
+ * @return An avhuff_error.
*/
avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength)
@@ -278,15 +278,15 @@ avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT3
}
/**
- * @fn UINT32 avhuff_encoder::raw_data_size(const UINT8 *data)
+ * @fn UINT32 avhuff_encoder::raw_data_size(const UINT8 *data)
*
- * @brief -------------------------------------------------
- * raw_data_size - return the raw data size of a raw stream based on the header
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * raw_data_size - return the raw data size of a raw stream based on the header
+ * -------------------------------------------------.
*
- * @param data The data.
+ * @param data The data.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 avhuff_encoder::raw_data_size(const UINT8 *data)
@@ -308,21 +308,21 @@ UINT32 avhuff_encoder::raw_data_size(const UINT8 *data)
}
/**
- * @fn avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize)
+ * @fn avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize)
*
- * @brief -------------------------------------------------
- * assemble_data - assemble a datastream from raw bits
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * assemble_data - assemble a datastream from raw bits
+ * -------------------------------------------------.
*
- * @param [in,out] buffer The buffer.
- * @param [in,out] bitmap The bitmap.
- * @param channels The channels.
- * @param numsamples The numsamples.
- * @param [in,out] samples If non-null, the samples.
- * @param [in,out] metadata If non-null, the metadata.
- * @param metadatasize The metadatasize.
+ * @param [in,out] buffer The buffer.
+ * @param [in,out] bitmap The bitmap.
+ * @param channels The channels.
+ * @param numsamples The numsamples.
+ * @param [in,out] samples If non-null, the samples.
+ * @param [in,out] metadata If non-null, the metadata.
+ * @param metadatasize The metadatasize.
*
- * @return An avhuff_error.
+ * @return An avhuff_error.
*/
avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize)
@@ -378,19 +378,19 @@ avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16
}
/**
- * @fn avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes)
+ * @fn avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes)
*
- * @brief -------------------------------------------------
- * encode_audio - encode raw audio data to the destination
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * encode_audio - encode raw audio data to the destination
+ * -------------------------------------------------.
*
- * @param source Source for the.
- * @param channels The channels.
- * @param samples The samples.
- * @param [in,out] dest If non-null, destination for the.
- * @param [in,out] sizes If non-null, the sizes.
+ * @param source Source for the.
+ * @param channels The channels.
+ * @param samples The samples.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param [in,out] sizes If non-null, the sizes.
*
- * @return An avhuff_error.
+ * @return An avhuff_error.
*/
avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes)
@@ -511,19 +511,19 @@ avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int
}
/**
- * @fn avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength)
+ * @fn avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength)
*
- * @brief -------------------------------------------------
- * encode_video - encode raw video data to the destination
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * encode_video - encode raw video data to the destination
+ * -------------------------------------------------.
*
- * @param source Source for the.
- * @param width The width.
- * @param height The height.
- * @param [in,out] dest If non-null, destination for the.
- * @param [in,out] complength The complength.
+ * @param source Source for the.
+ * @param width The width.
+ * @param height The height.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param [in,out] complength The complength.
*
- * @return An avhuff_error.
+ * @return An avhuff_error.
*/
avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength)
@@ -533,20 +533,20 @@ avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int he
}
/**
- * @fn avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength)
+ * @fn avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength)
*
- * @brief -------------------------------------------------
- * encode_video_lossless - do a lossless video encoding using deltas and huffman
- * encoding
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * encode_video_lossless - do a lossless video encoding using deltas and huffman
+ * encoding
+ * -------------------------------------------------.
*
- * @param source Source for the.
- * @param width The width.
- * @param height The height.
- * @param [in,out] dest If non-null, destination for the.
- * @param [in,out] complength The complength.
+ * @param source Source for the.
+ * @param width The width.
+ * @param height The height.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param [in,out] complength The complength.
*
- * @return An avhuff_error.
+ * @return An avhuff_error.
*/
avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength)
@@ -601,18 +601,18 @@ avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int widt
//**************************************************************************
/**
- * @fn UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count)
+ * @fn UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count)
*
- * @brief -------------------------------------------------
- * rle_and_histo_bitmap - RLE compress and histogram a bitmap's worth of data
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * rle_and_histo_bitmap - RLE compress and histogram a bitmap's worth of data
+ * -------------------------------------------------.
*
- * @param source Source for the.
- * @param items_per_row The items per row.
- * @param item_advance The item advance.
- * @param row_count Number of rows.
+ * @param source Source for the.
+ * @param items_per_row The items per row.
+ * @param item_advance The item advance.
+ * @param row_count Number of rows.
*
- * @return null if it fails, else an UINT16*.
+ * @return null if it fails, else an UINT16*.
*/
UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count)
@@ -679,11 +679,11 @@ UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *sour
//**************************************************************************
/**
- * @fn avhuff_decoder::avhuff_decoder()
+ * @fn avhuff_decoder::avhuff_decoder()
*
- * @brief -------------------------------------------------
- * avhuff_decoder - constructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * avhuff_decoder - constructor
+ * -------------------------------------------------.
*/
avhuff_decoder::avhuff_decoder()
@@ -691,13 +691,13 @@ avhuff_decoder::avhuff_decoder()
}
/**
- * @fn void avhuff_decoder::configure(const avhuff_decompress_config &config)
+ * @fn void avhuff_decoder::configure(const avhuff_decompress_config &config)
*
- * @brief -------------------------------------------------
- * configure - configure decompression parameters
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * configure - configure decompression parameters
+ * -------------------------------------------------.
*
- * @param config The configuration.
+ * @param config The configuration.
*/
void avhuff_decoder::configure(const avhuff_decompress_config &config)
@@ -712,17 +712,17 @@ void avhuff_decoder::configure(const avhuff_decompress_config &config)
}
/**
- * @fn avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest)
+ * @fn avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest)
*
- * @brief -------------------------------------------------
- * decode_data - decode both audio and video from a raw data stream
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * decode_data - decode both audio and video from a raw data stream
+ * -------------------------------------------------.
*
- * @param source Source for the.
- * @param complength The complength.
- * @param [in,out] dest If non-null, destination for the.
+ * @param source Source for the.
+ * @param complength The complength.
+ * @param [in,out] dest If non-null, destination for the.
*
- * @return An avhuff_error.
+ * @return An avhuff_error.
*/
avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest)
@@ -853,23 +853,23 @@ avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength,
}
/**
- * @fn avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes)
+ * @fn avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes)
*
- * @brief -------------------------------------------------
- * decode_audio - decode audio from a compressed data stream
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * decode_audio - decode audio from a compressed data stream
+ * -------------------------------------------------.
*
- * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
- * condition occurs.
+ * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
+ * condition occurs.
*
- * @param channels The channels.
- * @param samples The samples.
- * @param source Source for the.
- * @param [in,out] dest If non-null, destination for the.
- * @param dxor The dxor.
- * @param sizes The sizes.
+ * @param channels The channels.
+ * @param samples The samples.
+ * @param source Source for the.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param dxor The dxor.
+ * @param sizes The sizes.
*
- * @return An avhuff_error.
+ * @return An avhuff_error.
*/
avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes)
@@ -991,21 +991,21 @@ avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8
}
/**
- * @fn avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor)
+ * @fn avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor)
*
- * @brief -------------------------------------------------
- * decode_video - decode video from a compressed data stream
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * decode_video - decode video from a compressed data stream
+ * -------------------------------------------------.
*
- * @param width The width.
- * @param height The height.
- * @param source Source for the.
- * @param complength The complength.
- * @param [in,out] dest If non-null, destination for the.
- * @param dstride The dstride.
- * @param dxor The dxor.
+ * @param width The width.
+ * @param height The height.
+ * @param source Source for the.
+ * @param complength The complength.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param dstride The dstride.
+ * @param dxor The dxor.
*
- * @return An avhuff_error.
+ * @return An avhuff_error.
*/
avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor)
@@ -1018,22 +1018,22 @@ avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *so
}
/**
- * @fn avhuff_error avhuff_decoder::decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor)
+ * @fn avhuff_error avhuff_decoder::decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor)
*
- * @brief -------------------------------------------------
- * decode_video_lossless - do a lossless video decoding using deltas and huffman
- * encoding
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * decode_video_lossless - do a lossless video decoding using deltas and huffman
+ * encoding
+ * -------------------------------------------------.
*
- * @param width The width.
- * @param height The height.
- * @param source Source for the.
- * @param complength The complength.
- * @param [in,out] dest If non-null, destination for the.
- * @param dstride The dstride.
- * @param dxor The dxor.
+ * @param width The width.
+ * @param height The height.
+ * @param source Source for the.
+ * @param complength The complength.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param dstride The dstride.
+ * @param dxor The dxor.
*
- * @return An avhuff_error.
+ * @return An avhuff_error.
*/
avhuff_error avhuff_decoder::decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor)
diff --git a/src/lib/util/aviio.c b/src/lib/util/aviio.c
index dcc14428716..06b603e0e31 100644
--- a/src/lib/util/aviio.c
+++ b/src/lib/util/aviio.c
@@ -19,136 +19,136 @@
***************************************************************************/
/**
- * @def FILETYPE_READ
+ * @def FILETYPE_READ
*
- * @brief A macro that defines filetype read.
+ * @brief A macro that defines filetype read.
*/
#define FILETYPE_READ 1
/**
- * @def FILETYPE_CREATE
+ * @def FILETYPE_CREATE
*
- * @brief A macro that defines filetype create.
+ * @brief A macro that defines filetype create.
*/
#define FILETYPE_CREATE 2
-/** @brief Size of the maximum riff. */
+/** @brief Size of the maximum riff. */
#define MAX_RIFF_SIZE (2UL * 1024 * 1024 * 1024 - 1024) /* just under 2GB */
-/** @brief The maximum avi size in gigabytes. */
+/** @brief The maximum avi size in gigabytes. */
#define MAX_AVI_SIZE_IN_GB (256)
/**
- * @def FOUR_GB
+ * @def FOUR_GB
*
- * @brief A macro that defines four gigabytes.
+ * @brief A macro that defines four gigabytes.
*/
#define FOUR_GB ((UINT64)1 << 32)
/**
- * @def MAX_SOUND_CHANNELS
+ * @def MAX_SOUND_CHANNELS
*
- * @brief A macro that defines maximum sound channels.
+ * @brief A macro that defines maximum sound channels.
*/
#define MAX_SOUND_CHANNELS 2
/**
- * @def SOUND_BUFFER_MSEC
+ * @def SOUND_BUFFER_MSEC
*
- * @brief A macro that defines sound buffer msec.
+ * @brief A macro that defines sound buffer msec.
*/
#define SOUND_BUFFER_MSEC 2000 /* milliseconds of sound buffering */
-/** @brief The chunktype riff. */
+/** @brief The chunktype riff. */
#define CHUNKTYPE_RIFF AVI_FOURCC('R','I','F','F')
-/** @brief List of chunktypes. */
+/** @brief List of chunktypes. */
#define CHUNKTYPE_LIST AVI_FOURCC('L','I','S','T')
-/** @brief The chunktype junk. */
+/** @brief The chunktype junk. */
#define CHUNKTYPE_JUNK AVI_FOURCC('J','U','N','K')
-/** @brief The chunktype avih. */
+/** @brief The chunktype avih. */
#define CHUNKTYPE_AVIH AVI_FOURCC('a','v','i','h')
-/** @brief The chunktype strh. */
+/** @brief The chunktype strh. */
#define CHUNKTYPE_STRH AVI_FOURCC('s','t','r','h')
-/** @brief The chunktype strf. */
+/** @brief The chunktype strf. */
#define CHUNKTYPE_STRF AVI_FOURCC('s','t','r','f')
-/** @brief The first chunktype index. */
+/** @brief The first chunktype index. */
#define CHUNKTYPE_IDX1 AVI_FOURCC('i','d','x','1')
-/** @brief The chunktype indx. */
+/** @brief The chunktype indx. */
#define CHUNKTYPE_INDX AVI_FOURCC('i','n','d','x')
-/** @brief The chunktype xxdb. */
+/** @brief The chunktype xxdb. */
#define CHUNKTYPE_XXDB AVI_FOURCC(0x00,0x00,'d','b')
-/** @brief The chunktype xxdc. */
+/** @brief The chunktype xxdc. */
#define CHUNKTYPE_XXDC AVI_FOURCC(0x00,0x00,'d','c')
-/** @brief The chunktype xxwb. */
+/** @brief The chunktype xxwb. */
#define CHUNKTYPE_XXWB AVI_FOURCC(0x00,0x00,'w','b')
-/** @brief The chunktype ixxx. */
+/** @brief The chunktype ixxx. */
#define CHUNKTYPE_IXXX AVI_FOURCC('i','x',0x00,0x00)
-/** @brief The chunktype xx mask. */
+/** @brief The chunktype xx mask. */
#define CHUNKTYPE_XX_MASK AVI_FOURCC(0x00,0x00,0xff,0xff)
-/** @brief The listtype avi. */
+/** @brief The listtype avi. */
#define LISTTYPE_AVI AVI_FOURCC('A','V','I',' ')
-/** @brief The listtype avix. */
+/** @brief The listtype avix. */
#define LISTTYPE_AVIX AVI_FOURCC('A','V','I','X')
-/** @brief The listtype hdrl. */
+/** @brief The listtype hdrl. */
#define LISTTYPE_HDRL AVI_FOURCC('h','d','r','l')
-/** @brief The listtype strl. */
+/** @brief The listtype strl. */
#define LISTTYPE_STRL AVI_FOURCC('s','t','r','l')
-/** @brief The listtype movi. */
+/** @brief The listtype movi. */
#define LISTTYPE_MOVI AVI_FOURCC('m','o','v','i')
-/** @brief The streamtype vids. */
+/** @brief The streamtype vids. */
#define STREAMTYPE_VIDS AVI_FOURCC('v','i','d','s')
-/** @brief The streamtype auds. */
+/** @brief The streamtype auds. */
#define STREAMTYPE_AUDS AVI_FOURCC('a','u','d','s')
-/** @brief The handler bitmap. */
+/** @brief The handler bitmap. */
#define HANDLER_DIB AVI_FOURCC('D','I','B',' ')
-/** @brief The handler hfyu. */
+/** @brief The handler hfyu. */
#define HANDLER_HFYU AVI_FOURCC('h','f','y','u')
/* main AVI header files */
/**
- * @def AVIF_HASINDEX
+ * @def AVIF_HASINDEX
*
- * @brief A macro that defines avif hasindex.
+ * @brief A macro that defines avif hasindex.
*/
#define AVIF_HASINDEX 0x00000010
/**
- * @def AVIF_MUSTUSEINDEX
+ * @def AVIF_MUSTUSEINDEX
*
- * @brief A macro that defines avif mustuseindex.
+ * @brief A macro that defines avif mustuseindex.
*/
#define AVIF_MUSTUSEINDEX 0x00000020
/**
- * @def AVIF_ISINTERLEAVED
+ * @def AVIF_ISINTERLEAVED
*
- * @brief A macro that defines avif isinterleaved.
+ * @brief A macro that defines avif isinterleaved.
*/
#define AVIF_ISINTERLEAVED 0x00000100
/**
- * @def AVIF_COPYRIGHTED
+ * @def AVIF_COPYRIGHTED
*
- * @brief A macro that defines avif copyrighted.
+ * @brief A macro that defines avif copyrighted.
*/
#define AVIF_COPYRIGHTED 0x00010000
/**
- * @def AVIF_WASCAPTUREFILE
+ * @def AVIF_WASCAPTUREFILE
*
- * @brief A macro that defines avif wascapturefile.
+ * @brief A macro that defines avif wascapturefile.
*/
#define AVIF_WASCAPTUREFILE 0x00020000
@@ -156,33 +156,33 @@
/* index definitions */
/**
- * @def AVI_INDEX_OF_INDEXES
+ * @def AVI_INDEX_OF_INDEXES
*
- * @brief A macro that defines avi index of indexes.
+ * @brief A macro that defines avi index of indexes.
*/
#define AVI_INDEX_OF_INDEXES 0x00
/**
- * @def AVI_INDEX_OF_CHUNKS
+ * @def AVI_INDEX_OF_CHUNKS
*
- * @brief A macro that defines avi index of chunks.
+ * @brief A macro that defines avi index of chunks.
*/
#define AVI_INDEX_OF_CHUNKS 0x01
/**
- * @def AVI_INDEX_IS_DATA
+ * @def AVI_INDEX_IS_DATA
*
- * @brief A macro that defines avi index is data.
+ * @brief A macro that defines avi index is data.
*/
#define AVI_INDEX_IS_DATA 0x80
/**
- * @def AVI_INDEX_2FIELD
+ * @def AVI_INDEX_2FIELD
*
- * @brief A macro that defines avi index 2 field.
+ * @brief A macro that defines avi index 2 field.
*/
#define AVI_INDEX_2FIELD 0x01
@@ -190,33 +190,33 @@
/* HuffYUV definitions */
/**
- * @def HUFFYUV_PREDICT_LEFT
+ * @def HUFFYUV_PREDICT_LEFT
*
- * @brief A macro that defines huffyuv predict left.
+ * @brief A macro that defines huffyuv predict left.
*/
#define HUFFYUV_PREDICT_LEFT 0
/**
- * @def HUFFYUV_PREDICT_GRADIENT
+ * @def HUFFYUV_PREDICT_GRADIENT
*
- * @brief A macro that defines huffyuv predict gradient.
+ * @brief A macro that defines huffyuv predict gradient.
*/
#define HUFFYUV_PREDICT_GRADIENT 1
/**
- * @def HUFFYUV_PREDICT_MEDIAN
+ * @def HUFFYUV_PREDICT_MEDIAN
*
- * @brief A macro that defines huffyuv predict median.
+ * @brief A macro that defines huffyuv predict median.
*/
#define HUFFYUV_PREDICT_MEDIAN 2
/**
- * @def HUFFYUV_PREDICT_DECORR
+ * @def HUFFYUV_PREDICT_DECORR
*
- * @brief A macro that defines huffyuv predict decorr.
+ * @brief A macro that defines huffyuv predict decorr.
*/
#define HUFFYUV_PREDICT_DECORR 0x40
@@ -228,176 +228,176 @@
***************************************************************************/
/**
- * @struct avi_chunk
+ * @struct avi_chunk
*
- * @brief An avi chunk.
+ * @brief An avi chunk.
*/
struct avi_chunk
{
- /** @brief The offset. */
+ /** @brief The offset. */
UINT64 offset; /* file offset of chunk header */
- /** @brief The size. */
+ /** @brief The size. */
UINT64 size; /* size of this chunk */
- /** @brief The type. */
+ /** @brief The type. */
UINT32 type; /* type of this chunk */
- /** @brief The listtype. */
+ /** @brief The listtype. */
UINT32 listtype; /* type of this list (if we are a list) */
};
/**
- * @struct avi_chunk_list
+ * @struct avi_chunk_list
*
- * @brief List of avi chunks.
+ * @brief List of avi chunks.
*/
struct avi_chunk_list
{
- /** @brief The offset. */
+ /** @brief The offset. */
UINT64 offset; /* offset in the file of header */
- /** @brief The length. */
+ /** @brief The length. */
UINT32 length; /* length of the chunk including header */
};
/**
- * @struct huffyuv_table
+ * @struct huffyuv_table
*
- * @brief A huffyuv table.
+ * @brief A huffyuv table.
*/
struct huffyuv_table
{
- /** @brief The shift[ 256]. */
+ /** @brief The shift[ 256]. */
UINT8 shift[256]; /* bit shift amounts */
- /** @brief The bits[ 256]. */
+ /** @brief The bits[ 256]. */
UINT32 bits[256]; /* bit match values */
- /** @brief The mask[ 256]. */
+ /** @brief The mask[ 256]. */
UINT32 mask[256]; /* bit mask values */
- /** @brief The baselookup[ 65536]. */
+ /** @brief The baselookup[ 65536]. */
UINT16 baselookup[65536]; /* base lookup table */
- /** @brief The extralookup. */
+ /** @brief The extralookup. */
UINT16 * extralookup; /* extra lookup tables */
};
/**
- * @struct huffyuv_data
+ * @struct huffyuv_data
*
- * @brief A huffyuv data.
+ * @brief A huffyuv data.
*/
struct huffyuv_data
{
- /** @brief The predictor. */
+ /** @brief The predictor. */
UINT8 predictor; /* predictor */
- /** @brief The table[ 3]. */
+ /** @brief The table[ 3]. */
huffyuv_table table[3]; /* array of tables */
};
/**
- * @struct avi_stream
+ * @struct avi_stream
*
- * @brief An avi stream.
+ * @brief An avi stream.
*/
struct avi_stream
{
- /** @brief The type. */
+ /** @brief The type. */
UINT32 type; /* subtype of stream */
- /** @brief Describes the format to use. */
+ /** @brief Describes the format to use. */
UINT32 format; /* format of stream data */
- /** @brief The rate. */
+ /** @brief The rate. */
UINT32 rate; /* timescale for stream */
- /** @brief The scale. */
+ /** @brief The scale. */
UINT32 scale; /* duration of one sample in the stream */
- /** @brief The samples. */
+ /** @brief The samples. */
UINT32 samples; /* number of samples */
- /** @brief The chunk. */
+ /** @brief The chunk. */
avi_chunk_list * chunk; /* list of chunks */
- /** @brief The chunks. */
+ /** @brief The chunks. */
UINT32 chunks; /* chunks currently known */
- /** @brief The chunksalloc. */
+ /** @brief The chunksalloc. */
UINT32 chunksalloc; /* number of chunks allocated */
- /** @brief The width. */
+ /** @brief The width. */
UINT32 width; /* width of video */
- /** @brief The height. */
+ /** @brief The height. */
UINT32 height; /* height of video */
- /** @brief The depth. */
+ /** @brief The depth. */
UINT32 depth; /* depth of video */
- /** @brief The interlace. */
+ /** @brief The interlace. */
UINT8 interlace; /* interlace parameters */
- /** @brief The huffyuv. */
+ /** @brief The huffyuv. */
huffyuv_data * huffyuv; /* huffyuv decompression data */
- /** @brief The channels. */
+ /** @brief The channels. */
UINT16 channels; /* audio channels */
- /** @brief The samplebits. */
+ /** @brief The samplebits. */
UINT16 samplebits; /* audio bits per sample */
- /** @brief The samplerate. */
+ /** @brief The samplerate. */
UINT32 samplerate; /* audio sample rate */
/* only used when creating */
- /** @brief The saved strh offset. */
+ /** @brief The saved strh offset. */
UINT64 saved_strh_offset; /* writeoffset of strh chunk */
- /** @brief The saved indx offset. */
+ /** @brief The saved indx offset. */
UINT64 saved_indx_offset; /* writeoffset of indx chunk */
};
/**
- * @struct avi_file
+ * @struct avi_file
*
- * @brief An avi file.
+ * @brief An avi file.
*/
struct avi_file
{
/* shared data */
- /** @brief The file. */
+ /** @brief The file. */
osd_file * file; /* pointer to open file */
- /** @brief The type. */
+ /** @brief The type. */
int type; /* type of access (read/create) */
- /** @brief The information. */
+ /** @brief The information. */
avi_movie_info info; /* movie info structure */
- /** @brief The tempbuffer. */
+ /** @brief The tempbuffer. */
UINT8 * tempbuffer; /* temporary buffer */
- /** @brief The tempbuffersize. */
+ /** @brief The tempbuffersize. */
UINT32 tempbuffersize; /* size of the temporary buffer */
/* only used when reading */
- /** @brief The streams. */
+ /** @brief The streams. */
int streams; /* number of streams */
- /** @brief The stream. */
+ /** @brief The stream. */
avi_stream * stream; /* allocated array of stream information */
- /** @brief The rootchunk. */
+ /** @brief The rootchunk. */
avi_chunk rootchunk; /* dummy root chunk that wraps the whole file */
/* only used when creating */
- /** @brief The writeoffs. */
+ /** @brief The writeoffs. */
UINT64 writeoffs; /* current file write offset */
- /** @brief The riffbase. */
+ /** @brief The riffbase. */
UINT64 riffbase; /* base of the current RIFF */
- /** @brief The chunkstack[ 8]. */
+ /** @brief The chunkstack[ 8]. */
avi_chunk chunkstack[8]; /* stack of chunks we are writing */
- /** @brief The chunksp. */
+ /** @brief The chunksp. */
int chunksp; /* stack pointer for the current chunk */
- /** @brief The saved movi offset. */
+ /** @brief The saved movi offset. */
UINT64 saved_movi_offset; /* writeoffset of movi list */
- /** @brief The saved avih offset. */
+ /** @brief The saved avih offset. */
UINT64 saved_avih_offset; /* writeoffset of avih chunk */
- /** @brief The soundbuf. */
+ /** @brief The soundbuf. */
INT16 * soundbuf; /* buffer for sound data */
- /** @brief The soundbuf samples. */
+ /** @brief The soundbuf samples. */
UINT32 soundbuf_samples; /* length of sound buffer in samples */
- /** @brief The soundbuf chansamples[ maximum sound channels]. */
+ /** @brief The soundbuf chansamples[ maximum sound channels]. */
UINT32 soundbuf_chansamples[MAX_SOUND_CHANNELS]; /* samples in buffer for each channel */
- /** @brief The soundbuf chunks. */
+ /** @brief The soundbuf chunks. */
UINT32 soundbuf_chunks; /* number of chunks completed so far */
- /** @brief The soundbuf frames. */
+ /** @brief The soundbuf frames. */
UINT32 soundbuf_frames; /* number of frames ahead of the video */
};
@@ -471,13 +471,13 @@ static void printf_chunk_recursive(avi_file *file, avi_chunk *chunk, int indent)
-------------------------------------------------*/
/**
- * @fn INLINE UINT16 fetch_16bits(const UINT8 *data)
+ * @fn INLINE UINT16 fetch_16bits(const UINT8 *data)
*
- * @brief Fetches the 16bits.
+ * @brief Fetches the 16bits.
*
- * @param data The data.
+ * @param data The data.
*
- * @return The 16bits.
+ * @return The 16bits.
*/
INLINE UINT16 fetch_16bits(const UINT8 *data)
@@ -492,13 +492,13 @@ INLINE UINT16 fetch_16bits(const UINT8 *data)
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 fetch_32bits(const UINT8 *data)
+ * @fn INLINE UINT32 fetch_32bits(const UINT8 *data)
*
- * @brief Fetches the 32bits.
+ * @brief Fetches the 32bits.
*
- * @param data The data.
+ * @param data The data.
*
- * @return The 32bits.
+ * @return The 32bits.
*/
INLINE UINT32 fetch_32bits(const UINT8 *data)
@@ -513,13 +513,13 @@ INLINE UINT32 fetch_32bits(const UINT8 *data)
-------------------------------------------------*/
/**
- * @fn INLINE UINT64 fetch_64bits(const UINT8 *data)
+ * @fn INLINE UINT64 fetch_64bits(const UINT8 *data)
*
- * @brief Fetches the 64bits.
+ * @brief Fetches the 64bits.
*
- * @param data The data.
+ * @param data The data.
*
- * @return The 64bits.
+ * @return The 64bits.
*/
INLINE UINT64 fetch_64bits(const UINT8 *data)
@@ -537,12 +537,12 @@ INLINE UINT64 fetch_64bits(const UINT8 *data)
-------------------------------------------------*/
/**
- * @fn INLINE void put_16bits(UINT8 *data, UINT16 value)
+ * @fn INLINE void put_16bits(UINT8 *data, UINT16 value)
*
- * @brief Puts the 16bits.
+ * @brief Puts the 16bits.
*
- * @param [in,out] data If non-null, the data.
- * @param value The value.
+ * @param [in,out] data If non-null, the data.
+ * @param value The value.
*/
INLINE void put_16bits(UINT8 *data, UINT16 value)
@@ -558,12 +558,12 @@ INLINE void put_16bits(UINT8 *data, UINT16 value)
-------------------------------------------------*/
/**
- * @fn INLINE void put_32bits(UINT8 *data, UINT32 value)
+ * @fn INLINE void put_32bits(UINT8 *data, UINT32 value)
*
- * @brief Puts the 32bits.
+ * @brief Puts the 32bits.
*
- * @param [in,out] data If non-null, the data.
- * @param value The value.
+ * @param [in,out] data If non-null, the data.
+ * @param value The value.
*/
INLINE void put_32bits(UINT8 *data, UINT32 value)
@@ -581,12 +581,12 @@ INLINE void put_32bits(UINT8 *data, UINT32 value)
-------------------------------------------------*/
/**
- * @fn INLINE void put_64bits(UINT8 *data, UINT64 value)
+ * @fn INLINE void put_64bits(UINT8 *data, UINT64 value)
*
- * @brief Puts the 64bits.
+ * @brief Puts the 64bits.
*
- * @param [in,out] data If non-null, the data.
- * @param value The value.
+ * @param [in,out] data If non-null, the data.
+ * @param value The value.
*/
INLINE void put_64bits(UINT8 *data, UINT64 value)
@@ -608,13 +608,13 @@ INLINE void put_64bits(UINT8 *data, UINT64 value)
-------------------------------------------------*/
/**
- * @fn INLINE avi_stream *get_video_stream(avi_file *file)
+ * @fn INLINE avi_stream *get_video_stream(avi_file *file)
*
- * @brief Gets video stream.
+ * @brief Gets video stream.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return null if it fails, else the video stream.
+ * @return null if it fails, else the video stream.
*/
INLINE avi_stream *get_video_stream(avi_file *file)
@@ -636,15 +636,15 @@ INLINE avi_stream *get_video_stream(avi_file *file)
-------------------------------------------------*/
/**
- * @fn INLINE avi_stream *get_audio_stream(avi_file *file, int channel, int *offset)
+ * @fn INLINE avi_stream *get_audio_stream(avi_file *file, int channel, int *offset)
*
- * @brief Gets audio stream.
+ * @brief Gets audio stream.
*
- * @param [in,out] file If non-null, the file.
- * @param channel The channel.
- * @param [in,out] offset If non-null, the offset.
+ * @param [in,out] file If non-null, the file.
+ * @param channel The channel.
+ * @param [in,out] offset If non-null, the offset.
*
- * @return null if it fails, else the audio stream.
+ * @return null if it fails, else the audio stream.
*/
INLINE avi_stream *get_audio_stream(avi_file *file, int channel, int *offset)
@@ -674,16 +674,16 @@ INLINE avi_stream *get_audio_stream(avi_file *file, int channel, int *offset)
-------------------------------------------------*/
/**
- * @fn INLINE avi_error set_stream_chunk_info(avi_stream *stream, UINT32 index, UINT64 offset, UINT32 length)
+ * @fn INLINE avi_error set_stream_chunk_info(avi_stream *stream, UINT32 index, UINT64 offset, UINT32 length)
*
- * @brief Sets stream chunk information.
+ * @brief Sets stream chunk information.
*
- * @param [in,out] stream If non-null, the stream.
- * @param index Zero-based index of the.
- * @param offset The offset.
- * @param length The length.
+ * @param [in,out] stream If non-null, the stream.
+ * @param index Zero-based index of the.
+ * @param offset The offset.
+ * @param length The length.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
INLINE avi_error set_stream_chunk_info(avi_stream *stream, UINT32 index, UINT64 offset, UINT32 length)
@@ -720,13 +720,13 @@ INLINE avi_error set_stream_chunk_info(avi_stream *stream, UINT32 index, UINT64
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 compute_idx1_size(avi_file *file)
+ * @fn INLINE UINT32 compute_idx1_size(avi_file *file)
*
- * @brief Calculates the index 1 size.
+ * @brief Calculates the index 1 size.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return The calculated index 1 size.
+ * @return The calculated index 1 size.
*/
INLINE UINT32 compute_idx1_size(avi_file *file)
@@ -748,14 +748,14 @@ INLINE UINT32 compute_idx1_size(avi_file *file)
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 get_chunkid_for_stream(avi_file *file, avi_stream *stream)
+ * @fn INLINE UINT32 get_chunkid_for_stream(avi_file *file, avi_stream *stream)
*
- * @brief Gets chunkid for stream.
+ * @brief Gets chunkid for stream.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] stream If non-null, the stream.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] stream If non-null, the stream.
*
- * @return The chunkid for stream.
+ * @return The chunkid for stream.
*/
INLINE UINT32 get_chunkid_for_stream(avi_file *file, avi_stream *stream)
@@ -778,14 +778,14 @@ INLINE UINT32 get_chunkid_for_stream(avi_file *file, avi_stream *stream)
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 framenum_to_samplenum(avi_file *file, UINT32 framenum)
+ * @fn INLINE UINT32 framenum_to_samplenum(avi_file *file, UINT32 framenum)
*
- * @brief Framenum to samplenum.
+ * @brief Framenum to samplenum.
*
- * @param [in,out] file If non-null, the file.
- * @param framenum The framenum.
+ * @param [in,out] file If non-null, the file.
+ * @param framenum The framenum.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
INLINE UINT32 framenum_to_samplenum(avi_file *file, UINT32 framenum)
@@ -801,14 +801,14 @@ INLINE UINT32 framenum_to_samplenum(avi_file *file, UINT32 framenum)
-------------------------------------------------*/
/**
- * @fn INLINE avi_error expand_tempbuffer(avi_file *file, UINT32 length)
+ * @fn INLINE avi_error expand_tempbuffer(avi_file *file, UINT32 length)
*
- * @brief Expand tempbuffer.
+ * @brief Expand tempbuffer.
*
- * @param [in,out] file If non-null, the file.
- * @param length The length.
+ * @param [in,out] file If non-null, the file.
+ * @param length The length.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
INLINE avi_error expand_tempbuffer(avi_file *file, UINT32 length)
@@ -838,14 +838,14 @@ INLINE avi_error expand_tempbuffer(avi_file *file, UINT32 length)
-------------------------------------------------*/
/**
- * @fn avi_error avi_open(const char *filename, avi_file **file)
+ * @fn avi_error avi_open(const char *filename, avi_file **file)
*
- * @brief Queries if a given avi open.
+ * @brief Queries if a given avi open.
*
- * @param filename Filename of the file.
- * @param [in,out] file If non-null, the file.
+ * @param filename Filename of the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
avi_error avi_open(const char *filename, avi_file **file)
@@ -901,15 +901,15 @@ error:
-------------------------------------------------*/
/**
- * @fn avi_error avi_create(const char *filename, const avi_movie_info *info, avi_file **file)
+ * @fn avi_error avi_create(const char *filename, const avi_movie_info *info, avi_file **file)
*
- * @brief Avi create.
+ * @brief Avi create.
*
- * @param filename Filename of the file.
- * @param info The information.
- * @param [in,out] file If non-null, the file.
+ * @param filename Filename of the file.
+ * @param info The information.
+ * @param [in,out] file If non-null, the file.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
avi_error avi_create(const char *filename, const avi_movie_info *info, avi_file **file)
@@ -1020,13 +1020,13 @@ error:
-------------------------------------------------*/
/**
- * @fn avi_error avi_close(avi_file *file)
+ * @fn avi_error avi_close(avi_file *file)
*
- * @brief Avi close.
+ * @brief Avi close.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
avi_error avi_close(avi_file *file)
@@ -1104,11 +1104,11 @@ avi_error avi_close(avi_file *file)
-------------------------------------------------*/
/**
- * @fn void avi_printf_chunks(avi_file *file)
+ * @fn void avi_printf_chunks(avi_file *file)
*
- * @brief Avi printf chunks.
+ * @brief Avi printf chunks.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*/
void avi_printf_chunks(avi_file *file)
@@ -1123,13 +1123,13 @@ void avi_printf_chunks(avi_file *file)
-------------------------------------------------*/
/**
- * @fn const char *avi_error_string(avi_error err)
+ * @fn const char *avi_error_string(avi_error err)
*
- * @brief Avi error string.
+ * @brief Avi error string.
*
- * @param err The error.
+ * @param err The error.
*
- * @return null if it fails, else a char*.
+ * @return null if it fails, else a char*.
*/
const char *avi_error_string(avi_error err)
@@ -1164,13 +1164,13 @@ const char *avi_error_string(avi_error err)
-------------------------------------------------*/
/**
- * @fn const avi_movie_info *avi_get_movie_info(avi_file *file)
+ * @fn const avi_movie_info *avi_get_movie_info(avi_file *file)
*
- * @brief Avi get movie information.
+ * @brief Avi get movie information.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return null if it fails, else an avi_movie_info*.
+ * @return null if it fails, else an avi_movie_info*.
*/
const avi_movie_info *avi_get_movie_info(avi_file *file)
@@ -1185,14 +1185,14 @@ const avi_movie_info *avi_get_movie_info(avi_file *file)
-------------------------------------------------*/
/**
- * @fn UINT32 avi_first_sample_in_frame(avi_file *file, UINT32 framenum)
+ * @fn UINT32 avi_first_sample_in_frame(avi_file *file, UINT32 framenum)
*
- * @brief Avi first sample in frame.
+ * @brief Avi first sample in frame.
*
- * @param [in,out] file If non-null, the file.
- * @param framenum The framenum.
+ * @param [in,out] file If non-null, the file.
+ * @param framenum The framenum.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 avi_first_sample_in_frame(avi_file *file, UINT32 framenum)
@@ -1208,15 +1208,15 @@ UINT32 avi_first_sample_in_frame(avi_file *file, UINT32 framenum)
-------------------------------------------------*/
/**
- * @fn avi_error avi_read_video_frame(avi_file *file, UINT32 framenum, bitmap_yuy16 &bitmap)
+ * @fn avi_error avi_read_video_frame(avi_file *file, UINT32 framenum, bitmap_yuy16 &bitmap)
*
- * @brief Avi read video frame.
+ * @brief Avi read video frame.
*
- * @param [in,out] file If non-null, the file.
- * @param framenum The framenum.
- * @param [in,out] bitmap The bitmap.
+ * @param [in,out] file If non-null, the file.
+ * @param framenum The framenum.
+ * @param [in,out] bitmap The bitmap.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
avi_error avi_read_video_frame(avi_file *file, UINT32 framenum, bitmap_yuy16 &bitmap)
@@ -1278,17 +1278,17 @@ avi_error avi_read_video_frame(avi_file *file, UINT32 framenum, bitmap_yuy16 &bi
-------------------------------------------------*/
/**
- * @fn avi_error avi_read_sound_samples(avi_file *file, int channel, UINT32 firstsample, UINT32 numsamples, INT16 *output)
+ * @fn avi_error avi_read_sound_samples(avi_file *file, int channel, UINT32 firstsample, UINT32 numsamples, INT16 *output)
*
- * @brief Avi read sound samples.
+ * @brief Avi read sound samples.
*
- * @param [in,out] file If non-null, the file.
- * @param channel The channel.
- * @param firstsample The firstsample.
- * @param numsamples The numsamples.
- * @param [in,out] output If non-null, the output.
+ * @param [in,out] file If non-null, the file.
+ * @param channel The channel.
+ * @param firstsample The firstsample.
+ * @param numsamples The numsamples.
+ * @param [in,out] output If non-null, the output.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
avi_error avi_read_sound_samples(avi_file *file, int channel, UINT32 firstsample, UINT32 numsamples, INT16 *output)
@@ -1398,14 +1398,14 @@ avi_error avi_read_sound_samples(avi_file *file, int channel, UINT32 firstsample
-------------------------------------------------*/
/**
- * @fn avi_error avi_append_video_frame(avi_file *file, bitmap_yuy16 &bitmap)
+ * @fn avi_error avi_append_video_frame(avi_file *file, bitmap_yuy16 &bitmap)
*
- * @brief Avi append video frame.
+ * @brief Avi append video frame.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] bitmap The bitmap.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] bitmap The bitmap.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
avi_error avi_append_video_frame(avi_file *file, bitmap_yuy16 &bitmap)
@@ -1456,14 +1456,14 @@ avi_error avi_append_video_frame(avi_file *file, bitmap_yuy16 &bitmap)
-------------------------------------------------*/
/**
- * @fn avi_error avi_append_video_frame(avi_file *file, bitmap_rgb32 &bitmap)
+ * @fn avi_error avi_append_video_frame(avi_file *file, bitmap_rgb32 &bitmap)
*
- * @brief Avi append video frame.
+ * @brief Avi append video frame.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] bitmap The bitmap.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] bitmap The bitmap.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
avi_error avi_append_video_frame(avi_file *file, bitmap_rgb32 &bitmap)
@@ -1518,17 +1518,17 @@ avi_error avi_append_video_frame(avi_file *file, bitmap_rgb32 &bitmap)
-------------------------------------------------*/
/**
- * @fn avi_error avi_append_sound_samples(avi_file *file, int channel, const INT16 *samples, UINT32 numsamples, UINT32 sampleskip)
+ * @fn avi_error avi_append_sound_samples(avi_file *file, int channel, const INT16 *samples, UINT32 numsamples, UINT32 sampleskip)
*
- * @brief Avi append sound samples.
+ * @brief Avi append sound samples.
*
- * @param [in,out] file If non-null, the file.
- * @param channel The channel.
- * @param samples The samples.
- * @param numsamples The numsamples.
- * @param sampleskip The sampleskip.
+ * @param [in,out] file If non-null, the file.
+ * @param channel The channel.
+ * @param samples The samples.
+ * @param numsamples The numsamples.
+ * @param sampleskip The sampleskip.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
avi_error avi_append_sound_samples(avi_file *file, int channel, const INT16 *samples, UINT32 numsamples, UINT32 sampleskip)
@@ -1561,15 +1561,15 @@ avi_error avi_append_sound_samples(avi_file *file, int channel, const INT16 *sam
-------------------------------------------------*/
/**
- * @fn static avi_error read_chunk_data(avi_file *file, const avi_chunk *chunk, UINT8 **buffer)
+ * @fn static avi_error read_chunk_data(avi_file *file, const avi_chunk *chunk, UINT8 **buffer)
*
- * @brief Reads chunk data.
+ * @brief Reads chunk data.
*
- * @param [in,out] file If non-null, the file.
- * @param chunk The chunk.
- * @param [in,out] buffer If non-null, the buffer.
+ * @param [in,out] file If non-null, the file.
+ * @param chunk The chunk.
+ * @param [in,out] buffer If non-null, the buffer.
*
- * @return The chunk data.
+ * @return The chunk data.
*/
static avi_error read_chunk_data(avi_file *file, const avi_chunk *chunk, UINT8 **buffer)
@@ -1601,15 +1601,15 @@ static avi_error read_chunk_data(avi_file *file, const avi_chunk *chunk, UINT8 *
-------------------------------------------------*/
/**
- * @fn static avi_error get_first_chunk(avi_file *file, const avi_chunk *parent, avi_chunk *newchunk)
+ * @fn static avi_error get_first_chunk(avi_file *file, const avi_chunk *parent, avi_chunk *newchunk)
*
- * @brief Gets the first chunk.
+ * @brief Gets the first chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param parent The parent.
- * @param [in,out] newchunk If non-null, the newchunk.
+ * @param [in,out] file If non-null, the file.
+ * @param parent The parent.
+ * @param [in,out] newchunk If non-null, the newchunk.
*
- * @return The first chunk.
+ * @return The first chunk.
*/
static avi_error get_first_chunk(avi_file *file, const avi_chunk *parent, avi_chunk *newchunk)
@@ -1627,15 +1627,15 @@ static avi_error get_first_chunk(avi_file *file, const avi_chunk *parent, avi_ch
-------------------------------------------------*/
/**
- * @fn static avi_error get_next_chunk(avi_file *file, const avi_chunk *parent, avi_chunk *newchunk)
+ * @fn static avi_error get_next_chunk(avi_file *file, const avi_chunk *parent, avi_chunk *newchunk)
*
- * @brief Gets the next chunk.
+ * @brief Gets the next chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param parent The parent.
- * @param [in,out] newchunk If non-null, the newchunk.
+ * @param [in,out] file If non-null, the file.
+ * @param parent The parent.
+ * @param [in,out] newchunk If non-null, the newchunk.
*
- * @return The next chunk.
+ * @return The next chunk.
*/
static avi_error get_next_chunk(avi_file *file, const avi_chunk *parent, avi_chunk *newchunk)
@@ -1651,16 +1651,16 @@ static avi_error get_next_chunk(avi_file *file, const avi_chunk *parent, avi_chu
-------------------------------------------------*/
/**
- * @fn static avi_error find_first_chunk(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
+ * @fn static avi_error find_first_chunk(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
*
- * @brief Searches for the first chunk.
+ * @brief Searches for the first chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param findme The findme.
- * @param container The container.
- * @param [out] result If non-null, the result.
+ * @param [in,out] file If non-null, the file.
+ * @param findme The findme.
+ * @param container The container.
+ * @param [out] result If non-null, the result.
*
- * @return The found chunk.
+ * @return The found chunk.
*/
static avi_error find_first_chunk(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
@@ -1681,16 +1681,16 @@ static avi_error find_first_chunk(avi_file *file, UINT32 findme, const avi_chunk
-------------------------------------------------*/
/**
- * @fn static avi_error find_next_chunk(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
+ * @fn static avi_error find_next_chunk(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
*
- * @brief Searches for the next chunk.
+ * @brief Searches for the next chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param findme The findme.
- * @param container The container.
- * @param [out] result If non-null, the result.
+ * @param [in,out] file If non-null, the file.
+ * @param findme The findme.
+ * @param container The container.
+ * @param [out] result If non-null, the result.
*
- * @return The found chunk.
+ * @return The found chunk.
*/
static avi_error find_next_chunk(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
@@ -1711,16 +1711,16 @@ static avi_error find_next_chunk(avi_file *file, UINT32 findme, const avi_chunk
-------------------------------------------------*/
/**
- * @fn static avi_error find_first_list(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
+ * @fn static avi_error find_first_list(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
*
- * @brief Searches for the first list.
+ * @brief Searches for the first list.
*
- * @param [in,out] file If non-null, the file.
- * @param findme The findme.
- * @param container The container.
- * @param [out] result If non-null, the result.
+ * @param [in,out] file If non-null, the file.
+ * @param findme The findme.
+ * @param container The container.
+ * @param [out] result If non-null, the result.
*
- * @return The found list.
+ * @return The found list.
*/
static avi_error find_first_list(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
@@ -1741,16 +1741,16 @@ static avi_error find_first_list(avi_file *file, UINT32 findme, const avi_chunk
-------------------------------------------------*/
/**
- * @fn static avi_error find_next_list(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
+ * @fn static avi_error find_next_list(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
*
- * @brief Searches for the next list.
+ * @brief Searches for the next list.
*
- * @param [in,out] file If non-null, the file.
- * @param findme The findme.
- * @param container The container.
- * @param [out] result If non-null, the result.
+ * @param [in,out] file If non-null, the file.
+ * @param findme The findme.
+ * @param container The container.
+ * @param [out] result If non-null, the result.
*
- * @return The found list.
+ * @return The found list.
*/
static avi_error find_next_list(avi_file *file, UINT32 findme, const avi_chunk *container, avi_chunk *result)
@@ -1771,16 +1771,16 @@ static avi_error find_next_list(avi_file *file, UINT32 findme, const avi_chunk *
-------------------------------------------------*/
/**
- * @fn static avi_error get_next_chunk_internal(avi_file *file, const avi_chunk *parent, avi_chunk *newchunk, UINT64 offset)
+ * @fn static avi_error get_next_chunk_internal(avi_file *file, const avi_chunk *parent, avi_chunk *newchunk, UINT64 offset)
*
- * @brief Gets the next chunk internal.
+ * @brief Gets the next chunk internal.
*
- * @param [in,out] file If non-null, the file.
- * @param parent The parent.
- * @param [in,out] newchunk If non-null, the newchunk.
- * @param offset The offset.
+ * @param [in,out] file If non-null, the file.
+ * @param parent The parent.
+ * @param [in,out] newchunk If non-null, the newchunk.
+ * @param offset The offset.
*
- * @return The next chunk internal.
+ * @return The next chunk internal.
*/
static avi_error get_next_chunk_internal(avi_file *file, const avi_chunk *parent, avi_chunk *newchunk, UINT64 offset)
@@ -1827,13 +1827,13 @@ static avi_error get_next_chunk_internal(avi_file *file, const avi_chunk *parent
-------------------------------------------------*/
/**
- * @fn static avi_error read_movie_data(avi_file *file)
+ * @fn static avi_error read_movie_data(avi_file *file)
*
- * @brief Reads movie data.
+ * @brief Reads movie data.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return The movie data.
+ * @return The movie data.
*/
static avi_error read_movie_data(avi_file *file)
@@ -1938,13 +1938,13 @@ error:
-------------------------------------------------*/
/**
- * @fn static avi_error extract_movie_info(avi_file *file)
+ * @fn static avi_error extract_movie_info(avi_file *file)
*
- * @brief Extracts the movie information described by file.
+ * @brief Extracts the movie information described by file.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return The extracted movie information.
+ * @return The extracted movie information.
*/
static avi_error extract_movie_info(avi_file *file)
@@ -2009,14 +2009,14 @@ static avi_error extract_movie_info(avi_file *file)
-------------------------------------------------*/
/**
- * @fn static avi_error parse_avih_chunk(avi_file *file, avi_chunk *avih)
+ * @fn static avi_error parse_avih_chunk(avi_file *file, avi_chunk *avih)
*
- * @brief Parse avih chunk.
+ * @brief Parse avih chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] avih If non-null, the avih.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] avih If non-null, the avih.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error parse_avih_chunk(avi_file *file, avi_chunk *avih)
@@ -2051,15 +2051,15 @@ error:
-------------------------------------------------*/
/**
- * @fn static avi_error parse_strh_chunk(avi_file *file, avi_stream *stream, avi_chunk *strh)
+ * @fn static avi_error parse_strh_chunk(avi_file *file, avi_stream *stream, avi_chunk *strh)
*
- * @brief Parse strh chunk.
+ * @brief Parse strh chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] stream If non-null, the stream.
- * @param [in,out] strh If non-null, the strh.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] stream If non-null, the stream.
+ * @param [in,out] strh If non-null, the strh.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error parse_strh_chunk(avi_file *file, avi_stream *stream, avi_chunk *strh)
@@ -2091,15 +2091,15 @@ error:
-------------------------------------------------*/
/**
- * @fn static avi_error parse_strf_chunk(avi_file *file, avi_stream *stream, avi_chunk *strf)
+ * @fn static avi_error parse_strf_chunk(avi_file *file, avi_stream *stream, avi_chunk *strf)
*
- * @brief Parse strf chunk.
+ * @brief Parse strf chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] stream If non-null, the stream.
- * @param [in,out] strf If non-null, the strf.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] stream If non-null, the stream.
+ * @param [in,out] strf If non-null, the strf.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error parse_strf_chunk(avi_file *file, avi_stream *stream, avi_chunk *strf)
@@ -2147,15 +2147,15 @@ error:
-------------------------------------------------*/
/**
- * @fn static avi_error parse_indx_chunk(avi_file *file, avi_stream *stream, avi_chunk *strf)
+ * @fn static avi_error parse_indx_chunk(avi_file *file, avi_stream *stream, avi_chunk *strf)
*
- * @brief Parse indx chunk.
+ * @brief Parse indx chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] stream If non-null, the stream.
- * @param [in,out] strf If non-null, the strf.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] stream If non-null, the stream.
+ * @param [in,out] strf If non-null, the strf.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error parse_indx_chunk(avi_file *file, avi_stream *stream, avi_chunk *strf)
@@ -2249,15 +2249,15 @@ error:
-------------------------------------------------*/
/**
- * @fn static avi_error parse_idx1_chunk(avi_file *file, UINT64 baseoffset, avi_chunk *idx1)
+ * @fn static avi_error parse_idx1_chunk(avi_file *file, UINT64 baseoffset, avi_chunk *idx1)
*
- * @brief Parse index 1 chunk.
+ * @brief Parse index 1 chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param baseoffset The baseoffset.
- * @param [in,out] idx1 If non-null, the first index.
+ * @param [in,out] file If non-null, the file.
+ * @param baseoffset The baseoffset.
+ * @param [in,out] idx1 If non-null, the first index.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error parse_idx1_chunk(avi_file *file, UINT64 baseoffset, avi_chunk *idx1)
@@ -2311,16 +2311,16 @@ error:
-------------------------------------------------*/
/**
- * @fn static avi_error chunk_open(avi_file *file, UINT32 type, UINT32 listtype, UINT32 estlength)
+ * @fn static avi_error chunk_open(avi_file *file, UINT32 type, UINT32 listtype, UINT32 estlength)
*
- * @brief Queries if a given chunk open.
+ * @brief Queries if a given chunk open.
*
- * @param [in,out] file If non-null, the file.
- * @param type The type.
- * @param listtype The listtype.
- * @param estlength The estlength.
+ * @param [in,out] file If non-null, the file.
+ * @param type The type.
+ * @param listtype The listtype.
+ * @param estlength The estlength.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error chunk_open(avi_file *file, UINT32 type, UINT32 listtype, UINT32 estlength)
@@ -2382,13 +2382,13 @@ static avi_error chunk_open(avi_file *file, UINT32 type, UINT32 listtype, UINT32
-------------------------------------------------*/
/**
- * @fn static avi_error chunk_close(avi_file *file)
+ * @fn static avi_error chunk_close(avi_file *file)
*
- * @brief Chunk close.
+ * @brief Chunk close.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error chunk_close(avi_file *file)
@@ -2425,16 +2425,16 @@ static avi_error chunk_close(avi_file *file)
-------------------------------------------------*/
/**
- * @fn static avi_error chunk_write(avi_file *file, UINT32 type, const void *data, UINT32 length)
+ * @fn static avi_error chunk_write(avi_file *file, UINT32 type, const void *data, UINT32 length)
*
- * @brief Chunk write.
+ * @brief Chunk write.
*
- * @param [in,out] file If non-null, the file.
- * @param type The type.
- * @param data The data.
- * @param length The length.
+ * @param [in,out] file If non-null, the file.
+ * @param type The type.
+ * @param data The data.
+ * @param length The length.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error chunk_write(avi_file *file, UINT32 type, const void *data, UINT32 length)
@@ -2509,18 +2509,18 @@ static avi_error chunk_write(avi_file *file, UINT32 type, const void *data, UINT
-------------------------------------------------*/
/**
- * @fn static avi_error chunk_overwrite(avi_file *file, UINT32 type, const void *data, UINT32 length, UINT64 *offset, int initial_write)
+ * @fn static avi_error chunk_overwrite(avi_file *file, UINT32 type, const void *data, UINT32 length, UINT64 *offset, int initial_write)
*
- * @brief Chunk overwrite.
+ * @brief Chunk overwrite.
*
- * @param [in,out] file If non-null, the file.
- * @param type The type.
- * @param data The data.
- * @param length The length.
- * @param [in,out] offset If non-null, the offset.
- * @param initial_write The initial write.
+ * @param [in,out] file If non-null, the file.
+ * @param type The type.
+ * @param data The data.
+ * @param length The length.
+ * @param [in,out] offset If non-null, the offset.
+ * @param initial_write The initial write.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error chunk_overwrite(avi_file *file, UINT32 type, const void *data, UINT32 length, UINT64 *offset, int initial_write)
@@ -2556,13 +2556,13 @@ static avi_error chunk_overwrite(avi_file *file, UINT32 type, const void *data,
-------------------------------------------------*/
/**
- * @fn static avi_error write_initial_headers(avi_file *file)
+ * @fn static avi_error write_initial_headers(avi_file *file)
*
- * @brief Writes an initial headers.
+ * @brief Writes an initial headers.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error write_initial_headers(avi_file *file)
@@ -2638,14 +2638,14 @@ static avi_error write_initial_headers(avi_file *file)
-------------------------------------------------*/
/**
- * @fn static avi_error write_avih_chunk(avi_file *file, int initial_write)
+ * @fn static avi_error write_avih_chunk(avi_file *file, int initial_write)
*
- * @brief Writes an avih chunk.
+ * @brief Writes an avih chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param initial_write The initial write.
+ * @param [in,out] file If non-null, the file.
+ * @param initial_write The initial write.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error write_avih_chunk(avi_file *file, int initial_write)
@@ -2674,15 +2674,15 @@ static avi_error write_avih_chunk(avi_file *file, int initial_write)
-------------------------------------------------*/
/**
- * @fn static avi_error write_strh_chunk(avi_file *file, avi_stream *stream, int initial_write)
+ * @fn static avi_error write_strh_chunk(avi_file *file, avi_stream *stream, int initial_write)
*
- * @brief Writes a strh chunk.
+ * @brief Writes a strh chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] stream If non-null, the stream.
- * @param initial_write The initial write.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] stream If non-null, the stream.
+ * @param initial_write The initial write.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error write_strh_chunk(avi_file *file, avi_stream *stream, int initial_write)
@@ -2729,14 +2729,14 @@ static avi_error write_strh_chunk(avi_file *file, avi_stream *stream, int initia
-------------------------------------------------*/
/**
- * @fn static avi_error write_strf_chunk(avi_file *file, avi_stream *stream)
+ * @fn static avi_error write_strf_chunk(avi_file *file, avi_stream *stream)
*
- * @brief Writes a strf chunk.
+ * @brief Writes a strf chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] stream If non-null, the stream.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] stream If non-null, the stream.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error write_strf_chunk(avi_file *file, avi_stream *stream)
@@ -2793,15 +2793,15 @@ static avi_error write_strf_chunk(avi_file *file, avi_stream *stream)
-------------------------------------------------*/
/**
- * @fn static avi_error write_indx_chunk(avi_file *file, avi_stream *stream, int initial_write)
+ * @fn static avi_error write_indx_chunk(avi_file *file, avi_stream *stream, int initial_write)
*
- * @brief Writes an indx chunk.
+ * @brief Writes an indx chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] stream If non-null, the stream.
- * @param initial_write The initial write.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] stream If non-null, the stream.
+ * @param initial_write The initial write.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error write_indx_chunk(avi_file *file, avi_stream *stream, int initial_write)
@@ -2901,13 +2901,13 @@ static avi_error write_indx_chunk(avi_file *file, avi_stream *stream, int initia
-------------------------------------------------*/
/**
- * @fn static avi_error write_idx1_chunk(avi_file *file)
+ * @fn static avi_error write_idx1_chunk(avi_file *file)
*
- * @brief Writes an index 1 chunk.
+ * @brief Writes an index 1 chunk.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error write_idx1_chunk(avi_file *file)
@@ -2960,13 +2960,13 @@ static avi_error write_idx1_chunk(avi_file *file)
-------------------------------------------------*/
/**
- * @fn static avi_error soundbuf_initialize(avi_file *file)
+ * @fn static avi_error soundbuf_initialize(avi_file *file)
*
- * @brief Soundbuf initialize.
+ * @brief Soundbuf initialize.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error soundbuf_initialize(avi_file *file)
@@ -3003,14 +3003,14 @@ static avi_error soundbuf_initialize(avi_file *file)
-------------------------------------------------*/
/**
- * @fn static avi_error soundbuf_write_chunk(avi_file *file, UINT32 framenum)
+ * @fn static avi_error soundbuf_write_chunk(avi_file *file, UINT32 framenum)
*
- * @brief Soundbuf write chunk.
+ * @brief Soundbuf write chunk.
*
- * @param [in,out] file If non-null, the file.
- * @param framenum The framenum.
+ * @param [in,out] file If non-null, the file.
+ * @param framenum The framenum.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error soundbuf_write_chunk(avi_file *file, UINT32 framenum)
@@ -3046,14 +3046,14 @@ static avi_error soundbuf_write_chunk(avi_file *file, UINT32 framenum)
-------------------------------------------------*/
/**
- * @fn static avi_error soundbuf_flush(avi_file *file, int only_flush_full)
+ * @fn static avi_error soundbuf_flush(avi_file *file, int only_flush_full)
*
- * @brief Soundbuf flush.
+ * @brief Soundbuf flush.
*
- * @param [in,out] file If non-null, the file.
- * @param only_flush_full The only flush full.
+ * @param [in,out] file If non-null, the file.
+ * @param only_flush_full The only flush full.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error soundbuf_flush(avi_file *file, int only_flush_full)
@@ -3150,16 +3150,16 @@ static avi_error soundbuf_flush(avi_file *file, int only_flush_full)
-------------------------------------------------*/
/**
- * @fn static avi_error rgb32_compress_to_rgb(avi_stream *stream, const bitmap_rgb32 &bitmap, UINT8 *data, UINT32 numbytes)
+ * @fn static avi_error rgb32_compress_to_rgb(avi_stream *stream, const bitmap_rgb32 &bitmap, UINT8 *data, UINT32 numbytes)
*
- * @brief RGB 32 compress to RGB.
+ * @brief RGB 32 compress to RGB.
*
- * @param [in,out] stream If non-null, the stream.
- * @param bitmap The bitmap.
- * @param [in,out] data If non-null, the data.
- * @param numbytes The numbytes.
+ * @param [in,out] stream If non-null, the stream.
+ * @param bitmap The bitmap.
+ * @param [in,out] data If non-null, the data.
+ * @param numbytes The numbytes.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error rgb32_compress_to_rgb(avi_stream *stream, const bitmap_rgb32 &bitmap, UINT8 *data, UINT32 numbytes)
@@ -3214,16 +3214,16 @@ static avi_error rgb32_compress_to_rgb(avi_stream *stream, const bitmap_rgb32 &b
-------------------------------------------------*/
/**
- * @fn static avi_error yuv_decompress_to_yuy16(avi_stream *stream, const UINT8 *data, UINT32 numbytes, bitmap_yuy16 &bitmap)
+ * @fn static avi_error yuv_decompress_to_yuy16(avi_stream *stream, const UINT8 *data, UINT32 numbytes, bitmap_yuy16 &bitmap)
*
- * @brief Yuv decompress to yuy 16.
+ * @brief Yuv decompress to yuy 16.
*
- * @param [in,out] stream If non-null, the stream.
- * @param data The data.
- * @param numbytes The numbytes.
- * @param [in,out] bitmap The bitmap.
+ * @param [in,out] stream If non-null, the stream.
+ * @param data The data.
+ * @param numbytes The numbytes.
+ * @param [in,out] bitmap The bitmap.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error yuv_decompress_to_yuy16(avi_stream *stream, const UINT8 *data, UINT32 numbytes, bitmap_yuy16 &bitmap)
@@ -3266,16 +3266,16 @@ static avi_error yuv_decompress_to_yuy16(avi_stream *stream, const UINT8 *data,
-------------------------------------------------*/
/**
- * @fn static avi_error yuy16_compress_to_yuy(avi_stream *stream, const bitmap_yuy16 &bitmap, UINT8 *data, UINT32 numbytes)
+ * @fn static avi_error yuy16_compress_to_yuy(avi_stream *stream, const bitmap_yuy16 &bitmap, UINT8 *data, UINT32 numbytes)
*
- * @brief Yuy 16 compress to yuy.
+ * @brief Yuy 16 compress to yuy.
*
- * @param [in,out] stream If non-null, the stream.
- * @param bitmap The bitmap.
- * @param [in,out] data If non-null, the data.
- * @param numbytes The numbytes.
+ * @param [in,out] stream If non-null, the stream.
+ * @param bitmap The bitmap.
+ * @param [in,out] data If non-null, the data.
+ * @param numbytes The numbytes.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error yuy16_compress_to_yuy(avi_stream *stream, const bitmap_yuy16 &bitmap, UINT8 *data, UINT32 numbytes)
@@ -3318,15 +3318,15 @@ static avi_error yuy16_compress_to_yuy(avi_stream *stream, const bitmap_yuy16 &b
-------------------------------------------------*/
/**
- * @fn static avi_error huffyuv_extract_tables(avi_stream *stream, const UINT8 *chunkdata, UINT32 size)
+ * @fn static avi_error huffyuv_extract_tables(avi_stream *stream, const UINT8 *chunkdata, UINT32 size)
*
- * @brief Huffyuv extract tables.
+ * @brief Huffyuv extract tables.
*
- * @param [in,out] stream If non-null, the stream.
- * @param chunkdata The chunkdata.
- * @param size The size.
+ * @param [in,out] stream If non-null, the stream.
+ * @param chunkdata The chunkdata.
+ * @param size The size.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error huffyuv_extract_tables(avi_stream *stream, const UINT8 *chunkdata, UINT32 size)
@@ -3469,16 +3469,16 @@ error:
-------------------------------------------------*/
/**
- * @fn static avi_error huffyuv_decompress_to_yuy16(avi_stream *stream, const UINT8 *data, UINT32 numbytes, bitmap_yuy16 &bitmap)
+ * @fn static avi_error huffyuv_decompress_to_yuy16(avi_stream *stream, const UINT8 *data, UINT32 numbytes, bitmap_yuy16 &bitmap)
*
- * @brief Huffyuv decompress to yuy 16.
+ * @brief Huffyuv decompress to yuy 16.
*
- * @param [in,out] stream If non-null, the stream.
- * @param data The data.
- * @param numbytes The numbytes.
- * @param [in,out] bitmap The bitmap.
+ * @param [in,out] stream If non-null, the stream.
+ * @param data The data.
+ * @param numbytes The numbytes.
+ * @param [in,out] bitmap The bitmap.
*
- * @return An avi_error.
+ * @return An avi_error.
*/
static avi_error huffyuv_decompress_to_yuy16(avi_stream *stream, const UINT8 *data, UINT32 numbytes, bitmap_yuy16 &bitmap)
@@ -3685,12 +3685,12 @@ static avi_error huffyuv_decompress_to_yuy16(avi_stream *stream, const UINT8 *da
}
/**
- * @fn static void u64toa(UINT64 val, char *output)
+ * @fn static void u64toa(UINT64 val, char *output)
*
- * @brief 64toas.
+ * @brief 64toas.
*
- * @param val The value.
- * @param [in,out] output If non-null, the output.
+ * @param val The value.
+ * @param [in,out] output If non-null, the output.
*/
static void u64toa(UINT64 val, char *output)
@@ -3710,13 +3710,13 @@ static void u64toa(UINT64 val, char *output)
-------------------------------------------------*/
/**
- * @fn static void printf_chunk_recursive(avi_file *file, avi_chunk *container, int indent)
+ * @fn static void printf_chunk_recursive(avi_file *file, avi_chunk *container, int indent)
*
- * @brief Printf chunk recursive.
+ * @brief Printf chunk recursive.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] container If non-null, the container.
- * @param indent The indent.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] container If non-null, the container.
+ * @param indent The indent.
*/
static void printf_chunk_recursive(avi_file *file, avi_chunk *container, int indent)
diff --git a/src/lib/util/bitmap.c b/src/lib/util/bitmap.c
index e9e941f3fc5..aeb9852ca1c 100644
--- a/src/lib/util/bitmap.c
+++ b/src/lib/util/bitmap.c
@@ -20,9 +20,9 @@
// CONSTANTS
//**************************************************************************
-/** @brief alignment values; 128 bytes is the largest cache line on typical architectures today. */
+/** @brief alignment values; 128 bytes is the largest cache line on typical architectures today. */
const UINT32 BITMAP_OVERALL_ALIGN = 128;
-/** @brief The bitmap rowbytes align. */
+/** @brief The bitmap rowbytes align. */
const UINT32 BITMAP_ROWBYTES_ALIGN = 128;
@@ -62,18 +62,18 @@ inline void bitmap_t::compute_base(int xslop, int yslop)
//**************************************************************************
/**
- * @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, int width, int height, int xslop, int yslop)
+ * @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, int width, int height, int xslop, int yslop)
*
- * @brief -------------------------------------------------
- * bitmap_t - basic constructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * bitmap_t - basic constructor
+ * -------------------------------------------------.
*
- * @param format Describes the format to use.
- * @param bpp The bits per pixel.
- * @param width The width.
- * @param height The height.
- * @param xslop The xslop.
- * @param yslop The yslop.
+ * @param format Describes the format to use.
+ * @param bpp The bits per pixel.
+ * @param width The width.
+ * @param height The height.
+ * @param xslop The xslop.
+ * @param yslop The yslop.
*/
bitmap_t::bitmap_t(bitmap_format format, int bpp, int width, int height, int xslop, int yslop)
@@ -88,16 +88,16 @@ bitmap_t::bitmap_t(bitmap_format format, int bpp, int width, int height, int xsl
}
/**
- * @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, void *base, int width, int height, int rowpixels)
+ * @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, void *base, int width, int height, int rowpixels)
*
- * @brief Constructor.
+ * @brief Constructor.
*
- * @param format Describes the format to use.
- * @param bpp The bits per pixel.
- * @param [in,out] base If non-null, the base.
- * @param width The width.
- * @param height The height.
- * @param rowpixels The rowpixels.
+ * @param format Describes the format to use.
+ * @param bpp The bits per pixel.
+ * @param [in,out] base If non-null, the base.
+ * @param width The width.
+ * @param height The height.
+ * @param rowpixels The rowpixels.
*/
bitmap_t::bitmap_t(bitmap_format format, int bpp, void *base, int width, int height, int rowpixels)
@@ -115,14 +115,14 @@ bitmap_t::bitmap_t(bitmap_format format, int bpp, void *base, int width, int hei
}
/**
- * @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, bitmap_t &source, const rectangle &subrect)
+ * @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, bitmap_t &source, const rectangle &subrect)
*
- * @brief Constructor.
+ * @brief Constructor.
*
- * @param format Describes the format to use.
- * @param bpp The bits per pixel.
- * @param [in,out] source Source for the.
- * @param subrect The subrect.
+ * @param format Describes the format to use.
+ * @param bpp The bits per pixel.
+ * @param [in,out] source Source for the.
+ * @param subrect The subrect.
*/
bitmap_t::bitmap_t(bitmap_format format, int bpp, bitmap_t &source, const rectangle &subrect)
@@ -143,11 +143,11 @@ bitmap_t::bitmap_t(bitmap_format format, int bpp, bitmap_t &source, const rectan
}
/**
- * @fn bitmap_t::~bitmap_t()
+ * @fn bitmap_t::~bitmap_t()
*
- * @brief -------------------------------------------------
- * ~bitmap_t - basic destructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * ~bitmap_t - basic destructor
+ * -------------------------------------------------.
*/
bitmap_t::~bitmap_t()
@@ -157,17 +157,17 @@ bitmap_t::~bitmap_t()
}
/**
- * @fn void bitmap_t::allocate(int width, int height, int xslop, int yslop)
+ * @fn void bitmap_t::allocate(int width, int height, int xslop, int yslop)
*
- * @brief -------------------------------------------------
- * allocate -- (re)allocate memory for the bitmap at the given size, destroying
- * anything that already exists
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * allocate -- (re)allocate memory for the bitmap at the given size, destroying
+ * anything that already exists
+ * -------------------------------------------------.
*
- * @param width The width.
- * @param height The height.
- * @param xslop The xslop.
- * @param yslop The yslop.
+ * @param width The width.
+ * @param height The height.
+ * @param xslop The xslop.
+ * @param yslop The yslop.
*/
void bitmap_t::allocate(int width, int height, int xslop, int yslop)
@@ -201,17 +201,17 @@ void bitmap_t::allocate(int width, int height, int xslop, int yslop)
}
/**
- * @fn void bitmap_t::resize(int width, int height, int xslop, int yslop)
+ * @fn void bitmap_t::resize(int width, int height, int xslop, int yslop)
*
- * @brief -------------------------------------------------
- * resize -- resize a bitmap, reusing existing memory if the new size is smaller than
- * the current size
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * resize -- resize a bitmap, reusing existing memory if the new size is smaller than
+ * the current size
+ * -------------------------------------------------.
*
- * @param width The width.
- * @param height The height.
- * @param xslop The xslop.
- * @param yslop The yslop.
+ * @param width The width.
+ * @param height The height.
+ * @param xslop The xslop.
+ * @param yslop The yslop.
*/
void bitmap_t::resize(int width, int height, int xslop, int yslop)
@@ -248,11 +248,11 @@ void bitmap_t::resize(int width, int height, int xslop, int yslop)
}
/**
- * @fn void bitmap_t::reset()
+ * @fn void bitmap_t::reset()
*
- * @brief -------------------------------------------------
- * reset -- reset to an invalid bitmap, deleting all allocated stuff
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * reset -- reset to an invalid bitmap, deleting all allocated stuff
+ * -------------------------------------------------.
*/
void bitmap_t::reset()
@@ -271,16 +271,16 @@ void bitmap_t::reset()
}
/**
- * @fn void bitmap_t::wrap(void *base, int width, int height, int rowpixels)
+ * @fn void bitmap_t::wrap(void *base, int width, int height, int rowpixels)
*
- * @brief -------------------------------------------------
- * wrap -- wrap an array of memory; the target bitmap does not own the memory
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * wrap -- wrap an array of memory; the target bitmap does not own the memory
+ * -------------------------------------------------.
*
- * @param [in,out] base If non-null, the base.
- * @param width The width.
- * @param height The height.
- * @param rowpixels The rowpixels.
+ * @param [in,out] base If non-null, the base.
+ * @param width The width.
+ * @param height The height.
+ * @param rowpixels The rowpixels.
*/
void bitmap_t::wrap(void *base, int width, int height, int rowpixels)
@@ -297,15 +297,15 @@ void bitmap_t::wrap(void *base, int width, int height, int rowpixels)
}
/**
- * @fn void bitmap_t::wrap(const bitmap_t &source, const rectangle &subrect)
+ * @fn void bitmap_t::wrap(const bitmap_t &source, const rectangle &subrect)
*
- * @brief -------------------------------------------------
- * wrap -- wrap a subrectangle of an existing bitmap by copying its fields; the target
- * bitmap does not own the memory
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * wrap -- wrap a subrectangle of an existing bitmap by copying its fields; the target
+ * bitmap does not own the memory
+ * -------------------------------------------------.
*
- * @param source Source for the.
- * @param subrect The subrect.
+ * @param source Source for the.
+ * @param subrect The subrect.
*/
void bitmap_t::wrap(const bitmap_t &source, const rectangle &subrect)
@@ -327,13 +327,13 @@ void bitmap_t::wrap(const bitmap_t &source, const rectangle &subrect)
}
/**
- * @fn void bitmap_t::set_palette(palette_t *palette)
+ * @fn void bitmap_t::set_palette(palette_t *palette)
*
- * @brief -------------------------------------------------
- * set_palette -- associate a palette with a bitmap
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * set_palette -- associate a palette with a bitmap
+ * -------------------------------------------------.
*
- * @param [in,out] palette If non-null, the palette.
+ * @param [in,out] palette If non-null, the palette.
*/
void bitmap_t::set_palette(palette_t *palette)
@@ -354,14 +354,14 @@ void bitmap_t::set_palette(palette_t *palette)
}
/**
- * @fn void bitmap_t::fill(UINT32 color, const rectangle &cliprect)
+ * @fn void bitmap_t::fill(UINT32 color, const rectangle &cliprect)
*
- * @brief -------------------------------------------------
- * fill -- fill a bitmap with a solid color
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * fill -- fill a bitmap with a solid color
+ * -------------------------------------------------.
*
- * @param color The color.
- * @param cliprect The cliprect.
+ * @param color The color.
+ * @param cliprect The cliprect.
*/
void bitmap_t::fill(UINT32 color, const rectangle &cliprect)
diff --git a/src/lib/util/cdrom.c b/src/lib/util/cdrom.c
index 40f3caf4190..e3cb14e8f0c 100644
--- a/src/lib/util/cdrom.c
+++ b/src/lib/util/cdrom.c
@@ -28,39 +28,39 @@
DEBUGGING
***************************************************************************/
-/** @brief The verbose. */
+/** @brief The verbose. */
#define VERBOSE (0)
#if VERBOSE
/**
- * @def LOG(x) do
+ * @def LOG(x) do
*
- * @brief A macro that defines log.
+ * @brief A macro that defines log.
*
- * @param x The void to process.
+ * @param x The void to process.
*/
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
/**
- * @fn void CLIB_DECL logerror(const char *text, ...) ATTR_PRINTF(1,2);
+ * @fn void CLIB_DECL logerror(const char *text, ...) ATTR_PRINTF(1,2);
*
- * @brief Logerrors the given text.
+ * @brief Logerrors the given text.
*
- * @param text The text.
+ * @param text The text.
*
- * @return A CLIB_DECL.
+ * @return A CLIB_DECL.
*/
void CLIB_DECL logerror(const char *text, ...) ATTR_PRINTF(1,2);
#else
/**
- * @def LOG(x);
+ * @def LOG(x);
*
- * @brief A macro that defines log.
+ * @brief A macro that defines log.
*
- * @param x The void to process.
+ * @param x The void to process.
*/
#define LOG(x)
@@ -72,26 +72,26 @@ void CLIB_DECL logerror(const char *text, ...) ATTR_PRINTF(1,2);
CONSTANTS
***************************************************************************/
-/** @brief offset within sector. */
+/** @brief offset within sector. */
const int SYNC_OFFSET = 0x000;
-/** @brief 12 bytes. */
+/** @brief 12 bytes. */
const int SYNC_NUM_BYTES = 12;
-/** @brief offset within sector. */
+/** @brief offset within sector. */
const int MODE_OFFSET = 0x00f;
-/** @brief offset within sector. */
+/** @brief offset within sector. */
const int ECC_P_OFFSET = 0x81c;
-/** @brief 2 lots of 86. */
+/** @brief 2 lots of 86. */
const int ECC_P_NUM_BYTES = 86;
-/** @brief 24 bytes each. */
+/** @brief 24 bytes each. */
const int ECC_P_COMP = 24;
-/** @brief The ECC q offset. */
+/** @brief The ECC q offset. */
const int ECC_Q_OFFSET = ECC_P_OFFSET + 2 * ECC_P_NUM_BYTES;
-/** @brief 2 lots of 52. */
+/** @brief 2 lots of 52. */
const int ECC_Q_NUM_BYTES = 52;
-/** @brief 43 bytes each. */
+/** @brief 43 bytes each. */
const int ECC_Q_COMP = 43;
@@ -101,20 +101,20 @@ const int ECC_Q_COMP = 43;
***************************************************************************/
/**
- * @struct cdrom_file
+ * @struct cdrom_file
*
- * @brief A cdrom file.
+ * @brief A cdrom file.
*/
struct cdrom_file
{
- /** @brief The chd. */
+ /** @brief The chd. */
chd_file * chd; /* CHD file */
- /** @brief The cdtoc. */
+ /** @brief The cdtoc. */
cdrom_toc cdtoc; /* TOC for the CD */
- /** @brief Information describing the track. */
+ /** @brief Information describing the track. */
chdcd_track_input_info track_info; /* track info */
- /** @brief The fhandle[ CD maximum tracks]. */
+ /** @brief The fhandle[ CD maximum tracks]. */
core_file * fhandle[CD_MAX_TRACKS];/* file handle */
};
@@ -130,15 +130,15 @@ struct cdrom_file
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum)
+ * @fn INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum)
*
- * @brief Physical to chd lba.
+ * @brief Physical to chd lba.
*
- * @param [in,out] file If non-null, the file.
- * @param physlba The physlba.
- * @param [in,out] tracknum The tracknum.
+ * @param [in,out] file If non-null, the file.
+ * @param physlba The physlba.
+ * @param [in,out] tracknum The tracknum.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum)
@@ -164,15 +164,15 @@ INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &trac
-------------------------------------------------*/
/**
- * @fn INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum)
+ * @fn INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum)
*
- * @brief Logical to chd lba.
+ * @brief Logical to chd lba.
*
- * @param [in,out] file If non-null, the file.
- * @param loglba The loglba.
- * @param [in,out] tracknum The tracknum.
+ * @param [in,out] file If non-null, the file.
+ * @param loglba The loglba.
+ * @param [in,out] tracknum The tracknum.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum)
@@ -208,13 +208,13 @@ INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &trackn
***************************************************************************/
/**
- * @fn cdrom_file *cdrom_open(const char *inputfile)
+ * @fn cdrom_file *cdrom_open(const char *inputfile)
*
- * @brief Queries if a given cdrom open.
+ * @brief Queries if a given cdrom open.
*
- * @param inputfile The inputfile.
+ * @param inputfile The inputfile.
*
- * @return null if it fails, else a cdrom_file*.
+ * @return null if it fails, else a cdrom_file*.
*/
cdrom_file *cdrom_open(const char *inputfile)
@@ -304,13 +304,13 @@ cdrom_file *cdrom_open(const char *inputfile)
-------------------------------------------------*/
/**
- * @fn cdrom_file *cdrom_open(chd_file *chd)
+ * @fn cdrom_file *cdrom_open(chd_file *chd)
*
- * @brief Queries if a given cdrom open.
+ * @brief Queries if a given cdrom open.
*
- * @param [in,out] chd If non-null, the chd.
+ * @param [in,out] chd If non-null, the chd.
*
- * @return null if it fails, else a cdrom_file*.
+ * @return null if it fails, else a cdrom_file*.
*/
cdrom_file *cdrom_open(chd_file *chd)
@@ -402,11 +402,11 @@ cdrom_file *cdrom_open(chd_file *chd)
-------------------------------------------------*/
/**
- * @fn void cdrom_close(cdrom_file *file)
+ * @fn void cdrom_close(cdrom_file *file)
*
- * @brief Cdrom close.
+ * @brief Cdrom close.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*/
void cdrom_close(cdrom_file *file)
@@ -432,19 +432,19 @@ void cdrom_close(cdrom_file *file)
***************************************************************************/
/**
- * @fn chd_error read_partial_sector(cdrom_file *file, void *dest, UINT32 lbasector, UINT32 chdsector, UINT32 tracknum, UINT32 startoffs, UINT32 length)
+ * @fn chd_error read_partial_sector(cdrom_file *file, void *dest, UINT32 lbasector, UINT32 chdsector, UINT32 tracknum, UINT32 startoffs, UINT32 length)
*
- * @brief Reads partial sector.
+ * @brief Reads partial sector.
*
- * @param [in,out] file If non-null, the file.
- * @param [in,out] dest If non-null, destination for the.
- * @param lbasector The lbasector.
- * @param chdsector The chdsector.
- * @param tracknum The tracknum.
- * @param startoffs The startoffs.
- * @param length The length.
+ * @param [in,out] file If non-null, the file.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param lbasector The lbasector.
+ * @param chdsector The chdsector.
+ * @param tracknum The tracknum.
+ * @param startoffs The startoffs.
+ * @param length The length.
*
- * @return The partial sector.
+ * @return The partial sector.
*/
chd_error read_partial_sector(cdrom_file *file, void *dest, UINT32 lbasector, UINT32 chdsector, UINT32 tracknum, UINT32 startoffs, UINT32 length)
@@ -506,17 +506,17 @@ chd_error read_partial_sector(cdrom_file *file, void *dest, UINT32 lbasector, UI
-------------------------------------------------*/
/**
- * @fn UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32 datatype, bool phys)
+ * @fn UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32 datatype, bool phys)
*
- * @brief Cdrom read data.
+ * @brief Cdrom read data.
*
- * @param [in,out] file If non-null, the file.
- * @param lbasector The lbasector.
- * @param [in,out] buffer If non-null, the buffer.
- * @param datatype The datatype.
- * @param phys true to physical.
+ * @param [in,out] file If non-null, the file.
+ * @param lbasector The lbasector.
+ * @param [in,out] buffer If non-null, the buffer.
+ * @param datatype The datatype.
+ * @param phys true to physical.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32 datatype, bool phys)
@@ -592,16 +592,16 @@ UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32
-------------------------------------------------*/
/**
- * @fn UINT32 cdrom_read_subcode(cdrom_file *file, UINT32 lbasector, void *buffer, bool phys)
+ * @fn UINT32 cdrom_read_subcode(cdrom_file *file, UINT32 lbasector, void *buffer, bool phys)
*
- * @brief Cdrom read subcode.
+ * @brief Cdrom read subcode.
*
- * @param [in,out] file If non-null, the file.
- * @param lbasector The lbasector.
- * @param [in,out] buffer If non-null, the buffer.
- * @param phys true to physical.
+ * @param [in,out] file If non-null, the file.
+ * @param lbasector The lbasector.
+ * @param [in,out] buffer If non-null, the buffer.
+ * @param phys true to physical.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 cdrom_read_subcode(cdrom_file *file, UINT32 lbasector, void *buffer, bool phys)
@@ -642,14 +642,14 @@ UINT32 cdrom_read_subcode(cdrom_file *file, UINT32 lbasector, void *buffer, bool
-------------------------------------------------*/
/**
- * @fn UINT32 cdrom_get_track(cdrom_file *file, UINT32 frame)
+ * @fn UINT32 cdrom_get_track(cdrom_file *file, UINT32 frame)
*
- * @brief Cdrom get track.
+ * @brief Cdrom get track.
*
- * @param [in,out] file If non-null, the file.
- * @param frame The frame.
+ * @param [in,out] file If non-null, the file.
+ * @param frame The frame.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 cdrom_get_track(cdrom_file *file, UINT32 frame)
@@ -672,14 +672,14 @@ UINT32 cdrom_get_track(cdrom_file *file, UINT32 frame)
-------------------------------------------------*/
/**
- * @fn UINT32 cdrom_get_track_start(cdrom_file *file, UINT32 track)
+ * @fn UINT32 cdrom_get_track_start(cdrom_file *file, UINT32 track)
*
- * @brief Cdrom get track start.
+ * @brief Cdrom get track start.
*
- * @param [in,out] file If non-null, the file.
- * @param track The track.
+ * @param [in,out] file If non-null, the file.
+ * @param track The track.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 cdrom_get_track_start(cdrom_file *file, UINT32 track)
@@ -700,14 +700,14 @@ UINT32 cdrom_get_track_start(cdrom_file *file, UINT32 track)
-------------------------------------------------*/
/**
- * @fn UINT32 cdrom_get_track_start_phys(cdrom_file *file, UINT32 track)
+ * @fn UINT32 cdrom_get_track_start_phys(cdrom_file *file, UINT32 track)
*
- * @brief Cdrom get track start physical.
+ * @brief Cdrom get track start physical.
*
- * @param [in,out] file If non-null, the file.
- * @param track The track.
+ * @param [in,out] file If non-null, the file.
+ * @param track The track.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 cdrom_get_track_start_phys(cdrom_file *file, UINT32 track)
@@ -732,13 +732,13 @@ UINT32 cdrom_get_track_start_phys(cdrom_file *file, UINT32 track)
-------------------------------------------------*/
/**
- * @fn int cdrom_get_last_track(cdrom_file *file)
+ * @fn int cdrom_get_last_track(cdrom_file *file)
*
- * @brief Cdrom get last track.
+ * @brief Cdrom get last track.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return An int.
+ * @return An int.
*/
int cdrom_get_last_track(cdrom_file *file)
@@ -756,14 +756,14 @@ int cdrom_get_last_track(cdrom_file *file)
-------------------------------------------------*/
/**
- * @fn int cdrom_get_adr_control(cdrom_file *file, int track)
+ * @fn int cdrom_get_adr_control(cdrom_file *file, int track)
*
- * @brief Cdrom get address control.
+ * @brief Cdrom get address control.
*
- * @param [in,out] file If non-null, the file.
- * @param track The track.
+ * @param [in,out] file If non-null, the file.
+ * @param track The track.
*
- * @return An int.
+ * @return An int.
*/
int cdrom_get_adr_control(cdrom_file *file, int track)
@@ -785,14 +785,14 @@ int cdrom_get_adr_control(cdrom_file *file, int track)
-------------------------------------------------*/
/**
- * @fn int cdrom_get_track_type(cdrom_file *file, int track)
+ * @fn int cdrom_get_track_type(cdrom_file *file, int track)
*
- * @brief Cdrom get track type.
+ * @brief Cdrom get track type.
*
- * @param [in,out] file If non-null, the file.
- * @param track The track.
+ * @param [in,out] file If non-null, the file.
+ * @param track The track.
*
- * @return An int.
+ * @return An int.
*/
int cdrom_get_track_type(cdrom_file *file, int track)
@@ -810,13 +810,13 @@ int cdrom_get_track_type(cdrom_file *file, int track)
-------------------------------------------------*/
/**
- * @fn const cdrom_toc *cdrom_get_toc(cdrom_file *file)
+ * @fn const cdrom_toc *cdrom_get_toc(cdrom_file *file)
*
- * @brief Cdrom get TOC.
+ * @brief Cdrom get TOC.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return null if it fails, else a cdrom_toc*.
+ * @return null if it fails, else a cdrom_toc*.
*/
const cdrom_toc *cdrom_get_toc(cdrom_file *file)
@@ -840,13 +840,13 @@ const cdrom_toc *cdrom_get_toc(cdrom_file *file)
-------------------------------------------------*/
/**
- * @fn static void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trktype, UINT32 *datasize)
+ * @fn static void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trktype, UINT32 *datasize)
*
- * @brief Cdrom get information from type string.
+ * @brief Cdrom get information from type string.
*
- * @param typestring The typestring.
- * @param [in,out] trktype If non-null, the trktype.
- * @param [in,out] datasize If non-null, the datasize.
+ * @param typestring The typestring.
+ * @param [in,out] trktype If non-null, the trktype.
+ * @param [in,out] datasize If non-null, the datasize.
*/
static void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trktype, UINT32 *datasize)
@@ -935,12 +935,12 @@ static void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trkt
-------------------------------------------------*/
/**
- * @fn void cdrom_convert_type_string_to_track_info(const char *typestring, cdrom_track_info *info)
+ * @fn void cdrom_convert_type_string_to_track_info(const char *typestring, cdrom_track_info *info)
*
- * @brief Cdrom convert type string to track information.
+ * @brief Cdrom convert type string to track information.
*
- * @param typestring The typestring.
- * @param [in,out] info If non-null, the information.
+ * @param typestring The typestring.
+ * @param [in,out] info If non-null, the information.
*/
void cdrom_convert_type_string_to_track_info(const char *typestring, cdrom_track_info *info)
@@ -955,12 +955,12 @@ void cdrom_convert_type_string_to_track_info(const char *typestring, cdrom_track
-------------------------------------------------*/
/**
- * @fn void cdrom_convert_type_string_to_pregap_info(const char *typestring, cdrom_track_info *info)
+ * @fn void cdrom_convert_type_string_to_pregap_info(const char *typestring, cdrom_track_info *info)
*
- * @brief Cdrom convert type string to pregap information.
+ * @brief Cdrom convert type string to pregap information.
*
- * @param typestring The typestring.
- * @param [in,out] info If non-null, the information.
+ * @param typestring The typestring.
+ * @param [in,out] info If non-null, the information.
*/
void cdrom_convert_type_string_to_pregap_info(const char *typestring, cdrom_track_info *info)
@@ -975,12 +975,12 @@ void cdrom_convert_type_string_to_pregap_info(const char *typestring, cdrom_trac
-------------------------------------------------*/
/**
- * @fn void cdrom_convert_subtype_string_to_track_info(const char *typestring, cdrom_track_info *info)
+ * @fn void cdrom_convert_subtype_string_to_track_info(const char *typestring, cdrom_track_info *info)
*
- * @brief Cdrom convert subtype string to track information.
+ * @brief Cdrom convert subtype string to track information.
*
- * @param typestring The typestring.
- * @param [in,out] info If non-null, the information.
+ * @param typestring The typestring.
+ * @param [in,out] info If non-null, the information.
*/
void cdrom_convert_subtype_string_to_track_info(const char *typestring, cdrom_track_info *info)
@@ -1004,12 +1004,12 @@ void cdrom_convert_subtype_string_to_track_info(const char *typestring, cdrom_tr
-------------------------------------------------*/
/**
- * @fn void cdrom_convert_subtype_string_to_pregap_info(const char *typestring, cdrom_track_info *info)
+ * @fn void cdrom_convert_subtype_string_to_pregap_info(const char *typestring, cdrom_track_info *info)
*
- * @brief Cdrom convert subtype string to pregap information.
+ * @brief Cdrom convert subtype string to pregap information.
*
- * @param typestring The typestring.
- * @param [in,out] info If non-null, the information.
+ * @param typestring The typestring.
+ * @param [in,out] info If non-null, the information.
*/
void cdrom_convert_subtype_string_to_pregap_info(const char *typestring, cdrom_track_info *info)
@@ -1032,13 +1032,13 @@ void cdrom_convert_subtype_string_to_pregap_info(const char *typestring, cdrom_t
-------------------------------------------------*/
/**
- * @fn const char *cdrom_get_type_string(UINT32 trktype)
+ * @fn const char *cdrom_get_type_string(UINT32 trktype)
*
- * @brief Cdrom get type string.
+ * @brief Cdrom get type string.
*
- * @param trktype The trktype.
+ * @param trktype The trktype.
*
- * @return null if it fails, else a char*.
+ * @return null if it fails, else a char*.
*/
const char *cdrom_get_type_string(UINT32 trktype)
@@ -1064,13 +1064,13 @@ const char *cdrom_get_type_string(UINT32 trktype)
-------------------------------------------------*/
/**
- * @fn const char *cdrom_get_subtype_string(UINT32 subtype)
+ * @fn const char *cdrom_get_subtype_string(UINT32 subtype)
*
- * @brief Cdrom get subtype string.
+ * @brief Cdrom get subtype string.
*
- * @param subtype The subtype.
+ * @param subtype The subtype.
*
- * @return null if it fails, else a char*.
+ * @return null if it fails, else a char*.
*/
const char *cdrom_get_subtype_string(UINT32 subtype)
@@ -1095,14 +1095,14 @@ const char *cdrom_get_subtype_string(UINT32 subtype)
-------------------------------------------------*/
/**
- * @fn chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
+ * @fn chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
*
- * @brief Cdrom parse metadata.
+ * @brief Cdrom parse metadata.
*
- * @param [in,out] chd If non-null, the chd.
- * @param [in,out] toc If non-null, the TOC.
+ * @param [in,out] chd If non-null, the chd.
+ * @param [in,out] toc If non-null, the TOC.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
@@ -1272,14 +1272,14 @@ chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
-------------------------------------------------*/
/**
- * @fn chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc)
+ * @fn chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc)
*
- * @brief Cdrom write metadata.
+ * @brief Cdrom write metadata.
*
- * @param [in,out] chd If non-null, the chd.
- * @param toc The TOC.
+ * @param [in,out] chd If non-null, the chd.
+ * @param toc The TOC.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc)
@@ -1327,9 +1327,9 @@ chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc)
}
/**
- * @brief -------------------------------------------------
- * ECC lookup tables pre-calculated tables for ECC data calcs
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * ECC lookup tables pre-calculated tables for ECC data calcs
+ * -------------------------------------------------.
*/
static const UINT8 ecclow[256] =
@@ -1352,7 +1352,7 @@ static const UINT8 ecclow[256] =
0xfd, 0xff, 0xf9, 0xfb, 0xf5, 0xf7, 0xf1, 0xf3, 0xed, 0xef, 0xe9, 0xeb, 0xe5, 0xe7, 0xe1, 0xe3
};
-/** @brief The ecchigh[ 256]. */
+/** @brief The ecchigh[ 256]. */
static const UINT8 ecchigh[256] =
{
0x00, 0xf4, 0xf5, 0x01, 0xf7, 0x03, 0x02, 0xf6, 0xf3, 0x07, 0x06, 0xf2, 0x04, 0xf0, 0xf1, 0x05,
@@ -1374,10 +1374,10 @@ static const UINT8 ecchigh[256] =
};
/**
- * @brief -------------------------------------------------
- * poffsets - each row represents the addresses used to calculate a byte of the ECC P
- * data 86 (*2) ECC P bytes, 24 values represented by each
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * poffsets - each row represents the addresses used to calculate a byte of the ECC P
+ * data 86 (*2) ECC P bytes, 24 values represented by each
+ * -------------------------------------------------.
*/
static const UINT16 poffsets[ECC_P_NUM_BYTES][ECC_P_COMP] =
@@ -1471,10 +1471,10 @@ static const UINT16 poffsets[ECC_P_NUM_BYTES][ECC_P_COMP] =
};
/**
- * @brief -------------------------------------------------
- * qoffsets - each row represents the addresses used to calculate a byte of the ECC Q
- * data 52 (*2) ECC Q bytes, 43 values represented by each
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * qoffsets - each row represents the addresses used to calculate a byte of the ECC Q
+ * data 52 (*2) ECC Q bytes, 43 values represented by each
+ * -------------------------------------------------.
*/
static const UINT16 qoffsets[ECC_Q_NUM_BYTES][ECC_Q_COMP] =
@@ -1547,17 +1547,17 @@ inline UINT8 ecc_source_byte(const UINT8 *sector, UINT32 offset)
}
/**
- * @fn void ecc_compute_bytes(const UINT8 *sector, const UINT16 *row, int rowlen, UINT8 &val1, UINT8 &val2)
+ * @fn void ecc_compute_bytes(const UINT8 *sector, const UINT16 *row, int rowlen, UINT8 &val1, UINT8 &val2)
*
- * @brief -------------------------------------------------
- * ecc_compute_bytes - calculate an ECC value (P or Q)
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * ecc_compute_bytes - calculate an ECC value (P or Q)
+ * -------------------------------------------------.
*
- * @param sector The sector.
- * @param row The row.
- * @param rowlen The rowlen.
- * @param [in,out] val1 The first value.
- * @param [in,out] val2 The second value.
+ * @param sector The sector.
+ * @param row The row.
+ * @param rowlen The rowlen.
+ * @param [in,out] val1 The first value.
+ * @param [in,out] val2 The second value.
*/
void ecc_compute_bytes(const UINT8 *sector, const UINT16 *row, int rowlen, UINT8 &val1, UINT8 &val2)
@@ -1574,15 +1574,15 @@ void ecc_compute_bytes(const UINT8 *sector, const UINT16 *row, int rowlen, UINT8
}
/**
- * @fn bool ecc_verify(const UINT8 *sector)
+ * @fn bool ecc_verify(const UINT8 *sector)
*
- * @brief -------------------------------------------------
- * ecc_verify - verify the P and Q ECC codes in a sector
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * ecc_verify - verify the P and Q ECC codes in a sector
+ * -------------------------------------------------.
*
- * @param sector The sector.
+ * @param sector The sector.
*
- * @return true if it succeeds, false if it fails.
+ * @return true if it succeeds, false if it fails.
*/
bool ecc_verify(const UINT8 *sector)
@@ -1608,14 +1608,14 @@ bool ecc_verify(const UINT8 *sector)
}
/**
- * @fn void ecc_generate(UINT8 *sector)
+ * @fn void ecc_generate(UINT8 *sector)
*
- * @brief -------------------------------------------------
- * ecc_generate - generate the P and Q ECC codes for a sector, overwriting any
- * existing codes
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * ecc_generate - generate the P and Q ECC codes for a sector, overwriting any
+ * existing codes
+ * -------------------------------------------------.
*
- * @param [in,out] sector If non-null, the sector.
+ * @param [in,out] sector If non-null, the sector.
*/
void ecc_generate(UINT8 *sector)
@@ -1630,13 +1630,13 @@ void ecc_generate(UINT8 *sector)
}
/**
- * @fn void ecc_clear(UINT8 *sector)
+ * @fn void ecc_clear(UINT8 *sector)
*
- * @brief -------------------------------------------------
- * ecc_clear - erase the ECC P and Q cods to 0 within a sector
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * ecc_clear - erase the ECC P and Q cods to 0 within a sector
+ * -------------------------------------------------.
*
- * @param [in,out] sector If non-null, the sector.
+ * @param [in,out] sector If non-null, the sector.
*/
void ecc_clear(UINT8 *sector)
diff --git a/src/lib/util/chd.c b/src/lib/util/chd.c
index f9bdf179f8a..07e98d03b85 100644
--- a/src/lib/util/chd.c
+++ b/src/lib/util/chd.c
@@ -280,11 +280,11 @@ inline UINT8 chd_file::bits_for_value(UINT64 value)
//**************************************************************************
/**
- * @fn chd_file::chd_file()
+ * @fn chd_file::chd_file()
*
- * @brief -------------------------------------------------
- * chd_file - constructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * chd_file - constructor
+ * -------------------------------------------------.
*/
chd_file::chd_file()
@@ -297,11 +297,11 @@ chd_file::chd_file()
}
/**
- * @fn chd_file::~chd_file()
+ * @fn chd_file::~chd_file()
*
- * @brief -------------------------------------------------
- * ~chd_file - destructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * ~chd_file - destructor
+ * -------------------------------------------------.
*/
chd_file::~chd_file()
@@ -311,13 +311,13 @@ chd_file::~chd_file()
}
/**
- * @fn sha1_t chd_file::sha1()
+ * @fn sha1_t chd_file::sha1()
*
- * @brief -------------------------------------------------
- * sha1 - return our SHA1 value
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * sha1 - return our SHA1 value
+ * -------------------------------------------------.
*
- * @return A sha1_t.
+ * @return A sha1_t.
*/
sha1_t chd_file::sha1()
@@ -337,16 +337,16 @@ sha1_t chd_file::sha1()
}
/**
- * @fn sha1_t chd_file::raw_sha1()
+ * @fn sha1_t chd_file::raw_sha1()
*
- * @brief -------------------------------------------------
- * raw_sha1 - return our raw SHA1 value
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * raw_sha1 - return our raw SHA1 value
+ * -------------------------------------------------.
*
- * @exception CHDERR_UNSUPPORTED_VERSION Thrown when a chderr unsupported version error
- * condition occurs.
+ * @exception CHDERR_UNSUPPORTED_VERSION Thrown when a chderr unsupported version error
+ * condition occurs.
*
- * @return A sha1_t.
+ * @return A sha1_t.
*/
sha1_t chd_file::raw_sha1()
@@ -370,16 +370,16 @@ sha1_t chd_file::raw_sha1()
}
/**
- * @fn sha1_t chd_file::parent_sha1()
+ * @fn sha1_t chd_file::parent_sha1()
*
- * @brief -------------------------------------------------
- * parent_sha1 - return our parent's SHA1 value
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * parent_sha1 - return our parent's SHA1 value
+ * -------------------------------------------------.
*
- * @exception CHDERR_UNSUPPORTED_VERSION Thrown when a chderr unsupported version error
- * condition occurs.
+ * @exception CHDERR_UNSUPPORTED_VERSION Thrown when a chderr unsupported version error
+ * condition occurs.
*
- * @return A sha1_t.
+ * @return A sha1_t.
*/
sha1_t chd_file::parent_sha1()
@@ -403,17 +403,17 @@ sha1_t chd_file::parent_sha1()
}
/**
- * @fn chd_error chd_file::hunk_info(UINT32 hunknum, chd_codec_type &compressor, UINT32 &compbytes)
+ * @fn chd_error chd_file::hunk_info(UINT32 hunknum, chd_codec_type &compressor, UINT32 &compbytes)
*
- * @brief -------------------------------------------------
- * hunk_info - return information about this hunk
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * hunk_info - return information about this hunk
+ * -------------------------------------------------.
*
- * @param hunknum The hunknum.
- * @param [in,out] compressor The compressor.
- * @param [in,out] compbytes The compbytes.
+ * @param hunknum The hunknum.
+ * @param [in,out] compressor The compressor.
+ * @param [in,out] compbytes The compbytes.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::hunk_info(UINT32 hunknum, chd_codec_type &compressor, UINT32 &compbytes)
@@ -514,13 +514,13 @@ chd_error chd_file::hunk_info(UINT32 hunknum, chd_codec_type &compressor, UINT32
}
/**
- * @fn void chd_file::set_raw_sha1(sha1_t rawdata)
+ * @fn void chd_file::set_raw_sha1(sha1_t rawdata)
*
- * @brief -------------------------------------------------
- * set_raw_sha1 - set our SHA1 values
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * set_raw_sha1 - set our SHA1 values
+ * -------------------------------------------------.
*
- * @param rawdata The rawdata.
+ * @param rawdata The rawdata.
*/
void chd_file::set_raw_sha1(sha1_t rawdata)
@@ -540,15 +540,15 @@ void chd_file::set_raw_sha1(sha1_t rawdata)
}
/**
- * @fn void chd_file::set_parent_sha1(sha1_t parent)
+ * @fn void chd_file::set_parent_sha1(sha1_t parent)
*
- * @brief -------------------------------------------------
- * set_parent_sha1 - set the parent SHA1 value
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * set_parent_sha1 - set the parent SHA1 value
+ * -------------------------------------------------.
*
- * @exception CHDERR_INVALID_FILE Thrown when a chderr invalid file error condition occurs.
+ * @exception CHDERR_INVALID_FILE Thrown when a chderr invalid file error condition occurs.
*
- * @param parent The parent.
+ * @param parent The parent.
*/
void chd_file::set_parent_sha1(sha1_t parent)
@@ -567,19 +567,19 @@ void chd_file::set_parent_sha1(sha1_t parent)
}
/**
- * @fn chd_error chd_file::create(core_file &file, UINT64 logicalbytes, UINT32 hunkbytes, UINT32 unitbytes, chd_codec_type compression[4])
+ * @fn chd_error chd_file::create(core_file &file, UINT64 logicalbytes, UINT32 hunkbytes, UINT32 unitbytes, chd_codec_type compression[4])
*
- * @brief -------------------------------------------------
- * create - create a new file with no parent using an existing opened file handle
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * create - create a new file with no parent using an existing opened file handle
+ * -------------------------------------------------.
*
- * @param [in,out] file The file.
- * @param logicalbytes The logicalbytes.
- * @param hunkbytes The hunkbytes.
- * @param unitbytes The unitbytes.
- * @param compression The compression.
+ * @param [in,out] file The file.
+ * @param logicalbytes The logicalbytes.
+ * @param hunkbytes The hunkbytes.
+ * @param unitbytes The unitbytes.
+ * @param compression The compression.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::create(core_file &file, UINT64 logicalbytes, UINT32 hunkbytes, UINT32 unitbytes, chd_codec_type compression[4])
@@ -602,19 +602,19 @@ chd_error chd_file::create(core_file &file, UINT64 logicalbytes, UINT32 hunkbyte
}
/**
- * @fn chd_error chd_file::create(core_file &file, UINT64 logicalbytes, UINT32 hunkbytes, chd_codec_type compression[4], chd_file &parent)
+ * @fn chd_error chd_file::create(core_file &file, UINT64 logicalbytes, UINT32 hunkbytes, chd_codec_type compression[4], chd_file &parent)
*
- * @brief -------------------------------------------------
- * create - create a new file with a parent using an existing opened file handle
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * create - create a new file with a parent using an existing opened file handle
+ * -------------------------------------------------.
*
- * @param [in,out] file The file.
- * @param logicalbytes The logicalbytes.
- * @param hunkbytes The hunkbytes.
- * @param compression The compression.
- * @param [in,out] parent The parent.
+ * @param [in,out] file The file.
+ * @param logicalbytes The logicalbytes.
+ * @param hunkbytes The hunkbytes.
+ * @param compression The compression.
+ * @param [in,out] parent The parent.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::create(core_file &file, UINT64 logicalbytes, UINT32 hunkbytes, chd_codec_type compression[4], chd_file &parent)
@@ -637,19 +637,19 @@ chd_error chd_file::create(core_file &file, UINT64 logicalbytes, UINT32 hunkbyte
}
/**
- * @fn chd_error chd_file::create(const char *filename, UINT64 logicalbytes, UINT32 hunkbytes, UINT32 unitbytes, chd_codec_type compression[4])
+ * @fn chd_error chd_file::create(const char *filename, UINT64 logicalbytes, UINT32 hunkbytes, UINT32 unitbytes, chd_codec_type compression[4])
*
- * @brief -------------------------------------------------
- * create - create a new file with no parent using a filename
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * create - create a new file with no parent using a filename
+ * -------------------------------------------------.
*
- * @param filename Filename of the file.
- * @param logicalbytes The logicalbytes.
- * @param hunkbytes The hunkbytes.
- * @param unitbytes The unitbytes.
- * @param compression The compression.
+ * @param filename Filename of the file.
+ * @param logicalbytes The logicalbytes.
+ * @param hunkbytes The hunkbytes.
+ * @param unitbytes The unitbytes.
+ * @param compression The compression.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::create(const char *filename, UINT64 logicalbytes, UINT32 hunkbytes, UINT32 unitbytes, chd_codec_type compression[4])
@@ -678,19 +678,19 @@ chd_error chd_file::create(const char *filename, UINT64 logicalbytes, UINT32 hun
}
/**
- * @fn chd_error chd_file::create(const char *filename, UINT64 logicalbytes, UINT32 hunkbytes, chd_codec_type compression[4], chd_file &parent)
+ * @fn chd_error chd_file::create(const char *filename, UINT64 logicalbytes, UINT32 hunkbytes, chd_codec_type compression[4], chd_file &parent)
*
- * @brief -------------------------------------------------
- * create - create a new file with a parent using a filename
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * create - create a new file with a parent using a filename
+ * -------------------------------------------------.
*
- * @param filename Filename of the file.
- * @param logicalbytes The logicalbytes.
- * @param hunkbytes The hunkbytes.
- * @param compression The compression.
- * @param [in,out] parent The parent.
+ * @param filename Filename of the file.
+ * @param logicalbytes The logicalbytes.
+ * @param hunkbytes The hunkbytes.
+ * @param compression The compression.
+ * @param [in,out] parent The parent.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::create(const char *filename, UINT64 logicalbytes, UINT32 hunkbytes, chd_codec_type compression[4], chd_file &parent)
@@ -719,17 +719,17 @@ chd_error chd_file::create(const char *filename, UINT64 logicalbytes, UINT32 hun
}
/**
- * @fn chd_error chd_file::open(const char *filename, bool writeable, chd_file *parent)
+ * @fn chd_error chd_file::open(const char *filename, bool writeable, chd_file *parent)
*
- * @brief -------------------------------------------------
- * open - open an existing file for read or read/write
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * open - open an existing file for read or read/write
+ * -------------------------------------------------.
*
- * @param filename Filename of the file.
- * @param writeable true if writeable.
- * @param [in,out] parent If non-null, the parent.
+ * @param filename Filename of the file.
+ * @param writeable true if writeable.
+ * @param [in,out] parent If non-null, the parent.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::open(const char *filename, bool writeable, chd_file *parent)
@@ -759,17 +759,17 @@ chd_error chd_file::open(const char *filename, bool writeable, chd_file *parent)
}
/**
- * @fn chd_error chd_file::open(core_file &file, bool writeable, chd_file *parent)
+ * @fn chd_error chd_file::open(core_file &file, bool writeable, chd_file *parent)
*
- * @brief -------------------------------------------------
- * open - open an existing file for read or read/write
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * open - open an existing file for read or read/write
+ * -------------------------------------------------.
*
- * @param [in,out] file The file.
- * @param writeable true if writeable.
- * @param [in,out] parent If non-null, the parent.
+ * @param [in,out] file The file.
+ * @param writeable true if writeable.
+ * @param [in,out] parent If non-null, the parent.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::open(core_file &file, bool writeable, chd_file *parent)
@@ -786,11 +786,11 @@ chd_error chd_file::open(core_file &file, bool writeable, chd_file *parent)
}
/**
- * @fn void chd_file::close()
+ * @fn void chd_file::close()
*
- * @brief -------------------------------------------------
- * close - close a CHD file for access
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * close - close a CHD file for access
+ * -------------------------------------------------.
*/
void chd_file::close()
@@ -841,26 +841,26 @@ void chd_file::close()
}
/**
- * @fn chd_error chd_file::read_hunk(UINT32 hunknum, void *buffer)
- *
- * @brief -------------------------------------------------
- * read - read a single hunk from the CHD file
- * -------------------------------------------------.
- *
- * @exception CHDERR_NOT_OPEN Thrown when a chderr not open error condition occurs.
- * @exception CHDERR_HUNK_OUT_OF_RANGE Thrown when a chderr hunk out of range error
- * condition occurs.
- * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
- * condition occurs.
- * @exception CHDERR_REQUIRES_PARENT Thrown when a chderr requires parent error condition
- * occurs.
- * @exception CHDERR_READ_ERROR Thrown when a chderr read error error condition
- * occurs.
- *
- * @param hunknum The hunknum.
- * @param [in,out] buffer If non-null, the buffer.
- *
- * @return The hunk.
+ * @fn chd_error chd_file::read_hunk(UINT32 hunknum, void *buffer)
+ *
+ * @brief -------------------------------------------------
+ * read - read a single hunk from the CHD file
+ * -------------------------------------------------.
+ *
+ * @exception CHDERR_NOT_OPEN Thrown when a chderr not open error condition occurs.
+ * @exception CHDERR_HUNK_OUT_OF_RANGE Thrown when a chderr hunk out of range error
+ * condition occurs.
+ * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
+ * condition occurs.
+ * @exception CHDERR_REQUIRES_PARENT Thrown when a chderr requires parent error condition
+ * occurs.
+ * @exception CHDERR_READ_ERROR Thrown when a chderr read error error condition
+ * occurs.
+ *
+ * @param hunknum The hunknum.
+ * @param [in,out] buffer If non-null, the buffer.
+ *
+ * @return The hunk.
*/
chd_error chd_file::read_hunk(UINT32 hunknum, void *buffer)
@@ -990,22 +990,22 @@ chd_error chd_file::read_hunk(UINT32 hunknum, void *buffer)
}
/**
- * @fn chd_error chd_file::write_hunk(UINT32 hunknum, const void *buffer)
+ * @fn chd_error chd_file::write_hunk(UINT32 hunknum, const void *buffer)
*
- * @brief -------------------------------------------------
- * write - write a single hunk to the CHD file
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * write - write a single hunk to the CHD file
+ * -------------------------------------------------.
*
- * @exception CHDERR_NOT_OPEN Thrown when a chderr not open error condition occurs.
- * @exception CHDERR_HUNK_OUT_OF_RANGE Thrown when a chderr hunk out of range error
- * condition occurs.
- * @exception CHDERR_FILE_NOT_WRITEABLE Thrown when a chderr file not writeable error
- * condition occurs.
+ * @exception CHDERR_NOT_OPEN Thrown when a chderr not open error condition occurs.
+ * @exception CHDERR_HUNK_OUT_OF_RANGE Thrown when a chderr hunk out of range error
+ * condition occurs.
+ * @exception CHDERR_FILE_NOT_WRITEABLE Thrown when a chderr file not writeable error
+ * condition occurs.
*
- * @param hunknum The hunknum.
- * @param buffer The buffer.
+ * @param hunknum The hunknum.
+ * @param buffer The buffer.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::write_hunk(UINT32 hunknum, const void *buffer)
@@ -1076,17 +1076,17 @@ chd_error chd_file::write_hunk(UINT32 hunknum, const void *buffer)
}
/**
- * @fn chd_error chd_file::read_units(UINT64 unitnum, void *buffer, UINT32 count)
+ * @fn chd_error chd_file::read_units(UINT64 unitnum, void *buffer, UINT32 count)
*
- * @brief -------------------------------------------------
- * read_units - read the given number of units from the CHD
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * read_units - read the given number of units from the CHD
+ * -------------------------------------------------.
*
- * @param unitnum The unitnum.
- * @param [in,out] buffer If non-null, the buffer.
- * @param count Number of.
+ * @param unitnum The unitnum.
+ * @param [in,out] buffer If non-null, the buffer.
+ * @param count Number of.
*
- * @return The units.
+ * @return The units.
*/
chd_error chd_file::read_units(UINT64 unitnum, void *buffer, UINT32 count)
@@ -1095,17 +1095,17 @@ chd_error chd_file::read_units(UINT64 unitnum, void *buffer, UINT32 count)
}
/**
- * @fn chd_error chd_file::write_units(UINT64 unitnum, const void *buffer, UINT32 count)
+ * @fn chd_error chd_file::write_units(UINT64 unitnum, const void *buffer, UINT32 count)
*
- * @brief -------------------------------------------------
- * write_units - write the given number of units to the CHD
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * write_units - write the given number of units to the CHD
+ * -------------------------------------------------.
*
- * @param unitnum The unitnum.
- * @param buffer The buffer.
- * @param count Number of.
+ * @param unitnum The unitnum.
+ * @param buffer The buffer.
+ * @param count Number of.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::write_units(UINT64 unitnum, const void *buffer, UINT32 count)
@@ -1114,18 +1114,18 @@ chd_error chd_file::write_units(UINT64 unitnum, const void *buffer, UINT32 count
}
/**
- * @fn chd_error chd_file::read_bytes(UINT64 offset, void *buffer, UINT32 bytes)
+ * @fn chd_error chd_file::read_bytes(UINT64 offset, void *buffer, UINT32 bytes)
*
- * @brief -------------------------------------------------
- * read_bytes - read from the CHD at a byte level, using the cache to handle partial
- * hunks
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * read_bytes - read from the CHD at a byte level, using the cache to handle partial
+ * hunks
+ * -------------------------------------------------.
*
- * @param offset The offset.
- * @param [in,out] buffer If non-null, the buffer.
- * @param bytes The bytes.
+ * @param offset The offset.
+ * @param [in,out] buffer If non-null, the buffer.
+ * @param bytes The bytes.
*
- * @return The bytes.
+ * @return The bytes.
*/
chd_error chd_file::read_bytes(UINT64 offset, void *buffer, UINT32 bytes)
@@ -1167,18 +1167,18 @@ chd_error chd_file::read_bytes(UINT64 offset, void *buffer, UINT32 bytes)
}
/**
- * @fn chd_error chd_file::write_bytes(UINT64 offset, const void *buffer, UINT32 bytes)
+ * @fn chd_error chd_file::write_bytes(UINT64 offset, const void *buffer, UINT32 bytes)
*
- * @brief -------------------------------------------------
- * write_bytes - write to the CHD at a byte level, using the cache to handle partial
- * hunks
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * write_bytes - write to the CHD at a byte level, using the cache to handle partial
+ * hunks
+ * -------------------------------------------------.
*
- * @param offset The offset.
- * @param buffer The buffer.
- * @param bytes The bytes.
+ * @param offset The offset.
+ * @param buffer The buffer.
+ * @param bytes The bytes.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::write_bytes(UINT64 offset, const void *buffer, UINT32 bytes)
@@ -1221,20 +1221,20 @@ chd_error chd_file::write_bytes(UINT64 offset, const void *buffer, UINT32 bytes)
}
/**
- * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, std::string &output)
+ * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, std::string &output)
*
- * @brief -------------------------------------------------
- * read_metadata - read the indexed metadata of the given type
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * read_metadata - read the indexed metadata of the given type
+ * -------------------------------------------------.
*
- * @exception CHDERR_METADATA_NOT_FOUND Thrown when a chderr metadata not found error
- * condition occurs.
+ * @exception CHDERR_METADATA_NOT_FOUND Thrown when a chderr metadata not found error
+ * condition occurs.
*
- * @param searchtag The searchtag.
- * @param searchindex The searchindex.
- * @param [in,out] output The output.
+ * @param searchtag The searchtag.
+ * @param searchindex The searchindex.
+ * @param [in,out] output The output.
*
- * @return The metadata.
+ * @return The metadata.
*/
chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, std::string &output)
@@ -1265,18 +1265,18 @@ chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex
}
/**
- * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output)
+ * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output)
*
- * @brief Reads a metadata.
+ * @brief Reads a metadata.
*
- * @exception CHDERR_METADATA_NOT_FOUND Thrown when a chderr metadata not found error
- * condition occurs.
+ * @exception CHDERR_METADATA_NOT_FOUND Thrown when a chderr metadata not found error
+ * condition occurs.
*
- * @param searchtag The searchtag.
- * @param searchindex The searchindex.
- * @param [in,out] output The output.
+ * @param searchtag The searchtag.
+ * @param searchindex The searchindex.
+ * @param [in,out] output The output.
*
- * @return The metadata.
+ * @return The metadata.
*/
chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output)
@@ -1303,20 +1303,20 @@ chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex
}
/**
- * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, void *output, UINT32 outputlen, UINT32 &resultlen)
+ * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, void *output, UINT32 outputlen, UINT32 &resultlen)
*
- * @brief Reads a metadata.
+ * @brief Reads a metadata.
*
- * @exception CHDERR_METADATA_NOT_FOUND Thrown when a chderr metadata not found error
- * condition occurs.
+ * @exception CHDERR_METADATA_NOT_FOUND Thrown when a chderr metadata not found error
+ * condition occurs.
*
- * @param searchtag The searchtag.
- * @param searchindex The searchindex.
- * @param [in,out] output If non-null, the output.
- * @param outputlen The outputlen.
- * @param [in,out] resultlen The resultlen.
+ * @param searchtag The searchtag.
+ * @param searchindex The searchindex.
+ * @param [in,out] output If non-null, the output.
+ * @param outputlen The outputlen.
+ * @param [in,out] resultlen The resultlen.
*
- * @return The metadata.
+ * @return The metadata.
*/
chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, void *output, UINT32 outputlen, UINT32 &resultlen)
@@ -1343,20 +1343,20 @@ chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex
}
/**
- * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output, chd_metadata_tag &resulttag, UINT8 &resultflags)
+ * @fn chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output, chd_metadata_tag &resulttag, UINT8 &resultflags)
*
- * @brief Reads a metadata.
+ * @brief Reads a metadata.
*
- * @exception CHDERR_METADATA_NOT_FOUND Thrown when a chderr metadata not found error
- * condition occurs.
+ * @exception CHDERR_METADATA_NOT_FOUND Thrown when a chderr metadata not found error
+ * condition occurs.
*
- * @param searchtag The searchtag.
- * @param searchindex The searchindex.
- * @param [in,out] output The output.
- * @param [in,out] resulttag The resulttag.
- * @param [in,out] resultflags The resultflags.
+ * @param searchtag The searchtag.
+ * @param searchindex The searchindex.
+ * @param [in,out] output The output.
+ * @param [in,out] resulttag The resulttag.
+ * @param [in,out] resultflags The resultflags.
*
- * @return The metadata.
+ * @return The metadata.
*/
chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex, dynamic_buffer &output, chd_metadata_tag &resulttag, UINT8 &resultflags)
@@ -1385,19 +1385,19 @@ chd_error chd_file::read_metadata(chd_metadata_tag searchtag, UINT32 searchindex
}
/**
- * @fn chd_error chd_file::write_metadata(chd_metadata_tag metatag, UINT32 metaindex, const void *inputbuf, UINT32 inputlen, UINT8 flags)
+ * @fn chd_error chd_file::write_metadata(chd_metadata_tag metatag, UINT32 metaindex, const void *inputbuf, UINT32 inputlen, UINT8 flags)
*
- * @brief -------------------------------------------------
- * write_metadata - write the indexed metadata of the given type
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * write_metadata - write the indexed metadata of the given type
+ * -------------------------------------------------.
*
- * @param metatag The metatag.
- * @param metaindex The metaindex.
- * @param inputbuf The inputbuf.
- * @param inputlen The inputlen.
- * @param flags The flags.
+ * @param metatag The metatag.
+ * @param metaindex The metaindex.
+ * @param inputbuf The inputbuf.
+ * @param inputlen The inputlen.
+ * @param flags The flags.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::write_metadata(chd_metadata_tag metatag, UINT32 metaindex, const void *inputbuf, UINT32 inputlen, UINT8 flags)
@@ -1467,19 +1467,19 @@ chd_error chd_file::write_metadata(chd_metadata_tag metatag, UINT32 metaindex, c
}
/**
- * @fn chd_error chd_file::delete_metadata(chd_metadata_tag metatag, UINT32 metaindex)
+ * @fn chd_error chd_file::delete_metadata(chd_metadata_tag metatag, UINT32 metaindex)
*
- * @brief -------------------------------------------------
- * delete_metadata - remove the given metadata from the list
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * delete_metadata - remove the given metadata from the list
+ * -------------------------------------------------.
*
- * @exception CHDERR_METADATA_NOT_FOUND Thrown when a chderr metadata not found error
- * condition occurs.
+ * @exception CHDERR_METADATA_NOT_FOUND Thrown when a chderr metadata not found error
+ * condition occurs.
*
- * @param metatag The metatag.
- * @param metaindex The metaindex.
+ * @param metatag The metatag.
+ * @param metaindex The metaindex.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::delete_metadata(chd_metadata_tag metatag, UINT32 metaindex)
@@ -1505,17 +1505,17 @@ chd_error chd_file::delete_metadata(chd_metadata_tag metatag, UINT32 metaindex)
}
/**
- * @fn chd_error chd_file::clone_all_metadata(chd_file &source)
+ * @fn chd_error chd_file::clone_all_metadata(chd_file &source)
*
- * @brief -------------------------------------------------
- * clone_all_metadata - clone the metadata from one CHD to a second
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * clone_all_metadata - clone the metadata from one CHD to a second
+ * -------------------------------------------------.
*
- * @exception err Thrown when an error error condition occurs.
+ * @exception err Thrown when an error error condition occurs.
*
- * @param [in,out] source Another instance to copy.
+ * @param [in,out] source Another instance to copy.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::clone_all_metadata(chd_file &source)
@@ -1552,16 +1552,16 @@ chd_error chd_file::clone_all_metadata(chd_file &source)
}
/**
- * @fn sha1_t chd_file::compute_overall_sha1(sha1_t rawsha1)
+ * @fn sha1_t chd_file::compute_overall_sha1(sha1_t rawsha1)
*
- * @brief -------------------------------------------------
- * compute_overall_sha1 - iterate through the metadata and compute the overall hash of
- * the CHD file
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * compute_overall_sha1 - iterate through the metadata and compute the overall hash of
+ * the CHD file
+ * -------------------------------------------------.
*
- * @param rawsha1 The first rawsha.
+ * @param rawsha1 The first rawsha.
*
- * @return The calculated overall sha 1.
+ * @return The calculated overall sha 1.
*/
sha1_t chd_file::compute_overall_sha1(sha1_t rawsha1)
@@ -1604,17 +1604,17 @@ sha1_t chd_file::compute_overall_sha1(sha1_t rawsha1)
}
/**
- * @fn chd_error chd_file::codec_configure(chd_codec_type codec, int param, void *config)
+ * @fn chd_error chd_file::codec_configure(chd_codec_type codec, int param, void *config)
*
- * @brief -------------------------------------------------
- * codec_config - set internal codec parameters
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * codec_config - set internal codec parameters
+ * -------------------------------------------------.
*
- * @param codec The codec.
- * @param param The parameter.
- * @param [in,out] config If non-null, the configuration.
+ * @param codec The codec.
+ * @param param The parameter.
+ * @param [in,out] config If non-null, the configuration.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::codec_configure(chd_codec_type codec, int param, void *config)
@@ -1640,15 +1640,15 @@ chd_error chd_file::codec_configure(chd_codec_type codec, int param, void *confi
}
/**
- * @fn const char *chd_file::error_string(chd_error err)
+ * @fn const char *chd_file::error_string(chd_error err)
*
- * @brief -------------------------------------------------
- * error_string - return an error string for the given CHD error
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * error_string - return an error string for the given CHD error
+ * -------------------------------------------------.
*
- * @param err The error.
+ * @param err The error.
*
- * @return null if it fails, else a char*.
+ * @return null if it fails, else a char*.
*/
const char *chd_file::error_string(chd_error err)
@@ -1698,14 +1698,14 @@ const char *chd_file::error_string(chd_error err)
//**************************************************************************
/**
- * @fn UINT32 chd_file::guess_unitbytes()
+ * @fn UINT32 chd_file::guess_unitbytes()
*
- * @brief -------------------------------------------------
- * guess_unitbytes - for older CHD formats, take a guess at the bytes/unit based on
- * metadata
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * guess_unitbytes - for older CHD formats, take a guess at the bytes/unit based on
+ * metadata
+ * -------------------------------------------------.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 chd_file::guess_unitbytes()
@@ -1729,19 +1729,19 @@ UINT32 chd_file::guess_unitbytes()
}
/**
- * @fn void chd_file::parse_v3_header(UINT8 *rawheader, sha1_t &parentsha1)
+ * @fn void chd_file::parse_v3_header(UINT8 *rawheader, sha1_t &parentsha1)
*
- * @brief -------------------------------------------------
- * parse_v3_header - parse the header from a v3 file and configure core parameters
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * parse_v3_header - parse the header from a v3 file and configure core parameters
+ * -------------------------------------------------.
*
- * @exception CHDERR_INVALID_FILE Thrown when a chderr invalid file error condition
- * occurs.
- * @exception CHDERR_UNKNOWN_COMPRESSION Thrown when a chderr unknown compression error
- * condition occurs.
+ * @exception CHDERR_INVALID_FILE Thrown when a chderr invalid file error condition
+ * occurs.
+ * @exception CHDERR_UNKNOWN_COMPRESSION Thrown when a chderr unknown compression error
+ * condition occurs.
*
- * @param [in,out] rawheader If non-null, the rawheader.
- * @param [in,out] parentsha1 The first parentsha.
+ * @param [in,out] rawheader If non-null, the rawheader.
+ * @param [in,out] parentsha1 The first parentsha.
*/
void chd_file::parse_v3_header(UINT8 *rawheader, sha1_t &parentsha1)
@@ -1792,19 +1792,19 @@ void chd_file::parse_v3_header(UINT8 *rawheader, sha1_t &parentsha1)
}
/**
- * @fn void chd_file::parse_v4_header(UINT8 *rawheader, sha1_t &parentsha1)
+ * @fn void chd_file::parse_v4_header(UINT8 *rawheader, sha1_t &parentsha1)
*
- * @brief -------------------------------------------------
- * parse_v4_header - parse the header from a v4 file and configure core parameters
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * parse_v4_header - parse the header from a v4 file and configure core parameters
+ * -------------------------------------------------.
*
- * @exception CHDERR_INVALID_FILE Thrown when a chderr invalid file error condition
- * occurs.
- * @exception CHDERR_UNKNOWN_COMPRESSION Thrown when a chderr unknown compression error
- * condition occurs.
+ * @exception CHDERR_INVALID_FILE Thrown when a chderr invalid file error condition
+ * occurs.
+ * @exception CHDERR_UNKNOWN_COMPRESSION Thrown when a chderr unknown compression error
+ * condition occurs.
*
- * @param [in,out] rawheader If non-null, the rawheader.
- * @param [in,out] parentsha1 The first parentsha.
+ * @param [in,out] rawheader If non-null, the rawheader.
+ * @param [in,out] parentsha1 The first parentsha.
*/
void chd_file::parse_v4_header(UINT8 *rawheader, sha1_t &parentsha1)
@@ -1855,16 +1855,16 @@ void chd_file::parse_v4_header(UINT8 *rawheader, sha1_t &parentsha1)
}
/**
- * @fn void chd_file::parse_v5_header(UINT8 *rawheader, sha1_t &parentsha1)
+ * @fn void chd_file::parse_v5_header(UINT8 *rawheader, sha1_t &parentsha1)
*
- * @brief -------------------------------------------------
- * parse_v5_header - read the header from a v5 file and configure core parameters
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * parse_v5_header - read the header from a v5 file and configure core parameters
+ * -------------------------------------------------.
*
- * @exception CHDERR_INVALID_FILE Thrown when a chderr invalid file error condition occurs.
+ * @exception CHDERR_INVALID_FILE Thrown when a chderr invalid file error condition occurs.
*
- * @param [in,out] rawheader If non-null, the rawheader.
- * @param [in,out] parentsha1 The first parentsha.
+ * @param [in,out] rawheader If non-null, the rawheader.
+ * @param [in,out] parentsha1 The first parentsha.
*/
void chd_file::parse_v5_header(UINT8 *rawheader, sha1_t &parentsha1)
@@ -1905,16 +1905,16 @@ void chd_file::parse_v5_header(UINT8 *rawheader, sha1_t &parentsha1)
}
/**
- * @fn chd_error chd_file::compress_v5_map()
+ * @fn chd_error chd_file::compress_v5_map()
*
- * @brief -------------------------------------------------
- * compress_v5_map - compress the v5 map and write it to the end of the file
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * compress_v5_map - compress the v5 map and write it to the end of the file
+ * -------------------------------------------------.
*
- * @exception CHDERR_COMPRESSION_ERROR Thrown when a chderr compression error error
- * condition occurs.
+ * @exception CHDERR_COMPRESSION_ERROR Thrown when a chderr compression error error
+ * condition occurs.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file::compress_v5_map()
@@ -2119,14 +2119,14 @@ chd_error chd_file::compress_v5_map()
}
/**
- * @fn void chd_file::decompress_v5_map()
+ * @fn void chd_file::decompress_v5_map()
*
- * @brief -------------------------------------------------
- * decompress_v5_map - decompress the v5 map
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * decompress_v5_map - decompress the v5 map
+ * -------------------------------------------------.
*
- * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
- * condition occurs.
+ * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
+ * condition occurs.
*/
void chd_file::decompress_v5_map()
@@ -2243,20 +2243,20 @@ void chd_file::decompress_v5_map()
}
/**
- * @fn chd_error chd_file::create_common()
+ * @fn chd_error chd_file::create_common()
*
- * @brief -------------------------------------------------
- * create_common - command path when creating a new CHD file
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * create_common - command path when creating a new CHD file
+ * -------------------------------------------------.
*
- * @exception CHDERR_UNSUPPORTED_VERSION Thrown when a chderr unsupported version error
- * condition occurs.
- * @exception CHDERR_INVALID_PARAMETER Thrown when a chderr invalid parameter error
- * condition occurs.
- * @exception CHDERR_UNKNOWN_COMPRESSION Thrown when a chderr unknown compression error
- * condition occurs.
+ * @exception CHDERR_UNSUPPORTED_VERSION Thrown when a chderr unsupported version error
+ * condition occurs.
+ * @exception CHDERR_INVALID_PARAMETER Thrown when a chderr invalid parameter error
+ * condition occurs.
+ * @exception CHDERR_UNKNOWN_COMPRESSION Thrown when a chderr unknown compression error
+ * condition occurs.
*
- * @return The new common.
+ * @return The new common.
*/
chd_error chd_file::create_common()
@@ -2353,26 +2353,26 @@ chd_error chd_file::create_common()
}
/**
- * @fn chd_error chd_file::open_common(bool writeable)
- *
- * @brief -------------------------------------------------
- * open_common - common path when opening an existing CHD file for input
- * -------------------------------------------------.
- *
- * @exception CHDERR_INVALID_FILE Thrown when a chderr invalid file error condition
- * occurs.
- * @exception CHDERR_UNSUPPORTED_VERSION Thrown when a chderr unsupported version error
- * condition occurs.
- * @exception CHDERR_FILE_NOT_WRITEABLE Thrown when a chderr file not writeable error
- * condition occurs.
- * @exception CHDERR_INVALID_PARENT Thrown when a chderr invalid parent error condition
- * occurs.
- * @exception CHDERR_INVALID_PARAMETER Thrown when a chderr invalid parameter error
- * condition occurs.
- *
- * @param writeable true if writeable.
- *
- * @return A chd_error.
+ * @fn chd_error chd_file::open_common(bool writeable)
+ *
+ * @brief -------------------------------------------------
+ * open_common - common path when opening an existing CHD file for input
+ * -------------------------------------------------.
+ *
+ * @exception CHDERR_INVALID_FILE Thrown when a chderr invalid file error condition
+ * occurs.
+ * @exception CHDERR_UNSUPPORTED_VERSION Thrown when a chderr unsupported version error
+ * condition occurs.
+ * @exception CHDERR_FILE_NOT_WRITEABLE Thrown when a chderr file not writeable error
+ * condition occurs.
+ * @exception CHDERR_INVALID_PARENT Thrown when a chderr invalid parent error condition
+ * occurs.
+ * @exception CHDERR_INVALID_PARAMETER Thrown when a chderr invalid parameter error
+ * condition occurs.
+ *
+ * @param writeable true if writeable.
+ *
+ * @return A chd_error.
*/
chd_error chd_file::open_common(bool writeable)
@@ -2434,14 +2434,14 @@ chd_error chd_file::open_common(bool writeable)
}
/**
- * @fn void chd_file::create_open_common()
+ * @fn void chd_file::create_open_common()
*
- * @brief -------------------------------------------------
- * create_open_common - common code for handling creation and opening of a file
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * create_open_common - common code for handling creation and opening of a file
+ * -------------------------------------------------.
*
- * @exception CHDERR_UNKNOWN_COMPRESSION Thrown when a chderr unknown compression error
- * condition occurs.
+ * @exception CHDERR_UNKNOWN_COMPRESSION Thrown when a chderr unknown compression error
+ * condition occurs.
*/
void chd_file::create_open_common()
@@ -2467,22 +2467,22 @@ void chd_file::create_open_common()
}
/**
- * @fn void chd_file::verify_proper_compression_append(UINT32 hunknum)
- *
- * @brief -------------------------------------------------
- * verify_proper_compression_append - verify that the given hunk is a proper candidate
- * for appending to a compressed CHD
- * -------------------------------------------------.
- *
- * @exception CHDERR_NOT_OPEN Thrown when a chderr not open error condition occurs.
- * @exception CHDERR_HUNK_OUT_OF_RANGE Thrown when a chderr hunk out of range error
- * condition occurs.
- * @exception CHDERR_FILE_NOT_WRITEABLE Thrown when a chderr file not writeable error
- * condition occurs.
- * @exception CHDERR_COMPRESSION_ERROR Thrown when a chderr compression error error
- * condition occurs.
- *
- * @param hunknum The hunknum.
+ * @fn void chd_file::verify_proper_compression_append(UINT32 hunknum)
+ *
+ * @brief -------------------------------------------------
+ * verify_proper_compression_append - verify that the given hunk is a proper candidate
+ * for appending to a compressed CHD
+ * -------------------------------------------------.
+ *
+ * @exception CHDERR_NOT_OPEN Thrown when a chderr not open error condition occurs.
+ * @exception CHDERR_HUNK_OUT_OF_RANGE Thrown when a chderr hunk out of range error
+ * condition occurs.
+ * @exception CHDERR_FILE_NOT_WRITEABLE Thrown when a chderr file not writeable error
+ * condition occurs.
+ * @exception CHDERR_COMPRESSION_ERROR Thrown when a chderr compression error error
+ * condition occurs.
+ *
+ * @param hunknum The hunknum.
*/
void chd_file::verify_proper_compression_append(UINT32 hunknum)
@@ -2515,18 +2515,18 @@ void chd_file::verify_proper_compression_append(UINT32 hunknum)
}
/**
- * @fn void chd_file::hunk_write_compressed(UINT32 hunknum, INT8 compression, const UINT8 *compressed, UINT32 complength, crc16_t crc16)
- *
- * @brief -------------------------------------------------
- * hunk_write_compressed - write a hunk to a compressed CHD, discovering the best
- * technique
- * -------------------------------------------------.
- *
- * @param hunknum The hunknum.
- * @param compression The compression.
- * @param compressed The compressed.
- * @param complength The complength.
- * @param crc16 The CRC 16.
+ * @fn void chd_file::hunk_write_compressed(UINT32 hunknum, INT8 compression, const UINT8 *compressed, UINT32 complength, crc16_t crc16)
+ *
+ * @brief -------------------------------------------------
+ * hunk_write_compressed - write a hunk to a compressed CHD, discovering the best
+ * technique
+ * -------------------------------------------------.
+ *
+ * @param hunknum The hunknum.
+ * @param compression The compression.
+ * @param compressed The compressed.
+ * @param complength The complength.
+ * @param crc16 The CRC 16.
*/
void chd_file::hunk_write_compressed(UINT32 hunknum, INT8 compression, const UINT8 *compressed, UINT32 complength, crc16_t crc16)
@@ -2546,17 +2546,17 @@ void chd_file::hunk_write_compressed(UINT32 hunknum, INT8 compression, const UIN
}
/**
- * @fn void chd_file::hunk_copy_from_self(UINT32 hunknum, UINT32 otherhunk)
+ * @fn void chd_file::hunk_copy_from_self(UINT32 hunknum, UINT32 otherhunk)
*
- * @brief -------------------------------------------------
- * hunk_copy_from_self - mark a hunk as being a copy of another hunk in the same CHD
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * hunk_copy_from_self - mark a hunk as being a copy of another hunk in the same CHD
+ * -------------------------------------------------.
*
- * @exception CHDERR_INVALID_PARAMETER Thrown when a chderr invalid parameter error
- * condition occurs.
+ * @exception CHDERR_INVALID_PARAMETER Thrown when a chderr invalid parameter error
+ * condition occurs.
*
- * @param hunknum The hunknum.
- * @param otherhunk The otherhunk.
+ * @param hunknum The hunknum.
+ * @param otherhunk The otherhunk.
*/
void chd_file::hunk_copy_from_self(UINT32 hunknum, UINT32 otherhunk)
@@ -2577,14 +2577,14 @@ void chd_file::hunk_copy_from_self(UINT32 hunknum, UINT32 otherhunk)
}
/**
- * @fn void chd_file::hunk_copy_from_parent(UINT32 hunknum, UINT64 parentunit)
+ * @fn void chd_file::hunk_copy_from_parent(UINT32 hunknum, UINT64 parentunit)
*
- * @brief -------------------------------------------------
- * hunk_copy_from_parent - mark a hunk as being a copy of a hunk from a parent CHD
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * hunk_copy_from_parent - mark a hunk as being a copy of a hunk from a parent CHD
+ * -------------------------------------------------.
*
- * @param hunknum The hunknum.
- * @param parentunit The parentunit.
+ * @param hunknum The hunknum.
+ * @param parentunit The parentunit.
*/
void chd_file::hunk_copy_from_parent(UINT32 hunknum, UINT64 parentunit)
@@ -2601,18 +2601,18 @@ void chd_file::hunk_copy_from_parent(UINT32 hunknum, UINT64 parentunit)
}
/**
- * @fn bool chd_file::metadata_find(chd_metadata_tag metatag, INT32 metaindex, metadata_entry &metaentry, bool resume)
+ * @fn bool chd_file::metadata_find(chd_metadata_tag metatag, INT32 metaindex, metadata_entry &metaentry, bool resume)
*
- * @brief -------------------------------------------------
- * metadata_find - find a metadata entry
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * metadata_find - find a metadata entry
+ * -------------------------------------------------.
*
- * @param metatag The metatag.
- * @param metaindex The metaindex.
- * @param [in,out] metaentry The metaentry.
- * @param resume true to resume.
+ * @param metatag The metatag.
+ * @param metaindex The metaindex.
+ * @param [in,out] metaentry The metaentry.
+ * @param resume true to resume.
*
- * @return true if it succeeds, false if it fails.
+ * @return true if it succeeds, false if it fails.
*/
bool chd_file::metadata_find(chd_metadata_tag metatag, INT32 metaindex, metadata_entry &metaentry, bool resume)
@@ -2657,14 +2657,14 @@ bool chd_file::metadata_find(chd_metadata_tag metatag, INT32 metaindex, metadata
}
/**
- * @fn void chd_file::metadata_set_previous_next(UINT64 prevoffset, UINT64 nextoffset)
+ * @fn void chd_file::metadata_set_previous_next(UINT64 prevoffset, UINT64 nextoffset)
*
- * @brief -------------------------------------------------
- * metadata_set_previous_next - set the 'next' offset of a piece of metadata
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * metadata_set_previous_next - set the 'next' offset of a piece of metadata
+ * -------------------------------------------------.
*
- * @param prevoffset The prevoffset.
- * @param nextoffset The nextoffset.
+ * @param prevoffset The prevoffset.
+ * @param nextoffset The nextoffset.
*/
void chd_file::metadata_set_previous_next(UINT64 prevoffset, UINT64 nextoffset)
@@ -2691,11 +2691,11 @@ void chd_file::metadata_set_previous_next(UINT64 prevoffset, UINT64 nextoffset)
}
/**
- * @fn void chd_file::metadata_update_hash()
+ * @fn void chd_file::metadata_update_hash()
*
- * @brief -------------------------------------------------
- * metadata_update_hash - compute the SHA1 hash of all metadata that requests it
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * metadata_update_hash - compute the SHA1 hash of all metadata that requests it
+ * -------------------------------------------------.
*/
void chd_file::metadata_update_hash()
@@ -2716,16 +2716,16 @@ void chd_file::metadata_update_hash()
}
/**
- * @fn int CLIB_DECL chd_file::metadata_hash_compare(const void *elem1, const void *elem2)
+ * @fn int CLIB_DECL chd_file::metadata_hash_compare(const void *elem1, const void *elem2)
*
- * @brief -------------------------------------------------
- * metadata_hash_compare - compare two hash entries
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * metadata_hash_compare - compare two hash entries
+ * -------------------------------------------------.
*
- * @param elem1 The first element.
- * @param elem2 The second element.
+ * @param elem1 The first element.
+ * @param elem2 The second element.
*
- * @return A CLIB_DECL.
+ * @return A CLIB_DECL.
*/
int CLIB_DECL chd_file::metadata_hash_compare(const void *elem1, const void *elem2)
@@ -2740,11 +2740,11 @@ int CLIB_DECL chd_file::metadata_hash_compare(const void *elem1, const void *ele
//**************************************************************************
/**
- * @fn chd_file_compressor::chd_file_compressor()
+ * @fn chd_file_compressor::chd_file_compressor()
*
- * @brief -------------------------------------------------
- * chd_file_compressor - constructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * chd_file_compressor - constructor
+ * -------------------------------------------------.
*/
chd_file_compressor::chd_file_compressor()
@@ -2767,11 +2767,11 @@ chd_file_compressor::chd_file_compressor()
}
/**
- * @fn chd_file_compressor::~chd_file_compressor()
+ * @fn chd_file_compressor::~chd_file_compressor()
*
- * @brief -------------------------------------------------
- * ~chd_file_compressor - destructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * ~chd_file_compressor - destructor
+ * -------------------------------------------------.
*/
chd_file_compressor::~chd_file_compressor()
@@ -2786,11 +2786,11 @@ chd_file_compressor::~chd_file_compressor()
}
/**
- * @fn void chd_file_compressor::compress_begin()
+ * @fn void chd_file_compressor::compress_begin()
*
- * @brief -------------------------------------------------
- * compress_begin - initiate compression
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * compress_begin - initiate compression
+ * -------------------------------------------------.
*/
void chd_file_compressor::compress_begin()
@@ -2835,16 +2835,16 @@ void chd_file_compressor::compress_begin()
}
/**
- * @fn chd_error chd_file_compressor::compress_continue(double &progress, double &ratio)
+ * @fn chd_error chd_file_compressor::compress_continue(double &progress, double &ratio)
*
- * @brief -------------------------------------------------
- * compress_continue - continue compression
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * compress_continue - continue compression
+ * -------------------------------------------------.
*
- * @param [in,out] progress The progress.
- * @param [in,out] ratio The ratio.
+ * @param [in,out] progress The progress.
+ * @param [in,out] ratio The ratio.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chd_file_compressor::compress_continue(double &progress, double &ratio)
@@ -2989,16 +2989,16 @@ chd_error chd_file_compressor::compress_continue(double &progress, double &ratio
}
/**
- * @fn void *chd_file_compressor::async_walk_parent_static(void *param, int threadid)
+ * @fn void *chd_file_compressor::async_walk_parent_static(void *param, int threadid)
*
- * @brief -------------------------------------------------
- * async_walk_parent - handle asynchronous parent walking operations
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * async_walk_parent - handle asynchronous parent walking operations
+ * -------------------------------------------------.
*
- * @param [in,out] param If non-null, the parameter.
- * @param threadid The threadid.
+ * @param [in,out] param If non-null, the parameter.
+ * @param threadid The threadid.
*
- * @return null if it fails, else a void*.
+ * @return null if it fails, else a void*.
*/
void *chd_file_compressor::async_walk_parent_static(void *param, int threadid)
@@ -3009,11 +3009,11 @@ void *chd_file_compressor::async_walk_parent_static(void *param, int threadid)
}
/**
- * @fn void chd_file_compressor::async_walk_parent(work_item &item)
+ * @fn void chd_file_compressor::async_walk_parent(work_item &item)
*
- * @brief Asynchronous walk parent.
+ * @brief Asynchronous walk parent.
*
- * @param [in,out] item The item.
+ * @param [in,out] item The item.
*/
void chd_file_compressor::async_walk_parent(work_item &item)
@@ -3031,16 +3031,16 @@ void chd_file_compressor::async_walk_parent(work_item &item)
}
/**
- * @fn void *chd_file_compressor::async_compress_hunk_static(void *param, int threadid)
+ * @fn void *chd_file_compressor::async_compress_hunk_static(void *param, int threadid)
*
- * @brief -------------------------------------------------
- * async_compress_hunk - handle asynchronous hunk compression
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * async_compress_hunk - handle asynchronous hunk compression
+ * -------------------------------------------------.
*
- * @param [in,out] param If non-null, the parameter.
- * @param threadid The threadid.
+ * @param [in,out] param If non-null, the parameter.
+ * @param threadid The threadid.
*
- * @return null if it fails, else a void*.
+ * @return null if it fails, else a void*.
*/
void *chd_file_compressor::async_compress_hunk_static(void *param, int threadid)
@@ -3051,12 +3051,12 @@ void *chd_file_compressor::async_compress_hunk_static(void *param, int threadid)
}
/**
- * @fn void chd_file_compressor::async_compress_hunk(work_item &item, int threadid)
+ * @fn void chd_file_compressor::async_compress_hunk(work_item &item, int threadid)
*
- * @brief Asynchronous compress hunk.
+ * @brief Asynchronous compress hunk.
*
- * @param [in,out] item The item.
- * @param threadid The threadid.
+ * @param [in,out] item The item.
+ * @param threadid The threadid.
*/
void chd_file_compressor::async_compress_hunk(work_item &item, int threadid)
@@ -3081,16 +3081,16 @@ void chd_file_compressor::async_compress_hunk(work_item &item, int threadid)
}
/**
- * @fn void *chd_file_compressor::async_read_static(void *param, int threadid)
+ * @fn void *chd_file_compressor::async_read_static(void *param, int threadid)
*
- * @brief -------------------------------------------------
- * async_read - handle asynchronous source file reading
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * async_read - handle asynchronous source file reading
+ * -------------------------------------------------.
*
- * @param [in,out] param If non-null, the parameter.
- * @param threadid The threadid.
+ * @param [in,out] param If non-null, the parameter.
+ * @param threadid The threadid.
*
- * @return null if it fails, else a void*.
+ * @return null if it fails, else a void*.
*/
void *chd_file_compressor::async_read_static(void *param, int threadid)
@@ -3100,9 +3100,9 @@ void *chd_file_compressor::async_read_static(void *param, int threadid)
}
/**
- * @fn void chd_file_compressor::async_read()
+ * @fn void chd_file_compressor::async_read()
*
- * @brief Asynchronous read.
+ * @brief Asynchronous read.
*/
void chd_file_compressor::async_read()
@@ -3181,11 +3181,11 @@ void chd_file_compressor::async_read()
//**************************************************************************
/**
- * @fn chd_file_compressor::hashmap::hashmap()
+ * @fn chd_file_compressor::hashmap::hashmap()
*
- * @brief -------------------------------------------------
- * hashmap - constructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * hashmap - constructor
+ * -------------------------------------------------.
*/
chd_file_compressor::hashmap::hashmap()
@@ -3196,11 +3196,11 @@ chd_file_compressor::hashmap::hashmap()
}
/**
- * @fn chd_file_compressor::hashmap::~hashmap()
+ * @fn chd_file_compressor::hashmap::~hashmap()
*
- * @brief -------------------------------------------------
- * ~hashmap - destructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * ~hashmap - destructor
+ * -------------------------------------------------.
*/
chd_file_compressor::hashmap::~hashmap()
@@ -3210,11 +3210,11 @@ chd_file_compressor::hashmap::~hashmap()
}
/**
- * @fn void chd_file_compressor::hashmap::reset()
+ * @fn void chd_file_compressor::hashmap::reset()
*
- * @brief -------------------------------------------------
- * reset - reset the state of the map
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * reset - reset the state of the map
+ * -------------------------------------------------.
*/
void chd_file_compressor::hashmap::reset()
@@ -3233,16 +3233,16 @@ void chd_file_compressor::hashmap::reset()
}
/**
- * @fn UINT64 chd_file_compressor::hashmap::find(crc16_t crc16, sha1_t sha1)
+ * @fn UINT64 chd_file_compressor::hashmap::find(crc16_t crc16, sha1_t sha1)
*
- * @brief -------------------------------------------------
- * find - find an item in the CRC map
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * find - find an item in the CRC map
+ * -------------------------------------------------.
*
- * @param crc16 The CRC 16.
- * @param sha1 The first sha.
+ * @param crc16 The CRC 16.
+ * @param sha1 The first sha.
*
- * @return An UINT64.
+ * @return An UINT64.
*/
UINT64 chd_file_compressor::hashmap::find(crc16_t crc16, sha1_t sha1)
@@ -3255,15 +3255,15 @@ UINT64 chd_file_compressor::hashmap::find(crc16_t crc16, sha1_t sha1)
}
/**
- * @fn void chd_file_compressor::hashmap::add(UINT64 itemnum, crc16_t crc16, sha1_t sha1)
+ * @fn void chd_file_compressor::hashmap::add(UINT64 itemnum, crc16_t crc16, sha1_t sha1)
*
- * @brief -------------------------------------------------
- * add - add an item to the CRC map
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * add - add an item to the CRC map
+ * -------------------------------------------------.
*
- * @param itemnum The itemnum.
- * @param crc16 The CRC 16.
- * @param sha1 The first sha.
+ * @param itemnum The itemnum.
+ * @param crc16 The CRC 16.
+ * @param sha1 The first sha.
*/
void chd_file_compressor::hashmap::add(UINT64 itemnum, crc16_t crc16, sha1_t sha1)
diff --git a/src/lib/util/chdcd.c b/src/lib/util/chdcd.c
index d55b83f5a82..e267c613d1d 100644
--- a/src/lib/util/chdcd.c
+++ b/src/lib/util/chdcd.c
@@ -22,15 +22,15 @@
***************************************************************************/
/**
- * @def TOKENIZE();
+ * @def TOKENIZE();
*
- * @brief A macro that defines tokenize.
+ * @brief A macro that defines tokenize.
*
- * @param linebuffer The linebuffer.
- * @param i Zero-based index of the.
- * @param sizeof(linebuffer) The sizeof(linebuffer)
- * @param token The token.
- * @param sizeof(token) The sizeof(token)
+ * @param linebuffer The linebuffer.
+ * @param i Zero-based index of the.
+ * @param sizeof(linebuffer) The sizeof(linebuffer)
+ * @param token The token.
+ * @param sizeof(token) The sizeof(token)
*/
#define TOKENIZE i = tokenize( linebuffer, i, sizeof(linebuffer), token, sizeof(token) );
@@ -41,7 +41,7 @@
GLOBAL VARIABLES
***************************************************************************/
-/** @brief The linebuffer[ 512]. */
+/** @brief The linebuffer[ 512]. */
static char linebuffer[512];
@@ -51,13 +51,13 @@ static char linebuffer[512];
***************************************************************************/
/**
- * @fn static std::string get_file_path(std::string &path)
+ * @fn static std::string get_file_path(std::string &path)
*
- * @brief Gets file path.
+ * @brief Gets file path.
*
- * @param [in,out] path Full pathname of the file.
+ * @param [in,out] path Full pathname of the file.
*
- * @return The file path.
+ * @return The file path.
*/
static std::string get_file_path(std::string &path)
@@ -76,13 +76,13 @@ static std::string get_file_path(std::string &path)
-------------------------------------------------*/
/**
- * @fn static UINT64 get_file_size(const char *filename)
+ * @fn static UINT64 get_file_size(const char *filename)
*
- * @brief Gets file size.
+ * @brief Gets file size.
*
- * @param filename Filename of the file.
+ * @param filename Filename of the file.
*
- * @return The file size.
+ * @return The file size.
*/
static UINT64 get_file_size(const char *filename)
@@ -104,17 +104,17 @@ static UINT64 get_file_size(const char *filename)
-------------------------------------------------*/
/**
- * @fn static int tokenize( const char *linebuffer, int i, int linebuffersize, char *token, int tokensize )
+ * @fn static int tokenize( const char *linebuffer, int i, int linebuffersize, char *token, int tokensize )
*
- * @brief Tokenizes.
+ * @brief Tokenizes.
*
- * @param linebuffer The linebuffer.
- * @param i Zero-based index of the.
- * @param linebuffersize The linebuffersize.
- * @param [in,out] token If non-null, the token.
- * @param tokensize The tokensize.
+ * @param linebuffer The linebuffer.
+ * @param i Zero-based index of the.
+ * @param linebuffersize The linebuffersize.
+ * @param [in,out] token If non-null, the token.
+ * @param tokensize The tokensize.
*
- * @return An int.
+ * @return An int.
*/
static int tokenize( const char *linebuffer, int i, int linebuffersize, char *token, int tokensize )
@@ -162,13 +162,13 @@ static int tokenize( const char *linebuffer, int i, int linebuffersize, char *to
-------------------------------------------------*/
/**
- * @fn static int msf_to_frames( char *token )
+ * @fn static int msf_to_frames( char *token )
*
- * @brief Msf to frames.
+ * @brief Msf to frames.
*
- * @param [in,out] token If non-null, the token.
+ * @param [in,out] token If non-null, the token.
*
- * @return An int.
+ * @return An int.
*/
static int msf_to_frames( char *token )
@@ -199,14 +199,14 @@ static int msf_to_frames( char *token )
-------------------------------------------------*/
/**
- * @fn static UINT32 parse_wav_sample(const char *filename, UINT32 *dataoffs)
+ * @fn static UINT32 parse_wav_sample(const char *filename, UINT32 *dataoffs)
*
- * @brief Parse WAV sample.
+ * @brief Parse WAV sample.
*
- * @param filename Filename of the file.
- * @param [in,out] dataoffs If non-null, the dataoffs.
+ * @param filename Filename of the file.
+ * @param [in,out] dataoffs If non-null, the dataoffs.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
static UINT32 parse_wav_sample(const char *filename, UINT32 *dataoffs)
@@ -378,13 +378,13 @@ static UINT32 parse_wav_sample(const char *filename, UINT32 *dataoffs)
}
/**
- * @fn UINT16 read_uint16(FILE *infile)
+ * @fn UINT16 read_uint16(FILE *infile)
*
- * @brief Reads uint 16.
+ * @brief Reads uint 16.
*
- * @param [in,out] infile If non-null, the infile.
+ * @param [in,out] infile If non-null, the infile.
*
- * @return The uint 16.
+ * @return The uint 16.
*/
UINT16 read_uint16(FILE *infile)
@@ -400,13 +400,13 @@ UINT16 read_uint16(FILE *infile)
}
/**
- * @fn UINT32 read_uint32(FILE *infile)
+ * @fn UINT32 read_uint32(FILE *infile)
*
- * @brief Reads uint 32.
+ * @brief Reads uint 32.
*
- * @param [in,out] infile If non-null, the infile.
+ * @param [in,out] infile If non-null, the infile.
*
- * @return The uint 32.
+ * @return The uint 32.
*/
UINT32 read_uint32(FILE *infile)
@@ -422,13 +422,13 @@ UINT32 read_uint32(FILE *infile)
}
/**
- * @fn UINT64 read_uint64(FILE *infile)
+ * @fn UINT64 read_uint64(FILE *infile)
*
- * @brief Reads uint 64.
+ * @brief Reads uint 64.
*
- * @param [in,out] infile If non-null, the infile.
+ * @param [in,out] infile If non-null, the infile.
*
- * @return The uint 64.
+ * @return The uint 64.
*/
UINT64 read_uint64(FILE *infile)
@@ -452,15 +452,15 @@ UINT64 read_uint64(FILE *infile)
-------------------------------------------------*/
/**
- * @fn chd_error chdcd_parse_nero(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
+ * @fn chd_error chdcd_parse_nero(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
*
- * @brief Chdcd parse nero.
+ * @brief Chdcd parse nero.
*
- * @param tocfname The tocfname.
- * @param [in,out] outtoc The outtoc.
- * @param [in,out] outinfo The outinfo.
+ * @param tocfname The tocfname.
+ * @param [in,out] outtoc The outtoc.
+ * @param [in,out] outinfo The outinfo.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chdcd_parse_nero(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
@@ -638,15 +638,15 @@ chd_error chdcd_parse_nero(const char *tocfname, cdrom_toc &outtoc, chdcd_track_
-------------------------------------------------*/
/**
- * @fn chd_error chdcd_parse_iso(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
+ * @fn chd_error chdcd_parse_iso(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
*
- * @brief Chdcd parse ISO.
+ * @brief Chdcd parse ISO.
*
- * @param tocfname The tocfname.
- * @param [in,out] outtoc The outtoc.
- * @param [in,out] outinfo The outinfo.
+ * @param tocfname The tocfname.
+ * @param [in,out] outtoc The outtoc.
+ * @param [in,out] outinfo The outinfo.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chdcd_parse_iso(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
@@ -715,15 +715,15 @@ chd_error chdcd_parse_iso(const char *tocfname, cdrom_toc &outtoc, chdcd_track_i
-------------------------------------------------*/
/**
- * @fn static chd_error chdcd_parse_gdi(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
+ * @fn static chd_error chdcd_parse_gdi(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
*
- * @brief Chdcd parse GDI.
+ * @brief Chdcd parse GDI.
*
- * @param tocfname The tocfname.
- * @param [in,out] outtoc The outtoc.
- * @param [in,out] outinfo The outinfo.
+ * @param tocfname The tocfname.
+ * @param [in,out] outtoc The outtoc.
+ * @param [in,out] outinfo The outinfo.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
static chd_error chdcd_parse_gdi(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
@@ -847,15 +847,15 @@ static chd_error chdcd_parse_gdi(const char *tocfname, cdrom_toc &outtoc, chdcd_
-------------------------------------------------*/
/**
- * @fn chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
+ * @fn chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
*
- * @brief Chdcd parse cue.
+ * @brief Chdcd parse cue.
*
- * @param tocfname The tocfname.
- * @param [in,out] outtoc The outtoc.
- * @param [in,out] outinfo The outinfo.
+ * @param tocfname The tocfname.
+ * @param [in,out] outtoc The outtoc.
+ * @param [in,out] outinfo The outinfo.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
@@ -1142,15 +1142,15 @@ chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_i
-------------------------------------------------*/
/**
- * @fn chd_error chdcd_parse_toc(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
+ * @fn chd_error chdcd_parse_toc(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
*
- * @brief Chdcd parse TOC.
+ * @brief Chdcd parse TOC.
*
- * @param tocfname The tocfname.
- * @param [in,out] outtoc The outtoc.
- * @param [in,out] outinfo The outinfo.
+ * @param tocfname The tocfname.
+ * @param [in,out] outtoc The outtoc.
+ * @param [in,out] outinfo The outinfo.
*
- * @return A chd_error.
+ * @return A chd_error.
*/
chd_error chdcd_parse_toc(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
diff --git a/src/lib/util/chdcodec.c b/src/lib/util/chdcodec.c
index 753ce852dd3..9f013609133 100644
--- a/src/lib/util/chdcodec.c
+++ b/src/lib/util/chdcodec.c
@@ -1454,15 +1454,15 @@ UINT32 chd_cd_flac_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *
}
/**
- * @fn UINT32 chd_cd_flac_compressor::blocksize(UINT32 bytes)
+ * @fn UINT32 chd_cd_flac_compressor::blocksize(UINT32 bytes)
*
- * @brief -------------------------------------------------
- * blocksize - return the optimal block size
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * blocksize - return the optimal block size
+ * -------------------------------------------------.
*
- * @param bytes The bytes.
+ * @param bytes The bytes.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 chd_cd_flac_compressor::blocksize(UINT32 bytes)
@@ -1481,17 +1481,17 @@ UINT32 chd_cd_flac_compressor::blocksize(UINT32 bytes)
//**************************************************************************
/**
- * @fn chd_cd_flac_decompressor::chd_cd_flac_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
+ * @fn chd_cd_flac_decompressor::chd_cd_flac_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
*
- * @brief -------------------------------------------------
- * chd_cd_flac_decompressor - constructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * chd_cd_flac_decompressor - constructor
+ * -------------------------------------------------.
*
- * @exception CHDERR_CODEC_ERROR Thrown when a chderr codec error error condition occurs.
+ * @exception CHDERR_CODEC_ERROR Thrown when a chderr codec error error condition occurs.
*
- * @param [in,out] chd The chd.
- * @param hunkbytes The hunkbytes.
- * @param lossy true to lossy.
+ * @param [in,out] chd The chd.
+ * @param hunkbytes The hunkbytes.
+ * @param lossy true to lossy.
*/
chd_cd_flac_decompressor::chd_cd_flac_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
@@ -1521,11 +1521,11 @@ chd_cd_flac_decompressor::chd_cd_flac_decompressor(chd_file &chd, UINT32 hunkbyt
}
/**
- * @fn chd_cd_flac_decompressor::~chd_cd_flac_decompressor()
+ * @fn chd_cd_flac_decompressor::~chd_cd_flac_decompressor()
*
- * @brief -------------------------------------------------
- * ~chd_cd_flac_decompressor - destructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * ~chd_cd_flac_decompressor - destructor
+ * -------------------------------------------------.
*/
chd_cd_flac_decompressor::~chd_cd_flac_decompressor()
@@ -1534,19 +1534,19 @@ chd_cd_flac_decompressor::~chd_cd_flac_decompressor()
}
/**
- * @fn void chd_cd_flac_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen)
+ * @fn void chd_cd_flac_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen)
*
- * @brief -------------------------------------------------
- * decompress - decompress data using the FLAC codec
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * decompress - decompress data using the FLAC codec
+ * -------------------------------------------------.
*
- * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
- * condition occurs.
+ * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
+ * condition occurs.
*
- * @param src Source for the.
- * @param complen The complen.
- * @param [in,out] dest If non-null, destination for the.
- * @param destlen The destlen.
+ * @param src Source for the.
+ * @param complen The complen.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param destlen The destlen.
*/
void chd_cd_flac_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen)
@@ -1593,15 +1593,15 @@ void chd_cd_flac_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT
//**************************************************************************
/**
- * @fn chd_avhuff_compressor::chd_avhuff_compressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
+ * @fn chd_avhuff_compressor::chd_avhuff_compressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
*
- * @brief -------------------------------------------------
- * chd_avhuff_compressor - constructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * chd_avhuff_compressor - constructor
+ * -------------------------------------------------.
*
- * @param [in,out] chd The chd.
- * @param hunkbytes The hunkbytes.
- * @param lossy true to lossy.
+ * @param [in,out] chd The chd.
+ * @param hunkbytes The hunkbytes.
+ * @param lossy true to lossy.
*/
chd_avhuff_compressor::chd_avhuff_compressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
@@ -1620,22 +1620,22 @@ chd_avhuff_compressor::chd_avhuff_compressor(chd_file &chd, UINT32 hunkbytes, bo
}
/**
- * @fn UINT32 chd_avhuff_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *dest)
+ * @fn UINT32 chd_avhuff_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *dest)
*
- * @brief -------------------------------------------------
- * compress - compress data using the A/V codec
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * compress - compress data using the A/V codec
+ * -------------------------------------------------.
*
- * @exception CHDERR_INVALID_DATA Thrown when a chderr invalid data error condition
- * occurs.
- * @exception CHDERR_COMPRESSION_ERROR Thrown when a chderr compression error error
- * condition occurs.
+ * @exception CHDERR_INVALID_DATA Thrown when a chderr invalid data error condition
+ * occurs.
+ * @exception CHDERR_COMPRESSION_ERROR Thrown when a chderr compression error error
+ * condition occurs.
*
- * @param src Source for the.
- * @param srclen The srclen.
- * @param [in,out] dest If non-null, destination for the.
+ * @param src Source for the.
+ * @param srclen The srclen.
+ * @param [in,out] dest If non-null, destination for the.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 chd_avhuff_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *dest)
@@ -1662,16 +1662,16 @@ UINT32 chd_avhuff_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *d
}
/**
- * @fn void chd_avhuff_compressor::postinit()
+ * @fn void chd_avhuff_compressor::postinit()
*
- * @brief -------------------------------------------------
- * postinit - actual initialization of avhuff happens here, on the first attempt to
- * compress or decompress data
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * postinit - actual initialization of avhuff happens here, on the first attempt to
+ * compress or decompress data
+ * -------------------------------------------------.
*
- * @exception err Thrown when an error error condition occurs.
- * @exception CHDERR_INVALID_METADATA Thrown when a chderr invalid metadata error condition
- * occurs.
+ * @exception err Thrown when an error error condition occurs.
+ * @exception CHDERR_INVALID_METADATA Thrown when a chderr invalid metadata error condition
+ * occurs.
*/
void chd_avhuff_compressor::postinit()
@@ -1705,15 +1705,15 @@ void chd_avhuff_compressor::postinit()
//**************************************************************************
/**
- * @fn chd_avhuff_decompressor::chd_avhuff_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
+ * @fn chd_avhuff_decompressor::chd_avhuff_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
*
- * @brief -------------------------------------------------
- * chd_avhuff_decompressor - constructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * chd_avhuff_decompressor - constructor
+ * -------------------------------------------------.
*
- * @param [in,out] chd The chd.
- * @param hunkbytes The hunkbytes.
- * @param lossy true to lossy.
+ * @param [in,out] chd The chd.
+ * @param hunkbytes The hunkbytes.
+ * @param lossy true to lossy.
*/
chd_avhuff_decompressor::chd_avhuff_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
@@ -1722,19 +1722,19 @@ chd_avhuff_decompressor::chd_avhuff_decompressor(chd_file &chd, UINT32 hunkbytes
}
/**
- * @fn void chd_avhuff_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen)
+ * @fn void chd_avhuff_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen)
*
- * @brief -------------------------------------------------
- * decompress - decompress data using the A/V codec
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * decompress - decompress data using the A/V codec
+ * -------------------------------------------------.
*
- * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
- * condition occurs.
+ * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
+ * condition occurs.
*
- * @param src Source for the.
- * @param complen The complen.
- * @param [in,out] dest If non-null, destination for the.
- * @param destlen The destlen.
+ * @param src Source for the.
+ * @param complen The complen.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param destlen The destlen.
*/
void chd_avhuff_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen)
@@ -1754,17 +1754,17 @@ void chd_avhuff_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8
}
/**
- * @fn void chd_avhuff_decompressor::configure(int param, void *config)
+ * @fn void chd_avhuff_decompressor::configure(int param, void *config)
*
- * @brief -------------------------------------------------
- * config - codec-specific configuration for the A/V codec
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * config - codec-specific configuration for the A/V codec
+ * -------------------------------------------------.
*
- * @exception CHDERR_INVALID_PARAMETER Thrown when a chderr invalid parameter error
- * condition occurs.
+ * @exception CHDERR_INVALID_PARAMETER Thrown when a chderr invalid parameter error
+ * condition occurs.
*
- * @param param The parameter.
- * @param [in,out] config If non-null, the configuration.
+ * @param param The parameter.
+ * @param [in,out] config If non-null, the configuration.
*/
void chd_avhuff_decompressor::configure(int param, void *config)
diff --git a/src/lib/util/corealloc.c b/src/lib/util/corealloc.c
index 40d7456546a..a635803e463 100644
--- a/src/lib/util/corealloc.c
+++ b/src/lib/util/corealloc.c
@@ -395,13 +395,13 @@ void memory_entry::release(memory_entry *entry, const char *file, int line)
}
/**
- * @fn void memory_entry::report_unfreed(UINT64 start)
+ * @fn void memory_entry::report_unfreed(UINT64 start)
*
- * @brief -------------------------------------------------
- * report_unfreed - print a list of unfreed memory to the target file
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * report_unfreed - print a list of unfreed memory to the target file
+ * -------------------------------------------------.
*
- * @param start The start.
+ * @param start The start.
*/
void memory_entry::report_unfreed(UINT64 start)
diff --git a/src/lib/util/corefile.c b/src/lib/util/corefile.c
index 30639615a58..797805ac768 100644
--- a/src/lib/util/corefile.c
+++ b/src/lib/util/corefile.c
@@ -1029,17 +1029,17 @@ static file_error osd_or_zlib_read(core_file *file, void *buffer, UINT64 offset,
-------------------------------------------------*/
/**
- * @fn static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 offset, UINT32 length, UINT32 *actual)
+ * @fn static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 offset, UINT32 length, UINT32 *actual)
*
- * @brief OSD or zlib write.
+ * @brief OSD or zlib write.
*
- * @param [in,out] file If non-null, the file.
- * @param buffer The buffer.
- * @param offset The offset.
- * @param length The length.
- * @param [in,out] actual If non-null, the actual.
+ * @param [in,out] file If non-null, the file.
+ * @param buffer The buffer.
+ * @param offset The offset.
+ * @param length The length.
+ * @param [in,out] actual If non-null, the actual.
*
- * @return A file_error.
+ * @return A file_error.
*/
static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 offset, UINT32 length, UINT32 *actual)
diff --git a/src/lib/util/corestr.c b/src/lib/util/corestr.c
index eb6f76ac4b4..b4a75a3bc48 100644
--- a/src/lib/util/corestr.c
+++ b/src/lib/util/corestr.c
@@ -295,13 +295,13 @@ std::string strmakeupper(std::string& str)
}
/**
- * @fn std::string strmakelower(std::string& str)
+ * @fn std::string strmakelower(std::string& str)
*
- * @brief Strmakelowers the given string.
+ * @brief Strmakelowers the given string.
*
- * @param [in,out] str The string.
+ * @param [in,out] str The string.
*
- * @return A std::string.
+ * @return A std::string.
*/
std::string strmakelower(std::string& str)
@@ -311,15 +311,15 @@ std::string strmakelower(std::string& str)
}
/**
- * @fn int strreplace(std::string &str, const std::string& search, const std::string& replace)
+ * @fn int strreplace(std::string &str, const std::string& search, const std::string& replace)
*
- * @brief Strreplaces.
+ * @brief Strreplaces.
*
- * @param [in,out] str The string.
- * @param search The search.
- * @param replace The replace.
+ * @param [in,out] str The string.
+ * @param search The search.
+ * @param replace The replace.
*
- * @return An int.
+ * @return An int.
*/
int strreplace(std::string &str, const std::string& search, const std::string& replace)
diff --git a/src/lib/util/coreutil.c b/src/lib/util/coreutil.c
index 2a2a27d712e..a7c2ccb0f22 100644
--- a/src/lib/util/coreutil.c
+++ b/src/lib/util/coreutil.c
@@ -69,14 +69,14 @@ int gregorian_is_leap_year(int year)
/* months are one counted */
/**
- * @fn int gregorian_days_in_month(int month, int year)
+ * @fn int gregorian_days_in_month(int month, int year)
*
- * @brief Gregorian days in month.
+ * @brief Gregorian days in month.
*
- * @param month The month.
- * @param year The year.
+ * @param month The month.
+ * @param year The year.
*
- * @return An int.
+ * @return An int.
*/
int gregorian_days_in_month(int month, int year)
@@ -95,12 +95,12 @@ int gregorian_days_in_month(int month, int year)
***************************************************************************/
/**
- * @fn void rand_memory(void *memory, size_t length)
+ * @fn void rand_memory(void *memory, size_t length)
*
- * @brief Random memory.
+ * @brief Random memory.
*
- * @param [in,out] memory If non-null, the memory.
- * @param length The length.
+ * @param [in,out] memory If non-null, the memory.
+ * @param length The length.
*/
void rand_memory(void *memory, size_t length)
diff --git a/src/lib/util/cstrpool.c b/src/lib/util/cstrpool.c
index 36c5ff694bb..dfb41e25232 100644
--- a/src/lib/util/cstrpool.c
+++ b/src/lib/util/cstrpool.c
@@ -71,11 +71,11 @@ bool const_string_pool::contains(const char *string)
}
/**
- * @fn const_string_pool::pool_chunk::pool_chunk()
+ * @fn const_string_pool::pool_chunk::pool_chunk()
*
- * @brief -------------------------------------------------
- * pool_chunk - constructor
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * pool_chunk - constructor
+ * -------------------------------------------------.
*/
const_string_pool::pool_chunk::pool_chunk()
@@ -85,15 +85,15 @@ const_string_pool::pool_chunk::pool_chunk()
}
/**
- * @fn const char *const_string_pool::pool_chunk::add(const char *string)
+ * @fn const char *const_string_pool::pool_chunk::add(const char *string)
*
- * @brief -------------------------------------------------
- * add - add a string to this pool
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * add - add a string to this pool
+ * -------------------------------------------------.
*
- * @param string The string to add.
+ * @param string The string to add.
*
- * @return null if it fails, else a char*.
+ * @return null if it fails, else a char*.
*/
const char *const_string_pool::pool_chunk::add(const char *string)
diff --git a/src/lib/util/delegate.c b/src/lib/util/delegate.c
index 5abf04b3a32..2245cf14bcb 100644
--- a/src/lib/util/delegate.c
+++ b/src/lib/util/delegate.c
@@ -33,16 +33,16 @@ delegate_mfp::raw_mfp_data delegate_mfp::s_null_mfp = { 0 };
#if (USE_DELEGATE_TYPE == DELEGATE_TYPE_INTERNAL)
/**
- * @fn delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const
+ * @fn delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const
*
- * @brief -------------------------------------------------
- * delegate_convert_raw - given an object and an raw function, adjust the object base
- * and return the actual final code pointer
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * delegate_convert_raw - given an object and an raw function, adjust the object base
+ * and return the actual final code pointer
+ * -------------------------------------------------.
*
- * @param [in,out] object [in,out] If non-null, the object.
+ * @param [in,out] object [in,out] If non-null, the object.
*
- * @return The given data converted to a generic.
+ * @return The given data converted to a generic.
*/
delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const
diff --git a/src/lib/util/delegate.h b/src/lib/util/delegate.h
index 3b02f91b976..848e56480c9 100644
--- a/src/lib/util/delegate.h
+++ b/src/lib/util/delegate.h
@@ -659,8 +659,7 @@ public:
if (is_mfp() && (HAS_DIFFERENT_ABI)) \
return (*reinterpret_cast<generic_member_func>(m_function)) x; \
else \
- return (*m_function) x; \
-
+ return (*m_function) x;
//return MEMBER_ABI (*reinpertret_cast<generic_member_func>(m_function)) x;
// call the function
diff --git a/src/lib/util/flac.c b/src/lib/util/flac.c
index 2e1e999977d..49fc667a184 100644
--- a/src/lib/util/flac.c
+++ b/src/lib/util/flac.c
@@ -609,15 +609,15 @@ FLAC__StreamDecoderWriteStatus flac_decoder::write_callback(const ::FLAC__Frame
}
/**
- * @fn void flac_decoder::error_callback_static(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+ * @fn void flac_decoder::error_callback_static(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
*
- * @brief -------------------------------------------------
- * error_callback - handle errors (ignore them)
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * error_callback - handle errors (ignore them)
+ * -------------------------------------------------.
*
- * @param decoder The decoder.
- * @param status The status.
- * @param [in,out] client_data If non-null, information describing the client.
+ * @param decoder The decoder.
+ * @param status The status.
+ * @param [in,out] client_data If non-null, information describing the client.
*/
void flac_decoder::error_callback_static(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
diff --git a/src/lib/util/harddisk.c b/src/lib/util/harddisk.c
index 4b041cf29a8..b1082f3234f 100644
--- a/src/lib/util/harddisk.c
+++ b/src/lib/util/harddisk.c
@@ -98,13 +98,13 @@ chd_file *hard_disk_get_chd(hard_disk_file *file)
-------------------------------------------------*/
/**
- * @fn hard_disk_info *hard_disk_get_info(hard_disk_file *file)
+ * @fn hard_disk_info *hard_disk_get_info(hard_disk_file *file)
*
- * @brief Hard disk get information.
+ * @brief Hard disk get information.
*
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] file If non-null, the file.
*
- * @return null if it fails, else a hard_disk_info*.
+ * @return null if it fails, else a hard_disk_info*.
*/
hard_disk_info *hard_disk_get_info(hard_disk_file *file)
@@ -119,15 +119,15 @@ hard_disk_info *hard_disk_get_info(hard_disk_file *file)
-------------------------------------------------*/
/**
- * @fn UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer)
+ * @fn UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer)
*
- * @brief Hard disk read.
+ * @brief Hard disk read.
*
- * @param [in,out] file If non-null, the file.
- * @param lbasector The lbasector.
- * @param [in,out] buffer If non-null, the buffer.
+ * @param [in,out] file If non-null, the file.
+ * @param lbasector The lbasector.
+ * @param [in,out] buffer If non-null, the buffer.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer)
@@ -143,15 +143,15 @@ UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer)
-------------------------------------------------*/
/**
- * @fn UINT32 hard_disk_write(hard_disk_file *file, UINT32 lbasector, const void *buffer)
+ * @fn UINT32 hard_disk_write(hard_disk_file *file, UINT32 lbasector, const void *buffer)
*
- * @brief Hard disk write.
+ * @brief Hard disk write.
*
- * @param [in,out] file If non-null, the file.
- * @param lbasector The lbasector.
- * @param buffer The buffer.
+ * @param [in,out] file If non-null, the file.
+ * @param lbasector The lbasector.
+ * @param buffer The buffer.
*
- * @return An UINT32.
+ * @return An UINT32.
*/
UINT32 hard_disk_write(hard_disk_file *file, UINT32 lbasector, const void *buffer)
diff --git a/src/lib/util/hashing.c b/src/lib/util/hashing.c
index d7244d4edcf..e7f315ecc53 100644
--- a/src/lib/util/hashing.c
+++ b/src/lib/util/hashing.c
@@ -215,15 +215,15 @@ bool crc16_t::from_string(const char *string, int length)
}
/**
- * @fn const char *crc16_t::as_string(std::string &buffer) const
+ * @fn const char *crc16_t::as_string(std::string &buffer) const
*
- * @brief -------------------------------------------------
- * as_string - convert to a string
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * as_string - convert to a string
+ * -------------------------------------------------.
*
- * @param [in,out] buffer The buffer.
+ * @param [in,out] buffer The buffer.
*
- * @return null if it fails, else a char*.
+ * @return null if it fails, else a char*.
*/
const char *crc16_t::as_string(std::string &buffer) const
@@ -233,14 +233,14 @@ const char *crc16_t::as_string(std::string &buffer) const
}
/**
- * @fn void crc16_creator::append(const void *data, UINT32 length)
+ * @fn void crc16_creator::append(const void *data, UINT32 length)
*
- * @brief -------------------------------------------------
- * append - hash a block of data, appending to the currently-accumulated value
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * append - hash a block of data, appending to the currently-accumulated value
+ * -------------------------------------------------.
*
- * @param data The data.
- * @param length The length.
+ * @param data The data.
+ * @param length The length.
*/
void crc16_creator::append(const void *data, UINT32 length)
diff --git a/src/lib/util/huffman.c b/src/lib/util/huffman.c
index 7f804aec222..9205264f9eb 100644
--- a/src/lib/util/huffman.c
+++ b/src/lib/util/huffman.c
@@ -731,18 +731,18 @@ huffman_8bit_decoder::huffman_8bit_decoder()
}
/**
- * @fn huffman_error huffman_8bit_decoder::decode(const UINT8 *source, UINT32 slength, UINT8 *dest, UINT32 dlength)
+ * @fn huffman_error huffman_8bit_decoder::decode(const UINT8 *source, UINT32 slength, UINT8 *dest, UINT32 dlength)
*
- * @brief -------------------------------------------------
- * decode - decode a full buffer
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * decode - decode a full buffer
+ * -------------------------------------------------.
*
- * @param source Source for the.
- * @param slength The slength.
- * @param [in,out] dest If non-null, destination for the.
- * @param dlength The dlength.
+ * @param source Source for the.
+ * @param slength The slength.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param dlength The dlength.
*
- * @return A huffman_error.
+ * @return A huffman_error.
*/
huffman_error huffman_8bit_decoder::decode(const UINT8 *source, UINT32 slength, UINT8 *dest, UINT32 dlength)
diff --git a/src/lib/util/jedparse.c b/src/lib/util/jedparse.c
index 37bee01fa85..9bed1164303 100644
--- a/src/lib/util/jedparse.c
+++ b/src/lib/util/jedparse.c
@@ -411,15 +411,15 @@ int jedbin_parse(const void *data, size_t length, jed_data *result)
-------------------------------------------------*/
/**
- * @fn size_t jedbin_output(const jed_data *data, void *result, size_t length)
+ * @fn size_t jedbin_output(const jed_data *data, void *result, size_t length)
*
- * @brief Jedbin output.
+ * @brief Jedbin output.
*
- * @param data The data.
- * @param [out] result If non-null, the result.
- * @param length The length.
+ * @param data The data.
+ * @param [out] result If non-null, the result.
+ * @param length The length.
*
- * @return A size_t.
+ * @return A size_t.
*/
size_t jedbin_output(const jed_data *data, void *result, size_t length)
diff --git a/src/lib/util/md5.c b/src/lib/util/md5.c
index 7c571d9442e..3c0abb33b30 100644
--- a/src/lib/util/md5.c
+++ b/src/lib/util/md5.c
@@ -155,12 +155,12 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx)
*/
/**
- * @fn void MD5Transform(UWORD32 buf[4], UWORD32 const in[16])
+ * @fn void MD5Transform(UWORD32 buf[4], UWORD32 const in[16])
*
- * @brief Md 5 transform.
+ * @brief Md 5 transform.
*
- * @param buf The buffer.
- * @param in The in.
+ * @param buf The buffer.
+ * @param in The in.
*/
void
diff --git a/src/lib/util/opresolv.c b/src/lib/util/opresolv.c
index 0dd9252d7b6..91c6f1a9cbd 100644
--- a/src/lib/util/opresolv.c
+++ b/src/lib/util/opresolv.c
@@ -537,14 +537,14 @@ optreserr_t option_resolution_isvalidvalue(const char *specification, int option
}
/**
- * @fn int option_resolution_contains(const char *specification, int option_char)
+ * @fn int option_resolution_contains(const char *specification, int option_char)
*
- * @brief Option resolution contains.
+ * @brief Option resolution contains.
*
- * @param specification The specification.
- * @param option_char The option character.
+ * @param specification The specification.
+ * @param option_char The option character.
*
- * @return An int.
+ * @return An int.
*/
int option_resolution_contains(const char *specification, int option_char)
@@ -553,13 +553,13 @@ int option_resolution_contains(const char *specification, int option_char)
}
/**
- * @fn const char *option_resolution_error_string(optreserr_t err)
+ * @fn const char *option_resolution_error_string(optreserr_t err)
*
- * @brief Option resolution error string.
+ * @brief Option resolution error string.
*
- * @param err The error.
+ * @param err The error.
*
- * @return null if it fails, else a char*.
+ * @return null if it fails, else a char*.
*/
const char *option_resolution_error_string(optreserr_t err)
diff --git a/src/lib/util/options.c b/src/lib/util/options.c
index b365c1dd0ff..69e7189f50b 100644
--- a/src/lib/util/options.c
+++ b/src/lib/util/options.c
@@ -710,13 +710,13 @@ void core_options::remove_entry(core_options::entry &delentry)
}
/**
- * @fn void core_options::copyfrom(const core_options &src)
+ * @fn void core_options::copyfrom(const core_options &src)
*
- * @brief -------------------------------------------------
- * copyfrom - copy options from another set
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * copyfrom - copy options from another set
+ * -------------------------------------------------.
*
- * @param src Source for the.
+ * @param src Source for the.
*/
void core_options::copyfrom(const core_options &src)
@@ -730,19 +730,19 @@ void core_options::copyfrom(const core_options &src)
}
/**
- * @fn bool core_options::validate_and_set_data(core_options::entry &curentry, const char *newdata, int priority, std::string &error_string)
+ * @fn bool core_options::validate_and_set_data(core_options::entry &curentry, const char *newdata, int priority, std::string &error_string)
*
- * @brief -------------------------------------------------
- * validate_and_set_data - make sure the data is of the appropriate type and within
- * range, then set it
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * validate_and_set_data - make sure the data is of the appropriate type and within
+ * range, then set it
+ * -------------------------------------------------.
*
- * @param [in,out] curentry The curentry.
- * @param newdata The newdata.
- * @param priority The priority.
- * @param [in,out] error_string The error string.
+ * @param [in,out] curentry The curentry.
+ * @param newdata The newdata.
+ * @param priority The priority.
+ * @param [in,out] error_string The error string.
*
- * @return true if it succeeds, false if it fails.
+ * @return true if it succeeds, false if it fails.
*/
bool core_options::validate_and_set_data(core_options::entry &curentry, const char *newdata, int priority, std::string &error_string)
diff --git a/src/lib/util/palette.c b/src/lib/util/palette.c
index 7e20e7e9cb7..f2252a24319 100644
--- a/src/lib/util/palette.c
+++ b/src/lib/util/palette.c
@@ -468,14 +468,14 @@ void palette_t::normalize_range(UINT32 start, UINT32 end, int lum_min, int lum_m
}
/**
- * @fn void palette_t::update_adjusted_color(UINT32 group, UINT32 index)
+ * @fn void palette_t::update_adjusted_color(UINT32 group, UINT32 index)
*
- * @brief -------------------------------------------------
- * update_adjusted_color - update a color index by group and index pair
- * -------------------------------------------------.
+ * @brief -------------------------------------------------
+ * update_adjusted_color - update a color index by group and index pair
+ * -------------------------------------------------.
*
- * @param group The group.
- * @param index Zero-based index of the.
+ * @param group The group.
+ * @param index Zero-based index of the.
*/
void palette_t::update_adjusted_color(UINT32 group, UINT32 index)
diff --git a/src/lib/util/plaparse.c b/src/lib/util/plaparse.c
index f6228d2cbe9..74bc8edcc69 100644
--- a/src/lib/util/plaparse.c
+++ b/src/lib/util/plaparse.c
@@ -295,15 +295,15 @@ static bool process_field(jed_data *data, const UINT8 **src, const UINT8 *srcend
-------------------------------------------------*/
/**
- * @fn int pla_parse(const void *data, size_t length, jed_data *result)
+ * @fn int pla_parse(const void *data, size_t length, jed_data *result)
*
- * @brief Pla parse.
+ * @brief Pla parse.
*
- * @param data The data.
- * @param length The length.
- * @param [out] result If non-null, the result.
+ * @param data The data.
+ * @param length The length.
+ * @param [out] result If non-null, the result.
*
- * @return An int.
+ * @return An int.
*/
int pla_parse(const void *data, size_t length, jed_data *result)
diff --git a/src/lib/util/png.c b/src/lib/util/png.c
index 224cdf8d3dc..706dfb5e50f 100644
--- a/src/lib/util/png.c
+++ b/src/lib/util/png.c
@@ -1097,15 +1097,15 @@ png_error png_write_bitmap(core_file *fp, png_info *info, bitmap_t &bitmap, int
********************************************************************************/
/**
- * @fn png_error mng_capture_start(core_file *fp, bitmap_t &bitmap, double rate)
+ * @fn png_error mng_capture_start(core_file *fp, bitmap_t &bitmap, double rate)
*
- * @brief Mng capture start.
+ * @brief Mng capture start.
*
- * @param [in,out] fp If non-null, the fp.
- * @param [in,out] bitmap The bitmap.
- * @param rate The rate.
+ * @param [in,out] fp If non-null, the fp.
+ * @param [in,out] bitmap The bitmap.
+ * @param rate The rate.
*
- * @return A png_error.
+ * @return A png_error.
*/
png_error mng_capture_start(core_file *fp, bitmap_t &bitmap, double rate)
@@ -1131,17 +1131,17 @@ png_error mng_capture_start(core_file *fp, bitmap_t &bitmap, double rate)
}
/**
- * @fn png_error mng_capture_frame(core_file *fp, png_info *info, bitmap_t &bitmap, int palette_length, const rgb_t *palette)
+ * @fn png_error mng_capture_frame(core_file *fp, png_info *info, bitmap_t &bitmap, int palette_length, const rgb_t *palette)
*
- * @brief Mng capture frame.
+ * @brief Mng capture frame.
*
- * @param [in,out] fp If non-null, the fp.
- * @param [in,out] info If non-null, the information.
- * @param [in,out] bitmap The bitmap.
- * @param palette_length Length of the palette.
- * @param palette The palette.
+ * @param [in,out] fp If non-null, the fp.
+ * @param [in,out] info If non-null, the information.
+ * @param [in,out] bitmap The bitmap.
+ * @param palette_length Length of the palette.
+ * @param palette The palette.
*
- * @return A png_error.
+ * @return A png_error.
*/
png_error mng_capture_frame(core_file *fp, png_info *info, bitmap_t &bitmap, int palette_length, const rgb_t *palette)
@@ -1150,13 +1150,13 @@ png_error mng_capture_frame(core_file *fp, png_info *info, bitmap_t &bitmap, int
}
/**
- * @fn png_error mng_capture_stop(core_file *fp)
+ * @fn png_error mng_capture_stop(core_file *fp)
*
- * @brief Mng capture stop.
+ * @brief Mng capture stop.
*
- * @param [in,out] fp If non-null, the fp.
+ * @param [in,out] fp If non-null, the fp.
*
- * @return A png_error.
+ * @return A png_error.
*/
png_error mng_capture_stop(core_file *fp)
diff --git a/src/lib/util/pool.c b/src/lib/util/pool.c
index 0ca2be3deaa..ab62f47c6aa 100644
--- a/src/lib/util/pool.c
+++ b/src/lib/util/pool.c
@@ -571,11 +571,11 @@ static void memory_error(const char *message)
-------------------------------------------------*/
/**
- * @fn int test_memory_pools(void)
+ * @fn int test_memory_pools(void)
*
- * @brief Tests memory pools.
+ * @brief Tests memory pools.
*
- * @return An int.
+ * @return An int.
*/
int test_memory_pools(void)
diff --git a/src/lib/util/sha1.c b/src/lib/util/sha1.c
index 732828d9ccf..32247510190 100644
--- a/src/lib/util/sha1.c
+++ b/src/lib/util/sha1.c
@@ -122,11 +122,11 @@ static void WRITE_UINT32(unsigned char* data, UINT32 val)
/* Initialize the SHA values */
/**
- * @fn void sha1_init(struct sha1_ctx *ctx)
+ * @fn void sha1_init(struct sha1_ctx *ctx)
*
- * @brief Sha 1 initialise.
+ * @brief Sha 1 initialise.
*
- * @param [in,out] ctx If non-null, the context.
+ * @param [in,out] ctx If non-null, the context.
*/
void
@@ -154,12 +154,12 @@ sha1_init(struct sha1_ctx *ctx)
Note that this function destroys the data area */
/**
- * @fn static void sha1_transform(UINT32 *state, UINT32 *data)
+ * @fn static void sha1_transform(UINT32 *state, UINT32 *data)
*
- * @brief Sha 1 transform.
+ * @brief Sha 1 transform.
*
- * @param [in,out] state If non-null, the state.
- * @param [in,out] data If non-null, the data.
+ * @param [in,out] state If non-null, the state.
+ * @param [in,out] data If non-null, the data.
*/
static void
@@ -268,12 +268,12 @@ sha1_transform(UINT32 *state, UINT32 *data)
}
/**
- * @fn static void sha1_block(struct sha1_ctx *ctx, const UINT8 *block)
+ * @fn static void sha1_block(struct sha1_ctx *ctx, const UINT8 *block)
*
- * @brief Sha 1 block.
+ * @brief Sha 1 block.
*
- * @param [in,out] ctx If non-null, the context.
- * @param block The block.
+ * @param [in,out] ctx If non-null, the context.
+ * @param block The block.
*/
static void
@@ -294,13 +294,13 @@ sha1_block(struct sha1_ctx *ctx, const UINT8 *block)
}
/**
- * @fn void sha1_update(struct sha1_ctx *ctx, unsigned length, const UINT8 *buffer)
+ * @fn void sha1_update(struct sha1_ctx *ctx, unsigned length, const UINT8 *buffer)
*
- * @brief Sha 1 update.
+ * @brief Sha 1 update.
*
- * @param [in,out] ctx If non-null, the context.
- * @param length The length.
- * @param buffer The buffer.
+ * @param [in,out] ctx If non-null, the context.
+ * @param length The length.
+ * @param buffer The buffer.
*/
void
@@ -340,11 +340,11 @@ sha1_update(struct sha1_ctx *ctx,
1 0* (64-bit count of bits processed, MSB-first) */
/**
- * @fn void sha1_final(struct sha1_ctx *ctx)
+ * @fn void sha1_final(struct sha1_ctx *ctx)
*
- * @brief Sha 1 final.
+ * @brief Sha 1 final.
*
- * @param [in,out] ctx If non-null, the context.
+ * @param [in,out] ctx If non-null, the context.
*/
void
@@ -391,13 +391,13 @@ sha1_final(struct sha1_ctx *ctx)
}
/**
- * @fn void sha1_digest(const struct sha1_ctx *ctx, unsigned length, UINT8 *digest)
+ * @fn void sha1_digest(const struct sha1_ctx *ctx, unsigned length, UINT8 *digest)
*
- * @brief Sha 1 digest.
+ * @brief Sha 1 digest.
*
- * @param ctx The context.
- * @param length The length.
- * @param [in,out] digest If non-null, the digest.
+ * @param ctx The context.
+ * @param length The length.
+ * @param [in,out] digest If non-null, the digest.
*/
void
diff --git a/src/lib/util/tagmap.c b/src/lib/util/tagmap.c
index 95b0ec4fabf..7995b578314 100644
--- a/src/lib/util/tagmap.c
+++ b/src/lib/util/tagmap.c
@@ -13,8 +13,8 @@
#include "tagmap.h"
#ifdef MAME_DEBUG
-/** @brief The tagmap finds. */
+/** @brief The tagmap finds. */
INT32 g_tagmap_finds = 0;
-/** @brief true to enable, false to disable the tagmap counter. */
+/** @brief true to enable, false to disable the tagmap counter. */
bool g_tagmap_counter_enabled = false;
#endif
diff --git a/src/lib/util/un7z.c b/src/lib/util/un7z.c
index 57c7eeb0890..bbae440e0ff 100644
--- a/src/lib/util/un7z.c
+++ b/src/lib/util/un7z.c
@@ -468,11 +468,11 @@ _7z_error _7z_file_decompress(_7z_file *new_7z, void *buffer, UINT32 length)
-------------------------------------------------*/
/**
- * @fn static void free__7z_file(_7z_file *_7z)
+ * @fn static void free__7z_file(_7z_file *_7z)
*
- * @brief Free 7z file.
+ * @brief Free 7z file.
*
- * @param [in,out] _7z If non-null, the 7z.
+ * @param [in,out] _7z If non-null, the 7z.
*/
static void free__7z_file(_7z_file *_7z)
diff --git a/src/lib/util/unicode.c b/src/lib/util/unicode.c
index 7f264bc1fb6..5f375337b34 100644
--- a/src/lib/util/unicode.c
+++ b/src/lib/util/unicode.c
@@ -309,13 +309,13 @@ int utf16f_from_uchar(utf16_char *utf16string, size_t count, unicode_char uchar)
-------------------------------------------------*/
/**
- * @fn const char *utf8_previous_char(const char *utf8string)
+ * @fn const char *utf8_previous_char(const char *utf8string)
*
- * @brief UTF 8 previous character.
+ * @brief UTF 8 previous character.
*
- * @param utf8string The UTF 8string.
+ * @param utf8string The UTF 8string.
*
- * @return null if it fails, else a char*.
+ * @return null if it fails, else a char*.
*/
const char *utf8_previous_char(const char *utf8string)
@@ -333,13 +333,13 @@ const char *utf8_previous_char(const char *utf8string)
-------------------------------------------------*/
/**
- * @fn int utf8_is_valid_string(const char *utf8string)
+ * @fn int utf8_is_valid_string(const char *utf8string)
*
- * @brief UTF 8 is valid string.
+ * @brief UTF 8 is valid string.
*
- * @param utf8string The UTF 8string.
+ * @param utf8string The UTF 8string.
*
- * @return An int.
+ * @return An int.
*/
int utf8_is_valid_string(const char *utf8string)
diff --git a/src/lib/util/unzip.c b/src/lib/util/unzip.c
index 072e29c130d..21e137b9f24 100644
--- a/src/lib/util/unzip.c
+++ b/src/lib/util/unzip.c
@@ -69,25 +69,25 @@
#define ZIPUNCMP 0x16
/**
- * @def ZIPFNLN
+ * @def ZIPFNLN
*
- * @brief A macro that defines zipfnln.
+ * @brief A macro that defines zipfnln.
*/
#define ZIPFNLN 0x1a
/**
- * @def ZIPXTRALN
+ * @def ZIPXTRALN
*
- * @brief A macro that defines zipxtraln.
+ * @brief A macro that defines zipxtraln.
*/
#define ZIPXTRALN 0x1c
/**
- * @def ZIPNAME
+ * @def ZIPNAME
*
- * @brief A macro that defines zipname.
+ * @brief A macro that defines zipname.
*/
#define ZIPNAME 0x1e
@@ -99,13 +99,13 @@
***************************************************************************/
/**
- * @fn INLINE UINT16 read_word(UINT8 *buf)
+ * @fn INLINE UINT16 read_word(UINT8 *buf)
*
- * @brief Reads a word.
+ * @brief Reads a word.
*
- * @param [in,out] buf If non-null, the buffer.
+ * @param [in,out] buf If non-null, the buffer.
*
- * @return The word.
+ * @return The word.
*/
INLINE UINT16 read_word(UINT8 *buf)
@@ -114,13 +114,13 @@ INLINE UINT16 read_word(UINT8 *buf)
}
/**
- * @fn INLINE UINT32 read_dword(UINT8 *buf)
+ * @fn INLINE UINT32 read_dword(UINT8 *buf)
*
- * @brief Reads a double word.
+ * @brief Reads a double word.
*
- * @param [in,out] buf If non-null, the buffer.
+ * @param [in,out] buf If non-null, the buffer.
*
- * @return The double word.
+ * @return The double word.
*/
INLINE UINT32 read_dword(UINT8 *buf)
@@ -134,7 +134,7 @@ INLINE UINT32 read_dword(UINT8 *buf)
GLOBAL VARIABLES
***************************************************************************/
-/** @brief The zip cache[ zip cache size]. */
+/** @brief The zip cache[ zip cache size]. */
static zip_file *zip_cache[ZIP_CACHE_SIZE];
@@ -165,14 +165,14 @@ static zip_error decompress_data_type_8(zip_file *zip, UINT64 offset, void *buff
-------------------------------------------------*/
/**
- * @fn zip_error zip_file_open(const char *filename, zip_file **zip)
+ * @fn zip_error zip_file_open(const char *filename, zip_file **zip)
*
- * @brief Queries if a given zip file open.
+ * @brief Queries if a given zip file open.
*
- * @param filename Filename of the file.
- * @param [in,out] zip If non-null, the zip.
+ * @param filename Filename of the file.
+ * @param [in,out] zip If non-null, the zip.
*
- * @return A zip_error.
+ * @return A zip_error.
*/
zip_error zip_file_open(const char *filename, zip_file **zip)
@@ -267,11 +267,11 @@ error:
-------------------------------------------------*/
/**
- * @fn void zip_file_close(zip_file *zip)
+ * @fn void zip_file_close(zip_file *zip)
*
- * @brief Zip file close.
+ * @brief Zip file close.
*
- * @param [in,out] zip If non-null, the zip.
+ * @param [in,out] zip If non-null, the zip.
*/
void zip_file_close(zip_file *zip)
@@ -305,9 +305,9 @@ void zip_file_close(zip_file *zip)
-------------------------------------------------*/
/**
- * @fn void zip_file_cache_clear(void)
+ * @fn void zip_file_cache_clear(void)
*
- * @brief Zip file cache clear.
+ * @brief Zip file cache clear.
*/
void zip_file_cache_clear(void)
@@ -335,13 +335,13 @@ void zip_file_cache_clear(void)
-------------------------------------------------*/
/**
- * @fn const zip_file_header *zip_file_first_file(zip_file *zip)
+ * @fn const zip_file_header *zip_file_first_file(zip_file *zip)
*
- * @brief Zip file first file.
+ * @brief Zip file first file.
*
- * @param [in,out] zip If non-null, the zip.
+ * @param [in,out] zip If non-null, the zip.
*
- * @return null if it fails, else a zip_file_header*.
+ * @return null if it fails, else a zip_file_header*.
*/
const zip_file_header *zip_file_first_file(zip_file *zip)
@@ -358,13 +358,13 @@ const zip_file_header *zip_file_first_file(zip_file *zip)
-------------------------------------------------*/
/**
- * @fn const zip_file_header *zip_file_next_file(zip_file *zip)
+ * @fn const zip_file_header *zip_file_next_file(zip_file *zip)
*
- * @brief Zip file next file.
+ * @brief Zip file next file.
*
- * @param [in,out] zip If non-null, the zip.
+ * @param [in,out] zip If non-null, the zip.
*
- * @return null if it fails, else a zip_file_header*.
+ * @return null if it fails, else a zip_file_header*.
*/
const zip_file_header *zip_file_next_file(zip_file *zip)
@@ -425,15 +425,15 @@ const zip_file_header *zip_file_next_file(zip_file *zip)
-------------------------------------------------*/
/**
- * @fn zip_error zip_file_decompress(zip_file *zip, void *buffer, UINT32 length)
+ * @fn zip_error zip_file_decompress(zip_file *zip, void *buffer, UINT32 length)
*
- * @brief Zip file decompress.
+ * @brief Zip file decompress.
*
- * @param [in,out] zip If non-null, the zip.
- * @param [in,out] buffer If non-null, the buffer.
- * @param length The length.
+ * @param [in,out] zip If non-null, the zip.
+ * @param [in,out] buffer If non-null, the buffer.
+ * @param length The length.
*
- * @return A zip_error.
+ * @return A zip_error.
*/
zip_error zip_file_decompress(zip_file *zip, void *buffer, UINT32 length)
@@ -484,11 +484,11 @@ zip_error zip_file_decompress(zip_file *zip, void *buffer, UINT32 length)
-------------------------------------------------*/
/**
- * @fn static void free_zip_file(zip_file *zip)
+ * @fn static void free_zip_file(zip_file *zip)
*
- * @brief Free zip file.
+ * @brief Free zip file.
*
- * @param [in,out] zip If non-null, the zip.
+ * @param [in,out] zip If non-null, the zip.
*/
static void free_zip_file(zip_file *zip)
@@ -518,13 +518,13 @@ static void free_zip_file(zip_file *zip)
-------------------------------------------------*/
/**
- * @fn static zip_error read_ecd(zip_file *zip)
+ * @fn static zip_error read_ecd(zip_file *zip)
*
- * @brief Reads an ecd.
+ * @brief Reads an ecd.
*
- * @param [in,out] zip If non-null, the zip.
+ * @param [in,out] zip If non-null, the zip.
*
- * @return The ecd.
+ * @return The ecd.
*/
static zip_error read_ecd(zip_file *zip)
@@ -602,14 +602,14 @@ static zip_error read_ecd(zip_file *zip)
-------------------------------------------------*/
/**
- * @fn static zip_error get_compressed_data_offset(zip_file *zip, UINT64 *offset)
+ * @fn static zip_error get_compressed_data_offset(zip_file *zip, UINT64 *offset)
*
- * @brief Gets compressed data offset.
+ * @brief Gets compressed data offset.
*
- * @param [in,out] zip If non-null, the zip.
- * @param [in,out] offset If non-null, the offset.
+ * @param [in,out] zip If non-null, the zip.
+ * @param [in,out] offset If non-null, the offset.
*
- * @return The compressed data offset.
+ * @return The compressed data offset.
*/
static zip_error get_compressed_data_offset(zip_file *zip, UINT64 *offset)
@@ -650,16 +650,16 @@ static zip_error get_compressed_data_offset(zip_file *zip, UINT64 *offset)
-------------------------------------------------*/
/**
- * @fn static zip_error decompress_data_type_0(zip_file *zip, UINT64 offset, void *buffer, UINT32 length)
+ * @fn static zip_error decompress_data_type_0(zip_file *zip, UINT64 offset, void *buffer, UINT32 length)
*
- * @brief Decompress the data type 0.
+ * @brief Decompress the data type 0.
*
- * @param [in,out] zip If non-null, the zip.
- * @param offset The offset.
- * @param [in,out] buffer If non-null, the buffer.
- * @param length The length.
+ * @param [in,out] zip If non-null, the zip.
+ * @param offset The offset.
+ * @param [in,out] buffer If non-null, the buffer.
+ * @param length The length.
*
- * @return A zip_error.
+ * @return A zip_error.
*/
static zip_error decompress_data_type_0(zip_file *zip, UINT64 offset, void *buffer, UINT32 length)
@@ -684,16 +684,16 @@ static zip_error decompress_data_type_0(zip_file *zip, UINT64 offset, void *buff
-------------------------------------------------*/
/**
- * @fn static zip_error decompress_data_type_8(zip_file *zip, UINT64 offset, void *buffer, UINT32 length)
+ * @fn static zip_error decompress_data_type_8(zip_file *zip, UINT64 offset, void *buffer, UINT32 length)
*
- * @brief Decompress the data type 8.
+ * @brief Decompress the data type 8.
*
- * @param [in,out] zip If non-null, the zip.
- * @param offset The offset.
- * @param [in,out] buffer If non-null, the buffer.
- * @param length The length.
+ * @param [in,out] zip If non-null, the zip.
+ * @param offset The offset.
+ * @param [in,out] buffer If non-null, the buffer.
+ * @param length The length.
*
- * @return A zip_error.
+ * @return A zip_error.
*/
static zip_error decompress_data_type_8(zip_file *zip, UINT64 offset, void *buffer, UINT32 length)
diff --git a/src/lib/util/vbiparse.c b/src/lib/util/vbiparse.c
index 43cfb57c158..9c6c39fc4ea 100644
--- a/src/lib/util/vbiparse.c
+++ b/src/lib/util/vbiparse.c
@@ -277,15 +277,15 @@ int vbi_parse_white_flag(const UINT16 *source, int sourcewidth, int sourceshift)
-------------------------------------------------*/
/**
- * @fn void vbi_parse_all(const UINT16 *source, int sourcerowpixels, int sourcewidth, int sourceshift, vbi_metadata *vbi)
+ * @fn void vbi_parse_all(const UINT16 *source, int sourcerowpixels, int sourcewidth, int sourceshift, vbi_metadata *vbi)
*
- * @brief Vbi parse all.
+ * @brief Vbi parse all.
*
- * @param source Source for the.
- * @param sourcerowpixels The sourcerowpixels.
- * @param sourcewidth The sourcewidth.
- * @param sourceshift The sourceshift.
- * @param [in,out] vbi If non-null, the vbi.
+ * @param source Source for the.
+ * @param sourcerowpixels The sourcerowpixels.
+ * @param sourcewidth The sourcewidth.
+ * @param sourceshift The sourceshift.
+ * @param [in,out] vbi If non-null, the vbi.
*/
void vbi_parse_all(const UINT16 *source, int sourcerowpixels, int sourcewidth, int sourceshift, vbi_metadata *vbi)
@@ -351,13 +351,13 @@ void vbi_parse_all(const UINT16 *source, int sourcerowpixels, int sourcewidth, i
-------------------------------------------------*/
/**
- * @fn void vbi_metadata_pack(UINT8 *dest, UINT32 framenum, const vbi_metadata *vbi)
+ * @fn void vbi_metadata_pack(UINT8 *dest, UINT32 framenum, const vbi_metadata *vbi)
*
- * @brief Vbi metadata pack.
+ * @brief Vbi metadata pack.
*
- * @param [in,out] dest If non-null, destination for the.
- * @param framenum The framenum.
- * @param vbi The vbi.
+ * @param [in,out] dest If non-null, destination for the.
+ * @param framenum The framenum.
+ * @param vbi The vbi.
*/
void vbi_metadata_pack(UINT8 *dest, UINT32 framenum, const vbi_metadata *vbi)
@@ -387,13 +387,13 @@ void vbi_metadata_pack(UINT8 *dest, UINT32 framenum, const vbi_metadata *vbi)
-------------------------------------------------*/
/**
- * @fn void vbi_metadata_unpack(vbi_metadata *vbi, UINT32 *framenum, const UINT8 *source)
+ * @fn void vbi_metadata_unpack(vbi_metadata *vbi, UINT32 *framenum, const UINT8 *source)
*
- * @brief Vbi metadata unpack.
+ * @brief Vbi metadata unpack.
*
- * @param [in,out] vbi If non-null, the vbi.
- * @param [in,out] framenum If non-null, the framenum.
- * @param source Source for the.
+ * @param [in,out] vbi If non-null, the vbi.
+ * @param [in,out] framenum If non-null, the framenum.
+ * @param source Source for the.
*/
void vbi_metadata_unpack(vbi_metadata *vbi, UINT32 *framenum, const UINT8 *source)
diff --git a/src/lib/util/xmlfile.c b/src/lib/util/xmlfile.c
index 193717b30aa..2e11f03418b 100644
--- a/src/lib/util/xmlfile.c
+++ b/src/lib/util/xmlfile.c
@@ -452,15 +452,15 @@ int xml_get_attribute_int_format(xml_data_node *node, const char *attribute)
-------------------------------------------------*/
/**
- * @fn float xml_get_attribute_float(xml_data_node *node, const char *attribute, float defvalue)
+ * @fn float xml_get_attribute_float(xml_data_node *node, const char *attribute, float defvalue)
*
- * @brief XML get attribute float.
+ * @brief XML get attribute float.
*
- * @param [in,out] node If non-null, the node.
- * @param attribute The attribute.
- * @param defvalue The defvalue.
+ * @param [in,out] node If non-null, the node.
+ * @param attribute The attribute.
+ * @param defvalue The defvalue.
*
- * @return A float.
+ * @return A float.
*/
float xml_get_attribute_float(xml_data_node *node, const char *attribute, float defvalue)
@@ -480,15 +480,15 @@ float xml_get_attribute_float(xml_data_node *node, const char *attribute, float
-------------------------------------------------*/
/**
- * @fn xml_attribute_node *xml_set_attribute(xml_data_node *node, const char *name, const char *value)
+ * @fn xml_attribute_node *xml_set_attribute(xml_data_node *node, const char *name, const char *value)
*
- * @brief XML set attribute.
+ * @brief XML set attribute.
*
- * @param [in,out] node If non-null, the node.
- * @param name The name.
- * @param value The value.
+ * @param [in,out] node If non-null, the node.
+ * @param name The name.
+ * @param value The value.
*
- * @return null if it fails, else an xml_attribute_node*.
+ * @return null if it fails, else an xml_attribute_node*.
*/
xml_attribute_node *xml_set_attribute(xml_data_node *node, const char *name, const char *value)
@@ -520,15 +520,15 @@ xml_attribute_node *xml_set_attribute(xml_data_node *node, const char *name, con
-------------------------------------------------*/
/**
- * @fn xml_attribute_node *xml_set_attribute_int(xml_data_node *node, const char *name, int value)
+ * @fn xml_attribute_node *xml_set_attribute_int(xml_data_node *node, const char *name, int value)
*
- * @brief XML set attribute int.
+ * @brief XML set attribute int.
*
- * @param [in,out] node If non-null, the node.
- * @param name The name.
- * @param value The value.
+ * @param [in,out] node If non-null, the node.
+ * @param name The name.
+ * @param value The value.
*
- * @return null if it fails, else an xml_attribute_node*.
+ * @return null if it fails, else an xml_attribute_node*.
*/
xml_attribute_node *xml_set_attribute_int(xml_data_node *node, const char *name, int value)
@@ -545,15 +545,15 @@ xml_attribute_node *xml_set_attribute_int(xml_data_node *node, const char *name,
-------------------------------------------------*/
/**
- * @fn xml_attribute_node *xml_set_attribute_float(xml_data_node *node, const char *name, float value)
+ * @fn xml_attribute_node *xml_set_attribute_float(xml_data_node *node, const char *name, float value)
*
- * @brief XML set attribute float.
+ * @brief XML set attribute float.
*
- * @param [in,out] node If non-null, the node.
- * @param name The name.
- * @param value The value.
+ * @param [in,out] node If non-null, the node.
+ * @param name The name.
+ * @param value The value.
*
- * @return null if it fails, else an xml_attribute_node*.
+ * @return null if it fails, else an xml_attribute_node*.
*/
xml_attribute_node *xml_set_attribute_float(xml_data_node *node, const char *name, float value)
@@ -575,13 +575,13 @@ xml_attribute_node *xml_set_attribute_float(xml_data_node *node, const char *nam
-------------------------------------------------*/
/**
- * @fn const char *xml_normalize_string(const char *string)
+ * @fn const char *xml_normalize_string(const char *string)
*
- * @brief XML normalize string.
+ * @brief XML normalize string.
*
- * @param string The string.
+ * @param string The string.
*
- * @return null if it fails, else a char*.
+ * @return null if it fails, else a char*.
*/
const char *xml_normalize_string(const char *string)
@@ -623,13 +623,13 @@ const char *xml_normalize_string(const char *string)
-------------------------------------------------*/
/**
- * @fn static void *expat_malloc(size_t size)
+ * @fn static void *expat_malloc(size_t size)
*
- * @brief Expat malloc.
+ * @brief Expat malloc.
*
- * @param size The size.
+ * @param size The size.
*
- * @return null if it fails, else a void*.
+ * @return null if it fails, else a void*.
*/
static void *expat_malloc(size_t size)
@@ -640,11 +640,11 @@ static void *expat_malloc(size_t size)
}
/**
- * @fn static void expat_free(void *ptr)
+ * @fn static void expat_free(void *ptr)
*
- * @brief Expat free.
+ * @brief Expat free.
*
- * @param [in,out] ptr If non-null, the pointer.
+ * @param [in,out] ptr If non-null, the pointer.
*/
static void expat_free(void *ptr)
@@ -654,14 +654,14 @@ static void expat_free(void *ptr)
}
/**
- * @fn static void *expat_realloc(void *ptr, size_t size)
+ * @fn static void *expat_realloc(void *ptr, size_t size)
*
- * @brief Expat realloc.
+ * @brief Expat realloc.
*
- * @param [in,out] ptr If non-null, the pointer.
- * @param size The size.
+ * @param [in,out] ptr If non-null, the pointer.
+ * @param size The size.
*
- * @return null if it fails, else a void*.
+ * @return null if it fails, else a void*.
*/
static void *expat_realloc(void *ptr, size_t size)
@@ -684,14 +684,14 @@ static void *expat_realloc(void *ptr, size_t size)
-------------------------------------------------*/
/**
- * @fn static int expat_setup_parser(xml_parse_info *parse_info, xml_parse_options *opts)
+ * @fn static int expat_setup_parser(xml_parse_info *parse_info, xml_parse_options *opts)
*
- * @brief Expat setup parser.
+ * @brief Expat setup parser.
*
- * @param [in,out] parse_info If non-null, information describing the parse.
- * @param [in,out] opts If non-null, options for controlling the operation.
+ * @param [in,out] parse_info If non-null, information describing the parse.
+ * @param [in,out] opts If non-null, options for controlling the operation.
*
- * @return An int.
+ * @return An int.
*/
static int expat_setup_parser(xml_parse_info *parse_info, xml_parse_options *opts)
@@ -746,13 +746,13 @@ static int expat_setup_parser(xml_parse_info *parse_info, xml_parse_options *opt
-------------------------------------------------*/
/**
- * @fn static void expat_element_start(void *data, const XML_Char *name, const XML_Char **attributes)
+ * @fn static void expat_element_start(void *data, const XML_Char *name, const XML_Char **attributes)
*
- * @brief Expat element start.
+ * @brief Expat element start.
*
- * @param [in,out] data If non-null, the data.
- * @param name The name.
- * @param attributes The attributes.
+ * @param [in,out] data If non-null, the data.
+ * @param name The name.
+ * @param attributes The attributes.
*/
static void expat_element_start(void *data, const XML_Char *name, const XML_Char **attributes)
@@ -785,13 +785,13 @@ static void expat_element_start(void *data, const XML_Char *name, const XML_Char
-------------------------------------------------*/
/**
- * @fn static void expat_data(void *data, const XML_Char *s, int len)
+ * @fn static void expat_data(void *data, const XML_Char *s, int len)
*
- * @brief Expat data.
+ * @brief Expat data.
*
- * @param [in,out] data If non-null, the data.
- * @param s The const XML_Char * to process.
- * @param len The length.
+ * @param [in,out] data If non-null, the data.
+ * @param s The const XML_Char * to process.
+ * @param len The length.
*/
static void expat_data(void *data, const XML_Char *s, int len)
@@ -833,12 +833,12 @@ static void expat_data(void *data, const XML_Char *s, int len)
-------------------------------------------------*/
/**
- * @fn static void expat_element_end(void *data, const XML_Char *name)
+ * @fn static void expat_element_end(void *data, const XML_Char *name)
*
- * @brief Expat element end.
+ * @brief Expat element end.
*
- * @param [in,out] data If non-null, the data.
- * @param name The name.
+ * @param [in,out] data If non-null, the data.
+ * @param name The name.
*/
static void expat_element_end(void *data, const XML_Char *name)
@@ -892,15 +892,15 @@ static void expat_element_end(void *data, const XML_Char *name)
-------------------------------------------------*/
/**
- * @fn static xml_data_node *add_child(xml_data_node *parent, const char *name, const char *value)
+ * @fn static xml_data_node *add_child(xml_data_node *parent, const char *name, const char *value)
*
- * @brief Adds a child.
+ * @brief Adds a child.
*
- * @param [in,out] parent If non-null, the parent.
- * @param name The name.
- * @param value The value.
+ * @param [in,out] parent If non-null, the parent.
+ * @param name The name.
+ * @param value The value.
*
- * @return null if it fails, else an xml_data_node*.
+ * @return null if it fails, else an xml_data_node*.
*/
static xml_data_node *add_child(xml_data_node *parent, const char *name, const char *value)
@@ -946,15 +946,15 @@ static xml_data_node *add_child(xml_data_node *parent, const char *name, const c
-------------------------------------------------*/
/**
- * @fn static xml_attribute_node *add_attribute(xml_data_node *node, const char *name, const char *value)
+ * @fn static xml_attribute_node *add_attribute(xml_data_node *node, const char *name, const char *value)
*
- * @brief Adds an attribute.
+ * @brief Adds an attribute.
*
- * @param [in,out] node If non-null, the node.
- * @param name The name.
- * @param value The value.
+ * @param [in,out] node If non-null, the node.
+ * @param name The name.
+ * @param value The value.
*
- * @return null if it fails, else an xml_attribute_node*.
+ * @return null if it fails, else an xml_attribute_node*.
*/
static xml_attribute_node *add_attribute(xml_data_node *node, const char *name, const char *value)
@@ -1001,13 +1001,13 @@ static xml_attribute_node *add_attribute(xml_data_node *node, const char *name,
-------------------------------------------------*/
/**
- * @fn static void write_node_recursive(xml_data_node *node, int indent, core_file *file)
+ * @fn static void write_node_recursive(xml_data_node *node, int indent, core_file *file)
*
- * @brief Writes a node recursive.
+ * @brief Writes a node recursive.
*
- * @param [in,out] node If non-null, the node.
- * @param indent The indent.
- * @param [in,out] file If non-null, the file.
+ * @param [in,out] node If non-null, the node.
+ * @param indent The indent.
+ * @param [in,out] file If non-null, the file.
*/
static void write_node_recursive(xml_data_node *node, int indent, core_file *file)
@@ -1054,11 +1054,11 @@ static void write_node_recursive(xml_data_node *node, int indent, core_file *fil
-------------------------------------------------*/
/**
- * @fn static void free_node_recursive(xml_data_node *node)
+ * @fn static void free_node_recursive(xml_data_node *node)
*
- * @brief Free node recursive.
+ * @brief Free node recursive.
*
- * @param [in,out] node If non-null, the node.
+ * @param [in,out] node If non-null, the node.
*/
static void free_node_recursive(xml_data_node *node)
diff --git a/src/lib/util/zippath.c b/src/lib/util/zippath.c
index 8d22952223a..36c9470ed92 100644
--- a/src/lib/util/zippath.c
+++ b/src/lib/util/zippath.c
@@ -23,23 +23,23 @@
***************************************************************************/
/**
- * @struct zippath_returned_directory
+ * @struct zippath_returned_directory
*
- * @brief A zippath returned directory.
+ * @brief A zippath returned directory.
*/
struct zippath_returned_directory
{
- /** @brief The next. */
+ /** @brief The next. */
zippath_returned_directory *next;
- /** @brief The name. */
+ /** @brief The name. */
std::string name;
};
/**
- * @class zippath_directory
+ * @class zippath_directory
*
- * @brief A zippath directory.
+ * @brief A zippath directory.
*/
class zippath_directory
@@ -53,23 +53,23 @@ public:
returned_dirlist(NULL) { }
/* common */
- /** @brief true to returned parent. */
+ /** @brief true to returned parent. */
bool returned_parent;
- /** @brief The returned entry. */
+ /** @brief The returned entry. */
osd_directory_entry returned_entry;
/* specific to normal directories */
- /** @brief Pathname of the directory. */
+ /** @brief Pathname of the directory. */
osd_directory *directory;
/* specific to ZIP directories */
- /** @brief true to called zip first. */
+ /** @brief true to called zip first. */
bool called_zip_first;
- /** @brief The zipfile. */
+ /** @brief The zipfile. */
zip_file *zipfile;
- /** @brief The zipprefix. */
+ /** @brief The zipprefix. */
std::string zipprefix;
- /** @brief The returned dirlist. */
+ /** @brief The returned dirlist. */
zippath_returned_directory *returned_dirlist;
};
@@ -89,15 +89,15 @@ static int is_7z_file(const char *path);
***************************************************************************/
/**
- * @fn int is_path_separator(char c)
+ * @fn int is_path_separator(char c)
*
- * @brief ============================================================
- * is_path_separator
- * ============================================================.
+ * @brief ============================================================
+ * is_path_separator
+ * ============================================================.
*
- * @param c The character.
+ * @param c The character.
*
- * @return An int.
+ * @return An int.
*/
int is_path_separator(char c)
@@ -110,13 +110,13 @@ int is_path_separator(char c)
-------------------------------------------------*/
/**
- * @fn static void parse_parent_path(const char *path, int *beginpos, int *endpos)
+ * @fn static void parse_parent_path(const char *path, int *beginpos, int *endpos)
*
- * @brief Parse parent path.
+ * @brief Parse parent path.
*
- * @param path Full pathname of the file.
- * @param [in,out] beginpos If non-null, the beginpos.
- * @param [in,out] endpos If non-null, the endpos.
+ * @param path Full pathname of the file.
+ * @param [in,out] beginpos If non-null, the beginpos.
+ * @param [in,out] endpos If non-null, the endpos.
*/
static void parse_parent_path(const char *path, int *beginpos, int *endpos)
@@ -149,14 +149,14 @@ static void parse_parent_path(const char *path, int *beginpos, int *endpos)
-------------------------------------------------*/
/**
- * @fn std::string &zippath_parent(std::string &dst, const char *path)
+ * @fn std::string &zippath_parent(std::string &dst, const char *path)
*
- * @brief Zippath parent.
+ * @brief Zippath parent.
*
- * @param [in,out] dst Destination for the.
- * @param path Full pathname of the file.
+ * @param [in,out] dst Destination for the.
+ * @param path Full pathname of the file.
*
- * @return A std::string&amp;
+ * @return A std::string&amp;
*/
std::string &zippath_parent(std::string &dst, const char *path)
@@ -182,14 +182,14 @@ std::string &zippath_parent(std::string &dst, const char *path)
-------------------------------------------------*/
/**
- * @fn std::string &zippath_parent_basename(std::string &dst, const char *path)
+ * @fn std::string &zippath_parent_basename(std::string &dst, const char *path)
*
- * @brief Zippath parent basename.
+ * @brief Zippath parent basename.
*
- * @param [in,out] dst Destination for the.
- * @param path Full pathname of the file.
+ * @param [in,out] dst Destination for the.
+ * @param path Full pathname of the file.
*
- * @return A std::string&amp;
+ * @return A std::string&amp;
*/
std::string &zippath_parent_basename(std::string &dst, const char *path)
@@ -207,15 +207,15 @@ std::string &zippath_parent_basename(std::string &dst, const char *path)
-------------------------------------------------*/
/**
- * @fn std::string &zippath_combine(std::string &dst, const char *path1, const char *path2)
+ * @fn std::string &zippath_combine(std::string &dst, const char *path1, const char *path2)
*
- * @brief Zippath combine.
+ * @brief Zippath combine.
*
- * @param [in,out] dst Destination for the.
- * @param path1 The first path.
- * @param path2 The second path.
+ * @param [in,out] dst Destination for the.
+ * @param path1 The first path.
+ * @param path2 The second path.
*
- * @return A std::string&amp;
+ * @return A std::string&amp;
*/
std::string &zippath_combine(std::string &dst, const char *path1, const char *path2)
@@ -255,13 +255,13 @@ std::string &zippath_combine(std::string &dst, const char *path1, const char *pa
-------------------------------------------------*/
/**
- * @fn static file_error file_error_from_zip_error(zip_error ziperr)
+ * @fn static file_error file_error_from_zip_error(zip_error ziperr)
*
- * @brief File error from zip error.
+ * @brief File error from zip error.
*
- * @param ziperr The ziperr.
+ * @param ziperr The ziperr.
*
- * @return A file_error.
+ * @return A file_error.
*/
static file_error file_error_from_zip_error(zip_error ziperr)
@@ -298,15 +298,15 @@ static file_error file_error_from_zip_error(zip_error ziperr)
-------------------------------------------------*/
/**
- * @fn static file_error create_core_file_from_zip(zip_file *zip, const zip_file_header *header, core_file *&file)
+ * @fn static file_error create_core_file_from_zip(zip_file *zip, const zip_file_header *header, core_file *&file)
*
- * @brief Creates core file from zip.
+ * @brief Creates core file from zip.
*
- * @param [in,out] zip If non-null, the zip.
- * @param header The header.
- * @param [in,out] file [in,out] If non-null, the file.
+ * @param [in,out] zip If non-null, the zip.
+ * @param header The header.
+ * @param [in,out] file [in,out] If non-null, the file.
*
- * @return The new core file from zip.
+ * @return The new core file from zip.
*/
static file_error create_core_file_from_zip(zip_file *zip, const zip_file_header *header, core_file *&file)
@@ -345,16 +345,16 @@ done:
-------------------------------------------------*/
/**
- * @fn file_error zippath_fopen(const char *filename, UINT32 openflags, core_file *&file, std::string &revised_path)
+ * @fn file_error zippath_fopen(const char *filename, UINT32 openflags, core_file *&file, std::string &revised_path)
*
- * @brief Zippath fopen.
+ * @brief Zippath fopen.
*
- * @param filename Filename of the file.
- * @param openflags The openflags.
- * @param [in,out] file [in,out] If non-null, the file.
- * @param [in,out] revised_path Full pathname of the revised file.
+ * @param filename Filename of the file.
+ * @param openflags The openflags.
+ * @param [in,out] file [in,out] If non-null, the file.
+ * @param [in,out] revised_path Full pathname of the revised file.
*
- * @return A file_error.
+ * @return A file_error.
*/
file_error zippath_fopen(const char *filename, UINT32 openflags, core_file *&file, std::string &revised_path)
@@ -487,13 +487,13 @@ done:
-------------------------------------------------*/
/**
- * @fn static int is_root(const char *path)
+ * @fn static int is_root(const char *path)
*
- * @brief Is root.
+ * @brief Is root.
*
- * @param path Full pathname of the file.
+ * @param path Full pathname of the file.
*
- * @return An int.
+ * @return An int.
*/
static int is_root(const char *path)
@@ -519,13 +519,13 @@ static int is_root(const char *path)
-------------------------------------------------*/
/**
- * @fn static int is_7z_file(const char *path)
+ * @fn static int is_7z_file(const char *path)
*
- * @brief Is 7z file.
+ * @brief Is 7z file.
*
- * @param path Full pathname of the file.
+ * @param path Full pathname of the file.
*
- * @return An int.
+ * @return An int.
*/
static int is_7z_file(const char *path)
@@ -541,13 +541,13 @@ static int is_7z_file(const char *path)
-------------------------------------------------*/
/**
- * @fn static int is_zip_file(const char *path)
+ * @fn static int is_zip_file(const char *path)
*
- * @brief Is zip file.
+ * @brief Is zip file.
*
- * @param path Full pathname of the file.
+ * @param path Full pathname of the file.
*
- * @return An int.
+ * @return An int.
*/
static int is_zip_file(const char *path)
@@ -564,13 +564,13 @@ static int is_zip_file(const char *path)
-------------------------------------------------*/
/**
- * @fn static int is_zip_file_separator(char c)
+ * @fn static int is_zip_file_separator(char c)
*
- * @brief Is zip file separator.
+ * @brief Is zip file separator.
*
- * @param c The character.
+ * @param c The character.
*
- * @return An int.
+ * @return An int.
*/
static int is_zip_file_separator(char c)
@@ -586,13 +586,13 @@ static int is_zip_file_separator(char c)
-------------------------------------------------*/
/**
- * @fn static int is_zip_path_separator(char c)
+ * @fn static int is_zip_path_separator(char c)
*
- * @brief Is zip path separator.
+ * @brief Is zip path separator.
*
- * @param c The character.
+ * @param c The character.
*
- * @return An int.
+ * @return An int.
*/
static int is_zip_path_separator(char c)
@@ -608,14 +608,14 @@ static int is_zip_path_separator(char c)
-------------------------------------------------*/
/**
- * @fn static char next_path_char(const char *s, int *pos)
+ * @fn static char next_path_char(const char *s, int *pos)
*
- * @brief Next path character.
+ * @brief Next path character.
*
- * @param s The const char * to process.
- * @param [in,out] pos If non-null, the position.
+ * @param s The const char * to process.
+ * @param [in,out] pos If non-null, the position.
*
- * @return A char.
+ * @return A char.
*/
static char next_path_char(const char *s, int *pos)
@@ -661,15 +661,15 @@ static char next_path_char(const char *s, int *pos)
-------------------------------------------------*/
/**
- * @fn static const zip_file_header *zippath_find_sub_path(zip_file *zipfile, const char *subpath, osd_dir_entry_type *type)
+ * @fn static const zip_file_header *zippath_find_sub_path(zip_file *zipfile, const char *subpath, osd_dir_entry_type *type)
*
- * @brief Zippath find sub path.
+ * @brief Zippath find sub path.
*
- * @param [in,out] zipfile If non-null, the zipfile.
- * @param subpath The subpath.
- * @param [in,out] type If non-null, the type.
+ * @param [in,out] zipfile If non-null, the zipfile.
+ * @param subpath The subpath.
+ * @param [in,out] type If non-null, the type.
*
- * @return null if it fails, else a zip_file_header*.
+ * @return null if it fails, else a zip_file_header*.
*/
static const zip_file_header *zippath_find_sub_path(zip_file *zipfile, const char *subpath, osd_dir_entry_type *type)
@@ -726,16 +726,16 @@ static const zip_file_header *zippath_find_sub_path(zip_file *zipfile, const cha
-------------------------------------------------*/
/**
- * @fn static file_error zippath_resolve(const char *path, osd_dir_entry_type &entry_type, zip_file *&zipfile, std::string &newpath)
+ * @fn static file_error zippath_resolve(const char *path, osd_dir_entry_type &entry_type, zip_file *&zipfile, std::string &newpath)
*
- * @brief Zippath resolve.
+ * @brief Zippath resolve.
*
- * @param path Full pathname of the file.
- * @param [in,out] entry_type Type of the entry.
- * @param [in,out] zipfile [in,out] If non-null, the zipfile.
- * @param [in,out] newpath The newpath.
+ * @param path Full pathname of the file.
+ * @param [in,out] entry_type Type of the entry.
+ * @param [in,out] zipfile [in,out] If non-null, the zipfile.
+ * @param [in,out] newpath The newpath.
*
- * @return A file_error.
+ * @return A file_error.
*/
static file_error zippath_resolve(const char *path, osd_dir_entry_type &entry_type, zip_file *&zipfile, std::string &newpath)
@@ -834,14 +834,14 @@ done:
-------------------------------------------------*/
/**
- * @fn file_error zippath_opendir(const char *path, zippath_directory **directory)
+ * @fn file_error zippath_opendir(const char *path, zippath_directory **directory)
*
- * @brief Zippath opendir.
+ * @brief Zippath opendir.
*
- * @param path Full pathname of the file.
- * @param [in,out] directory If non-null, pathname of the directory.
+ * @param path Full pathname of the file.
+ * @param [in,out] directory If non-null, pathname of the directory.
*
- * @return A file_error.
+ * @return A file_error.
*/
file_error zippath_opendir(const char *path, zippath_directory **directory)
@@ -905,11 +905,11 @@ done:
-------------------------------------------------*/
/**
- * @fn void zippath_closedir(zippath_directory *directory)
+ * @fn void zippath_closedir(zippath_directory *directory)
*
- * @brief Zippath closedir.
+ * @brief Zippath closedir.
*
- * @param [in,out] directory If non-null, pathname of the directory.
+ * @param [in,out] directory If non-null, pathname of the directory.
*/
void zippath_closedir(zippath_directory *directory)
@@ -938,14 +938,14 @@ void zippath_closedir(zippath_directory *directory)
-------------------------------------------------*/
/**
- * @fn static const char *get_relative_path(zippath_directory *directory, const zip_file_header *header)
+ * @fn static const char *get_relative_path(zippath_directory *directory, const zip_file_header *header)
*
- * @brief Gets relative path.
+ * @brief Gets relative path.
*
- * @param [in,out] directory If non-null, pathname of the directory.
- * @param header The header.
+ * @param [in,out] directory If non-null, pathname of the directory.
+ * @param header The header.
*
- * @return null if it fails, else the relative path.
+ * @return null if it fails, else the relative path.
*/
static const char *get_relative_path(zippath_directory *directory, const zip_file_header *header)
@@ -970,13 +970,13 @@ static const char *get_relative_path(zippath_directory *directory, const zip_fil
-------------------------------------------------*/
/**
- * @fn const osd_directory_entry *zippath_readdir(zippath_directory *directory)
+ * @fn const osd_directory_entry *zippath_readdir(zippath_directory *directory)
*
- * @brief Zippath readdir.
+ * @brief Zippath readdir.
*
- * @param [in,out] directory If non-null, pathname of the directory.
+ * @param [in,out] directory If non-null, pathname of the directory.
*
- * @return null if it fails, else an osd_directory_entry*.
+ * @return null if it fails, else an osd_directory_entry*.
*/
const osd_directory_entry *zippath_readdir(zippath_directory *directory)
@@ -1086,13 +1086,13 @@ const osd_directory_entry *zippath_readdir(zippath_directory *directory)
-------------------------------------------------*/
/**
- * @fn int zippath_is_zip(zippath_directory *directory)
+ * @fn int zippath_is_zip(zippath_directory *directory)
*
- * @brief Zippath is zip.
+ * @brief Zippath is zip.
*
- * @param [in,out] directory If non-null, pathname of the directory.
+ * @param [in,out] directory If non-null, pathname of the directory.
*
- * @return An int.
+ * @return An int.
*/
int zippath_is_zip(zippath_directory *directory)
diff --git a/src/mame/arcade.lst b/src/mame/arcade.lst
index 44ca3d04526..7f53d7e3342 100644
--- a/src/mame/arcade.lst
+++ b/src/mame/arcade.lst
@@ -1901,7 +1901,7 @@ geostorm // (c) 1994 Irem (Japan)
airass // (c) 1993 Irem (World)
firebarr // (c) 1993 Irem (Japan)
dsoccr94 // (c) 1994 Irem (Data East Corporation license)
-dsoccr94k //
+dsoccr94k //
kftgoal // (c) 1994 Jaleco
wpksoc // (c) 1995 Jaleco
@@ -4845,7 +4845,7 @@ mahmajn2 // 1994.05 Tokorosan no Mahmahjong 2 (Japan)
qgh // 1994.09 Quiz Ghost Hunter
// M1 board
-bingpty // ?
+bingpty // ?
// Sega System 32 games
radm // 1991.?? Rad Mobile (World)
@@ -9123,7 +9123,7 @@ keroppi // (c) 1993 Sammy
keroppij // (c) 1993 Sammy
extdwnhl // (c) 1995 Sammy Japan
gundhara // (c) 1995 Banpresto
-gundharac // (c) 1995 Banpresto (Chinese, bootleg?)
+gundharac // (c) 1995 Banpresto (Chinese, bootleg?)
sokonuke // (c) 1995 Sammy Industries
zombraid // (c) 1995 American Sammy
zombraidp // (c) 1995 American Sammy
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index e2846bfcf70..a6ad987f06c 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -168,7 +168,7 @@ WRITE8_MEMBER( irem_audio_device::ay8910_45M_portb_w )
WRITE8_MEMBER( irem_audio_device::ay8910_45L_porta_w )
{
/*
- * 45L 21 IOA0 ==> BD
+ * 45L 21 IOA0 ==> BD
* 45L 20 IOA1 ==> SD
* 45L 19 IOA2 ==> OH
* 45L 18 IOA3 ==> CH
@@ -465,7 +465,7 @@ NETLIST_START(kidniki_interface)
TTL_INPUT(I_BD0, 1)
//CLOCK(I_BD0, 5)
TTL_INPUT(I_CH0, 1)
- //CLOCK(I_CH0, 2.2 )
+ //CLOCK(I_CH0, 2.2 )
TTL_INPUT(I_OH0, 1)
//CLOCK(I_OH0, 1.0)
ANALOG_INPUT(I_MSM2K0, 0)
diff --git a/src/mame/audio/nl_kidniki.c b/src/mame/audio/nl_kidniki.c
index 57abca3176b..5eaea584553 100644
--- a/src/mame/audio/nl_kidniki.c
+++ b/src/mame/audio/nl_kidniki.c
@@ -312,68 +312,68 @@ NETLIST_END()
NETLIST_START(opamp)
- /* Opamp model from
- *
- * http://www.ecircuitcenter.com/Circuits/opmodel1/opmodel1.htm
- *
- * Bandwidth 1Mhz
- *
- */
+ /* Opamp model from
+ *
+ * http://www.ecircuitcenter.com/Circuits/opmodel1/opmodel1.htm
+ *
+ * Bandwidth 1Mhz
+ *
+ */
- /* Terminal definitions for calling netlists */
+ /* Terminal definitions for calling netlists */
- ALIAS(PLUS, G1.IP) // Positive input
- ALIAS(MINUS, G1.IN) // Negative input
- ALIAS(OUT, EBUF.OP) // Opamp output ...
+ ALIAS(PLUS, G1.IP) // Positive input
+ ALIAS(MINUS, G1.IN) // Negative input
+ ALIAS(OUT, EBUF.OP) // Opamp output ...
- ALIAS(GND, EBUF.ON) // GND terminal
- ALIAS(VCC, DUMMY.I) // VCC terminal
- DUMMY_INPUT(DUMMY)
+ ALIAS(GND, EBUF.ON) // GND terminal
+ ALIAS(VCC, DUMMY.I) // VCC terminal
+ DUMMY_INPUT(DUMMY)
- /* The opamp model */
+ /* The opamp model */
- VCCS(G1)
- PARAM(G1.RI, RES_K(1000))
+ VCCS(G1)
+ PARAM(G1.RI, RES_K(1000))
#if 1
- PARAM(G1.G, 100) // typical OP-AMP amplification 100 * 1000 = 100000
- RES(RP1, 1000)
- CAP(CP1, 1.59e-5) // <== change to 1.59e-3 for 10Khz bandwidth
+ PARAM(G1.G, 100) // typical OP-AMP amplification 100 * 1000 = 100000
+ RES(RP1, 1000)
+ CAP(CP1, 1.59e-5) // <== change to 1.59e-3 for 10Khz bandwidth
#else
- PARAM(G1.G, 1) // typical OP-AMP amplification 100 * 1000 = 100000
- RES(RP1, 100000)
- CAP(CP1, 1.59e-7) // <== change to 1.59e-3 for 10Khz bandwidth
+ PARAM(G1.G, 1) // typical OP-AMP amplification 100 * 1000 = 100000
+ RES(RP1, 100000)
+ CAP(CP1, 1.59e-7) // <== change to 1.59e-3 for 10Khz bandwidth
#endif
- VCVS(EBUF)
- PARAM(EBUF.RO, 50)
- PARAM(EBUF.G, 1)
+ VCVS(EBUF)
+ PARAM(EBUF.RO, 50)
+ PARAM(EBUF.G, 1)
// PARAM(EBUF.RI, 1e20)
// NET_C(EBUF.ON, GND)
- NET_C(G1.ON, GND)
- NET_C(RP1.2, GND)
- NET_C(CP1.2, GND)
- NET_C(EBUF.IN, GND)
+ NET_C(G1.ON, GND)
+ NET_C(RP1.2, GND)
+ NET_C(CP1.2, GND)
+ NET_C(EBUF.IN, GND)
- NET_C(RP1.1, G1.OP)
- NET_C(CP1.1, RP1.1)
+ NET_C(RP1.1, G1.OP)
+ NET_C(CP1.1, RP1.1)
- DIODE(DP,"1N914")
- DIODE(DN,"1N914")
+ DIODE(DP,"1N914")
+ DIODE(DN,"1N914")
- NET_C(DP.K, VCC)
+ NET_C(DP.K, VCC)
#if 1
- NET_C(DP.A, DN.K, RP1.1)
+ NET_C(DP.A, DN.K, RP1.1)
#else
- RES(RDP, 1000)
- RES(RDN, 1000)
- NET_C(RDP.1, DP.A)
- NET_C(RDN.1, DN.K)
- NET_C(RDP.2, RDN.2, RP1.1)
+ RES(RDP, 1000)
+ RES(RDN, 1000)
+ NET_C(RDP.1, DP.A)
+ NET_C(RDN.1, DN.K)
+ NET_C(RDP.2, RDN.2, RP1.1)
#endif
- NET_C(DN.A, GND)
+ NET_C(DN.A, GND)
- NET_C(EBUF.IP, RP1.1)
+ NET_C(EBUF.IP, RP1.1)
NETLIST_END()
diff --git a/src/mame/drivers/aleisttl.c b/src/mame/drivers/aleisttl.c
index 1192b740f2f..3f2fca3b479 100644
--- a/src/mame/drivers/aleisttl.c
+++ b/src/mame/drivers/aleisttl.c
@@ -7,7 +7,7 @@
Chase (aka Chase1) (1976)
Deluxe Soccer (1973)
Fire Power (1975)
- Fütsball (1975)
+ F??tsball (1975)
Galaxy Raider (1974)
Hesitation (1974) AL-6500?
Hockey, Soccer, Tennis (1974)
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index 42c890e542d..a6a36ea55b0 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -569,26 +569,26 @@ ROM_END
ROM_START( bioniccbl )
ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */
- ROM_LOAD16_BYTE( "02l.bin", 0x00000, 0x10000, CRC(b2fe1ddb) SHA1(892f19124993add96edabdba3aafeecc6668c5d9) )
- ROM_LOAD16_BYTE( "03l.bin", 0x00001, 0x10000, CRC(427a003d) SHA1(5a379fe2942e5565810939d5eb843003226222cc) )
- ROM_LOAD16_BYTE( "02u.bin", 0x20000, 0x10000, CRC(27f04bb6) SHA1(41d17b84b34dc8b2e5dfa67794a8df3e898b740b) )
- ROM_LOAD16_BYTE( "03u.bin", 0x20001, 0x10000, CRC(c01547b1) SHA1(563bf6be4f10f5e6eb5b562266accf168f62bf30) )
+ ROM_LOAD16_BYTE( "02l.bin", 0x00000, 0x10000, CRC(b2fe1ddb) SHA1(892f19124993add96edabdba3aafeecc6668c5d9) )
+ ROM_LOAD16_BYTE( "03l.bin", 0x00001, 0x10000, CRC(427a003d) SHA1(5a379fe2942e5565810939d5eb843003226222cc) )
+ ROM_LOAD16_BYTE( "02u.bin", 0x20000, 0x10000, CRC(27f04bb6) SHA1(41d17b84b34dc8b2e5dfa67794a8df3e898b740b) )
+ ROM_LOAD16_BYTE( "03u.bin", 0x20001, 0x10000, CRC(c01547b1) SHA1(563bf6be4f10f5e6eb5b562266accf168f62bf30) )
ROM_REGION( 0x10000, "audiocpu", 0 )
- ROM_LOAD( "01.bin", 0x00000, 0x8000, CRC(8ea07917) SHA1(e9ace70d89482fc3669860450a41aacacbee9083) )
+ ROM_LOAD( "01.bin", 0x00000, 0x8000, CRC(8ea07917) SHA1(e9ace70d89482fc3669860450a41aacacbee9083) )
ROM_REGION( 0x1000, "mcu", 0 ) /* i8751 microcontroller */
ROM_LOAD( "c8751h-88", 0x0000, 0x1000, NO_DUMP ) // 19.bin (protected)
ROM_REGION( 0x08000, "gfx1", 0 )
- ROM_LOAD( "06.bin", 0x00000, 0x4000, CRC(4e6b81d9) SHA1(052784d789b0c9193edf218fa1883b6e3b7df988) )
+ ROM_LOAD( "06.bin", 0x00000, 0x4000, CRC(4e6b81d9) SHA1(052784d789b0c9193edf218fa1883b6e3b7df988) )
ROM_REGION( 0x10000, "gfx2", 0 )
- ROM_LOAD( "05.bin", 0x00000, 0x8000, CRC(9bf8dc7f) SHA1(539a52087ed1f58839b6aa8c0b5ed249f4f4041e) )
- ROM_LOAD( "04.bin", 0x08000, 0x8000, CRC(1b43bf63) SHA1(b80d675a07cebd83daf202d1c3d3f7c2dedf5c30) )
+ ROM_LOAD( "05.bin", 0x00000, 0x8000, CRC(9bf8dc7f) SHA1(539a52087ed1f58839b6aa8c0b5ed249f4f4041e) )
+ ROM_LOAD( "04.bin", 0x08000, 0x8000, CRC(1b43bf63) SHA1(b80d675a07cebd83daf202d1c3d3f7c2dedf5c30) )
ROM_REGION( 0x40000, "gfx3", 0 )
- ROM_LOAD( "ts_12.17f", 0x00000, 0x8000, CRC(e4b4619e) SHA1(3bec8399ffb28fd50ce6ae88d90b091eadf8bda1) ) // 09.bin
+ ROM_LOAD( "ts_12.17f", 0x00000, 0x8000, CRC(e4b4619e) SHA1(3bec8399ffb28fd50ce6ae88d90b091eadf8bda1) ) // 09.bin
ROM_LOAD( "ts_11.15f", 0x08000, 0x8000, CRC(ab30237a) SHA1(ea6c07df992ba48f9eca7daa4ea775faa94358d2) ) // 08.bin
ROM_LOAD( "ts_17.17g", 0x10000, 0x8000, CRC(deb657e4) SHA1(b36b468f9bbb7a4937286230d3f6caa14c61d4dd) ) // 13.bin
ROM_LOAD( "ts_16.15g", 0x18000, 0x8000, CRC(d363b5f9) SHA1(1dd3991d99db2d6bcbdb12879ba50a01fef95004) ) // 12.bin
@@ -598,10 +598,10 @@ ROM_START( bioniccbl )
ROM_LOAD( "ts_24.18k", 0x38000, 0x8000, CRC(f156e564) SHA1(a6cad05bcc6d9ded6294f9b5aa856d05641aed02) ) // 18.bin
ROM_REGION( 0x40000, "gfx4", 0 )
- ROM_LOAD( "07.bin", 0x00000, 0x10000, CRC(a0e78996) SHA1(810a54e657c0faaff6a8494acaf803d1d2151893) )
- ROM_LOAD( "11.bin", 0x10000, 0x10000, CRC(37cb11c2) SHA1(af8c2ae4bb6e6c13ea3e8b7c96e5b18f1eb1d5a5) )
- ROM_LOAD( "15.bin", 0x20000, 0x10000, CRC(4e0354ce) SHA1(d3256c891b44c6593b0b44c0d0a3e754ce78c1cb) )
- ROM_LOAD( "16.bin", 0x30000, 0x10000, CRC(ac89e5cc) SHA1(aa7e065ece6d25b7e83fadcd22c09e1f7dc0b86f) )
+ ROM_LOAD( "07.bin", 0x00000, 0x10000, CRC(a0e78996) SHA1(810a54e657c0faaff6a8494acaf803d1d2151893) )
+ ROM_LOAD( "11.bin", 0x10000, 0x10000, CRC(37cb11c2) SHA1(af8c2ae4bb6e6c13ea3e8b7c96e5b18f1eb1d5a5) )
+ ROM_LOAD( "15.bin", 0x20000, 0x10000, CRC(4e0354ce) SHA1(d3256c891b44c6593b0b44c0d0a3e754ce78c1cb) )
+ ROM_LOAD( "16.bin", 0x30000, 0x10000, CRC(ac89e5cc) SHA1(aa7e065ece6d25b7e83fadcd22c09e1f7dc0b86f) )
ROM_REGION( 0x0100, "proms", 0 )
ROM_LOAD( "63s141.18f", 0x0000, 0x0100, CRC(b58d0023) SHA1(e8a4a2e2951bf73b3d9eed6957e9ee1e61c9c58a) ) /* priority (not used), Labeled "TSB" */
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index d0d4b25363e..b3162d5b532 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -2367,7 +2367,7 @@ ROM_END
DRIVER_INIT_MEMBER(cclimber_state,yamato)
{
yamato_decode(machine(),"maincpu");
-
+
save_item(NAME(m_yamato_p0));
save_item(NAME(m_yamato_p1));
}
@@ -2376,7 +2376,7 @@ DRIVER_INIT_MEMBER(cclimber_state,yamato)
DRIVER_INIT_MEMBER(cclimber_state,toprollr)
{
toprollr_decode(machine(), "maincpu", "user1");
-
+
save_item(NAME(m_toprollr_rombank));
}
diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c
index 78fdc8f0238..70f99cb2d77 100644
--- a/src/mame/drivers/chsuper.c
+++ b/src/mame/drivers/chsuper.c
@@ -135,21 +135,21 @@ WRITE8_MEMBER( chsuper_state::chsuper_vram_w )
*/
-WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh
+WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh
{
coin_counter_w(machine(), 0, data & 0x01); // Coin counter
- output_set_lamp_value(0, (data >> 1) & 1); // Hold 1 / Black (Nero) lamp.
- coin_counter_w(machine(), 1, data & 0x04); // Payout / Ticket Out pulse
- output_set_lamp_value(1, (data >> 3) & 1); // Hold 2 / Low (Bassa) lamp.
+ output_set_lamp_value(0, (data >> 1) & 1); // Hold 1 / Black (Nero) lamp.
+ coin_counter_w(machine(), 1, data & 0x04); // Payout / Ticket Out pulse
+ output_set_lamp_value(1, (data >> 3) & 1); // Hold 2 / Low (Bassa) lamp.
// D4: unused...
- output_set_lamp_value(5, (data >> 5) & 1); // BET lamp
+ output_set_lamp_value(5, (data >> 5) & 1); // BET lamp
// D6: ticket motor...
// D7: unused...
/* Workaround to get the HOLD 3 lamp line active,
from the HOLD 1 and HOLD 5 lamps status...
*/
- m_blacklamp = (data >> 1) & 1; // latching the BLACK lamp status...
+ m_blacklamp = (data >> 1) & 1; // latching the BLACK lamp status...
if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON...
{
@@ -161,29 +161,29 @@ WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh
}
}
-WRITE8_MEMBER( chsuper_state::chsuper_outportb_w ) // Port EFh
+WRITE8_MEMBER( chsuper_state::chsuper_outportb_w ) // Port EFh
{
// D0: unknown...
// D1: unused...
- output_set_lamp_value(3, (data >> 2) & 1); // Hold 4 / High (Alta) lamp.
+ output_set_lamp_value(3, (data >> 2) & 1); // Hold 4 / High (Alta) lamp.
// D3: unused...
// D4: unused...
- output_set_lamp_value(4, (data >> 5) & 1); // Hold 5 / Red (Rosso) / Gamble (Raddoppio) lamp.
- output_set_lamp_value(6, (data >> 6) & 1); // Start / Gamble (Raddoppio) lamp.
+ output_set_lamp_value(4, (data >> 5) & 1); // Hold 5 / Red (Rosso) / Gamble (Raddoppio) lamp.
+ output_set_lamp_value(6, (data >> 6) & 1); // Start / Gamble (Raddoppio) lamp.
// D7: unused...
/* Workaround to get the HOLD 3 lamp line active,
from the HOLD 1 and HOLD 5 lamps status...
*/
- m_redlamp = (data >> 5) & 1; // latching the RED lamp status...
+ m_redlamp = (data >> 5) & 1; // latching the RED lamp status...
- if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON...
+ if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON...
{
- output_set_lamp_value(2, 1); // Hold 3 ON
+ output_set_lamp_value(2, 1); // Hold 3 ON
}
else
{
- output_set_lamp_value(2, 0); // Hold 3 OFF
+ output_set_lamp_value(2, 0); // Hold 3 OFF
}
}
@@ -208,7 +208,7 @@ static ADDRESS_MAP_START( chsuper_portmap, AS_IO, 8, chsuper_state )
AM_RANGE( 0x00fc, 0x00fc ) AM_DEVWRITE("ramdac", ramdac_device, index_w)
AM_RANGE( 0x00fd, 0x00fd ) AM_DEVWRITE("ramdac", ramdac_device, pal_w)
AM_RANGE( 0x00fe, 0x00fe ) AM_DEVWRITE("ramdac", ramdac_device, mask_w)
- AM_RANGE( 0x8300, 0x8300 ) AM_READ_PORT("IN2") // valid input port present in test mode.
+ AM_RANGE( 0x8300, 0x8300 ) AM_READ_PORT("IN2") // valid input port present in test mode.
AM_RANGE( 0xff20, 0xff3f ) AM_DEVWRITE("dac", dac_device, write_unsigned8) // unk writes
ADDRESS_MAP_END
@@ -263,7 +263,7 @@ static INPUT_PORTS_START( chsuper )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W) PORT_NAME("IN1-3")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E) PORT_NAME("IN1-4")
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_R) PORT_NAME("IN1-5")
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) // ticket-in in chmpnum
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) // ticket-in in chmpnum
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_T) PORT_NAME("IN1-7")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) // ticket out / payout in chsuper2
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 17379f137f3..ba14b7a932a 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -7,7 +7,7 @@
Dark Seal (Rev 4) (c) 1990 Data East Corporation (Japanese version)
Gate Of Doom (Rev 4) (c) 1990 Data East Corporation (USA version)
Gate of Doom (Rev 1) (c) 1990 Data East Corporation (USA version)
-
+
Board: DE-0332-2
Emulation by Bryan McPhail, mish@tendril.co.uk
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index 0fb97421ae6..9a68c8193b9 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -1621,28 +1621,28 @@ ROM_START( fantsia2a )
ROM_END
/* sole change seems to be copyright date, PCB has chip references instead of grid references. Not correcting all labels in other sets in case these are legitimate labels */
-ROM_START( fantsia2n )
- ROM_REGION( 0x500000, "maincpu", 0 ) /* 68000 code */
- ROM_LOAD16_BYTE( "prog2.g17", 0x000000, 0x80000, CRC(57c59972) SHA1(4b1da928b537cf340a67026d07bc3dfc078b0d0f) )
- ROM_LOAD16_BYTE( "prog1.f17", 0x000001, 0x80000, CRC(bf2d9a26) SHA1(92f0c1bd32f1e5e0ede3ba847242a212dfae4986) )
- ROM_LOAD16_BYTE( "scr2.g16", 0x100000, 0x80000, CRC(887b1bc5) SHA1(b6fcdc8a56ea25758f363224d256e9b6c8e30244) )
- ROM_LOAD16_BYTE( "scr1.f16", 0x100001, 0x80000, CRC(cbba3182) SHA1(a484819940fa1ef18ce679465c31075798748bac) )
- ROM_LOAD16_BYTE( "scr4.g15", 0x200000, 0x80000, CRC(ce97e411) SHA1(be0ed41362db03f384229c708f2ba4146e5cb501) )
- ROM_LOAD16_BYTE( "scr3.f15", 0x200001, 0x80000, CRC(480cc2e8) SHA1(38fe57ba1e34537f8be65fcc023ccd43369a5d94) )
- ROM_LOAD16_BYTE( "scr6.g14", 0x300000, 0x80000, CRC(b29d49de) SHA1(854b76755acf58fb8a4648a0ce72ea6bdf26c555) )
- ROM_LOAD16_BYTE( "scr5.f14", 0x300001, 0x80000, CRC(d5f88b83) SHA1(518a1f6732149f2851bbedca61f7313c39beb91b) )
- ROM_LOAD16_BYTE( "scr8.g20", 0x400000, 0x80000, CRC(694ae2b3) SHA1(82b7a565290fce07c8393af4718fd1e6136928e9) )
- ROM_LOAD16_BYTE( "scr7.f20", 0x400001, 0x80000, CRC(6068712c) SHA1(80a136d76dca566772e34d832ac11b8c7d6ce9ab) )
-
- ROM_REGION( 0x100000, "gfx1", 0 ) /* sprites */
- ROM_LOAD( "23_OBJ1.U5", 0x00000, 0x80000, CRC(b45c9234) SHA1(b5eeec91b9c6952b338130458405997e1a51bf2f) )
- ROM_LOAD( "obj2.2i", 0x80000, 0x80000, CRC(ea6e3861) SHA1(463b40f5441231a0451571a0b8afe1ed0fd4b164) )
-
- ROM_REGION( 0x140000, "oki", 0 ) /* OKIM6295 samples */
- /* 00000-2ffff is fixed, 30000-3ffff is bank switched from all the ROMs */
- ROM_LOAD( "music2.1b", 0x00000, 0x80000, CRC(23cc4f9c) SHA1(06b5342c25de966ce590917c571e5b19af1fef7d) )
- ROM_RELOAD( 0x40000, 0x80000 )
- ROM_LOAD( "music1.1a", 0xc0000, 0x80000, CRC(864167c2) SHA1(c454b26b6dea993e6bd64546f92beef05e46d7d7) )
+ROM_START( fantsia2n )
+ ROM_REGION( 0x500000, "maincpu", 0 ) /* 68000 code */
+ ROM_LOAD16_BYTE( "prog2.g17", 0x000000, 0x80000, CRC(57c59972) SHA1(4b1da928b537cf340a67026d07bc3dfc078b0d0f) )
+ ROM_LOAD16_BYTE( "prog1.f17", 0x000001, 0x80000, CRC(bf2d9a26) SHA1(92f0c1bd32f1e5e0ede3ba847242a212dfae4986) )
+ ROM_LOAD16_BYTE( "scr2.g16", 0x100000, 0x80000, CRC(887b1bc5) SHA1(b6fcdc8a56ea25758f363224d256e9b6c8e30244) )
+ ROM_LOAD16_BYTE( "scr1.f16", 0x100001, 0x80000, CRC(cbba3182) SHA1(a484819940fa1ef18ce679465c31075798748bac) )
+ ROM_LOAD16_BYTE( "scr4.g15", 0x200000, 0x80000, CRC(ce97e411) SHA1(be0ed41362db03f384229c708f2ba4146e5cb501) )
+ ROM_LOAD16_BYTE( "scr3.f15", 0x200001, 0x80000, CRC(480cc2e8) SHA1(38fe57ba1e34537f8be65fcc023ccd43369a5d94) )
+ ROM_LOAD16_BYTE( "scr6.g14", 0x300000, 0x80000, CRC(b29d49de) SHA1(854b76755acf58fb8a4648a0ce72ea6bdf26c555) )
+ ROM_LOAD16_BYTE( "scr5.f14", 0x300001, 0x80000, CRC(d5f88b83) SHA1(518a1f6732149f2851bbedca61f7313c39beb91b) )
+ ROM_LOAD16_BYTE( "scr8.g20", 0x400000, 0x80000, CRC(694ae2b3) SHA1(82b7a565290fce07c8393af4718fd1e6136928e9) )
+ ROM_LOAD16_BYTE( "scr7.f20", 0x400001, 0x80000, CRC(6068712c) SHA1(80a136d76dca566772e34d832ac11b8c7d6ce9ab) )
+
+ ROM_REGION( 0x100000, "gfx1", 0 ) /* sprites */
+ ROM_LOAD( "23_OBJ1.U5", 0x00000, 0x80000, CRC(b45c9234) SHA1(b5eeec91b9c6952b338130458405997e1a51bf2f) )
+ ROM_LOAD( "obj2.2i", 0x80000, 0x80000, CRC(ea6e3861) SHA1(463b40f5441231a0451571a0b8afe1ed0fd4b164) )
+
+ ROM_REGION( 0x140000, "oki", 0 ) /* OKIM6295 samples */
+ /* 00000-2ffff is fixed, 30000-3ffff is bank switched from all the ROMs */
+ ROM_LOAD( "music2.1b", 0x00000, 0x80000, CRC(23cc4f9c) SHA1(06b5342c25de966ce590917c571e5b19af1fef7d) )
+ ROM_RELOAD( 0x40000, 0x80000 )
+ ROM_LOAD( "music1.1a", 0xc0000, 0x80000, CRC(864167c2) SHA1(c454b26b6dea993e6bd64546f92beef05e46d7d7) )
ROM_END
ROM_START( wownfant)
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index 6f679b567cd..29c03b69b77 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -499,7 +499,7 @@ void gaplus_state::machine_start()
m_namco56xx = machine().device<namco56xx_device>("namcoio_2");
break;
}
-
+
save_item(NAME(m_main_irq_mask));
save_item(NAME(m_sub_irq_mask));
save_item(NAME(m_sub2_irq_mask));
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 62f219edcec..51d4291ef4d 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -11055,7 +11055,7 @@ ROM_START( nc96e )
ROM_REGION( 0x200, "proms", 0 ) // palette
ROM_LOAD( "82s129a.u84", 0x0000, 0x0100, CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) )
ROM_LOAD( "82s129a.u79", 0x0100, 0x0100, CRC(05224f73) SHA1(051c3ee9c63f5436e4f6c355fc308f37910a88ef) )
-
+
ROM_REGION( 0x80000, "oki", ROMREGION_ERASEFF ) // samples
// none?
ROM_END
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 9868e367ba2..099ab8690d8 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -412,50 +412,50 @@ ROM_START( gradius3j )
ROM_END
ROM_START( gradius3js )
- ROM_REGION( 0x40000, "maincpu", 0 )
- ROM_LOAD16_BYTE( "945_s13.f15", 0x00000, 0x20000, CRC(70c240a2) SHA1(82dc391572e1f61b0182cb031654d71adcdd5f6e) )
- ROM_LOAD16_BYTE( "945_s12.e15", 0x00001, 0x20000, CRC(bbc300d4) SHA1(e1ca98bc591575285d7bd2d4fefdf35fed10dcb6) )
-
- ROM_REGION( 0x100000, "sub", 0 )
- ROM_LOAD16_BYTE( "945_m09.r17", 0x000000, 0x20000, CRC(b4a6df25) SHA1(85533cf140d28f6f81c0b49b8061bda0924a613a) )
- ROM_LOAD16_BYTE( "945_m08.n17", 0x000001, 0x20000, CRC(74e981d2) SHA1(e7b47a2da01ff73293d2100c48fdf00b33125af5) )
- ROM_LOAD16_BYTE( "945_l06b.r11", 0x040000, 0x20000, CRC(83772304) SHA1(a90c75a3de670b6ec5e0fc201876d463b4a76766) )
- ROM_LOAD16_BYTE( "945_l06a.n11", 0x040001, 0x20000, CRC(e1fd75b6) SHA1(6160d80a2f1bf550e85d6253cf521a96f5a644cc) )
- ROM_LOAD16_BYTE( "945_l07c.r15", 0x080000, 0x20000, CRC(c1e399b6) SHA1(e95bd478dd3beea0175bf9ee4cededb111c4ace1) )
- ROM_LOAD16_BYTE( "945_l07a.n15", 0x080001, 0x20000, CRC(96222d04) SHA1(b55700f683a556b0e73dbac9c7b4ce485420d21c) )
- ROM_LOAD16_BYTE( "945_l07d.r13", 0x0c0000, 0x20000, CRC(4c16d4bd) SHA1(01dcf169b78a1e495214b10181401d1920b0c924) )
- ROM_LOAD16_BYTE( "945_l07b.n13", 0x0c0001, 0x20000, CRC(5e209d01) SHA1(0efa1bbfdc7e2ba1e0bb96245e2bfe961258b446) )
-
- ROM_REGION( 0x10000, "audiocpu", 0 )
- ROM_LOAD( "945_m05.d9", 0x00000, 0x10000, CRC(c8c45365) SHA1(b9a7b736b52bca42c7b8c8ed64c8df73e0116158) )
-
- ROM_REGION( 0x200000, "k051960", 0 ) /* graphics (addressable by the main CPU) */
+ ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_LOAD16_BYTE( "945_s13.f15", 0x00000, 0x20000, CRC(70c240a2) SHA1(82dc391572e1f61b0182cb031654d71adcdd5f6e) )
+ ROM_LOAD16_BYTE( "945_s12.e15", 0x00001, 0x20000, CRC(bbc300d4) SHA1(e1ca98bc591575285d7bd2d4fefdf35fed10dcb6) )
+
+ ROM_REGION( 0x100000, "sub", 0 )
+ ROM_LOAD16_BYTE( "945_m09.r17", 0x000000, 0x20000, CRC(b4a6df25) SHA1(85533cf140d28f6f81c0b49b8061bda0924a613a) )
+ ROM_LOAD16_BYTE( "945_m08.n17", 0x000001, 0x20000, CRC(74e981d2) SHA1(e7b47a2da01ff73293d2100c48fdf00b33125af5) )
+ ROM_LOAD16_BYTE( "945_l06b.r11", 0x040000, 0x20000, CRC(83772304) SHA1(a90c75a3de670b6ec5e0fc201876d463b4a76766) )
+ ROM_LOAD16_BYTE( "945_l06a.n11", 0x040001, 0x20000, CRC(e1fd75b6) SHA1(6160d80a2f1bf550e85d6253cf521a96f5a644cc) )
+ ROM_LOAD16_BYTE( "945_l07c.r15", 0x080000, 0x20000, CRC(c1e399b6) SHA1(e95bd478dd3beea0175bf9ee4cededb111c4ace1) )
+ ROM_LOAD16_BYTE( "945_l07a.n15", 0x080001, 0x20000, CRC(96222d04) SHA1(b55700f683a556b0e73dbac9c7b4ce485420d21c) )
+ ROM_LOAD16_BYTE( "945_l07d.r13", 0x0c0000, 0x20000, CRC(4c16d4bd) SHA1(01dcf169b78a1e495214b10181401d1920b0c924) )
+ ROM_LOAD16_BYTE( "945_l07b.n13", 0x0c0001, 0x20000, CRC(5e209d01) SHA1(0efa1bbfdc7e2ba1e0bb96245e2bfe961258b446) )
+
+ ROM_REGION( 0x10000, "audiocpu", 0 )
+ ROM_LOAD( "945_m05.d9", 0x00000, 0x10000, CRC(c8c45365) SHA1(b9a7b736b52bca42c7b8c8ed64c8df73e0116158) )
+
+ ROM_REGION( 0x200000, "k051960", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD32_BYTE( "945_A02A.K2", 0x000000, 0x20000, CRC(fbb81511) SHA1(e7988d52e323e46117f5080c469daf9b119f28a0) )
- ROM_LOAD32_BYTE( "945_A02C.M2", 0x000001, 0x20000, CRC(031b55e8) SHA1(64ed8dee60bf012df7c1ed496af1c75263c052a6) )
- ROM_LOAD32_BYTE( "945_A01A.E2", 0x000002, 0x20000, CRC(bace5abb) SHA1(b32df63294c0730f463335b1b760494389c60062) )
- ROM_LOAD32_BYTE( "945_A01C.H2", 0x000003, 0x20000, CRC(d91b29a6) SHA1(0c3027a08996f4c2b86dd88695241b21c8dffd64) )
- ROM_LOAD32_BYTE( "945_A02B.K4", 0x080000, 0x20000, CRC(c0fed4ab) SHA1(f01975b13759cae7c8dfd24f9b3f4ac960d32957) )
- ROM_LOAD32_BYTE( "945_A02D.M4", 0x080001, 0x20000, CRC(d462817c) SHA1(00137e38454e7c3548a1a9553c5ee644916b3959) )
- ROM_LOAD32_BYTE( "945_A01B.E4", 0x080002, 0x20000, CRC(b426090e) SHA1(06a671a648e3255146fe0c325d5451d4f75f08aa) )
- ROM_LOAD32_BYTE( "945_A01D.H4", 0x080003, 0x20000, CRC(3990c09a) SHA1(1f6a089c1d03fb95d4d96fecc0379bde26ee2b9d) )
-
- ROM_LOAD32_BYTE( "945_l04a.k6", 0x100000, 0x20000, CRC(884e21ee) SHA1(ce86dd3a06775e5b1aa09db010dcb674e67828e7) )
- ROM_LOAD32_BYTE( "945_l04c.m6", 0x100001, 0x20000, CRC(45bcd921) SHA1(e51a8a71362a6fb55124aa1dce74519c0a3c6e3f) )
- ROM_LOAD32_BYTE( "945_l03a.e6", 0x100002, 0x20000, CRC(a67ef087) SHA1(fd63474f3bbde5dfc53ed4c1db25d6411a8b54d2) )
- ROM_LOAD32_BYTE( "945_l03c.h6", 0x100003, 0x20000, CRC(a56be17a) SHA1(1d387736144c30fcb5de54235331ab1ff70c356e) )
- ROM_LOAD32_BYTE( "945_l04b.k8", 0x180000, 0x20000, CRC(843bc67d) SHA1(cdf8421083f24ab27867ed5d08d8949da192b2b9) )
- ROM_LOAD32_BYTE( "945_l04d.m8", 0x180001, 0x20000, CRC(0a98d08e) SHA1(1e0ca51a2d45c01fa3f11950ddd387f41ddae691) )
- ROM_LOAD32_BYTE( "945_l03b.e8", 0x180002, 0x20000, CRC(933e68b9) SHA1(f3a39446ca77d17fdbd938bd5f718ae9d5570879) )
- ROM_LOAD32_BYTE( "945_l03d.h8", 0x180003, 0x20000, CRC(f375e87b) SHA1(6427b966795c907c8e516244872fe52217da62c4) )
-
- ROM_REGION( 0x0100, "proms", 0 )
- ROM_LOAD( "945l14.j28", 0x0000, 0x0100, CRC(c778c189) SHA1(847eaf379ba075c25911c6f83dd63ff390534f60) ) /* priority encoder (not used) */
-
- ROM_REGION( 0x80000, "k007232", 0 ) /* 007232 samples */
+ ROM_LOAD32_BYTE( "945_A02C.M2", 0x000001, 0x20000, CRC(031b55e8) SHA1(64ed8dee60bf012df7c1ed496af1c75263c052a6) )
+ ROM_LOAD32_BYTE( "945_A01A.E2", 0x000002, 0x20000, CRC(bace5abb) SHA1(b32df63294c0730f463335b1b760494389c60062) )
+ ROM_LOAD32_BYTE( "945_A01C.H2", 0x000003, 0x20000, CRC(d91b29a6) SHA1(0c3027a08996f4c2b86dd88695241b21c8dffd64) )
+ ROM_LOAD32_BYTE( "945_A02B.K4", 0x080000, 0x20000, CRC(c0fed4ab) SHA1(f01975b13759cae7c8dfd24f9b3f4ac960d32957) )
+ ROM_LOAD32_BYTE( "945_A02D.M4", 0x080001, 0x20000, CRC(d462817c) SHA1(00137e38454e7c3548a1a9553c5ee644916b3959) )
+ ROM_LOAD32_BYTE( "945_A01B.E4", 0x080002, 0x20000, CRC(b426090e) SHA1(06a671a648e3255146fe0c325d5451d4f75f08aa) )
+ ROM_LOAD32_BYTE( "945_A01D.H4", 0x080003, 0x20000, CRC(3990c09a) SHA1(1f6a089c1d03fb95d4d96fecc0379bde26ee2b9d) )
+
+ ROM_LOAD32_BYTE( "945_l04a.k6", 0x100000, 0x20000, CRC(884e21ee) SHA1(ce86dd3a06775e5b1aa09db010dcb674e67828e7) )
+ ROM_LOAD32_BYTE( "945_l04c.m6", 0x100001, 0x20000, CRC(45bcd921) SHA1(e51a8a71362a6fb55124aa1dce74519c0a3c6e3f) )
+ ROM_LOAD32_BYTE( "945_l03a.e6", 0x100002, 0x20000, CRC(a67ef087) SHA1(fd63474f3bbde5dfc53ed4c1db25d6411a8b54d2) )
+ ROM_LOAD32_BYTE( "945_l03c.h6", 0x100003, 0x20000, CRC(a56be17a) SHA1(1d387736144c30fcb5de54235331ab1ff70c356e) )
+ ROM_LOAD32_BYTE( "945_l04b.k8", 0x180000, 0x20000, CRC(843bc67d) SHA1(cdf8421083f24ab27867ed5d08d8949da192b2b9) )
+ ROM_LOAD32_BYTE( "945_l04d.m8", 0x180001, 0x20000, CRC(0a98d08e) SHA1(1e0ca51a2d45c01fa3f11950ddd387f41ddae691) )
+ ROM_LOAD32_BYTE( "945_l03b.e8", 0x180002, 0x20000, CRC(933e68b9) SHA1(f3a39446ca77d17fdbd938bd5f718ae9d5570879) )
+ ROM_LOAD32_BYTE( "945_l03d.h8", 0x180003, 0x20000, CRC(f375e87b) SHA1(6427b966795c907c8e516244872fe52217da62c4) )
+
+ ROM_REGION( 0x0100, "proms", 0 )
+ ROM_LOAD( "945l14.j28", 0x0000, 0x0100, CRC(c778c189) SHA1(847eaf379ba075c25911c6f83dd63ff390534f60) ) /* priority encoder (not used) */
+
+ ROM_REGION( 0x80000, "k007232", 0 ) /* 007232 samples */
ROM_LOAD( "945_A10A.C14", 0x00000, 0x20000, CRC(ec717414) SHA1(8c63d5fe01d0833529fca91bc80cdbd8a04174c0) )
ROM_LOAD( "945_A10B.C16", 0x20000, 0x20000, CRC(709e30e4) SHA1(27fcea720cd2498f1870c9290d30dcb3dd81d5e5) )
- ROM_LOAD( "945_l11a.c18", 0x40000, 0x20000, CRC(6043f4eb) SHA1(1c2e9ace1cfdde504b7b6158e3c3f54dc5ae33d4) )
- ROM_LOAD( "945_l11b.c20", 0x60000, 0x20000, CRC(89ea3baf) SHA1(8edcbaa7969185cfac48c02559826d1b8b081f3f) )
+ ROM_LOAD( "945_l11a.c18", 0x40000, 0x20000, CRC(6043f4eb) SHA1(1c2e9ace1cfdde504b7b6158e3c3f54dc5ae33d4) )
+ ROM_LOAD( "945_l11b.c20", 0x60000, 0x20000, CRC(89ea3baf) SHA1(8edcbaa7969185cfac48c02559826d1b8b081f3f) )
ROM_END
ROM_START( gradius3a )
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index d10424246a8..216a17ad5f0 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -91,7 +91,7 @@ void grchamp_state::machine_start()
save_item(NAME(m_collmode));
}
- void grchamp_state::machine_reset()
+ void grchamp_state::machine_reset()
{
/* if the coin system is 1 way, lock Coin B (Page 40) */
coin_lockout_w(machine(), 1, (ioport("DSWB")->read() & 0x10) ? 1 : 0);
diff --git a/src/mame/drivers/jankenmn.c b/src/mame/drivers/jankenmn.c
index 2f70aaaac9b..580e3ad2353 100644
--- a/src/mame/drivers/jankenmn.c
+++ b/src/mame/drivers/jankenmn.c
@@ -263,7 +263,7 @@ ADDRESS_MAP_END
/*
Writes to port 30h....
-
+
They are coming from different code chunks, but seems that at least
they have different functions. Writes from 00B6h are unknown, whilst
others coming from 00D6h are counters. Sometimes whilst one increase,
@@ -276,7 +276,7 @@ ADDRESS_MAP_END
is written to the port. Maybe is a leftover, or just a connector to
hook the multiplier's 'roulette style' matrix lamps for other Janken
Man games...
-
+
':maincpu' (00B6): unmapped io memory write to 0030 = 01 & FF
':maincpu' (00D6): unmapped io memory write to 0030 = 2F & FF
':maincpu' (0103): unmapped io memory write to 0030 = 00 & FF
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index 6ddf475901f..824ca2fc9e1 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -397,7 +397,7 @@ static INPUT_PORTS_START( generic_input )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x02, "4" )
PORT_DIPSETTING( 0x03, "3" )
- PORT_DIPSETTING( 0x00, DEF_STR( Infinite ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Infinite ) )
PORT_DIPNAME( 0x0c, 0x0c, "Bonus" ) PORT_DIPLOCATION("DSW2:3,4")
PORT_DIPSETTING( 0x00, "20000 only" )
PORT_DIPSETTING( 0x0c, "20000, every 40000 after" )
@@ -436,7 +436,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( kamikcab )
PORT_INCLUDE( generic_input )
-
+
PORT_MODIFY("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("DSW2:1,2")
PORT_DIPSETTING( 0x01, "5" )
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index d95bca7dd94..0b183331047 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -3280,9 +3280,9 @@ ROM_START( rodland )
ROM_LOAD16_BYTE( "JALECO_ROD_LAND_3.ROM3", 0x040000, 0x010000, CRC(62fdf6d7) SHA1(ffde7e7f5b3b548bc980b9dee767f693046ecab2) )
ROM_LOAD16_BYTE( "JALECO_ROD_LAND_4.ROM4", 0x040001, 0x010000, CRC(44163c86) SHA1(1c56d79531af0312e7cd3dc66cf61b55dd1a6e51) )
- ROM_REGION( 0x20000, "audiocpu", 0 ) /* Sound CPU Code */
- ROM_LOAD16_BYTE( "JALECO_ROD_LAND_5.ROM5", 0x000000, 0x010000, CRC(c1617c28) SHA1(1b3440055c083b74270fe06b5f42e7d1337efeca) )
- ROM_LOAD16_BYTE( "JALECO_ROD_LAND_6.ROM6", 0x000001, 0x010000, CRC(663392b2) SHA1(99052639e934d1ca18888c9c7fa061c1d3508fd4) )
+ ROM_REGION( 0x20000, "audiocpu", 0 ) /* Sound CPU Code */
+ ROM_LOAD16_BYTE( "JALECO_ROD_LAND_5.ROM5", 0x000000, 0x010000, CRC(c1617c28) SHA1(1b3440055c083b74270fe06b5f42e7d1337efeca) )
+ ROM_LOAD16_BYTE( "JALECO_ROD_LAND_6.ROM6", 0x000001, 0x010000, CRC(663392b2) SHA1(99052639e934d1ca18888c9c7fa061c1d3508fd4) )
ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 */
ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) )
@@ -3319,16 +3319,16 @@ ROM_START( rodlandj )
ROM_LOAD16_BYTE( "JALECO_ROD_LAND_6.ROM6", 0x000001, 0x010000, CRC(663392b2) SHA1(99052639e934d1ca18888c9c7fa061c1d3508fd4) )
ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 */
- ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) )
-
+ ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) )
+
ROM_REGION( 0x080000, "gfx2", 0 ) /* Scroll 1 */
ROM_LOAD( "LH534H32.ROM18", 0x000000, 0x080000, CRC(f3b30ca6) SHA1(f2f88c24a009b6695f7548aebd37b25d1fd19892) )
ROM_REGION( 0x020000, "gfx3", 0 ) /* Scroll 2 */
ROM_LOAD( "LH2311J0.ROM19", 0x000000, 0x020000, CRC(124d7e8f) SHA1(d7885a10085cc3389bd0e26e9d54adb8929218c0) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Sprites */
- ROM_LOAD( "LH534H33.ROM23", 0x000000, 0x080000, CRC(936db174) SHA1(4dfb2c31bc4bbf659184fe18e320d19f326b3ec5) )
+ ROM_REGION( 0x080000, "gfx4", 0 ) /* Sprites */
+ ROM_LOAD( "LH534H33.ROM23", 0x000000, 0x080000, CRC(936db174) SHA1(4dfb2c31bc4bbf659184fe18e320d19f326b3ec5) )
ROM_REGION( 0x040000, "oki1", 0 ) /* Samples */
ROM_LOAD( "LH5321T5.ROM10", 0x000000, 0x040000, CRC(e1d1cd99) SHA1(6604111d37455c1bd59c1469d9ee7841e7dec913) )
@@ -3354,23 +3354,23 @@ ROM_START( rodlandjb )
ROM_LOAD16_BYTE( "rl02.bin", 0x000000, 0x010000, CRC(d26eae8f) SHA1(1c6d514e6d006f78fa7b24d18a3eb4c5a4c5cbce) )
ROM_LOAD16_BYTE( "rl01.bin", 0x000001, 0x010000, CRC(04cf24bc) SHA1(e754cce3c83a7088daf90e753fbb0df9ef7fc9be) )
- ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 */
- ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) )
+ ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 */
+ ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) )
- ROM_REGION( 0x080000, "gfx2", 0 ) /* Scroll 1 */
- ROM_LOAD( "LH534H32.ROM18", 0x000000, 0x080000, CRC(f3b30ca6) SHA1(f2f88c24a009b6695f7548aebd37b25d1fd19892) )
+ ROM_REGION( 0x080000, "gfx2", 0 ) /* Scroll 1 */
+ ROM_LOAD( "LH534H32.ROM18", 0x000000, 0x080000, CRC(f3b30ca6) SHA1(f2f88c24a009b6695f7548aebd37b25d1fd19892) )
- ROM_REGION( 0x020000, "gfx3", 0 ) /* Scroll 2 */
- ROM_LOAD( "LH2311J0.ROM19", 0x000000, 0x020000, CRC(124d7e8f) SHA1(d7885a10085cc3389bd0e26e9d54adb8929218c0) )
+ ROM_REGION( 0x020000, "gfx3", 0 ) /* Scroll 2 */
+ ROM_LOAD( "LH2311J0.ROM19", 0x000000, 0x020000, CRC(124d7e8f) SHA1(d7885a10085cc3389bd0e26e9d54adb8929218c0) )
- ROM_REGION( 0x080000, "gfx4", 0 ) /* Sprites */
- ROM_LOAD( "LH534H33.ROM23", 0x000000, 0x080000, CRC(936db174) SHA1(4dfb2c31bc4bbf659184fe18e320d19f326b3ec5) )
+ ROM_REGION( 0x080000, "gfx4", 0 ) /* Sprites */
+ ROM_LOAD( "LH534H33.ROM23", 0x000000, 0x080000, CRC(936db174) SHA1(4dfb2c31bc4bbf659184fe18e320d19f326b3ec5) )
- ROM_REGION( 0x040000, "oki1", 0 ) /* Samples */
- ROM_LOAD( "LH5321T5.ROM10", 0x000000, 0x040000, CRC(e1d1cd99) SHA1(6604111d37455c1bd59c1469d9ee7841e7dec913) )
+ ROM_REGION( 0x040000, "oki1", 0 ) /* Samples */
+ ROM_LOAD( "LH5321T5.ROM10", 0x000000, 0x040000, CRC(e1d1cd99) SHA1(6604111d37455c1bd59c1469d9ee7841e7dec913) )
- ROM_REGION( 0x040000, "oki2", 0 ) /* Samples */
- ROM_LOAD( "S202000DR.ROM8", 0x000000, 0x040000, CRC(8a49d3a7) SHA1(68cb8cf2753b39c253d0edaa8ef2c54fd1f6ebe5) )
+ ROM_REGION( 0x040000, "oki2", 0 ) /* Samples */
+ ROM_LOAD( "S202000DR.ROM8", 0x000000, 0x040000, CRC(8a49d3a7) SHA1(68cb8cf2753b39c253d0edaa8ef2c54fd1f6ebe5) )
ROM_REGION( 0x0200, "proms", 0 ) /* Priority PROM */
ROM_LOAD( "PS89013A.M14", 0x0000, 0x0200, CRC(8914e72d) SHA1(80a664471f14c8ed8544a5e226fdca425ab3c657) )
@@ -3991,8 +3991,8 @@ DRIVER_INIT_MEMBER(megasys1_state,phantasm)
DRIVER_INIT_MEMBER(megasys1_state,rodland)
{
- rodland_gfx_unmangle("gfx1");
- rodland_gfx_unmangle("gfx4");
+ rodland_gfx_unmangle("gfx1");
+ rodland_gfx_unmangle("gfx4");
rodland_rom_decode(machine(), "maincpu");
}
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 933abf5e37e..8b34dbb22ce 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -742,9 +742,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(model1_state::model1_interrupt)
irq_raise(m_sound_irq);
m_m1audio->check_fifo_irq();
-
+
if (m_m1comm != NULL)
- m_m1comm->check_vint_irq();
+ m_m1comm->check_vint_irq();
}
}
@@ -960,7 +960,7 @@ static ADDRESS_MAP_START( model1_vr_mem, AS_PROGRAM, 16, model1_state )
AM_RANGE(0xb00000, 0xb00fff) AM_DEVREADWRITE8("m1comm", m1comm_device, share_r, share_w, 0xffff)
AM_RANGE(0xb01000, 0xb01001) AM_DEVREADWRITE8("m1comm", m1comm_device, cn_r, cn_w, 0x00ff)
AM_RANGE(0xb01002, 0xb01003) AM_DEVREADWRITE8("m1comm", m1comm_device, fg_r, fg_w, 0x00ff)
-
+
AM_RANGE(0xc00000, 0xc0003f) AM_READWRITE(io_r, io_w)
AM_RANGE(0xc00040, 0xc00043) AM_READWRITE(network_ctl_r, network_ctl_w)
@@ -1599,7 +1599,7 @@ static MACHINE_CONFIG_START( model1_vr, model1_state )
MCFG_VIDEO_START_OVERRIDE(model1_state,model1)
MCFG_SEGAM1AUDIO_ADD("m1audio")
-
+
MCFG_M1COMM_ADD("m1comm")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 95e9177da59..8509fb90664 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -5690,9 +5690,9 @@ DRIVER_INIT_MEMBER(model3_state,scud)
DRIVER_INIT_CALL(model3_15);
/* TODO: network device at 0xC0000000 - FF */
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
-
-// UINT32 *rom = (UINT32*)memregion("user1")->base();
-// rom[(0x799de8^4)/4] = 0x00050208; // secret debug menu
+
+// UINT32 *rom = (UINT32*)memregion("user1")->base();
+// rom[(0x799de8^4)/4] = 0x00050208; // secret debug menu
}
DRIVER_INIT_MEMBER(model3_state,scudplus)
@@ -5952,7 +5952,7 @@ DRIVER_INIT_MEMBER(model3_state,eca)
// base = 0xffc80000
UINT32 *rom = (UINT32*)memregion("user1")->base();
-
+
// cabinet network error
rom[(0x4a45e4^4)/4] = 0x60000000;
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 7449c64837c..013aeb3c448 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -323,7 +323,7 @@ void namcos86_state::machine_start()
membank("bank1")->configure_entries(0, 32, memregion("user1")->base(), 0x2000);
membank("bank2")->configure_entries(0, 4, memregion("cpu2")->base() + 0x10000, 0x2000);
-
+
save_item(NAME(m_wdog));
}
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index 3a3b05b38e4..c78d0adec2b 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -805,7 +805,7 @@ YS-1604
| |
|---------------------------------------------------------|
-Year is assumed to be 1994 based on 94*41 factory sticker and 19/1/95
+Year is assumed to be 1994 based on 94*41 factory sticker and 19/1/95
operator sticker on a revised version PCB. The year is not shown but
must be >= 1994, since the development system (cross compiler?) they
used left a "1994.8-1989" in the rom
@@ -815,7 +815,7 @@ Paradise (set 2): No board ID, although some tracks which are wire hacks on
Except for the program rom all other data matches Paradise (set 1).
NOTE: on this version of the PCB the above listed 4MHz OSC is replaced with
a 3.579545MHz OSC
-
+
The Escape version might be the newest revision due to improved slot machine
animation on 'girl select' compared to other sets. Except for the program
rom all other data matches Paradise (set 1).
@@ -848,55 +848,55 @@ ROM_START( paradise )
ROM_END
ROM_START( paradisea )
- ROM_REGION( 0x40000, "maincpu", 0 ) /* Z80 Code */
- ROM_LOAD( "a-19.U128", 0x00000, 0x40000, CRC(d47ecb7e) SHA1(74e7a33f2fc4c7c830c53c50541c3d0efd152e98) )
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* Z80 Code */
+ ROM_LOAD( "a-19.U128", 0x00000, 0x40000, CRC(d47ecb7e) SHA1(74e7a33f2fc4c7c830c53c50541c3d0efd152e98) )
- ROM_REGION( 0x80000, "gfx1", ROMREGION_INVERT) /* 16x16x8 Sprites */
- ROM_LOAD( "a-19.u114", 0x00000, 0x40000, CRC(c748ba3b) SHA1(ad23bda4e001ca539f849c1ca256de5daf7c233b) )
- ROM_LOAD( "a-19.u115", 0x40000, 0x40000, CRC(0d517bbb) SHA1(5bf7c5036f3d660901e26f14baaea1a3c0327dfe) )
+ ROM_REGION( 0x80000, "gfx1", ROMREGION_INVERT) /* 16x16x8 Sprites */
+ ROM_LOAD( "a-19.u114", 0x00000, 0x40000, CRC(c748ba3b) SHA1(ad23bda4e001ca539f849c1ca256de5daf7c233b) )
+ ROM_LOAD( "a-19.u115", 0x40000, 0x40000, CRC(0d517bbb) SHA1(5bf7c5036f3d660901e26f14baaea1a3c0327dfe) )
- ROM_REGION( 0x20000, "gfx2", ROMREGION_INVERT) /* 8x8x4 Background */
- ROM_LOAD( "a-19.u94", 0x00000, 0x20000, CRC(e3a99209) SHA1(5db79dc1a38d93b458b043499a58516285c65aa8) )
+ ROM_REGION( 0x20000, "gfx2", ROMREGION_INVERT) /* 8x8x4 Background */
+ ROM_LOAD( "a-19.u94", 0x00000, 0x20000, CRC(e3a99209) SHA1(5db79dc1a38d93b458b043499a58516285c65aa8) )
- ROM_REGION( 0x100000, "gfx3", ROMREGION_INVERT) /* 8x8x8 Foreground */
- ROM_LOAD( "a-19.u92", 0x00000, 0x80000, CRC(633d24f0) SHA1(26b25ec1014fba1a3d0d2bdba0c867c57034647d) )
- ROM_LOAD( "a-19.u93", 0x80000, 0x80000, CRC(bbf5c632) SHA1(9d31e136f014c2dd7dd988c3aee0adfcfea91bc9) )
+ ROM_REGION( 0x100000, "gfx3", ROMREGION_INVERT) /* 8x8x8 Foreground */
+ ROM_LOAD( "a-19.u92", 0x00000, 0x80000, CRC(633d24f0) SHA1(26b25ec1014fba1a3d0d2bdba0c867c57034647d) )
+ ROM_LOAD( "a-19.u93", 0x80000, 0x80000, CRC(bbf5c632) SHA1(9d31e136f014c2dd7dd988c3aee0adfcfea91bc9) )
- ROM_REGION( 0x40000, "gfx4", ROMREGION_INVERT) /* 8x8x8 Midground */
- ROM_LOAD( "a-19.u110", 0x00000, 0x20000, CRC(9807a7e6) SHA1(30e2a741a93954cfe672c61c93a990d0c3b25145) )
- ROM_LOAD( "a-19.u111", 0x20000, 0x20000, CRC(bc9f93f0) SHA1(dd4cfc849a0c0f918ac0dfeb7f00a67aae5a1c13) )
+ ROM_REGION( 0x40000, "gfx4", ROMREGION_INVERT) /* 8x8x8 Midground */
+ ROM_LOAD( "a-19.u110", 0x00000, 0x20000, CRC(9807a7e6) SHA1(30e2a741a93954cfe672c61c93a990d0c3b25145) )
+ ROM_LOAD( "a-19.u111", 0x20000, 0x20000, CRC(bc9f93f0) SHA1(dd4cfc849a0c0f918ac0dfeb7f00a67aae5a1c13) )
- ROM_REGION( 0x40000, "oki1", 0 ) /* Samples */
- ROM_LOAD( "a-19.u85", 0x00000, 0x40000, CRC(bf3c3065) SHA1(54dd7ffea2fb3f31ed575e982b82691cddc2581a) )
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Samples */
+ ROM_LOAD( "a-19.u85", 0x00000, 0x40000, CRC(bf3c3065) SHA1(54dd7ffea2fb3f31ed575e982b82691cddc2581a) )
- ROM_REGION( 0x80000, "oki2", 0 ) /* Samples (banked) */
- ROM_LOAD( "a-19.u113", 0x00000, 0x80000, CRC(53de6025) SHA1(c94b3778b57ff7f46ce4cff661841019fb187d5d) )
+ ROM_REGION( 0x80000, "oki2", 0 ) /* Samples (banked) */
+ ROM_LOAD( "a-19.u113", 0x00000, 0x80000, CRC(53de6025) SHA1(c94b3778b57ff7f46ce4cff661841019fb187d5d) )
ROM_END
ROM_START( paradisee ) /* YS-1600 PCB. All labels are simply labeled "Escape" */
- ROM_REGION( 0x40000, "maincpu", 0 ) /* Z80 Code */
- ROM_LOAD( "escape.U128", 0x00000, 0x40000, CRC(19b4e854) SHA1(7d7292017df67b7ed3a3e0059334866890c58b83) )
+ ROM_REGION( 0x40000, "maincpu", 0 ) /* Z80 Code */
+ ROM_LOAD( "escape.U128", 0x00000, 0x40000, CRC(19b4e854) SHA1(7d7292017df67b7ed3a3e0059334866890c58b83) )
- ROM_REGION( 0x80000, "gfx1", ROMREGION_INVERT) /* 16x16x8 Sprites */
- ROM_LOAD( "escape.u114", 0x00000, 0x40000, CRC(c748ba3b) SHA1(ad23bda4e001ca539f849c1ca256de5daf7c233b) )
- ROM_LOAD( "escape.u115", 0x40000, 0x40000, CRC(0d517bbb) SHA1(5bf7c5036f3d660901e26f14baaea1a3c0327dfe) )
+ ROM_REGION( 0x80000, "gfx1", ROMREGION_INVERT) /* 16x16x8 Sprites */
+ ROM_LOAD( "escape.u114", 0x00000, 0x40000, CRC(c748ba3b) SHA1(ad23bda4e001ca539f849c1ca256de5daf7c233b) )
+ ROM_LOAD( "escape.u115", 0x40000, 0x40000, CRC(0d517bbb) SHA1(5bf7c5036f3d660901e26f14baaea1a3c0327dfe) )
- ROM_REGION( 0x20000, "gfx2", ROMREGION_INVERT) /* 8x8x4 Background */
- ROM_LOAD( "escape.u94", 0x00000, 0x20000, CRC(e3a99209) SHA1(5db79dc1a38d93b458b043499a58516285c65aa8) )
+ ROM_REGION( 0x20000, "gfx2", ROMREGION_INVERT) /* 8x8x4 Background */
+ ROM_LOAD( "escape.u94", 0x00000, 0x20000, CRC(e3a99209) SHA1(5db79dc1a38d93b458b043499a58516285c65aa8) )
- ROM_REGION( 0x100000, "gfx3", ROMREGION_INVERT) /* 8x8x8 Foreground */
- ROM_LOAD( "escape.u92", 0x00000, 0x80000, CRC(633d24f0) SHA1(26b25ec1014fba1a3d0d2bdba0c867c57034647d) )
- ROM_LOAD( "escape.u93", 0x80000, 0x80000, CRC(bbf5c632) SHA1(9d31e136f014c2dd7dd988c3aee0adfcfea91bc9) )
+ ROM_REGION( 0x100000, "gfx3", ROMREGION_INVERT) /* 8x8x8 Foreground */
+ ROM_LOAD( "escape.u92", 0x00000, 0x80000, CRC(633d24f0) SHA1(26b25ec1014fba1a3d0d2bdba0c867c57034647d) )
+ ROM_LOAD( "escape.u93", 0x80000, 0x80000, CRC(bbf5c632) SHA1(9d31e136f014c2dd7dd988c3aee0adfcfea91bc9) )
- ROM_REGION( 0x40000, "gfx4", ROMREGION_INVERT) /* 8x8x8 Midground */
- ROM_LOAD( "escape.u110", 0x00000, 0x20000, CRC(9807a7e6) SHA1(30e2a741a93954cfe672c61c93a990d0c3b25145) )
- ROM_LOAD( "escape.u111", 0x20000, 0x20000, CRC(bc9f93f0) SHA1(dd4cfc849a0c0f918ac0dfeb7f00a67aae5a1c13) )
+ ROM_REGION( 0x40000, "gfx4", ROMREGION_INVERT) /* 8x8x8 Midground */
+ ROM_LOAD( "escape.u110", 0x00000, 0x20000, CRC(9807a7e6) SHA1(30e2a741a93954cfe672c61c93a990d0c3b25145) )
+ ROM_LOAD( "escape.u111", 0x20000, 0x20000, CRC(bc9f93f0) SHA1(dd4cfc849a0c0f918ac0dfeb7f00a67aae5a1c13) )
- ROM_REGION( 0x40000, "oki1", 0 ) /* Samples */
- ROM_LOAD( "escape.u85", 0x00000, 0x40000, CRC(bf3c3065) SHA1(54dd7ffea2fb3f31ed575e982b82691cddc2581a) )
+ ROM_REGION( 0x40000, "oki1", 0 ) /* Samples */
+ ROM_LOAD( "escape.u85", 0x00000, 0x40000, CRC(bf3c3065) SHA1(54dd7ffea2fb3f31ed575e982b82691cddc2581a) )
- ROM_REGION( 0x80000, "oki2", 0 ) /* Samples (banked) */
- ROM_LOAD( "escape.u113", 0x00000, 0x80000, CRC(53de6025) SHA1(c94b3778b57ff7f46ce4cff661841019fb187d5d) )
+ ROM_REGION( 0x80000, "oki2", 0 ) /* Samples (banked) */
+ ROM_LOAD( "escape.u113", 0x00000, 0x80000, CRC(53de6025) SHA1(c94b3778b57ff7f46ce4cff661841019fb187d5d) )
ROM_END
ROM_START( paradlx )
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 21ee56e5d0c..4ab389ab393 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -1622,12 +1622,12 @@ PayTable Js+ 2PR 3K STR FL FH 4K SF RF (Bonus)
BA 1 2 3 4 5 8 25 50 250 800
% Range: 93.8-95.8% Optimum: 97.8% Hit Frequency: 45.3%
Programs Available: PP0021
-
+
NOTE: REQUIRES Progressive link which is not currently supported
*/
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "pp0021_723-703.u68", 0x00000, 0x10000, CRC(58f2a68b) SHA1(72c0a29016b17f7e308a9e9b2d724771b5e26560) ) /* Game Version: 723, Library Version: 703 */
-
+
ROM_REGION( 0x020000, "gfx1", 0 )
ROM_LOAD( "mro-cg740.u72", 0x00000, 0x8000, CRC(72667f6c) SHA1(89843f472cc0329317cfc643c63bdfd11234b194) )
ROM_LOAD( "mgo-cg740.u73", 0x08000, 0x8000, CRC(7437254a) SHA1(bba166dece8af58da217796f81117d0b05752b87) )
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 98a87936458..8ba70c82847 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -1454,7 +1454,7 @@ static INPUT_PORTS_START( tahjong )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 ) // "COIN1", but not working
PORT_START("DSW1") // port $10
- PORT_DIPNAME( 0x07, 0x07, "SWB:1,2,3" ) PORT_DIPLOCATION("SWB:1,2,3") // only with bets on
+ PORT_DIPNAME( 0x07, 0x07, "SWB:1,2,3" ) PORT_DIPLOCATION("SWB:1,2,3") // only with bets on
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -3605,8 +3605,8 @@ ROM_START( tahjong )
ROM_LOAD( "p2.bin", 0x01000, 0x1000, CRC(c33e3cc3) SHA1(707c437f180ddd2916b5806f208e0a478207d528) )
ROM_LOAD( "p3.bin", 0x02000, 0x1000, CRC(9e741a74) SHA1(6c8e8eb04331d48b72e2be270c13dbf8deb76005) )
ROM_LOAD( "p4.bin", 0x03000, 0x1000, CRC(dc6ae62b) SHA1(d0c51047f734c885b7f19972c1bf0408199fde51) )
- ROM_LOAD( "p5.bin", 0x04000, 0x1000, CRC(cc9123a3) SHA1(75276045247a0c9ac5810be01f3b58ad63101f9b) ) // same as royalmj (unused)
- ROM_LOAD( "p6.bin", 0x05000, 0x1000, CRC(92150a0f) SHA1(5c97ba5014abdba4afc78e02e7d90e6ca4d777ac) ) // ""
+ ROM_LOAD( "p5.bin", 0x04000, 0x1000, CRC(cc9123a3) SHA1(75276045247a0c9ac5810be01f3b58ad63101f9b) ) // same as royalmj (unused)
+ ROM_LOAD( "p6.bin", 0x05000, 0x1000, CRC(92150a0f) SHA1(5c97ba5014abdba4afc78e02e7d90e6ca4d777ac) ) // ""
ROM_LOAD( "s1.bin", 0x10000, 0x4000, CRC(beff21af) SHA1(4dc40a1ac4e36401b1ad8ae3954af6e5001e0a67) )
ROM_LOAD( "s2.bin", 0x14000, 0x4000, CRC(fed42e7c) SHA1(31136dff07bd1883dc2d107823ba83a34abf003d) )
diff --git a/src/mame/drivers/segam1.c b/src/mame/drivers/segam1.c
index 2790a4b0431..a39ada35922 100644
--- a/src/mame/drivers/segam1.c
+++ b/src/mame/drivers/segam1.c
@@ -76,7 +76,7 @@ static MACHINE_CONFIG_START( segam1, segam1_state )
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2)
MCFG_CPU_PROGRAM_MAP(segam1_map)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", segam1_state, irq1_line_hold)
+// MCFG_CPU_VBLANK_INT_DRIVER("screen", segam1_state, irq1_line_hold)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -103,7 +103,7 @@ ROM_START( bingpty )
ROM_LOAD( "epr-14845.bin", 0x00000, 0x20000, CRC(90d47101) SHA1(7bc002c104e3dbde1986aaec54112d5658eab523) )
ROM_REGION( 0x8000, "m1comm", 0 ) /* Z80 Code */
- ROM_LOAD( "epr-14221a.bin", 0x00000, 0x8000, CRC(a13e67a4) SHA1(4cd269c7f04a64ae7806c8784f86bf6553a25d85) )
+ ROM_LOAD( "epr-14221a.bin", 0x00000, 0x8000, CRC(a13e67a4) SHA1(4cd269c7f04a64ae7806c8784f86bf6553a25d85) )
// dumps of the X-Board part, and the LINK PCB are missing.
ROM_END
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index bfcf36dd938..7177f1b4e9d 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -9,10 +9,10 @@
Still to do:
* fix protection
* fix jpark correctly
- * priorities in multi32 appear wrong - stadium cross map screen
- and title fight ingame backgrounds
- * should f1lap be set up as a twin cabinet / direct link or can it
- be operated as a single screen, unlike f1en/air rescue
+ * priorities in multi32 appear wrong - stadium cross map screen
+ and title fight ingame backgrounds
+ * should f1lap be set up as a twin cabinet / direct link or can it
+ be operated as a single screen, unlike f1en/air rescue
****************************************************************************
@@ -1818,7 +1818,7 @@ static INPUT_PORTS_START( f1en )
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_NAME("mainpcb:Steering Wheel")
PORT_START("mainpcb:ANALOG2")
- PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_NAME("mainpcb:Gas Pedal")
+ PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_NAME("mainpcb:Gas Pedal")
PORT_START("mainpcb:ANALOG3")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_NAME("mainpcb:Brake Pedal")
@@ -5096,26 +5096,26 @@ READ16_MEMBER(segas32_new_state::dual_pcb_slave)
-DRIVER_INIT_MEMBER(segas32_new_state,titlef) { m_mainpcb->init_titlef(); }
-DRIVER_INIT_MEMBER(segas32_new_state,slipstrm) { m_mainpcb->init_slipstrm(); }
-DRIVER_INIT_MEMBER(segas32_new_state,radm) { m_mainpcb->init_radm(); }
-DRIVER_INIT_MEMBER(segas32_new_state,holo) { m_mainpcb->init_holo(); }
-DRIVER_INIT_MEMBER(segas32_new_state,svf) { m_mainpcb->init_svf(); }
-DRIVER_INIT_MEMBER(segas32_new_state,jleague) { m_mainpcb->init_jleague(); }
-DRIVER_INIT_MEMBER(segas32_new_state,jpark) { m_mainpcb->init_jpark(); }
-DRIVER_INIT_MEMBER(segas32_new_state,ga2) { m_mainpcb->init_ga2(); }
-DRIVER_INIT_MEMBER(segas32_new_state,scross) { m_mainpcb->init_scross(); }
-DRIVER_INIT_MEMBER(segas32_new_state,spidman) { m_mainpcb->init_spidman(); }
-DRIVER_INIT_MEMBER(segas32_new_state,sonicp) { m_mainpcb->init_sonicp(); }
-DRIVER_INIT_MEMBER(segas32_new_state,dbzvrvs) { m_mainpcb->init_dbzvrvs(); }
-DRIVER_INIT_MEMBER(segas32_new_state,brival) { m_mainpcb->init_brival(); }
-DRIVER_INIT_MEMBER(segas32_new_state,harddunk) { m_mainpcb->init_harddunk(); }
-DRIVER_INIT_MEMBER(segas32_new_state,arabfgt) { m_mainpcb->init_arabfgt(); }
-DRIVER_INIT_MEMBER(segas32_new_state,sonic) { m_mainpcb->init_sonic(); }
-DRIVER_INIT_MEMBER(segas32_new_state,alien3) { m_mainpcb->init_alien3(); }
-DRIVER_INIT_MEMBER(segas32_new_state,darkedge) { m_mainpcb->init_darkedge(); }
-DRIVER_INIT_MEMBER(segas32_new_state,radr) { m_mainpcb->init_radr(); }
-DRIVER_INIT_MEMBER(segas32_new_state,orunners) { m_mainpcb->init_orunners(); }
+DRIVER_INIT_MEMBER(segas32_new_state,titlef) { m_mainpcb->init_titlef(); }
+DRIVER_INIT_MEMBER(segas32_new_state,slipstrm) { m_mainpcb->init_slipstrm(); }
+DRIVER_INIT_MEMBER(segas32_new_state,radm) { m_mainpcb->init_radm(); }
+DRIVER_INIT_MEMBER(segas32_new_state,holo) { m_mainpcb->init_holo(); }
+DRIVER_INIT_MEMBER(segas32_new_state,svf) { m_mainpcb->init_svf(); }
+DRIVER_INIT_MEMBER(segas32_new_state,jleague) { m_mainpcb->init_jleague(); }
+DRIVER_INIT_MEMBER(segas32_new_state,jpark) { m_mainpcb->init_jpark(); }
+DRIVER_INIT_MEMBER(segas32_new_state,ga2) { m_mainpcb->init_ga2(); }
+DRIVER_INIT_MEMBER(segas32_new_state,scross) { m_mainpcb->init_scross(); }
+DRIVER_INIT_MEMBER(segas32_new_state,spidman) { m_mainpcb->init_spidman(); }
+DRIVER_INIT_MEMBER(segas32_new_state,sonicp) { m_mainpcb->init_sonicp(); }
+DRIVER_INIT_MEMBER(segas32_new_state,dbzvrvs) { m_mainpcb->init_dbzvrvs(); }
+DRIVER_INIT_MEMBER(segas32_new_state,brival) { m_mainpcb->init_brival(); }
+DRIVER_INIT_MEMBER(segas32_new_state,harddunk) { m_mainpcb->init_harddunk(); }
+DRIVER_INIT_MEMBER(segas32_new_state,arabfgt) { m_mainpcb->init_arabfgt(); }
+DRIVER_INIT_MEMBER(segas32_new_state,sonic) { m_mainpcb->init_sonic(); }
+DRIVER_INIT_MEMBER(segas32_new_state,alien3) { m_mainpcb->init_alien3(); }
+DRIVER_INIT_MEMBER(segas32_new_state,darkedge) { m_mainpcb->init_darkedge(); }
+DRIVER_INIT_MEMBER(segas32_new_state,radr) { m_mainpcb->init_radr(); }
+DRIVER_INIT_MEMBER(segas32_new_state,orunners) { m_mainpcb->init_orunners(); }
DRIVER_INIT_MEMBER(segas32_new_state, arescue)
{
@@ -5131,7 +5131,6 @@ DRIVER_INIT_MEMBER(segas32_new_state, arescue)
}
DRIVER_INIT_MEMBER(segas32_new_state,f1en) {
-
m_mainpcb->init_f1en();
m_slavepcb->init_f1en();
@@ -5164,7 +5163,7 @@ void segas32_state::init_arescue(int m_hasdsp)
{
segas32_common_init(read16_delegate(FUNC(segas32_state::analog_custom_io_r),this), write16_delegate(FUNC(segas32_state::analog_custom_io_w),this));
if (m_hasdsp) m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa00007, read16_delegate(FUNC(segas32_state::arescue_dsp_r),this), write16_delegate(FUNC(segas32_state::arescue_dsp_w),this));
-
+
for (int i = 0; i < 6; i++)
m_arescue_dsp_io[i] = 0x00;
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index da89b5fadc7..07ea0c4ced3 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -10843,44 +10843,44 @@ ROM_END
same factory as normal boards same as daiohc. Modified layout allowing
split ROMs */
ROM_START( gundharac )
- ROM_REGION( 0x200000, "maincpu", 0 ) /* 68000 Code */
- ROM_LOAD16_BYTE( "4.U3", 0x000000, 0x080000, CRC(14e9970a) SHA1(31964bd290cc94c40684adf3a5d129b1c3addc3b) )
- ROM_LOAD16_BYTE( "2.U4", 0x000001, 0x080000, CRC(96dfc658) SHA1(f570bc49758535eb00d93ecce9f75832f97a0d8d) )
- ROM_LOAD16_BYTE( "3.U103", 0x100000, 0x080000, CRC(312f58e2) SHA1(a74819d2f84a00c233489893f12c9ab1a98459cf) )
- ROM_LOAD16_BYTE( "1.U102", 0x100001, 0x080000, CRC(8d23a23c) SHA1(9e9a6488db424c81a97edcb7115cc070fe35c077) )
+ ROM_REGION( 0x200000, "maincpu", 0 ) /* 68000 Code */
+ ROM_LOAD16_BYTE( "4.U3", 0x000000, 0x080000, CRC(14e9970a) SHA1(31964bd290cc94c40684adf3a5d129b1c3addc3b) )
+ ROM_LOAD16_BYTE( "2.U4", 0x000001, 0x080000, CRC(96dfc658) SHA1(f570bc49758535eb00d93ecce9f75832f97a0d8d) )
+ ROM_LOAD16_BYTE( "3.U103", 0x100000, 0x080000, CRC(312f58e2) SHA1(a74819d2f84a00c233489893f12c9ab1a98459cf) )
+ ROM_LOAD16_BYTE( "1.U102", 0x100001, 0x080000, CRC(8d23a23c) SHA1(9e9a6488db424c81a97edcb7115cc070fe35c077) )
- ROM_REGION( 0x800000, "gfx1", 0 ) /* Sprites */
+ ROM_REGION( 0x800000, "gfx1", 0 ) /* Sprites */
ROM_LOAD16_BYTE( "19.U140", 0x000000, 0x080000, CRC(32d92c28) SHA1(7ba67f715f094aacf2dc2399809e4dfc7e4ca241) )
- ROM_LOAD16_BYTE( "23.U142", 0x000001, 0x080000, CRC(ff44db9b) SHA1(76ecd3ce3b6b33f3ae0b0454d58cf37d545dd72c) )
- ROM_LOAD16_BYTE( "21.U141", 0x100000, 0x080000, CRC(1901dc08) SHA1(b19428a7510d6e28a39bdf6ecc9732e3c2d19214) )
- ROM_LOAD16_BYTE( "25.U143", 0x100001, 0x080000, CRC(877289a2) SHA1(7482320e319d7b641fabba5aeeaa1237b693a219) )
+ ROM_LOAD16_BYTE( "23.U142", 0x000001, 0x080000, CRC(ff44db9b) SHA1(76ecd3ce3b6b33f3ae0b0454d58cf37d545dd72c) )
+ ROM_LOAD16_BYTE( "21.U141", 0x100000, 0x080000, CRC(1901dc08) SHA1(b19428a7510d6e28a39bdf6ecc9732e3c2d19214) )
+ ROM_LOAD16_BYTE( "25.U143", 0x100001, 0x080000, CRC(877289a2) SHA1(7482320e319d7b641fabba5aeeaa1237b693a219) )
ROM_LOAD16_BYTE( "18.U140-B", 0x200000, 0x080000, CRC(4f023fb0) SHA1(815765c9783e44762bf57a3fbfad4385c316343a) )
ROM_LOAD16_BYTE( "22.U142-B", 0x200001, 0x080000, CRC(6f3fe7e7) SHA1(71bc347c06678f4ae7850799da6346c6447bf3c0) )
ROM_LOAD16_BYTE( "20.U141-B", 0x300000, 0x080000, CRC(7f1932e0) SHA1(13262a7322ad29cf7c85461204a3518e900c6145) )
ROM_LOAD16_BYTE( "24.U143-B", 0x300001, 0x080000, CRC(066a2e2b) SHA1(186729918a89535484ab86dd58caf20ccce81501) )
- ROM_LOAD16_BYTE( "9.U144", 0x400000, 0x080000, CRC(6b4a531f) SHA1(701d6b2d87a742c8a2ab36331bd843dcd3309eae) )
- ROM_LOAD16_BYTE( "13.U146", 0x400001, 0x080000, CRC(45be3df4) SHA1(36667bf5e4b80d17a9d7b6ce4df7498f94681c46) )
- ROM_LOAD16_BYTE( "11.U145", 0x500000, 0x080000, CRC(f5210aa5) SHA1(4834d905f699dbec1cdacea6b320271c291aa2a7) )
- ROM_LOAD16_BYTE( "15.U147", 0x500001, 0x080000, CRC(17003119) SHA1(a2edd65c98bc654b541dad3e3783d90931c97597) )
- ROM_LOAD16_BYTE( "8.U144-B", 0x600000, 0x080000, CRC(ad9d9338) SHA1(33d6c881a20e2150017cc26f929473291e561718) )
- ROM_LOAD16_BYTE( "12.U146-B", 0x600001, 0x080000, CRC(0fd4c062) SHA1(7f418d43d9ba884c504f6fe3c04b11724412ac6b) )
- ROM_LOAD16_BYTE( "10.U145-B", 0x700000, 0x080000, CRC(7c5d12b9) SHA1(6ee45c4da6994540852153752e2818a8ea8ecf1a) )
- ROM_LOAD16_BYTE( "14.U147-B", 0x700001, 0x080000, CRC(5a8af50f) SHA1(3b7937ba720fcbbc5e29c1b95a97c29e8ff5490a) )
-
- ROM_REGION( 0x200000, "gfx2", 0 ) /* Layer 1 */
- ROM_LOAD16_BYTE( "5.U148", 0x000000, 0x080000, CRC(0c740f9b) SHA1(f6d135c3318ff0d50d40921aa108b1b332c1a086) )
- ROM_LOAD16_BYTE( "6.U150", 0x000001, 0x080000, CRC(ba60eb98) SHA1(7204269816332bbb3401d9f20a513372ffe78500) )
- ROM_LOAD16_BYTE( "7.U154", 0x100000, 0x080000, CRC(b768e666) SHA1(473fa52c16c0a9f321e6429947a3e0fc1ef22f7e) )
-
- ROM_REGION( 0x400000, "gfx3", 0 ) /* Layer 2 */
- ROM_LOAD16_BYTE( "26.U164", 0x000000, 0x080000, CRC(be3ccaba) SHA1(98f8b83cbed00932866375d21f86ee5c9bddb2a6) )
- ROM_LOAD16_BYTE( "28.U166", 0x000001, 0x080000, CRC(8a650a4e) SHA1(1f6eda27b39ad052e3d9a8a72cb0a072e7be4487) )
- ROM_LOAD16_BYTE( "27.U165", 0x100000, 0x080000, CRC(47994ff0) SHA1(25211a9af01f77788578bb524619d95b5b86e241) )
- ROM_LOAD16_BYTE( "29.U167", 0x100001, 0x080000, CRC(453c3d3f) SHA1(151528b6b1e7f8c059d67dbaca61e7c382e9ce04) )
+ ROM_LOAD16_BYTE( "9.U144", 0x400000, 0x080000, CRC(6b4a531f) SHA1(701d6b2d87a742c8a2ab36331bd843dcd3309eae) )
+ ROM_LOAD16_BYTE( "13.U146", 0x400001, 0x080000, CRC(45be3df4) SHA1(36667bf5e4b80d17a9d7b6ce4df7498f94681c46) )
+ ROM_LOAD16_BYTE( "11.U145", 0x500000, 0x080000, CRC(f5210aa5) SHA1(4834d905f699dbec1cdacea6b320271c291aa2a7) )
+ ROM_LOAD16_BYTE( "15.U147", 0x500001, 0x080000, CRC(17003119) SHA1(a2edd65c98bc654b541dad3e3783d90931c97597) )
+ ROM_LOAD16_BYTE( "8.U144-B", 0x600000, 0x080000, CRC(ad9d9338) SHA1(33d6c881a20e2150017cc26f929473291e561718) )
+ ROM_LOAD16_BYTE( "12.U146-B", 0x600001, 0x080000, CRC(0fd4c062) SHA1(7f418d43d9ba884c504f6fe3c04b11724412ac6b) )
+ ROM_LOAD16_BYTE( "10.U145-B", 0x700000, 0x080000, CRC(7c5d12b9) SHA1(6ee45c4da6994540852153752e2818a8ea8ecf1a) )
+ ROM_LOAD16_BYTE( "14.U147-B", 0x700001, 0x080000, CRC(5a8af50f) SHA1(3b7937ba720fcbbc5e29c1b95a97c29e8ff5490a) )
+
+ ROM_REGION( 0x200000, "gfx2", 0 ) /* Layer 1 */
+ ROM_LOAD16_BYTE( "5.U148", 0x000000, 0x080000, CRC(0c740f9b) SHA1(f6d135c3318ff0d50d40921aa108b1b332c1a086) )
+ ROM_LOAD16_BYTE( "6.U150", 0x000001, 0x080000, CRC(ba60eb98) SHA1(7204269816332bbb3401d9f20a513372ffe78500) )
+ ROM_LOAD16_BYTE( "7.U154", 0x100000, 0x080000, CRC(b768e666) SHA1(473fa52c16c0a9f321e6429947a3e0fc1ef22f7e) )
+
+ ROM_REGION( 0x400000, "gfx3", 0 ) /* Layer 2 */
+ ROM_LOAD16_BYTE( "26.U164", 0x000000, 0x080000, CRC(be3ccaba) SHA1(98f8b83cbed00932866375d21f86ee5c9bddb2a6) )
+ ROM_LOAD16_BYTE( "28.U166", 0x000001, 0x080000, CRC(8a650a4e) SHA1(1f6eda27b39ad052e3d9a8a72cb0a072e7be4487) )
+ ROM_LOAD16_BYTE( "27.U165", 0x100000, 0x080000, CRC(47994ff0) SHA1(25211a9af01f77788578bb524619d95b5b86e241) )
+ ROM_LOAD16_BYTE( "29.U167", 0x100001, 0x080000, CRC(453c3d3f) SHA1(151528b6b1e7f8c059d67dbaca61e7c382e9ce04) )
ROM_LOAD16_BYTE( "16.U152", 0x200000, 0x080000, CRC(5ccc500b) SHA1(d3a2a5658cac8d788e0a1189c184309b8394b10a) )
ROM_LOAD16_BYTE( "17.U153", 0x300000, 0x080000, CRC(5586d086) SHA1(e43d5e8834701f40389400f68a99353e67598f6d) )
- ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */
+ ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */
ROM_LOAD( "30.U69", 0x000000, 0x080000, CRC(3111a98a) SHA1(75e17a0113060a10551b2b8c17b19890eb7aa0a6) )
ROM_LOAD( "31.U70", 0x080000, 0x080000, CRC(30cb2524) SHA1(85deb83262bbe481404705e163e5eb9362985b01) )
ROM_END
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index 3b082deff16..cdcfac70ddb 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -978,7 +978,7 @@ ROM_START( turtshipk )
ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "t-4.8a", 0x00000, 0x08000, CRC(1cbe48e8) SHA1(6ac5981d36a44595bb8dc847c54c7be7b374f82c) )
- ROM_REGION( 0x04000, "gfx1", 0 ) /* Really a 27128? */
+ ROM_REGION( 0x04000, "gfx1", 0 ) /* Really a 27128? */
ROM_LOAD( "turtship.005", 0x00000, 0x04000, CRC(651fef75) SHA1(9c821a2ee30c222987f0d4192133776490d6a4e0) ) /* characters */
ROM_REGION( 0x80000, "gfx2", 0 )
@@ -1002,69 +1002,69 @@ ROM_START( turtshipk )
ROM_END
ROM_START( turtshipko )
- ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + banked ROMs images */
- ROM_LOAD( "T-3.G5", 0x00000, 0x08000, CRC(cd789535) SHA1(3c4f94c751645b61066177fbf3157924ad177c32) )
- ROM_LOAD( "T-2.G3", 0x08000, 0x08000, CRC(253678c0) SHA1(1470fd936003462d480c759658628ea085d4bd71) )
- ROM_LOAD( "T-1.E3", 0x10000, 0x08000, CRC(d6fdc376) SHA1(3f4e1fde8b83e3762f9499dfe291309efe940093) )
-
- ROM_REGION( 0x10000, "audiocpu", 0 )
- ROM_LOAD( "T-4.A8", 0x00000, 0x08000, CRC(1cbe48e8) SHA1(6ac5981d36a44595bb8dc847c54c7be7b374f82c) )
-
- ROM_REGION( 0x04000, "gfx1", 0 )
- ROM_LOAD( "T-5.K8", 0x00000, 0x04000, CRC(35c3dbc5) SHA1(6700c72e5e0f7bd1429d342cb5d3daccd6b1b70f) ) /* characters */
- ROM_CONTINUE( 0x00000, 0x04000 ) /* A14 tied high, only upper half is used */
-
- ROM_REGION( 0x80000, "gfx2", 0 )
- ROM_LOAD( "T-8.D1", 0x00000, 0x10000, CRC(2f0b2336) SHA1(a869e0a50aab7d29afbca46fa04bd470488a8eeb) ) /* tiles */
- ROM_LOAD( "T-10.C3", 0x10000, 0x10000, CRC(6a0072f4) SHA1(d74b53ed90a4d01020a179f263a39b7547b8f82e) )
- ROM_RELOAD( 0x30000, 0x10000)
- ROM_LOAD( "T-11.D3", 0x20000, 0x10000, CRC(53da6cb1) SHA1(52720746298adb01828f959f81b385d268c94343) )
- ROM_LOAD( "T-6.A1", 0x40000, 0x10000, CRC(a7cce654) SHA1(f6c99622dcacc1d76021ca29b0bbceefbb75c499) )
- ROM_LOAD( "T-7.C1", 0x50000, 0x10000, CRC(90dd8415) SHA1(8e9d43ff9164fb287ab82df7da8890976b9d21c7) )
- ROM_RELOAD( 0x70000, 0x10000)
- ROM_LOAD( "T-9.A3", 0x60000, 0x10000, CRC(44762916) SHA1(3427066fc02d1b9b71a59ac41d3332d5cd8d1423) )
-
- ROM_REGION( 0x40000, "gfx3", 0 )
- ROM_LOAD( "T-13.I1", 0x00000, 0x10000, CRC(1cc87f50) SHA1(d7d8a4376b556675dafa0a407bb34b6017f17e7d) ) /* sprites */
- ROM_LOAD( "T-15.I3", 0x10000, 0x10000, CRC(775ee5d9) SHA1(e39eb558cc2d5cdf4c87b96f85af72e5600b995e) )
- ROM_LOAD( "T-12.G1", 0x20000, 0x10000, CRC(57783312) SHA1(57942e8c3b7be63ea62bae3c104cb2842eb6b755) )
- ROM_LOAD( "T-14.G3", 0x30000, 0x10000, CRC(a30e3346) SHA1(150a837fb5d4705df9e8e9a94f78cff0e1c57d64) )
-
- ROM_REGION( 0x08000, "gfx4", 0 ) /* background tilemaps */
- ROM_LOAD( "T-16.F9", 0x00000, 0x08000, CRC(9b377277) SHA1(4858560e35144727aea958023f3df785baa994a8) )
+ ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + banked ROMs images */
+ ROM_LOAD( "T-3.G5", 0x00000, 0x08000, CRC(cd789535) SHA1(3c4f94c751645b61066177fbf3157924ad177c32) )
+ ROM_LOAD( "T-2.G3", 0x08000, 0x08000, CRC(253678c0) SHA1(1470fd936003462d480c759658628ea085d4bd71) )
+ ROM_LOAD( "T-1.E3", 0x10000, 0x08000, CRC(d6fdc376) SHA1(3f4e1fde8b83e3762f9499dfe291309efe940093) )
+
+ ROM_REGION( 0x10000, "audiocpu", 0 )
+ ROM_LOAD( "T-4.A8", 0x00000, 0x08000, CRC(1cbe48e8) SHA1(6ac5981d36a44595bb8dc847c54c7be7b374f82c) )
+
+ ROM_REGION( 0x04000, "gfx1", 0 )
+ ROM_LOAD( "T-5.K8", 0x00000, 0x04000, CRC(35c3dbc5) SHA1(6700c72e5e0f7bd1429d342cb5d3daccd6b1b70f) ) /* characters */
+ ROM_CONTINUE( 0x00000, 0x04000 ) /* A14 tied high, only upper half is used */
+
+ ROM_REGION( 0x80000, "gfx2", 0 )
+ ROM_LOAD( "T-8.D1", 0x00000, 0x10000, CRC(2f0b2336) SHA1(a869e0a50aab7d29afbca46fa04bd470488a8eeb) ) /* tiles */
+ ROM_LOAD( "T-10.C3", 0x10000, 0x10000, CRC(6a0072f4) SHA1(d74b53ed90a4d01020a179f263a39b7547b8f82e) )
+ ROM_RELOAD( 0x30000, 0x10000)
+ ROM_LOAD( "T-11.D3", 0x20000, 0x10000, CRC(53da6cb1) SHA1(52720746298adb01828f959f81b385d268c94343) )
+ ROM_LOAD( "T-6.A1", 0x40000, 0x10000, CRC(a7cce654) SHA1(f6c99622dcacc1d76021ca29b0bbceefbb75c499) )
+ ROM_LOAD( "T-7.C1", 0x50000, 0x10000, CRC(90dd8415) SHA1(8e9d43ff9164fb287ab82df7da8890976b9d21c7) )
+ ROM_RELOAD( 0x70000, 0x10000)
+ ROM_LOAD( "T-9.A3", 0x60000, 0x10000, CRC(44762916) SHA1(3427066fc02d1b9b71a59ac41d3332d5cd8d1423) )
+
+ ROM_REGION( 0x40000, "gfx3", 0 )
+ ROM_LOAD( "T-13.I1", 0x00000, 0x10000, CRC(1cc87f50) SHA1(d7d8a4376b556675dafa0a407bb34b6017f17e7d) ) /* sprites */
+ ROM_LOAD( "T-15.I3", 0x10000, 0x10000, CRC(775ee5d9) SHA1(e39eb558cc2d5cdf4c87b96f85af72e5600b995e) )
+ ROM_LOAD( "T-12.G1", 0x20000, 0x10000, CRC(57783312) SHA1(57942e8c3b7be63ea62bae3c104cb2842eb6b755) )
+ ROM_LOAD( "T-14.G3", 0x30000, 0x10000, CRC(a30e3346) SHA1(150a837fb5d4705df9e8e9a94f78cff0e1c57d64) )
+
+ ROM_REGION( 0x08000, "gfx4", 0 ) /* background tilemaps */
+ ROM_LOAD( "T-16.F9", 0x00000, 0x08000, CRC(9b377277) SHA1(4858560e35144727aea958023f3df785baa994a8) )
ROM_END
ROM_START( turtshipkn )
- ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + banked ROMs images */
- ROM_LOAD( "T-3.G5", 0x00000, 0x08000, CRC(529b091c) SHA1(9a3a885dbf1f9d3c3c326418efdcb4f6f96eb4ae) )
- ROM_LOAD( "T-2.G3", 0x08000, 0x08000, CRC(d2f30195) SHA1(d64f088ed776658563943e8cde086842d0d899f8) )
- ROM_LOAD( "T-1.E3", 0x10000, 0x08000, CRC(2d02da90) SHA1(5cf059e04e145861f9877cefa2c7168e6ded19ac) )
-
- ROM_REGION( 0x10000, "audiocpu", 0 )
- ROM_LOAD( "T-4.A8", 0x00000, 0x08000, CRC(1cbe48e8) SHA1(6ac5981d36a44595bb8dc847c54c7be7b374f82c) )
-
- ROM_REGION( 0x04000, "gfx1", 0 )
- ROM_LOAD( "T-5.K8", 0x00000, 0x04000, CRC(5c2ee02d) SHA1(c8d3dbdaab943c1639795915cf275951501a2a77) ) /* characters */
- ROM_CONTINUE( 0x00000, 0x04000 ) /* A14 tied high, only upper half is used */
-
- ROM_REGION( 0x80000, "gfx2", 0 )
- ROM_LOAD( "T-8.D1", 0x00000, 0x10000, CRC(2f0b2336) SHA1(a869e0a50aab7d29afbca46fa04bd470488a8eeb) ) /* tiles */
- ROM_LOAD( "T-10.C3", 0x10000, 0x10000, CRC(6a0072f4) SHA1(d74b53ed90a4d01020a179f263a39b7547b8f82e) )
- ROM_RELOAD( 0x30000, 0x10000)
- ROM_LOAD( "T-11.D3", 0x20000, 0x10000, CRC(53da6cb1) SHA1(52720746298adb01828f959f81b385d268c94343) )
- ROM_LOAD( "T-6.A1", 0x40000, 0x10000, CRC(a7cce654) SHA1(f6c99622dcacc1d76021ca29b0bbceefbb75c499) )
- ROM_LOAD( "T-7.C1", 0x50000, 0x10000, CRC(90dd8415) SHA1(8e9d43ff9164fb287ab82df7da8890976b9d21c7) )
- ROM_RELOAD( 0x70000, 0x10000)
- ROM_LOAD( "T-9.A3", 0x60000, 0x10000, CRC(44762916) SHA1(3427066fc02d1b9b71a59ac41d3332d5cd8d1423) )
-
- ROM_REGION( 0x40000, "gfx3", 0 )
- ROM_LOAD( "T-13.I1", 0x00000, 0x10000, CRC(1cc87f50) SHA1(d7d8a4376b556675dafa0a407bb34b6017f17e7d) ) /* sprites */
- ROM_LOAD( "T-15.I3", 0x10000, 0x10000, CRC(3bf91fb8) SHA1(1c8368dc8d52c3c48a85391f00c91a80fa5d781d) )
- ROM_LOAD( "T-12.G1", 0x20000, 0x10000, CRC(57783312) SHA1(57942e8c3b7be63ea62bae3c104cb2842eb6b755) )
- ROM_LOAD( "T-14.G3", 0x30000, 0x10000, CRC(ee162dc0) SHA1(127b3cb3ddd47aa8ee70cad2d54b1306ad8f10e8) )
-
- ROM_REGION( 0x08000, "gfx4", 0 ) /* background tilemaps */
- ROM_LOAD( "T-16.F9", 0x00000, 0x08000, CRC(9b377277) SHA1(4858560e35144727aea958023f3df785baa994a8) )
+ ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + banked ROMs images */
+ ROM_LOAD( "T-3.G5", 0x00000, 0x08000, CRC(529b091c) SHA1(9a3a885dbf1f9d3c3c326418efdcb4f6f96eb4ae) )
+ ROM_LOAD( "T-2.G3", 0x08000, 0x08000, CRC(d2f30195) SHA1(d64f088ed776658563943e8cde086842d0d899f8) )
+ ROM_LOAD( "T-1.E3", 0x10000, 0x08000, CRC(2d02da90) SHA1(5cf059e04e145861f9877cefa2c7168e6ded19ac) )
+
+ ROM_REGION( 0x10000, "audiocpu", 0 )
+ ROM_LOAD( "T-4.A8", 0x00000, 0x08000, CRC(1cbe48e8) SHA1(6ac5981d36a44595bb8dc847c54c7be7b374f82c) )
+
+ ROM_REGION( 0x04000, "gfx1", 0 )
+ ROM_LOAD( "T-5.K8", 0x00000, 0x04000, CRC(5c2ee02d) SHA1(c8d3dbdaab943c1639795915cf275951501a2a77) ) /* characters */
+ ROM_CONTINUE( 0x00000, 0x04000 ) /* A14 tied high, only upper half is used */
+
+ ROM_REGION( 0x80000, "gfx2", 0 )
+ ROM_LOAD( "T-8.D1", 0x00000, 0x10000, CRC(2f0b2336) SHA1(a869e0a50aab7d29afbca46fa04bd470488a8eeb) ) /* tiles */
+ ROM_LOAD( "T-10.C3", 0x10000, 0x10000, CRC(6a0072f4) SHA1(d74b53ed90a4d01020a179f263a39b7547b8f82e) )
+ ROM_RELOAD( 0x30000, 0x10000)
+ ROM_LOAD( "T-11.D3", 0x20000, 0x10000, CRC(53da6cb1) SHA1(52720746298adb01828f959f81b385d268c94343) )
+ ROM_LOAD( "T-6.A1", 0x40000, 0x10000, CRC(a7cce654) SHA1(f6c99622dcacc1d76021ca29b0bbceefbb75c499) )
+ ROM_LOAD( "T-7.C1", 0x50000, 0x10000, CRC(90dd8415) SHA1(8e9d43ff9164fb287ab82df7da8890976b9d21c7) )
+ ROM_RELOAD( 0x70000, 0x10000)
+ ROM_LOAD( "T-9.A3", 0x60000, 0x10000, CRC(44762916) SHA1(3427066fc02d1b9b71a59ac41d3332d5cd8d1423) )
+
+ ROM_REGION( 0x40000, "gfx3", 0 )
+ ROM_LOAD( "T-13.I1", 0x00000, 0x10000, CRC(1cc87f50) SHA1(d7d8a4376b556675dafa0a407bb34b6017f17e7d) ) /* sprites */
+ ROM_LOAD( "T-15.I3", 0x10000, 0x10000, CRC(3bf91fb8) SHA1(1c8368dc8d52c3c48a85391f00c91a80fa5d781d) )
+ ROM_LOAD( "T-12.G1", 0x20000, 0x10000, CRC(57783312) SHA1(57942e8c3b7be63ea62bae3c104cb2842eb6b755) )
+ ROM_LOAD( "T-14.G3", 0x30000, 0x10000, CRC(ee162dc0) SHA1(127b3cb3ddd47aa8ee70cad2d54b1306ad8f10e8) )
+
+ ROM_REGION( 0x08000, "gfx4", 0 ) /* background tilemaps */
+ ROM_LOAD( "T-16.F9", 0x00000, 0x08000, CRC(9b377277) SHA1(4858560e35144727aea958023f3df785baa994a8) )
ROM_END
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 3a1b602f9c0..f804ae18664 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -453,7 +453,7 @@ GFXDECODE_END
void slapshot_state::machine_start()
{
membank("z80bank")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x4000);
-
+
m_int6_timer = timer_alloc(TIMER_SLAPSHOT_INTERRUPT6);
}
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 1cdb1cc1559..6dfb2178091 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -137,7 +137,7 @@ void spacefb_state::device_timer(emu_timer &timer, device_timer_id id, int param
assert_always(FALSE, "Unknown id in spacefb_state::device_timer");
}
}
-
+
TIMER_CALLBACK_MEMBER(spacefb_state::interrupt_callback)
{
int next_vpos;
@@ -172,7 +172,7 @@ void spacefb_state::start_interrupt_timer()
void spacefb_state::machine_start()
{
m_interrupt_timer = timer_alloc(TIMER_INTERRUPT);
-
+
save_item(NAME(m_sound_latch));
}
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index 0dfb244cc01..45b231384f8 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -252,7 +252,7 @@ void sprcros2_state::machine_start()
{
membank("masterbank")->configure_entries(0, 2, memregion("master")->base() + 0x10000, 0x2000);
membank("slavebank")->configure_entries(0, 2, memregion("slave")->base() + 0x10000, 0x2000);
-
+
save_item(NAME(m_port7));
save_item(NAME(m_s_port3));
}
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index 842340882b8..14d281bdcd8 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -243,7 +243,7 @@ UINT32 srmp5_state::screen_update_srmp5(screen_device &screen, bitmap_rgb32 &bit
void srmp5_state::machine_start()
{
membank("bank1")->configure_entries(0, 256, memregion("maincpu")->base(), 0x4000);
-
+
save_item(NAME(m_input_select));
save_item(NAME(m_cmd1));
save_item(NAME(m_cmd2));
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 5b1259e6e16..bf8ffd55b04 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -2165,7 +2165,7 @@ static MACHINE_CONFIG_START( sparkman, suna8_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna8_state, suna8_play_samples_w)) // two sample roms
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna8_state, suna8_play_samples_w)) // two sample roms
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(suna8_state, suna8_samples_number_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index c21abdd20ba..ecb0bd1ea9e 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -32,7 +32,7 @@
- dquizgo2: bugged video test
Notes:
-
+
Mr Kicker: The F-E1-16-010 PCB version still needs proper speed ups
Mr Kicker: Doesn't boot without a valid default eeprom, but no longer seems to fail
@@ -458,7 +458,7 @@ static ADDRESS_MAP_START( misncrft_io, AS_IO, 16, vamphalf_state )
ADDRESS_MAP_END
static ADDRESS_MAP_START( coolmini_io, AS_IO, 16, vamphalf_state )
-// AM_RANGE(0x002, 0x003) AM_WRITE(mrkicker_oki_bank_w) // not coolmini?, installed on init
+// AM_RANGE(0x002, 0x003) AM_WRITE(mrkicker_oki_bank_w) // not coolmini?, installed on init
AM_RANGE(0x200, 0x203) AM_WRITE(flipscreen_w)
AM_RANGE(0x300, 0x303) AM_READ_PORT("SYSTEM")
AM_RANGE(0x304, 0x307) AM_READ_PORT("P1_P2")
diff --git a/src/mame/etc/doxy_driver.h b/src/mame/etc/doxy_driver.h
index 906af7379d4..66e90c178b8 100644
--- a/src/mame/etc/doxy_driver.h
+++ b/src/mame/etc/doxy_driver.h
@@ -1,11 +1,11 @@
/*! @file doxy_driver.h
@license BSD-3-Clause
@copyright Angelo Salese & the MAME team
-
+
@basehw 4enraya
Main CPU: Z80
Sound Chip: AY8910
-
+
@memmap 4enraya,Z80
0x0000-0xbfff ROM
0xc000-0xcfff work RAM
@@ -27,14 +27,13 @@
*/
-/**
+/**
template for Doxygen commenting style for drivers
All accepted special commands that aren't in Doxygen needs to be hooked up into the ini file.
memmap/iomap/irq -> [%s,%s] -> [name_of_romset,cpu_name]
irqnum -> type of irq, might accept one or two commands (for vectors)
irqname -> A description of the irq used, might use brief and extended description.
-
+
@sa http://www.stack.nl/~dimitri/doxygen/manual/commands.html
@todo needs discussion for accepted standardized syntax
*/
-
diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h
index f7e32e48e00..f2242a895f5 100644
--- a/src/mame/includes/cclimber.h
+++ b/src/mame/includes/cclimber.h
@@ -21,7 +21,7 @@ public:
m_swimmer_background_color(*this, "bgcolor"),
m_toprollr_bg_videoram(*this, "bg_videoram"),
m_toprollr_bg_coloram(*this, "bg_coloram") { }
-
+
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h
index b8529f8748a..42ec05e4fb4 100644
--- a/src/mame/includes/gaplus.h
+++ b/src/mame/includes/gaplus.h
@@ -51,7 +51,7 @@ public:
required_device<palette_device> m_palette;
namco58xx_device *m_namco58xx;
namco56xx_device *m_namco56xx;
-
+
required_shared_ptr<UINT8> m_customio_3;
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_spriteram;
diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h
index 416ff5da787..56e871113c2 100644
--- a/src/mame/includes/ladybug.h
+++ b/src/mame/includes/ladybug.h
@@ -22,7 +22,7 @@ public:
m_palette(*this, "palette"),
m_port_dsw0(*this, "DSW0"),
m_p1_control(*this, "CONTP1"),
- m_p2_control(*this, "CONTP2") { }
+ m_p2_control(*this, "CONTP2") { }
/* memory pointers */
required_shared_ptr<UINT8> m_videoram;
diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h
index 683e746d1b5..3915293b9f4 100644
--- a/src/mame/includes/namcos86.h
+++ b/src/mame/includes/namcos86.h
@@ -63,7 +63,7 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info2);
TILE_GET_INFO_MEMBER(get_tile_info3);
- DECLARE_DRIVER_INIT(namco86);
+ DECLARE_DRIVER_INIT(namco86);
virtual void machine_start();
virtual void video_start();
DECLARE_PALETTE_INIT(namcos86);
diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h
index 309041968cc..d5bfab76958 100644
--- a/src/mame/includes/nbmj8991.h
+++ b/src/mame/includes/nbmj8991.h
@@ -70,7 +70,7 @@ public:
void gfxdraw();
void postload();
-
+
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h
index 9ea0727ad3a..161d19fe4fb 100644
--- a/src/mame/includes/segas32.h
+++ b/src/mame/includes/segas32.h
@@ -31,7 +31,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
-
+
required_device<timer_device> m_irq_timer_0;
required_device<timer_device> m_irq_timer_1;
@@ -269,7 +269,7 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const;
-// virtual void device_start();
+// virtual void device_start();
// virtual void device_reset();
};
@@ -299,4 +299,3 @@ protected:
extern const UINT8 ga2_v25_opcode_table[];
extern const device_type SEGA_S32_PCB;
-
diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h
index 75f5607f1af..61c541b0759 100644
--- a/src/mame/includes/slapshot.h
+++ b/src/mame/includes/slapshot.h
@@ -49,7 +49,7 @@ public:
required_device<tc0640fio_device> m_tc0640fio;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
-
+
/* memory pointers */
required_shared_ptr<UINT16> m_spriteram;
required_shared_ptr<UINT16> m_spriteext;
diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h
index aa141e635ac..513c3a1679c 100644
--- a/src/mame/includes/spacefb.h
+++ b/src/mame/includes/spacefb.h
@@ -75,14 +75,14 @@ public:
void draw_bullet(offs_t offs, pen_t pen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flip);
void draw_sprite(offs_t offs, pen_t *pens, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flip);
void draw_objects(bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
+
protected:
enum
{
TIMER_INTERRUPT
};
-
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h
index e4e6989e8cd..24a4c4f3630 100644
--- a/src/mame/includes/vastar.h
+++ b/src/mame/includes/vastar.h
@@ -55,6 +55,6 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
-
+
INTERRUPT_GEN_MEMBER(vblank_irq);
};
diff --git a/src/mame/layout/chsuper.lay b/src/mame/layout/chsuper.lay
index c3a385ebb24..7fa3f452215 100644
--- a/src/mame/layout/chsuper.lay
+++ b/src/mame/layout/chsuper.lay
@@ -173,7 +173,7 @@
<color red="0.1" green="0.05" blue="0.0" />
</rect>
</element>
-
+
<element name="start_b" defstate="0">
<rect state="1">
<color red="0.0" green="0.8" blue="0.0" />
@@ -257,6 +257,6 @@
<bezel name="lamp6" element="start" inputtag="IN0" inputmask="0x08">
<bounds x="3.57" y="3.07" width="0.31" height="0.20" />
</bezel>
-
+
</view>
</mamelayout>
diff --git a/src/mame/machine/m1comm.c b/src/mame/machine/m1comm.c
index 9b3c0758c6a..09f0116ff69 100644
--- a/src/mame/machine/m1comm.c
+++ b/src/mame/machine/m1comm.c
@@ -159,7 +159,7 @@ void m1comm_device::device_reset()
m_zfg = 0;
m_cn = 0;
m_fg = 0;
-
+
m_commcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
@@ -172,7 +172,7 @@ READ8_MEMBER(m1comm_device::dlc_reg_r)
return 0xFF;
}
// dirty hack to keep Z80 in RESET state
-
+
UINT8 result = m_dlc_reg[offset];
#ifdef __M1COMM_VERBOSE__
printf("m1comm-dlc_reg_r: read register %02x for value %02x\n", offset, result);
@@ -224,11 +224,11 @@ WRITE8_MEMBER(m1comm_device::syn_w)
case 0x00:
printf("m1comm-syn_w: VINT disabled\n");
break;
-
+
case 0x02:
printf("m1comm-syn_w: VINT enabled\n");
break;
-
+
default:
printf("m1comm-syn_w: %02x\n", data);
break;
@@ -306,7 +306,7 @@ WRITE8_MEMBER(m1comm_device::fg_w)
{
if (!m_cn)
return;
-
+
m_fg = data & 0x01;
}
@@ -327,7 +327,7 @@ void m1comm_device::check_vint_irq()
#ifdef __M1COMM_SIMULATION__
void m1comm_device::comm_tick(){
- if (m_linkenable == 0x01)
+ if (m_linkenable == 0x01)
{
int frameStart = 0x0010;
int frameOffset = 0x0000;
@@ -350,14 +350,14 @@ void m1comm_device::comm_tick(){
printf("M1COMM: listen on %s\n", m_localhost);
m_line_rx.open(m_localhost);
}
-
+
// check tx socket
if (!m_line_tx.is_open())
{
printf("M1COMM: connect to %s\n", m_remotehost);
m_line_tx.open(m_remotehost);
}
-
+
// if both sockets are there check ring
if ((m_line_rx.is_open()) && (m_line_tx.is_open()))
{
@@ -394,7 +394,7 @@ void m1comm_device::comm_tick(){
m_line_tx.write(m_buffer, dataSize);
}
}
-
+
// 0xFE - link size
else if (idx == 0xFE)
{
@@ -405,11 +405,11 @@ void m1comm_device::comm_tick(){
// slave and relay forward message
m_line_tx.write(m_buffer, dataSize);
}
-
+
// consider it done
printf("M1COMM: link established - id %02x of %02x\n", m_linkid, m_linkcount);
m_linkalive = 0x01;
-
+
// write to shared mem
m_shared[0] = 0x01;
m_shared[2] = m_linkid;
@@ -427,13 +427,13 @@ void m1comm_device::comm_tick(){
}
printf("M1COMM: droped a message...\n");
}
-
+
if (m_linkalive == 0x00)
recv = m_line_rx.read(m_buffer, dataSize);
else
recv = 0;
}
-
+
// if we are master and link is not yet established
if (isMaster && (m_linkalive == 0x00))
{
@@ -461,7 +461,7 @@ void m1comm_device::comm_tick(){
m_shared[2] = m_linkid;
m_shared[3] = m_linkcount;
}
-
+
else if (m_linktimer > 0x02)
{
// decrease delay timer
@@ -471,7 +471,7 @@ void m1comm_device::comm_tick(){
}
}
}
- }
+ }
// update "ring buffer" if link established
if (m_linkalive == 0x01)
@@ -526,7 +526,7 @@ void m1comm_device::comm_tick(){
}
recv = m_line_rx.read(m_buffer, dataSize);
}
-
+
// update "ring buffer" if link established
// live relay does not send data
if (m_linkid != 0x00 && m_shared[5] == 0x01)
@@ -542,7 +542,7 @@ void m1comm_device::comm_tick(){
// push message to other nodes
m_line_tx.write(m_buffer, dataSize);
- // master sends some additional status bytes
+ // master sends some additional status bytes
if (isMaster){
m_buffer[0] = 0xF0;
for (int j = 0x00 ; j < frameSize ; j++)
@@ -562,4 +562,4 @@ void m1comm_device::comm_tick(){
}
}
#endif
-} \ No newline at end of file
+}
diff --git a/src/mame/machine/m1comm.h b/src/mame/machine/m1comm.h
index 02cfceb3078..85c0b3eb834 100644
--- a/src/mame/machine/m1comm.h
+++ b/src/mame/machine/m1comm.h
@@ -12,7 +12,7 @@
#define MCFG_M1COMM_ADD(_tag ) \
MCFG_DEVICE_ADD(_tag, M1COMM, 0)
-
+
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@@ -57,7 +57,7 @@ public:
DECLARE_READ8_MEMBER(fg_r);
DECLARE_WRITE8_MEMBER(fg_w);
- // IRQ logic - 5 = VINT, 7 = DLC
+ // IRQ logic - 5 = VINT, 7 = DLC
void check_vint_irq();
protected:
@@ -68,26 +68,26 @@ protected:
private:
UINT8 m_shared[0x1000]; // 2x 2k = 4k; model1 accesses this with 16bit data and 11bit address (A0 to A10)
- UINT8 m_dlc_reg[0x20]; // MB89374 registers
- UINT8 m_dma_reg[0x20]; // MB89237A registers
- UINT8 m_syn; // bit0 is stored; purpose unknown, bit1 is used to enable/disable VINT/IRQ5
- UINT8 m_zfg; // z80 flip gate? purpose unknown, bit0 is stored
- UINT8 m_cn; // bit0 is used to enable/disable the comm board
- UINT8 m_fg; // flip gate? purpose unknown, bit0 is stored, bit7 is connected to ZFG bit 0
-
+ UINT8 m_dlc_reg[0x20]; // MB89374 registers
+ UINT8 m_dma_reg[0x20]; // MB89237A registers
+ UINT8 m_syn; // bit0 is stored; purpose unknown, bit1 is used to enable/disable VINT/IRQ5
+ UINT8 m_zfg; // z80 flip gate? purpose unknown, bit0 is stored
+ UINT8 m_cn; // bit0 is used to enable/disable the comm board
+ UINT8 m_fg; // flip gate? purpose unknown, bit0 is stored, bit7 is connected to ZFG bit 0
+
emu_file m_line_rx; // rx line - can be either differential, simple serial or toslink
emu_file m_line_tx; // tx line - is differential, simple serial and toslink
char m_localhost[256];
char m_remotehost[256];
UINT8 m_buffer[0x1000];
-
+
#ifdef __M1COMM_SIMULATION__
UINT8 m_linkenable;
UINT16 m_linktimer;
UINT8 m_linkalive;
UINT8 m_linkid;
UINT8 m_linkcount;
-
+
void comm_tick();
#endif
};
diff --git a/src/mame/nl.lst b/src/mame/nl.lst
index 904db249b13..67723374e4b 100644
--- a/src/mame/nl.lst
+++ b/src/mame/nl.lst
@@ -29,4 +29,3 @@ pong // (c) 1972 Atari
pongd // (c) 1975 Atari
pongf // (c) 1972 Atari
breakout // (c) 1976 Atari
-
diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c
index 053b3b86a84..491316ae7ac 100644
--- a/src/mame/video/gaplus.c
+++ b/src/mame/video/gaplus.c
@@ -183,9 +183,9 @@ void gaplus_state::video_start()
m_bg_tilemap->configure_groups(*m_gfxdecode->gfx(0), 0xff);
starfield_init();
-
+
save_item(NAME(m_starfield_control));
-
+
for (int i = 0; i < MAX_STARS; i++)
{
save_item(NAME(m_stars[i].x), i);
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index 6e75216c458..4a1458d533a 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -6,14 +6,14 @@
#include "includes/model3.h"
/*
- TODO:
- - Tilemap flash effect
- - Fog
- - Mipmapping
- - Mipmap uploads smaller than a tile
- - Some of the 4-bit and 8-bit textures need their alpha values rechecked
- - Spotlights
- - Recheck normal vector transform
+ TODO:
+ - Tilemap flash effect
+ - Fog
+ - Mipmapping
+ - Mipmap uploads smaller than a tile
+ - Some of the 4-bit and 8-bit textures need their alpha values rechecked
+ - Spotlights
+ - Recheck normal vector transform
*/
@@ -847,8 +847,8 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw
Polygon Data
0x00: x------- -------- -------- -------- Supermodel says specular enable
- -xxxxx-- -------- -------- -------- ?
- ------xx xxxxxxxx xxxxxx-- -------- Polygon ID
+ -xxxxx-- -------- -------- -------- ?
+ ------xx xxxxxxxx xxxxxx-- -------- Polygon ID
-------- -------- -------- -x------ 0 = Triangle, 1 = Quad
-------- -------- -------- ----x--- Vertex 3 shared from previous polygon
-------- -------- -------- -----x-- Vertex 2 shared from previous polygon
@@ -859,9 +859,9 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw
0x01: xxxxxxxx xxxxxxxx xxxxxxxx -------- Polygon normal X coordinate (2.22 fixed point)
-------- -------- -------- -x------ UV format (0 = 13.3, 1 = 16.0)
- -------- -------- -------- ---x---- 1 = Double-sided polygon
+ -------- -------- -------- ---x---- 1 = Double-sided polygon
-------- -------- -------- -----x-- If set, this is the last polygon
- -------- -------- -------- ------x- Poly color, 1 = RGB, 0 = color table
+ -------- -------- -------- ------x- Poly color, 1 = RGB, 0 = color table
-------- -------- -------- x-x-x--x ?
@@ -878,7 +878,7 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw
-------- -------- -------- -x------ Texture page
-------- -------- -------- ---xxxxx Upper 5 bits of texture U coordinate
-------- -------- -------- x------- ?
- -------- -------- -------- --x----- ?
+ -------- -------- -------- --x----- ?
0x05: xxxxxxxx xxxxxxxx xxxxxxxx -------- Specular color?
-------- -------- -------- x------- Low bit of texture U coordinate
@@ -887,27 +887,27 @@ cached_texture *model3_state::get_texture(int page, int texx, int texy, int texw
0x06: x------- -------- -------- -------- Texture contour enable
-xxxxx-- -------- -------- -------- Fixed shading?
- ------x- -------- -------- -------- Enable fixed shading?
- -------x -------- -------- -------- Could be high priority polygon?
+ ------x- -------- -------- -------- Enable fixed shading?
+ -------x -------- -------- -------- Could be high priority polygon?
-------- x------- -------- -------- 1 = disable transparency?
-------- -xxxxx-- -------- -------- Polygon translucency (0 = fully transparent)
-------- -------x -------- -------- 1 = disable lighting
-------- -------- xxxxx--- -------- Polygon light modifier (Amount that a luminous polygon will burn through fog.
- Valid range is 0.0 to 1.0. 0.0 is completely fogged;
- 1.0 has no fog.)
- -------- -------- -----x-- -------- Texture enable
+ Valid range is 0.0 to 1.0. 0.0 is completely fogged;
+ 1.0 has no fog.)
+ -------- -------- -----x-- -------- Texture enable
-------- -------- ------xx x------- Texture format
-------- -------- -------- -------x Alpha enable?
- -------- ------x- -------- -------- Never seen set?
- -------- -------- -------- -----xx- Always set?
+ -------- ------x- -------- -------- Never seen set?
+ -------- -------- -------- -----xx- Always set?
-------- -------- -------- -xxxx--- ?
- TODO: Bits to find (from Real3D dev guide):
- SetHighPriority(): Indicates that the polygon has higher priority than others in scene
- PolygonIsLayered(): Indicates a stencil polygon.
- DoSmoothShading(): Indicates that the polygon will be smooth shaded
- void SetNPScale ( float np_scale ) ; Sets the texture lod scale for the polygon. A value greater than 1 will increase the
- range of the transition of texture level of detail.
+ TODO: Bits to find (from Real3D dev guide):
+ SetHighPriority(): Indicates that the polygon has higher priority than others in scene
+ PolygonIsLayered(): Indicates a stencil polygon.
+ DoSmoothShading(): Indicates that the polygon will be smooth shaded
+ void SetNPScale ( float np_scale ) ; Sets the texture lod scale for the polygon. A value greater than 1 will increase the
+ range of the transition of texture level of detail.
Vertex entry
@@ -953,8 +953,8 @@ WRITE64_MEMBER(model3_state::real3d_polygon_ram_w)
static const UINT8 texture_decode16[64] =
{
- 0, 1, 4, 5, 8, 9, 12, 13,
- 2, 3, 6, 7, 10, 11, 14, 15,
+ 0, 1, 4, 5, 8, 9, 12, 13,
+ 2, 3, 6, 7, 10, 11, 14, 15,
16, 17, 20, 21, 24, 25, 28, 29,
18, 19, 22, 23, 26, 27, 30, 31,
32, 33, 36, 37, 40, 41, 44, 45,
@@ -965,10 +965,10 @@ static const UINT8 texture_decode16[64] =
static const UINT8 texture_decode8[32] =
{
- 1, 3, 5, 7,
- 0, 2, 4, 6,
- 9, 11, 13, 15,
- 8, 10, 12, 14,
+ 1, 3, 5, 7,
+ 0, 2, 4, 6,
+ 9, 11, 13, 15,
+ 8, 10, 12, 14,
17, 19, 21, 23,
16, 18, 20, 22,
25, 27, 29, 31,
@@ -1035,21 +1035,21 @@ inline void model3_state::write_texture8(int xpos, int ypos, int width, int heig
}
/*
- Texture header:
-
- -------- -------- -------- --xxxxxx X-position
- -------- -------- ----xxxx x------- Y-position
- -------- -------x xx------ -------- Width
- -------- ----xxx- -------- -------- Height
- -------- ---x---- -------- -------- Texture page
- -------- --x----- -------- -------- Write 8-bit data to the lower byte of texel
- -------- -x------ -------- -------- Write 8-bit data to the upper byte of texel
- -------- x------- -------- -------- Bitdepth, 0 = 8-bit, 1 = 16-bit
- xxxxxxxx -------- -------- -------- Texture type
- 0x00 = texture with mipmaps
- 0x01 = texture without mipmaps
- 0x02 = only mipmaps
- 0x80 = possibly gamma table
+ Texture header:
+
+ -------- -------- -------- --xxxxxx X-position
+ -------- -------- ----xxxx x------- Y-position
+ -------- -------x xx------ -------- Width
+ -------- ----xxx- -------- -------- Height
+ -------- ---x---- -------- -------- Texture page
+ -------- --x----- -------- -------- Write 8-bit data to the lower byte of texel
+ -------- -x------ -------- -------- Write 8-bit data to the upper byte of texel
+ -------- x------- -------- -------- Bitdepth, 0 = 8-bit, 1 = 16-bit
+ xxxxxxxx -------- -------- -------- Texture type
+ 0x00 = texture with mipmaps
+ 0x01 = texture without mipmaps
+ 0x02 = only mipmaps
+ 0x80 = possibly gamma table
*/
@@ -1450,11 +1450,11 @@ static int clip_w(const m3_clip_vertex* v, int num_vertices, m3_clip_vertex* out
int v1_side = (v[i].w < W_PLANE) ? -1 : 1;
int v2_side = (v[previ].w < W_PLANE) ? -1 : 1;
- if ((v1_side * v2_side) < 0) // edge goes through W plane
+ if ((v1_side * v2_side) < 0) // edge goes through W plane
{
// insert vertex at intersection point
float wdiv = v[previ].w - v[i].w;
- if (wdiv == 0.0f) // 0 edge means degenerate polygon
+ if (wdiv == 0.0f) // 0 edge means degenerate polygon
return 0;
float t = fabs((W_PLANE - v[previ].w) / wdiv);
@@ -1469,7 +1469,7 @@ static int clip_w(const m3_clip_vertex* v, int num_vertices, m3_clip_vertex* out
clipv[clip_verts].s = v[previ].s + ((v[i].s - v[previ].s) * t);
++clip_verts;
}
- if (v1_side > 0) // current point is inside
+ if (v1_side > 0) // current point is inside
{
clipv[clip_verts] = v[i];
++clip_verts;
@@ -1500,12 +1500,12 @@ static int clip(const m3_clip_vertex* v, int num_vertices, m3_clip_vertex* out,
float v1_axis, v2_axis;
- if (sign) // +axis
+ if (sign) // +axis
{
v1_axis = v1a[axis];
v2_axis = v2a[axis];
}
- else // -axis
+ else // -axis
{
v1_axis = -v1a[axis];
v2_axis = -v2a[axis];
@@ -1514,12 +1514,12 @@ static int clip(const m3_clip_vertex* v, int num_vertices, m3_clip_vertex* out,
v1_side = (v1_axis <= v[i].w) ? 1 : -1;
v2_side = (v2_axis <= v[previ].w) ? 1 : -1;
- if ((v1_side * v2_side) < 0) // edge goes through W plane
+ if ((v1_side * v2_side) < 0) // edge goes through W plane
{
// insert vertex at intersection point
float wdiv = ((v[previ].w - v2_axis) - (v[i].w - v1_axis));
- if (wdiv == 0.0f) // 0 edge means degenerate polygon
+ if (wdiv == 0.0f) // 0 edge means degenerate polygon
return 0;
float t = fabs((v[previ].w - v2_axis) / wdiv);
@@ -1534,7 +1534,7 @@ static int clip(const m3_clip_vertex* v, int num_vertices, m3_clip_vertex* out,
clipv[clip_verts].s = v[previ].s + ((v[i].s - v[previ].s) * t);
++clip_verts;
}
- if (v1_side > 0) // current point is inside
+ if (v1_side > 0) // current point is inside
{
clipv[clip_verts] = v[i];
++clip_verts;
@@ -1728,7 +1728,7 @@ void model3_state::draw_model(UINT32 addr)
clip_vert[i].z = p[i][2];
clip_vert[i].w = p[i][3];
- clip_vert[i].u = vertex[i].u * texture_coord_scale * 256.0f; // 8 bits of subtexel accuracy for bilinear filtering
+ clip_vert[i].u = vertex[i].u * texture_coord_scale * 256.0f; // 8 bits of subtexel accuracy for bilinear filtering
clip_vert[i].v = vertex[i].v * texture_coord_scale * 256.0f;
// transform vertex normal
@@ -1772,12 +1772,12 @@ void model3_state::draw_model(UINT32 addr)
/* clip against view frustum */
num_vertices = clip_w(clip_vert, num_vertices, clip_vert);
- num_vertices = clip(clip_vert, num_vertices, clip_vert, 0, 0); // W <= -X
- num_vertices = clip(clip_vert, num_vertices, clip_vert, 0, 1); // W <= +X
- num_vertices = clip(clip_vert, num_vertices, clip_vert, 1, 0); // W <= -Y
- num_vertices = clip(clip_vert, num_vertices, clip_vert, 1, 1); // W <= +X
- num_vertices = clip(clip_vert, num_vertices, clip_vert, 2, 0); // W <= -Z
- num_vertices = clip(clip_vert, num_vertices, clip_vert, 2, 1); // W <= +Z
+ num_vertices = clip(clip_vert, num_vertices, clip_vert, 0, 0); // W <= -X
+ num_vertices = clip(clip_vert, num_vertices, clip_vert, 0, 1); // W <= +X
+ num_vertices = clip(clip_vert, num_vertices, clip_vert, 1, 0); // W <= -Y
+ num_vertices = clip(clip_vert, num_vertices, clip_vert, 1, 1); // W <= +X
+ num_vertices = clip(clip_vert, num_vertices, clip_vert, 2, 0); // W <= -Z
+ num_vertices = clip(clip_vert, num_vertices, clip_vert, 2, 1); // W <= +Z
/* divide by W, transform to screen coords */
for(i=0; i < num_vertices; i++)
@@ -1823,7 +1823,7 @@ void model3_state::draw_model(UINT32 addr)
int tex_height = (header[3] & 0x7);
int tex_format = (header[6] >> 7) & 0x7;
- if (tex_format != 0 && tex_format != 7) // enable color modulation if this is not a color texture
+ if (tex_format != 0 && tex_format != 7) // enable color modulation if this is not a color texture
colormod = true;
if (tex_width >= 6 || tex_height >= 6) // srally2 poly ram has degenerate polys with 2k tex size (cpu bug or intended?)
@@ -1838,7 +1838,7 @@ void model3_state::draw_model(UINT32 addr)
for (i=2; i < num_vertices; i++)
{
- bool alpha = (header[6] & 0x1) || ((header[6] & 0x800000) == 0); // put to alpha buffer if there's any transparency involved
+ bool alpha = (header[6] & 0x1) || ((header[6] & 0x800000) == 0); // 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)
@@ -2037,12 +2037,12 @@ void model3_state::draw_viewport(int pri, UINT32 address)
m_viewport_far = 100000.0f;
/* set up frustum */
- float frustum_left = atan2(*(float *)&node[12], *(float *)&node[13]);
- float frustum_right = -atan2(*(float *)&node[16], -*(float *)&node[17]);
- float frustum_top = atan2(*(float *)&node[14], *(float *)&node[15]);
- float frustum_bottom = -atan2(*(float *)&node[18], -*(float *)&node[19]);
-// float frustum_1 = atan2(*(float *)&node[9], *(float *)&node[8]);
-// float frustum_2 = atan2(*(float *)&node[11], *(float *)&node[10]);
+ float frustum_left = atan2(*(float *)&node[12], *(float *)&node[13]);
+ float frustum_right = -atan2(*(float *)&node[16], -*(float *)&node[17]);
+ float frustum_top = atan2(*(float *)&node[14], *(float *)&node[15]);
+ float frustum_bottom = -atan2(*(float *)&node[18], -*(float *)&node[19]);
+// float frustum_1 = atan2(*(float *)&node[9], *(float *)&node[8]);
+// float frustum_2 = atan2(*(float *)&node[11], *(float *)&node[10]);
/*
printf("%f\n", *(float *)&node[3]);
@@ -2379,7 +2379,7 @@ void model3_renderer::draw_scanline_tex(INT32 scanline, const extent_t &extent,
if (z <= zb[x])
{
UINT32 texel;
- TEX_FETCH(); // TODO fetch rgbaint_t instead
+ TEX_FETCH(); // TODO fetch rgbaint_t instead
rgbaint_t color(texel);
@@ -2425,7 +2425,7 @@ void model3_renderer::draw_scanline_tex_colormod(INT32 scanline, const extent_t
if (z <= zb[x])
{
UINT32 texel;
- TEX_FETCH(); // TODO fetch rgbaint_t instead
+ TEX_FETCH(); // TODO fetch rgbaint_t instead
rgbaint_t color(texel);
diff --git a/src/mame/video/n64.h b/src/mame/video/n64.h
index 9d132f22146..ae7231c9dd0 100644
--- a/src/mame/video/n64.h
+++ b/src/mame/video/n64.h
@@ -193,8 +193,8 @@ public:
// YUV Factors
void set_yuv_factors(color_t k023, color_t k1, color_t k4, color_t k5) { m_k023 = k023; m_k1 = k1; m_k4 = k4; m_k5 = k5; }
- color_t& get_k023() { return m_k023; }
- color_t& get_k1() { return m_k1; }
+ color_t& get_k023() { return m_k023; }
+ color_t& get_k1() { return m_k1; }
// Blender-related (move into RDP::Blender)
void set_blender_input(INT32 cycle, INT32 which, color_t** input_rgb, color_t** input_a, INT32 a, INT32 b, rdp_span_aux* userdata);
@@ -210,7 +210,7 @@ public:
void tc_div_no_perspective(INT32 ss, INT32 st, INT32 sw, INT32* sss, INT32* sst);
UINT32 get_log2(UINT32 lod_clamp);
void render_spans(INT32 start, INT32 end, INT32 tilenum, bool flip, extent_t* spans, bool rect, rdp_poly_state* object);
- INT32 get_alpha_cvg(INT32 comb_alpha, rdp_span_aux* userdata, const rdp_poly_state &object);
+ INT32 get_alpha_cvg(INT32 comb_alpha, rdp_span_aux* userdata, const rdp_poly_state &object);
void z_store(const rdp_poly_state &object, UINT32 zcurpixel, UINT32 dzcurpixel, UINT32 z, UINT32 enc);
UINT32 z_decompress(UINT32 zcurpixel);
@@ -281,8 +281,8 @@ public:
color_t m_env_alpha; /* generic alpha constant ('environment') */
color_t m_fog_color; /* generic color constant ('fog') */
color_t m_key_scale; /* color-keying constant */
- color_t m_lod_fraction; /* Z-based LOD fraction for this poly */
- color_t m_prim_lod_fraction; /* fixed LOD fraction for this poly */
+ color_t m_lod_fraction; /* Z-based LOD fraction for this poly */
+ color_t m_prim_lod_fraction; /* fixed LOD fraction for this poly */
color_t m_one;
color_t m_zero;
@@ -332,7 +332,7 @@ private:
void video_update32(n64_periphs* n64, bitmap_rgb32 &bitmap);
typedef void (n64_rdp::*compute_cvg_t) (extent_t* spans, INT32* majorx, INT32* minorx, INT32* majorxint, INT32* minorxint, INT32 scanline, INT32 yh, INT32 yl, INT32 base);
- compute_cvg_t m_compute_cvg[2];
+ compute_cvg_t m_compute_cvg[2];
running_machine* m_machine;
diff --git a/src/mame/video/n64types.h b/src/mame/video/n64types.h
index 98b7ff0e766..625ffd520f8 100644
--- a/src/mame/video/n64types.h
+++ b/src/mame/video/n64types.h
@@ -283,10 +283,10 @@ struct rdp_span_aux
color_t m_shade_alpha; /* gouraud-shaded alpha */
color_t m_key_scale; /* color-keying constant */
color_t m_noise_color; /* noise */
- color_t m_lod_fraction; /* Z-based LOD fraction for this poly */
- color_t m_prim_lod_fraction; /* fixed LOD fraction for this poly */
- color_t m_k4;
- color_t m_k5;
+ color_t m_lod_fraction; /* Z-based LOD fraction for this poly */
+ color_t m_prim_lod_fraction; /* fixed LOD fraction for this poly */
+ color_t m_k4;
+ color_t m_k5;
color_inputs_t m_color_inputs;
UINT32 m_current_pix_cvg;
UINT32 m_current_mem_cvg;
@@ -300,7 +300,7 @@ struct rdp_span_aux
INT32 m_dzpix_enc;
UINT8* m_tmem; /* pointer to texture cache for this polygon */
bool m_start_span;
- rgbaint_t m_clamp_diff[8];
+ rgbaint_t m_clamp_diff[8];
};
struct z_decompress_entry_t
@@ -331,4 +331,4 @@ class span_param_t
};
};
-#endif // _VIDEO_N64TYPES_H_ \ No newline at end of file
+#endif // _VIDEO_N64TYPES_H_
diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c
index 0b2e31e3b9f..2878127fd33 100644
--- a/src/mame/video/namcos86.c
+++ b/src/mame/video/namcos86.c
@@ -148,7 +148,7 @@ void namcos86_state::video_start()
}
m_spriteram = m_rthunder_spriteram + 0x1800;
-
+
save_item(NAME(m_tilebank));
save_item(NAME(m_xscroll));
save_item(NAME(m_yscroll));
diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c
index c07a598c27c..cc688e9d1ab 100644
--- a/src/mame/video/nbmj8991.c
+++ b/src/mame/video/nbmj8991.c
@@ -289,7 +289,7 @@ void nbmj8991_state::gfxdraw()
void nbmj8991_state::video_start()
{
m_blitter_timer = timer_alloc(TIMER_BLITTER);
-
+
int width = m_screen->width();
int height = m_screen->height();
@@ -297,9 +297,9 @@ void nbmj8991_state::video_start()
m_videoram = auto_alloc_array(machine(), UINT8, width * height);
m_clut = auto_alloc_array(machine(), UINT8, 0x800);
memset(m_videoram, 0x00, (width * height * sizeof(UINT8)));
-
+
m_screen_refresh = 1;
-
+
save_item(NAME(m_scrollx));
save_item(NAME(m_scrolly));
save_item(NAME(m_blitter_destx));
@@ -316,7 +316,7 @@ void nbmj8991_state::video_start()
save_pointer(NAME(m_videoram), width * height);
save_pointer(NAME(m_clut), 0x800);
save_item(NAME(m_flipscreen_old));
-
+
machine().save().register_postload(save_prepost_delegate(FUNC(nbmj8991_state::postload), this));
}
diff --git a/src/mame/video/rdpfiltr.inc b/src/mame/video/rdpfiltr.inc
index f3117f1f0f4..31f10f4858a 100644
--- a/src/mame/video/rdpfiltr.inc
+++ b/src/mame/video/rdpfiltr.inc
@@ -614,4 +614,4 @@ INLINE UINT32 ge_two(UINT32 enb)
}
return 0;
}
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/video/rdptpipe.c b/src/mame/video/rdptpipe.c
index 8740451088a..34a62f70c4a 100644
--- a/src/mame/video/rdptpipe.c
+++ b/src/mame/video/rdptpipe.c
@@ -476,7 +476,7 @@ void n64_texture_pipe_t::lod_1cycle(INT32* sss, INT32* sst, const INT32 s, const
/* FIXME: ???
if(object.m_other_modes.sharpen_tex_en && magnify)
{
- userdata->m_lod_fraction |= 0x100;
+ userdata->m_lod_fraction |= 0x100;
}
*/
}
@@ -550,7 +550,7 @@ void n64_texture_pipe_t::lod_2cycle(INT32* sss, INT32* sst, const INT32 s, const
/* FIXME: ???
if(object.m_other_modes.sharpen_tex_en && magnify)
{
- userdata->m_lod_fraction |= 0x100;
+ userdata->m_lod_fraction |= 0x100;
}*/
if (object.m_other_modes.tex_lod_en)
diff --git a/src/mame/video/rdptpipe.h b/src/mame/video/rdptpipe.h
index 0dbd4fc8030..f190f8fee0e 100644
--- a/src/mame/video/rdptpipe.h
+++ b/src/mame/video/rdptpipe.h
@@ -111,57 +111,57 @@ class n64_texture_pipe_t
void mask(rgbaint_t& st, const n64_tile_t& tile);
void mask_coupled(rgbaint_t& sstt, const n64_tile_t& tile);
- rgbaint_t shift_cycle(rgbaint_t& st, const n64_tile_t& tile);
+ rgbaint_t shift_cycle(rgbaint_t& st, const n64_tile_t& tile);
void shift_copy(rgbaint_t& st, const n64_tile_t& tile);
void clamp_cycle(rgbaint_t& st, rgbaint_t& stfrac, rgbaint_t& maxst, const INT32 tilenum, const n64_tile_t& tile, rdp_span_aux* userdata);
void clamp_cycle_light(rgbaint_t& st, rgbaint_t& maxst, const INT32 tilenum, const n64_tile_t& tile, rdp_span_aux* userdata);
- void fetch_nop(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
-
- void fetch_rgba16_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_rgba16_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_rgba16_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_rgba32_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_rgba32_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_rgba32_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
-
- void fetch_yuv(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
-
- void fetch_ci4_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ci4_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ci4_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ci8_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ci8_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ci8_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
-
- void fetch_ia4_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ia4_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ia4_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ia8_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ia8_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ia8_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ia16_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ia16_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_ia16_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
-
- void fetch_i4_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_i4_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_i4_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_i8_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_i8_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
- void fetch_i8_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_nop(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+
+ void fetch_rgba16_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_rgba16_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_rgba16_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_rgba32_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_rgba32_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_rgba32_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+
+ void fetch_yuv(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+
+ void fetch_ci4_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ci4_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ci4_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ci8_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ci8_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ci8_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+
+ void fetch_ia4_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ia4_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ia4_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ia8_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ia8_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ia8_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ia16_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ia16_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_ia16_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+
+ void fetch_i4_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_i4_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_i4_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_i8_tlut0(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_i8_tlut1(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
+ void fetch_i8_raw(rgbaint_t& out, INT32 s, INT32 t, INT32 tbase, INT32 tpal, rdp_span_aux* userdata);
texel_fetcher_t m_texel_fetch[16*5];
n64_rdp* m_rdp;
INT32 m_maskbits_table[16];
- color_t m_expand_16to32_table[0x10000];
+ color_t m_expand_16to32_table[0x10000];
UINT16 m_lod_lookup[0x80000];
- rgbaint_t m_st2_add;
- rgbaint_t m_v1;
+ rgbaint_t m_st2_add;
+ rgbaint_t m_v1;
};
#endif // _VIDEO_RDPTEXPIPE_H_
diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c
index 16f9f75d271..dd9627f481d 100644
--- a/src/mame/video/segas32.c
+++ b/src/mame/video/segas32.c
@@ -43,7 +43,7 @@
---- -t-- ---- ---- : Tile banking related
---- --f- ---- ---- : 1= Global X/Y flip? (most games?)
---- ---f ---- ---- : 1= prohbit Y flip? (Air Rescue 2nd screen title, also gets set on one of the intro sequence screens)
- ---- ---- ---- 4--- : 1= X+Y flip for NBG3
+ ---- ---- ---- 4--- : 1= X+Y flip for NBG3
---- ---- ---- -2-- : 1= X+Y flip for NBG2
---- ---- ---- --1- : 1= X+Y flip for NBG1
---- ---- ---- ---0 : 1= X+Y flip for NBG0
@@ -256,7 +256,7 @@ void segas32_state::common_start(int multi32)
memset(m_mixer_control, 0xff, sizeof(m_mixer_control[0][0]) * 0x80 );
-
+
}
@@ -884,11 +884,11 @@ void segas32_state::update_tilemap_zoom(screen_device &screen, struct segas32_st
/* determine if we're flipped */
int global_flip = (m_system32_videoram[0x1ff00 / 2] >> 9)&1;
-
+
int flipx = global_flip;
int flipy = global_flip;
-
+
int layer_flip = (m_system32_videoram[0x1ff00 / 2] >> bgnum) & 1;
flipy ^= layer_flip;
diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c
index 3f3ca029578..7cc4faf59b0 100644
--- a/src/mame/video/snk68.c
+++ b/src/mame/video/snk68.c
@@ -62,7 +62,7 @@ void snk68_state::video_start()
m_fg_tile_offset = 0;
common_video_start();
-
+
save_item(NAME(m_fg_tile_offset));
}
@@ -170,7 +170,7 @@ void snk68_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect,
// (globally selected)
bool const is_pow = (m_gfxdecode->gfx(1)->elements() <= 0x4000);
bool const flip = flip_screen();
-
+
for (int offs = 0; offs < 0x800; offs += 0x40)
{
int mx = (m_spriteram[offs + 2*group] & 0xff) << 4;
diff --git a/src/mame/video/spacefb.c b/src/mame/video/spacefb.c
index 2a6eca758b0..c663655dc32 100644
--- a/src/mame/video/spacefb.c
+++ b/src/mame/video/spacefb.c
@@ -88,7 +88,7 @@ void spacefb_state::video_start()
but most likely, the actual star position is random as the hardware
uses whatever value is on the shift register on power-up */
m_star_shift_reg = 0x18f89;
-
+
save_pointer(NAME(m_object_present_map), width * height);
save_item(NAME(m_port_0));
save_item(NAME(m_port_2));
diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c
index a24561714fe..5dfce63e4ef 100644
--- a/src/mess/drivers/bbc.c
+++ b/src/mess/drivers/bbc.c
@@ -1089,7 +1089,7 @@ static MACHINE_CONFIG_DERIVED( bbcmc, bbcm )
/* fdc */
MCFG_DEVICE_REMOVE("wd177x")
-// MCFG_WD1772_ADD("wd177x", XTAL_16MHz / 2)
+// MCFG_WD1772_ADD("wd177x", XTAL_16MHz / 2)
MCFG_WD1770_ADD("wd177x", XTAL_16MHz / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_drq_w))
diff --git a/src/mess/drivers/crvision.c b/src/mess/drivers/crvision.c
index 97b67a9b292..08250767a2e 100644
--- a/src/mess/drivers/crvision.c
+++ b/src/mess/drivers/crvision.c
@@ -699,7 +699,7 @@ void crvision_state::machine_start()
void laser2001_state::machine_start()
{
crvision_state::machine_start();
-
+
// zerofill/state saving
m_joylatch = 0;
m_centronics_busy = 0;
diff --git a/src/mess/drivers/hh_tms1k.c b/src/mess/drivers/hh_tms1k.c
index 5cf0d2ba650..8504f383829 100644
--- a/src/mess/drivers/hh_tms1k.c
+++ b/src/mess/drivers/hh_tms1k.c
@@ -4073,7 +4073,7 @@ void tbreakup_state::prepare_display()
m_display_segmask[y] = 0x7f;
m_display_state[y] = (m_r >> y & 1) ? (m_o & 0x7f) : 0;
}
-
+
// 22 round leds from O2-O7 and expander port 7
for (int y = 2; y < 8; y++)
m_display_state[y] = (m_o >> y & 1) ? m_exp_port[6] : 0;
@@ -4081,7 +4081,7 @@ void tbreakup_state::prepare_display()
// 24 rectangular leds from expander ports 1-6 (not strobed)
for (int y = 0; y < 6; y++)
m_display_state[y+8] = m_exp_port[y];
-
+
set_display_size(8, 14);
display_update();
}
@@ -4099,7 +4099,7 @@ WRITE16_MEMBER(tbreakup_state::write_r)
// R7,R8: input mux
m_inp_mux = data >> 7 & 3;
-
+
// R3-R5: TMS1025 port S
// R2: TMS1025 STD pin
m_expander->write_s(space, 0, data >> 3 & 7);
@@ -4114,7 +4114,7 @@ WRITE16_MEMBER(tbreakup_state::write_o)
{
// O0-O3: TMS1025 port H
m_expander->write_h(space, 0, data & 0xf);
-
+
// O0-O7: led state
m_o = data;
prepare_display();
@@ -4182,7 +4182,7 @@ static MACHINE_CONFIG_START( tbreakup, tbreakup_state )
MCFG_TMS1XXX_READ_K_CB(READ8(tbreakup_state, read_k))
MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tbreakup_state, write_r))
MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tbreakup_state, write_o))
-
+
MCFG_DEVICE_ADD("expander", TMS1025, 0)
MCFG_TMS1024_WRITE_PORT_CB(1, WRITE8(tbreakup_state, expander_w))
MCFG_TMS1024_WRITE_PORT_CB(2, WRITE8(tbreakup_state, expander_w))
diff --git a/src/mess/drivers/hp64k.c b/src/mess/drivers/hp64k.c
index 641a7e30c88..61f3141c589 100644
--- a/src/mess/drivers/hp64k.c
+++ b/src/mess/drivers/hp64k.c
@@ -20,447 +20,447 @@
#include "cpu/hphybrid/hphybrid.h"
#include "video/i8275.h"
-#define BIT_MASK(n) (1U << (n))
+#define BIT_MASK(n) (1U << (n))
// Macros to clear/set single bits
-#define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n))
-#define BIT_SET(w , n) ((w) |= BIT_MASK(n))
+#define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n))
+#define BIT_SET(w , n) ((w) |= BIT_MASK(n))
class hp64k_state : public driver_device
{
public:
- hp64k_state(const machine_config &mconfig, device_type type, const char *tag);
+ hp64k_state(const machine_config &mconfig, device_type type, const char *tag);
- //virtual void driver_start();
- //virtual void machine_start();
- virtual void video_start();
- virtual void machine_reset();
+ //virtual void driver_start();
+ //virtual void machine_start();
+ virtual void video_start();
+ virtual void machine_reset();
- UINT8 hp64k_crtc_filter(UINT8 data);
- DECLARE_WRITE16_MEMBER(hp64k_crtc_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_crtc_drq_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_crtc_vrtc_w);
+ UINT8 hp64k_crtc_filter(UINT8 data);
+ DECLARE_WRITE16_MEMBER(hp64k_crtc_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_crtc_drq_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_crtc_vrtc_w);
- I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels);
+ I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels);
- DECLARE_READ16_MEMBER(hp64k_rear_sw_r);
+ DECLARE_READ16_MEMBER(hp64k_rear_sw_r);
- IRQ_CALLBACK_MEMBER(hp64k_irq_callback);
- void hp64k_update_irl(void);
- DECLARE_WRITE16_MEMBER(hp64k_irl_mask_w);
+ IRQ_CALLBACK_MEMBER(hp64k_irq_callback);
+ void hp64k_update_irl(void);
+ DECLARE_WRITE16_MEMBER(hp64k_irl_mask_w);
- TIMER_DEVICE_CALLBACK_MEMBER(hp64k_kb_scan);
- DECLARE_READ16_MEMBER(hp64k_kb_r);
+ TIMER_DEVICE_CALLBACK_MEMBER(hp64k_kb_scan);
+ DECLARE_READ16_MEMBER(hp64k_kb_r);
private:
- required_device<hp_5061_3011_cpu_device> m_cpu;
- required_device<i8275_device> m_crtc;
- required_device<palette_device> m_palette;
- required_ioport m_io_key0;
- required_ioport m_io_key1;
- required_ioport m_io_key2;
- required_ioport m_io_key3;
-
- // Character generator
- const UINT8 *m_chargen;
-
- UINT32 m_crtc_ptr;
- bool m_crtc_drq;
- bool m_vrtc;
-
- // Interrupt handling
- UINT8 m_irl_mask;
- UINT8 m_irl_pending;
-
- // State of keyboard
- ioport_value m_kb_state[ 4 ];
- UINT8 m_kb_row_col;
- bool m_kb_scan_on;
- bool m_kb_pressed;
+ required_device<hp_5061_3011_cpu_device> m_cpu;
+ required_device<i8275_device> m_crtc;
+ required_device<palette_device> m_palette;
+ required_ioport m_io_key0;
+ required_ioport m_io_key1;
+ required_ioport m_io_key2;
+ required_ioport m_io_key3;
+
+ // Character generator
+ const UINT8 *m_chargen;
+
+ UINT32 m_crtc_ptr;
+ bool m_crtc_drq;
+ bool m_vrtc;
+
+ // Interrupt handling
+ UINT8 m_irl_mask;
+ UINT8 m_irl_pending;
+
+ // State of keyboard
+ ioport_value m_kb_state[ 4 ];
+ UINT8 m_kb_row_col;
+ bool m_kb_scan_on;
+ bool m_kb_pressed;
};
static ADDRESS_MAP_START(cpu_mem_map , AS_PROGRAM , 16 , hp64k_state)
- AM_RANGE(0x0000 , 0x3fff) AM_ROM
- AM_RANGE(0x8000 , 0x8001) AM_WRITE(hp64k_crtc_w)
- AM_RANGE(0x8002 , 0xffff) AM_RAM
+ AM_RANGE(0x0000 , 0x3fff) AM_ROM
+ AM_RANGE(0x8000 , 0x8001) AM_WRITE(hp64k_crtc_w)
+ AM_RANGE(0x8002 , 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START(cpu_io_map , AS_IO , 16 , hp64k_state)
- // PA = 0, IC = [0..3]
- // Keyboard input
- AM_RANGE(HP_MAKE_IOADDR(0 , 0) , HP_MAKE_IOADDR(0 , 3)) AM_READ(hp64k_kb_r)
- // PA = 7, IC = 2
- // Rear-panel switches
- AM_RANGE(HP_MAKE_IOADDR(7 , 2) , HP_MAKE_IOADDR(7 , 2)) AM_READ(hp64k_rear_sw_r)
- // PA = 12, IC = [0..3]
- // Interrupt mask
- AM_RANGE(HP_MAKE_IOADDR(12 , 0) , HP_MAKE_IOADDR(12 , 3)) AM_WRITE(hp64k_irl_mask_w)
+ // PA = 0, IC = [0..3]
+ // Keyboard input
+ AM_RANGE(HP_MAKE_IOADDR(0 , 0) , HP_MAKE_IOADDR(0 , 3)) AM_READ(hp64k_kb_r)
+ // PA = 7, IC = 2
+ // Rear-panel switches
+ AM_RANGE(HP_MAKE_IOADDR(7 , 2) , HP_MAKE_IOADDR(7 , 2)) AM_READ(hp64k_rear_sw_r)
+ // PA = 12, IC = [0..3]
+ // Interrupt mask
+ AM_RANGE(HP_MAKE_IOADDR(12 , 0) , HP_MAKE_IOADDR(12 , 3)) AM_WRITE(hp64k_irl_mask_w)
ADDRESS_MAP_END
hp64k_state::hp64k_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig , type , tag),
- m_cpu(*this , "cpu"),
- m_crtc(*this , "crtc"),
- m_palette(*this , "palette"),
- m_io_key0(*this , "KEY0"),
- m_io_key1(*this , "KEY1"),
- m_io_key2(*this , "KEY2"),
- m_io_key3(*this , "KEY3")
+ : driver_device(mconfig , type , tag),
+ m_cpu(*this , "cpu"),
+ m_crtc(*this , "crtc"),
+ m_palette(*this , "palette"),
+ m_io_key0(*this , "KEY0"),
+ m_io_key1(*this , "KEY1"),
+ m_io_key2(*this , "KEY2"),
+ m_io_key3(*this , "KEY3")
{
}
void hp64k_state::video_start()
{
- m_chargen = memregion("chargen")->base();
+ m_chargen = memregion("chargen")->base();
}
void hp64k_state::machine_reset()
{
- m_crtc_drq = false;
- m_vrtc = false;
- m_crtc_ptr = 0;
- m_irl_mask = 0;
- m_irl_pending = 0;
- memset(&m_kb_state[ 0 ] , 0 , sizeof(m_kb_state));
- m_kb_row_col = 0;
- m_kb_scan_on = true;
+ m_crtc_drq = false;
+ m_vrtc = false;
+ m_crtc_ptr = 0;
+ m_irl_mask = 0;
+ m_irl_pending = 0;
+ memset(&m_kb_state[ 0 ] , 0 , sizeof(m_kb_state));
+ m_kb_row_col = 0;
+ m_kb_scan_on = true;
}
UINT8 hp64k_state::hp64k_crtc_filter(UINT8 data)
{
- bool inv = (data & 0xe0) == 0xe0;
+ bool inv = (data & 0xe0) == 0xe0;
- return inv ? (data & 0xf2) : data;
+ return inv ? (data & 0xf2) : data;
}
WRITE16_MEMBER(hp64k_state::hp64k_crtc_w)
{
- m_crtc->write(space , offset == 0 , hp64k_crtc_filter((UINT8)data));
+ m_crtc->write(space , offset == 0 , hp64k_crtc_filter((UINT8)data));
}
WRITE_LINE_MEMBER(hp64k_state::hp64k_crtc_drq_w)
{
- bool crtc_drq = state != 0;
- bool prev_crtc = m_crtc_drq;
- m_crtc_drq = crtc_drq;
+ bool crtc_drq = state != 0;
+ bool prev_crtc = m_crtc_drq;
+ m_crtc_drq = crtc_drq;
- if (!prev_crtc && crtc_drq) {
- address_space& prog_space = m_cpu->space(AS_PROGRAM);
+ if (!prev_crtc && crtc_drq) {
+ address_space& prog_space = m_cpu->space(AS_PROGRAM);
- UINT8 data = prog_space.read_byte(m_crtc_ptr);
- m_crtc_ptr++;
+ UINT8 data = prog_space.read_byte(m_crtc_ptr);
+ m_crtc_ptr++;
- m_crtc->dack_w(prog_space , 0 , hp64k_crtc_filter(data));
- }
+ m_crtc->dack_w(prog_space , 0 , hp64k_crtc_filter(data));
+ }
}
WRITE_LINE_MEMBER(hp64k_state::hp64k_crtc_vrtc_w)
{
- bool vrtc = state != 0;
+ bool vrtc = state != 0;
- if (!m_vrtc && vrtc) {
- m_crtc_ptr = 0xf9f0 << 1;
- }
- m_vrtc = vrtc;
+ if (!m_vrtc && vrtc) {
+ m_crtc_ptr = 0xf9f0 << 1;
+ }
+ m_vrtc = vrtc;
}
I8275_DRAW_CHARACTER_MEMBER(hp64k_state::crtc_display_pixels)
{
- const rgb_t *palette = m_palette->palette()->entry_list_raw();
- UINT8 chargen_byte = m_chargen[ linecount | ((unsigned)charcode << 4) ];
- bool lvid , livid;
- UINT16 pixels_lvid , pixels_livid;
- unsigned i;
-
- if (vsp) {
- pixels_lvid = pixels_livid = ~0;
- } else if (lten) {
- pixels_livid = ~0;
- if (rvv) {
- pixels_lvid = ~0;
- } else {
- pixels_lvid = 0;
- }
- } else if (rvv) {
- pixels_lvid = ~0;
- pixels_livid = (UINT16)chargen_byte << 1;
- } else {
- pixels_lvid = ~((UINT16)chargen_byte << 1);
- pixels_livid = ~0;
- }
-
- for (i = 0; i < 9; i++) {
- lvid = (pixels_lvid & (1U << (8 - i))) != 0;
- livid = (pixels_livid & (1U << (8 - i))) != 0;
-
- if (!lvid) {
- // Normal brightness
- bitmap.pix32(y , x + i) = palette[ 2 ];
- } else if (livid) {
- // Black
- bitmap.pix32(y , x + i) = palette[ 0 ];
- } else {
- // Half brightness
- bitmap.pix32(y , x + i) = palette[ 1 ];
- }
- }
+ const rgb_t *palette = m_palette->palette()->entry_list_raw();
+ UINT8 chargen_byte = m_chargen[ linecount | ((unsigned)charcode << 4) ];
+ bool lvid , livid;
+ UINT16 pixels_lvid , pixels_livid;
+ unsigned i;
+
+ if (vsp) {
+ pixels_lvid = pixels_livid = ~0;
+ } else if (lten) {
+ pixels_livid = ~0;
+ if (rvv) {
+ pixels_lvid = ~0;
+ } else {
+ pixels_lvid = 0;
+ }
+ } else if (rvv) {
+ pixels_lvid = ~0;
+ pixels_livid = (UINT16)chargen_byte << 1;
+ } else {
+ pixels_lvid = ~((UINT16)chargen_byte << 1);
+ pixels_livid = ~0;
+ }
+
+ for (i = 0; i < 9; i++) {
+ lvid = (pixels_lvid & (1U << (8 - i))) != 0;
+ livid = (pixels_livid & (1U << (8 - i))) != 0;
+
+ if (!lvid) {
+ // Normal brightness
+ bitmap.pix32(y , x + i) = palette[ 2 ];
+ } else if (livid) {
+ // Black
+ bitmap.pix32(y , x + i) = palette[ 0 ];
+ } else {
+ // Half brightness
+ bitmap.pix32(y , x + i) = palette[ 1 ];
+ }
+ }
}
READ16_MEMBER(hp64k_state::hp64k_rear_sw_r)
{
- // TEST
- return ~0;
+ // TEST
+ return ~0;
}
IRQ_CALLBACK_MEMBER(hp64k_state::hp64k_irq_callback)
{
- if (irqline == HPHYBRID_IRL) {
- return 0xff00 | (m_irl_mask & m_irl_pending);
- } else {
- return ~0;
- }
+ if (irqline == HPHYBRID_IRL) {
+ return 0xff00 | (m_irl_mask & m_irl_pending);
+ } else {
+ return ~0;
+ }
}
void hp64k_state::hp64k_update_irl(void)
{
- m_cpu->set_input_line(HPHYBRID_IRL , (m_irl_mask & m_irl_pending) != 0);
+ m_cpu->set_input_line(HPHYBRID_IRL , (m_irl_mask & m_irl_pending) != 0);
}
WRITE16_MEMBER(hp64k_state::hp64k_irl_mask_w)
{
- m_irl_mask = (UINT8)data;
- hp64k_update_irl();
+ m_irl_mask = (UINT8)data;
+ hp64k_update_irl();
}
TIMER_DEVICE_CALLBACK_MEMBER(hp64k_state::hp64k_kb_scan)
{
- if (m_kb_scan_on) {
- unsigned i;
-
- ioport_value input[ 4 ];
- input[ 0 ] = m_io_key0->read();
- input[ 1 ] = m_io_key1->read();
- input[ 2 ] = m_io_key2->read();
- input[ 3 ] = m_io_key3->read();
-
- for (i = 0; i < 128; i++) {
- if (++m_kb_row_col >= 128) {
- m_kb_row_col = 0;
- }
-
- ioport_value mask = BIT_MASK(m_kb_row_col & 0x1f);
- unsigned idx = m_kb_row_col >> 5;
-
- if ((input[ idx ] ^ m_kb_state[ idx ]) & mask) {
- // key changed state
- m_kb_state[ idx ] ^= mask;
- m_kb_pressed = (m_kb_state[ idx ] & mask) != 0;
- m_kb_scan_on = false;
- BIT_SET(m_irl_pending , 0);
- hp64k_update_irl();
- break;
- }
- }
- }
+ if (m_kb_scan_on) {
+ unsigned i;
+
+ ioport_value input[ 4 ];
+ input[ 0 ] = m_io_key0->read();
+ input[ 1 ] = m_io_key1->read();
+ input[ 2 ] = m_io_key2->read();
+ input[ 3 ] = m_io_key3->read();
+
+ for (i = 0; i < 128; i++) {
+ if (++m_kb_row_col >= 128) {
+ m_kb_row_col = 0;
+ }
+
+ ioport_value mask = BIT_MASK(m_kb_row_col & 0x1f);
+ unsigned idx = m_kb_row_col >> 5;
+
+ if ((input[ idx ] ^ m_kb_state[ idx ]) & mask) {
+ // key changed state
+ m_kb_state[ idx ] ^= mask;
+ m_kb_pressed = (m_kb_state[ idx ] & mask) != 0;
+ m_kb_scan_on = false;
+ BIT_SET(m_irl_pending , 0);
+ hp64k_update_irl();
+ break;
+ }
+ }
+ }
}
READ16_MEMBER(hp64k_state::hp64k_kb_r)
{
- UINT16 ret = 0xff00 | m_kb_row_col;
+ UINT16 ret = 0xff00 | m_kb_row_col;
- if (m_kb_pressed) {
- BIT_SET(ret , 7);
- }
+ if (m_kb_pressed) {
+ BIT_SET(ret , 7);
+ }
- m_kb_scan_on = true;
- BIT_CLR(m_irl_pending , 0);
- hp64k_update_irl();
+ m_kb_scan_on = true;
+ BIT_CLR(m_irl_pending , 0);
+ hp64k_update_irl();
- return ret;
+ return ret;
}
static INPUT_PORTS_START(hp64k)
- // Keyboard is arranged in a 8 x 16 matrix. Of the 128 possible positions, only 77 are used.
- // For key arrangement on the matrix, see [1] pg 334
- // Keys are mapped on bit b of KEYn
- // where b = (row & 1) << 4 + column, n = row >> 1
- // column = [0..15]
- // row = [0..7]
- PORT_START("KEY0")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
- PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
- PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
- PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
- PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
- PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
- PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
- PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
- PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^') PORT_CHAR('~')
- PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('\\') PORT_CHAR('|')
- PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
- PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED)
-
- PORT_START("KEY1")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
- PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_NAME("RECALL")
- PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F10) PORT_NAME("CLRLINE")
- PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F11) PORT_NAME("CAPS")
- PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F12) PORT_NAME("RESET")
- PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_NAME("SK1")
- PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_NAME("SK2")
- PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_NAME("SK3")
- PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_NAME("SK4")
- PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_NAME("SK5")
- PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_NAME("SK6")
- PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_NAME("SK7")
- PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_NAME("SK8")
- PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED)
-
- PORT_START("KEY2")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
- PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
- PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
- PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_INSERT) PORT_NAME("INSCHAR")
- PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL) PORT_NAME("DELCHAR")
- PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
- PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
- PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
- PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
- PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') PORT_CHAR('`')
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[') PORT_CHAR('{')
- PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('_') PORT_CHAR(UCHAR_MAMEKEY(DEL))
- PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_NAME("ROLLUP")
- PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
- PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGDN) PORT_NAME("NEXTPG")
-
- PORT_START("KEY3")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
- PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
- PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
- PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
- PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')
- PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']') PORT_CHAR('}')
- PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
- PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
- PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
- PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
- PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
- PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
- PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
- PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_END) PORT_NAME("ROLLDN")
- PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
- PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGUP) PORT_NAME("PREVPG")
+ // Keyboard is arranged in a 8 x 16 matrix. Of the 128 possible positions, only 77 are used.
+ // For key arrangement on the matrix, see [1] pg 334
+ // Keys are mapped on bit b of KEYn
+ // where b = (row & 1) << 4 + column, n = row >> 1
+ // column = [0..15]
+ // row = [0..7]
+ PORT_START("KEY0")
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
+ PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
+ PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
+ PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
+ PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
+ PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
+ PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
+ PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
+ PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^') PORT_CHAR('~')
+ PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('\\') PORT_CHAR('|')
+ PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
+ PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED)
+
+ PORT_START("KEY1")
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
+ PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_NAME("RECALL")
+ PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F10) PORT_NAME("CLRLINE")
+ PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F11) PORT_NAME("CAPS")
+ PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F12) PORT_NAME("RESET")
+ PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_NAME("SK1")
+ PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_NAME("SK2")
+ PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_NAME("SK3")
+ PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_NAME("SK4")
+ PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_NAME("SK5")
+ PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_NAME("SK6")
+ PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_NAME("SK7")
+ PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_NAME("SK8")
+ PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED)
+
+ PORT_START("KEY2")
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+ PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
+ PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
+ PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
+ PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_INSERT) PORT_NAME("INSCHAR")
+ PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL) PORT_NAME("DELCHAR")
+ PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
+ PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
+ PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
+ PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
+ PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') PORT_CHAR('`')
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[') PORT_CHAR('{')
+ PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('_') PORT_CHAR(UCHAR_MAMEKEY(DEL))
+ PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_NAME("ROLLUP")
+ PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
+ PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGDN) PORT_NAME("NEXTPG")
+
+ PORT_START("KEY3")
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
+ PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
+ PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
+ PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
+ PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')
+ PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']') PORT_CHAR('}')
+ PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
+ PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
+ PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+ PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
+ PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
+ PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
+ PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
+ PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+ PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_END) PORT_NAME("ROLLDN")
+ PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
+ PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGUP) PORT_NAME("PREVPG")
INPUT_PORTS_END
static MACHINE_CONFIG_START(hp64k , hp64k_state)
- MCFG_CPU_ADD("cpu" , HP_5061_3011 , 6250000)
- MCFG_CPU_PROGRAM_MAP(cpu_mem_map)
- MCFG_CPU_IO_MAP(cpu_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp64k_state , hp64k_irq_callback)
- MCFG_QUANTUM_TIME(attotime::from_hz(100))
-
- // Actual keyboard refresh rate should be between 1 and 2 kHz
- MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer" , hp64k_state , hp64k_kb_scan , attotime::from_hz(100))
-
- // Clock = 25 MHz / 9 * (112/114)
- MCFG_DEVICE_ADD("crtc" , I8275 , 2729045)
- MCFG_I8275_CHARACTER_WIDTH(9)
- MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(hp64k_state , crtc_display_pixels)
- MCFG_I8275_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_drq_w))
- MCFG_I8275_VRTC_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_vrtc_w))
-
- MCFG_SCREEN_ADD("screen" , RASTER)
- MCFG_SCREEN_UPDATE_DEVICE("crtc" , i8275_device , screen_update)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette")
+ MCFG_CPU_ADD("cpu" , HP_5061_3011 , 6250000)
+ MCFG_CPU_PROGRAM_MAP(cpu_mem_map)
+ MCFG_CPU_IO_MAP(cpu_io_map)
+ MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp64k_state , hp64k_irq_callback)
+ MCFG_QUANTUM_TIME(attotime::from_hz(100))
+
+ // Actual keyboard refresh rate should be between 1 and 2 kHz
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer" , hp64k_state , hp64k_kb_scan , attotime::from_hz(100))
+
+ // Clock = 25 MHz / 9 * (112/114)
+ MCFG_DEVICE_ADD("crtc" , I8275 , 2729045)
+ MCFG_I8275_CHARACTER_WIDTH(9)
+ MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(hp64k_state , crtc_display_pixels)
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_drq_w))
+ MCFG_I8275_VRTC_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_vrtc_w))
+
+ MCFG_SCREEN_ADD("screen" , RASTER)
+ MCFG_SCREEN_UPDATE_DEVICE("crtc" , i8275_device , screen_update)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette")
MACHINE_CONFIG_END
ROM_START(hp64k)
- ROM_REGION(0x8000 , "cpu" , ROMREGION_16BIT | ROMREGION_BE | ROMREGION_INVERT)
- ROM_LOAD16_BYTE("64100_80022.bin" , 0x0000 , 0x1000 , CRC(38b2aae5) SHA1(bfd0f126bfaf3724dc501979ad2d46afc41913aa))
- ROM_LOAD16_BYTE("64100_80020.bin" , 0x0001 , 0x1000 , CRC(ac01b436) SHA1(be1e827ea1393a95abb02a52ab5cc35dc2cd96e4))
- ROM_LOAD16_BYTE("64100_80023.bin" , 0x2000 , 0x1000 , CRC(6b4bc2ce) SHA1(00e6c58ccae9640dc81cb3e92db90a8c69b02a93))
- ROM_LOAD16_BYTE("64100_80021.bin" , 0x2001 , 0x1000 , CRC(74f9d33c) SHA1(543a845a992b0ceac3e0491acdfb178df0adeb1f))
- ROM_LOAD16_BYTE("64100_80026.bin" , 0x4000 , 0x1000 , CRC(a74e834b) SHA1(a2ff9765628985d9bab4cb44ba23257a9b8d0965))
- ROM_LOAD16_BYTE("64100_80024.bin" , 0x4001 , 0x1000 , CRC(2e15a1d2) SHA1(ce4330f8f8015a26c02f0965b95baf7dfd615512))
- ROM_LOAD16_BYTE("64100_80027.bin" , 0x6000 , 0x1000 , CRC(b93c0e7a) SHA1(b239446d3d6e9d3dba6c0278b2771abe1623e1ad))
- ROM_LOAD16_BYTE("64100_80025.bin" , 0x6001 , 0x1000 , CRC(e6353085) SHA1(48d78835c798f2caf6ee539057676d4f3c8a4df9))
-
- ROM_REGION(0x800 , "chargen" , 0)
- ROM_LOAD("1816_1496_82S191.bin" , 0 , 0x800 , CRC(32a52664) SHA1(8b2a49a32510103ff424e8481d5ed9887f609f2f))
+ ROM_REGION(0x8000 , "cpu" , ROMREGION_16BIT | ROMREGION_BE | ROMREGION_INVERT)
+ ROM_LOAD16_BYTE("64100_80022.bin" , 0x0000 , 0x1000 , CRC(38b2aae5) SHA1(bfd0f126bfaf3724dc501979ad2d46afc41913aa))
+ ROM_LOAD16_BYTE("64100_80020.bin" , 0x0001 , 0x1000 , CRC(ac01b436) SHA1(be1e827ea1393a95abb02a52ab5cc35dc2cd96e4))
+ ROM_LOAD16_BYTE("64100_80023.bin" , 0x2000 , 0x1000 , CRC(6b4bc2ce) SHA1(00e6c58ccae9640dc81cb3e92db90a8c69b02a93))
+ ROM_LOAD16_BYTE("64100_80021.bin" , 0x2001 , 0x1000 , CRC(74f9d33c) SHA1(543a845a992b0ceac3e0491acdfb178df0adeb1f))
+ ROM_LOAD16_BYTE("64100_80026.bin" , 0x4000 , 0x1000 , CRC(a74e834b) SHA1(a2ff9765628985d9bab4cb44ba23257a9b8d0965))
+ ROM_LOAD16_BYTE("64100_80024.bin" , 0x4001 , 0x1000 , CRC(2e15a1d2) SHA1(ce4330f8f8015a26c02f0965b95baf7dfd615512))
+ ROM_LOAD16_BYTE("64100_80027.bin" , 0x6000 , 0x1000 , CRC(b93c0e7a) SHA1(b239446d3d6e9d3dba6c0278b2771abe1623e1ad))
+ ROM_LOAD16_BYTE("64100_80025.bin" , 0x6001 , 0x1000 , CRC(e6353085) SHA1(48d78835c798f2caf6ee539057676d4f3c8a4df9))
+
+ ROM_REGION(0x800 , "chargen" , 0)
+ ROM_LOAD("1816_1496_82S191.bin" , 0 , 0x800 , CRC(32a52664) SHA1(8b2a49a32510103ff424e8481d5ed9887f609f2f))
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
diff --git a/src/mess/drivers/i7000.c b/src/mess/drivers/i7000.c
index e0f160ed985..de363e40998 100644
--- a/src/mess/drivers/i7000.c
+++ b/src/mess/drivers/i7000.c
@@ -51,9 +51,9 @@ class i7000_state : public driver_device
public:
i7000_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_card(*this, "cardslot"),
- m_videoram(*this, "videoram")
- { }
+ m_card(*this, "cardslot"),
+ m_videoram(*this, "videoram")
+ { }
virtual void video_start();
@@ -62,8 +62,8 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT8 *m_char_rom;
-// DECLARE_READ8_MEMBER( i7000_io_r );
-// DECLARE_WRITE8_MEMBER( i7000_io_w );
+// DECLARE_READ8_MEMBER( i7000_io_r );
+// DECLARE_WRITE8_MEMBER( i7000_io_w );
DECLARE_DRIVER_INIT(i7000);
DECLARE_PALETTE_INIT(i7000);
@@ -88,42 +88,42 @@ void i7000_state::video_start()
UINT32 i7000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- offs_t addr = 0;
-
- for (int sy = 0; sy < 25; sy++)
- {
- for (int sx = 0; sx < 40; sx++)
- {
- UINT8 data = m_videoram[addr++];
- for (int y = 0; y < 8; y++)
- {
- int color = m_char_rom[data*8 + y];
- for (int x = 0; x < 8; x++)
- {
- bitmap.pix16(sy*8 + y, sx*8 + 7 - x) = (color & 1);
- color >>= 1;
- }
- }
- }
- }
-
- return 0;
+ offs_t addr = 0;
+
+ for (int sy = 0; sy < 25; sy++)
+ {
+ for (int sx = 0; sx < 40; sx++)
+ {
+ UINT8 data = m_videoram[addr++];
+ for (int y = 0; y < 8; y++)
+ {
+ int color = m_char_rom[data*8 + y];
+ for (int x = 0; x < 8; x++)
+ {
+ bitmap.pix16(sy*8 + y, sx*8 + 7 - x) = (color & 1);
+ color >>= 1;
+ }
+ }
+ }
+ }
+
+ return 0;
}
/*FIXME: we still need to figure out the proper memory map
for the maincpu and where the cartridge slot maps to. */
static ADDRESS_MAP_START(i7000_mem, AS_PROGRAM, 8, i7000_state)
- AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION("maincpu", 0)
- AM_RANGE(0x1000, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0xffff) AM_RAM AM_SHARE("videoram")
+ AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION("maincpu", 0)
+ AM_RANGE(0x1000, 0x1fff) AM_RAM
+ AM_RANGE(0x2000, 0xffff) AM_RAM AM_SHARE("videoram")
// AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("cardslot", 0)
ADDRESS_MAP_END
/*
static ADDRESS_MAP_START( i7000_io , AS_IO, 8, i7000_state)
- ADDRESS_MAP_UNMAP_HIGH
- ADDRESS_MAP_GLOBAL_MASK (0xff)
- AM_RANGE(0x00, 0xff) AM_READWRITE(i7000_io_r, i7000_io_w)
+ ADDRESS_MAP_UNMAP_HIGH
+ ADDRESS_MAP_GLOBAL_MASK (0xff)
+ AM_RANGE(0x00, 0xff) AM_READWRITE(i7000_io_r, i7000_io_w)
ADDRESS_MAP_END
*/
@@ -161,7 +161,7 @@ static MACHINE_CONFIG_START( i7000, i7000_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NSC800, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(i7000_mem)
-// MCFG_CPU_IO_MAP(i7000_io)
+// MCFG_CPU_IO_MAP(i7000_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -175,7 +175,7 @@ static MACHINE_CONFIG_START( i7000, i7000_state )
MCFG_PALETTE_ADD("palette", 2)
MCFG_PALETTE_INIT_OWNER(i7000_state, i7000)
-// MCFG_GFXDECODE_ADD("gfxdecode", "palette", i7000)
+// MCFG_GFXDECODE_ADD("gfxdecode", "palette", i7000)
/* Cartridge slot */
MCFG_GENERIC_CARTSLOT_ADD("cardslot", generic_romram_plain_slot, "i7000_card")
diff --git a/src/mess/drivers/rc759.c b/src/mess/drivers/rc759.c
index bcbab8bad8b..cfe48a89093 100644
--- a/src/mess/drivers/rc759.c
+++ b/src/mess/drivers/rc759.c
@@ -4,12 +4,12 @@
Regnecentralen RC759
- TODO:
- - Emulate the Intel 82730 CRT controller and figure out the rest
- - Connect iSBX bus
- - (much later) move floppy/external printer to the slot interface
+ TODO:
+ - Emulate the Intel 82730 CRT controller and figure out the rest
+ - Connect iSBX bus
+ - (much later) move floppy/external printer to the slot interface
- Status: Hangs waiting for an answer from the 82730
+ Status: Hangs waiting for an answer from the 82730
***************************************************************************/
@@ -256,27 +256,27 @@ static ADDRESS_MAP_START( rc759_io, AS_IO, 16, rc759_state )
AM_RANGE(0x000, 0x003) AM_DEVREADWRITE8("pic", pic8259_device, read, write, 0x00ff)
AM_RANGE(0x020, 0x021) AM_READ8(keyboard_r, 0x00ff)
AM_RANGE(0x050, 0x05f) AM_READWRITE8(rtc_r, rtc_w, 0x00ff) // and sound
-// AM_RANGE(0x060, 0x06f) AM_WRITE8(crt_control_w, 0x00ff)
+// AM_RANGE(0x060, 0x06f) AM_WRITE8(crt_control_w, 0x00ff)
AM_RANGE(0x070, 0x077) AM_DEVREADWRITE8("ppi", i8255_device, read, write, 0x00ff)
AM_RANGE(0x080, 0x0ff) AM_READWRITE8(nvram_r, nvram_w, 0x00ff)
-// AM_RANGE(0x100, 0x101) net
+// AM_RANGE(0x100, 0x101) net
AM_RANGE(0x180, 0x1bf) AM_READWRITE8(palette_r, palette_w, 0x00ff)
-// AM_RANGE(0x230, 0x231) crt reset
-// AM_RANGE(0x240, 0x241) crt ch. att.
-// AM_RANGE(0x250, 0x251) local printer data (centronics)
-// AM_RANGE(0x260, 0x261) local printer control (centronics)
+// AM_RANGE(0x230, 0x231) crt reset
+// AM_RANGE(0x240, 0x241) crt ch. att.
+// AM_RANGE(0x250, 0x251) local printer data (centronics)
+// AM_RANGE(0x260, 0x261) local printer control (centronics)
AM_RANGE(0x280, 0x287) AM_DEVREADWRITE8("fdc", wd2797_t, read, write, 0x00ff)
AM_RANGE(0x288, 0x289) AM_WRITE8(floppy_control_w, 0x00ff)
-// AM_RANGE(0x28a, 0x28b) external printer data
-// AM_RANGE(0x28d, 0x28d) external printer control
+// AM_RANGE(0x28a, 0x28b) external printer data
+// AM_RANGE(0x28d, 0x28d) external printer control
AM_RANGE(0x28e, 0x28f) AM_READWRITE8(floppy_ack_r, floppy_reserve_w, 0x00ff)
AM_RANGE(0x290, 0x291) AM_WRITE8(floppy_release_w, 0x00ff)
-// AM_RANGE(0x292, 0x293) AM_READWRITE8(printer_ack_r, printer_reserve_w, 0x00ff)
-// AM_RANGE(0x294, 0x295) AM_WRITE8(printer_release_w, 0x00ff)
-// AM_RANGE(0x300, 0x30f) isbx1
-// AM_RANGE(0x310, 0x31f) isbx2
-// AM_RANGE(0x320, 0x321) isbx dma ack
-// AM_RANGE(0x330, 0x331) isbx tc
+// AM_RANGE(0x292, 0x293) AM_READWRITE8(printer_ack_r, printer_reserve_w, 0x00ff)
+// AM_RANGE(0x294, 0x295) AM_WRITE8(printer_release_w, 0x00ff)
+// AM_RANGE(0x300, 0x30f) isbx1
+// AM_RANGE(0x310, 0x31f) isbx2
+// AM_RANGE(0x320, 0x321) isbx dma ack
+// AM_RANGE(0x330, 0x331) isbx tc
ADDRESS_MAP_END
diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c
index 3ff558b09db..68bad92a04c 100644
--- a/src/mess/drivers/xerox820.c
+++ b/src/mess/drivers/xerox820.c
@@ -38,11 +38,11 @@
8-inch formats
77 tracks, 1 head, 26 sectors, 128 bytes sector length, first sector id 1
- 77 tracks, 1 head, 26 sectors, 256 bytes sector length, first sector id 1
+ 77 tracks, 1 head, 26 sectors, 256 bytes sector length, first sector id 1
- 5.25-inch formats
- 40 tracks, 1 head, 18 sectors, 128 bytes sector length, first sector id 1
- 40 tracks, 2 heads, 18 sectors, 128 bytes sector length, first sector id 1
+ 5.25-inch formats
+ 40 tracks, 1 head, 18 sectors, 128 bytes sector length, first sector id 1
+ 40 tracks, 2 heads, 18 sectors, 128 bytes sector length, first sector id 1
*/
diff --git a/src/mess/machine/apricotkb_hle.c b/src/mess/machine/apricotkb_hle.c
index e40677e5078..6950033c79f 100644
--- a/src/mess/machine/apricotkb_hle.c
+++ b/src/mess/machine/apricotkb_hle.c
@@ -256,8 +256,8 @@ void apricot_keyboard_hle_device::rcv_complete()
m_data_in = get_received_char();
// reset command? send keyboard ready (likely needs a delay, just disable for now)
-// if (m_data_in == 0xe8)
-// transmit_register_setup(0xfb);
+// if (m_data_in == 0xe8)
+// transmit_register_setup(0xfb);
}
WRITE_LINE_MEMBER( apricot_keyboard_hle_device::rxd_w )
diff --git a/src/mess/machine/ti99/990_dk.h b/src/mess/machine/ti99/990_dk.h
index eb044b2974f..2f83660ae75 100644
--- a/src/mess/machine/ti99/990_dk.h
+++ b/src/mess/machine/ti99/990_dk.h
@@ -52,10 +52,10 @@ private:
int m_buf_pos;
buf_mode_t m_buf_mode;
int m_unit;
-// int m_head;
+// int m_head;
int m_sector;
/*int m_non_seq_mode;*/
-// int m_ddam;
+// int m_ddam;
struct
{
diff --git a/src/version.c b/src/version.c
index ac911975594..5343ee091de 100644
--- a/src/version.c
+++ b/src/version.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#define BARE_BUILD_VERSION "0.162"
+#define BARE_BUILD_VERSION "0.163"
extern const char bare_build_version[];
extern const char build_version[];