summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-07-22 06:21:54 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-07-22 06:21:54 +0000
commit79246ab9172f61178139b4b7974debba8fb7c5f8 (patch)
tree6365530c8cf287ea3b7752c3c45c8c6f8e4c68ae /src/emu
parent5d7e1fcc62a7f9dd5441eaccbc274f9327efcf00 (diff)
More cleanups, there is issue with srcclean that needs to be taken care as well, just doing now what we can
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/addrmap.h2
-rw-r--r--src/emu/bus/a1bus/a1bus.h4
-rw-r--r--src/emu/bus/a2bus/a2bus.h6
-rw-r--r--src/emu/bus/a2bus/a2eauxslot.h8
-rw-r--r--src/emu/bus/a2bus/a2mcms.h2
-rw-r--r--src/emu/bus/amiga/zorro/a2052.h4
-rw-r--r--src/emu/bus/amiga/zorro/a2232.h6
-rw-r--r--src/emu/bus/amiga/zorro/a590.h4
-rw-r--r--src/emu/bus/amiga/zorro/action_replay.h4
-rw-r--r--src/emu/bus/amiga/zorro/buddha.h4
-rw-r--r--src/emu/bus/amiga/zorro/cards.h32
-rw-r--r--src/emu/bus/amiga/zorro/zorro.h258
-rw-r--r--src/emu/bus/bml3/bml3bus.h4
-rw-r--r--src/emu/bus/centronics/epson_ex800.h2
-rw-r--r--src/emu/bus/centronics/epson_lx800.h2
-rw-r--r--src/emu/bus/coco/cococart.h18
-rw-r--r--src/emu/bus/cpc/cpc_rs232.h2
-rw-r--r--src/emu/bus/cpc/cpcexp.h2
-rw-r--r--src/emu/bus/gameboy/mbc.h2
-rw-r--r--src/emu/bus/iq151/iq151.h2
-rw-r--r--src/emu/bus/isa/aga.h2
-rw-r--r--src/emu/bus/isa/gus.h10
-rw-r--r--src/emu/bus/isa/isa.h6
-rw-r--r--src/emu/bus/kc/kc.h14
-rw-r--r--src/emu/bus/msx_cart/ascii.h1
-rw-r--r--src/emu/bus/msx_cart/konami.h16
-rw-r--r--src/emu/bus/msx_cart/yamaha.h1
-rw-r--r--src/emu/bus/msx_slot/bunsetsu.h4
-rw-r--r--src/emu/bus/msx_slot/cartridge.h1
-rw-r--r--src/emu/bus/msx_slot/disk.h7
-rw-r--r--src/emu/bus/msx_slot/music.h4
-rw-r--r--src/emu/bus/msx_slot/ram.h3
-rw-r--r--src/emu/bus/msx_slot/ram_mm.h1
-rw-r--r--src/emu/bus/neogeo/banked_cart.h3
-rw-r--r--src/emu/bus/neogeo/bootleg_prot.h5
-rw-r--r--src/emu/bus/neogeo/cmc_prot.h3
-rw-r--r--src/emu/bus/neogeo/fatfury2_prot.h5
-rw-r--r--src/emu/bus/neogeo/kof2002_prot.h3
-rw-r--r--src/emu/bus/neogeo/kof98_prot.h6
-rw-r--r--src/emu/bus/neogeo/mslugx_prot.h3
-rw-r--r--src/emu/bus/neogeo/neogeo_intf.h3
-rw-r--r--src/emu/bus/neogeo/pcm2_prot.h5
-rw-r--r--src/emu/bus/neogeo/pvc_prot.h3
-rw-r--r--src/emu/bus/neogeo/sbp_prot.h6
-rw-r--r--src/emu/bus/neogeo/sma_prot.h3
-rw-r--r--src/emu/bus/nes/mmc5.h2
-rw-r--r--src/emu/bus/nubus/nubus.h4
-rw-r--r--src/emu/bus/oricext/jasmin.h2
-rw-r--r--src/emu/bus/oricext/microdisc.h2
-rw-r--r--src/emu/bus/oricext/oricext.h6
-rw-r--r--src/emu/bus/pc_kbd/pc_kbdc.h4
-rw-r--r--src/emu/bus/pet/diag.h2
-rw-r--r--src/emu/bus/ql/cst_q_plus4.h2
-rw-r--r--src/emu/bus/ql/cst_qdisc.h2
-rw-r--r--src/emu/bus/ql/cumana_fdi.h4
-rw-r--r--src/emu/bus/ql/exp.h44
-rw-r--r--src/emu/bus/ql/kempston_di.h2
-rw-r--r--src/emu/bus/ql/miracle_gold_card.h2
-rw-r--r--src/emu/bus/ql/miracle_hd.h2
-rw-r--r--src/emu/bus/ql/mp_fdi.h2
-rw-r--r--src/emu/bus/ql/opd_basic_master.h2
-rw-r--r--src/emu/bus/ql/pcml_qdisk.h2
-rw-r--r--src/emu/bus/ql/qubide.h2
-rw-r--r--src/emu/bus/ql/rom.h8
-rw-r--r--src/emu/bus/ql/sandy_superdisk.h2
-rw-r--r--src/emu/bus/ql/sandy_superqboard.h2
-rw-r--r--src/emu/bus/ql/trumpcard.h2
-rw-r--r--src/emu/bus/scsi/scsihle.h3
-rw-r--r--src/emu/bus/tvc/tvc.h4
-rw-r--r--src/emu/bus/vtech/ioexp/carts.h2
-rw-r--r--src/emu/bus/vtech/ioexp/ioexp.h36
-rw-r--r--src/emu/bus/vtech/ioexp/joystick.h2
-rw-r--r--src/emu/bus/vtech/ioexp/printer.h2
-rw-r--r--src/emu/bus/vtech/memexp/carts.h2
-rw-r--r--src/emu/bus/vtech/memexp/floppy.h4
-rw-r--r--src/emu/bus/vtech/memexp/memexp.h50
-rw-r--r--src/emu/bus/vtech/memexp/memory.h2
-rw-r--r--src/emu/bus/vtech/memexp/rs232.h2
-rw-r--r--src/emu/bus/vtech/memexp/wordpro.h2
-rw-r--r--src/emu/bus/x68k/x68kexp.h4
-rw-r--r--src/emu/bus/z88/z88.h4
-rw-r--r--src/emu/cpu/adsp2100/adsp2100.h6
-rw-r--r--src/emu/cpu/cpu.mak2
-rw-r--r--src/emu/cpu/g65816/g65816op.h10
-rw-r--r--src/emu/cpu/m68000/m68000.h16
-rw-r--r--src/emu/cpu/m68000/m68kmmu.h6
-rw-r--r--src/emu/cpu/mb86233/mb86233.h2
-rw-r--r--src/emu/cpu/minx/minxfunc.h1
-rw-r--r--src/emu/cpu/minx/minxops.h1
-rw-r--r--src/emu/cpu/mips/mips3.h4
-rw-r--r--src/emu/cpu/powerpc/ppc.h8
-rw-r--r--src/emu/cpu/rsp/rsp.h12
-rw-r--r--src/emu/cpu/scudsp/scudsp.h6
-rw-r--r--src/emu/cpu/sh2/sh2.h18
-rw-r--r--src/emu/cpu/sharc/sharcops.inc2
-rw-r--r--src/emu/cpu/tms7000/tms7000.h16
-rw-r--r--src/emu/cpu/tms7000/tms70op.inc8
-rw-r--r--src/emu/cpu/upd7725/upd7725.h4
-rw-r--r--src/emu/cpu/z80/tmpz84c011.h2
-rw-r--r--src/emu/cpu/z80/tmpz84c015.h18
-rw-r--r--src/emu/digfx.h2
-rw-r--r--src/emu/imagedev/cartslot.h6
-rw-r--r--src/emu/imagedev/cassette.h12
-rw-r--r--src/emu/imagedev/diablo.h4
-rw-r--r--src/emu/imagedev/flopdrv.h2
-rw-r--r--src/emu/imagedev/harddriv.h4
-rw-r--r--src/emu/imagedev/midiin.h2
-rw-r--r--src/emu/luaengine.h8
-rw-r--r--src/emu/machine/53c810.h2
-rw-r--r--src/emu/machine/6525tpi.h2
-rw-r--r--src/emu/machine/6532riot.h8
-rw-r--r--src/emu/machine/68307.h6
-rw-r--r--src/emu/machine/6840ptm.h4
-rw-r--r--src/emu/machine/74123.h8
-rw-r--r--src/emu/machine/8042kbdc.h6
-rw-r--r--src/emu/machine/aakart.h14
-rw-r--r--src/emu/machine/adc0808.h20
-rw-r--r--src/emu/machine/adc1038.h2
-rw-r--r--src/emu/machine/akiko.h12
-rw-r--r--src/emu/machine/am9517a.h2
-rw-r--r--src/emu/machine/at_keybc.h4
-rw-r--r--src/emu/machine/autoconfig.h2
-rw-r--r--src/emu/machine/ay31015.h12
-rw-r--r--src/emu/machine/corvushd.h14
-rw-r--r--src/emu/machine/cr511b.h51
-rw-r--r--src/emu/machine/dmac.h39
-rw-r--r--src/emu/machine/dp8390.h4
-rw-r--r--src/emu/machine/eepromser.h10
-rw-r--r--src/emu/machine/gayle.h12
-rw-r--r--src/emu/machine/hd63450.h4
-rw-r--r--src/emu/machine/i8255.h4
-rw-r--r--src/emu/machine/i8271.h4
-rw-r--r--src/emu/machine/i8279.h4
-rw-r--r--src/emu/machine/ins8250.h4
-rw-r--r--src/emu/machine/kb3600.h2
-rw-r--r--src/emu/machine/keyboard.h4
-rw-r--r--src/emu/machine/mb89352.h4
-rw-r--r--src/emu/machine/mb89363b.h4
-rw-r--r--src/emu/machine/mc6854.h12
-rw-r--r--src/emu/machine/mos6530.h4
-rw-r--r--src/emu/machine/ncr539x.h6
-rw-r--r--src/emu/machine/roc10937.h16
-rw-r--r--src/emu/machine/s2636.h4
-rw-r--r--src/emu/machine/s3c2400.h10
-rw-r--r--src/emu/machine/s3c2410.h12
-rw-r--r--src/emu/machine/s3c2440.h10
-rw-r--r--src/emu/machine/s3c44b0.h2
-rw-r--r--src/emu/machine/terminal.h6
-rw-r--r--src/emu/machine/tms9902.h4
-rw-r--r--src/emu/machine/upd71071.h4
-rw-r--r--src/emu/machine/wd11c00_17.h2
-rw-r--r--src/emu/machine/wd17xx.h8
-rw-r--r--src/emu/machine/wd2010.h2
-rw-r--r--src/emu/machine/ym2148.h1
-rw-r--r--src/emu/machine/z80ctc.h4
-rw-r--r--src/emu/machine/z80dart.h14
-rw-r--r--src/emu/machine/z80dma.h2
-rw-r--r--src/emu/machine/z80pio.h4
-rw-r--r--src/emu/machine/z80sti.h20
-rw-r--r--src/emu/mame.h22
-rw-r--r--src/emu/memory.h2
-rw-r--r--src/emu/netlist/analog/nld_bjt.h6
-rw-r--r--src/emu/netlist/analog/nld_fourterm.h20
-rw-r--r--src/emu/netlist/analog/nld_ms_direct.h645
-rw-r--r--src/emu/netlist/analog/nld_ms_direct1.h41
-rw-r--r--src/emu/netlist/analog/nld_ms_direct2.h59
-rw-r--r--src/emu/netlist/analog/nld_ms_gauss_seidel.h586
-rw-r--r--src/emu/netlist/analog/nld_opamps.h2
-rw-r--r--src/emu/netlist/analog/nld_solver.h334
-rw-r--r--src/emu/netlist/analog/nld_twoterm.h14
-rw-r--r--src/emu/netlist/devices/nld_4020.h14
-rw-r--r--src/emu/netlist/devices/nld_4066.h4
-rw-r--r--src/emu/netlist/devices/nld_74123.h18
-rw-r--r--src/emu/netlist/devices/nld_7474.h2
-rw-r--r--src/emu/netlist/devices/nld_7490.h4
-rw-r--r--src/emu/netlist/devices/nld_74ls629.h2
-rw-r--r--src/emu/netlist/devices/nld_cmos.h24
-rw-r--r--src/emu/netlist/devices/nld_log.h2
-rw-r--r--src/emu/netlist/devices/nld_r2r_dac.h14
-rw-r--r--src/emu/netlist/devices/nld_system.h44
-rw-r--r--src/emu/netlist/devices/nld_truthtable.h414
-rw-r--r--src/emu/netlist/nl_base.h324
-rw-r--r--src/emu/netlist/nl_dice_compat.h8
-rw-r--r--src/emu/netlist/nl_lists.h30
-rw-r--r--src/emu/netlist/nl_setup.h2
-rw-r--r--src/emu/netlist/nl_time.h4
-rw-r--r--src/emu/netlist/plists.h168
-rw-r--r--src/emu/netlist/pstate.h20
-rw-r--r--src/emu/sound.h2
-rw-r--r--src/emu/sound/amiga.h2
-rw-r--r--src/emu/sound/ay8910.h24
-rw-r--r--src/emu/sound/discrete.h2
-rw-r--r--src/emu/sound/es5506.h22
-rw-r--r--src/emu/sound/gaelco.h2
-rw-r--r--src/emu/sound/namco.h2
-rw-r--r--src/emu/sound/nes_apu.h2
-rw-r--r--src/emu/sound/okim6258.h4
-rw-r--r--src/emu/sound/pokey.h2
-rw-r--r--src/emu/sound/rf5c68.h2
-rw-r--r--src/emu/sound/segapcm.h6
-rw-r--r--src/emu/sound/tms36xx.h12
-rw-r--r--src/emu/sound/tms5110.h20
-rw-r--r--src/emu/sound/vrender0.h2
-rw-r--r--src/emu/video.h2
-rw-r--r--src/emu/video/crtc_ega.h16
-rw-r--r--src/emu/video/huc6202.h6
-rw-r--r--src/emu/video/mc6845.h28
-rw-r--r--src/emu/video/mc6847.h14
-rw-r--r--src/emu/video/ramdac.h2
-rw-r--r--src/emu/video/snes_ppu.h52
-rw-r--r--src/emu/video/t6a04.h2
-rw-r--r--src/emu/video/tms3556.h10
-rw-r--r--src/emu/video/tms9928a.h8
-rw-r--r--src/emu/video/vic4567.h8
-rw-r--r--src/emu/video/vooddefs.h4
-rw-r--r--src/emu/video/voodoo.h18
216 files changed, 2175 insertions, 2234 deletions
diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h
index 96e5d6a0da9..f5b34456698 100644
--- a/src/emu/addrmap.h
+++ b/src/emu/addrmap.h
@@ -130,7 +130,7 @@ public:
write16_delegate m_wproto16; // 16-bit write proto-delegate
write32_delegate m_wproto32; // 32-bit write proto-delegate
write64_delegate m_wproto64; // 64-bit write proto-delegate
-
+
setoffset_delegate m_soproto; // set offset proto-delegate
address_map_delegate m_submap_delegate;
int m_submap_bits;
diff --git a/src/emu/bus/a1bus/a1bus.h b/src/emu/bus/a1bus/a1bus.h
index ef748915607..ec98eccbb4f 100644
--- a/src/emu/bus/a1bus/a1bus.h
+++ b/src/emu/bus/a1bus/a1bus.h
@@ -75,7 +75,7 @@ public:
// construction/destruction
a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
a1bus_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);
-
+
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(object); }
@@ -97,7 +97,7 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
// internal state
cpu_device *m_maincpu;
diff --git a/src/emu/bus/a2bus/a2bus.h b/src/emu/bus/a2bus/a2bus.h
index 87d3410383a..db227f00e9d 100644
--- a/src/emu/bus/a2bus/a2bus.h
+++ b/src/emu/bus/a2bus/a2bus.h
@@ -32,7 +32,7 @@
#define MCFG_A2BUS_OUT_INH_CB(_devcb) \
devcb = &a2bus_device::set_out_inh_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_A2BUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, A2BUS_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
@@ -83,7 +83,7 @@ public:
// construction/destruction
a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
a2bus_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);
-
+
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2bus_device &>(device).m_out_irq_cb.set_callback(object); }
@@ -104,7 +104,7 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
// internal state
cpu_device *m_maincpu;
diff --git a/src/emu/bus/a2bus/a2eauxslot.h b/src/emu/bus/a2bus/a2eauxslot.h
index 7e7d110c484..ba289849afe 100644
--- a/src/emu/bus/a2bus/a2eauxslot.h
+++ b/src/emu/bus/a2bus/a2eauxslot.h
@@ -20,13 +20,13 @@
#define MCFG_A2EAUXSLOT_CPU(_cputag) \
a2eauxslot_device::static_set_cputag(*device, _cputag);
-
+
#define MCFG_A2EAUXSLOT_OUT_IRQ_CB(_devcb) \
devcb = &a2eauxslot_device::set_out_irq_callback(*device, DEVCB_##_devcb);
#define MCFG_A2EAUXSLOT_OUT_NMI_CB(_devcb) \
devcb = &a2eauxslot_device::set_out_nmi_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_A2EAUXSLOT_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, A2EAUXSLOT_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
@@ -71,12 +71,12 @@ public:
// construction/destruction
a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
a2eauxslot_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);
-
+
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a2eauxslot_device &>(device).m_out_nmi_cb.set_callback(object); }
-
+
void add_a2eauxslot_card(device_a2eauxslot_card_interface *card);
device_a2eauxslot_card_interface *get_a2eauxslot_card();
diff --git a/src/emu/bus/a2bus/a2mcms.h b/src/emu/bus/a2bus/a2mcms.h
index f896e1b4aea..c4d5e3dd730 100644
--- a/src/emu/bus/a2bus/a2mcms.h
+++ b/src/emu/bus/a2bus/a2mcms.h
@@ -106,7 +106,7 @@ protected:
virtual bool take_c800() { return false; }
private:
- a2bus_mcms1_device *m_card1; // card 1 for passthrough
+ a2bus_mcms1_device *m_card1; // card 1 for passthrough
mcms_device *m_engine;
};
diff --git a/src/emu/bus/amiga/zorro/a2052.h b/src/emu/bus/amiga/zorro/a2052.h
index 4ba55e94342..18f7fcd43e6 100644
--- a/src/emu/bus/amiga/zorro/a2052.h
+++ b/src/emu/bus/amiga/zorro/a2052.h
@@ -1,11 +1,11 @@
/***************************************************************************
- Commodore A2052
+ Commodore A2052
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Zorro-II RAM Expansion (0.5, 1 or 2 MB)
+ Zorro-II RAM Expansion (0.5, 1 or 2 MB)
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/a2232.h b/src/emu/bus/amiga/zorro/a2232.h
index 862893e2b0a..29e1b685992 100644
--- a/src/emu/bus/amiga/zorro/a2232.h
+++ b/src/emu/bus/amiga/zorro/a2232.h
@@ -1,13 +1,13 @@
/***************************************************************************
- Commodore A2232
+ Commodore A2232
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Zorro-II Serial Card
+ Zorro-II Serial Card
- Provides the Amiga with 7 additional RS232 ports.
+ Provides the Amiga with 7 additional RS232 ports.
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/a590.h b/src/emu/bus/amiga/zorro/a590.h
index 4682c72903f..3665ff514c6 100644
--- a/src/emu/bus/amiga/zorro/a590.h
+++ b/src/emu/bus/amiga/zorro/a590.h
@@ -1,11 +1,11 @@
/***************************************************************************
- Commodore A590 / A2091
+ Commodore A590 / A2091
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- DMAC based SCSI controller for the Amiga 500 and Zorro-II
+ DMAC based SCSI controller for the Amiga 500 and Zorro-II
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/action_replay.h b/src/emu/bus/amiga/zorro/action_replay.h
index f2520575fb7..5ae6844daa3 100644
--- a/src/emu/bus/amiga/zorro/action_replay.h
+++ b/src/emu/bus/amiga/zorro/action_replay.h
@@ -1,11 +1,11 @@
/***************************************************************************
- Datel Action Replay
+ Datel Action Replay
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Freezer cartridge for Amiga 500 and Amiga 2000
+ Freezer cartridge for Amiga 500 and Amiga 2000
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/buddha.h b/src/emu/bus/amiga/zorro/buddha.h
index 9cc2a479e55..5c7b31f7ffc 100644
--- a/src/emu/bus/amiga/zorro/buddha.h
+++ b/src/emu/bus/amiga/zorro/buddha.h
@@ -1,11 +1,11 @@
/***************************************************************************
- Buddha
+ Buddha
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Zorro-II IDE controller
+ Zorro-II IDE controller
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/cards.h b/src/emu/bus/amiga/zorro/cards.h
index 57c98f01053..fbbd2b17b29 100644
--- a/src/emu/bus/amiga/zorro/cards.h
+++ b/src/emu/bus/amiga/zorro/cards.h
@@ -1,21 +1,21 @@
/***************************************************************************
- Amiga Zorro Cards
-
- There are different card types and layouts:
-
- * 86-pin expansion slot
- - A1000
- - A500 (rotated slot)
- - A2000/B2000 (internal slot)
- * Zorro-II
- - A2000
- - B2000
- * Zorro-III
- - A3000, A4000
-
- For details see zorro.h. Zorro-II cards can be inserted into
- Zorro-III slots.
+ Amiga Zorro Cards
+
+ There are different card types and layouts:
+
+ * 86-pin expansion slot
+ - A1000
+ - A500 (rotated slot)
+ - A2000/B2000 (internal slot)
+ * Zorro-II
+ - A2000
+ - B2000
+ * Zorro-III
+ - A3000, A4000
+
+ For details see zorro.h. Zorro-II cards can be inserted into
+ Zorro-III slots.
***************************************************************************/
diff --git a/src/emu/bus/amiga/zorro/zorro.h b/src/emu/bus/amiga/zorro/zorro.h
index 7c6d593f6d5..c5dbbb0286b 100644
--- a/src/emu/bus/amiga/zorro/zorro.h
+++ b/src/emu/bus/amiga/zorro/zorro.h
@@ -1,140 +1,140 @@
/***************************************************************************
- Amiga Zorro Slots
+ Amiga Zorro Slots
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- 86-pin Expansion Slot (Zorro-I), Zorro-II, Zorro-III
-
- 86-pin Expansion Slot
-
- 2 Ground 1 Ground
- 4 Ground 3 Ground
- 6 +5VDC 5 +5VDC
- 8 -5VDC 7 N/C
- 10 +12VDC 9 N/C *1
- 12 CFGIN 11 N/C *2
- 14 /C3 Clock 13 Ground
- 16 /C1 Clock 15 CDAC
- 18 XRDY 17 /OVR
- 20 N/C *3 19 /INT2
- 22 /INT6 21 A5
- 24 A4 23 A6
- 26 A3 25 Ground
- 28 A7 27 A2
- 30 A8 29 A1
- 32 A9 31 FC0
- 34 A10 33 FC1
- 36 A11 35 FC2
- 38 A12 37 Ground
- 40 /IPL0 39 A13
- 42 /IPL1 41 A14
- 44 /IPL2 43 A15
- 46 /BEER 45 A16
- 48 /VPA 47 A17
- 50 E Clock 49 Ground
- 52 A18 51 /VMA
- 54 A19 53 /RST
- 56 A20 55 /HLT
- 58 A21 57 A22
- 60 /BR *4 59 A23
- 62 /BGACK 61 Ground
- 64 /BG *5 63 D15
- 66 /DTACK 65 D14
- 68 R/W 67 D13
- 70 /LDS 69 D12
- 72 /UDS 71 D11
- 74 /AS 73 Ground
- 76 D10 75 D0
- 78 D9 77 D1
- 80 D8 79 D2
- 82 D7 81 D3
- 84 D6 83 D4
- 86 D5 85 Ground
-
- *1 28 MHz Clock on A2000 and B2000
- *2 /COPCFG on B2000
- *3 /PALOPE on A1000, /BOSS on B2000
- *4 /CBR on B2000
- *5 /CBG on B2000
-
- Zorro-II (differences only)
-
- 7 /OWN
- 9 /SLAVEn
- 11 /CFGOUTn
- 12 /CFGINn
- 20 -12VDC
- 40 /EINT7
- 42 /EINT5
- 44 /EINT4
- 60 /BRn
- 64 /BGn
-
- 88 Ground 87 Ground
- 90 Ground 89 Ground
- 92 7 MHz 91 Ground
- 94 /BURST 93 DOE
- 96 /EINT1 95 /BG *5
- 98 N/C 97 N/C
+ 86-pin Expansion Slot (Zorro-I), Zorro-II, Zorro-III
+
+ 86-pin Expansion Slot
+
+ 2 Ground 1 Ground
+ 4 Ground 3 Ground
+ 6 +5VDC 5 +5VDC
+ 8 -5VDC 7 N/C
+ 10 +12VDC 9 N/C *1
+ 12 CFGIN 11 N/C *2
+ 14 /C3 Clock 13 Ground
+ 16 /C1 Clock 15 CDAC
+ 18 XRDY 17 /OVR
+ 20 N/C *3 19 /INT2
+ 22 /INT6 21 A5
+ 24 A4 23 A6
+ 26 A3 25 Ground
+ 28 A7 27 A2
+ 30 A8 29 A1
+ 32 A9 31 FC0
+ 34 A10 33 FC1
+ 36 A11 35 FC2
+ 38 A12 37 Ground
+ 40 /IPL0 39 A13
+ 42 /IPL1 41 A14
+ 44 /IPL2 43 A15
+ 46 /BEER 45 A16
+ 48 /VPA 47 A17
+ 50 E Clock 49 Ground
+ 52 A18 51 /VMA
+ 54 A19 53 /RST
+ 56 A20 55 /HLT
+ 58 A21 57 A22
+ 60 /BR *4 59 A23
+ 62 /BGACK 61 Ground
+ 64 /BG *5 63 D15
+ 66 /DTACK 65 D14
+ 68 R/W 67 D13
+ 70 /LDS 69 D12
+ 72 /UDS 71 D11
+ 74 /AS 73 Ground
+ 76 D10 75 D0
+ 78 D9 77 D1
+ 80 D8 79 D2
+ 82 D7 81 D3
+ 84 D6 83 D4
+ 86 D5 85 Ground
+
+ *1 28 MHz Clock on A2000 and B2000
+ *2 /COPCFG on B2000
+ *3 /PALOPE on A1000, /BOSS on B2000
+ *4 /CBR on B2000
+ *5 /CBG on B2000
+
+ Zorro-II (differences only)
+
+ 7 /OWN
+ 9 /SLAVEn
+ 11 /CFGOUTn
+ 12 /CFGINn
+ 20 -12VDC
+ 40 /EINT7
+ 42 /EINT5
+ 44 /EINT4
+ 60 /BRn
+ 64 /BGn
+
+ 88 Ground 87 Ground
+ 90 Ground 89 Ground
+ 92 7 MHz 91 Ground
+ 94 /BURST 93 DOE
+ 96 /EINT1 95 /BG *5
+ 98 N/C 97 N/C
100 Ground 99 Ground
- *6 /GBG on B2000
-
- Zorro-III
-
- The Zorro-III is a multiplexed Zorro-II bus with address- and
- data phases. Signals changes as follows:
-
- 17 /CINH
- 18 /MTCR
- 29 /LOCK
- 30 AD8 (D0)
- 32 AD9 (D1)
- 34 AD10 (D2)
- 36 AD11 (D3)
- 38 AD12 (D4)
- 39 AD13 (D5)
- 40 Reserved
- 41 AD14 (D6)
- 42 Reserved
- 43 AD15 (D7)
- 44 Reserved
- 45 AD16 (D8)
- 47 AD17 (D9)
- 48 /MTACK
- 51 /DS0
- 52 AD18 (D10)
- 54 AD19 (D11)
- 56 AD20 (D12)
- 57 AD22 (D14)
- 58 AD21 (D13)
- 59 AD23 (D15)
- 63 AD31
- 65 AD30
- 67 AD29
- 69 AD28
- 70 /DS2
- 71 AD27
- 72 /DS3
- 74 /CCS
- 75 SD0 (D16)
- 76 AD26
- 77 SD1 (D17)
- 78 AD25
- 79 SD2 (D18)
- 80 AD24
- 81 SD3 (D19)
- 82 SD7 (D23)
- 83 SD4 (D20)
- 84 SD6 (D22)
- 86 SD5 (D21)
- 91 Sense Z3
- 94 /IORST
- 95 /BCLR
- 97 /FCS
- 98 /DS1
+ *6 /GBG on B2000
+
+ Zorro-III
+
+ The Zorro-III is a multiplexed Zorro-II bus with address- and
+ data phases. Signals changes as follows:
+
+ 17 /CINH
+ 18 /MTCR
+ 29 /LOCK
+ 30 AD8 (D0)
+ 32 AD9 (D1)
+ 34 AD10 (D2)
+ 36 AD11 (D3)
+ 38 AD12 (D4)
+ 39 AD13 (D5)
+ 40 Reserved
+ 41 AD14 (D6)
+ 42 Reserved
+ 43 AD15 (D7)
+ 44 Reserved
+ 45 AD16 (D8)
+ 47 AD17 (D9)
+ 48 /MTACK
+ 51 /DS0
+ 52 AD18 (D10)
+ 54 AD19 (D11)
+ 56 AD20 (D12)
+ 57 AD22 (D14)
+ 58 AD21 (D13)
+ 59 AD23 (D15)
+ 63 AD31
+ 65 AD30
+ 67 AD29
+ 69 AD28
+ 70 /DS2
+ 71 AD27
+ 72 /DS3
+ 74 /CCS
+ 75 SD0 (D16)
+ 76 AD26
+ 77 SD1 (D17)
+ 78 AD25
+ 79 SD2 (D18)
+ 80 AD24
+ 81 SD3 (D19)
+ 82 SD7 (D23)
+ 83 SD4 (D20)
+ 84 SD6 (D22)
+ 86 SD5 (D21)
+ 91 Sense Z3
+ 94 /IORST
+ 95 /BCLR
+ 97 /FCS
+ 98 /DS1
***************************************************************************/
diff --git a/src/emu/bus/bml3/bml3bus.h b/src/emu/bus/bml3/bml3bus.h
index 969fbcf7656..cb6be92cf5a 100644
--- a/src/emu/bus/bml3/bml3bus.h
+++ b/src/emu/bus/bml3/bml3bus.h
@@ -21,7 +21,7 @@
#define MCFG_BML3BUS_CPU(_cputag) \
bml3bus_device::static_set_cputag(*device, _cputag);
-
+
#define MCFG_BML3BUS_OUT_NMI_CB(_devcb) \
devcb = &bml3bus_device::set_out_nmi_callback(*device, DEVCB_##_devcb);
@@ -79,7 +79,7 @@ public:
// construction/destruction
bml3bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
bml3bus_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);
-
+
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<bml3bus_device &>(device).m_out_nmi_cb.set_callback(object); }
diff --git a/src/emu/bus/centronics/epson_ex800.h b/src/emu/bus/centronics/epson_ex800.h
index 24048e047ed..c64ca3b2e6e 100644
--- a/src/emu/bus/centronics/epson_ex800.h
+++ b/src/emu/bus/centronics/epson_ex800.h
@@ -28,7 +28,7 @@
// ======================> epson_ex800_t
class epson_ex800_t : public device_t,
- public device_centronics_peripheral_interface
+ public device_centronics_peripheral_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/centronics/epson_lx800.h b/src/emu/bus/centronics/epson_lx800.h
index 7bf62fa7b05..258aeb3230d 100644
--- a/src/emu/bus/centronics/epson_lx800.h
+++ b/src/emu/bus/centronics/epson_lx800.h
@@ -29,7 +29,7 @@
// ======================> epson_lx800_t
class epson_lx800_t : public device_t,
- public device_centronics_peripheral_interface
+ public device_centronics_peripheral_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/coco/cococart.h b/src/emu/bus/coco/cococart.h
index 07171b03426..128cdea8e48 100644
--- a/src/emu/bus/coco/cococart.h
+++ b/src/emu/bus/coco/cococart.h
@@ -46,7 +46,7 @@ struct coco_cartridge_line
cococart_line_value value;
int line;
int q_count;
- devcb_write_line *callback;
+ devcb_write_line *callback;
};
// ======================> cococart_base_update_delegate
@@ -56,13 +56,13 @@ typedef delegate<void (UINT8 *)> cococart_base_update_delegate;
#define MCFG_COCO_CARTRIDGE_CART_CB(_devcb) \
devcb = &cococart_slot_device::static_set_cart_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_COCO_CARTRIDGE_NMI_CB(_devcb) \
devcb = &cococart_slot_device::static_set_nmi_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_COCO_CARTRIDGE_HALT_CB(_devcb) \
devcb = &cococart_slot_device::static_set_halt_callback(*device, DEVCB_##_devcb);
-
+
// ======================> cococart_slot_device
class device_cococart_interface;
@@ -78,7 +78,7 @@ public:
template<class _Object> static devcb_base &static_set_cart_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_cart_callback.set_callback(object); }
template<class _Object> static devcb_base &static_set_nmi_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_nmi_callback.set_callback(object); }
template<class _Object> static devcb_base &static_set_halt_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_halt_callback.set_callback(object); }
-
+
// device-level overrides
virtual void device_start();
virtual void device_config_complete();
@@ -128,10 +128,10 @@ private:
coco_cartridge_line m_cart_line;
coco_cartridge_line m_nmi_line;
coco_cartridge_line m_halt_line;
-public:
- devcb_write_line m_cart_callback;
- devcb_write_line m_nmi_callback;
- devcb_write_line m_halt_callback;
+public:
+ devcb_write_line m_cart_callback;
+ devcb_write_line m_nmi_callback;
+ devcb_write_line m_halt_callback;
private:
// cartridge
device_cococart_interface *m_cart;
diff --git a/src/emu/bus/cpc/cpc_rs232.h b/src/emu/bus/cpc/cpc_rs232.h
index 0e44e41d6a9..fe1a716a1fb 100644
--- a/src/emu/bus/cpc/cpc_rs232.h
+++ b/src/emu/bus/cpc/cpc_rs232.h
@@ -14,7 +14,7 @@
#include "cpcexp.h"
class cpc_rs232_device : public device_t,
- public device_cpc_expansion_card_interface
+ public device_cpc_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/cpc/cpcexp.h b/src/emu/bus/cpc/cpcexp.h
index b5ab0247331..943396b1eef 100644
--- a/src/emu/bus/cpc/cpcexp.h
+++ b/src/emu/bus/cpc/cpcexp.h
@@ -93,7 +93,7 @@ public:
// construction/destruction
cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~cpc_expansion_slot_device();
-
+
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_nmi_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_reset_callback(device_t &device, _Object object) { return downcast<cpc_expansion_slot_device &>(device).m_out_reset_cb.set_callback(object); }
diff --git a/src/emu/bus/gameboy/mbc.h b/src/emu/bus/gameboy/mbc.h
index ef261a44503..46e23c3984d 100644
--- a/src/emu/bus/gameboy/mbc.h
+++ b/src/emu/bus/gameboy/mbc.h
@@ -221,7 +221,7 @@ class gb_rom_licheng_device : public gb_rom_mbc5_device
public:
// construction/destruction
gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
virtual DECLARE_WRITE8_MEMBER(write_bank);
};
diff --git a/src/emu/bus/iq151/iq151.h b/src/emu/bus/iq151/iq151.h
index e7fe12e8b4b..9b85ee9d3a2 100644
--- a/src/emu/bus/iq151/iq151.h
+++ b/src/emu/bus/iq151/iq151.h
@@ -79,7 +79,7 @@ public:
// construction/destruction
iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~iq151cart_slot_device();
-
+
template<class _Object> static devcb_base &set_out_irq0_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irq1_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq1_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq2_cb.set_callback(object); }
diff --git a/src/emu/bus/isa/aga.h b/src/emu/bus/isa/aga.h
index e764458a087..cfe867ec258 100644
--- a/src/emu/bus/isa/aga.h
+++ b/src/emu/bus/isa/aga.h
@@ -57,7 +57,7 @@ public:
DECLARE_READ8_MEMBER( pc_aga_videoram_r );
MC6845_UPDATE_ROW( aga_update_row );
- MC6845_UPDATE_ROW( mda_text_inten_update_row );
+ MC6845_UPDATE_ROW( mda_text_inten_update_row );
MC6845_UPDATE_ROW( mda_text_blink_update_row );
MC6845_UPDATE_ROW( cga_text_inten_update_row );
MC6845_UPDATE_ROW( cga_text_inten_alt_update_row );
diff --git a/src/emu/bus/isa/gus.h b/src/emu/bus/isa/gus.h
index 06451a0ac56..969643d427a 100644
--- a/src/emu/bus/isa/gus.h
+++ b/src/emu/bus/isa/gus.h
@@ -61,22 +61,22 @@
#define MCFG_GF1_TIMER2_IRQ_HANDLER(_devcb) \
devcb = &gf1_device::set_timer2_irq_handler(*device, DEVCB_##_devcb);
-
+
#define MCFG_GF1_SB_IRQ_HANDLER(_devcb) \
devcb = &gf1_device::set_sb_irq_handler(*device, DEVCB_##_devcb);
#define MCFG_GF1_DMA_IRQ_HANDLER(_devcb) \
devcb = &gf1_device::set_dma_irq_handler(*device, DEVCB_##_devcb);
-
+
#define MCFG_GF1_DRQ1_HANDLER(_devcb) \
devcb = &gf1_device::set_drq1_handler(*device, DEVCB_##_devcb);
-
+
#define MCFG_GF1_DRQ2_HANDLER(_devcb) \
devcb = &gf1_device::set_drq2_handler(*device, DEVCB_##_devcb);
-
+
#define MCFG_GF1_NMI_HANDLER(_devcb) \
devcb = &gf1_device::set_nmi_handler(*device, DEVCB_##_devcb);
-
+
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
diff --git a/src/emu/bus/isa/isa.h b/src/emu/bus/isa/isa.h
index f4640af9a98..83953700d59 100644
--- a/src/emu/bus/isa/isa.h
+++ b/src/emu/bus/isa/isa.h
@@ -92,7 +92,7 @@
#define MCFG_ISA_BUS_IOCHCK(_iochck) \
downcast<isa8_device *>(device)->set_iochck_callback(DEVCB_##_iochck);
-
+
#define MCFG_ISA_OUT_IRQ2_CB(_devcb) \
devcb = &isa8_device::set_out_irq2_callback(*device, DEVCB_##_devcb);
@@ -119,7 +119,7 @@
#define MCFG_ISA_OUT_DRQ3_CB(_devcb) \
devcb = &isa8_device::set_out_drq3_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_ISA_OUT_IRQ10_CB(_devcb) \
devcb = &isa16_device::set_out_irq10_callback(*device, DEVCB_##_devcb);
@@ -354,7 +354,7 @@ public:
template<class _Object> static devcb_base &set_out_drq5_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq5_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_drq6_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq6_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_drq7_callback(device_t &device, _Object object) { return downcast<isa16_device &>(device).m_out_drq7_cb.set_callback(object); }
-
+
void install16_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_delegate rhandler, write16_delegate whandler);
// for ISA16, put the 16-bit configs in the primary slots and the 8-bit configs in the secondary
diff --git a/src/emu/bus/kc/kc.h b/src/emu/bus/kc/kc.h
index 8970e957530..1b9b4c7f5d5 100644
--- a/src/emu/bus/kc/kc.h
+++ b/src/emu/bus/kc/kc.h
@@ -49,7 +49,7 @@ public:
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_nmi_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_halt_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_halt_cb.set_callback(object); }
-
+
// device-level overrides
virtual void device_start();
@@ -127,7 +127,7 @@ extern const device_type KCCART_SLOT;
#define MCFG_KCEXP_SLOT_NEXT_SLOT(_next_slot_tag) \
kcexp_slot_device::static_set_next_slot(*device, _next_slot_tag);
-
+
#define MCFG_KCCART_SLOT_OUT_IRQ_CB(_devcb) \
devcb = &kccart_slot_device::set_out_irq_callback(*device, DEVCB_##_devcb);
@@ -141,12 +141,12 @@ extern const device_type KCCART_SLOT;
#define MCFG_KCCART_SLOT_NEXT_SLOT(_next_slot_tag) \
kccart_slot_device::static_set_next_slot(*device, _next_slot_tag);
-// #define MCFG_KC85_EXPANSION_ADD(_tag,_next_slot_tag,_config,_slot_intf,_def_slot)
-// MCFG_DEVICE_ADD(_tag, KCEXP_SLOT, 0)
-// MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
+// #define MCFG_KC85_EXPANSION_ADD(_tag,_next_slot_tag,_config,_slot_intf,_def_slot)
+// MCFG_DEVICE_ADD(_tag, KCEXP_SLOT, 0)
+// MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
// #define MCFG_KC85_CARTRIDGE_ADD(_tag,_next_slot_tag,_config,_slot_intf,_def_slot)
-// MCFG_DEVICE_ADD(_tag, KCCART_SLOT, 0)
-// MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
+// MCFG_DEVICE_ADD(_tag, KCCART_SLOT, 0)
+// MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
#endif /* __KCEXP_H__ */
diff --git a/src/emu/bus/msx_cart/ascii.h b/src/emu/bus/msx_cart/ascii.h
index 24ad955e32f..39a01074af6 100644
--- a/src/emu/bus/msx_cart/ascii.h
+++ b/src/emu/bus/msx_cart/ascii.h
@@ -113,4 +113,3 @@ private:
#endif
-
diff --git a/src/emu/bus/msx_cart/konami.h b/src/emu/bus/msx_cart/konami.h
index 6f9b10bdf94..c85fcd5fbe6 100644
--- a/src/emu/bus/msx_cart/konami.h
+++ b/src/emu/bus/msx_cart/konami.h
@@ -94,22 +94,22 @@ private:
class msx_cart_synthesizer : public device_t
- , public msx_cart_interface
+ , public msx_cart_interface
{
public:
- msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- // device-level overrides
- virtual void device_start();
+ // device-level overrides
+ virtual void device_start();
virtual machine_config_constructor device_mconfig_additions() const;
- virtual void initialize_cartridge();
+ virtual void initialize_cartridge();
- virtual DECLARE_READ8_MEMBER(read_cart);
- virtual DECLARE_WRITE8_MEMBER(write_cart);
+ virtual DECLARE_READ8_MEMBER(read_cart);
+ virtual DECLARE_WRITE8_MEMBER(write_cart);
private:
- UINT8 *m_bank_base;
+ UINT8 *m_bank_base;
required_device<dac_device> m_dac;
};
diff --git a/src/emu/bus/msx_cart/yamaha.h b/src/emu/bus/msx_cart/yamaha.h
index 337eabd8f60..e1f6fc489ff 100644
--- a/src/emu/bus/msx_cart/yamaha.h
+++ b/src/emu/bus/msx_cart/yamaha.h
@@ -60,4 +60,3 @@ public:
};
#endif
-
diff --git a/src/emu/bus/msx_slot/bunsetsu.h b/src/emu/bus/msx_slot/bunsetsu.h
index d798cc52b34..de41015932c 100644
--- a/src/emu/bus/msx_slot/bunsetsu.h
+++ b/src/emu/bus/msx_slot/bunsetsu.h
@@ -11,8 +11,7 @@ extern const device_type MSX_SLOT_BUNSETSU;
#define MCFG_MSX_SLOT_BUNSETSU_ADD(_tag, _startpage, _numpages, _region, _offset, _bunsetsu_region_tag) \
MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_BUNSETSU, _startpage, _numpages) \
msx_slot_rom_device::set_rom_start(*device, _region, _offset); \
- msx_slot_bunsetsu_device::set_bunsetsu_region_tag(*device, _bunsetsu_region_tag); \
-
+ msx_slot_bunsetsu_device::set_bunsetsu_region_tag(*device, _bunsetsu_region_tag);
class msx_slot_bunsetsu_device : public msx_slot_rom_device
{
public:
@@ -35,4 +34,3 @@ private:
#endif
-
diff --git a/src/emu/bus/msx_slot/cartridge.h b/src/emu/bus/msx_slot/cartridge.h
index fef197fdbd5..ec09924f295 100644
--- a/src/emu/bus/msx_slot/cartridge.h
+++ b/src/emu/bus/msx_slot/cartridge.h
@@ -80,4 +80,3 @@ public:
#endif
-
diff --git a/src/emu/bus/msx_slot/disk.h b/src/emu/bus/msx_slot/disk.h
index ad734b7fde7..7816dd28bdc 100644
--- a/src/emu/bus/msx_slot/disk.h
+++ b/src/emu/bus/msx_slot/disk.h
@@ -103,9 +103,9 @@ protected:
class msx_slot_tc8566_disk_device : public msx_slot_disk_device
{
public:
- msx_slot_tc8566_disk_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);
+ msx_slot_tc8566_disk_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);
- virtual void device_start();
+ virtual void device_start();
protected:
tc8566af_device *m_fdc;
@@ -185,7 +185,7 @@ public:
DECLARE_READ8_MEMBER(io_read);
DECLARE_WRITE8_MEMBER(io_write);
- void post_load();
+ void post_load();
private:
UINT8 m_control;
@@ -195,4 +195,3 @@ private:
#endif
-
diff --git a/src/emu/bus/msx_slot/music.h b/src/emu/bus/msx_slot/music.h
index 10e07ae47e6..c21ca3b84fc 100644
--- a/src/emu/bus/msx_slot/music.h
+++ b/src/emu/bus/msx_slot/music.h
@@ -13,8 +13,7 @@ extern const device_type MSX_SLOT_MUSIC;
#define MCFG_MSX_SLOT_MUSIC_ADD(_tag, _startpage, _numpages, _region, _offset, _ym2413_tag) \
MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_MUSIC, _startpage, _numpages) \
msx_slot_rom_device::set_rom_start(*device, _region, _offset); \
- msx_slot_music_device::set_ym2413_tag(*device, _ym2413_tag); \
-
+ msx_slot_music_device::set_ym2413_tag(*device, _ym2413_tag);
class msx_slot_music_device : public msx_slot_rom_device
{
public:
@@ -36,4 +35,3 @@ private:
#endif
-
diff --git a/src/emu/bus/msx_slot/ram.h b/src/emu/bus/msx_slot/ram.h
index 9f66808b234..3a2b0a936f9 100644
--- a/src/emu/bus/msx_slot/ram.h
+++ b/src/emu/bus/msx_slot/ram.h
@@ -4,8 +4,7 @@
#include "slot.h"
#define MCFG_MSX_SLOT_RAM_ADD(_tag, _startpage, _numpages) \
- MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_RAM, _startpage, _numpages) \
-
+ MCFG_MSX_INTERNAL_SLOT_ADD(_tag, MSX_SLOT_RAM, _startpage, _numpages)
class msx_slot_ram_device : public device_t,
public msx_internal_slot_interface
{
diff --git a/src/emu/bus/msx_slot/ram_mm.h b/src/emu/bus/msx_slot/ram_mm.h
index 5027fa428e1..89399bc2608 100644
--- a/src/emu/bus/msx_slot/ram_mm.h
+++ b/src/emu/bus/msx_slot/ram_mm.h
@@ -41,4 +41,3 @@ private:
extern const device_type MSX_SLOT_RAM_MM;
#endif
-
diff --git a/src/emu/bus/neogeo/banked_cart.h b/src/emu/bus/neogeo/banked_cart.h
index 60e2ad0cc05..d0921b72c33 100644
--- a/src/emu/bus/neogeo/banked_cart.h
+++ b/src/emu/bus/neogeo/banked_cart.h
@@ -42,6 +42,3 @@ private:
};
#endif
-
-
-
diff --git a/src/emu/bus/neogeo/bootleg_prot.h b/src/emu/bus/neogeo/bootleg_prot.h
index bcd2b3f3172..685c315dc33 100644
--- a/src/emu/bus/neogeo/bootleg_prot.h
+++ b/src/emu/bus/neogeo/bootleg_prot.h
@@ -22,7 +22,7 @@ public:
void neogeo_bootleg_sx_decrypt(UINT8* fixed, UINT32 fixed_size, int value);
void kog_px_decrypt(UINT8* cpurom, UINT32 cpurom_size);
void kof97oro_px_decode(UINT8* cpurom, UINT32 cpurom_size);
- void kof10thBankswitch(address_space &space, UINT16 nBank);
+ void kof10thBankswitch(address_space &space, UINT16 nBank);
DECLARE_READ16_MEMBER(kof10th_RAM2_r);
DECLARE_READ16_MEMBER(kof10th_RAMB_r);
DECLARE_WRITE16_MEMBER(kof10th_custom_w);
@@ -95,6 +95,3 @@ private:
};
#endif
-
-
-
diff --git a/src/emu/bus/neogeo/cmc_prot.h b/src/emu/bus/neogeo/cmc_prot.h
index 3d12a159aa7..5c535b09f37 100644
--- a/src/emu/bus/neogeo/cmc_prot.h
+++ b/src/emu/bus/neogeo/cmc_prot.h
@@ -83,6 +83,3 @@ private:
};
#endif
-
-
-
diff --git a/src/emu/bus/neogeo/fatfury2_prot.h b/src/emu/bus/neogeo/fatfury2_prot.h
index 4ba37427531..d359f616136 100644
--- a/src/emu/bus/neogeo/fatfury2_prot.h
+++ b/src/emu/bus/neogeo/fatfury2_prot.h
@@ -38,8 +38,3 @@ private:
};
#endif
-
-
-
-
-
diff --git a/src/emu/bus/neogeo/kof2002_prot.h b/src/emu/bus/neogeo/kof2002_prot.h
index 2cad2d846e7..6e9074c157e 100644
--- a/src/emu/bus/neogeo/kof2002_prot.h
+++ b/src/emu/bus/neogeo/kof2002_prot.h
@@ -34,6 +34,3 @@ private:
};
#endif
-
-
-
diff --git a/src/emu/bus/neogeo/kof98_prot.h b/src/emu/bus/neogeo/kof98_prot.h
index 7f6e08c1cd1..dfd587c418a 100644
--- a/src/emu/bus/neogeo/kof98_prot.h
+++ b/src/emu/bus/neogeo/kof98_prot.h
@@ -16,7 +16,7 @@ class kof98_prot_device : public device_t
public:
// construction/destruction
kof98_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
void kof98_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size);
void install_kof98_protection(cpu_device* maincpu);
DECLARE_WRITE16_MEMBER(kof98_prot_w);
@@ -36,7 +36,3 @@ private:
};
#endif
-
-
-
-
diff --git a/src/emu/bus/neogeo/mslugx_prot.h b/src/emu/bus/neogeo/mslugx_prot.h
index 4a6bb284f9b..cb95da812ac 100644
--- a/src/emu/bus/neogeo/mslugx_prot.h
+++ b/src/emu/bus/neogeo/mslugx_prot.h
@@ -37,6 +37,3 @@ private:
};
#endif
-
-
-
diff --git a/src/emu/bus/neogeo/neogeo_intf.h b/src/emu/bus/neogeo/neogeo_intf.h
index cba60338833..07c60c12c54 100644
--- a/src/emu/bus/neogeo/neogeo_intf.h
+++ b/src/emu/bus/neogeo/neogeo_intf.h
@@ -49,7 +49,7 @@ public:
void ym_alloc(UINT32 size) { if (m_ym == NULL) m_ym.resize(size/sizeof(UINT8)); }
UINT8* get_ym_base() { return m_ym; }
UINT32 get_ym_size() { return m_ym.bytes(); }
-
+
void ymdelta_alloc(UINT32 size) { if (m_ymdelta == NULL) m_ymdelta.resize(size/sizeof(UINT8)); }
UINT8* get_ymdelta_base() { return m_ymdelta; }
UINT32 get_ymdelta_size() { return m_ymdelta.bytes(); }
@@ -74,4 +74,3 @@ protected:
};
#endif
-
diff --git a/src/emu/bus/neogeo/pcm2_prot.h b/src/emu/bus/neogeo/pcm2_prot.h
index ff3aa862e2c..09b0e8a1f21 100644
--- a/src/emu/bus/neogeo/pcm2_prot.h
+++ b/src/emu/bus/neogeo/pcm2_prot.h
@@ -16,7 +16,7 @@ class pcm2_prot_device : public device_t
public:
// construction/destruction
pcm2_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
void neo_pcm2_snk_1999(UINT8* ymrom, UINT32 ymsize, int value);
void neo_pcm2_swap(UINT8* ymrom, UINT32 ymsize, int value);
@@ -32,6 +32,3 @@ private:
};
#endif
-
-
-
diff --git a/src/emu/bus/neogeo/pvc_prot.h b/src/emu/bus/neogeo/pvc_prot.h
index 408fbfc8176..fde58cbb8f6 100644
--- a/src/emu/bus/neogeo/pvc_prot.h
+++ b/src/emu/bus/neogeo/pvc_prot.h
@@ -46,6 +46,3 @@ private:
};
#endif
-
-
-
diff --git a/src/emu/bus/neogeo/sbp_prot.h b/src/emu/bus/neogeo/sbp_prot.h
index 12f483b8866..6fd99d03f58 100644
--- a/src/emu/bus/neogeo/sbp_prot.h
+++ b/src/emu/bus/neogeo/sbp_prot.h
@@ -16,7 +16,7 @@ class sbp_prot_device : public device_t
public:
// construction/destruction
sbp_prot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
UINT8* m_mainrom;
@@ -36,7 +36,3 @@ private:
};
#endif
-
-
-
-
diff --git a/src/emu/bus/neogeo/sma_prot.h b/src/emu/bus/neogeo/sma_prot.h
index 049eeb2a774..814b52625aa 100644
--- a/src/emu/bus/neogeo/sma_prot.h
+++ b/src/emu/bus/neogeo/sma_prot.h
@@ -54,6 +54,3 @@ private:
};
#endif
-
-
-
diff --git a/src/emu/bus/nes/mmc5.h b/src/emu/bus/nes/mmc5.h
index d507429b58a..e764f9bcc95 100644
--- a/src/emu/bus/nes/mmc5.h
+++ b/src/emu/bus/nes/mmc5.h
@@ -78,7 +78,7 @@ protected:
// MMC-5 contains 1K of internal ram
UINT8 m_exram[0x400];
-
+
UINT8 m_ram_hi_banks[4];
// int m_nes_vram_sprite[8];
diff --git a/src/emu/bus/nubus/nubus.h b/src/emu/bus/nubus/nubus.h
index eb79dbc8b83..e494df7ac0a 100644
--- a/src/emu/bus/nubus/nubus.h
+++ b/src/emu/bus/nubus/nubus.h
@@ -38,7 +38,7 @@
#define MCFG_NUBUS_OUT_IRQE_CB(_devcb) \
devcb = &nubus_device::set_out_irqe_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_NUBUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, NUBUS_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
@@ -88,7 +88,7 @@ public:
nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
nubus_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);
~nubus_device() { m_device_list.detach_all(); }
-
+
// inline configuration
static void static_set_cputag(device_t &device, const char *tag);
template<class _Object> static devcb_base &set_out_irq9_callback(device_t &device, _Object object) { return downcast<nubus_device &>(device).m_out_irq9_cb.set_callback(object); }
diff --git a/src/emu/bus/oricext/jasmin.h b/src/emu/bus/oricext/jasmin.h
index 6815d652daf..4fe40da89fc 100644
--- a/src/emu/bus/oricext/jasmin.h
+++ b/src/emu/bus/oricext/jasmin.h
@@ -28,7 +28,7 @@ protected:
bool side_sel, fdc_reset, ram_access, rom_access, select[4];
UINT8 *jasmin_rom;
floppy_image_device *cur_floppy, *floppies[4];
-
+
virtual void device_start();
virtual void device_reset();
const rom_entry *device_rom_region() const;
diff --git a/src/emu/bus/oricext/microdisc.h b/src/emu/bus/oricext/microdisc.h
index fb7a6fd68b5..3ea5e8f9545 100644
--- a/src/emu/bus/oricext/microdisc.h
+++ b/src/emu/bus/oricext/microdisc.h
@@ -40,7 +40,7 @@ protected:
floppy_image_device *floppies[4];
UINT8 port_314;
bool intrq_state, drq_state, hld_state;
-
+
virtual void device_start();
virtual void device_reset();
const rom_entry *device_rom_region() const;
diff --git a/src/emu/bus/oricext/oricext.h b/src/emu/bus/oricext/oricext.h
index 1d2cb6e2a65..5308ca36da8 100644
--- a/src/emu/bus/oricext/oricext.h
+++ b/src/emu/bus/oricext/oricext.h
@@ -10,7 +10,7 @@
#include "emu.h"
#include "cpu/m6502/m6502.h"
-#define MCFG_ORICEXT_ADD(_tag, _slot_intf, _def_slot, _cputag, _irq) \
+#define MCFG_ORICEXT_ADD(_tag, _slot_intf, _def_slot, _cputag, _irq) \
MCFG_DEVICE_ADD(_tag, ORICEXT_CONNECTOR, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
downcast<oricext_connector *>(device)->set_cputag(_cputag); \
@@ -20,7 +20,7 @@
class oricext_device;
class oricext_connector: public device_t,
- public device_slot_interface
+ public device_slot_interface
{
public:
oricext_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -38,7 +38,7 @@ protected:
};
class oricext_device : public device_t,
- public device_slot_card_interface
+ public device_slot_card_interface
{
public:
oricext_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);
diff --git a/src/emu/bus/pc_kbd/pc_kbdc.h b/src/emu/bus/pc_kbd/pc_kbdc.h
index d391486e5e5..679870c5b93 100644
--- a/src/emu/bus/pc_kbd/pc_kbdc.h
+++ b/src/emu/bus/pc_kbd/pc_kbdc.h
@@ -24,7 +24,7 @@ set the data line and then set the clock line.
#define MCFG_PC_KBDC_OUT_DATA_CB(_devcb) \
devcb = &pc_kbdc_device::set_out_data_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_PC_KBDC_SLOT_ADD(_kbdc_tag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, PC_KBDC_SLOT, 0 ) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
@@ -67,7 +67,7 @@ public:
template<class _Object> static devcb_base &set_out_clock_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_clock_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_data_callback(device_t &device, _Object object) { return downcast<pc_kbdc_device &>(device).m_out_data_cb.set_callback(object); }
-
+
void set_keyboard(device_pc_kbd_interface *keyboard);
int clock_signal() { return m_clock_state; }
diff --git a/src/emu/bus/pet/diag.h b/src/emu/bus/pet/diag.h
index 7a5752bdc86..fec6dcae5a8 100644
--- a/src/emu/bus/pet/diag.h
+++ b/src/emu/bus/pet/diag.h
@@ -46,7 +46,7 @@ public:
virtual DECLARE_WRITE_LINE_MEMBER( input_d ) { output_4(state); }
virtual DECLARE_WRITE_LINE_MEMBER( input_k ) { output_9(state); }
virtual DECLARE_WRITE_LINE_MEMBER( input_l ) { output_10(state); }
-
+
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/emu/bus/ql/cst_q_plus4.h b/src/emu/bus/ql/cst_q_plus4.h
index ad6b385782a..6dc315ccaa9 100644
--- a/src/emu/bus/ql/cst_q_plus4.h
+++ b/src/emu/bus/ql/cst_q_plus4.h
@@ -26,7 +26,7 @@
// ======================> cst_q_plus4_t
class cst_q_plus4_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/cst_qdisc.h b/src/emu/bus/ql/cst_qdisc.h
index e422dcf10ab..545b825744c 100644
--- a/src/emu/bus/ql/cst_qdisc.h
+++ b/src/emu/bus/ql/cst_qdisc.h
@@ -25,7 +25,7 @@
// ======================> cst_ql_disc_interface_t
class cst_ql_disc_interface_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/cumana_fdi.h b/src/emu/bus/ql/cumana_fdi.h
index fac6a1b0bc4..4be8652ca2b 100644
--- a/src/emu/bus/ql/cumana_fdi.h
+++ b/src/emu/bus/ql/cumana_fdi.h
@@ -2,7 +2,7 @@
// copyright-holders:Curt Coder
/**********************************************************************
- Cumana Floppy Disk Interface emulation
+ Cumana Floppy Disk Interface emulation
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@@ -25,7 +25,7 @@
// ======================> cumana_floppy_disk_interface_t
class cumana_floppy_disk_interface_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/exp.h b/src/emu/bus/ql/exp.h
index d77433c398b..045812c2a32 100644
--- a/src/emu/bus/ql/exp.h
+++ b/src/emu/bus/ql/exp.h
@@ -64,13 +64,13 @@
#define MCFG_QL_EXPANSION_SLOT_IPL0L_CALLBACK(_write) \
- devcb = &ql_expansion_slot_t::set_ipl0l_wr_callback(*device, DEVCB_##_write);
+ devcb = &ql_expansion_slot_t::set_ipl0l_wr_callback(*device, DEVCB_##_write);
#define MCFG_QL_EXPANSION_SLOT_IPL1L_CALLBACK(_write) \
- devcb = &ql_expansion_slot_t::set_ipl1l_wr_callback(*device, DEVCB_##_write);
+ devcb = &ql_expansion_slot_t::set_ipl1l_wr_callback(*device, DEVCB_##_write);
#define MCFG_QL_EXPANSION_SLOT_BERRL_CALLBACK(_write) \
- devcb = &ql_expansion_slot_t::set_berrl_wr_callback(*device, DEVCB_##_write);
+ devcb = &ql_expansion_slot_t::set_berrl_wr_callback(*device, DEVCB_##_write);
#define MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(_write) \
devcb = &ql_expansion_slot_t::set_extintl_wr_callback(*device, DEVCB_##_write);
@@ -93,14 +93,14 @@ public:
// construction/destruction
device_ql_expansion_card_interface(const machine_config &mconfig, device_t &device);
- virtual void romoeh_w(int state) { m_romoeh = state; }
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) { return data; }
- virtual void write(address_space &space, offs_t offset, UINT8 data) { }
+ virtual void romoeh_w(int state) { m_romoeh = state; }
+ virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) { return data; }
+ virtual void write(address_space &space, offs_t offset, UINT8 data) { }
protected:
ql_expansion_slot_t *m_slot;
- int m_romoeh;
+ int m_romoeh;
};
@@ -113,31 +113,31 @@ public:
// construction/destruction
ql_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- template<class _Object> static devcb_base &set_ipl0l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl0l.set_callback(object); }
- template<class _Object> static devcb_base &set_ipl1l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl1l.set_callback(object); }
- template<class _Object> static devcb_base &set_berrl_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_berrl.set_callback(object); }
+ template<class _Object> static devcb_base &set_ipl0l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl0l.set_callback(object); }
+ template<class _Object> static devcb_base &set_ipl1l_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_ipl1l.set_callback(object); }
+ template<class _Object> static devcb_base &set_berrl_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_berrl.set_callback(object); }
template<class _Object> static devcb_base &set_extintl_wr_callback(device_t &device, _Object object) { return downcast<ql_expansion_slot_t &>(device).m_write_extintl.set_callback(object); }
- // computer interface
- UINT8 read(address_space &space, offs_t offset, UINT8 data) { if (m_card) data = m_card->read(space, offset, data); return data; }
- void write(address_space &space, offs_t offset, UINT8 data) { if (m_card) m_card->write(space, offset, data); }
- DECLARE_WRITE_LINE_MEMBER( romoeh_w ) { if (m_card) m_card->romoeh_w(state); }
+ // computer interface
+ UINT8 read(address_space &space, offs_t offset, UINT8 data) { if (m_card) data = m_card->read(space, offset, data); return data; }
+ void write(address_space &space, offs_t offset, UINT8 data) { if (m_card) m_card->write(space, offset, data); }
+ DECLARE_WRITE_LINE_MEMBER( romoeh_w ) { if (m_card) m_card->romoeh_w(state); }
- // card interface
- DECLARE_WRITE_LINE_MEMBER( ipl0l_w ) { m_write_ipl0l(state); }
- DECLARE_WRITE_LINE_MEMBER( ipl1l_w ) { m_write_ipl1l(state); }
- DECLARE_WRITE_LINE_MEMBER( berrl_w ) { m_write_berrl(state); }
+ // card interface
+ DECLARE_WRITE_LINE_MEMBER( ipl0l_w ) { m_write_ipl0l(state); }
+ DECLARE_WRITE_LINE_MEMBER( ipl1l_w ) { m_write_ipl1l(state); }
+ DECLARE_WRITE_LINE_MEMBER( berrl_w ) { m_write_berrl(state); }
DECLARE_WRITE_LINE_MEMBER( extintl_w ) { m_write_extintl(state); }
protected:
// device-level overrides
virtual void device_start();
- virtual void device_reset() { if (get_card_device()) get_card_device()->reset(); }
+ virtual void device_reset() { if (get_card_device()) get_card_device()->reset(); }
devcb_write_line m_write_ipl0l;
- devcb_write_line m_write_ipl1l;
- devcb_write_line m_write_berrl;
- devcb_write_line m_write_extintl;
+ devcb_write_line m_write_ipl1l;
+ devcb_write_line m_write_berrl;
+ devcb_write_line m_write_extintl;
device_ql_expansion_card_interface *m_card;
};
diff --git a/src/emu/bus/ql/kempston_di.h b/src/emu/bus/ql/kempston_di.h
index 2bde84e00be..1ca3a14e1f2 100644
--- a/src/emu/bus/ql/kempston_di.h
+++ b/src/emu/bus/ql/kempston_di.h
@@ -25,7 +25,7 @@
// ======================> kempston_disk_interface_t
class kempston_disk_interface_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/miracle_gold_card.h b/src/emu/bus/ql/miracle_gold_card.h
index 8decf3157ca..721ae564e46 100644
--- a/src/emu/bus/ql/miracle_gold_card.h
+++ b/src/emu/bus/ql/miracle_gold_card.h
@@ -25,7 +25,7 @@
// ======================> miracle_gold_card_t
class miracle_gold_card_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/miracle_hd.h b/src/emu/bus/ql/miracle_hd.h
index 4d7503128a5..7df72866a8f 100644
--- a/src/emu/bus/ql/miracle_hd.h
+++ b/src/emu/bus/ql/miracle_hd.h
@@ -25,7 +25,7 @@
// ======================> miracle_hard_disk_t
class miracle_hard_disk_t : public device_t,
- public device_ql_rom_cartridge_card_interface
+ public device_ql_rom_cartridge_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/mp_fdi.h b/src/emu/bus/ql/mp_fdi.h
index 7e6280e2b6b..7934cf0731a 100644
--- a/src/emu/bus/ql/mp_fdi.h
+++ b/src/emu/bus/ql/mp_fdi.h
@@ -25,7 +25,7 @@
// ======================> micro_peripherals_floppy_disk_interface_t
class micro_peripherals_floppy_disk_interface_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/opd_basic_master.h b/src/emu/bus/ql/opd_basic_master.h
index 8d262b8e493..261ce258980 100644
--- a/src/emu/bus/ql/opd_basic_master.h
+++ b/src/emu/bus/ql/opd_basic_master.h
@@ -25,7 +25,7 @@
// ======================> opd_basic_master_t
class opd_basic_master_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/pcml_qdisk.h b/src/emu/bus/ql/pcml_qdisk.h
index 46e15d67036..1c6f33df282 100644
--- a/src/emu/bus/ql/pcml_qdisk.h
+++ b/src/emu/bus/ql/pcml_qdisk.h
@@ -25,7 +25,7 @@
// ======================> pcml_q_disk_interface_t
class pcml_q_disk_interface_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/qubide.h b/src/emu/bus/ql/qubide.h
index a8334729b46..6b5ef287c5f 100644
--- a/src/emu/bus/ql/qubide.h
+++ b/src/emu/bus/ql/qubide.h
@@ -26,7 +26,7 @@
// ======================> qubide_t
class qubide_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/rom.h b/src/emu/bus/ql/rom.h
index 74a655dba15..02e79f8f2d8 100644
--- a/src/emu/bus/ql/rom.h
+++ b/src/emu/bus/ql/rom.h
@@ -64,16 +64,16 @@ public:
device_ql_rom_cartridge_card_interface(const machine_config &mconfig, device_t &device);
virtual ~device_ql_rom_cartridge_card_interface();
- virtual void romoeh_w(int state) { m_romoeh = state; }
- virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) { return data; }
- virtual void write(address_space &space, offs_t offset, UINT8 data) { }
+ virtual void romoeh_w(int state) { m_romoeh = state; }
+ virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) { return data; }
+ virtual void write(address_space &space, offs_t offset, UINT8 data) { }
protected:
ql_rom_cartridge_slot_t *m_slot;
optional_shared_ptr<UINT8> m_rom;
- int m_romoeh;
+ int m_romoeh;
};
diff --git a/src/emu/bus/ql/sandy_superdisk.h b/src/emu/bus/ql/sandy_superdisk.h
index 2ebf422e95b..0ab375aea7f 100644
--- a/src/emu/bus/ql/sandy_superdisk.h
+++ b/src/emu/bus/ql/sandy_superdisk.h
@@ -28,7 +28,7 @@
// ======================> sandy_super_disk_device
class sandy_super_disk_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/sandy_superqboard.h b/src/emu/bus/ql/sandy_superqboard.h
index 8a34e2bf305..535f9b0dd26 100644
--- a/src/emu/bus/ql/sandy_superqboard.h
+++ b/src/emu/bus/ql/sandy_superqboard.h
@@ -28,7 +28,7 @@
// ======================> sandy_superqboard_t
class sandy_superqboard_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/ql/trumpcard.h b/src/emu/bus/ql/trumpcard.h
index a0bd1bb7713..ecae4d0e88c 100644
--- a/src/emu/bus/ql/trumpcard.h
+++ b/src/emu/bus/ql/trumpcard.h
@@ -27,7 +27,7 @@
// ======================> ql_trump_card_t
class ql_trump_card_t : public device_t,
- public device_ql_expansion_card_interface
+ public device_ql_expansion_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/scsi/scsihle.h b/src/emu/bus/scsi/scsihle.h
index 071748f8aeb..50feb6ff45f 100644
--- a/src/emu/bus/scsi/scsihle.h
+++ b/src/emu/bus/scsi/scsihle.h
@@ -88,6 +88,5 @@ extern const input_device_default DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_7)[];
MCFG_DEVICE_MODIFY(_tag ) \
MCFG_SLOT_OPTION_ADD( _option, _type ) \
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS( _option, _id ) \
- MCFG_SLOT_DEFAULT_OPTION( _option ) \
-
+ MCFG_SLOT_DEFAULT_OPTION( _option )
#endif
diff --git a/src/emu/bus/tvc/tvc.h b/src/emu/bus/tvc/tvc.h
index e02922218b5..181806f8195 100644
--- a/src/emu/bus/tvc/tvc.h
+++ b/src/emu/bus/tvc/tvc.h
@@ -89,7 +89,7 @@ public:
// construction/destruction
tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~tvcexp_slot_device();
-
+
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_nmi_cb.set_callback(object); }
@@ -124,5 +124,5 @@ extern const device_type TVCEXP_SLOT;
#define MCFG_TVCEXP_SLOT_OUT_NMI_CB(_devcb) \
devcb = &tvcexp_slot_device::set_out_nmi_callback(*device, DEVCB_##_devcb);
-
+
#endif /* __TVCEXP_H__ */
diff --git a/src/emu/bus/vtech/ioexp/carts.h b/src/emu/bus/vtech/ioexp/carts.h
index afca300774f..fb7cf41cd9f 100644
--- a/src/emu/bus/vtech/ioexp/carts.h
+++ b/src/emu/bus/vtech/ioexp/carts.h
@@ -1,6 +1,6 @@
/***************************************************************************
- VTech Laser/VZ I/O Expansion Slot Devices
+ VTech Laser/VZ I/O Expansion Slot Devices
***************************************************************************/
diff --git a/src/emu/bus/vtech/ioexp/ioexp.h b/src/emu/bus/vtech/ioexp/ioexp.h
index 782cd8a229a..b82962ee0ee 100644
--- a/src/emu/bus/vtech/ioexp/ioexp.h
+++ b/src/emu/bus/vtech/ioexp/ioexp.h
@@ -1,27 +1,27 @@
/***************************************************************************
- VTech Laser/VZ I/O Expansion Slot
+ VTech Laser/VZ I/O Expansion Slot
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- 30-pin slot
-
- 15 GND 16 NC
- 14 /WR 17 NC
- 13 A3 18 NC
- 12 A6 19 +5VDC
- 11 A2 20 NC
- 10 A5 21 D4
- 9 D0 22 D5
- 8 D2 23 D7
- 7 D6 24 D1
- 6 D3 25 /RD
- 5 /IORQ 26 A1
- 4 +5VDC 27 A4
- 3 NC 28 A0
- 2 NC 29 A7
- 1 NC 30 NC
+ 30-pin slot
+
+ 15 GND 16 NC
+ 14 /WR 17 NC
+ 13 A3 18 NC
+ 12 A6 19 +5VDC
+ 11 A2 20 NC
+ 10 A5 21 D4
+ 9 D0 22 D5
+ 8 D2 23 D7
+ 7 D6 24 D1
+ 6 D3 25 /RD
+ 5 /IORQ 26 A1
+ 4 +5VDC 27 A4
+ 3 NC 28 A0
+ 2 NC 29 A7
+ 1 NC 30 NC
***************************************************************************/
diff --git a/src/emu/bus/vtech/ioexp/joystick.h b/src/emu/bus/vtech/ioexp/joystick.h
index 8344ce43d40..0226f517393 100644
--- a/src/emu/bus/vtech/ioexp/joystick.h
+++ b/src/emu/bus/vtech/ioexp/joystick.h
@@ -1,6 +1,6 @@
/***************************************************************************
- VTech Laser Joystick Interface
+ VTech Laser Joystick Interface
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/vtech/ioexp/printer.h b/src/emu/bus/vtech/ioexp/printer.h
index 0229b9051e7..ed3010c5f73 100644
--- a/src/emu/bus/vtech/ioexp/printer.h
+++ b/src/emu/bus/vtech/ioexp/printer.h
@@ -1,6 +1,6 @@
/***************************************************************************
- VTech Laser/VZ Printer Interface
+ VTech Laser/VZ Printer Interface
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/vtech/memexp/carts.h b/src/emu/bus/vtech/memexp/carts.h
index 30663b75ed0..c00f069f79d 100644
--- a/src/emu/bus/vtech/memexp/carts.h
+++ b/src/emu/bus/vtech/memexp/carts.h
@@ -1,6 +1,6 @@
/***************************************************************************
- VTech Laser/VZ Memory Expansion Slot Devices
+ VTech Laser/VZ Memory Expansion Slot Devices
***************************************************************************/
diff --git a/src/emu/bus/vtech/memexp/floppy.h b/src/emu/bus/vtech/memexp/floppy.h
index 08dbc70987e..a5d0aa12757 100644
--- a/src/emu/bus/vtech/memexp/floppy.h
+++ b/src/emu/bus/vtech/memexp/floppy.h
@@ -1,11 +1,11 @@
/***************************************************************************
- VTech Laser/VZ Floppy Controller Cartridge
+ VTech Laser/VZ Floppy Controller Cartridge
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Laser DD 20
+ Laser DD 20
Dick Smith Electronics X-7304
***************************************************************************/
diff --git a/src/emu/bus/vtech/memexp/memexp.h b/src/emu/bus/vtech/memexp/memexp.h
index 60940df14b5..38aceb2835c 100644
--- a/src/emu/bus/vtech/memexp/memexp.h
+++ b/src/emu/bus/vtech/memexp/memexp.h
@@ -1,34 +1,34 @@
/***************************************************************************
- VTech Laser/VZ Memory Expansion Slot
+ VTech Laser/VZ Memory Expansion Slot
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- 44-pin slot
-
- 22 GND 23 NC
- 21 +5VDC 24 A11
- 20 /IORQ 25 A12
- 19 /RD 26 A13
- 18 /NMI 27 A14
- 17 /WAIT 28 A15
- 16 /MI 29 CLK
- 15 /RFSH 30 D4
- 14 D7 31 D3
- 13 D2 32 D5
- 12 A1 33 D6
- 11 A2 34 NC
- 10 A3 35 A0
- 9 A4 36 D0
- 8 A5 37 D1
- 7 A6 38 /INT
- 6 A7 39 /HALT
- 5 A8 40 /MERQ
- 4 A9 41 /WR
- 3 A10 42 /NC
- 2 /RESET 43 +9VDC
- 1 GND 44 NC
+ 44-pin slot
+
+ 22 GND 23 NC
+ 21 +5VDC 24 A11
+ 20 /IORQ 25 A12
+ 19 /RD 26 A13
+ 18 /NMI 27 A14
+ 17 /WAIT 28 A15
+ 16 /MI 29 CLK
+ 15 /RFSH 30 D4
+ 14 D7 31 D3
+ 13 D2 32 D5
+ 12 A1 33 D6
+ 11 A2 34 NC
+ 10 A3 35 A0
+ 9 A4 36 D0
+ 8 A5 37 D1
+ 7 A6 38 /INT
+ 6 A7 39 /HALT
+ 5 A8 40 /MERQ
+ 4 A9 41 /WR
+ 3 A10 42 /NC
+ 2 /RESET 43 +9VDC
+ 1 GND 44 NC
***************************************************************************/
diff --git a/src/emu/bus/vtech/memexp/memory.h b/src/emu/bus/vtech/memexp/memory.h
index 99f3b9fd3ce..37b77126e1a 100644
--- a/src/emu/bus/vtech/memexp/memory.h
+++ b/src/emu/bus/vtech/memexp/memory.h
@@ -1,6 +1,6 @@
/***************************************************************************
- VTech Laser/VZ Memory Expansions
+ VTech Laser/VZ Memory Expansions
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/vtech/memexp/rs232.h b/src/emu/bus/vtech/memexp/rs232.h
index 0d631875bad..9314b6c6721 100644
--- a/src/emu/bus/vtech/memexp/rs232.h
+++ b/src/emu/bus/vtech/memexp/rs232.h
@@ -1,6 +1,6 @@
/***************************************************************************
- Dick Smith VZ-200/300 RS-232 Cartridge
+ Dick Smith VZ-200/300 RS-232 Cartridge
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/vtech/memexp/wordpro.h b/src/emu/bus/vtech/memexp/wordpro.h
index b6b10226b41..58caa365251 100644
--- a/src/emu/bus/vtech/memexp/wordpro.h
+++ b/src/emu/bus/vtech/memexp/wordpro.h
@@ -1,6 +1,6 @@
/***************************************************************************
- Dick Smith VZ-300 WordPro Cartridge
+ Dick Smith VZ-300 WordPro Cartridge
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/x68k/x68kexp.h b/src/emu/bus/x68k/x68kexp.h
index 74da5ef89b8..cabca04e8f0 100644
--- a/src/emu/bus/x68k/x68kexp.h
+++ b/src/emu/bus/x68k/x68kexp.h
@@ -85,7 +85,7 @@
#define MCFG_X68K_EXPANSION_SLOT_OUT_RESET_CB(_devcb) \
devcb = &x68k_expansion_slot_device::set_out_reset_callback(*device, DEVCB_##_devcb);
-
+
//**************************************************************************
// TYPE DEFINITIONS
@@ -115,7 +115,7 @@ public:
// construction/destruction
x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~x68k_expansion_slot_device();
-
+
template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq2_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_irq4_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_irq4_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<x68k_expansion_slot_device &>(device).m_out_nmi_cb.set_callback(object); }
diff --git a/src/emu/bus/z88/z88.h b/src/emu/bus/z88/z88.h
index edeae5e6624..d899c69fe9a 100644
--- a/src/emu/bus/z88/z88.h
+++ b/src/emu/bus/z88/z88.h
@@ -85,7 +85,7 @@ public:
// construction/destruction
z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual ~z88cart_slot_device();
-
+
template<class _Object> static devcb_base &set_out_flp_callback(device_t &device, _Object object) { return downcast<z88cart_slot_device &>(device).m_out_flp_cb.set_callback(object); }
// device-level overrides
@@ -134,5 +134,5 @@ extern const device_type Z88CART_SLOT;
#define MCFG_Z88CART_SLOT_OUT_FLP_CB(_devcb) \
devcb = &z88cart_slot_device::set_out_flp_callback(*device, DEVCB_##_devcb);
-
+
#endif /* __Z88CART_H__ */
diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h
index 460ddd6ce98..580c98c4552 100644
--- a/src/emu/cpu/adsp2100/adsp2100.h
+++ b/src/emu/cpu/adsp2100/adsp2100.h
@@ -456,9 +456,9 @@ protected:
UINT16 m_mask_table[0x4000];
UINT16 m_reverse_table[0x4000];
- devcb_read32 m_sport_rx_cb; // callback for serial receive
- devcb_write32 m_sport_tx_cb; // callback for serial transmit
- devcb_write_line m_timer_fired_cb; // callback for timer fired
+ devcb_read32 m_sport_rx_cb; // callback for serial receive
+ devcb_write32 m_sport_tx_cb; // callback for serial transmit
+ devcb_write_line m_timer_fired_cb; // callback for timer fired
// debugging
#if ADSP_TRACK_HOTSPOTS
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak
index c70b60ee51a..d72872fd573 100644
--- a/src/emu/cpu/cpu.mak
+++ b/src/emu/cpu/cpu.mak
@@ -1780,7 +1780,7 @@ DASMOBJS += $(CPUOBJ)/upd7810/upd7810_dasm.o
endif
$(CPUOBJ)/upd7810/upd7810_opcodes.o: $(CPUSRC)/upd7810/upd7810_opcodes.c \
- $(CPUSRC)/upd7810/upd7810_macros.h
+ $(CPUSRC)/upd7810/upd7810_macros.h
$(CPUOBJ)/upd7810/upd7810.o: $(CPUSRC)/upd7810/upd7810.c \
$(CPUSRC)/upd7810/upd7810.h \
diff --git a/src/emu/cpu/g65816/g65816op.h b/src/emu/cpu/g65816/g65816op.h
index 03bc4c52203..2efcbac5208 100644
--- a/src/emu/cpu/g65816/g65816op.h
+++ b/src/emu/cpu/g65816/g65816op.h
@@ -1915,15 +1915,15 @@ TABLE_FUNCTION(void, set_reg, (int regnum, uint val))
#if EXECUTION_MODE == EXECUTION_MODE_E
-#define g65816i_correct_mode() (FLAG_E == EFLAG_SET)
+#define g65816i_correct_mode() (FLAG_E == EFLAG_SET)
#elif EXECUTION_MODE == EXECUTION_MODE_M0X0
-#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_CLEAR) && (FLAG_X == XFLAG_CLEAR))
+#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_CLEAR) && (FLAG_X == XFLAG_CLEAR))
#elif EXECUTION_MODE == EXECUTION_MODE_M0X1
-#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_CLEAR) && (FLAG_X == XFLAG_SET))
+#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_CLEAR) && (FLAG_X == XFLAG_SET))
#elif EXECUTION_MODE == EXECUTION_MODE_M1X0
-#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_SET) && (FLAG_X == XFLAG_CLEAR))
+#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_SET) && (FLAG_X == XFLAG_CLEAR))
#elif EXECUTION_MODE == EXECUTION_MODE_M1X1
-#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_SET) && (FLAG_X == XFLAG_SET))
+#define g65816i_correct_mode() ((FLAG_E == EFLAG_CLEAR) && (FLAG_M == MFLAG_SET) && (FLAG_X == XFLAG_SET))
#else
#error Invalid EXECUTION_MODE
#endif
diff --git a/src/emu/cpu/m68000/m68000.h b/src/emu/cpu/m68000/m68000.h
index b6979d0942d..06b34680507 100644
--- a/src/emu/cpu/m68000/m68000.h
+++ b/src/emu/cpu/m68000/m68000.h
@@ -252,14 +252,14 @@ public:
const UINT8* cyc_exception;
/* Callbacks to host */
- device_irq_acknowledge_delegate int_ack_callback; /* Interrupt Acknowledge */
- write32_delegate bkpt_ack_callback; /* Breakpoint Acknowledge */
- write_line_delegate reset_instr_callback; /* Called when a RESET instruction is encountered */
- write32_delegate cmpild_instr_callback; /* Called when a CMPI.L #v, Dn instruction is encountered */
- write_line_delegate rte_instr_callback; /* Called when a RTE instruction is encountered */
- write8_delegate tas_write_callback; /* Called instead of normal write8 by the TAS instruction,
- allowing writeback to be disabled globally or selectively
- or other side effects to be implemented */
+ device_irq_acknowledge_delegate int_ack_callback; /* Interrupt Acknowledge */
+ write32_delegate bkpt_ack_callback; /* Breakpoint Acknowledge */
+ write_line_delegate reset_instr_callback; /* Called when a RESET instruction is encountered */
+ write32_delegate cmpild_instr_callback; /* Called when a CMPI.L #v, Dn instruction is encountered */
+ write_line_delegate rte_instr_callback; /* Called when a RTE instruction is encountered */
+ write8_delegate tas_write_callback; /* Called instead of normal write8 by the TAS instruction,
+ allowing writeback to be disabled globally or selectively
+ or other side effects to be implemented */
address_space *program;
diff --git a/src/emu/cpu/m68000/m68kmmu.h b/src/emu/cpu/m68000/m68kmmu.h
index 90ae7ea713c..ea4cb3dc7ce 100644
--- a/src/emu/cpu/m68000/m68kmmu.h
+++ b/src/emu/cpu/m68000/m68kmmu.h
@@ -774,12 +774,12 @@ INLINE UINT32 get_dt3_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 f
if (!(ptest))
{
- page_entry |= 0x8; // always set the U bit
+ page_entry |= 0x8; // always set the U bit
// if we're writing, the M bit comes into play
if (!m68k->mmu_tmp_rw)
{
- page_entry |= 0x10; // set Modified
+ page_entry |= 0x10; // set Modified
}
// if these updates resulted in a change, write the entry back where we found it
@@ -795,7 +795,7 @@ INLINE UINT32 get_dt3_table_entry(m68000_base_device *m68k, UINT32 tptr, UINT8 f
// SR: B G U1 U0 S CM CM M 0 W T R
m68k->mmu_tmp_sr |= ((addr_out & ~0xfff) || (page_entry & 0x7f4));
}
- break;
+ break;
case 2: // shouldn't happen
fatalerror("68040: got indirect final page pointer, shouldn't be possible\n");
diff --git a/src/emu/cpu/mb86233/mb86233.h b/src/emu/cpu/mb86233/mb86233.h
index 68ca986f45c..2f28d29fd5a 100644
--- a/src/emu/cpu/mb86233/mb86233.h
+++ b/src/emu/cpu/mb86233/mb86233.h
@@ -103,7 +103,7 @@ private:
UINT32 m_shift;
UINT32 m_repcnt;
UINT16 m_sr;
- UINT8 m_fpucontrol;
+ UINT8 m_fpucontrol;
UINT32 m_gpr[16];
UINT32 m_extport[0x30];
diff --git a/src/emu/cpu/minx/minxfunc.h b/src/emu/cpu/minx/minxfunc.h
index 119af87dbf3..312071d3d7b 100644
--- a/src/emu/cpu/minx/minxfunc.h
+++ b/src/emu/cpu/minx/minxfunc.h
@@ -360,4 +360,3 @@ void minx_cpu_device::CALL( UINT16 arg )
#define AD2_Y8 UINT32 addr2 = ( m_YI << 16 ) | ( m_Y + rdop() )
#define AD2_XL UINT32 addr2 = ( m_XI << 16 ) | ( m_X + ( m_HL & 0x00FF ) )
#define AD2_YL UINT32 addr2 = ( m_YI << 16 ) | ( m_Y + ( m_HL & 0x00FF ) )
-
diff --git a/src/emu/cpu/minx/minxops.h b/src/emu/cpu/minx/minxops.h
index 5466b93bb2a..ca11a3258dc 100644
--- a/src/emu/cpu/minx/minxops.h
+++ b/src/emu/cpu/minx/minxops.h
@@ -559,4 +559,3 @@ const int minx_cpu_device::insnminx_cycles[256] = {
8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12, 12, 12, 12, 12, 12,
20, 8, 24, 12, 8, 1, 8, 12, 8, 8, 8, 20, 20, 1, 1, 8
};
-
diff --git a/src/emu/cpu/mips/mips3.h b/src/emu/cpu/mips/mips3.h
index 3f4826ef54c..2d2fce7ed03 100644
--- a/src/emu/cpu/mips/mips3.h
+++ b/src/emu/cpu/mips/mips3.h
@@ -359,7 +359,7 @@ private:
/* core state */
internal_mips3_state *m_core;
- /* internal stuff */
+ /* internal stuff */
UINT32 m_ppc;
UINT32 m_nextpc;
UINT32 m_pcbase;
@@ -444,7 +444,7 @@ private:
/* fast RAM */
UINT32 m_fastram_select;
- struct
+ struct
{
offs_t start; /* start of the RAM block */
offs_t end; /* end of the RAM block */
diff --git a/src/emu/cpu/powerpc/ppc.h b/src/emu/cpu/powerpc/ppc.h
index dbdf6131903..009e2118e20 100644
--- a/src/emu/cpu/powerpc/ppc.h
+++ b/src/emu/cpu/powerpc/ppc.h
@@ -695,20 +695,20 @@ protected:
//class ppc403_device : public ppc_device
//{
//public:
-// ppc403_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+// ppc403_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
//
//protected:
-// virtual UINT32 execute_input_lines() const { return 8; }
+// virtual UINT32 execute_input_lines() const { return 8; }
//};
//
//
//class ppc405_device : public ppc_device
//{
//public:
-// ppc405_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+// ppc405_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
//
//protected:
-// virtual UINT32 execute_input_lines() const { return 8; }
+// virtual UINT32 execute_input_lines() const { return 8; }
//};
diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h
index e2812609e59..f0706d6dcf1 100644
--- a/src/emu/cpu/rsp/rsp.h
+++ b/src/emu/cpu/rsp/rsp.h
@@ -145,13 +145,13 @@ union ACCUMULATOR_REG
#define MCFG_RSP_DP_REG_R_CB(_devcb) \
devcb = &rsp_cpu_device::static_set_dp_reg_r_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_RSP_DP_REG_W_CB(_devcb) \
devcb = &rsp_cpu_device::static_set_dp_reg_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_RSP_SP_REG_R_CB(_devcb) \
devcb = &rsp_cpu_device::static_set_sp_reg_r_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_RSP_SP_REG_W_CB(_devcb) \
devcb = &rsp_cpu_device::static_set_sp_reg_w_callback(*device, DEVCB_##_devcb);
@@ -163,7 +163,7 @@ class rsp_cpu_device : public legacy_cpu_device
protected:
// construction/destruction
rsp_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, cpu_get_info_func info);
-
+
public:
void resolve_cb();
template<class _Object> static devcb_base &static_set_dp_reg_r_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).dp_reg_r_func.set_callback(object); }
@@ -171,13 +171,13 @@ public:
template<class _Object> static devcb_base &static_set_sp_reg_r_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).sp_reg_r_func.set_callback(object); }
template<class _Object> static devcb_base &static_set_sp_reg_w_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).sp_reg_w_func.set_callback(object); }
template<class _Object> static devcb_base &static_set_status_callback(device_t &device, _Object object) { return downcast<rsp_cpu_device &>(device).sp_set_status_func.set_callback(object); }
-
+
devcb_read32 dp_reg_r_func;
devcb_write32 dp_reg_w_func;
devcb_read32 sp_reg_r_func;
devcb_write32 sp_reg_w_func;
- devcb_write32 sp_set_status_func;
+ devcb_write32 sp_set_status_func;
};
diff --git a/src/emu/cpu/scudsp/scudsp.h b/src/emu/cpu/scudsp/scudsp.h
index 9d460b58ee0..9406a7e1917 100644
--- a/src/emu/cpu/scudsp/scudsp.h
+++ b/src/emu/cpu/scudsp/scudsp.h
@@ -61,11 +61,11 @@ class scudsp_cpu_device : public cpu_device
public:
// construction/destruction
scudsp_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, UINT32 _clock);
-
+
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_dma_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_in_dma_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dma_callback(device_t &device, _Object object) { return downcast<scudsp_cpu_device &>(device).m_out_dma_cb.set_callback(object); }
-
+
/* port 0 */
DECLARE_READ32_MEMBER( program_control_r );
DECLARE_WRITE32_MEMBER( program_control_w );
@@ -104,7 +104,7 @@ protected:
devcb_write_line m_out_irq_cb;
devcb_read16 m_in_dma_cb;
devcb_write16 m_out_dma_cb;
-
+
private:
address_space_config m_program_config;
address_space_config m_data_config;
diff --git a/src/emu/cpu/sh2/sh2.h b/src/emu/cpu/sh2/sh2.h
index 21e53f19a4c..d8e7401053c 100644
--- a/src/emu/cpu/sh2/sh2.h
+++ b/src/emu/cpu/sh2/sh2.h
@@ -519,19 +519,19 @@ public:
class sh2_frontend : public drc_frontend
{
public:
- sh2_frontend(sh2_device *device, UINT32 window_start, UINT32 window_end, UINT32 max_sequence);
+ sh2_frontend(sh2_device *device, UINT32 window_start, UINT32 window_end, UINT32 max_sequence);
protected:
- virtual bool describe(opcode_desc &desc, const opcode_desc *prev);
+ virtual bool describe(opcode_desc &desc, const opcode_desc *prev);
private:
- bool describe_group_0(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
- bool describe_group_2(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
- bool describe_group_3(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
- bool describe_group_4(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
- bool describe_group_6(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
- bool describe_group_8(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
- bool describe_group_12(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
+ bool describe_group_0(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
+ bool describe_group_2(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
+ bool describe_group_3(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
+ bool describe_group_4(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
+ bool describe_group_6(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
+ bool describe_group_8(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
+ bool describe_group_12(opcode_desc &desc, const opcode_desc *prev, UINT16 opcode);
sh2_device *m_sh2;
};
diff --git a/src/emu/cpu/sharc/sharcops.inc b/src/emu/cpu/sharc/sharcops.inc
index e1140c9885b..95c86cfa140 100644
--- a/src/emu/cpu/sharc/sharcops.inc
+++ b/src/emu/cpu/sharc/sharcops.inc
@@ -823,7 +823,7 @@ void adsp21062_device::COMPUTE(UINT32 opcode)
case 0x62: compute_max(rn, rx, ry); break;
case 0x81: compute_fadd(rn, rx, ry); break;
case 0x82: compute_fsub(rn, rx, ry); break;
- case 0x89: compute_favg(rn, rx, ry); break;
+ case 0x89: compute_favg(rn, rx, ry); break;
case 0x8a: compute_fcomp(rx, ry); break;
case 0x91: compute_fabs_plus(rn, rx, ry); break;
case 0xa1: compute_fpass(rn, rx); break;
diff --git a/src/emu/cpu/tms7000/tms7000.h b/src/emu/cpu/tms7000/tms7000.h
index 35f733d115a..1a66c79b9cf 100644
--- a/src/emu/cpu/tms7000/tms7000.h
+++ b/src/emu/cpu/tms7000/tms7000.h
@@ -65,7 +65,7 @@ public:
DECLARE_WRITE8_MEMBER(tms7000_pf_w);
DECLARE_READ8_MEMBER(tms7002_pf_r) { return tms7000_pf_r(space, offset + 0x10); }
DECLARE_WRITE8_MEMBER(tms7002_pf_w) { tms7000_pf_w(space, offset + 0x10, data); }
-
+
bool chip_is_cmos() { return (m_info_flags & TMS7000_CHIP_IS_CMOS) ? true : false; }
UINT32 chip_get_family() { return m_info_flags & TMS7000_CHIP_FAMILY_MASK; }
bool chip_is_family_70x0() { return chip_get_family() == TMS7000_CHIP_FAMILY_70X0; }
@@ -128,17 +128,17 @@ protected:
UINT8 m_port_latch[4];
UINT8 m_port_ddr[4];
-
+
void flag_ext_interrupt(int extline);
void check_interrupts();
void do_interrupt(int irqline);
-
+
TIMER_CALLBACK_MEMBER(simple_timer_cb);
void timer_run(int tmr);
void timer_reload(int tmr);
void timer_tick_pre(int tmr);
void timer_tick_low(int tmr);
-
+
// internal read/write
inline UINT8 read_r8(UINT8 address) { return m_program->read_byte(address); }
inline void write_r8(UINT8 address, UINT8 data) { m_program->write_byte(address, data); }
@@ -160,7 +160,7 @@ protected:
inline void push8(UINT8 data) { m_program->write_byte(++m_sp, data); }
inline UINT16 pull16() { UINT16 ret = m_program->read_byte(m_sp--); return ret | m_program->read_byte(m_sp--) << 8; }
inline void push16(UINT16 data) { m_program->write_byte(++m_sp, data >> 8 & 0xff); m_program->write_byte(++m_sp, data & 0xff); }
-
+
// opcode handlers
void br_dir();
void br_inx();
@@ -202,7 +202,7 @@ protected:
void stsp();
void trap(UINT8 address);
void illegal(UINT8 op);
-
+
typedef int (tms7000_device::*op_func)(UINT8, UINT8);
int op_clr(UINT8 param1, UINT8 param2);
int op_dec(UINT8 param1, UINT8 param2);
@@ -214,7 +214,7 @@ protected:
int op_rrc(UINT8 param1, UINT8 param2);
int op_swap(UINT8 param1, UINT8 param2);
int op_xchb(UINT8 param1, UINT8 param2);
-
+
int op_adc(UINT8 param1, UINT8 param2);
int op_add(UINT8 param1, UINT8 param2);
int op_and(UINT8 param1, UINT8 param2);
@@ -227,7 +227,7 @@ protected:
int op_sbb(UINT8 param1, UINT8 param2);
int op_sub(UINT8 param1, UINT8 param2);
int op_xor(UINT8 param1, UINT8 param2);
-
+
inline void shortbranch(bool check);
inline void jmp(bool check);
int op_djnz(UINT8 param1, UINT8 param2);
diff --git a/src/emu/cpu/tms7000/tms70op.inc b/src/emu/cpu/tms7000/tms70op.inc
index 8b81a7e8721..904e5d713cb 100644
--- a/src/emu/cpu/tms7000/tms70op.inc
+++ b/src/emu/cpu/tms7000/tms70op.inc
@@ -307,19 +307,19 @@ int tms7000_device::op_dac(UINT8 param1, UINT8 param2)
UINT8 l1 = param1 >> 0 & 0xf;
UINT8 h2 = param2 >> 4 & 0xf;
UINT8 l2 = param2 >> 0 & 0xf;
-
+
// compute bcd constant
UINT8 d = ((l1 + l2 + c) < 10) ? 0 : 1;
if ((h1 + h2) == 9)
d |= 2;
else if ((h1 + h2) > 9)
d |= 4;
-
+
UINT8 t = param1 + param2 + c + lut_bcd_out[d];
SET_CNZ(t);
if (d > 2)
m_sr |= SR_C;
-
+
return t;
}
@@ -344,7 +344,7 @@ int tms7000_device::op_dsb(UINT8 param1, UINT8 param2)
SET_CNZ(t);
if (d <= 2)
m_sr |= SR_C;
-
+
return t;
}
diff --git a/src/emu/cpu/upd7725/upd7725.h b/src/emu/cpu/upd7725/upd7725.h
index aeb9097e11b..4e4d9ed6c5d 100644
--- a/src/emu/cpu/upd7725/upd7725.h
+++ b/src/emu/cpu/upd7725/upd7725.h
@@ -63,7 +63,7 @@ class upd96050_device;
#define MCFG_NECDSP_OUT_DRQ_CB(_devcb) \
devcb = &necdsp_device::set_out_drq_callback(*device, DEVCB_##_devcb);
-
+
// ======================> necdsp_device
@@ -86,7 +86,7 @@ public:
//template<class _Object> static devcb_base &set_out_so_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_so_cb.set_callback(object); }
//template<class _Object> static devcb_base &set_out_sorq_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_sorq_cb.set_callback(object); }
//template<class _Object> static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<necdsp_device &>(device).m_out_drq_cb.set_callback(object); }
-
+
UINT8 snesdsp_read(bool mode);
void snesdsp_write(bool mode, UINT8 data);
diff --git a/src/emu/cpu/z80/tmpz84c011.h b/src/emu/cpu/z80/tmpz84c011.h
index 973d9efb2d7..553a24d8fda 100644
--- a/src/emu/cpu/z80/tmpz84c011.h
+++ b/src/emu/cpu/z80/tmpz84c011.h
@@ -97,7 +97,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( trg1 ) { m_ctc->trg1(state); }
DECLARE_WRITE_LINE_MEMBER( trg2 ) { m_ctc->trg2(state); }
DECLARE_WRITE_LINE_MEMBER( trg3 ) { m_ctc->trg3(state); }
-
+
/////////////////////////////////////////////////////////
DECLARE_READ8_MEMBER( tmpz84c011_pa_r );
diff --git a/src/emu/cpu/z80/tmpz84c015.h b/src/emu/cpu/z80/tmpz84c015.h
index 05c20a46c89..412f47556c9 100644
--- a/src/emu/cpu/z80/tmpz84c015.h
+++ b/src/emu/cpu/z80/tmpz84c015.h
@@ -122,10 +122,10 @@ public:
template<class _Object> static devcb_base &set_out_syncb_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_out_syncb_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_rxdrqa_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_out_rxdrqa_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_txdrqa_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_out_txdrqa_cb.set_callback(object); }
+ template<class _Object> static devcb_base &set_out_txdrqa_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_out_txdrqa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_rxdrqb_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_out_rxdrqb_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_txdrqb_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_out_txdrqb_cb.set_callback(object); }
-
+ template<class _Object> static devcb_base &set_out_txdrqb_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_out_txdrqb_cb.set_callback(object); }
+
template<class _Object> static devcb_base &set_zc0_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_zc0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_zc1_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_zc1_cb.set_callback(object); }
template<class _Object> static devcb_base &set_zc2_callback(device_t &device, _Object object) { return downcast<tmpz84c015_device &>(device).m_zc2_cb.set_callback(object); }
@@ -171,7 +171,7 @@ public:
DECLARE_READ8_MEMBER( pa_r ) { return m_pio->pa_r(space, offset, mem_mask); }
DECLARE_WRITE8_MEMBER( pb_w ) { m_pio->pb_w(space, offset, data, mem_mask); }
DECLARE_READ8_MEMBER( pb_r ) { return m_pio->pb_r(space, offset, mem_mask); }
-
+
/////////////////////////////////////////////////////////
DECLARE_WRITE8_MEMBER( irq_priority_w );
@@ -204,7 +204,7 @@ public:
DECLARE_READ8_MEMBER( in_pb_cb_trampoline_r ) { return m_in_pb_cb(); }
DECLARE_WRITE8_MEMBER( out_pb_cb_trampoline_w ) { m_out_pb_cb(data); }
DECLARE_WRITE_LINE_MEMBER( out_brdy_cb_trampoline_w ) { m_out_brdy_cb(state); }
-
+
protected:
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const;
@@ -231,20 +231,20 @@ private:
// internal state
UINT8 m_irq_priority;
-
+
// callbacks
devcb_write_line m_out_txda_cb;
devcb_write_line m_out_dtra_cb;
devcb_write_line m_out_rtsa_cb;
devcb_write_line m_out_wrdya_cb;
devcb_write_line m_out_synca_cb;
-
+
devcb_write_line m_out_txdb_cb;
devcb_write_line m_out_dtrb_cb;
devcb_write_line m_out_rtsb_cb;
devcb_write_line m_out_wrdyb_cb;
devcb_write_line m_out_syncb_cb;
-
+
devcb_write_line m_out_rxdrqa_cb;
devcb_write_line m_out_txdrqa_cb;
devcb_write_line m_out_rxdrqb_cb;
@@ -257,7 +257,7 @@ private:
devcb_read8 m_in_pa_cb;
devcb_write8 m_out_pa_cb;
devcb_write_line m_out_ardy_cb;
-
+
devcb_read8 m_in_pb_cb;
devcb_write8 m_out_pb_cb;
devcb_write_line m_out_brdy_cb;
diff --git a/src/emu/digfx.h b/src/emu/digfx.h
index 86ff9ffd859..aff3a1a2cc1 100644
--- a/src/emu/digfx.h
+++ b/src/emu/digfx.h
@@ -107,8 +107,6 @@ const gfx_layout name = { width, height, RGN_FRAC(1,1), 8, { GFX_RAW }, { 0 }, {
// use these to declare a gfx_decode_entry array as a member of a device class
#define DECLARE_GFXDECODE_MEMBER( name ) static const gfx_decode_entry name[]
#define GFXDECODE_MEMBER( name ) const gfx_decode_entry name[] = {
-
-
// common gfx_decode_entry macros
#define GFXDECODE_ENTRYX(region,offset,layout,start,colors,flags) { region, offset, &layout, start, colors, flags },
#define GFXDECODE_ENTRY(region,offset,layout,start,colors) { region, offset, &layout, start, colors, 0 },
diff --git a/src/emu/imagedev/cartslot.h b/src/emu/imagedev/cartslot.h
index f30e590f45b..d4b5b0322d1 100644
--- a/src/emu/imagedev/cartslot.h
+++ b/src/emu/imagedev/cartslot.h
@@ -42,7 +42,7 @@ public:
static void static_set_extensions(device_t &device, const char *_extensions) { downcast<cartslot_image_device &>(device).m_extensions = _extensions; }
static void static_set_interface(device_t &device, const char *_interface) { downcast<cartslot_image_device &>(device).m_interface = _interface; }
static void static_set_must_be_loaded(device_t &device, bool _must_be_loaded) { downcast<cartslot_image_device &>(device).m_must_be_loaded = _must_be_loaded; }
-
+
// image-level overrides
virtual bool call_load();
virtual void call_unload();
@@ -102,10 +102,10 @@ extern const device_type CARTSLOT;
cartslot_image_device::static_set_must_be_loaded(*device, TRUE);
#define MCFG_CARTSLOT_LOAD(_class,_method) \
- cartslot_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
+ cartslot_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
#define MCFG_CARTSLOT_UNLOAD(_class,_method) \
- cartslot_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
+ cartslot_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
#define MCFG_CARTSLOT_PARTIALHASH(_partialhash) \
cartslot_image_device::static_set_partialhash(*device, _partialhash);
diff --git a/src/emu/imagedev/cassette.h b/src/emu/imagedev/cassette.h
index 66de5f12c5a..ac6842aadf8 100644
--- a/src/emu/imagedev/cassette.h
+++ b/src/emu/imagedev/cassette.h
@@ -107,7 +107,7 @@ private:
const struct CassetteFormat* const *m_formats;
const struct CassetteOptions *m_create_opts;
cassette_state m_default_state;
- const char * m_interface;
+ const char * m_interface;
};
// device type definition
@@ -124,17 +124,17 @@ typedef device_type_iterator<&device_creator<cassette_image_device>, cassette_im
#define MCFG_CASSETTE_MODIFY(_tag) \
MCFG_DEVICE_MODIFY(_tag)
-
-#define MCFG_CASSETTE_FORMATS(_formats) \
+
+#define MCFG_CASSETTE_FORMATS(_formats) \
cassette_image_device::static_set_formats(*device, _formats);
-#define MCFG_CASSETTE_CREATE_OPTS(_create_opts) \
+#define MCFG_CASSETTE_CREATE_OPTS(_create_opts) \
cassette_image_device::static_set_create_opts(*device, _create_opts);
-#define MCFG_CASSETTE_DEFAULT_STATE(_state) \
+#define MCFG_CASSETTE_DEFAULT_STATE(_state) \
cassette_image_device::static_set_default_state(*device, (cassette_state) (_state));
-#define MCFG_CASSETTE_INTERFACE(_interface) \
+#define MCFG_CASSETTE_INTERFACE(_interface) \
cassette_image_device::static_set_interface(*device, _interface);
#endif /* CASSETTE_H */
diff --git a/src/emu/imagedev/diablo.h b/src/emu/imagedev/diablo.h
index 44601b4f9ec..58e7ce16697 100644
--- a/src/emu/imagedev/diablo.h
+++ b/src/emu/imagedev/diablo.h
@@ -84,10 +84,10 @@ extern const device_type DIABLO;
MCFG_DEVICE_CONFIG(_config)
#define MCFG_DIABLO_LOAD(_class,_method) \
- diablo_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
+ diablo_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
#define MCFG_DIABLO_UNLOAD(_class,_method) \
- diablo_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
+ diablo_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
#define MCFG_DIABLO_INTERFACE(_interface) \
diablo_image_device::static_set_interface(*device, _interface);
diff --git a/src/emu/imagedev/flopdrv.h b/src/emu/imagedev/flopdrv.h
index 462e7d8bf29..dc80796f550 100644
--- a/src/emu/imagedev/flopdrv.h
+++ b/src/emu/imagedev/flopdrv.h
@@ -95,7 +95,7 @@ public:
~legacy_floppy_image_device();
template<class _Object> static devcb_base &set_out_idx_func(device_t &device, _Object object) { return downcast<legacy_floppy_image_device &>(device).m_out_idx_func.set_callback(object); }
-
+
virtual bool call_load();
virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { return load_software(swlist, swname, start_entry); }
virtual bool call_create(int format_type, option_resolution *format_options);
diff --git a/src/emu/imagedev/harddriv.h b/src/emu/imagedev/harddriv.h
index f808dc7e3ea..6ec48d327fb 100644
--- a/src/emu/imagedev/harddriv.h
+++ b/src/emu/imagedev/harddriv.h
@@ -79,10 +79,10 @@ extern const device_type HARDDISK;
MCFG_DEVICE_ADD(_tag, HARDDISK, 0)
#define MCFG_HARDDISK_LOAD(_class,_method) \
- harddisk_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
+ harddisk_image_device::static_set_device_load(*device, device_image_load_delegate(&DEVICE_IMAGE_LOAD_NAME(_class,_method), #_class "::device_image_load_" #_method, downcast<_class *>(owner)));
#define MCFG_HARDDISK_UNLOAD(_class,_method) \
- harddisk_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
+ harddisk_image_device::static_set_device_unload(*device, device_image_func_delegate(&DEVICE_IMAGE_UNLOAD_NAME(_class,_method), #_class "::device_image_unload_" #_method, downcast<_class *>(owner)));
#define MCFG_HARDDISK_INTERFACE(_interface) \
harddisk_image_device::static_set_interface(*device, _interface);
diff --git a/src/emu/imagedev/midiin.h b/src/emu/imagedev/midiin.h
index 93dadab5a39..5d3a864e60a 100644
--- a/src/emu/imagedev/midiin.h
+++ b/src/emu/imagedev/midiin.h
@@ -27,7 +27,7 @@ public:
midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb_base &set_input_callback(device_t &device, _Object object) { return downcast<midiin_device &>(device).m_input_cb.set_callback(object); }
-
+
// image-level overrides
virtual bool call_load();
virtual void call_unload();
diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h
index fadeed55bb8..ad4712d262f 100644
--- a/src/emu/luaengine.h
+++ b/src/emu/luaengine.h
@@ -44,12 +44,12 @@ private:
int cb;
hook();
- void set(lua_State *L, int idx);
+ void set(lua_State *L, int idx);
lua_State *precall();
void call(lua_engine *engine, lua_State *T, int nparam);
bool active() const { return L != NULL; }
};
-
+
static const char *const tname_ioport;
// internal state
@@ -58,7 +58,7 @@ private:
hook hook_output_cb;
bool output_notifier_set;
-
+
static lua_engine* luaThis;
std::map<lua_State *, std::pair<lua_State *, int> > thread_registry;
@@ -93,7 +93,7 @@ private:
static void *checkparam(lua_State *L, int idx, const char *tname);
static void *getparam(lua_State *L, int idx, const char *tname);
static void push(lua_State *L, void *p, const char *tname);
-
+
int report(int status);
int docall(int narg, int nres);
int incomplete(int status) ;
diff --git a/src/emu/machine/53c810.h b/src/emu/machine/53c810.h
index a5f3d86acae..c8ee4f80dce 100644
--- a/src/emu/machine/53c810.h
+++ b/src/emu/machine/53c810.h
@@ -22,7 +22,7 @@ public:
static void set_irq_callback(device_t &device, lsi53c810_irq_delegate callback) { downcast<lsi53c810_device &>(device).m_irq_cb = callback; }
static void set_dma_callback(device_t &device, lsi53c810_dma_delegate callback) { downcast<lsi53c810_device &>(device).m_dma_cb = callback; }
static void set_fetch_callback(device_t &device, lsi53c810_fetch_delegate callback) { downcast<lsi53c810_device &>(device).m_fetch_cb = callback; }
-
+
void lsi53c810_read_data(int bytes, UINT8 *pData);
void lsi53c810_write_data(int bytes, UINT8 *pData);
diff --git a/src/emu/machine/6525tpi.h b/src/emu/machine/6525tpi.h
index 87deba13e7d..40dadbd4ee9 100644
--- a/src/emu/machine/6525tpi.h
+++ b/src/emu/machine/6525tpi.h
@@ -49,7 +49,7 @@ public:
template<class _Object> static devcb_base &set_out_pc_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_pc_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_ca_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_ca_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_cb_callback(device_t &device, _Object object) { return downcast<tpi6525_device &>(device).m_out_cb_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h
index a2b2ce715f3..49dc2bfc000 100644
--- a/src/emu/machine/6532riot.h
+++ b/src/emu/machine/6532riot.h
@@ -50,7 +50,7 @@ public:
template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_in_pb_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_out_pb_cb.set_callback(object); }
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<riot6532_device &>(device).m_irq_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -75,8 +75,8 @@ protected:
UINT8 m_in;
UINT8 m_out;
UINT8 m_ddr;
- devcb_read8 *m_in_cb;
- devcb_write8 *m_out_cb;
+ devcb_read8 *m_in_cb;
+ devcb_write8 *m_out_cb;
};
// device-level overrides
@@ -100,7 +100,7 @@ private:
devcb_read8 m_in_pb_cb;
devcb_write8 m_out_pb_cb;
devcb_write_line m_irq_cb;
-
+
UINT8 m_irqstate;
UINT8 m_irqenable;
int m_irq;
diff --git a/src/emu/machine/68307.h b/src/emu/machine/68307.h
index 82f5ea25169..35cf8fc4362 100644
--- a/src/emu/machine/68307.h
+++ b/src/emu/machine/68307.h
@@ -45,7 +45,7 @@ public:
template<class _Object> static devcb_base &set_b_tx_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_b_tx.set_callback(object); }
template<class _Object> static devcb_base &set_inport_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).read_inport.set_callback(object); }
template<class _Object> static devcb_base &set_outport_cb(device_t &device, _Object object) { return downcast<m68307cpu_device &>(device).write_outport.set_callback(object); }
-
+
DECLARE_WRITE_LINE_MEMBER(m68307_duart_irq_handler);
DECLARE_WRITE_LINE_MEMBER(m68307_duart_txa){ write_a_tx(state); }
DECLARE_WRITE_LINE_MEMBER(m68307_duart_txb){ write_b_tx(state); }
@@ -69,7 +69,7 @@ public:
/* 68307 peripheral modules */
m68307_sim* m68307SIM;
m68307_mbus* m68307MBUS;
-// m68307_serial* m68307SERIAL;
+// m68307_serial* m68307SERIAL;
m68307_timer* m68307TIMER;
UINT16 m68307_base;
@@ -94,7 +94,7 @@ public:
/* callbacks for internal ports */
void set_port_callbacks(m68307_porta_read_delegate porta_r, m68307_porta_write_delegate porta_w, m68307_portb_read_delegate portb_r, m68307_portb_write_delegate portb_w);
void set_interrupt(int level, int vector);
- UINT16 get_cs(offs_t address);
+ UINT16 get_cs(offs_t address);
void timer0_interrupt();
void timer1_interrupt();
void serial_interrupt(int vector);
diff --git a/src/emu/machine/6840ptm.h b/src/emu/machine/6840ptm.h
index c5075a24144..d5e8851fae4 100644
--- a/src/emu/machine/6840ptm.h
+++ b/src/emu/machine/6840ptm.h
@@ -49,13 +49,13 @@ public:
// construction/destruction
ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- static void set_internal_clock(device_t &device, double clock) { downcast<ptm6840_device &>(device).m_internal_clock = clock; }
+ static void set_internal_clock(device_t &device, double clock) { downcast<ptm6840_device &>(device).m_internal_clock = clock; }
static void set_external_clocks(device_t &device, double clock0, double clock1, double clock2) { downcast<ptm6840_device &>(device).m_external_clock[0] = clock0; downcast<ptm6840_device &>(device).m_external_clock[1] = clock1; downcast<ptm6840_device &>(device).m_external_clock[2] = clock2; }
template<class _Object> static devcb_base &set_out0_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out1_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out1_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out2_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_out2_cb.set_callback(object); }
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<ptm6840_device &>(device).m_irq_cb.set_callback(object); }
-
+
int status(int clock) const { return m_enabled[clock]; } // get whether timer is enabled
int irq_state() const { return m_IRQ; } // get IRQ state
UINT16 count(int counter) const { return compute_counter(counter); } // get counter value
diff --git a/src/emu/machine/74123.h b/src/emu/machine/74123.h
index c051c3ce4e5..8b9391988a2 100644
--- a/src/emu/machine/74123.h
+++ b/src/emu/machine/74123.h
@@ -61,13 +61,13 @@
#define MCFG_TTL74123_RESISTOR_VALUE(_value) \
ttl74123_device::set_resistor_value(*device, _value);
-
+
#define MCFG_TTL74123_CAPACITOR_VALUE(_value) \
ttl74123_device::set_capacitor_value(*device, _value);
#define MCFG_TTL74123_A_PIN_VALUE(_value) \
ttl74123_device::set_a_pin_value(*device, _value);
-
+
#define MCFG_TTL74123_B_PIN_VALUE(_value) \
ttl74123_device::set_b_pin_value(*device, _value);
@@ -75,7 +75,7 @@
ttl74123_device::set_clear_pin_value(*device, _value);
#define MCFG_TTL74123_OUTPUT_CHANGED_CB(_devcb) \
- devcb = &ttl74123_device::set_output_changed_callback(*device, DEVCB_##_devcb);
+ devcb = &ttl74123_device::set_output_changed_callback(*device, DEVCB_##_devcb);
/* constants for the different ways the cap/res can be connected.
This determines the formula for calculating the pulse width */
@@ -103,7 +103,7 @@ public:
static void set_b_pin_value(device_t &device, int value) { downcast<ttl74123_device &>(device).m_b = value; }
static void set_clear_pin_value(device_t &device, int value) { downcast<ttl74123_device &>(device).m_clear = value; }
template<class _Object> static devcb_base &set_output_changed_callback(device_t &device, _Object object) { return downcast<ttl74123_device &>(device).m_output_changed_cb.set_callback(object); }
-
+
DECLARE_WRITE8_MEMBER(a_w);
DECLARE_WRITE8_MEMBER(b_w);
DECLARE_WRITE8_MEMBER(clear_w);
diff --git a/src/emu/machine/8042kbdc.h b/src/emu/machine/8042kbdc.h
index ec0180833d1..a2311e1924d 100644
--- a/src/emu/machine/8042kbdc.h
+++ b/src/emu/machine/8042kbdc.h
@@ -40,7 +40,7 @@ enum kbdc8042_type_t
devcb = &kbdc8042_device::set_output_buffer_empty_callback(*device, DEVCB_##_devcb);
#define MCFG_KBDC8042_SPEAKER_CB(_devcb) \
- devcb = &kbdc8042_device::set_speaker_callback(*device, DEVCB_##_devcb);
+ devcb = &kbdc8042_device::set_speaker_callback(*device, DEVCB_##_devcb);
//**************************************************************************
// TYPE DEFINITIONS
@@ -55,7 +55,7 @@ public:
kbdc8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
virtual machine_config_constructor device_mconfig_additions() const;
-
+
static void set_keyboard_type(device_t &device, kbdc8042_type_t keybtype) { downcast<kbdc8042_device &>(device).m_keybtype = keybtype; }
template<class _Object> static devcb_base &set_system_reset_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_system_reset_cb.set_callback(object); }
template<class _Object> static devcb_base &set_gate_a20_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_gate_a20_cb.set_callback(object); }
@@ -109,7 +109,7 @@ protected:
required_device<at_keyboard_device> m_keyboard_dev;
kbdc8042_type_t m_keybtype;
-
+
devcb_write_line m_system_reset_cb;
devcb_write_line m_gate_a20_cb;
devcb_write_line m_input_buffer_full_cb;
diff --git a/src/emu/machine/aakart.h b/src/emu/machine/aakart.h
index 35d27f5bf41..97b2c1b4727 100644
--- a/src/emu/machine/aakart.h
+++ b/src/emu/machine/aakart.h
@@ -20,7 +20,7 @@ Acorn Archimedes KART interface
#define MCFG_AAKART_OUT_RX_CB(_devcb) \
devcb = &aakart_device::set_out_rx_callback(*device, DEVCB_##_devcb);
-
+
enum{
STATUS_NORMAL = 0,
@@ -42,15 +42,15 @@ class aakart_device : public device_t
public:
// construction/destruction
aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_tx_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_rx_callback(device_t &device, _Object object) { return downcast<aakart_device &>(device).m_out_rx_cb.set_callback(object); }
// I/O operations
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( read );
- void send_keycode_down(UINT8 row, UINT8 col);
- void send_keycode_up(UINT8 row, UINT8 col);
+ void send_keycode_down(UINT8 row, UINT8 col);
+ void send_keycode_up(UINT8 row, UINT8 col);
protected:
// device-level overrides
virtual void device_validity_check(validity_checker &valid) const;
@@ -77,9 +77,9 @@ private:
UINT8 m_status;
UINT8 m_mouse_enable;
UINT8 m_keyb_enable;
- UINT8 m_keyb_row;
- UINT8 m_keyb_col;
- UINT8 m_keyb_state;
+ UINT8 m_keyb_row;
+ UINT8 m_keyb_col;
+ UINT8 m_keyb_state;
};
diff --git a/src/emu/machine/adc0808.h b/src/emu/machine/adc0808.h
index 1ba210ffdc0..cd0247b8c44 100644
--- a/src/emu/machine/adc0808.h
+++ b/src/emu/machine/adc0808.h
@@ -49,34 +49,34 @@ typedef device_delegate<double ()> adc0808_analog_read_delegate;
#define MCFG_ADC0808_IN_VREF_POS_CB(_class, _method) \
adc0808_device::set_in_vref_pos_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
-
+
#define MCFG_ADC0808_IN_VREF_NEG_CB(_class, _method) \
adc0808_device::set_in_vref_neg_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
-
+
#define MCFG_ADC0808_IN_IN_0_CB(_class, _method) \
adc0808_device::set_in_in_0_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
-
+
#define MCFG_ADC0808_IN_IN_1_CB(_class, _method) \
adc0808_device::set_in_in_1_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
-
+
#define MCFG_ADC0808_IN_IN_2_CB(_class, _method) \
adc0808_device::set_in_in_2_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
-
+
#define MCFG_ADC0808_IN_IN_3_CB(_class, _method) \
adc0808_device::set_in_in_3_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
-
+
#define MCFG_ADC0808_IN_IN_4_CB(_class, _method) \
adc0808_device::set_in_in_4_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
-
+
#define MCFG_ADC0808_IN_IN_5_CB(_class, _method) \
adc0808_device::set_in_in_5_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
#define MCFG_ADC0808_IN_IN_6_CB(_class, _method) \
adc0808_device::set_in_in_6_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
-
+
#define MCFG_ADC0808_IN_IN_7_CB(_class, _method) \
adc0808_device::set_in_in_7_callback(*device, adc0808_analog_read_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
-
+
// ======================> adc0808_device
class adc0808_device : public device_t
@@ -84,7 +84,7 @@ class adc0808_device : public device_t
public:
// construction/destruction
adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
template<class _Object> static devcb_base &set_out_eoc_callback(device_t &device, _Object object) { return downcast<adc0808_device &>(device).m_out_eoc_cb.set_callback(object); }
static void set_in_vref_pos_callback(device_t &device, adc0808_analog_read_delegate callback) { downcast<adc0808_device &>(device).m_in_vref_pos_cb = callback; }
static void set_in_vref_neg_callback(device_t &device, adc0808_analog_read_delegate callback) { downcast<adc0808_device &>(device).m_in_vref_neg_cb = callback; }
diff --git a/src/emu/machine/adc1038.h b/src/emu/machine/adc1038.h
index 45a134e04ab..8e22fd6face 100644
--- a/src/emu/machine/adc1038.h
+++ b/src/emu/machine/adc1038.h
@@ -49,7 +49,7 @@ private:
int m_data_out;
int m_adc_data;
int m_sars;
-
+
int m_gticlub_hack;
adc1038_input_delegate m_input_cb;
};
diff --git a/src/emu/machine/akiko.h b/src/emu/machine/akiko.h
index e3657d9d815..1fa5e46f6ef 100644
--- a/src/emu/machine/akiko.h
+++ b/src/emu/machine/akiko.h
@@ -1,12 +1,12 @@
/***************************************************************************
- Akiko
+ Akiko
- Used in the Amiga CD32
+ Used in the Amiga CD32
- - CD-ROM controller
- - Builtin 1KB NVRAM
- - Chunky to planar converter
+ - CD-ROM controller
+ - Builtin 1KB NVRAM
+ - Chunky to planar converter
***************************************************************************/
@@ -74,7 +74,7 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const;
private:
- // 1X CDROM sector time in msec (300KBps)
+ // 1X CDROM sector time in msec (300KBps)
static const int CD_SECTOR_TIME = (1000/((150*1024)/2048));
// internal state
diff --git a/src/emu/machine/am9517a.h b/src/emu/machine/am9517a.h
index c4aa7383039..ab2cdd3d60c 100644
--- a/src/emu/machine/am9517a.h
+++ b/src/emu/machine/am9517a.h
@@ -73,7 +73,7 @@ public:
template<class _Object> static devcb_base &set_out_dack_1_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_1_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dack_2_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_2_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dack_3_callback(device_t &device, _Object object) { return downcast<am9517a_device &>(device).m_out_dack_3_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/machine/at_keybc.h b/src/emu/machine/at_keybc.h
index 5ce533cc9f7..65ef24e2d1b 100644
--- a/src/emu/machine/at_keybc.h
+++ b/src/emu/machine/at_keybc.h
@@ -53,7 +53,7 @@ public:
template<class _Object> static devcb_base &set_output_buffer_empty_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_output_buffer_empty_cb.set_callback(object); }
template<class _Object> static devcb_base &set_keyboard_clock_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_keyboard_clock_cb.set_callback(object); }
template<class _Object> static devcb_base &set_keyboard_data_callback(device_t &device, _Object object) { return downcast<at_keyboard_controller_device &>(device).m_keyboard_data_cb.set_callback(object); }
-
+
// internal 8042 interface
DECLARE_READ8_MEMBER( t0_r );
DECLARE_READ8_MEMBER( t1_r );
@@ -78,7 +78,7 @@ protected:
virtual const rom_entry *device_rom_region() const;
virtual machine_config_constructor device_mconfig_additions() const;
-
+
private:
// internal state
upi41_cpu_device *m_cpu;
diff --git a/src/emu/machine/autoconfig.h b/src/emu/machine/autoconfig.h
index 5183f474af9..f86e7577c7a 100644
--- a/src/emu/machine/autoconfig.h
+++ b/src/emu/machine/autoconfig.h
@@ -1,6 +1,6 @@
/***************************************************************************
- Amiga Autoconfig
+ Amiga Autoconfig
***************************************************************************/
diff --git a/src/emu/machine/ay31015.h b/src/emu/machine/ay31015.h
index 3745cc7deac..2f46e925fda 100644
--- a/src/emu/machine/ay31015.h
+++ b/src/emu/machine/ay31015.h
@@ -68,7 +68,7 @@ public:
template<class _Object> static devcb_base &set_read_si_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_read_si_cb.set_callback(object); }
template<class _Object> static devcb_base &set_write_so_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_write_so_cb.set_callback(object); }
template<class _Object> static devcb_base &set_status_changed_callback(device_t &device, _Object object) { return downcast<ay31015_device &>(device).m_status_changed_cb.set_callback(object); }
-
+
/* Set an input pin */
void set_input_pin( ay31015_input_pin_t pin, int data );
@@ -164,7 +164,7 @@ extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 va
#define MCFG_AY31015_TX_CLOCK(_txclk) \
ay31015_device::set_tx_clock(*device, _txclk);
-
+
#define MCFG_AY31015_RX_CLOCK(_rxclk) \
ay31015_device::set_rx_clock(*device, _rxclk);
@@ -175,12 +175,12 @@ extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 va
devcb = &ay31015_device::set_write_so_callback(*device, DEVCB_##_devcb);
#define MCFG_AY31015_STATUS_CHANGED_CB(_devcb) \
- devcb = &ay31015_device::set_status_changed_callback(*device, DEVCB_##_devcb);
-
+ devcb = &ay31015_device::set_status_changed_callback(*device, DEVCB_##_devcb);
+
#define MCFG_AY51013_TX_CLOCK(_txclk) \
ay51013_device::set_tx_clock(*device, _txclk);
-
+
#define MCFG_AY51013_RX_CLOCK(_rxclk) \
ay51013_device::set_rx_clock(*device, _rxclk);
@@ -191,6 +191,6 @@ extern const device_type AY51013; // For AY-3-1014, AY-5-1013 and AY-6-1013 va
devcb = &ay51013_device::set_write_so_callback(*device, DEVCB_##_devcb);
#define MCFG_AY51013_STATUS_CHANGED_CB(_devcb) \
- devcb = &ay51013_device::set_status_changed_callback(*device, DEVCB_##_devcb);
+ devcb = &ay51013_device::set_status_changed_callback(*device, DEVCB_##_devcb);
#endif
diff --git a/src/emu/machine/corvushd.h b/src/emu/machine/corvushd.h
index 7b51be5fa68..56bf0cf45b8 100644
--- a/src/emu/machine/corvushd.h
+++ b/src/emu/machine/corvushd.h
@@ -405,9 +405,9 @@ private:
// Put drive into prep mode command (0x11)
//
struct {
- UINT8 code; // Command code
- UINT8 drive; // Drive number (starts at 1)
- UINT8 prep_block[512]; // Machine code payload
+ UINT8 code; // Command code
+ UINT8 drive; // Drive number (starts at 1)
+ UINT8 prep_block[512]; // Machine code payload
} prep_mode_command;
//
// Read Firmware command (Prep Mode 0x32)
@@ -439,15 +439,15 @@ private:
//
// Verify Drive command (Prep Mode 0x07)
//
- // On the real Corvus controller, this is a variable length response. If the
- // number of bad sectors is greater than zero, an additional four bytes will
- // follow for each bad sector. We don't emulate bad sectors, so we always
+ // On the real Corvus controller, this is a variable length response. If the
+ // number of bad sectors is greater than zero, an additional four bytes will
+ // follow for each bad sector. We don't emulate bad sectors, so we always
// return a count of 0. That makes this a fixed length response of 2 bytes.
//
struct {
UINT8 status; // Disk access status
UINT8 bad_sectors; // Number of bad sectors (always zero)
- } verify_drive_response;
+ } verify_drive_response;
} m_buffer;
// Structure of Block #1, the Disk Parameter Block
diff --git a/src/emu/machine/cr511b.h b/src/emu/machine/cr511b.h
index 98380826de7..08ee9056901 100644
--- a/src/emu/machine/cr511b.h
+++ b/src/emu/machine/cr511b.h
@@ -1,33 +1,33 @@
/***************************************************************************
- CR-511-B CD-ROM drive
+ CR-511-B CD-ROM drive
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- CD-ROM drive with a custom MKE/Panasonic interface as used in the
- Commodore CDTV and early SoundBlaster cards.
-
- 1 _RESET 2 GND
- 3 EFFK 4 SCCK
- 5 SBCP 6 SCOR
- 7 GND 8 GND
- 9 C16M 10 GND
- 11 _XAEN 12 GND
- 13 EMPASIS 14 D0
- 15 LRCK 16 DSCK
- 17 _MUTE 18 GND
- 19 _BUSY 20 _STCH
- 21 _ENABLE 22 DRQ
- 23 _HWR 24 GND
- 25 _DTEN 26 _HRD
- 27 _STEN 28 _CMD
- 29 _EOP 30 GND
- 31 DB7 32 GND
- 33 DB6 34 DB5
- 35 DB4 36 GND
- 37 DB3 38 DB2
- 39 DB1 40 DB0
+ CD-ROM drive with a custom MKE/Panasonic interface as used in the
+ Commodore CDTV and early SoundBlaster cards.
+
+ 1 _RESET 2 GND
+ 3 EFFK 4 SCCK
+ 5 SBCP 6 SCOR
+ 7 GND 8 GND
+ 9 C16M 10 GND
+ 11 _XAEN 12 GND
+ 13 EMPASIS 14 D0
+ 15 LRCK 16 DSCK
+ 17 _MUTE 18 GND
+ 19 _BUSY 20 _STCH
+ 21 _ENABLE 22 DRQ
+ 23 _HWR 24 GND
+ 25 _DTEN 26 _HRD
+ 27 _STEN 28 _CMD
+ 29 _EOP 30 GND
+ 31 DB7 32 GND
+ 33 DB6 34 DB5
+ 35 DB4 36 GND
+ 37 DB3 38 DB2
+ 39 DB1 40 DB0
***************************************************************************/
@@ -46,8 +46,7 @@
//**************************************************************************
#define MCFG_CR511B_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, CR511B, 0) \
-
+ MCFG_DEVICE_ADD(_tag, CR511B, 0)
#define MCFG_CR511B_STCH_HANDLER(_devcb) \
devcb = &cr511b_device::set_stch_handler(*device, DEVCB_##_devcb);
diff --git a/src/emu/machine/dmac.h b/src/emu/machine/dmac.h
index aff36e3f0c3..e87930ad7df 100644
--- a/src/emu/machine/dmac.h
+++ b/src/emu/machine/dmac.h
@@ -23,8 +23,7 @@
//**************************************************************************
#define MCFG_DMAC_ADD(_tag, _clock) \
- MCFG_DEVICE_ADD(_tag, DMAC, _clock) \
-
+ MCFG_DEVICE_ADD(_tag, DMAC, _clock)
#define MCFG_DMAC_CFGOUT_HANDLER(_devcb) \
devcb = &dmac_device::set_cfgout_handler(*device, DEVCB_##_devcb);
@@ -109,25 +108,25 @@ private:
// control register flags
enum
{
- CNTR_TCEN = 0x80, // terminal count enable
- CNTR_PREST = 0x40, // peripheral reset
- CNTR_PDMD = 0x20, // peripheral device mode select (1=scsi, 0=xt)
- CNTR_INTEN = 0x10, // interrupt enable
- CNTR_DDIR = 0x08 // device direction (1=rd host, wr to peripheral)
+ CNTR_TCEN = 0x80, // terminal count enable
+ CNTR_PREST = 0x40, // peripheral reset
+ CNTR_PDMD = 0x20, // peripheral device mode select (1=scsi, 0=xt)
+ CNTR_INTEN = 0x10, // interrupt enable
+ CNTR_DDIR = 0x08 // device direction (1=rd host, wr to peripheral)
};
// interrupt status register
enum
{
- ISTR_INTX = 0x100, // xt interrupt pending
- ISTR_INT_F = 0x080, // interrupt follow
- ISTR_INTS = 0x040, // scsi peripheral interrupt
- ISTR_E_INT = 0x020, // end-of-process interrupt
- ISTR_INT_P = 0x010, // interrupt pending
- ISTR_UE_INT = 0x008, // under-run fifo error interrupt
- ISTR_OE_INT = 0x004, // over-run fifo error interrupt
- ISTR_FF_FLG = 0x002, // fifo-full flag
- ISTR_FE_FLG = 0x001 // fifo-empty flag
+ ISTR_INTX = 0x100, // xt interrupt pending
+ ISTR_INT_F = 0x080, // interrupt follow
+ ISTR_INTS = 0x040, // scsi peripheral interrupt
+ ISTR_E_INT = 0x020, // end-of-process interrupt
+ ISTR_INT_P = 0x010, // interrupt pending
+ ISTR_UE_INT = 0x008, // under-run fifo error interrupt
+ ISTR_OE_INT = 0x004, // over-run fifo error interrupt
+ ISTR_FF_FLG = 0x002, // fifo-full flag
+ ISTR_FE_FLG = 0x001 // fifo-empty flag
};
static const int ISTR_INT_MASK = 0x1fc;
@@ -153,10 +152,10 @@ private:
int m_rst;
// register
- UINT16 m_cntr; // control register
- UINT16 m_istr; // interrupt status register
- UINT32 m_wtc; // word transfer count
- UINT32 m_acr; // address control register
+ UINT16 m_cntr; // control register
+ UINT16 m_istr; // interrupt status register
+ UINT32 m_wtc; // word transfer count
+ UINT32 m_acr; // address control register
bool m_dma_active;
diff --git a/src/emu/machine/dp8390.h b/src/emu/machine/dp8390.h
index 8a3fe0d7441..c4699ff7aab 100644
--- a/src/emu/machine/dp8390.h
+++ b/src/emu/machine/dp8390.h
@@ -17,7 +17,7 @@
#define MCFG_DP8390D_MEM_WRITE_CB(_devcb) \
devcb = &dp8390d_device::set_mem_write_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_RTL8019A_IRQ_CB(_devcb) \
devcb = &rtl8019a_device::set_irq_callback(*device, DEVCB_##_devcb);
@@ -37,7 +37,7 @@ class dp8390_device : public device_t,
public:
// construction/destruction
dp8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, float bandwidth, const char *shortname, const char *source);
-
+
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_breq_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_breq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_mem_read_callback(device_t &device, _Object object) { return downcast<dp8390_device &>(device).m_mem_read_cb.set_callback(object); }
diff --git a/src/emu/machine/eepromser.h b/src/emu/machine/eepromser.h
index e3683ee34ef..ace9f253f1b 100644
--- a/src/emu/machine/eepromser.h
+++ b/src/emu/machine/eepromser.h
@@ -59,7 +59,7 @@
// X24c44 16 bit ram/eeprom combo
#define MCFG_EEPROM_SERIAL_X24C44_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, EEPROM_SERIAL_X24C44_16BIT, 0)
-
+
// optional enable for streaming reads
#define MCFG_EEPROM_SERIAL_ENABLE_STREAMING() \
eeprom_serial_base_device::static_enable_streaming(*device);
@@ -144,7 +144,7 @@ protected:
virtual void handle_event(eeprom_event event);
virtual void parse_command_and_address() = 0;
virtual void execute_command();
-
+
// configuration state
UINT8 m_command_address_bits; // number of address bits in a command
@@ -219,7 +219,7 @@ protected:
class eeprom_serial_x24c44_device : public eeprom_serial_base_device
{
//async recall not implemented
- //async store not implemented
+ //async store not implemented
protected:
// construction/destruction
eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
@@ -227,7 +227,7 @@ protected:
public:
// read handlers
DECLARE_READ_LINE_MEMBER(do_read); // DO
-
+
// write handlers
DECLARE_WRITE_LINE_MEMBER(cs_write); // CS signal (active high)
DECLARE_WRITE_LINE_MEMBER(clk_write); // CLK signal (active high)
@@ -283,6 +283,6 @@ DECLARE_SERIAL_EEPROM_DEVICE(93cxx, 93c86, 93C86, 8)
DECLARE_SERIAL_EEPROM_DEVICE(er5911, er5911, ER5911, 8)
DECLARE_SERIAL_EEPROM_DEVICE(er5911, er5911, ER5911, 16)
-// X24c44 8 bit 32byte ram/eeprom combo
+// X24c44 8 bit 32byte ram/eeprom combo
DECLARE_SERIAL_EEPROM_DEVICE(x24c44, x24c44, X24C44, 16)
#endif
diff --git a/src/emu/machine/gayle.h b/src/emu/machine/gayle.h
index d125cec0720..df9a0e043d4 100644
--- a/src/emu/machine/gayle.h
+++ b/src/emu/machine/gayle.h
@@ -1,11 +1,11 @@
/***************************************************************************
- GAYLE
+ GAYLE
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
- Gate array used in the Amiga 600 and Amiga 1200 computers.
+ Gate array used in the Amiga 600 and Amiga 1200 computers.
***************************************************************************/
@@ -87,10 +87,10 @@ protected:
private:
enum
{
- GAYLE_CS = 0, // interrupt status
- GAYLE_IRQ, // interrupt change
- GAYLE_INTEN, // interrupt enable register
- GAYLE_CFG // config register
+ GAYLE_CS = 0, // interrupt status
+ GAYLE_IRQ, // interrupt change
+ GAYLE_INTEN, // interrupt enable register
+ GAYLE_CFG // config register
};
devcb_write_line m_int2_w;
diff --git a/src/emu/machine/hd63450.h b/src/emu/machine/hd63450.h
index 227c970c259..dd4c96d7cda 100644
--- a/src/emu/machine/hd63450.h
+++ b/src/emu/machine/hd63450.h
@@ -100,7 +100,7 @@ public:
dev.m_burst_clock[2] = clk3;
dev.m_burst_clock[3] = clk4;
}
-
+
DECLARE_READ16_MEMBER( read );
DECLARE_WRITE16_MEMBER( write );
DECLARE_WRITE_LINE_MEMBER(drq0_w);
@@ -133,7 +133,7 @@ private:
const char *m_cpu_tag;
attotime m_our_clock[4];
attotime m_burst_clock[4];
-
+
// internal state
hd63450_regs m_reg[4];
emu_timer* m_timer[4]; // for timing data reading/writing each channel
diff --git a/src/emu/machine/i8255.h b/src/emu/machine/i8255.h
index 2b6c3aedf12..ed4b2f39ad2 100644
--- a/src/emu/machine/i8255.h
+++ b/src/emu/machine/i8255.h
@@ -79,7 +79,7 @@ public:
template<class _Object> static devcb_base &set_out_pa_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pb_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_pc_callback(device_t &device, _Object object) { return downcast<i8255_device &>(device).m_out_pc_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -125,7 +125,7 @@ private:
devcb_read8 m_in_pa_cb;
devcb_read8 m_in_pb_cb;
devcb_read8 m_in_pc_cb;
-
+
devcb_write8 m_out_pa_cb;
devcb_write8 m_out_pb_cb;
devcb_write8 m_out_pc_cb;
diff --git a/src/emu/machine/i8271.h b/src/emu/machine/i8271.h
index 97712511d8a..e69baee004f 100644
--- a/src/emu/machine/i8271.h
+++ b/src/emu/machine/i8271.h
@@ -31,8 +31,8 @@ public:
template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<i8271_device &>(device).m_write_irq.set_callback(object); }
template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<i8271_device &>(device).m_write_drq.set_callback(object); }
- static void set_floppy_tags(device_t &device, const char *tag1, const char *tag2)
- {
+ static void set_floppy_tags(device_t &device, const char *tag1, const char *tag2)
+ {
i8271_device &dev = downcast<i8271_device &>(device);
dev.m_floppy_tag1 = tag1;
dev.m_floppy_tag2 = tag2;
diff --git a/src/emu/machine/i8279.h b/src/emu/machine/i8279.h
index 162e50585d5..0f0cbccbd8a 100644
--- a/src/emu/machine/i8279.h
+++ b/src/emu/machine/i8279.h
@@ -84,7 +84,7 @@ public:
template<class _Object> static devcb_base &set_in_rl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_rl_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_shift_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_shift_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_ctrl_callback(device_t &device, _Object object) { return downcast<i8279_device &>(device).m_in_ctrl_cb.set_callback(object); }
-
+
// read & write handlers
DECLARE_READ8_MEMBER(status_r);
DECLARE_READ8_MEMBER(data_r);
@@ -115,7 +115,7 @@ private:
devcb_write8 m_out_sl_cb; // Scanlines SL0-3
devcb_write8 m_out_disp_cb; // B0-3,A0-3
devcb_write_line m_out_bd_cb; // BD
- devcb_read8 m_in_rl_cb; // kbd readlines RL0-7
+ devcb_read8 m_in_rl_cb; // kbd readlines RL0-7
devcb_read_line m_in_shift_cb; // Shift key
devcb_read_line m_in_ctrl_cb; // Ctrl-Strobe line
diff --git a/src/emu/machine/ins8250.h b/src/emu/machine/ins8250.h
index 1b80ddf646d..cc32242d60c 100644
--- a/src/emu/machine/ins8250.h
+++ b/src/emu/machine/ins8250.h
@@ -18,14 +18,14 @@ class ins8250_uart_device : public device_t,
{
public:
ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
-
+
template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_tx_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_dtr_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_rts_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_rts_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_out1_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_out1_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_out2_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_out2_cb.set_callback(object); }
-
+
DECLARE_WRITE8_MEMBER( ins8250_w );
DECLARE_READ8_MEMBER( ins8250_r );
DECLARE_WRITE_LINE_MEMBER( dcd_w );
diff --git a/src/emu/machine/kb3600.h b/src/emu/machine/kb3600.h
index b9f7c02624d..5775508d3cc 100644
--- a/src/emu/machine/kb3600.h
+++ b/src/emu/machine/kb3600.h
@@ -137,7 +137,7 @@ private:
int m_b; // output buffer
int m_ako; // any key down
- int m_x_mask[9]; // mask of what keys are down
+ int m_x_mask[9]; // mask of what keys are down
// timers
emu_timer *m_scan_timer; // keyboard scan timer
diff --git a/src/emu/machine/keyboard.h b/src/emu/machine/keyboard.h
index 9c5091b5fc3..73eaf160f2a 100644
--- a/src/emu/machine/keyboard.h
+++ b/src/emu/machine/keyboard.h
@@ -16,12 +16,12 @@
INPUT_PORTS_EXTERN( generic_keyboard );
-class generic_keyboard_device : public device_t
+class generic_keyboard_device : public device_t
{
public:
generic_keyboard_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);
generic_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_keyboard_device &>(device).m_keyboard_cb.set_callback(object); }
virtual ioport_constructor device_input_ports() const;
diff --git a/src/emu/machine/mb89352.h b/src/emu/machine/mb89352.h
index 1e76def92e4..3c4952b2b2e 100644
--- a/src/emu/machine/mb89352.h
+++ b/src/emu/machine/mb89352.h
@@ -50,7 +50,7 @@
#define MCFG_MB89352A_IRQ_CB(_devcb) \
devcb = &mb89352_device::set_irq_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_MB89352A_DRQ_CB(_devcb) \
devcb = &mb89352_device::set_drq_callback(*device, DEVCB_##_devcb);
@@ -62,7 +62,7 @@ public:
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<mb89352_device &>(device).m_drq_cb.set_callback(object); }
-
+
// any publically accessible interfaces needed for runtime
DECLARE_READ8_MEMBER( mb89352_r );
DECLARE_WRITE8_MEMBER( mb89352_w );
diff --git a/src/emu/machine/mb89363b.h b/src/emu/machine/mb89363b.h
index 43aa03e1e60..0b2f32a304a 100644
--- a/src/emu/machine/mb89363b.h
+++ b/src/emu/machine/mb89363b.h
@@ -113,7 +113,7 @@ private:
devcb_read8 m_in_a_pa_cb;
devcb_read8 m_in_a_pb_cb;
devcb_read8 m_in_a_pc_cb;
-
+
devcb_write8 m_out_a_pa_cb;
devcb_write8 m_out_a_pb_cb;
devcb_write8 m_out_a_pc_cb;
@@ -121,7 +121,7 @@ private:
devcb_read8 m_in_b_pa_cb;
devcb_read8 m_in_b_pb_cb;
devcb_read8 m_in_b_pc_cb;
-
+
devcb_write8 m_out_b_pa_cb;
devcb_write8 m_out_b_pb_cb;
devcb_write8 m_out_b_pc_cb;
diff --git a/src/emu/machine/mc6854.h b/src/emu/machine/mc6854.h
index 40a7c694232..baa16636cc4 100644
--- a/src/emu/machine/mc6854.h
+++ b/src/emu/machine/mc6854.h
@@ -47,7 +47,7 @@ public:
static void set_out_frame_callback(device_t &device, mc6854_out_frame_delegate callback) { downcast<mc6854_device &>(device).m_out_frame_cb = callback; }
template<class _Object> static devcb_base &set_out_rts_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_rts_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<mc6854_device &>(device).m_out_dtr_cb.set_callback(object); }
-
+
/* interface to CPU via address/data bus*/
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -74,13 +74,13 @@ protected:
private:
// internal state
devcb_write_line m_out_irq_cb; /* interrupt request */
-
+
/* low-level, bit-based interface */
devcb_write_line m_out_txd_cb; /* transmit bit */
-
- /* high-level, frame-based interface */
- mc6854_out_frame_delegate m_out_frame_cb;
-
+
+ /* high-level, frame-based interface */
+ mc6854_out_frame_delegate m_out_frame_cb;
+
/* control lines */
devcb_write_line m_out_rts_cb; /* 1 = transmitting, 0 = idle */
devcb_write_line m_out_dtr_cb; /* 1 = data transmit ready, 0 = busy */
diff --git a/src/emu/machine/mos6530.h b/src/emu/machine/mos6530.h
index a9753235772..33af24cf993 100644
--- a/src/emu/machine/mos6530.h
+++ b/src/emu/machine/mos6530.h
@@ -79,10 +79,10 @@ private:
// internal state
devcb_read8 m_in_pa_cb;
devcb_write8 m_out_pa_cb;
-
+
devcb_read8 m_in_pb_cb;
devcb_write8 m_out_pb_cb;
-
+
mos6530_port m_port[2];
UINT8 m_irqstate;
diff --git a/src/emu/machine/ncr539x.h b/src/emu/machine/ncr539x.h
index ec8eb1112f3..76f081c8c28 100644
--- a/src/emu/machine/ncr539x.h
+++ b/src/emu/machine/ncr539x.h
@@ -17,16 +17,16 @@
#define MCFG_NCR539X_OUT_IRQ_CB(_devcb) \
devcb = &ncr539x_device::set_out_irq_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_NCR539X_OUT_DRQ_CB(_devcb) \
devcb = &ncr539x_device::set_out_drq_callback(*device, DEVCB_##_devcb);
-
+
class ncr539x_device : public legacy_scsi_host_adapter
{
public:
// construction/destruction
ncr539x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<ncr539x_device &>(device).m_out_drq_cb.set_callback(object); }
diff --git a/src/emu/machine/roc10937.h b/src/emu/machine/roc10937.h
index 120cd33bddb..a8c5130b75a 100644
--- a/src/emu/machine/roc10937.h
+++ b/src/emu/machine/roc10937.h
@@ -1,7 +1,7 @@
/**********************************************************************
- Rockwell 10937/10957 interface and simlar chips
- Emulation by J.Wallace
+ Rockwell 10937/10957 interface and simlar chips
+ Emulation by J.Wallace
OKI MSC1937 is a clone of this chip, with many others.
**********************************************************************/
@@ -12,7 +12,7 @@
#define MCFG_ROC10937_ADD(_tag,_val) \
MCFG_DEVICE_ADD(_tag, ROC10937,60)\
- MCFG_ROC10937_PORT(_val)
+ MCFG_ROC10937_PORT(_val)
#define MCFG_ROC10937_PORT(_val) \
roc10937_t::static_set_value(*device, _val);
@@ -21,8 +21,8 @@
#define MCFG_ROC10957_ADD(_tag,_val) \
MCFG_DEVICE_ADD(_tag, ROC10957,60)\
- MCFG_ROC10957_PORT(_val)
-
+ MCFG_ROC10957_PORT(_val)
+
#define MCFG_ROC10957_PORT(_val) \
roc10957_t::static_set_value(*device, _val);
#define MCFG_ROC10957_REMOVE(_tag) \
@@ -30,8 +30,8 @@
#define MCFG_MSC1937_ADD(_tag,_val) \
MCFG_DEVICE_ADD(_tag, ROC10937,60)\
- MCFG_MSC1937_PORT(_val)
-
+ MCFG_MSC1937_PORT(_val)
+
#define MCFG_MSC1937_PORT(_val) \
MCFG_ROC10937_PORT(_val)
@@ -40,7 +40,7 @@
#define MCFG_S16LF01_ADD(_tag,_val) \
MCFG_DEVICE_ADD(_tag, S16LF01,60)\
- MCFG_S16LF01_PORT(_val)
+ MCFG_S16LF01_PORT(_val)
#define MCFG_S16LF01_PORT(_val) \
MCFG_ROC10937_PORT(_val)
diff --git a/src/emu/machine/s2636.h b/src/emu/machine/s2636.h
index 53688f6bcd2..3be2d6e8093 100644
--- a/src/emu/machine/s2636.h
+++ b/src/emu/machine/s2636.h
@@ -32,7 +32,7 @@ public:
dev.m_x_offset = x_offset;
dev.m_y_offset = y_offset;
}
-
+
// returns a BITMAP_FORMAT_IND16 bitmap the size of the screen
// D0-D2 of each pixel is the pixel color
// D3 indicates whether the S2636 drew this pixel - 0 = not drawn, 1 = drawn
@@ -65,7 +65,7 @@ private:
int m_work_ram_size;
int m_y_offset;
int m_x_offset;
-
+
int check_collision( int spriteno1, int spriteno2, const rectangle &cliprect );
};
diff --git a/src/emu/machine/s3c2400.h b/src/emu/machine/s3c2400.h
index b456b080095..db4bc567392 100644
--- a/src/emu/machine/s3c2400.h
+++ b/src/emu/machine/s3c2400.h
@@ -19,16 +19,16 @@
#define MCFG_S3C2400_CORE_PIN_R_CB(_devcb) \
devcb = &s3c2400_device::set_core_pin_r_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2400_CORE_PIN_W_CB(_devcb) \
devcb = &s3c2400_device::set_core_pin_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2400_GPIO_PORT_R_CB(_devcb) \
devcb = &s3c2400_device::set_gpio_port_r_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2400_GPIO_PORT_W_CB(_devcb) \
devcb = &s3c2400_device::set_gpio_port_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2400_I2C_SCL_W_CB(_devcb) \
devcb = &s3c2400_device::set_i2c_scl_w_callback(*device, DEVCB_##_devcb);
@@ -43,7 +43,7 @@
#define MCFG_S3C2400_I2S_DATA_W_CB(_devcb) \
devcb = &s3c2400_device::set_i2s_data_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2400_LCD_FLAGS(_flags) \
s3c2400_device::set_lcd_flags(*device, _flags);
diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h
index da42c393ae7..802eb1cc52a 100644
--- a/src/emu/machine/s3c2410.h
+++ b/src/emu/machine/s3c2410.h
@@ -19,16 +19,16 @@
#define MCFG_S3C2410_CORE_PIN_R_CB(_devcb) \
devcb = &s3c2410_device::set_core_pin_r_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2410_CORE_PIN_W_CB(_devcb) \
devcb = &s3c2410_device::set_core_pin_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2410_GPIO_PORT_R_CB(_devcb) \
devcb = &s3c2410_device::set_gpio_port_r_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2410_GPIO_PORT_W_CB(_devcb) \
devcb = &s3c2410_device::set_gpio_port_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2410_I2C_SCL_W_CB(_devcb) \
devcb = &s3c2410_device::set_i2c_scl_w_callback(*device, DEVCB_##_devcb);
@@ -43,7 +43,7 @@
#define MCFG_S3C2410_I2S_DATA_W_CB(_devcb) \
devcb = &s3c2410_device::set_i2s_data_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2410_NAND_COMMAND_W_CB(_devcb) \
devcb = &s3c2410_device::set_nand_command_w_callback(*device, DEVCB_##_devcb);
@@ -55,7 +55,7 @@
#define MCFG_S3C2410_NAND_DATA_W_CB(_devcb) \
devcb = &s3c2410_device::set_nand_data_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2410_LCD_FLAGS(_flags) \
s3c2410_device::set_lcd_flags(*device, _flags);
diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h
index b4a737b3776..4c333de06f7 100644
--- a/src/emu/machine/s3c2440.h
+++ b/src/emu/machine/s3c2440.h
@@ -18,16 +18,16 @@
#define MCFG_S3C2440_CORE_PIN_R_CB(_devcb) \
devcb = &s3c2440_device::set_core_pin_r_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2440_CORE_PIN_W_CB(_devcb) \
devcb = &s3c2440_device::set_core_pin_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2440_GPIO_PORT_R_CB(_devcb) \
devcb = &s3c2440_device::set_gpio_port_r_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2440_GPIO_PORT_W_CB(_devcb) \
devcb = &s3c2440_device::set_gpio_port_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2440_I2C_SCL_W_CB(_devcb) \
devcb = &s3c2440_device::set_i2c_scl_w_callback(*device, DEVCB_##_devcb);
@@ -54,7 +54,7 @@
#define MCFG_S3C2440_NAND_DATA_W_CB(_devcb) \
devcb = &s3c2440_device::set_nand_data_w_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_S3C2440_LCD_FLAGS(_flags) \
s3c2440_device::set_lcd_flags(*device, _flags);
diff --git a/src/emu/machine/s3c44b0.h b/src/emu/machine/s3c44b0.h
index 96b86240160..dc13e086f77 100644
--- a/src/emu/machine/s3c44b0.h
+++ b/src/emu/machine/s3c44b0.h
@@ -600,7 +600,7 @@ class s3c44b0_device : public device_t
public:
s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~s3c44b0_device() {}
-
+
template<class _Object> static devcb_base &set_gpio_port_r_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_port_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_gpio_port_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_port_w_cb.set_callback(object); }
template<class _Object> static devcb_base &set_i2c_scl_w_callback(device_t &device, _Object object) { return downcast<s3c44b0_device &>(device).m_scl_w_cb.set_callback(object); }
diff --git a/src/emu/machine/terminal.h b/src/emu/machine/terminal.h
index 9684cb691db..9e2944e8806 100644
--- a/src/emu/machine/terminal.h
+++ b/src/emu/machine/terminal.h
@@ -21,14 +21,14 @@
INPUT_PORTS_EXTERN( generic_terminal );
-class generic_terminal_device : public device_t
+class generic_terminal_device : public device_t
{
public:
generic_terminal_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);
generic_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_terminal_device &>(device).m_keyboard_cb.set_callback(object); }
-
+
DECLARE_WRITE8_MEMBER(write) { term_write(data); }
DECLARE_WRITE8_MEMBER(kbd_put);
UINT32 update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/emu/machine/tms9902.h b/src/emu/machine/tms9902.h
index 9d34a48a240..ba775d3caa1 100644
--- a/src/emu/machine/tms9902.h
+++ b/src/emu/machine/tms9902.h
@@ -48,12 +48,12 @@ class tms9902_device : public device_t
{
public:
tms9902_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
template<class _Object> static devcb_base &set_int_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_rcv_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_rcv_cb.set_callback(object); }
template<class _Object> static devcb_base &set_xmit_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_xmit_cb.set_callback(object); }
template<class _Object> static devcb_base &set_ctrl_callback(device_t &device, _Object object) { return downcast<tms9902_device &>(device).m_ctrl_cb.set_callback(object); }
-
+
void set_clock(bool state);
void rcv_cts(line_state state);
diff --git a/src/emu/machine/upd71071.h b/src/emu/machine/upd71071.h
index 3f8f11bb3ed..61e254b3e7e 100644
--- a/src/emu/machine/upd71071.h
+++ b/src/emu/machine/upd71071.h
@@ -26,7 +26,7 @@ class upd71071_device : public device_t
public:
upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~upd71071_device() {}
-
+
static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<upd71071_device &>(device).m_cpu.set_tag(tag); }
static void set_clock(device_t &device, int clock) { downcast<upd71071_device &>(device).m_upd_clock = clock; }
template<class _Object> static devcb_base &set_out_hreq_callback(device_t &device, _Object object) { return downcast<upd71071_device &>(device).m_out_hreq_cb.set_callback(object); }
@@ -98,7 +98,7 @@ extern const device_type UPD71071;
#define MCFG_UPD71071_CLOCK(_clk) \
upd71071_device::set_clock(*device, _clk);
-
+
#define MCFG_UPD71071_OUT_HREQ_CB(_devcb) \
devcb = &upd71071_device::set_out_hreq_callback(*device, DEVCB_##_devcb);
diff --git a/src/emu/machine/wd11c00_17.h b/src/emu/machine/wd11c00_17.h
index fb6f702b0b4..9a49f252563 100644
--- a/src/emu/machine/wd11c00_17.h
+++ b/src/emu/machine/wd11c00_17.h
@@ -79,7 +79,7 @@ public:
template<class _Object> static devcb_base &set_out_ramwr_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_ramwr_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_cs1010_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_in_cs1010_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_cs1010_callback(device_t &device, _Object object) { return downcast<wd11c00_17_device &>(device).m_out_cs1010_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( io_r );
DECLARE_WRITE8_MEMBER( io_w );
diff --git a/src/emu/machine/wd17xx.h b/src/emu/machine/wd17xx.h
index 2aa7e39cb28..ac5844fb49a 100644
--- a/src/emu/machine/wd17xx.h
+++ b/src/emu/machine/wd17xx.h
@@ -1,6 +1,6 @@
/*********************************************************************
- !!! DEPRECATED, USE src/emu/wd_fdc.h FOR NEW DRIVERS !!!
+ !!! DEPRECATED, USE src/emu/wd_fdc.h FOR NEW DRIVERS !!!
wd17xx.h
@@ -54,7 +54,7 @@ public:
template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_out_intrq_func.set_callback(object); }
template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_out_drq_func.set_callback(object); }
template<class _Object> static devcb_base &set_dden_rd_callback(device_t &device, _Object object) { return downcast<wd1770_device &>(device).m_in_dden_func.set_callback(object); }
-
+
static void set_drive_tags(device_t &device, const char *tag1, const char *tag2, const char *tag3, const char *tag4)
{
wd1770_device &dev = downcast<wd1770_device &>(device);
@@ -63,7 +63,7 @@ public:
dev.m_floppy_drive_tags[2] = tag3;
dev.m_floppy_drive_tags[3] = tag4;
}
-
+
/* the following are not strictly part of the wd179x hardware/emulation
but will be put here for now until the flopdrv code has been finalised more */
void set_drive(UINT8); /* set drive wd179x is accessing */
@@ -130,7 +130,7 @@ protected:
devcb_write_line m_out_intrq_func;
devcb_write_line m_out_drq_func;
devcb_read_line m_in_dden_func;
-
+
const char *m_floppy_drive_tags[4];
/* input lines */
diff --git a/src/emu/machine/wd2010.h b/src/emu/machine/wd2010.h
index 8e18254f30b..61f6b23497e 100644
--- a/src/emu/machine/wd2010.h
+++ b/src/emu/machine/wd2010.h
@@ -87,7 +87,7 @@ public:
template<class _Object> static devcb_base &set_in_wf_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_wf_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_tk000_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_tk000_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_sc_callback(device_t &device, _Object object) { return downcast<wd2010_device &>(device).m_in_sc_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/machine/ym2148.h b/src/emu/machine/ym2148.h
index 3757d75c75a..e92b0c6738a 100644
--- a/src/emu/machine/ym2148.h
+++ b/src/emu/machine/ym2148.h
@@ -89,4 +89,3 @@ extern const device_type YM2148;
#endif
-
diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h
index d8ead13548f..4e395517092 100644
--- a/src/emu/machine/z80ctc.h
+++ b/src/emu/machine/z80ctc.h
@@ -65,7 +65,7 @@ public:
template<class _Object> static devcb_base &set_zc0_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_zc1_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc1_cb.set_callback(object); }
template<class _Object> static devcb_base &set_zc2_callback(device_t &device, _Object object) { return downcast<z80ctc_device &>(device).m_zc2_cb.set_callback(object); }
-
+
// read/write handlers
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -124,7 +124,7 @@ private:
devcb_write_line m_zc1_cb; // channel 1 zero crossing callbacks
devcb_write_line m_zc2_cb; // channel 2 zero crossing callbacks
devcb_write_line m_zc3_cb; // channel 3 zero crossing callbacks = NULL ?
-
+
UINT8 m_vector; // interrupt vector
attotime m_period16; // 16/system clock
attotime m_period256; // 256/system clock
diff --git a/src/emu/machine/z80dart.h b/src/emu/machine/z80dart.h
index 1e0114c120c..27376cddde0 100644
--- a/src/emu/machine/z80dart.h
+++ b/src/emu/machine/z80dart.h
@@ -485,10 +485,10 @@ public:
template<class _Object> static devcb_base &set_out_syncb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_syncb_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_int_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_rxdrqa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rxdrqa_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_txdrqa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqa_cb.set_callback(object); }
+ template<class _Object> static devcb_base &set_out_txdrqa_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqa_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_rxdrqb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_rxdrqb_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_txdrqb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqb_cb.set_callback(object); }
-
+ template<class _Object> static devcb_base &set_out_txdrqb_callback(device_t &device, _Object object) { return downcast<z80dart_device &>(device).m_out_txdrqb_cb.set_callback(object); }
+
static void configure_channels(device_t &device, int rxa, int txa, int rxb, int txb)
{
z80dart_device &dev = downcast<z80dart_device &>(device);
@@ -497,7 +497,7 @@ public:
dev.m_rxcb = rxb;
dev.m_txcb = txb;
}
-
+
DECLARE_READ8_MEMBER( cd_ba_r );
DECLARE_WRITE8_MEMBER( cd_ba_w );
DECLARE_READ8_MEMBER( ba_cd_r );
@@ -565,19 +565,19 @@ protected:
int m_txca;
int m_rxcb;
int m_txcb;
-
+
devcb_write_line m_out_txda_cb;
devcb_write_line m_out_dtra_cb;
devcb_write_line m_out_rtsa_cb;
devcb_write_line m_out_wrdya_cb;
devcb_write_line m_out_synca_cb;
-
+
devcb_write_line m_out_txdb_cb;
devcb_write_line m_out_dtrb_cb;
devcb_write_line m_out_rtsb_cb;
devcb_write_line m_out_wrdyb_cb;
devcb_write_line m_out_syncb_cb;
-
+
devcb_write_line m_out_int_cb;
devcb_write_line m_out_rxdrqa_cb;
devcb_write_line m_out_txdrqa_cb;
diff --git a/src/emu/machine/z80dma.h b/src/emu/machine/z80dma.h
index 93641ff17c5..f16812ef07b 100644
--- a/src/emu/machine/z80dma.h
+++ b/src/emu/machine/z80dma.h
@@ -83,7 +83,7 @@ public:
template<class _Object> static devcb_base &set_out_mreq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_mreq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_in_iorq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_in_iorq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_iorq_callback(device_t &device, _Object object) { return downcast<z80dma_device &>(device).m_out_iorq_cb.set_callback(object); }
-
+
UINT8 read();
void write(UINT8 data);
DECLARE_READ8_MEMBER( read ) { return read(); }
diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h
index 3dc71316126..91285fbc73a 100644
--- a/src/emu/machine/z80pio.h
+++ b/src/emu/machine/z80pio.h
@@ -92,7 +92,7 @@ public:
template<class _Object> static devcb_base &set_in_pb_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_in_pb_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_pb_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_pb_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_brdy_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_brdy_cb.set_callback(object); }
-
+
// I/O line access
int rdy(int which) { return m_port[which].rdy(); }
void strobe(int which, bool state) { m_port[which].strobe(state); }
@@ -206,7 +206,7 @@ private:
devcb_read8 m_in_pa_cb;
devcb_write8 m_out_pa_cb;
devcb_write_line m_out_ardy_cb;
-
+
devcb_read8 m_in_pb_cb;
devcb_write8 m_out_pb_cb;
devcb_write_line m_out_brdy_cb;
diff --git a/src/emu/machine/z80sti.h b/src/emu/machine/z80sti.h
index 2d156706c69..4065bf6bdcb 100644
--- a/src/emu/machine/z80sti.h
+++ b/src/emu/machine/z80sti.h
@@ -94,7 +94,7 @@ public:
template<class _Object> static devcb_base &set_out_tbo_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tbo_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_tco_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tco_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_tdo_callback(device_t &device, _Object object) { return downcast<z80sti_device &>(device).m_out_tdo_cb.set_callback(object); }
-
+
static void set_rx_clock(device_t &device, int clock) { downcast<z80sti_device &>(device).m_rx_clock = clock; }
static void set_tx_clock(device_t &device, int clock) { downcast<z80sti_device &>(device).m_tx_clock = clock; }
@@ -201,15 +201,15 @@ private:
void gpip_input(int bit, int state);
// device callbacks
- devcb_write_line m_out_int_cb; // this gets called on each change of the _INT pin (pin 17)
- devcb_read8 m_in_gpio_cb; // this is called on each read of the GPIO pins
- devcb_write8 m_out_gpio_cb; // this is called on each write of the GPIO pins
- devcb_write_line m_out_so_cb; // this gets called for each change of the SO pin (pin 37)
- devcb_write_line m_out_tao_cb; // this gets called for each change of the TAO pin (pin 1)
- devcb_write_line m_out_tbo_cb; // this gets called for each change of the TBO pin (pin 2)
- devcb_write_line m_out_tco_cb; // this gets called for each change of the TCO pin (pin 3)
- devcb_write_line m_out_tdo_cb; // this gets called for each change of the TDO pin (pin 4)
-
+ devcb_write_line m_out_int_cb; // this gets called on each change of the _INT pin (pin 17)
+ devcb_read8 m_in_gpio_cb; // this is called on each read of the GPIO pins
+ devcb_write8 m_out_gpio_cb; // this is called on each write of the GPIO pins
+ devcb_write_line m_out_so_cb; // this gets called for each change of the SO pin (pin 37)
+ devcb_write_line m_out_tao_cb; // this gets called for each change of the TAO pin (pin 1)
+ devcb_write_line m_out_tbo_cb; // this gets called for each change of the TBO pin (pin 2)
+ devcb_write_line m_out_tco_cb; // this gets called for each change of the TCO pin (pin 3)
+ devcb_write_line m_out_tdo_cb; // this gets called for each change of the TDO pin (pin 4)
+
int m_rx_clock; // serial receive clock
int m_tx_clock; // serial transmit clock
diff --git a/src/emu/mame.h b/src/emu/mame.h
index a1da76b4325..457b13f39f6 100644
--- a/src/emu/mame.h
+++ b/src/emu/mame.h
@@ -92,27 +92,27 @@ public:
emu_options &options() const { return m_options; }
web_engine *web() { return &m_web; }
lua_engine *lua() { return &m_lua; }
-
+
running_machine *machine() { return m_machine; }
void set_machine(running_machine *machine) { m_machine = machine; }
-
+
void update_machine();
-
+
/* execute as configured by the OPTION_SYSTEMNAME option on the specified options */
int execute();
void schedule_new_driver(const game_driver &driver);
private:
osd_interface & m_osd; // reference to OSD system
emu_options & m_options; // reference to options
-
- web_engine m_web;
- lua_engine m_lua;
-
- const game_driver * m_new_driver_pending; // pointer to the next pending driver
-
- running_machine *m_machine;
- static machine_manager* m_manager;
+
+ web_engine m_web;
+ lua_engine m_lua;
+
+ const game_driver * m_new_driver_pending; // pointer to the next pending driver
+
+ running_machine *m_machine;
+ static machine_manager* m_manager;
};
//**************************************************************************
diff --git a/src/emu/memory.h b/src/emu/memory.h
index 4b88936a4b8..765c00bd086 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -439,7 +439,7 @@ public:
UINT64 *install_read_handler(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read64_delegate rhandler, UINT64 unitmask = 0);
UINT64 *install_write_handler(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, write64_delegate whandler, UINT64 unitmask = 0);
UINT64 *install_readwrite_handler(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, read64_delegate rhandler, write64_delegate whandler, UINT64 unitmask = 0);
-
+
// setup
void prepare_map();
void populate_from_map(address_map *map = NULL);
diff --git a/src/emu/netlist/analog/nld_bjt.h b/src/emu/netlist/analog/nld_bjt.h
index 082f70d9b17..f1d980c1428 100644
--- a/src/emu/netlist/analog/nld_bjt.h
+++ b/src/emu/netlist/analog/nld_bjt.h
@@ -98,7 +98,7 @@ public:
NETLIB_UPDATE_TERMINALS()
{
- const double m = (is_qtype( BJT_NPN) ? 1 : -1);
+ const double m = (is_qtype( BJT_NPN) ? 1 : -1);
const int new_state = (m_RB.deltaV() * m > m_V ) ? 1 : 0;
if (m_state_on ^ new_state)
@@ -122,7 +122,7 @@ public:
m_RB.set(gb, v, 0.0);
m_RC.set(gc, 0.0, 0.0);
//m_RB.update_dev();
- //m_RC.update_dev();
+ //m_RC.update_dev();
m_state_on = new_state;
}
}
@@ -164,7 +164,7 @@ public:
m_D_EB(netlist_object_t::ANALOG),
m_D_EC(netlist_object_t::ANALOG),
m_alpha_f(0),
- m_alpha_r(0)
+ m_alpha_r(0)
{ }
NETLIB_UPDATE_TERMINALS()
diff --git a/src/emu/netlist/analog/nld_fourterm.h b/src/emu/netlist/analog/nld_fourterm.h
index 63efb89b449..5c729f6ca65 100644
--- a/src/emu/netlist/analog/nld_fourterm.h
+++ b/src/emu/netlist/analog/nld_fourterm.h
@@ -18,7 +18,7 @@
NET_REGISTER_DEV(VCCS, _name)
#define CCCS(_name) \
- NET_REGISTER_DEV(CCCS, _name)
+ NET_REGISTER_DEV(CCCS, _name)
#define VCVS(_name) \
NET_REGISTER_DEV(VCVS, _name)
@@ -104,18 +104,18 @@ protected:
class NETLIB_NAME(CCCS) : public NETLIB_NAME(VCCS)
{
public:
- ATTR_COLD NETLIB_NAME(CCCS)()
- : NETLIB_NAME(VCCS)(CCCS), m_gfac(1.0) { }
- //ATTR_COLD NETLIB_NAME(CCCS)(const family_t afamily)
- //: netlist_device_t(afamily), m_gfac(1.0) { }
+ ATTR_COLD NETLIB_NAME(CCCS)()
+ : NETLIB_NAME(VCCS)(CCCS), m_gfac(1.0) { }
+ //ATTR_COLD NETLIB_NAME(CCCS)(const family_t afamily)
+ //: netlist_device_t(afamily), m_gfac(1.0) { }
protected:
- ATTR_COLD virtual void start();
- ATTR_COLD virtual void reset();
- ATTR_COLD virtual void update_param();
- ATTR_HOT ATTR_ALIGN void update();
+ ATTR_COLD virtual void start();
+ ATTR_COLD virtual void reset();
+ ATTR_COLD virtual void update_param();
+ ATTR_HOT ATTR_ALIGN void update();
- double m_gfac;
+ double m_gfac;
};
diff --git a/src/emu/netlist/analog/nld_ms_direct.h b/src/emu/netlist/analog/nld_ms_direct.h
index 1d1089f054c..e067a476989 100644
--- a/src/emu/netlist/analog/nld_ms_direct.h
+++ b/src/emu/netlist/analog/nld_ms_direct.h
@@ -13,48 +13,48 @@ class netlist_matrix_solver_direct_t: public netlist_matrix_solver_t
{
public:
- netlist_matrix_solver_direct_t(const netlist_solver_parameters_t &params, int size);
+ netlist_matrix_solver_direct_t(const netlist_solver_parameters_t &params, int size);
- virtual ~netlist_matrix_solver_direct_t();
+ virtual ~netlist_matrix_solver_direct_t();
- ATTR_COLD virtual void vsetup(netlist_analog_net_t::list_t &nets);
- ATTR_COLD virtual void reset() { netlist_matrix_solver_t::reset(); }
+ ATTR_COLD virtual void vsetup(netlist_analog_net_t::list_t &nets);
+ ATTR_COLD virtual void reset() { netlist_matrix_solver_t::reset(); }
- ATTR_HOT inline const int N() const { if (m_N == 0) return m_dim; else return m_N; }
+ ATTR_HOT inline const int N() const { if (m_N == 0) return m_dim; else return m_N; }
- ATTR_HOT inline int vsolve_non_dynamic();
+ ATTR_HOT inline int vsolve_non_dynamic();
protected:
- ATTR_COLD virtual void add_term(int net_idx, netlist_terminal_t *term);
+ ATTR_COLD virtual void add_term(int net_idx, netlist_terminal_t *term);
- ATTR_HOT virtual double vsolve();
+ ATTR_HOT virtual double vsolve();
- ATTR_HOT int solve_non_dynamic();
- ATTR_HOT void build_LE();
- ATTR_HOT void gauss_LE(double (* RESTRICT x));
- ATTR_HOT double delta(const double (* RESTRICT V));
- ATTR_HOT void store(const double (* RESTRICT V), const bool store_RHS);
+ ATTR_HOT int solve_non_dynamic();
+ ATTR_HOT void build_LE();
+ ATTR_HOT void gauss_LE(double (* RESTRICT x));
+ ATTR_HOT double delta(const double (* RESTRICT V));
+ ATTR_HOT void store(const double (* RESTRICT V), const bool store_RHS);
- /* bring the whole system to the current time
- * Don't schedule a new calculation time. The recalculation has to be
- * triggered by the caller after the netlist element was changed.
- */
- ATTR_HOT double compute_next_timestep();
+ /* bring the whole system to the current time
+ * Don't schedule a new calculation time. The recalculation has to be
+ * triggered by the caller after the netlist element was changed.
+ */
+ ATTR_HOT double compute_next_timestep();
- double m_A[_storage_N][((_storage_N + 7) / 8) * 8];
- double m_RHS[_storage_N];
- double m_last_RHS[_storage_N]; // right hand side - contains currents
- double m_Vdelta[_storage_N];
- double m_last_V[_storage_N];
+ double m_A[_storage_N][((_storage_N + 7) / 8) * 8];
+ double m_RHS[_storage_N];
+ double m_last_RHS[_storage_N]; // right hand side - contains currents
+ double m_Vdelta[_storage_N];
+ double m_last_V[_storage_N];
- terms_t **m_terms;
- terms_t *m_rails_temp;
+ terms_t **m_terms;
+ terms_t *m_rails_temp;
private:
- vector_ops_t *m_row_ops[_storage_N + 1];
+ vector_ops_t *m_row_ops[_storage_N + 1];
- int m_dim;
- double m_lp_fact;
+ int m_dim;
+ double m_lp_fact;
};
// ----------------------------------------------------------------------------------------
@@ -64,149 +64,148 @@ private:
template <int m_N, int _storage_N>
netlist_matrix_solver_direct_t<m_N, _storage_N>::~netlist_matrix_solver_direct_t()
{
- for (int k=0; k<_storage_N; k++)
- {
- //delete[] m_A[k];
- }
- //delete[] m_last_RHS;
- //delete[] m_RHS;
- delete[] m_terms;
- delete[] m_rails_temp;
- //delete[] m_row_ops;
+ for (int k=0; k<_storage_N; k++)
+ {
+ //delete[] m_A[k];
+ }
+ //delete[] m_last_RHS;
+ //delete[] m_RHS;
+ delete[] m_terms;
+ delete[] m_rails_temp;
+ //delete[] m_row_ops;
}
template <int m_N, int _storage_N>
ATTR_HOT double netlist_matrix_solver_direct_t<m_N, _storage_N>::compute_next_timestep()
{
- double new_solver_timestep = m_params.m_max_timestep;
-
- if (m_params.m_dynamic)
- {
- /*
- * FIXME: We should extend the logic to use either all nets or
- * only output nets.
- */
+ double new_solver_timestep = m_params.m_max_timestep;
+
+ if (m_params.m_dynamic)
+ {
+ /*
+ * FIXME: We should extend the logic to use either all nets or
+ * only output nets.
+ */
#if 0
- for (netlist_analog_output_t * const *p = m_inps.first(); p != NULL; p = m_inps.next(p))
- {
- netlist_analog_net_t *n = (*p)->m_proxied_net;
+ for (netlist_analog_output_t * const *p = m_inps.first(); p != NULL; p = m_inps.next(p))
+ {
+ netlist_analog_net_t *n = (*p)->m_proxied_net;
#else
- for (int k = 0; k < N(); k++)
- {
- netlist_analog_net_t *n = m_nets[k];
+ for (int k = 0; k < N(); k++)
+ {
+ netlist_analog_net_t *n = m_nets[k];
#endif
- const double DD_n = (n->m_cur_Analog - m_last_V[k]);
- const double hn = current_timestep();
-
- double DD2 = (DD_n / hn - n->m_DD_n_m_1 / n->m_h_n_m_1) / (hn + n->m_h_n_m_1);
- double new_net_timestep;
-
- n->m_h_n_m_1 = hn;
- n->m_DD_n_m_1 = DD_n;
- if (fabs(DD2) > 1e-50) // avoid div-by-zero
- new_net_timestep = sqrt(m_params.m_lte / fabs(0.5*DD2));
- else
- new_net_timestep = m_params.m_max_timestep;
-
- if (new_net_timestep < new_solver_timestep)
- new_solver_timestep = new_net_timestep;
- }
- if (new_solver_timestep < m_params.m_min_timestep)
- new_solver_timestep = m_params.m_min_timestep;
- }
- //if (new_solver_timestep > 10.0 * hn)
- // new_solver_timestep = 10.0 * hn;
- return new_solver_timestep;
+ const double DD_n = (n->m_cur_Analog - m_last_V[k]);
+ const double hn = current_timestep();
+
+ double DD2 = (DD_n / hn - n->m_DD_n_m_1 / n->m_h_n_m_1) / (hn + n->m_h_n_m_1);
+ double new_net_timestep;
+
+ n->m_h_n_m_1 = hn;
+ n->m_DD_n_m_1 = DD_n;
+ if (fabs(DD2) > 1e-50) // avoid div-by-zero
+ new_net_timestep = sqrt(m_params.m_lte / fabs(0.5*DD2));
+ else
+ new_net_timestep = m_params.m_max_timestep;
+
+ if (new_net_timestep < new_solver_timestep)
+ new_solver_timestep = new_net_timestep;
+ }
+ if (new_solver_timestep < m_params.m_min_timestep)
+ new_solver_timestep = m_params.m_min_timestep;
+ }
+ //if (new_solver_timestep > 10.0 * hn)
+ // new_solver_timestep = 10.0 * hn;
+ return new_solver_timestep;
}
template <int m_N, int _storage_N>
ATTR_COLD void netlist_matrix_solver_direct_t<m_N, _storage_N>::add_term(int k, netlist_terminal_t *term)
{
- if (term->m_otherterm->net().isRailNet())
- {
- m_rails_temp[k].add(term, -1);
- }
- else
- {
- int ot = get_net_idx(&term->m_otherterm->net());
- if (ot>=0)
- {
- m_terms[k]->add(term, ot);
- SOLVER_VERBOSE_OUT(("Net %d Term %s %f %f\n", k, terms[i]->name().cstr(), terms[i]->m_gt, terms[i]->m_go));
- }
- /* Should this be allowed ? */
- else // if (ot<0)
- {
- m_rails_temp[k].add(term, ot);
- netlist().error("found term with missing othernet %s\n", term->name().cstr());
- }
- }
+ if (term->m_otherterm->net().isRailNet())
+ {
+ m_rails_temp[k].add(term, -1);
+ }
+ else
+ {
+ int ot = get_net_idx(&term->m_otherterm->net());
+ if (ot>=0)
+ {
+ m_terms[k]->add(term, ot);
+ SOLVER_VERBOSE_OUT(("Net %d Term %s %f %f\n", k, terms[i]->name().cstr(), terms[i]->m_gt, terms[i]->m_go));
+ }
+ /* Should this be allowed ? */
+ else // if (ot<0)
+ {
+ m_rails_temp[k].add(term, ot);
+ netlist().error("found term with missing othernet %s\n", term->name().cstr());
+ }
+ }
}
template <int m_N, int _storage_N>
ATTR_COLD void netlist_matrix_solver_direct_t<m_N, _storage_N>::vsetup(netlist_analog_net_t::list_t &nets)
{
+ if (m_dim < nets.count())
+ netlist().error("Dimension %d less than %d", m_dim, nets.count());
- if (m_dim < nets.count())
- netlist().error("Dimension %d less than %d", m_dim, nets.count());
+ for (int k = 0; k < N(); k++)
+ {
+ m_terms[k]->clear();
+ m_rails_temp[k].clear();
+ }
- for (int k = 0; k < N(); k++)
- {
- m_terms[k]->clear();
- m_rails_temp[k].clear();
- }
+ netlist_matrix_solver_t::setup(nets);
- netlist_matrix_solver_t::setup(nets);
+ for (int k = 0; k < N(); k++)
+ {
+ m_terms[k]->m_railstart = m_terms[k]->count();
+ for (int i = 0; i < m_rails_temp[k].count(); i++)
+ this->m_terms[k]->add(m_rails_temp[k].terms()[i], m_rails_temp[k].net_other()[i]);
- for (int k = 0; k < N(); k++)
- {
- m_terms[k]->m_railstart = m_terms[k]->count();
- for (int i = 0; i < m_rails_temp[k].count(); i++)
- this->m_terms[k]->add(m_rails_temp[k].terms()[i], m_rails_temp[k].net_other()[i]);
-
- m_rails_temp[k].clear(); // no longer needed
- m_terms[k]->set_pointers();
- }
+ m_rails_temp[k].clear(); // no longer needed
+ m_terms[k]->set_pointers();
+ }
#if 1
- /* Sort in descending order by number of connected matrix voltages.
- * The idea is, that for Gauss-Seidel algo the first voltage computed
- * depends on the greatest number of previous voltages thus taking into
- * account the maximum amout of information.
- *
- * This actually improves performance on popeye slightly. Average
- * GS computations reduce from 2.509 to 2.370
- *
- * Smallest to largest : 2.613
- * Unsorted : 2.509
- * Largest to smallest : 2.370
- *
- * Sorting as a general matrix pre-conditioning is mentioned in
- * literature but I have found no articles about Gauss Seidel.
- *
- */
-
-
- for (int k = 0; k < N() / 2; k++)
- for (int i = 0; i < N() - 1; i++)
- {
- if (m_terms[i]->m_railstart < m_terms[i+1]->m_railstart)
- {
- std::swap(m_terms[i],m_terms[i+1]);
- m_nets.swap(i, i+1);
- }
- }
-
- for (int k = 0; k < N(); k++)
- {
- int *other = m_terms[k]->net_other();
- for (int i = 0; i < m_terms[k]->count(); i++)
- if (other[i] != -1)
- other[i] = get_net_idx(&m_terms[k]->terms()[i]->m_otherterm->net());
- }
+ /* Sort in descending order by number of connected matrix voltages.
+ * The idea is, that for Gauss-Seidel algo the first voltage computed
+ * depends on the greatest number of previous voltages thus taking into
+ * account the maximum amout of information.
+ *
+ * This actually improves performance on popeye slightly. Average
+ * GS computations reduce from 2.509 to 2.370
+ *
+ * Smallest to largest : 2.613
+ * Unsorted : 2.509
+ * Largest to smallest : 2.370
+ *
+ * Sorting as a general matrix pre-conditioning is mentioned in
+ * literature but I have found no articles about Gauss Seidel.
+ *
+ */
+
+
+ for (int k = 0; k < N() / 2; k++)
+ for (int i = 0; i < N() - 1; i++)
+ {
+ if (m_terms[i]->m_railstart < m_terms[i+1]->m_railstart)
+ {
+ std::swap(m_terms[i],m_terms[i+1]);
+ m_nets.swap(i, i+1);
+ }
+ }
+
+ for (int k = 0; k < N(); k++)
+ {
+ int *other = m_terms[k]->net_other();
+ for (int i = 0; i < m_terms[k]->count(); i++)
+ if (other[i] != -1)
+ other[i] = get_net_idx(&m_terms[k]->terms()[i]->m_otherterm->net());
+ }
#endif
@@ -216,230 +215,230 @@ template <int m_N, int _storage_N>
ATTR_HOT void netlist_matrix_solver_direct_t<m_N, _storage_N>::build_LE()
{
#if 0
- for (int k=0; k < N(); k++)
- for (int i=0; i < N(); i++)
- m_A[k][i] = 0.0;
+ for (int k=0; k < N(); k++)
+ for (int i=0; i < N(); i++)
+ m_A[k][i] = 0.0;
#endif
- for (int k = 0; k < N(); k++)
- {
- for (int i=0; i < N(); i++)
- m_A[k][i] = 0.0;
-
- double rhsk = 0.0;
- double akk = 0.0;
- {
- const int terms_count = m_terms[k]->count();
- const double * RESTRICT gt = m_terms[k]->gt();
- const double * RESTRICT go = m_terms[k]->go();
- const double * RESTRICT Idr = m_terms[k]->Idr();
+ for (int k = 0; k < N(); k++)
+ {
+ for (int i=0; i < N(); i++)
+ m_A[k][i] = 0.0;
+
+ double rhsk = 0.0;
+ double akk = 0.0;
+ {
+ const int terms_count = m_terms[k]->count();
+ const double * RESTRICT gt = m_terms[k]->gt();
+ const double * RESTRICT go = m_terms[k]->go();
+ const double * RESTRICT Idr = m_terms[k]->Idr();
#if VECTALT
- for (int i = 0; i < terms_count; i++)
- {
- rhsk = rhsk + Idr[i];
- akk = akk + gt[i];
- }
+ for (int i = 0; i < terms_count; i++)
+ {
+ rhsk = rhsk + Idr[i];
+ akk = akk + gt[i];
+ }
#else
- m_terms[k]->ops()->sum2(Idr, gt, rhsk, akk);
+ m_terms[k]->ops()->sum2(Idr, gt, rhsk, akk);
#endif
- double * const * RESTRICT other_cur_analog = m_terms[k]->other_curanalog();
- for (int i = m_terms[k]->m_railstart; i < terms_count; i++)
- {
- //rhsk = rhsk + go[i] * terms[i]->m_otherterm->net().as_analog().Q_Analog();
- rhsk = rhsk + go[i] * *other_cur_analog[i];
- }
- }
+ double * const * RESTRICT other_cur_analog = m_terms[k]->other_curanalog();
+ for (int i = m_terms[k]->m_railstart; i < terms_count; i++)
+ {
+ //rhsk = rhsk + go[i] * terms[i]->m_otherterm->net().as_analog().Q_Analog();
+ rhsk = rhsk + go[i] * *other_cur_analog[i];
+ }
+ }
#if 0
- /*
- * Matrix preconditioning with 1.0 / Akk
- *
- * will save a number of calculations during elimination
- *
- */
- akk = 1.0 / akk;
- m_RHS[k] = rhsk * akk;
- m_A[k][k] += 1.0;
- {
- const int *net_other = m_terms[k]->net_other();
- const double *go = m_terms[k]->go();
- const int railstart = m_terms[k]->m_railstart;
-
- for (int i = 0; i < railstart; i++)
- {
- m_A[k][net_other[i]] += -go[i] * akk;
- }
- }
+ /*
+ * Matrix preconditioning with 1.0 / Akk
+ *
+ * will save a number of calculations during elimination
+ *
+ */
+ akk = 1.0 / akk;
+ m_RHS[k] = rhsk * akk;
+ m_A[k][k] += 1.0;
+ {
+ const int *net_other = m_terms[k]->net_other();
+ const double *go = m_terms[k]->go();
+ const int railstart = m_terms[k]->m_railstart;
+
+ for (int i = 0; i < railstart; i++)
+ {
+ m_A[k][net_other[i]] += -go[i] * akk;
+ }
+ }
#else
- m_RHS[k] = rhsk;
- m_A[k][k] += akk;
- {
- const int * RESTRICT net_other = m_terms[k]->net_other();
- const double * RESTRICT go = m_terms[k]->go();
- const int railstart = m_terms[k]->m_railstart;
-
- for (int i = 0; i < railstart; i++)
- {
- m_A[k][net_other[i]] += -go[i];
- }
- }
+ m_RHS[k] = rhsk;
+ m_A[k][k] += akk;
+ {
+ const int * RESTRICT net_other = m_terms[k]->net_other();
+ const double * RESTRICT go = m_terms[k]->go();
+ const int railstart = m_terms[k]->m_railstart;
+
+ for (int i = 0; i < railstart; i++)
+ {
+ m_A[k][net_other[i]] += -go[i];
+ }
+ }
#endif
- }
+ }
}
template <int m_N, int _storage_N>
ATTR_HOT void netlist_matrix_solver_direct_t<m_N, _storage_N>::gauss_LE(
- double (* RESTRICT x))
+ double (* RESTRICT x))
{
#if 0
- for (int i = 0; i < N(); i++)
- {
- for (int k = 0; k < N(); k++)
- printf("%f ", m_A[i][k]);
- printf("| %f = %f \n", x[i], m_RHS[i]);
- }
- printf("\n");
+ for (int i = 0; i < N(); i++)
+ {
+ for (int k = 0; k < N(); k++)
+ printf("%f ", m_A[i][k]);
+ printf("| %f = %f \n", x[i], m_RHS[i]);
+ }
+ printf("\n");
#endif
- const int kN = N();
-
- for (int i = 0; i < kN; i++) {
- // FIXME: use a parameter to enable pivoting?
- if (USE_PIVOT_SEARCH)
- {
- /* Find the row with the largest first value */
- int maxrow = i;
- for (int j = i + 1; j < kN; j++)
- {
- if (fabs(m_A[j][i]) > fabs(m_A[maxrow][i]))
- maxrow = j;
- }
-
- if (maxrow != i)
- {
- /* Swap the maxrow and ith row */
- for (int k = i; k < kN; k++) {
- std::swap(m_A[i][k], m_A[maxrow][k]);
- }
- std::swap(m_RHS[i], m_RHS[maxrow]);
- }
- }
-
- /* FIXME: Singular matrix? */
- const double f = 1.0 / m_A[i][i];
-
- /* Eliminate column i from row j */
-
- for (int j = i + 1; j < kN; j++)
- {
- const double f1 = - m_A[j][i] * f;
- if (f1 != 0.0)
- {
+ const int kN = N();
+
+ for (int i = 0; i < kN; i++) {
+ // FIXME: use a parameter to enable pivoting?
+ if (USE_PIVOT_SEARCH)
+ {
+ /* Find the row with the largest first value */
+ int maxrow = i;
+ for (int j = i + 1; j < kN; j++)
+ {
+ if (fabs(m_A[j][i]) > fabs(m_A[maxrow][i]))
+ maxrow = j;
+ }
+
+ if (maxrow != i)
+ {
+ /* Swap the maxrow and ith row */
+ for (int k = i; k < kN; k++) {
+ std::swap(m_A[i][k], m_A[maxrow][k]);
+ }
+ std::swap(m_RHS[i], m_RHS[maxrow]);
+ }
+ }
+
+ /* FIXME: Singular matrix? */
+ const double f = 1.0 / m_A[i][i];
+
+ /* Eliminate column i from row j */
+
+ for (int j = i + 1; j < kN; j++)
+ {
+ const double f1 = - m_A[j][i] * f;
+ if (f1 != 0.0)
+ {
#if 0 && VECTALT
- for (int k = i + 1; k < kN; k++)
- m_A[j][k] += m_A[i][k] * f1;
+ for (int k = i + 1; k < kN; k++)
+ m_A[j][k] += m_A[i][k] * f1;
#else
- // addmult gives some performance increase here...
- m_row_ops[kN - (i + 1)]->addmult(&m_A[j][i+1], &m_A[i][i+1], f1) ;
+ // addmult gives some performance increase here...
+ m_row_ops[kN - (i + 1)]->addmult(&m_A[j][i+1], &m_A[i][i+1], f1) ;
#endif
- m_RHS[j] += m_RHS[i] * f1;
- }
- }
- }
- /* back substitution */
- for (int j = kN - 1; j >= 0; j--)
- {
- double tmp = 0;
-
- for (int k = j + 1; k < kN; k++)
- tmp += m_A[j][k] * x[k];
-
- x[j] = (m_RHS[j] - tmp) / m_A[j][j];
- }
+ m_RHS[j] += m_RHS[i] * f1;
+ }
+ }
+ }
+ /* back substitution */
+ for (int j = kN - 1; j >= 0; j--)
+ {
+ double tmp = 0;
+
+ for (int k = j + 1; k < kN; k++)
+ tmp += m_A[j][k] * x[k];
+
+ x[j] = (m_RHS[j] - tmp) / m_A[j][j];
+ }
#if 0
- printf("Solution:\n");
- for (int i = 0; i < N(); i++)
- {
- for (int k = 0; k < N(); k++)
- printf("%f ", m_A[i][k]);
- printf("| %f = %f \n", x[i], m_RHS[i]);
- }
- printf("\n");
+ printf("Solution:\n");
+ for (int i = 0; i < N(); i++)
+ {
+ for (int k = 0; k < N(); k++)
+ printf("%f ", m_A[i][k]);
+ printf("| %f = %f \n", x[i], m_RHS[i]);
+ }
+ printf("\n");
#endif
}
template <int m_N, int _storage_N>
ATTR_HOT double netlist_matrix_solver_direct_t<m_N, _storage_N>::delta(
- const double (* RESTRICT V))
+ const double (* RESTRICT V))
{
- double cerr = 0;
- double cerr2 = 0;
- for (int i = 0; i < this->N(); i++)
- {
- const double e = (V[i] - this->m_nets[i]->m_cur_Analog);
- const double e2 = (m_RHS[i] - this->m_last_RHS[i]);
- cerr = (fabs(e) > cerr ? fabs(e) : cerr);
- cerr2 = (fabs(e2) > cerr2 ? fabs(e2) : cerr2);
- }
- // FIXME: Review
- return cerr + cerr2*100000.0;
+ double cerr = 0;
+ double cerr2 = 0;
+ for (int i = 0; i < this->N(); i++)
+ {
+ const double e = (V[i] - this->m_nets[i]->m_cur_Analog);
+ const double e2 = (m_RHS[i] - this->m_last_RHS[i]);
+ cerr = (fabs(e) > cerr ? fabs(e) : cerr);
+ cerr2 = (fabs(e2) > cerr2 ? fabs(e2) : cerr2);
+ }
+ // FIXME: Review
+ return cerr + cerr2*100000.0;
}
template <int m_N, int _storage_N>
ATTR_HOT void netlist_matrix_solver_direct_t<m_N, _storage_N>::store(
- const double (* RESTRICT V), const bool store_RHS)
+ const double (* RESTRICT V), const bool store_RHS)
{
- for (int i = 0; i < this->N(); i++)
- {
- this->m_nets[i]->m_cur_Analog = V[i];
- }
- if (store_RHS)
- {
- for (int i = 0; i < this->N(); i++)
- {
- this->m_last_RHS[i] = m_RHS[i];
- }
- }
+ for (int i = 0; i < this->N(); i++)
+ {
+ this->m_nets[i]->m_cur_Analog = V[i];
+ }
+ if (store_RHS)
+ {
+ for (int i = 0; i < this->N(); i++)
+ {
+ this->m_last_RHS[i] = m_RHS[i];
+ }
+ }
}
template <int m_N, int _storage_N>
ATTR_HOT double netlist_matrix_solver_direct_t<m_N, _storage_N>::vsolve()
{
- solve_base<netlist_matrix_solver_direct_t>(this);
- return this->compute_next_timestep();
+ solve_base<netlist_matrix_solver_direct_t>(this);
+ return this->compute_next_timestep();
}
template <int m_N, int _storage_N>
ATTR_HOT int netlist_matrix_solver_direct_t<m_N, _storage_N>::solve_non_dynamic()
{
- double new_v[_storage_N] = { 0.0 };
+ double new_v[_storage_N] = { 0.0 };
- this->gauss_LE(new_v);
+ this->gauss_LE(new_v);
- if (this->is_dynamic())
- {
- double err = delta(new_v);
+ if (this->is_dynamic())
+ {
+ double err = delta(new_v);
- store(new_v, true);
+ store(new_v, true);
- if (err > this->m_params.m_accuracy)
- {
- return 2;
- }
- return 1;
- }
- store(new_v, false); // ==> No need to store RHS
- return 1;
+ if (err > this->m_params.m_accuracy)
+ {
+ return 2;
+ }
+ return 1;
+ }
+ store(new_v, false); // ==> No need to store RHS
+ return 1;
}
template <int m_N, int _storage_N>
ATTR_HOT inline int netlist_matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic()
{
- this->build_LE();
+ this->build_LE();
- return this->solve_non_dynamic();
+ return this->solve_non_dynamic();
}
template <int m_N, int _storage_N>
@@ -448,15 +447,15 @@ netlist_matrix_solver_direct_t<m_N, _storage_N>::netlist_matrix_solver_direct_t(
, m_dim(size)
, m_lp_fact(0)
{
- m_terms = new terms_t *[N()];
- m_rails_temp = new terms_t[N()];
-
- for (int k = 0; k < N(); k++)
- {
- m_terms[k] = new terms_t;
- m_row_ops[k] = vector_ops_t::create_ops(k);
- }
- m_row_ops[N()] = vector_ops_t::create_ops(N());
+ m_terms = new terms_t *[N()];
+ m_rails_temp = new terms_t[N()];
+
+ for (int k = 0; k < N(); k++)
+ {
+ m_terms[k] = new terms_t;
+ m_row_ops[k] = vector_ops_t::create_ops(k);
+ }
+ m_row_ops[N()] = vector_ops_t::create_ops(N());
}
diff --git a/src/emu/netlist/analog/nld_ms_direct1.h b/src/emu/netlist/analog/nld_ms_direct1.h
index f562ea93dff..57c66daf82b 100644
--- a/src/emu/netlist/analog/nld_ms_direct1.h
+++ b/src/emu/netlist/analog/nld_ms_direct1.h
@@ -13,12 +13,12 @@ class ATTR_ALIGNED(64) netlist_matrix_solver_direct1_t: public netlist_matrix_so
{
public:
- netlist_matrix_solver_direct1_t(const netlist_solver_parameters_t &params)
- : netlist_matrix_solver_direct_t<1, 1>(params, 1)
- {}
- ATTR_HOT inline int vsolve_non_dynamic();
+ netlist_matrix_solver_direct1_t(const netlist_solver_parameters_t &params)
+ : netlist_matrix_solver_direct_t<1, 1>(params, 1)
+ {}
+ ATTR_HOT inline int vsolve_non_dynamic();
protected:
- ATTR_HOT virtual double vsolve();
+ ATTR_HOT virtual double vsolve();
private:
};
@@ -28,30 +28,29 @@ private:
ATTR_HOT double netlist_matrix_solver_direct1_t::vsolve()
{
- solve_base<netlist_matrix_solver_direct1_t>(this);
- return this->compute_next_timestep();
+ solve_base<netlist_matrix_solver_direct1_t>(this);
+ return this->compute_next_timestep();
}
ATTR_HOT inline int netlist_matrix_solver_direct1_t::vsolve_non_dynamic()
{
+ netlist_analog_net_t *net = m_nets[0];
+ this->build_LE();
+ //NL_VERBOSE_OUT(("%f %f\n", new_val, m_RHS[0] / m_A[0][0]);
- netlist_analog_net_t *net = m_nets[0];
- this->build_LE();
- //NL_VERBOSE_OUT(("%f %f\n", new_val, m_RHS[0] / m_A[0][0]);
+ double new_val = m_RHS[0] / m_A[0][0];
- double new_val = m_RHS[0] / m_A[0][0];
+ double e = (new_val - net->m_cur_Analog);
+ double cerr = fabs(e);
- double e = (new_val - net->m_cur_Analog);
- double cerr = fabs(e);
+ net->m_cur_Analog = new_val;
- net->m_cur_Analog = new_val;
-
- if (is_dynamic() && (cerr > m_params.m_accuracy))
- {
- return 2;
- }
- else
- return 1;
+ if (is_dynamic() && (cerr > m_params.m_accuracy))
+ {
+ return 2;
+ }
+ else
+ return 1;
}
diff --git a/src/emu/netlist/analog/nld_ms_direct2.h b/src/emu/netlist/analog/nld_ms_direct2.h
index 03bfc2b7429..9d7074b4d02 100644
--- a/src/emu/netlist/analog/nld_ms_direct2.h
+++ b/src/emu/netlist/analog/nld_ms_direct2.h
@@ -15,12 +15,12 @@ class ATTR_ALIGNED(64) netlist_matrix_solver_direct2_t: public netlist_matrix_so
{
public:
- netlist_matrix_solver_direct2_t(const netlist_solver_parameters_t &params)
- : netlist_matrix_solver_direct_t<2, 2>(params, 2)
- {}
- ATTR_HOT inline int vsolve_non_dynamic();
+ netlist_matrix_solver_direct2_t(const netlist_solver_parameters_t &params)
+ : netlist_matrix_solver_direct_t<2, 2>(params, 2)
+ {}
+ ATTR_HOT inline int vsolve_non_dynamic();
protected:
- ATTR_HOT virtual double vsolve();
+ ATTR_HOT virtual double vsolve();
private:
};
@@ -30,35 +30,34 @@ private:
ATTR_HOT double netlist_matrix_solver_direct2_t::vsolve()
{
- solve_base<netlist_matrix_solver_direct2_t>(this);
- return this->compute_next_timestep();
+ solve_base<netlist_matrix_solver_direct2_t>(this);
+ return this->compute_next_timestep();
}
ATTR_HOT inline int netlist_matrix_solver_direct2_t::vsolve_non_dynamic()
{
-
- build_LE();
-
- const double a = m_A[0][0];
- const double b = m_A[0][1];
- const double c = m_A[1][0];
- const double d = m_A[1][1];
-
- double new_val[2];
- new_val[1] = (a * m_RHS[1] - c * m_RHS[0]) / (a * d - b * c);
- new_val[0] = (m_RHS[0] - b * new_val[1]) / a;
-
- if (is_dynamic())
- {
- double err = this->delta(new_val);
- store(new_val, true);
- if (err > m_params.m_accuracy )
- return 2;
- else
- return 1;
- }
- store(new_val, false);
- return 1;
+ build_LE();
+
+ const double a = m_A[0][0];
+ const double b = m_A[0][1];
+ const double c = m_A[1][0];
+ const double d = m_A[1][1];
+
+ double new_val[2];
+ new_val[1] = (a * m_RHS[1] - c * m_RHS[0]) / (a * d - b * c);
+ new_val[0] = (m_RHS[0] - b * new_val[1]) / a;
+
+ if (is_dynamic())
+ {
+ double err = this->delta(new_val);
+ store(new_val, true);
+ if (err > m_params.m_accuracy )
+ return 2;
+ else
+ return 1;
+ }
+ store(new_val, false);
+ return 1;
}
diff --git a/src/emu/netlist/analog/nld_ms_gauss_seidel.h b/src/emu/netlist/analog/nld_ms_gauss_seidel.h
index ba4a23eb622..270aaf227a3 100644
--- a/src/emu/netlist/analog/nld_ms_gauss_seidel.h
+++ b/src/emu/netlist/analog/nld_ms_gauss_seidel.h
@@ -16,25 +16,25 @@ class ATTR_ALIGNED(64) netlist_matrix_solver_gauss_seidel_t: public netlist_matr
{
public:
- netlist_matrix_solver_gauss_seidel_t(const netlist_solver_parameters_t &params, int size)
- : netlist_matrix_solver_direct_t<m_N, _storage_N>(params, size)
- , m_lp_fact(0)
- , m_gs_fail(0)
- , m_gs_total(0)
- {}
+ netlist_matrix_solver_gauss_seidel_t(const netlist_solver_parameters_t &params, int size)
+ : netlist_matrix_solver_direct_t<m_N, _storage_N>(params, size)
+ , m_lp_fact(0)
+ , m_gs_fail(0)
+ , m_gs_total(0)
+ {}
- virtual ~netlist_matrix_solver_gauss_seidel_t() {}
+ virtual ~netlist_matrix_solver_gauss_seidel_t() {}
- ATTR_COLD virtual void log_stats();
+ ATTR_COLD virtual void log_stats();
- ATTR_HOT inline int vsolve_non_dynamic();
+ ATTR_HOT inline int vsolve_non_dynamic();
protected:
- ATTR_HOT virtual double vsolve();
+ ATTR_HOT virtual double vsolve();
private:
- double m_lp_fact;
- int m_gs_fail;
- int m_gs_total;
+ double m_lp_fact;
+ int m_gs_fail;
+ int m_gs_total;
};
@@ -46,307 +46,307 @@ template <int m_N, int _storage_N>
void netlist_matrix_solver_gauss_seidel_t<m_N, _storage_N>::log_stats()
{
#if 0
- if (this->m_calculations == 0)
- return;
- printf("==============================================\n");
- printf("Solver %s\n", this->name().cstr());
- printf(" ==> %d nets\n", this->N()); //, (*(*groups[i].first())->m_core_terms.first())->name().cstr());
- printf(" has %s elements\n", this->is_dynamic() ? "dynamic" : "no dynamic");
- printf(" has %s elements\n", this->is_timestep() ? "timestep" : "no timestep");
- printf(" %10d invocations (%6d Hz) %10d gs fails (%6.2f%%) %6.3f average\n",
- this->m_calculations,
- this->m_calculations * 10 / (int) (this->netlist().time().as_double() * 10.0),
- this->m_gs_fail,
- 100.0 * (double) this->m_gs_fail / (double) this->m_calculations,
- (double) this->m_gs_total / (double) this->m_calculations);
+ if (this->m_calculations == 0)
+ return;
+ printf("==============================================\n");
+ printf("Solver %s\n", this->name().cstr());
+ printf(" ==> %d nets\n", this->N()); //, (*(*groups[i].first())->m_core_terms.first())->name().cstr());
+ printf(" has %s elements\n", this->is_dynamic() ? "dynamic" : "no dynamic");
+ printf(" has %s elements\n", this->is_timestep() ? "timestep" : "no timestep");
+ printf(" %10d invocations (%6d Hz) %10d gs fails (%6.2f%%) %6.3f average\n",
+ this->m_calculations,
+ this->m_calculations * 10 / (int) (this->netlist().time().as_double() * 10.0),
+ this->m_gs_fail,
+ 100.0 * (double) this->m_gs_fail / (double) this->m_calculations,
+ (double) this->m_gs_total / (double) this->m_calculations);
#endif
}
template <int m_N, int _storage_N>
ATTR_HOT double netlist_matrix_solver_gauss_seidel_t<m_N, _storage_N>::vsolve()
{
- /*
- * enable linear prediction on first newton pass
- */
-
- if (USE_LINEAR_PREDICTION)
- for (int k = 0; k < this->N(); k++)
- {
- this->m_last_V[k] = this->m_nets[k]->m_cur_Analog;
- this->m_nets[k]->m_cur_Analog = this->m_nets[k]->m_cur_Analog + this->m_Vdelta[k] * this->current_timestep() * m_lp_fact;
- }
- else
- for (int k = 0; k < this->N(); k++)
- {
- this->m_last_V[k] = this->m_nets[k]->m_cur_Analog;
- }
-
- this->solve_base(this);
-
- if (USE_LINEAR_PREDICTION)
- {
- double sq = 0;
- double sqo = 0;
- const double rez_cts = 1.0 / this->current_timestep();
- for (int k = 0; k < this->N(); k++)
- {
- const netlist_analog_net_t *n = this->m_nets[k];
- const double nv = (n->m_cur_Analog - this->m_last_V[k]) * rez_cts ;
- sq += nv * nv;
- sqo += this->m_Vdelta[k] * this->m_Vdelta[k];
- this->m_Vdelta[k] = nv;
- }
- if (sqo > 1e-90)
- m_lp_fact = std::min(sqrt(sq/sqo), 2.0);
- else
- m_lp_fact = 0.0;
- }
-
-
- return this->compute_next_timestep();
+ /*
+ * enable linear prediction on first newton pass
+ */
+
+ if (USE_LINEAR_PREDICTION)
+ for (int k = 0; k < this->N(); k++)
+ {
+ this->m_last_V[k] = this->m_nets[k]->m_cur_Analog;
+ this->m_nets[k]->m_cur_Analog = this->m_nets[k]->m_cur_Analog + this->m_Vdelta[k] * this->current_timestep() * m_lp_fact;
+ }
+ else
+ for (int k = 0; k < this->N(); k++)
+ {
+ this->m_last_V[k] = this->m_nets[k]->m_cur_Analog;
+ }
+
+ this->solve_base(this);
+
+ if (USE_LINEAR_PREDICTION)
+ {
+ double sq = 0;
+ double sqo = 0;
+ const double rez_cts = 1.0 / this->current_timestep();
+ for (int k = 0; k < this->N(); k++)
+ {
+ const netlist_analog_net_t *n = this->m_nets[k];
+ const double nv = (n->m_cur_Analog - this->m_last_V[k]) * rez_cts ;
+ sq += nv * nv;
+ sqo += this->m_Vdelta[k] * this->m_Vdelta[k];
+ this->m_Vdelta[k] = nv;
+ }
+ if (sqo > 1e-90)
+ m_lp_fact = std::min(sqrt(sq/sqo), 2.0);
+ else
+ m_lp_fact = 0.0;
+ }
+
+
+ return this->compute_next_timestep();
}
template <int m_N, int _storage_N>
ATTR_HOT inline int netlist_matrix_solver_gauss_seidel_t<m_N, _storage_N>::vsolve_non_dynamic()
{
- /* The matrix based code looks a lot nicer but actually is 30% slower than
- * the optimized code which works directly on the data structures.
- * Need something like that for gaussian elimination as well.
- */
+ /* The matrix based code looks a lot nicer but actually is 30% slower than
+ * the optimized code which works directly on the data structures.
+ * Need something like that for gaussian elimination as well.
+ */
#if 0 || USE_MATRIX_GS
- static double ws = 1.0;
- ATTR_ALIGN double new_v[_storage_N] = { 0.0 };
- const int iN = this->N();
-
- bool resched = false;
-
- int resched_cnt = 0;
-
- this->build_LE();
-
- {
- double frob;
- frob = 0;
- double rmin = 1e99, rmax = -1e99;
- for (int k = 0; k < iN; k++)
- {
- new_v[k] = this->m_nets[k]->m_cur_Analog;
- double s=0.0;
- for (int i = 0; i < iN; i++)
- {
- frob += this->m_A[k][i] * this->m_A[k][i];
- s = s + fabs(this->m_A[k][i]);
- }
-
- if (s<rmin)
- rmin = s;
- if (s>rmax)
- rmax = s;
- }
+ static double ws = 1.0;
+ ATTR_ALIGN double new_v[_storage_N] = { 0.0 };
+ const int iN = this->N();
+
+ bool resched = false;
+
+ int resched_cnt = 0;
+
+ this->build_LE();
+
+ {
+ double frob;
+ frob = 0;
+ double rmin = 1e99, rmax = -1e99;
+ for (int k = 0; k < iN; k++)
+ {
+ new_v[k] = this->m_nets[k]->m_cur_Analog;
+ double s=0.0;
+ for (int i = 0; i < iN; i++)
+ {
+ frob += this->m_A[k][i] * this->m_A[k][i];
+ s = s + fabs(this->m_A[k][i]);
+ }
+
+ if (s<rmin)
+ rmin = s;
+ if (s>rmax)
+ rmax = s;
+ }
#if 0
- double frobA = sqrt(frob /(iN));
- if (1 &&frobA < 1.0)
- //ws = 2.0 / (1.0 + sqrt(1.0-frobA));
- ws = 2.0 / (2.0 - frobA);
- else
- ws = 1.0;
- ws = 0.9;
+ double frobA = sqrt(frob /(iN));
+ if (1 &&frobA < 1.0)
+ //ws = 2.0 / (1.0 + sqrt(1.0-frobA));
+ ws = 2.0 / (2.0 - frobA);
+ else
+ ws = 1.0;
+ ws = 0.9;
#else
- // calculate an estimate for rho.
- // This is based on the Perron–Frobenius theorem for positive matrices.
- // No mathematical proof here. The following estimates the
- // optimal relaxation parameter pretty well. Unfortunately, the
- // overhead is bigger than the gain. Consequently the fast GS below
- // uses a fixed GS. One can however use this here to determine a
- // suitable parameter.
- double rm = (rmax + rmin) * 0.5;
- if (rm < 1.0)
- ws = 2.0 / (1.0 + sqrt(1.0-rm));
- else
- ws = 1.0;
- if (ws > 1.02 && rmax > 1.001)
- printf("rmin %f rmax %f ws %f\n", rmin, rmax, ws);
+ // calculate an estimate for rho.
+ // This is based on the Perron???Frobenius theorem for positive matrices.
+ // No mathematical proof here. The following estimates the
+ // optimal relaxation parameter pretty well. Unfortunately, the
+ // overhead is bigger than the gain. Consequently the fast GS below
+ // uses a fixed GS. One can however use this here to determine a
+ // suitable parameter.
+ double rm = (rmax + rmin) * 0.5;
+ if (rm < 1.0)
+ ws = 2.0 / (1.0 + sqrt(1.0-rm));
+ else
+ ws = 1.0;
+ if (ws > 1.02 && rmax > 1.001)
+ printf("rmin %f rmax %f ws %f\n", rmin, rmax, ws);
#endif
- }
-
- // Frobenius norm for (D-L)^(-1)U
- //double frobU;
- //double frobL;
- //double norm;
- do {
- resched = false;
- double cerr = 0.0;
- //frobU = 0;
- //frobL = 0;
- //norm = 0;
-
- for (int k = 0; k < iN; k++)
- {
- double Idrive = 0;
- //double norm_t = 0;
- // Reduction loops need -ffast-math
- for (int i = 0; i < iN; i++)
- Idrive += this->m_A[k][i] * new_v[i];
-
- for (int i = 0; i < iN; i++)
- {
- //if (i < k) frobL += this->m_A[k][i] * this->m_A[k][i] / this->m_A[k][k] /this-> m_A[k][k];
- //if (i > k) frobU += this->m_A[k][i] * this->m_A[k][i] / this->m_A[k][k] / this->m_A[k][k];
- //norm_t += fabs(this->m_A[k][i]);
- }
-
- //if (norm_t > norm) norm = norm_t;
- const double new_val = (1.0-ws) * new_v[k] + ws * (this->m_RHS[k] - Idrive + this->m_A[k][k] * new_v[k]) / this->m_A[k][k];
-
- const double e = fabs(new_val - new_v[k]);
- cerr = (e > cerr ? e : cerr);
- new_v[k] = new_val;
- }
-
- if (cerr > this->m_params.m_accuracy)
- {
- resched = true;
- }
- resched_cnt++;
- //ATTR_UNUSED double frobUL = sqrt((frobU + frobL) / (double) (iN) / (double) (iN));
- } while (resched && (resched_cnt < this->m_params.m_gs_loops));
- //printf("Frobenius %f %f %f %f %f\n", sqrt(frobU), sqrt(frobL), frobUL, frobA, norm);
- //printf("Omega Estimate1 %f %f\n", 2.0 / (1.0 + sqrt(1-frobUL)), 2.0 / (1.0 + sqrt(1-frobA)) ); // printf("Frobenius %f\n", sqrt(frob / (double) (iN * iN) ));
- //printf("Omega Estimate2 %f %f\n", 2.0 / (2.0 - frobUL), 2.0 / (2.0 - frobA) ); // printf("Frobenius %f\n", sqrt(frob / (double) (iN * iN) ));
-
-
- this->store(new_v, false);
-
- this->m_gs_total += resched_cnt;
- if (resched)
- {
- //this->netlist().warning("Falling back to direct solver .. Consider increasing RESCHED_LOOPS");
- this->m_gs_fail++;
- int tmp = netlist_matrix_solver_direct_t<m_N, _storage_N>::solve_non_dynamic();
- this->m_calculations++;
- return tmp;
- }
- else {
- this->m_calculations++;
-
- return resched_cnt;
- }
+ }
+
+ // Frobenius norm for (D-L)^(-1)U
+ //double frobU;
+ //double frobL;
+ //double norm;
+ do {
+ resched = false;
+ double cerr = 0.0;
+ //frobU = 0;
+ //frobL = 0;
+ //norm = 0;
+
+ for (int k = 0; k < iN; k++)
+ {
+ double Idrive = 0;
+ //double norm_t = 0;
+ // Reduction loops need -ffast-math
+ for (int i = 0; i < iN; i++)
+ Idrive += this->m_A[k][i] * new_v[i];
+
+ for (int i = 0; i < iN; i++)
+ {
+ //if (i < k) frobL += this->m_A[k][i] * this->m_A[k][i] / this->m_A[k][k] /this-> m_A[k][k];
+ //if (i > k) frobU += this->m_A[k][i] * this->m_A[k][i] / this->m_A[k][k] / this->m_A[k][k];
+ //norm_t += fabs(this->m_A[k][i]);
+ }
+
+ //if (norm_t > norm) norm = norm_t;
+ const double new_val = (1.0-ws) * new_v[k] + ws * (this->m_RHS[k] - Idrive + this->m_A[k][k] * new_v[k]) / this->m_A[k][k];
+
+ const double e = fabs(new_val - new_v[k]);
+ cerr = (e > cerr ? e : cerr);
+ new_v[k] = new_val;
+ }
+
+ if (cerr > this->m_params.m_accuracy)
+ {
+ resched = true;
+ }
+ resched_cnt++;
+ //ATTR_UNUSED double frobUL = sqrt((frobU + frobL) / (double) (iN) / (double) (iN));
+ } while (resched && (resched_cnt < this->m_params.m_gs_loops));
+ //printf("Frobenius %f %f %f %f %f\n", sqrt(frobU), sqrt(frobL), frobUL, frobA, norm);
+ //printf("Omega Estimate1 %f %f\n", 2.0 / (1.0 + sqrt(1-frobUL)), 2.0 / (1.0 + sqrt(1-frobA)) ); // printf("Frobenius %f\n", sqrt(frob / (double) (iN * iN) ));
+ //printf("Omega Estimate2 %f %f\n", 2.0 / (2.0 - frobUL), 2.0 / (2.0 - frobA) ); // printf("Frobenius %f\n", sqrt(frob / (double) (iN * iN) ));
+
+
+ this->store(new_v, false);
+
+ this->m_gs_total += resched_cnt;
+ if (resched)
+ {
+ //this->netlist().warning("Falling back to direct solver .. Consider increasing RESCHED_LOOPS");
+ this->m_gs_fail++;
+ int tmp = netlist_matrix_solver_direct_t<m_N, _storage_N>::solve_non_dynamic();
+ this->m_calculations++;
+ return tmp;
+ }
+ else {
+ this->m_calculations++;
+
+ return resched_cnt;
+ }
#else
- const int iN = this->N();
- bool resched = false;
- int resched_cnt = 0;
-
- /* ideally, we could get an estimate for the spectral radius of
- * Inv(D - L) * U
- *
- * and estimate using
- *
- * omega = 2.0 / (1.0 + sqrt(1-rho))
- */
-
- const double ws = this->m_params.m_sor; //1.045; //2.0 / (1.0 + /*sin*/(3.14159 * 5.5 / (double) (m_nets.count()+1)));
- //const double ws = 2.0 / (1.0 + sin(3.14159 * 4 / (double) (this->N())));
-
- ATTR_ALIGN double w[_storage_N];
- ATTR_ALIGN double one_m_w[_storage_N];
- ATTR_ALIGN double RHS[_storage_N];
- ATTR_ALIGN double new_V[_storage_N];
-
- for (int k = 0; k < iN; k++)
- {
- double gtot_t = 0.0;
- double gabs_t = 0.0;
- double RHS_t = 0.0;
-
- new_V[k] = this->m_nets[k]->m_cur_Analog;
-
- {
- const int term_count = this->m_terms[k]->count();
- const double * const RESTRICT gt = this->m_terms[k]->gt();
- const double * const RESTRICT go = this->m_terms[k]->go();
- const double * const RESTRICT Idr = this->m_terms[k]->Idr();
- const double * const *other_cur_analog = this->m_terms[k]->other_curanalog();
+ const int iN = this->N();
+ bool resched = false;
+ int resched_cnt = 0;
+
+ /* ideally, we could get an estimate for the spectral radius of
+ * Inv(D - L) * U
+ *
+ * and estimate using
+ *
+ * omega = 2.0 / (1.0 + sqrt(1-rho))
+ */
+
+ const double ws = this->m_params.m_sor; //1.045; //2.0 / (1.0 + /*sin*/(3.14159 * 5.5 / (double) (m_nets.count()+1)));
+ //const double ws = 2.0 / (1.0 + sin(3.14159 * 4 / (double) (this->N())));
+
+ ATTR_ALIGN double w[_storage_N];
+ ATTR_ALIGN double one_m_w[_storage_N];
+ ATTR_ALIGN double RHS[_storage_N];
+ ATTR_ALIGN double new_V[_storage_N];
+
+ for (int k = 0; k < iN; k++)
+ {
+ double gtot_t = 0.0;
+ double gabs_t = 0.0;
+ double RHS_t = 0.0;
+
+ new_V[k] = this->m_nets[k]->m_cur_Analog;
+
+ {
+ const int term_count = this->m_terms[k]->count();
+ const double * const RESTRICT gt = this->m_terms[k]->gt();
+ const double * const RESTRICT go = this->m_terms[k]->go();
+ const double * const RESTRICT Idr = this->m_terms[k]->Idr();
+ const double * const *other_cur_analog = this->m_terms[k]->other_curanalog();
#if VECTALT
- for (int i = 0; i < term_count; i++)
- {
- gtot_t = gtot_t + gt[i];
- RHS_t = RHS_t + Idr[i];
- }
- if (USE_GABS)
- for (int i = 0; i < term_count; i++)
- gabs_t = gabs_t + fabs(go[i]);
+ for (int i = 0; i < term_count; i++)
+ {
+ gtot_t = gtot_t + gt[i];
+ RHS_t = RHS_t + Idr[i];
+ }
+ if (USE_GABS)
+ for (int i = 0; i < term_count; i++)
+ gabs_t = gabs_t + fabs(go[i]);
#else
- if (USE_GABS)
- this->m_terms[k]->ops()->sum2a(gt, Idr, go, gtot_t, RHS_t, gabs_t);
- else
- this->m_terms[k]->ops()->sum2(gt, Idr, gtot_t, RHS_t);
+ if (USE_GABS)
+ this->m_terms[k]->ops()->sum2a(gt, Idr, go, gtot_t, RHS_t, gabs_t);
+ else
+ this->m_terms[k]->ops()->sum2(gt, Idr, gtot_t, RHS_t);
#endif
- for (int i = this->m_terms[k]->m_railstart; i < term_count; i++)
- RHS_t = RHS_t + go[i] * *other_cur_analog[i];
- }
-
- RHS[k] = RHS_t;
-
- //if (fabs(gabs_t - fabs(gtot_t)) > 1e-20)
- // printf("%d %e abs: %f tot: %f\n",k, gabs_t / gtot_t -1.0, gabs_t, gtot_t);
-
- gabs_t *= 0.5; // avoid rounding issues
- if (!USE_GABS || gabs_t <= gtot_t)
- {
- w[k] = ws / gtot_t;
- one_m_w[k] = 1.0 - ws;
- }
- else
- {
- //printf("abs: %f tot: %f\n", gabs_t, gtot_t);
- w[k] = 1.0 / (gtot_t + gabs_t);
- one_m_w[k] = 1.0 - 1.0 * gtot_t / (gtot_t + gabs_t);
- }
-
- }
-
- const double accuracy = this->m_params.m_accuracy;
-
- do {
- resched = false;
-
- for (int k = 0; k < iN; k++)
- {
- const int * RESTRICT net_other = this->m_terms[k]->net_other();
- const int railstart = this->m_terms[k]->m_railstart;
- const double * RESTRICT go = this->m_terms[k]->go();
-
- double Idrive = 0.0;
- for (int i = 0; i < railstart; i++)
- Idrive = Idrive + go[i] * new_V[net_other[i]];
-
- //double new_val = (net->m_cur_Analog * gabs[k] + iIdr) / (gtot[k]);
- const double new_val = new_V[k] * one_m_w[k] + (Idrive + RHS[k]) * w[k];
-
- resched = resched || (std::abs(new_val - new_V[k]) > accuracy);
- new_V[k] = new_val;
- }
-
- resched_cnt++;
- } while (resched && (resched_cnt < this->m_params.m_gs_loops));
-
- for (int k = 0; k < iN; k++)
- this->m_nets[k]->m_cur_Analog = new_V[k];
-
- this->m_gs_total += resched_cnt;
- this->m_calculations++;
-
- if (resched)
- {
- //this->netlist().warning("Falling back to direct solver .. Consider increasing RESCHED_LOOPS");
- this->m_gs_fail++;
- return netlist_matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic();
- }
- else {
- return resched_cnt;
- }
+ for (int i = this->m_terms[k]->m_railstart; i < term_count; i++)
+ RHS_t = RHS_t + go[i] * *other_cur_analog[i];
+ }
+
+ RHS[k] = RHS_t;
+
+ //if (fabs(gabs_t - fabs(gtot_t)) > 1e-20)
+ // printf("%d %e abs: %f tot: %f\n",k, gabs_t / gtot_t -1.0, gabs_t, gtot_t);
+
+ gabs_t *= 0.5; // avoid rounding issues
+ if (!USE_GABS || gabs_t <= gtot_t)
+ {
+ w[k] = ws / gtot_t;
+ one_m_w[k] = 1.0 - ws;
+ }
+ else
+ {
+ //printf("abs: %f tot: %f\n", gabs_t, gtot_t);
+ w[k] = 1.0 / (gtot_t + gabs_t);
+ one_m_w[k] = 1.0 - 1.0 * gtot_t / (gtot_t + gabs_t);
+ }
+
+ }
+
+ const double accuracy = this->m_params.m_accuracy;
+
+ do {
+ resched = false;
+
+ for (int k = 0; k < iN; k++)
+ {
+ const int * RESTRICT net_other = this->m_terms[k]->net_other();
+ const int railstart = this->m_terms[k]->m_railstart;
+ const double * RESTRICT go = this->m_terms[k]->go();
+
+ double Idrive = 0.0;
+ for (int i = 0; i < railstart; i++)
+ Idrive = Idrive + go[i] * new_V[net_other[i]];
+
+ //double new_val = (net->m_cur_Analog * gabs[k] + iIdr) / (gtot[k]);
+ const double new_val = new_V[k] * one_m_w[k] + (Idrive + RHS[k]) * w[k];
+
+ resched = resched || (std::abs(new_val - new_V[k]) > accuracy);
+ new_V[k] = new_val;
+ }
+
+ resched_cnt++;
+ } while (resched && (resched_cnt < this->m_params.m_gs_loops));
+
+ for (int k = 0; k < iN; k++)
+ this->m_nets[k]->m_cur_Analog = new_V[k];
+
+ this->m_gs_total += resched_cnt;
+ this->m_calculations++;
+
+ if (resched)
+ {
+ //this->netlist().warning("Falling back to direct solver .. Consider increasing RESCHED_LOOPS");
+ this->m_gs_fail++;
+ return netlist_matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic();
+ }
+ else {
+ return resched_cnt;
+ }
#endif
}
diff --git a/src/emu/netlist/analog/nld_opamps.h b/src/emu/netlist/analog/nld_opamps.h
index d0d9a89d6b7..4433114a18c 100644
--- a/src/emu/netlist/analog/nld_opamps.h
+++ b/src/emu/netlist/analog/nld_opamps.h
@@ -19,7 +19,7 @@
// ----------------------------------------------------------------------------------------
#define LM3900(_name) \
- SUBMODEL(_name, opamp_lm3900)
+ SUBMODEL(_name, opamp_lm3900)
// ----------------------------------------------------------------------------------------
// Devices ...
diff --git a/src/emu/netlist/analog/nld_solver.h b/src/emu/netlist/analog/nld_solver.h
index 52f15cee8f8..a0f6ea470f9 100644
--- a/src/emu/netlist/analog/nld_solver.h
+++ b/src/emu/netlist/analog/nld_solver.h
@@ -45,31 +45,31 @@ struct netlist_solver_parameters_t
bool m_dynamic;
int m_gs_loops;
int m_nr_loops;
- netlist_time m_nt_sync_delay;
+ netlist_time m_nt_sync_delay;
};
class vector_ops_t
{
public:
- vector_ops_t(int size)
- : m_dim(size)
- {
- }
+ vector_ops_t(int size)
+ : m_dim(size)
+ {
+ }
- virtual ~vector_ops_t() {}
+ virtual ~vector_ops_t() {}
- virtual const double sum(const double * v) = 0;
- virtual void sum2(const double * RESTRICT v1, const double * RESTRICT v2, double & RESTRICT s1, double & RESTRICT s2) = 0;
- virtual void addmult(double * RESTRICT v1, const double * RESTRICT v2, const double &mult) = 0;
- virtual void sum2a(const double * RESTRICT v1, const double * RESTRICT v2, const double * RESTRICT v3abs, double & RESTRICT s1, double & RESTRICT s2, double & RESTRICT s3abs) = 0;
+ virtual const double sum(const double * v) = 0;
+ virtual void sum2(const double * RESTRICT v1, const double * RESTRICT v2, double & RESTRICT s1, double & RESTRICT s2) = 0;
+ virtual void addmult(double * RESTRICT v1, const double * RESTRICT v2, const double &mult) = 0;
+ virtual void sum2a(const double * RESTRICT v1, const double * RESTRICT v2, const double * RESTRICT v3abs, double & RESTRICT s1, double & RESTRICT s2, double & RESTRICT s3abs) = 0;
- virtual const double sumabs(const double * v) = 0;
+ virtual const double sumabs(const double * v) = 0;
- static vector_ops_t *create_ops(const int size);
+ static vector_ops_t *create_ops(const int size);
protected:
- int m_dim;
+ int m_dim;
private:
@@ -80,115 +80,115 @@ class vector_ops_impl_t : public vector_ops_t
{
public:
- vector_ops_impl_t()
- : vector_ops_t(m_N)
- {
- }
-
- vector_ops_impl_t(int size)
- : vector_ops_t(size)
- {
- assert(m_N == 0);
- }
-
- virtual ~vector_ops_impl_t() {}
-
- ATTR_HOT inline const int N() const { if (m_N == 0) return m_dim; else return m_N; }
-
- const double sum(const double * v)
- {
- const double * RESTRICT vl = v;
- double tmp = 0.0;
- for (int i=0; i < N(); i++)
- tmp += vl[i];
- return tmp;
- }
-
- void sum2(const double * RESTRICT v1, const double * RESTRICT v2, double & RESTRICT s1, double & RESTRICT s2)
- {
- const double * RESTRICT v1l = v1;
- const double * RESTRICT v2l = v2;
- for (int i=0; i < N(); i++)
- {
- s1 += v1l[i];
- s2 += v2l[i];
- }
- }
-
- void addmult(double * RESTRICT v1, const double * RESTRICT v2, const double &mult)
- {
- double * RESTRICT v1l = v1;
- const double * RESTRICT v2l = v2;
- for (int i=0; i < N(); i++)
- {
- v1l[i] += v2l[i] * mult;
- }
- }
-
- void sum2a(const double * RESTRICT v1, const double * RESTRICT v2, const double * RESTRICT v3abs, double & RESTRICT s1, double & RESTRICT s2, double & RESTRICT s3abs)
- {
- const double * RESTRICT v1l = v1;
- const double * RESTRICT v2l = v2;
- const double * RESTRICT v3l = v3abs;
- for (int i=0; i < N(); i++)
- {
- s1 += v1l[i];
- s2 += v2l[i];
- s3abs += fabs(v3l[i]);
- }
- }
-
- const double sumabs(const double * v)
- {
- const double * RESTRICT vl = v;
- double tmp = 0.0;
- for (int i=0; i < N(); i++)
- tmp += fabs(vl[i]);
- return tmp;
- }
+ vector_ops_impl_t()
+ : vector_ops_t(m_N)
+ {
+ }
+
+ vector_ops_impl_t(int size)
+ : vector_ops_t(size)
+ {
+ assert(m_N == 0);
+ }
+
+ virtual ~vector_ops_impl_t() {}
+
+ ATTR_HOT inline const int N() const { if (m_N == 0) return m_dim; else return m_N; }
+
+ const double sum(const double * v)
+ {
+ const double * RESTRICT vl = v;
+ double tmp = 0.0;
+ for (int i=0; i < N(); i++)
+ tmp += vl[i];
+ return tmp;
+ }
+
+ void sum2(const double * RESTRICT v1, const double * RESTRICT v2, double & RESTRICT s1, double & RESTRICT s2)
+ {
+ const double * RESTRICT v1l = v1;
+ const double * RESTRICT v2l = v2;
+ for (int i=0; i < N(); i++)
+ {
+ s1 += v1l[i];
+ s2 += v2l[i];
+ }
+ }
+
+ void addmult(double * RESTRICT v1, const double * RESTRICT v2, const double &mult)
+ {
+ double * RESTRICT v1l = v1;
+ const double * RESTRICT v2l = v2;
+ for (int i=0; i < N(); i++)
+ {
+ v1l[i] += v2l[i] * mult;
+ }
+ }
+
+ void sum2a(const double * RESTRICT v1, const double * RESTRICT v2, const double * RESTRICT v3abs, double & RESTRICT s1, double & RESTRICT s2, double & RESTRICT s3abs)
+ {
+ const double * RESTRICT v1l = v1;
+ const double * RESTRICT v2l = v2;
+ const double * RESTRICT v3l = v3abs;
+ for (int i=0; i < N(); i++)
+ {
+ s1 += v1l[i];
+ s2 += v2l[i];
+ s3abs += fabs(v3l[i]);
+ }
+ }
+
+ const double sumabs(const double * v)
+ {
+ const double * RESTRICT vl = v;
+ double tmp = 0.0;
+ for (int i=0; i < N(); i++)
+ tmp += fabs(vl[i]);
+ return tmp;
+ }
private:
};
class ATTR_ALIGNED(64) terms_t
{
- NETLIST_PREVENT_COPYING(terms_t)
+ NETLIST_PREVENT_COPYING(terms_t)
- public:
- ATTR_COLD terms_t() : m_railstart(0), m_ops(NULL)
- {}
+ public:
+ ATTR_COLD terms_t() : m_railstart(0), m_ops(NULL)
+ {}
- ATTR_COLD void clear()
- {
- m_term.clear();
- m_net_other.clear();
- m_gt.clear();
- }
+ ATTR_COLD void clear()
+ {
+ m_term.clear();
+ m_net_other.clear();
+ m_gt.clear();
+ }
- ATTR_COLD void add(netlist_terminal_t *term, int net_other);
+ ATTR_COLD void add(netlist_terminal_t *term, int net_other);
- ATTR_HOT inline int count() { return m_term.count(); }
+ ATTR_HOT inline int count() { return m_term.count(); }
- ATTR_HOT inline netlist_terminal_t **terms() { return m_term; }
- ATTR_HOT inline int *net_other() { return m_net_other; }
- ATTR_HOT inline double *gt() { return m_gt; }
- ATTR_HOT inline double *go() { return m_go; }
- ATTR_HOT inline double *Idr() { return m_Idr; }
- ATTR_HOT inline double **other_curanalog() { return m_other_curanalog; }
- ATTR_HOT vector_ops_t *ops() { return m_ops; }
+ ATTR_HOT inline netlist_terminal_t **terms() { return m_term; }
+ ATTR_HOT inline int *net_other() { return m_net_other; }
+ ATTR_HOT inline double *gt() { return m_gt; }
+ ATTR_HOT inline double *go() { return m_go; }
+ ATTR_HOT inline double *Idr() { return m_Idr; }
+ ATTR_HOT inline double **other_curanalog() { return m_other_curanalog; }
+ ATTR_HOT vector_ops_t *ops() { return m_ops; }
- ATTR_COLD void set_pointers();
+ ATTR_COLD void set_pointers();
- int m_railstart;
+ int m_railstart;
private:
- plinearlist_t<netlist_terminal_t *> m_term;
- plinearlist_t<int> m_net_other;
- plinearlist_t<double> m_go;
- plinearlist_t<double> m_gt;
- plinearlist_t<double> m_Idr;
- plinearlist_t<double *> m_other_curanalog;
- vector_ops_t * m_ops;
+ plinearlist_t<netlist_terminal_t *> m_term;
+ plinearlist_t<int> m_net_other;
+ plinearlist_t<double> m_go;
+ plinearlist_t<double> m_gt;
+ plinearlist_t<double> m_Idr;
+ plinearlist_t<double *> m_other_curanalog;
+ vector_ops_t * m_ops;
};
class netlist_matrix_solver_t : public netlist_device_t
@@ -200,60 +200,60 @@ public:
ATTR_COLD netlist_matrix_solver_t(const netlist_solver_parameters_t &params);
ATTR_COLD virtual ~netlist_matrix_solver_t();
- ATTR_COLD virtual void vsetup(netlist_analog_net_t::list_t &nets) = 0;
+ ATTR_COLD virtual void vsetup(netlist_analog_net_t::list_t &nets) = 0;
- template<class C>
- void solve_base(C *p);
+ template<class C>
+ void solve_base(C *p);
ATTR_HOT double solve();
ATTR_HOT inline bool is_dynamic() { return m_dynamic_devices.count() > 0; }
ATTR_HOT inline bool is_timestep() { return m_step_devices.count() > 0; }
- ATTR_HOT void update_forced();
- ATTR_HOT inline void update_after(const netlist_time after)
- {
- m_Q_sync.net().reschedule_in_queue(after);
- }
+ ATTR_HOT void update_forced();
+ ATTR_HOT inline void update_after(const netlist_time after)
+ {
+ m_Q_sync.net().reschedule_in_queue(after);
+ }
/* netdevice functions */
ATTR_HOT virtual void update();
- ATTR_COLD virtual void start();
- ATTR_COLD virtual void reset();
+ ATTR_COLD virtual void start();
+ ATTR_COLD virtual void reset();
- ATTR_COLD int get_net_idx(netlist_net_t *net);
+ ATTR_COLD int get_net_idx(netlist_net_t *net);
ATTR_COLD virtual void log_stats() {};
protected:
- ATTR_COLD void setup(netlist_analog_net_t::list_t &nets);
- ATTR_HOT void update_dynamic();
+ ATTR_COLD void setup(netlist_analog_net_t::list_t &nets);
+ ATTR_HOT void update_dynamic();
- // should return next time step
- ATTR_HOT virtual double vsolve() = 0;
+ // should return next time step
+ ATTR_HOT virtual double vsolve() = 0;
- ATTR_COLD virtual void add_term(int net_idx, netlist_terminal_t *term) = 0;
+ ATTR_COLD virtual void add_term(int net_idx, netlist_terminal_t *term) = 0;
- plinearlist_t<netlist_analog_net_t *> m_nets;
- plinearlist_t<netlist_analog_output_t *> m_inps;
+ plinearlist_t<netlist_analog_net_t *> m_nets;
+ plinearlist_t<netlist_analog_output_t *> m_inps;
- int m_calculations;
- const netlist_solver_parameters_t &m_params;
+ int m_calculations;
+ const netlist_solver_parameters_t &m_params;
- ATTR_HOT inline const double current_timestep() { return m_cur_ts; }
+ ATTR_HOT inline const double current_timestep() { return m_cur_ts; }
private:
- netlist_time m_last_step;
- double m_cur_ts;
- dev_list_t m_step_devices;
- dev_list_t m_dynamic_devices;
+ netlist_time m_last_step;
+ double m_cur_ts;
+ dev_list_t m_step_devices;
+ dev_list_t m_dynamic_devices;
- netlist_ttl_input_t m_fb_sync;
- netlist_ttl_output_t m_Q_sync;
+ netlist_ttl_input_t m_fb_sync;
+ netlist_ttl_output_t m_Q_sync;
- ATTR_HOT void step(const netlist_time delta);
+ ATTR_HOT void step(const netlist_time delta);
- ATTR_HOT void update_inputs();
+ ATTR_HOT void update_inputs();
};
@@ -262,45 +262,45 @@ private:
class ATTR_ALIGNED(64) NETLIB_NAME(solver) : public netlist_device_t
{
public:
- NETLIB_NAME(solver)()
- : netlist_device_t() { }
+ NETLIB_NAME(solver)()
+ : netlist_device_t() { }
- ATTR_COLD virtual ~NETLIB_NAME(solver)();
+ ATTR_COLD virtual ~NETLIB_NAME(solver)();
- ATTR_COLD void post_start();
+ ATTR_COLD void post_start();
- ATTR_HOT inline double gmin() { return m_gmin.Value(); }
+ ATTR_HOT inline double gmin() { return m_gmin.Value(); }
protected:
- ATTR_HOT void update();
- ATTR_HOT void start();
- ATTR_HOT void reset();
- ATTR_HOT void update_param();
-
- netlist_ttl_input_t m_fb_step;
- netlist_ttl_output_t m_Q_step;
-
- netlist_param_double_t m_freq;
- netlist_param_double_t m_sync_delay;
- netlist_param_double_t m_accuracy;
- netlist_param_double_t m_gmin;
- netlist_param_double_t m_lte;
- netlist_param_double_t m_sor;
- netlist_param_logic_t m_dynamic;
- netlist_param_double_t m_min_timestep;
-
- netlist_param_int_t m_nr_loops;
- netlist_param_int_t m_gs_loops;
- netlist_param_int_t m_gs_threshold;
- netlist_param_int_t m_parallel;
-
- netlist_matrix_solver_t::list_t m_mat_solvers;
+ ATTR_HOT void update();
+ ATTR_HOT void start();
+ ATTR_HOT void reset();
+ ATTR_HOT void update_param();
+
+ netlist_ttl_input_t m_fb_step;
+ netlist_ttl_output_t m_Q_step;
+
+ netlist_param_double_t m_freq;
+ netlist_param_double_t m_sync_delay;
+ netlist_param_double_t m_accuracy;
+ netlist_param_double_t m_gmin;
+ netlist_param_double_t m_lte;
+ netlist_param_double_t m_sor;
+ netlist_param_logic_t m_dynamic;
+ netlist_param_double_t m_min_timestep;
+
+ netlist_param_int_t m_nr_loops;
+ netlist_param_int_t m_gs_loops;
+ netlist_param_int_t m_gs_threshold;
+ netlist_param_int_t m_parallel;
+
+ netlist_matrix_solver_t::list_t m_mat_solvers;
private:
- netlist_solver_parameters_t m_params;
+ netlist_solver_parameters_t m_params;
- template <int m_N, int _storage_N>
- netlist_matrix_solver_t *create_solver(int size, int gs_threshold, bool use_specific);
+ template <int m_N, int _storage_N>
+ netlist_matrix_solver_t *create_solver(int size, int gs_threshold, bool use_specific);
};
diff --git a/src/emu/netlist/analog/nld_twoterm.h b/src/emu/netlist/analog/nld_twoterm.h
index 49cdfefb1bf..1e5d35353e0 100644
--- a/src/emu/netlist/analog/nld_twoterm.h
+++ b/src/emu/netlist/analog/nld_twoterm.h
@@ -88,7 +88,7 @@ class NETLIB_NAME(twoterm) : public netlist_device_t
{
public:
ATTR_COLD NETLIB_NAME(twoterm)(const family_t afamily);
- ATTR_COLD NETLIB_NAME(twoterm)();
+ ATTR_COLD NETLIB_NAME(twoterm)();
netlist_terminal_t m_P;
netlist_terminal_t m_N;
@@ -99,21 +99,21 @@ public:
ATTR_HOT inline void set(const double G, const double V, const double I)
{
- /* GO, GT, I */
+ /* GO, GT, I */
m_P.set( G, G, ( V) * G - I);
m_N.set( G, G, ( -V) * G + I);
}
ATTR_HOT inline double deltaV() const
{
- return m_P.net().as_analog().Q_Analog() - m_N.net().as_analog().Q_Analog();
+ return m_P.net().as_analog().Q_Analog() - m_N.net().as_analog().Q_Analog();
}
ATTR_HOT void set_mat(double a11, double a12, double a21, double a22, double r1, double r2)
{
- /* GO, GT, I */
- m_P.set(-a12, a11, -r1);
- m_N.set(-a21, a22, -r2);
+ /* GO, GT, I */
+ m_P.set(-a12, a11, -r1);
+ m_N.set(-a21, a22, -r2);
}
protected:
@@ -135,7 +135,7 @@ public:
inline void set_R(const double R)
{
- set(1.0 / R, 0.0, 0.0);
+ set(1.0 / R, 0.0, 0.0);
}
protected:
diff --git a/src/emu/netlist/devices/nld_4020.h b/src/emu/netlist/devices/nld_4020.h
index 3215a33d415..3ecf7923a38 100644
--- a/src/emu/netlist/devices/nld_4020.h
+++ b/src/emu/netlist/devices/nld_4020.h
@@ -34,16 +34,16 @@
NET_REGISTER_DEV(4020, _name) \
NET_CONNECT(_name, IP, _IP) \
NET_CONNECT(_name, RESET, _RESET) \
- NET_CONNECT(_name, VDD, _VDD) \
- NET_CONNECT(_name, VSS, _VSS)
+ NET_CONNECT(_name, VDD, _VDD) \
+ NET_CONNECT(_name, VSS, _VSS)
#define CD_4020_DIP(_name) \
NET_REGISTER_DEV(4020_dip, _name)
NETLIB_SUBDEVICE(4020_sub,
- NETLIB_LOGIC_FAMILY(CD4000)
- ATTR_HOT void update_outputs(const UINT16 cnt);
+ NETLIB_LOGIC_FAMILY(CD4000)
+ ATTR_HOT void update_outputs(const UINT16 cnt);
netlist_ttl_input_t m_IP;
@@ -53,10 +53,10 @@ NETLIB_SUBDEVICE(4020_sub,
);
NETLIB_DEVICE(4020,
- NETLIB_LOGIC_FAMILY(CD4000)
+ NETLIB_LOGIC_FAMILY(CD4000)
NETLIB_NAME(4020_sub) sub;
- NETLIB_NAME(vdd_vss) m_supply;
- netlist_ttl_input_t m_RESET;
+ NETLIB_NAME(vdd_vss) m_supply;
+ netlist_ttl_input_t m_RESET;
);
NETLIB_DEVICE_DERIVED(4020_dip, 4020,
diff --git a/src/emu/netlist/devices/nld_4066.h b/src/emu/netlist/devices/nld_4066.h
index 93abf613b39..23e9afdd5b2 100644
--- a/src/emu/netlist/devices/nld_4066.h
+++ b/src/emu/netlist/devices/nld_4066.h
@@ -31,7 +31,7 @@
NET_REGISTER_DEV(4066_dip, _name)
NETLIB_SUBDEVICE(4066,
- NETLIB_LOGIC_FAMILY(CD4000)
+ NETLIB_LOGIC_FAMILY(CD4000)
public:
netlist_analog_input_t m_control;
@@ -41,7 +41,7 @@ public:
);
NETLIB_DEVICE(4066_dip,
- NETLIB_LOGIC_FAMILY(CD4000)
+ NETLIB_LOGIC_FAMILY(CD4000)
NETLIB_NAME(4066) m_A;
NETLIB_NAME(4066) m_B;
diff --git a/src/emu/netlist/devices/nld_74123.h b/src/emu/netlist/devices/nld_74123.h
index 80ed26ba832..25704e96211 100644
--- a/src/emu/netlist/devices/nld_74123.h
+++ b/src/emu/netlist/devices/nld_74123.h
@@ -39,16 +39,16 @@ public:
netlist_ttl_input_t m_B;
netlist_ttl_input_t m_CLRQ;
netlist_ttl_output_t m_Q;
- netlist_ttl_output_t m_QQ;
+ netlist_ttl_output_t m_QQ;
- netlist_analog_input_t m_CV;
+ netlist_analog_input_t m_CV;
- netlist_state_t<netlist_sig_t> m_last_trig;
- netlist_state_t<UINT8> m_state;
- netlist_state_t<double> m_KP;
+ netlist_state_t<netlist_sig_t> m_last_trig;
+ netlist_state_t<UINT8> m_state;
+ netlist_state_t<double> m_KP;
- netlist_param_double_t m_K;
- netlist_param_double_t m_RI;
+ netlist_param_double_t m_K;
+ netlist_param_double_t m_RI;
);
@@ -57,8 +57,8 @@ public:
NETLIB_DEVICE(74123_dip,
- NETLIB_NAME(74123) m_1;
- NETLIB_NAME(74123) m_2;
+ NETLIB_NAME(74123) m_1;
+ NETLIB_NAME(74123) m_2;
);
diff --git a/src/emu/netlist/devices/nld_7474.h b/src/emu/netlist/devices/nld_7474.h
index 1629026f43e..1c209d3a4e0 100644
--- a/src/emu/netlist/devices/nld_7474.h
+++ b/src/emu/netlist/devices/nld_7474.h
@@ -57,7 +57,7 @@
NETLIB_SUBDEVICE(7474sub,
netlist_ttl_input_t m_CLK;
- netlist_state_t<UINT8> m_nextD;
+ netlist_state_t<UINT8> m_nextD;
netlist_ttl_output_t m_Q;
netlist_ttl_output_t m_QQ;
diff --git a/src/emu/netlist/devices/nld_7490.h b/src/emu/netlist/devices/nld_7490.h
index 6029b9837cf..1a83dbaa711 100644
--- a/src/emu/netlist/devices/nld_7490.h
+++ b/src/emu/netlist/devices/nld_7490.h
@@ -81,8 +81,8 @@ NETLIB_DEVICE(7490,
netlist_ttl_input_t m_B;
netlist_state_t<UINT8> m_cnt;
- netlist_state_t<UINT8> m_last_A;
- netlist_state_t<UINT8> m_last_B;
+ netlist_state_t<UINT8> m_last_A;
+ netlist_state_t<UINT8> m_last_B;
netlist_ttl_output_t m_Q[4];
);
diff --git a/src/emu/netlist/devices/nld_74ls629.h b/src/emu/netlist/devices/nld_74ls629.h
index a3a7b8230e9..c32c0c283ad 100644
--- a/src/emu/netlist/devices/nld_74ls629.h
+++ b/src/emu/netlist/devices/nld_74ls629.h
@@ -41,7 +41,7 @@ NETLIB_SUBDEVICE(SN74LS629clk,
netlist_time m_inc;
netlist_state_t<netlist_sig_t> m_enableq;
- netlist_state_t<netlist_sig_t> m_out;
+ netlist_state_t<netlist_sig_t> m_out;
);
NETLIB_DEVICE_WITH_PARAMS(SN74LS629,
diff --git a/src/emu/netlist/devices/nld_cmos.h b/src/emu/netlist/devices/nld_cmos.h
index b78d9dd090c..4d450c2003e 100644
--- a/src/emu/netlist/devices/nld_cmos.h
+++ b/src/emu/netlist/devices/nld_cmos.h
@@ -11,22 +11,22 @@
class nld_vdd_vss : public netlist_device_t
{
- public:
- nld_vdd_vss ()
- : netlist_device_t()
- { }
+ public:
+ nld_vdd_vss ()
+ : netlist_device_t()
+ { }
- netlist_analog_input_t m_vdd;
- netlist_analog_input_t m_vss;
+ netlist_analog_input_t m_vdd;
+ netlist_analog_input_t m_vss;
- protected:
- ATTR_HOT void update() {};
- ATTR_HOT void start() {};
- ATTR_HOT void reset() {};
+ protected:
+ ATTR_HOT void update() {};
+ ATTR_HOT void start() {};
+ ATTR_HOT void reset() {};
public:
- ATTR_HOT inline double vdd() { return INPANALOG(m_vdd); }
- ATTR_HOT inline double vss() { return INPANALOG(m_vss); }
+ ATTR_HOT inline double vdd() { return INPANALOG(m_vdd); }
+ ATTR_HOT inline double vss() { return INPANALOG(m_vss); }
};
#endif /* NLD_CMOS_H_ */
diff --git a/src/emu/netlist/devices/nld_log.h b/src/emu/netlist/devices/nld_log.h
index b227a4e6e91..700e38d22ec 100644
--- a/src/emu/netlist/devices/nld_log.h
+++ b/src/emu/netlist/devices/nld_log.h
@@ -28,7 +28,7 @@ NETLIB_DEVICE(log,
~NETLIB_NAME(log)();
netlist_analog_input_t m_I;
protected:
- netlist_state_t<FILE *> m_file;
+ netlist_state_t<FILE *> m_file;
);
#define LOGD(_name, _I, _I2) \
diff --git a/src/emu/netlist/devices/nld_r2r_dac.h b/src/emu/netlist/devices/nld_r2r_dac.h
index 300ca8de81f..619fad90539 100644
--- a/src/emu/netlist/devices/nld_r2r_dac.h
+++ b/src/emu/netlist/devices/nld_r2r_dac.h
@@ -51,15 +51,15 @@
#define R2R_DAC(_name, _VIN, _R, _N) \
NET_REGISTER_DEV(r2r_dac, _name) \
- NETDEV_PARAMI(_name, VIN, _VIN) \
- NETDEV_PARAMI(_name, R, _R) \
- NETDEV_PARAMI(_name, N, _N)
+ NETDEV_PARAMI(_name, VIN, _VIN) \
+ NETDEV_PARAMI(_name, R, _R) \
+ NETDEV_PARAMI(_name, N, _N)
NETLIB_DEVICE_WITH_PARAMS_DERIVED(r2r_dac, twoterm,
- netlist_param_double_t m_VIN;
- netlist_param_double_t m_R;
- netlist_param_int_t m_num;
- netlist_param_int_t m_val;
+ netlist_param_double_t m_VIN;
+ netlist_param_double_t m_R;
+ netlist_param_int_t m_num;
+ netlist_param_int_t m_val;
);
diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h
index a57f6d64bfc..f1397e4365a 100644
--- a/src/emu/netlist/devices/nld_system.h
+++ b/src/emu/netlist/devices/nld_system.h
@@ -37,7 +37,7 @@
NET_REGISTER_DEV(gnd, GND)
#define DUMMY_INPUT(_name) \
- NET_REGISTER_DEV(dummy_input, _name)
+ NET_REGISTER_DEV(dummy_input, _name)
// -----------------------------------------------------------------------------
// mainclock
@@ -122,28 +122,28 @@ private:
class NETLIB_NAME(dummy_input) : public netlist_device_t
{
public:
- ATTR_COLD NETLIB_NAME(dummy_input)()
- : netlist_device_t(DUMMY) { }
+ ATTR_COLD NETLIB_NAME(dummy_input)()
+ : netlist_device_t(DUMMY) { }
- ATTR_COLD virtual ~NETLIB_NAME(dummy_input)() {}
+ ATTR_COLD virtual ~NETLIB_NAME(dummy_input)() {}
protected:
- ATTR_COLD void start()
- {
- register_input("I", m_I);
- }
+ ATTR_COLD void start()
+ {
+ register_input("I", m_I);
+ }
- ATTR_COLD void reset()
- {
- }
+ ATTR_COLD void reset()
+ {
+ }
- ATTR_HOT ATTR_ALIGN void update()
- {
- }
+ ATTR_HOT ATTR_ALIGN void update()
+ {
+ }
private:
- netlist_analog_input_t m_I;
+ netlist_analog_input_t m_I;
};
@@ -216,12 +216,12 @@ protected:
register_input("I", m_I);
}
- ATTR_COLD virtual const netlist_logic_family_desc_t *logic_family()
- {
- return m_logic_family;
- }
+ ATTR_COLD virtual const netlist_logic_family_desc_t *logic_family()
+ {
+ return m_logic_family;
+ }
- const netlist_logic_family_desc_t *m_logic_family;
+ const netlist_logic_family_desc_t *m_logic_family;
private:
};
@@ -266,8 +266,8 @@ class nld_d_to_a_proxy : public nld_base_d_to_a_proxy
{
public:
ATTR_COLD nld_d_to_a_proxy(netlist_output_t &out_proxied)
- : nld_base_d_to_a_proxy(out_proxied)
- , m_RV(TWOTERM)
+ : nld_base_d_to_a_proxy(out_proxied)
+ , m_RV(TWOTERM)
, m_last_state(-1)
{
}
diff --git a/src/emu/netlist/devices/nld_truthtable.h b/src/emu/netlist/devices/nld_truthtable.h
index f5904f0dfc2..2f9e5ed1dbe 100644
--- a/src/emu/netlist/devices/nld_truthtable.h
+++ b/src/emu/netlist/devices/nld_truthtable.h
@@ -11,15 +11,15 @@
#include "../nl_base.h"
#define NETLIB_TRUTHTABLE(_name, _nIN, _nOUT, _state) \
- class NETLIB_NAME(_name) : public nld_truthtable_t<_nIN, _nOUT, _state> \
- { \
- public: \
- NETLIB_NAME(_name)() \
- : nld_truthtable_t<_nIN, _nOUT, _state>(&m_ttbl, m_desc) { } \
- private: \
- static truthtable_t m_ttbl; \
- static const char *m_desc[]; \
- }
+ class NETLIB_NAME(_name) : public nld_truthtable_t<_nIN, _nOUT, _state> \
+ { \
+ public: \
+ NETLIB_NAME(_name)() \
+ : nld_truthtable_t<_nIN, _nOUT, _state>(&m_ttbl, m_desc) { } \
+ private: \
+ static truthtable_t m_ttbl; \
+ static const char *m_desc[]; \
+ }
template<int m_NI, int m_NO, int has_state>
@@ -27,215 +27,215 @@ class nld_truthtable_t : public netlist_device_t
{
public:
- static const int m_num_bits = m_NI + has_state * (m_NI + m_NO);
- static const int m_size = (1 << (m_num_bits));
-
- struct truthtable_t
- {
- truthtable_t() : m_initialized(false) {}
- UINT32 m_outs[m_size];
- UINT8 m_timing[m_size][m_NO];
- netlist_time m_timing_nt[16];
- bool m_initialized;
- };
-
- nld_truthtable_t(truthtable_t *ttbl, const char *desc[])
- : netlist_device_t(), m_last_state(0), m_active(1), m_ttp(ttbl), m_desc(desc)
- {
- }
-
- ATTR_COLD virtual void start()
- {
- pstring ttline = pstring(m_desc[0]);
- {
- nl_util::pstring_list io = nl_util::split(ttline,"|");
- // checks
- assert(io.count() == 2);
- nl_util::pstring_list inout = nl_util::split(io[0], ",");
- assert(inout.count() == m_num_bits);
- nl_util::pstring_list out = nl_util::split(io[1], ",");
- assert(out.count() == m_NO);
-
- for (int i=0; i < m_NI; i++)
- {
- register_input(inout[i], m_i[i]);
- }
- for (int i=0; i < m_NO; i++)
- {
- register_output(out[i], m_Q[i]);
- }
- }
- setup_tt();
- // FIXME: save state
- }
-
- ATTR_COLD void help(int cur, nl_util::pstring_list list,
- UINT64 state, UINT64 ignore, UINT16 val, UINT8 timing_index[m_NO])
- {
- pstring elem = list[cur];
- int start = 0;
- int end = 0;
- int ign = 0;
-
- if (elem.equals("0"))
- {
- start = 0;
- end = 0;
- }
- else if (elem.equals("1"))
- {
- start = 1;
- end = 1;
- }
- else if (elem.equals("X"))
- {
- start = 0;
- end = 1;
- ign = 1;
- }
- for (int i = start; i <= end; i++)
- {
- const UINT64 nstate = state | (i << cur);
- const UINT64 nignore = ignore | (ign << cur);
-
- if (cur < m_num_bits - 1)
- {
- help(cur + 1, list, nstate, nignore, val, timing_index);
- }
- else
- {
- // cutoff previous inputs and outputs for ignore
- m_ttp->m_outs[nstate] = val | ((nignore & ((1 << m_NI)-1)) << m_NO);
- for (int j=0; j<m_NO; j++)
- m_ttp->m_timing[nstate][j] = timing_index[j];
- }
- }
- }
-
- ATTR_COLD void setup_tt()
- {
- if (m_ttp->m_initialized)
- return;
-
- const char **truthtable = m_desc;
- pstring ttline = pstring(truthtable[0]);
- truthtable++;
- ttline = pstring(truthtable[0]);
- truthtable++;
-
- for (int j=0; j < m_size; j++)
- m_ttp->m_outs[j] = -1;
-
- for (int j=0; j < 16; j++)
- m_ttp->m_timing_nt[j] = netlist_time::zero;
-
- while (!ttline.equals(""))
- {
- nl_util::pstring_list io = nl_util::split(ttline,"|");
- // checks
- assert(io.count() == 3);
- nl_util::pstring_list inout = nl_util::split(io[0], ",");
- assert(inout.count() == m_num_bits);
- nl_util::pstring_list out = nl_util::split(io[1], ",");
- assert(out.count() == m_NO);
- nl_util::pstring_list times = nl_util::split(io[2], ",");
- assert(times.count() == m_NO);
-
- UINT16 val = 0;
- UINT8 tindex[m_NO];
- for (int j=0; j<m_NO; j++)
- {
- if (out[j].equals("1"))
- val = val | (1 << j);
- netlist_time t = netlist_time::from_nsec(times[j].as_long());
- int k=0;
- while (m_ttp->m_timing_nt[k] != netlist_time::zero && m_ttp->m_timing_nt[k] != t)
- k++;
- m_ttp->m_timing_nt[k] = t;
- tindex[j] = k;
- }
-
- help(0, inout, 0 , 0 , val, tindex);
- ttline = pstring(truthtable[0]);
- truthtable++;
- }
- for (int j=0; j < m_size; j++)
- printf("%05x %04x %04x %04x\n", j, m_ttp->m_outs[j] & ((1 << m_NO)-1),
- m_ttp->m_outs[j] >> m_NO, m_ttp->m_timing[j][0]);
- for (int k=0; m_ttp->m_timing_nt[k] != netlist_time::zero; k++)
- printf("%d %f\n", k, m_ttp->m_timing_nt[k].as_double() * 1000000.0);
-
- m_ttp->m_initialized = true;
-
- }
-
- ATTR_COLD void reset()
- {
- //m_Q.initial(1);
- m_active = 1;
- m_last_state = 0;
- }
-
- ATTR_HOT ATTR_ALIGN void update()
- {
- //const netlist_time times[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22)};
-
- // FIXME: this check is needed because update is called during startup as well
- if (UNEXPECTED(USE_DEACTIVE_DEVICE && m_active == 0))
- return;
-
- UINT32 state = 0;
- for (int i=0; i< m_NI; i++)
- {
- m_i[i].activate();
- state = state | (INPLOGIC(m_i[i]) << i);
- }
-
- const UINT32 nstate = (has_state ? state | (m_last_state << m_NI) : state);
- const UINT32 out = m_ttp->m_outs[nstate] & ((1 << m_NO) - 1);
- const UINT32 ign = m_ttp->m_outs[nstate] >> m_NO;
- if (has_state) m_last_state = (state << m_NO) | out;
-
- for (int i=0; i< m_NI; i++)
- if (ign & (1 << i))
- m_i[i].inactivate();
-
- for (int i=0; i<m_NO; i++)
+ static const int m_num_bits = m_NI + has_state * (m_NI + m_NO);
+ static const int m_size = (1 << (m_num_bits));
+
+ struct truthtable_t
+ {
+ truthtable_t() : m_initialized(false) {}
+ UINT32 m_outs[m_size];
+ UINT8 m_timing[m_size][m_NO];
+ netlist_time m_timing_nt[16];
+ bool m_initialized;
+ };
+
+ nld_truthtable_t(truthtable_t *ttbl, const char *desc[])
+ : netlist_device_t(), m_last_state(0), m_active(1), m_ttp(ttbl), m_desc(desc)
+ {
+ }
+
+ ATTR_COLD virtual void start()
+ {
+ pstring ttline = pstring(m_desc[0]);
+ {
+ nl_util::pstring_list io = nl_util::split(ttline,"|");
+ // checks
+ assert(io.count() == 2);
+ nl_util::pstring_list inout = nl_util::split(io[0], ",");
+ assert(inout.count() == m_num_bits);
+ nl_util::pstring_list out = nl_util::split(io[1], ",");
+ assert(out.count() == m_NO);
+
+ for (int i=0; i < m_NI; i++)
+ {
+ register_input(inout[i], m_i[i]);
+ }
+ for (int i=0; i < m_NO; i++)
+ {
+ register_output(out[i], m_Q[i]);
+ }
+ }
+ setup_tt();
+ // FIXME: save state
+ }
+
+ ATTR_COLD void help(int cur, nl_util::pstring_list list,
+ UINT64 state, UINT64 ignore, UINT16 val, UINT8 timing_index[m_NO])
+ {
+ pstring elem = list[cur];
+ int start = 0;
+ int end = 0;
+ int ign = 0;
+
+ if (elem.equals("0"))
+ {
+ start = 0;
+ end = 0;
+ }
+ else if (elem.equals("1"))
+ {
+ start = 1;
+ end = 1;
+ }
+ else if (elem.equals("X"))
+ {
+ start = 0;
+ end = 1;
+ ign = 1;
+ }
+ for (int i = start; i <= end; i++)
+ {
+ const UINT64 nstate = state | (i << cur);
+ const UINT64 nignore = ignore | (ign << cur);
+
+ if (cur < m_num_bits - 1)
+ {
+ help(cur + 1, list, nstate, nignore, val, timing_index);
+ }
+ else
+ {
+ // cutoff previous inputs and outputs for ignore
+ m_ttp->m_outs[nstate] = val | ((nignore & ((1 << m_NI)-1)) << m_NO);
+ for (int j=0; j<m_NO; j++)
+ m_ttp->m_timing[nstate][j] = timing_index[j];
+ }
+ }
+ }
+
+ ATTR_COLD void setup_tt()
+ {
+ if (m_ttp->m_initialized)
+ return;
+
+ const char **truthtable = m_desc;
+ pstring ttline = pstring(truthtable[0]);
+ truthtable++;
+ ttline = pstring(truthtable[0]);
+ truthtable++;
+
+ for (int j=0; j < m_size; j++)
+ m_ttp->m_outs[j] = -1;
+
+ for (int j=0; j < 16; j++)
+ m_ttp->m_timing_nt[j] = netlist_time::zero;
+
+ while (!ttline.equals(""))
+ {
+ nl_util::pstring_list io = nl_util::split(ttline,"|");
+ // checks
+ assert(io.count() == 3);
+ nl_util::pstring_list inout = nl_util::split(io[0], ",");
+ assert(inout.count() == m_num_bits);
+ nl_util::pstring_list out = nl_util::split(io[1], ",");
+ assert(out.count() == m_NO);
+ nl_util::pstring_list times = nl_util::split(io[2], ",");
+ assert(times.count() == m_NO);
+
+ UINT16 val = 0;
+ UINT8 tindex[m_NO];
+ for (int j=0; j<m_NO; j++)
+ {
+ if (out[j].equals("1"))
+ val = val | (1 << j);
+ netlist_time t = netlist_time::from_nsec(times[j].as_long());
+ int k=0;
+ while (m_ttp->m_timing_nt[k] != netlist_time::zero && m_ttp->m_timing_nt[k] != t)
+ k++;
+ m_ttp->m_timing_nt[k] = t;
+ tindex[j] = k;
+ }
+
+ help(0, inout, 0 , 0 , val, tindex);
+ ttline = pstring(truthtable[0]);
+ truthtable++;
+ }
+ for (int j=0; j < m_size; j++)
+ printf("%05x %04x %04x %04x\n", j, m_ttp->m_outs[j] & ((1 << m_NO)-1),
+ m_ttp->m_outs[j] >> m_NO, m_ttp->m_timing[j][0]);
+ for (int k=0; m_ttp->m_timing_nt[k] != netlist_time::zero; k++)
+ printf("%d %f\n", k, m_ttp->m_timing_nt[k].as_double() * 1000000.0);
+
+ m_ttp->m_initialized = true;
+
+ }
+
+ ATTR_COLD void reset()
+ {
+ //m_Q.initial(1);
+ m_active = 1;
+ m_last_state = 0;
+ }
+
+ ATTR_HOT ATTR_ALIGN void update()
+ {
+ //const netlist_time times[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22)};
+
+ // FIXME: this check is needed because update is called during startup as well
+ if (UNEXPECTED(USE_DEACTIVE_DEVICE && m_active == 0))
+ return;
+
+ UINT32 state = 0;
+ for (int i=0; i< m_NI; i++)
+ {
+ m_i[i].activate();
+ state = state | (INPLOGIC(m_i[i]) << i);
+ }
+
+ const UINT32 nstate = (has_state ? state | (m_last_state << m_NI) : state);
+ const UINT32 out = m_ttp->m_outs[nstate] & ((1 << m_NO) - 1);
+ const UINT32 ign = m_ttp->m_outs[nstate] >> m_NO;
+ if (has_state) m_last_state = (state << m_NO) | out;
+
+ for (int i=0; i< m_NI; i++)
+ if (ign & (1 << i))
+ m_i[i].inactivate();
+
+ for (int i=0; i<m_NO; i++)
// OUTLOGIC(m_Q[i], (out >> i) & 1, times[(out >> i) & 1]);// ? 22000 : 15000);
- OUTLOGIC(m_Q[i], (out >> i) & 1, m_ttp->m_timing_nt[m_ttp->m_timing[nstate][i]]);// ? 22000 : 15000);
+ OUTLOGIC(m_Q[i], (out >> i) & 1, m_ttp->m_timing_nt[m_ttp->m_timing[nstate][i]]);// ? 22000 : 15000);
- }
+ }
#if (USE_DEACTIVE_DEVICE)
- ATTR_HOT void inc_active()
- {
- if (++m_active == 1)
- {
- update();
- }
- }
-
- ATTR_HOT void dec_active()
- {
- if (--m_active == 0)
- {
- for (int i = 0; i< m_NI; i++)
- m_i[i].inactivate();
- }
- }
+ ATTR_HOT void inc_active()
+ {
+ if (++m_active == 1)
+ {
+ update();
+ }
+ }
+
+ ATTR_HOT void dec_active()
+ {
+ if (--m_active == 0)
+ {
+ for (int i = 0; i< m_NI; i++)
+ m_i[i].inactivate();
+ }
+ }
#endif
- netlist_ttl_input_t m_i[m_NI];
- netlist_ttl_output_t m_Q[m_NO];
+ netlist_ttl_input_t m_i[m_NI];
+ netlist_ttl_output_t m_Q[m_NO];
private:
- UINT32 m_last_state;
- INT32 m_active;
+ UINT32 m_last_state;
+ INT32 m_active;
- truthtable_t *m_ttp;
- const char **m_desc;
+ truthtable_t *m_ttp;
+ const char **m_desc;
};
#endif /* NLD_TRUTHTABLE_H_ */
diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h
index a9b8e2ef694..1a94734ed93 100644
--- a/src/emu/netlist/nl_base.h
+++ b/src/emu/netlist/nl_base.h
@@ -244,7 +244,7 @@ typedef void (*net_update_delegate)(netlist_core_device_t *);
#define NETLIB_LOGIC_FAMILY(_fam) \
ATTR_COLD virtual const netlist_logic_family_desc_t *logic_family() \
{ \
- return &netlist_family_ ## _fam; \
+ return &netlist_family_ ## _fam; \
}
@@ -298,14 +298,14 @@ extern netlist_logic_family_desc_t netlist_family_CD4000;
template< typename X>
class netlist_state_t {
public:
- inline netlist_state_t() : m_x(static_cast<X>(0)) {}
- inline netlist_state_t(const X& x_) : m_x(x_) {}
- inline const X& get() const { return m_x; }
- inline X& ref() { return m_x; }
- inline operator const X&() const { return m_x; }
- inline operator X&() { return m_x; }
+ inline netlist_state_t() : m_x(static_cast<X>(0)) {}
+ inline netlist_state_t(const X& x_) : m_x(x_) {}
+ inline const X& get() const { return m_x; }
+ inline X& ref() { return m_x; }
+ inline operator const X&() const { return m_x; }
+ inline operator X&() { return m_x; }
private:
- X m_x;
+ X m_x;
};
// -----------------------------------------------------------------------------
@@ -324,7 +324,7 @@ public:
NET = 4,
DEVICE = 5,
NETLIST = 6,
- QUEUE = 7,
+ QUEUE = 7,
};
enum family_t {
// Terminal families
@@ -336,12 +336,12 @@ public:
RESISTOR, // Resistor
CAPACITOR, // Capacitor
DIODE, // Diode
- DUMMY, // DUMMY device without function
- BJT_EB, // BJT(Ebers-Moll)
+ DUMMY, // DUMMY device without function
+ BJT_EB, // BJT(Ebers-Moll)
BJT_SWITCH, // BJT(Switch)
VCVS, // Voltage controlled voltage source
VCCS, // Voltage controlled current source
- CCCS, // Current controlled current source
+ CCCS, // Current controlled current source
GND, // GND device
};
@@ -356,9 +356,9 @@ public:
PSTATE_INTERFACE_DECL()
template<typename C> ATTR_COLD void save(netlist_state_t<C> &state,
- const pstring &stname)
+ const pstring &stname)
{
- save(state.ref(), stname);
+ save(state.ref(), stname);
}
ATTR_HOT inline const type_t type() const { return m_objtype; }
@@ -469,7 +469,7 @@ class ATTR_ALIGN netlist_terminal_t : public netlist_core_terminal_t
NETLIST_PREVENT_COPYING(netlist_terminal_t)
public:
- typedef plinearlist_t<netlist_terminal_t * RESTRICT> list_t;
+ typedef plinearlist_t<netlist_terminal_t * RESTRICT> list_t;
ATTR_COLD netlist_terminal_t();
@@ -479,27 +479,27 @@ public:
ATTR_HOT inline void set(const double G)
{
- set_ptr(m_Idr1, 0);
+ set_ptr(m_Idr1, 0);
set_ptr(m_go1, G);
set_ptr(m_gt1, G);
}
ATTR_HOT inline void set(const double GO, const double GT)
{
- set_ptr(m_Idr1, 0);
+ set_ptr(m_Idr1, 0);
set_ptr(m_go1, GO);
set_ptr(m_gt1, GT);
}
ATTR_HOT inline void set(const double GO, const double GT, const double I)
{
- set_ptr(m_Idr1, I);
+ set_ptr(m_Idr1, I);
set_ptr(m_go1, GO);
set_ptr(m_gt1, GT);
}
- ATTR_HOT void schedule_solve();
- ATTR_HOT void schedule_after(const netlist_time &after);
+ ATTR_HOT void schedule_solve();
+ ATTR_HOT void schedule_after(const netlist_time &after);
netlist_terminal_t *m_otherterm;
@@ -508,11 +508,11 @@ protected:
ATTR_COLD virtual void reset();
private:
- inline void set_ptr(double *ptr, const double val)
- {
- if (ptr != NULL)
- *ptr = val;
- }
+ inline void set_ptr(double *ptr, const double val)
+ {
+ if (ptr != NULL)
+ *ptr = val;
+ }
};
@@ -531,8 +531,8 @@ public:
set_state(STATE_INP_ACTIVE);
}
- ATTR_HOT inline void inactivate();
- ATTR_HOT inline void activate();
+ ATTR_HOT inline void inactivate();
+ ATTR_HOT inline void activate();
protected:
ATTR_COLD virtual void reset()
@@ -559,8 +559,8 @@ public:
ATTR_HOT inline const netlist_sig_t Q() const;
ATTR_HOT inline const netlist_sig_t last_Q() const;
- ATTR_HOT inline void activate_hl();
- ATTR_HOT inline void activate_lh();
+ ATTR_HOT inline void activate_hl();
+ ATTR_HOT inline void activate_lh();
};
@@ -610,11 +610,11 @@ public:
ATTR_COLD void merge_net(netlist_net_t *othernet);
ATTR_COLD void register_railterminal(netlist_output_t &mr);
- ATTR_HOT inline netlist_logic_net_t & RESTRICT as_logic();
- ATTR_HOT inline const netlist_logic_net_t & RESTRICT as_logic() const;
+ ATTR_HOT inline netlist_logic_net_t & RESTRICT as_logic();
+ ATTR_HOT inline const netlist_logic_net_t & RESTRICT as_logic() const;
- ATTR_HOT inline netlist_analog_net_t & RESTRICT as_analog();
- ATTR_HOT inline const netlist_analog_net_t & RESTRICT as_analog() const;
+ ATTR_HOT inline netlist_analog_net_t & RESTRICT as_analog();
+ ATTR_HOT inline const netlist_analog_net_t & RESTRICT as_analog() const;
ATTR_HOT void update_devs();
@@ -625,98 +625,98 @@ public:
ATTR_HOT inline const netlist_core_terminal_t & RESTRICT railterminal() const { return *m_railterminal; }
ATTR_HOT inline void push_to_queue(const netlist_time delay);
- ATTR_HOT inline void reschedule_in_queue(const netlist_time delay);
+ ATTR_HOT inline void reschedule_in_queue(const netlist_time delay);
ATTR_HOT bool inline is_queued() const { return m_in_queue == 1; }
ATTR_HOT inline int num_cons() const { return m_core_terms.count(); }
- ATTR_HOT void inc_active(netlist_core_terminal_t &term);
- ATTR_HOT void dec_active(netlist_core_terminal_t &term);
+ ATTR_HOT void inc_active(netlist_core_terminal_t &term);
+ ATTR_HOT void dec_active(netlist_core_terminal_t &term);
- ATTR_COLD void rebuild_list(); /* rebuild m_list after a load */
+ ATTR_COLD void rebuild_list(); /* rebuild m_list after a load */
- ATTR_COLD void move_connections(netlist_net_t *new_net);
+ ATTR_COLD void move_connections(netlist_net_t *new_net);
- plinearlist_t<netlist_core_terminal_t *> m_core_terms; // save post-start m_list ...
+ plinearlist_t<netlist_core_terminal_t *> m_core_terms; // save post-start m_list ...
protected: //FIXME: needed by current solver code
ATTR_COLD virtual void save_register();
ATTR_COLD virtual void reset();
- netlist_sig_t m_new_Q;
- netlist_sig_t m_cur_Q;
+ netlist_sig_t m_new_Q;
+ netlist_sig_t m_cur_Q;
private:
- netlist_core_terminal_t * RESTRICT m_railterminal;
- plinkedlist_t<netlist_core_terminal_t> m_list_active;
+ netlist_core_terminal_t * RESTRICT m_railterminal;
+ plinkedlist_t<netlist_core_terminal_t> m_list_active;
- netlist_time m_time;
- INT32 m_active;
- UINT8 m_in_queue; /* 0: not in queue, 1: in queue, 2: last was taken */
+ netlist_time m_time;
+ INT32 m_active;
+ UINT8 m_in_queue; /* 0: not in queue, 1: in queue, 2: last was taken */
public:
- // We have to have those on one object. Dividing those does lead
- // to a significant performance hit
- // FIXME: Have to fix the public at some time
- double m_cur_Analog;
+ // We have to have those on one object. Dividing those does lead
+ // to a significant performance hit
+ // FIXME: Have to fix the public at some time
+ double m_cur_Analog;
};
class netlist_logic_net_t : public netlist_net_t
{
- NETLIST_PREVENT_COPYING(netlist_logic_net_t)
+ NETLIST_PREVENT_COPYING(netlist_logic_net_t)
public:
- typedef plinearlist_t<netlist_logic_net_t *> list_t;
-
- ATTR_COLD netlist_logic_net_t();
- ATTR_COLD virtual ~netlist_logic_net_t() { };
-
- ATTR_HOT inline const netlist_sig_t Q() const
- {
- return m_cur_Q;
- }
-
- ATTR_HOT inline const netlist_sig_t new_Q() const
- {
- return m_new_Q;
- }
-
- ATTR_HOT inline void set_Q(const netlist_sig_t newQ, const netlist_time delay)
- {
- if (EXPECTED(newQ != m_new_Q))
- {
- m_new_Q = newQ;
- push_to_queue(delay);
- }
- }
-
- ATTR_HOT inline void toggle_new_Q()
- {
- m_new_Q ^= 1;
- }
-
- ATTR_COLD void initial(const netlist_sig_t val)
- {
- m_cur_Q = val;
- m_new_Q = val;
- }
-
- /* internal state support
- * FIXME: get rid of this and implement export/import in MAME
- */
- ATTR_COLD inline netlist_sig_t &Q_state_ptr()
- {
- assert(family() == LOGIC);
- return m_cur_Q;
- }
+ typedef plinearlist_t<netlist_logic_net_t *> list_t;
+
+ ATTR_COLD netlist_logic_net_t();
+ ATTR_COLD virtual ~netlist_logic_net_t() { };
+
+ ATTR_HOT inline const netlist_sig_t Q() const
+ {
+ return m_cur_Q;
+ }
+
+ ATTR_HOT inline const netlist_sig_t new_Q() const
+ {
+ return m_new_Q;
+ }
+
+ ATTR_HOT inline void set_Q(const netlist_sig_t newQ, const netlist_time delay)
+ {
+ if (EXPECTED(newQ != m_new_Q))
+ {
+ m_new_Q = newQ;
+ push_to_queue(delay);
+ }
+ }
+
+ ATTR_HOT inline void toggle_new_Q()
+ {
+ m_new_Q ^= 1;
+ }
+
+ ATTR_COLD void initial(const netlist_sig_t val)
+ {
+ m_cur_Q = val;
+ m_new_Q = val;
+ }
+
+ /* internal state support
+ * FIXME: get rid of this and implement export/import in MAME
+ */
+ ATTR_COLD inline netlist_sig_t &Q_state_ptr()
+ {
+ assert(family() == LOGIC);
+ return m_cur_Q;
+ }
protected: //FIXME: needed by current solver code
- ATTR_COLD virtual void save_register();
- ATTR_COLD virtual void reset();
+ ATTR_COLD virtual void save_register();
+ ATTR_COLD virtual void reset();
private:
@@ -727,47 +727,47 @@ public:
class netlist_analog_net_t : public netlist_net_t
{
- NETLIST_PREVENT_COPYING(netlist_analog_net_t)
+ NETLIST_PREVENT_COPYING(netlist_analog_net_t)
public:
- typedef plinearlist_t<netlist_analog_net_t *> list_t;
+ typedef plinearlist_t<netlist_analog_net_t *> list_t;
- ATTR_COLD netlist_analog_net_t();
- ATTR_COLD virtual ~netlist_analog_net_t() { };
+ ATTR_COLD netlist_analog_net_t();
+ ATTR_COLD virtual ~netlist_analog_net_t() { };
- ATTR_HOT inline const double Q_Analog() const
- {
- //assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG);
- assert(family() == ANALOG);
- return m_cur_Analog;
- }
+ ATTR_HOT inline const double Q_Analog() const
+ {
+ //assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG);
+ assert(family() == ANALOG);
+ return m_cur_Analog;
+ }
- ATTR_COLD inline double &Q_Analog_state_ptr()
- {
- //assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG);
- assert(family() == ANALOG);
- return m_cur_Analog;
- }
+ ATTR_COLD inline double &Q_Analog_state_ptr()
+ {
+ //assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG);
+ assert(family() == ANALOG);
+ return m_cur_Analog;
+ }
- ATTR_HOT inline netlist_matrix_solver_t *solver() { return m_solver; }
+ ATTR_HOT inline netlist_matrix_solver_t *solver() { return m_solver; }
- ATTR_COLD bool already_processed(list_t *groups, int cur_group);
- ATTR_COLD void process_net(list_t *groups, int &cur_group);
+ ATTR_COLD bool already_processed(list_t *groups, int cur_group);
+ ATTR_COLD void process_net(list_t *groups, int &cur_group);
protected:
- ATTR_COLD virtual void save_register();
- ATTR_COLD virtual void reset();
+ ATTR_COLD virtual void save_register();
+ ATTR_COLD virtual void reset();
private:
public:
- double m_DD_n_m_1;
- double m_h_n_m_1;
+ double m_DD_n_m_1;
+ double m_h_n_m_1;
- //FIXME: needed by current solver code
- netlist_matrix_solver_t *m_solver;
+ //FIXME: needed by current solver code
+ netlist_matrix_solver_t *m_solver;
};
// -----------------------------------------------------------------------------
@@ -811,7 +811,7 @@ public:
}
private:
- netlist_logic_net_t m_my_net;
+ netlist_logic_net_t m_my_net;
nld_base_d_to_a_proxy *m_proxy;
};
@@ -834,10 +834,10 @@ public:
ATTR_HOT inline void set_Q(const double newQ);
- netlist_analog_net_t *m_proxied_net; // only for proxy nets in analog input logic
+ netlist_analog_net_t *m_proxied_net; // only for proxy nets in analog input logic
private:
- netlist_analog_net_t m_my_net;
+ netlist_analog_net_t m_my_net;
};
// -----------------------------------------------------------------------------
@@ -1030,7 +1030,7 @@ protected:
ATTR_COLD virtual void start() { }
ATTR_COLD virtual const netlist_logic_family_desc_t *logic_family()
{
- return &netlist_family_TTL;
+ return &netlist_family_TTL;
}
private:
@@ -1079,15 +1079,15 @@ private:
// -----------------------------------------------------------------------------
class netlist_queue_t : public netlist_timed_queue<netlist_net_t *, netlist_time, 512>,
- public netlist_object_t,
+ public netlist_object_t,
public pstate_callback_t
{
public:
- netlist_queue_t(netlist_base_t &nl);
+ netlist_queue_t(netlist_base_t &nl);
protected:
- void reset() {}
+ void reset() {}
void register_state(pstate_manager_t &manager, const pstring &module);
void on_pre_save();
@@ -1126,10 +1126,10 @@ public:
m_queue.push(netlist_queue_t::entry_t(attime, out));
}
- ATTR_HOT inline void remove_from_queue(netlist_net_t *out)
- {
- m_queue.remove(out);
- }
+ ATTR_HOT inline void remove_from_queue(netlist_net_t *out)
+ {
+ m_queue.remove(out);
+ }
ATTR_HOT void process_queue(const netlist_time delta);
ATTR_HOT inline void abort_current_queue_slice() { m_stop = netlist_time::zero; }
@@ -1161,10 +1161,10 @@ public:
template<class _C>
_C *get_first_device()
{
- //FIXME:
- for (netlist_device_t * const *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
- {
- _C *dev = dynamic_cast<_C *>(*entry);
+ //FIXME:
+ for (netlist_device_t * const *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
+ {
+ _C *dev = dynamic_cast<_C *>(*entry);
if (dev != NULL)
return dev;
}
@@ -1175,9 +1175,9 @@ public:
_C *get_single_device(const char *classname)
{
_C *ret = NULL;
- for (netlist_device_t * const *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
- {
- _C *dev = dynamic_cast<_C *>(*entry);
+ for (netlist_device_t * const *entry = m_devices.first(); entry != NULL; entry = m_devices.next(entry))
+ {
+ _C *dev = dynamic_cast<_C *>(*entry);
if (dev != NULL)
{
if (ret != NULL)
@@ -1261,26 +1261,26 @@ ATTR_HOT inline void netlist_param_double_t::setTo(const double param)
ATTR_HOT inline netlist_logic_net_t & RESTRICT netlist_net_t::as_logic()
{
- assert(family() == LOGIC);
- return static_cast<netlist_logic_net_t &>(*this);
+ assert(family() == LOGIC);
+ return static_cast<netlist_logic_net_t &>(*this);
}
ATTR_HOT inline const netlist_logic_net_t & RESTRICT netlist_net_t::as_logic() const
{
- assert(family() == LOGIC);
- return static_cast<const netlist_logic_net_t &>(*this);
+ assert(family() == LOGIC);
+ return static_cast<const netlist_logic_net_t &>(*this);
}
ATTR_HOT inline netlist_analog_net_t & RESTRICT netlist_net_t::as_analog()
{
- assert(family() == ANALOG);
- return static_cast<netlist_analog_net_t &>(*this);
+ assert(family() == ANALOG);
+ return static_cast<netlist_analog_net_t &>(*this);
}
ATTR_HOT inline const netlist_analog_net_t & RESTRICT netlist_net_t::as_analog() const
{
- assert(family() == ANALOG);
- return static_cast<const netlist_analog_net_t &>(*this);
+ assert(family() == ANALOG);
+ return static_cast<const netlist_analog_net_t &>(*this);
}
@@ -1337,16 +1337,16 @@ ATTR_HOT inline void netlist_net_t::push_to_queue(const netlist_time delay)
ATTR_HOT inline void netlist_net_t::reschedule_in_queue(const netlist_time delay)
{
- //if (UNEXPECTED(m_num_cons == 0 || is_queued()))
- if (is_queued())
- netlist().remove_from_queue(this);
-
- m_time = netlist().time() + delay;
- m_in_queue = (m_active > 0); /* queued ? */
- if (EXPECTED(m_in_queue))
- {
- netlist().push_to_queue(this, m_time);
- }
+ //if (UNEXPECTED(m_num_cons == 0 || is_queued()))
+ if (is_queued())
+ netlist().remove_from_queue(this);
+
+ m_time = netlist().time() + delay;
+ m_in_queue = (m_active > 0); /* queued ? */
+ if (EXPECTED(m_in_queue))
+ {
+ netlist().push_to_queue(this, m_time);
+ }
}
@@ -1362,11 +1362,11 @@ ATTR_HOT inline const double netlist_analog_input_t::Q_Analog() const
ATTR_HOT inline void netlist_analog_output_t::set_Q(const double newQ)
{
- if (newQ != net().as_analog().m_cur_Analog)
- {
- net().as_analog().m_cur_Analog = newQ;
- net().push_to_queue(NLTIME_FROM_NS(1));
- }
+ if (newQ != net().as_analog().m_cur_Analog)
+ {
+ net().as_analog().m_cur_Analog = newQ;
+ net().push_to_queue(NLTIME_FROM_NS(1));
+ }
}
diff --git a/src/emu/netlist/nl_dice_compat.h b/src/emu/netlist/nl_dice_compat.h
index c27e7a094cf..6fbede6d453 100644
--- a/src/emu/netlist/nl_dice_compat.h
+++ b/src/emu/netlist/nl_dice_compat.h
@@ -70,10 +70,10 @@ public:
ALIAS(_name.1, _name ## _SW.Q)
#define CHIP_INPUT_ACTIVE_HIGH(_name) \
- SWITCH2(_name ## _SW) \
- NET_C(_name ## _SW.2, V5) \
- NET_CSTR(# _name "_SW.1", "GND") \
- ALIAS(_name.1, _name ## _SW.Q)
+ SWITCH2(_name ## _SW) \
+ NET_C(_name ## _SW.2, V5) \
+ NET_CSTR(# _name "_SW.1", "GND") \
+ ALIAS(_name.1, _name ## _SW.Q)
#define CHIP_LATCH(_name) \
NETDEV_RSFF(_name) \
diff --git a/src/emu/netlist/nl_lists.h b/src/emu/netlist/nl_lists.h
index ab24bfdfe48..67b398503d6 100644
--- a/src/emu/netlist/nl_lists.h
+++ b/src/emu/netlist/nl_lists.h
@@ -74,21 +74,21 @@ public:
ATTR_HOT inline void remove(const _Element elem)
{
- entry_t * i = m_end - 1;
- while (i > &m_list[0])
- {
- if (i->object() == elem)
- {
- m_end--;
- while (i < m_end)
- {
- *i = *(i+1);
- i++;
- }
- return;
- }
- i--;
- }
+ entry_t * i = m_end - 1;
+ while (i > &m_list[0])
+ {
+ if (i->object() == elem)
+ {
+ m_end--;
+ while (i < m_end)
+ {
+ *i = *(i+1);
+ i++;
+ }
+ return;
+ }
+ i--;
+ }
}
ATTR_COLD void clear()
diff --git a/src/emu/netlist/nl_setup.h b/src/emu/netlist/nl_setup.h
index eee03e361be..9a6028c4848 100644
--- a/src/emu/netlist/nl_setup.h
+++ b/src/emu/netlist/nl_setup.h
@@ -83,7 +83,7 @@ public:
struct link_t
{
link_t() { }
- link_t(void *) { }
+ link_t(void *) { }
// Copy constructor
link_t(const link_t &from)
{
diff --git a/src/emu/netlist/nl_time.h b/src/emu/netlist/nl_time.h
index 1cd650cbfe5..af358320f8a 100644
--- a/src/emu/netlist/nl_time.h
+++ b/src/emu/netlist/nl_time.h
@@ -40,7 +40,7 @@ public:
ATTR_HOT friend inline bool operator<(const netlist_time &left, const netlist_time &right);
ATTR_HOT friend inline bool operator>=(const netlist_time &left, const netlist_time &right);
ATTR_HOT friend inline bool operator<=(const netlist_time &left, const netlist_time &right);
- ATTR_HOT friend inline bool operator!=(const netlist_time &left, const netlist_time &right);
+ ATTR_HOT friend inline bool operator!=(const netlist_time &left, const netlist_time &right);
ATTR_HOT inline const netlist_time &operator=(const netlist_time &right) { m_time = right.m_time; return *this; }
ATTR_HOT inline const netlist_time &operator=(const double &right) { m_time = (INTERNALTYPE) ( right * (double) RESOLUTION); return *this; }
@@ -114,7 +114,7 @@ ATTR_HOT inline bool operator>=(const netlist_time &left, const netlist_time &ri
ATTR_HOT inline bool operator!=(const netlist_time &left, const netlist_time &right)
{
- return (left.m_time != right.m_time);
+ return (left.m_time != right.m_time);
}
#endif /* NLTIME_H_ */
diff --git a/src/emu/netlist/plists.h b/src/emu/netlist/plists.h
index 7835205048a..17b90d538ae 100644
--- a/src/emu/netlist/plists.h
+++ b/src/emu/netlist/plists.h
@@ -26,19 +26,19 @@ public:
{
m_num_elements = numElements;
if (m_num_elements == 0)
- m_list = NULL;
+ m_list = NULL;
else
- m_list = new _ListClass[m_num_elements];
+ m_list = new _ListClass[m_num_elements];
m_count = 0;
}
ATTR_COLD plinearlist_t(const plinearlist_t &rhs)
{
m_num_elements = rhs.capacity();
- if (m_num_elements == 0)
- m_list = NULL;
- else
- m_list = new _ListClass[m_num_elements];
+ if (m_num_elements == 0)
+ m_list = NULL;
+ else
+ m_list = new _ListClass[m_num_elements];
m_count = 0;
for (int i=0; i<rhs.count(); i++)
{
@@ -59,31 +59,31 @@ public:
ATTR_COLD ~plinearlist_t()
{
- if (m_list != NULL)
- delete[] m_list;
- m_list = NULL;
+ if (m_list != NULL)
+ delete[] m_list;
+ m_list = NULL;
}
ATTR_HOT inline operator _ListClass * () { return m_list; }
- ATTR_HOT inline operator const _ListClass * () const { return m_list; }
+ ATTR_HOT inline operator const _ListClass * () const { return m_list; }
- /* using the [] operator will not allow gcc to vectorize code because
- * basically a pointer is returned.
- * array works around this.
- */
+ /* using the [] operator will not allow gcc to vectorize code because
+ * basically a pointer is returned.
+ * array works around this.
+ */
- ATTR_HOT inline _ListClass *array() { return m_list; }
+ ATTR_HOT inline _ListClass *array() { return m_list; }
- ATTR_HOT inline _ListClass& operator[](const int index) { return m_list[index]; }
- ATTR_HOT inline const _ListClass& operator[](const int index) const { return m_list[index]; }
+ ATTR_HOT inline _ListClass& operator[](const int index) { return m_list[index]; }
+ ATTR_HOT inline const _ListClass& operator[](const int index) const { return m_list[index]; }
ATTR_HOT inline void add(const _ListClass &elem)
{
if (m_count >= m_num_elements){
- int new_size = m_num_elements * 2;
- if (new_size < 32)
- new_size = 32;
- resize(new_size);
+ int new_size = m_num_elements * 2;
+ if (new_size < 32)
+ new_size = 32;
+ resize(new_size);
}
m_list[m_count++] = elem;
@@ -116,14 +116,14 @@ public:
}
}
- ATTR_HOT inline void swap(const int pos1, const int pos2)
- {
- assert((pos1>=0) && (pos1<m_count));
- assert((pos2>=0) && (pos2<m_count));
- _ListClass tmp = m_list[pos1];
- m_list[pos1] = m_list[pos2];
- m_list[pos2] =tmp;
- }
+ ATTR_HOT inline void swap(const int pos1, const int pos2)
+ {
+ assert((pos1>=0) && (pos1<m_count));
+ assert((pos2>=0) && (pos2<m_count));
+ _ListClass tmp = m_list[pos1];
+ m_list[pos1] = m_list[pos2];
+ m_list[pos2] =tmp;
+ }
ATTR_HOT inline bool contains(const _ListClass &elem) const
{
@@ -163,34 +163,34 @@ public:
}
private:
- ATTR_HOT inline void resize(const int new_size)
- {
- int cnt = count();
- if (new_size > 0)
- {
- _ListClass *m_new = new _ListClass[new_size];
- _ListClass *pd = m_new;
-
- if (cnt > new_size)
- cnt = new_size;
- for (_ListClass *ps = m_list; ps < m_list + cnt; ps++, pd++)
- *pd = *ps;
- if (m_list != NULL)
- delete[] m_list;
- m_list = m_new;
- m_count = cnt;
- }
- else
- {
- if (m_list != NULL)
- delete[] m_list;
- m_list = NULL;
- m_count = 0;
- }
- m_num_elements = new_size;
- }
-
- int m_count;
+ ATTR_HOT inline void resize(const int new_size)
+ {
+ int cnt = count();
+ if (new_size > 0)
+ {
+ _ListClass *m_new = new _ListClass[new_size];
+ _ListClass *pd = m_new;
+
+ if (cnt > new_size)
+ cnt = new_size;
+ for (_ListClass *ps = m_list; ps < m_list + cnt; ps++, pd++)
+ *pd = *ps;
+ if (m_list != NULL)
+ delete[] m_list;
+ m_list = m_new;
+ m_count = cnt;
+ }
+ else
+ {
+ if (m_list != NULL)
+ delete[] m_list;
+ m_list = NULL;
+ m_count = 0;
+ }
+ m_num_elements = new_size;
+ }
+
+ int m_count;
_ListClass * m_list /* ATTR_ALIGN */;
int m_num_elements;
};
@@ -203,35 +203,35 @@ template <class _C>
class pnamedlist_t : public plinearlist_t<_C>
{
public:
- _C find(const pstring name) const
- {
- for (int i=0; i < this->count(); i++)
- if (get_name((*this)[i]) == name)
- return (*this)[i];
- return _C(NULL);
- }
-
- void remove_by_name(const pstring name)
- {
- plinearlist_t<_C>::remove(find(name));
- }
-
- bool add(_C dev, bool allow_duplicate)
- {
- if (allow_duplicate)
- plinearlist_t<_C>::add(dev);
- else
- {
- if (!(this->find(get_name(dev)) == _C(NULL)))
- return false;
- plinearlist_t<_C>::add(dev);
- }
- return true;
- }
+ _C find(const pstring name) const
+ {
+ for (int i=0; i < this->count(); i++)
+ if (get_name((*this)[i]) == name)
+ return (*this)[i];
+ return _C(NULL);
+ }
+
+ void remove_by_name(const pstring name)
+ {
+ plinearlist_t<_C>::remove(find(name));
+ }
+
+ bool add(_C dev, bool allow_duplicate)
+ {
+ if (allow_duplicate)
+ plinearlist_t<_C>::add(dev);
+ else
+ {
+ if (!(this->find(get_name(dev)) == _C(NULL)))
+ return false;
+ plinearlist_t<_C>::add(dev);
+ }
+ return true;
+ }
private:
- template <typename T> static const pstring get_name(T &elem) { return elem.name(); }
- template <typename T> static const pstring get_name(T *elem) { return elem->name(); }
+ template <typename T> static const pstring get_name(T &elem) { return elem.name(); }
+ template <typename T> static const pstring get_name(T *elem) { return elem->name(); }
};
diff --git a/src/emu/netlist/pstate.h b/src/emu/netlist/pstate.h
index e959e98e1d2..59f91bc59a1 100644
--- a/src/emu/netlist/pstate.h
+++ b/src/emu/netlist/pstate.h
@@ -37,21 +37,21 @@ enum pstate_data_type_e {
template<typename _ItemType> struct nl_datatype
{
- static const pstate_data_type_e type = pstate_data_type_e(NOT_SUPPORTED);
- static const bool is_ptr = false;
+ static const pstate_data_type_e type = pstate_data_type_e(NOT_SUPPORTED);
+ static const bool is_ptr = false;
};
template<typename _ItemType> struct nl_datatype<_ItemType *>
{
- static const pstate_data_type_e type = pstate_data_type_e(NOT_SUPPORTED);
- static const bool is_ptr = true;
+ static const pstate_data_type_e type = pstate_data_type_e(NOT_SUPPORTED);
+ static const bool is_ptr = true;
};
//template<typename _ItemType> struct type_checker<_ItemType*> { static const bool is_atom = false; static const bool is_pointer = true; };
#define NETLIST_SAVE_TYPE(TYPE, TYPEDESC) \
- template<> struct nl_datatype<TYPE>{ static const pstate_data_type_e type = pstate_data_type_e(TYPEDESC); static const bool is_ptr = false;}; \
- template<> struct nl_datatype<TYPE *>{ static const pstate_data_type_e type = pstate_data_type_e(TYPEDESC); static const bool is_ptr = true;};
+ template<> struct nl_datatype<TYPE>{ static const pstate_data_type_e type = pstate_data_type_e(TYPEDESC); static const bool is_ptr = false;}; \
+ template<> struct nl_datatype<TYPE *>{ static const pstate_data_type_e type = pstate_data_type_e(TYPEDESC); static const bool is_ptr = true;};
NETLIST_SAVE_TYPE(char, DT_INT8);
NETLIST_SAVE_TYPE(double, DT_DOUBLE);
@@ -104,10 +104,10 @@ struct pstate_entry_t
template<typename T>
T *resolved()
{
- if (m_is_ptr)
- return *static_cast<T **>(m_ptr);
- else
- return static_cast<T *>(m_ptr);
+ if (m_is_ptr)
+ return *static_cast<T **>(m_ptr);
+ else
+ return static_cast<T *>(m_ptr);
}
};
diff --git a/src/emu/sound.h b/src/emu/sound.h
index c2e48204c0e..438c0663989 100644
--- a/src/emu/sound.h
+++ b/src/emu/sound.h
@@ -23,7 +23,7 @@
//**************************************************************************
const int STREAM_SYNC = -1; // special rate value indicating a one-sample-at-a-time stream
- // with actual rate defined by its input
+ // with actual rate defined by its input
//**************************************************************************
// MACROS
diff --git a/src/emu/sound/amiga.h b/src/emu/sound/amiga.h
index 56e092b248f..1963f5a16d2 100644
--- a/src/emu/sound/amiga.h
+++ b/src/emu/sound/amiga.h
@@ -18,7 +18,7 @@
// ======================> amiga_sound_device
-class amiga_sound_device : public device_t, public device_sound_interface
+class amiga_sound_device : public device_t, public device_sound_interface
{
public:
amiga_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
diff --git a/src/emu/sound/ay8910.h b/src/emu/sound/ay8910.h
index 537f7ec6109..d8803044b4f 100644
--- a/src/emu/sound/ay8910.h
+++ b/src/emu/sound/ay8910.h
@@ -70,7 +70,7 @@ YMZ294: 0 I/O port
#define MCFG_AY8910_OUTPUT_TYPE(_flag) \
ay8910_device::set_flags(*device, _flag);
-
+
#define MCFG_AY8910_RES_LOADS(_res0, _res1, _res2) \
ay8910_device::set_resistors_load(*device, _res0, _res1, _res2);
@@ -100,16 +100,16 @@ public:
// construction/destruction
ay8910_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
ay8910_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner,
- UINT32 clock, psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source);
+ UINT32 clock, psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source);
// static configuration helpers
static void set_flags(device_t &device, int flags) { downcast<ay8910_device &>(device).m_flags = flags; }
- static void set_resistors_load(device_t &device, int res_load0, int res_load1, int res_load2) { downcast<ay8910_device &>(device).m_res_load[0] = res_load0; downcast<ay8910_device &>(device).m_res_load[1] = res_load1; downcast<ay8910_device &>(device).m_res_load[2] = res_load2; }
+ static void set_resistors_load(device_t &device, int res_load0, int res_load1, int res_load2) { downcast<ay8910_device &>(device).m_res_load[0] = res_load0; downcast<ay8910_device &>(device).m_res_load[1] = res_load1; downcast<ay8910_device &>(device).m_res_load[2] = res_load2; }
template<class _Object> static devcb_base &set_port_a_read_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_a_read_cb.set_callback(object); }
template<class _Object> static devcb_base &set_port_b_read_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_b_read_cb.set_callback(object); }
template<class _Object> static devcb_base &set_port_a_write_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_a_write_cb.set_callback(object); }
template<class _Object> static devcb_base &set_port_b_write_callback(device_t &device, _Object object) { return downcast<ay8910_device &>(device).m_port_b_write_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( address_w );
DECLARE_WRITE8_MEMBER( data_w );
@@ -125,7 +125,7 @@ public:
void set_volume(int channel,int volume);
void ay_set_clock(int clock);
-
+
struct ay_ym_param
{
double r_up;
@@ -134,13 +134,13 @@ public:
double res[32];
};
- struct mosfet_param
- {
- double m_Vth;
- double m_Vg;
- int m_count;
- double m_Kn[32];
- };
+ struct mosfet_param
+ {
+ double m_Vth;
+ double m_Vg;
+ int m_count;
+ double m_Kn[32];
+ };
void ay8910_write_ym(int addr, int data);
int ay8910_read_ym();
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index 427a91e4a5e..d61e7127bb0 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -3751,7 +3751,7 @@ enum
* add and delete may be slow - the focus is on access!
*/
- // TODO: replace with dynamic_array from utils
+ // TODO: replace with dynamic_array from utils
template<class _ElementType> struct dynamic_array_t
{
public:
diff --git a/src/emu/sound/es5506.h b/src/emu/sound/es5506.h
index dfb99ca17ae..c434ec8b12e 100644
--- a/src/emu/sound/es5506.h
+++ b/src/emu/sound/es5506.h
@@ -19,37 +19,37 @@
#define MCFG_ES5506_REGION1(_region) \
es5506_device::set_region1(*device, _region);
-
+
#define MCFG_ES5506_REGION2(_region) \
es5506_device::set_region2(*device, _region);
-
+
#define MCFG_ES5506_REGION3(_region) \
es5506_device::set_region3(*device, _region);
#define MCFG_ES5506_CHANNELS(_chan) \
es5506_device::set_channels(*device, _chan);
-
+
#define MCFG_ES5506_IRQ_CB(_devcb) \
devcb = &es5506_device::set_irq_callback(*device, DEVCB_##_devcb);
#define MCFG_ES5506_READ_PORT_CB(_devcb) \
- devcb = &es5506_device::set_read_port_callback(*device, DEVCB_##_devcb);
+ devcb = &es5506_device::set_read_port_callback(*device, DEVCB_##_devcb);
+
-
#define MCFG_ES5505_REGION0(_region) \
es5505_device::set_region0(*device, _region);
#define MCFG_ES5505_REGION1(_region) \
es5505_device::set_region1(*device, _region);
-
+
#define MCFG_ES5505_CHANNELS(_chan) \
es5505_device::set_channels(*device, _chan);
-
+
#define MCFG_ES5505_IRQ_CB(_devcb) \
devcb = &es5505_device::set_irq_callback(*device, DEVCB_##_devcb);
#define MCFG_ES5505_READ_PORT_CB(_devcb) \
- devcb = &es5505_device::set_read_port_callback(*device, DEVCB_##_devcb);
+ devcb = &es5505_device::set_read_port_callback(*device, DEVCB_##_devcb);
/* struct describing a single playing voice */
@@ -117,7 +117,7 @@ class es550x_device : public device_t,
public:
es550x_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);
~es550x_device() {}
-
+
static void set_region0(device_t &device, const char *region0) { downcast<es550x_device &>(device).m_region0 = region0; }
static void set_region1(device_t &device, const char *region1) { downcast<es550x_device &>(device).m_region1 = region1; }
static void set_region2(device_t &device, const char *region2) { downcast<es550x_device &>(device).m_region2 = region2; }
@@ -125,7 +125,7 @@ public:
static void set_channels(device_t &device, int channels) { downcast<es550x_device &>(device).m_channels = channels; }
template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<es550x_device &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb_base &set_read_port_callback(device_t &device, _Object object) { return downcast<es550x_device &>(device).m_read_port_cb.set_callback(object); }
-
+
protected:
// device-level overrides
@@ -164,7 +164,7 @@ protected:
#endif
FILE *m_eslog;
-
+
const char * m_region0; /* memory region where the sample ROM lives */
const char * m_region1; /* memory region where the sample ROM lives */
const char * m_region2; /* memory region where the sample ROM lives */
diff --git a/src/emu/sound/gaelco.h b/src/emu/sound/gaelco.h
index c1cf64ed6d7..83235e9f69c 100644
--- a/src/emu/sound/gaelco.h
+++ b/src/emu/sound/gaelco.h
@@ -51,7 +51,7 @@ public:
dev.m_banks[2] = offs3;
dev.m_banks[3] = offs4;
}
-
+
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/emu/sound/namco.h b/src/emu/sound/namco.h
index b0c1d2a4fbc..3da05979fb3 100644
--- a/src/emu/sound/namco.h
+++ b/src/emu/sound/namco.h
@@ -40,7 +40,7 @@ public:
// static configuration
static void set_voices(device_t &device, int voices) { downcast<namco_audio_device &>(device).m_voices = voices; }
static void set_stereo(device_t &device, int stereo) { downcast<namco_audio_device &>(device).m_stereo = stereo; }
-
+
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/emu/sound/nes_apu.h b/src/emu/sound/nes_apu.h
index 3c8d777159a..3027c23d4b9 100644
--- a/src/emu/sound/nes_apu.h
+++ b/src/emu/sound/nes_apu.h
@@ -47,7 +47,7 @@ class nesapu_device : public device_t,
public:
nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~nesapu_device() {}
-
+
static void set_cpu_tag(device_t &device, const char *tag) { downcast<nesapu_device &>(device).m_cpu_tag = tag; }
DECLARE_READ8_MEMBER( read );
diff --git a/src/emu/sound/okim6258.h b/src/emu/sound/okim6258.h
index affbb5019be..57eaf465a1e 100644
--- a/src/emu/sound/okim6258.h
+++ b/src/emu/sound/okim6258.h
@@ -84,8 +84,8 @@ private:
UINT8 m_nibble_shift; /* nibble select */
sound_stream *m_stream; /* which stream are we playing on? */
- UINT8 m_output_bits; /* D/A precision is 10-bits but 12-bit data can be
- output serially to an external DAC */
+ UINT8 m_output_bits; /* D/A precision is 10-bits but 12-bit data can be
+ output serially to an external DAC */
INT32 m_signal;
INT32 m_step;
diff --git a/src/emu/sound/pokey.h b/src/emu/sound/pokey.h
index e66bab4e465..2c55c6fcb6c 100644
--- a/src/emu/sound/pokey.h
+++ b/src/emu/sound/pokey.h
@@ -220,7 +220,7 @@ public:
template<class _Object> static devcb_base &set_allpot_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_allpot_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_serin_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_serin_r_cb.set_callback(object); }
template<class _Object> static devcb_base &set_serout_w_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_serout_w_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/sound/rf5c68.h b/src/emu/sound/rf5c68.h
index d4d5b13cf04..ca6cebc3989 100644
--- a/src/emu/sound/rf5c68.h
+++ b/src/emu/sound/rf5c68.h
@@ -62,7 +62,7 @@ public:
~rf5c68_device() { }
static void set_end_callback(device_t &device, rf5c68_sample_end_cb_delegate callback) { downcast<rf5c68_device &>(device).m_sample_end_cb = callback; }
-
+
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/emu/sound/segapcm.h b/src/emu/sound/segapcm.h
index 2c4e38f03f8..c090a74f29b 100644
--- a/src/emu/sound/segapcm.h
+++ b/src/emu/sound/segapcm.h
@@ -38,13 +38,13 @@ class segapcm_device : public device_t,
public:
segapcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~segapcm_device() { }
-
+
// static configuration
static void set_bank(device_t &device, int bank) { downcast<segapcm_device &>(device).m_bank = bank; }
-
+
DECLARE_WRITE8_MEMBER( sega_pcm_w );
DECLARE_READ8_MEMBER( sega_pcm_r );
-
+
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/emu/sound/tms36xx.h b/src/emu/sound/tms36xx.h
index 8cdf5f2c798..a38552592a1 100644
--- a/src/emu/sound/tms36xx.h
+++ b/src/emu/sound/tms36xx.h
@@ -44,8 +44,8 @@ public:
tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~tms36xx_device() { }
- static void set_subtype(device_t &device, int type)
- {
+ static void set_subtype(device_t &device, int type)
+ {
tms36xx_device &dev = downcast<tms36xx_device &>(device);
switch (type)
{
@@ -63,9 +63,9 @@ public:
break;
}
}
- static void set_tune_speed(device_t &device, double speed)
- {
- downcast<tms36xx_device &>(device).m_speed = (speed > 0) ? TMS36XX_VMAX / speed : TMS36XX_VMAX;
+ static void set_tune_speed(device_t &device, double speed)
+ {
+ downcast<tms36xx_device &>(device).m_speed = (speed > 0) ? TMS36XX_VMAX / speed : TMS36XX_VMAX;
}
static void set_decays(device_t &device, double decay_0, double decay_1, double decay_2, double decay_3, double decay_4, double decay_5)
{
@@ -77,7 +77,7 @@ public:
dev.m_decay_time[4] = decay_4;
dev.m_decay_time[5] = decay_5;
}
-
+
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/emu/sound/tms5110.h b/src/emu/sound/tms5110.h
index e11e0534c79..bf6eed76ee8 100644
--- a/src/emu/sound/tms5110.h
+++ b/src/emu/sound/tms5110.h
@@ -80,8 +80,8 @@ protected:
void set_variant(int variant);
- UINT8 m_talk_status;
- sound_stream *m_stream;
+ UINT8 m_talk_status;
+ sound_stream *m_stream;
private:
void new_int_write(UINT8 rc, UINT8 m0, UINT8 m1, UINT8 addr);
@@ -107,7 +107,7 @@ private:
UINT8 m_CTL_pins;
UINT8 m_speaking_now;
-
+
UINT8 m_state;
/* Rom interface */
@@ -259,7 +259,7 @@ public:
static void set_stop_bit(device_t &device, UINT8 stop_bit) { downcast<tmsprom_device &>(device).m_stop_bit = stop_bit; }
template<class _Object> static devcb_base &set_pdc_callback(device_t &device, _Object object) { return downcast<tmsprom_device &>(device).m_pdc_cb.set_callback(object); }
template<class _Object> static devcb_base &set_ctl_callback(device_t &device, _Object object) { return downcast<tmsprom_device &>(device).m_ctl_cb.set_callback(object); }
-
+
DECLARE_WRITE_LINE_MEMBER( m0_w );
DECLARE_READ_LINE_MEMBER( data_r );
@@ -314,25 +314,25 @@ extern const device_type TMSPROM;
#define MCFG_TMSPROM_ROM_SIZE(_size) \
tmsprom_device::set_rom_size(*device, _size);
-
+
#define MCFG_TMSPROM_PDC_BIT(_bit) \
tmsprom_device::set_pdc_bit(*device, _bit);
-
+
#define MCFG_TMSPROM_CTL1_BIT(_bit) \
tmsprom_device::set_ctl1_bit(*device, _bit);
#define MCFG_TMSPROM_CTL2_BIT(_bit) \
tmsprom_device::set_ctl2_bit(*device, _bit);
-
+
#define MCFG_TMSPROM_CTL4_BIT(_bit) \
tmsprom_device::set_ctl4_bit(*device, _bit);
-
+
#define MCFG_TMSPROM_CTL8_BIT(_bit) \
tmsprom_device::set_ctl8_bit(*device, _bit);
#define MCFG_TMSPROM_RESET_BIT(_bit) \
tmsprom_device::set_reset_bit(*device, _bit);
-
+
#define MCFG_TMSPROM_STOP_BIT(_bit) \
tmsprom_device::set_stop_bit(*device, _bit);
@@ -340,6 +340,6 @@ extern const device_type TMSPROM;
devcb = &tmsprom_device::set_pdc_callback(*device, DEVCB_##_devcb);
#define MCFG_TMSPROM_CTL_CB(_devcb) \
- devcb = &tmsprom_device::set_ctl_callback(*device, DEVCB_##_devcb);
+ devcb = &tmsprom_device::set_ctl_callback(*device, DEVCB_##_devcb);
#endif /* __TMS5110_H__ */
diff --git a/src/emu/sound/vrender0.h b/src/emu/sound/vrender0.h
index 21515269027..e44bdae2dc5 100644
--- a/src/emu/sound/vrender0.h
+++ b/src/emu/sound/vrender0.h
@@ -41,7 +41,7 @@ public:
protected:
// device-level overrides
virtual void device_start();
-
+
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
diff --git a/src/emu/video.h b/src/emu/video.h
index b1c74355410..5904b4c6c53 100644
--- a/src/emu/video.h
+++ b/src/emu/video.h
@@ -170,7 +170,7 @@ private:
attotime m_mng_frame_period; // period of a single movie frame
attotime m_mng_next_frame_time; // time of next frame
UINT32 m_mng_frame; // current movie frame number
-
+
// movie recording - AVI
avi_file * m_avi_file; // handle to the open movie file
attotime m_avi_frame_period; // period of a single movie frame
diff --git a/src/emu/video/crtc_ega.h b/src/emu/video/crtc_ega.h
index 5356ee28f5f..3ea4d22d8a0 100644
--- a/src/emu/video/crtc_ega.h
+++ b/src/emu/video/crtc_ega.h
@@ -59,20 +59,20 @@ class crtc_ega_device : public device_t,
public:
crtc_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- template<class _Object> static devcb_base &set_res_out_de_callback(device_t &device, _Object object)
+ template<class _Object> static devcb_base &set_res_out_de_callback(device_t &device, _Object object)
{ return downcast<crtc_ega_device &>(device).m_res_out_de_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_res_out_hsync_callback(device_t &device, _Object object)
+ template<class _Object> static devcb_base &set_res_out_hsync_callback(device_t &device, _Object object)
{ return downcast<crtc_ega_device &>(device).m_res_out_hsync_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_res_out_vsync_callback(device_t &device, _Object object)
+ template<class _Object> static devcb_base &set_res_out_vsync_callback(device_t &device, _Object object)
{ return downcast<crtc_ega_device &>(device).m_res_out_vsync_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_res_out_vblank_callback(device_t &device, _Object object)
+ template<class _Object> static devcb_base &set_res_out_vblank_callback(device_t &device, _Object object)
{ return downcast<crtc_ega_device &>(device).m_res_out_vblank_cb.set_callback(object); }
static void set_begin_update_callback(device_t &device, crtc_ega_begin_update_delegate callback) { downcast<crtc_ega_device &>(device).m_begin_update_cb = callback; }
static void set_row_update_callback(device_t &device, crtc_ega_row_update_delegate callback) { downcast<crtc_ega_device &>(device).m_row_update_cb = callback; }
static void set_end_update_callback(device_t &device, crtc_ega_end_update_delegate callback) { downcast<crtc_ega_device &>(device).m_end_update_cb = callback; }
static void set_hpixels_per_column(device_t &device, int hpixels_per_column) { downcast<crtc_ega_device &>(device).m_hpixels_per_column = hpixels_per_column; }
-
+
/* select one of the registers for reading or writing */
DECLARE_WRITE8_MEMBER( address_w );
@@ -119,16 +119,16 @@ private:
optionally return a pointer that will be passed to the
update and tear down callbacks */
crtc_ega_begin_update_delegate m_begin_update_cb;
-
+
/* this gets called for every row, the driver must output
x_count * hpixels_per_column pixels.
cursor_x indicates the character position where the cursor is, or -1
if there is no cursor on this row */
crtc_ega_row_update_delegate m_row_update_cb;
-
+
/* if specified, this gets called after all row updating is complete */
crtc_ega_end_update_delegate m_end_update_cb;
-
+
/* ega/vga register file */
UINT8 m_horiz_char_total; /* 0x00 */
UINT8 m_horiz_disp; /* 0x01 */
diff --git a/src/emu/video/huc6202.h b/src/emu/video/huc6202.h
index 1f4b6d100fd..e5f16f679de 100644
--- a/src/emu/video/huc6202.h
+++ b/src/emu/video/huc6202.h
@@ -46,13 +46,13 @@
#define MCFG_HUC6202_WRITE_1_CB(_devcb) \
devcb = &huc6202_device::set_write_1_callback(*device, DEVCB_##_devcb);
-
+
class huc6202_device : public device_t
{
public:
// construction/destruction
huc6202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
template<class _Object> static devcb_base &set_next_pixel_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_next_pixel_0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_time_til_next_event_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_time_til_next_event_0_cb.set_callback(object); }
template<class _Object> static devcb_base &set_vsync_changed_0_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_vsync_changed_0_cb.set_callback(object); }
@@ -65,7 +65,7 @@ public:
template<class _Object> static devcb_base &set_hsync_changed_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_hsync_changed_1_cb.set_callback(object); }
template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_read_1_cb.set_callback(object); }
template<class _Object> static devcb_base &set_write_1_callback(device_t &device, _Object object) { return downcast<huc6202_device &>(device).m_write_1_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( io_read );
diff --git a/src/emu/video/mc6845.h b/src/emu/video/mc6845.h
index 702c9a6f6d6..b12cb56875b 100644
--- a/src/emu/video/mc6845.h
+++ b/src/emu/video/mc6845.h
@@ -67,7 +67,7 @@ typedef device_delegate<void (bitmap_rgb32 &bitmap, const rectangle &cliprect)>
#define MC6845_BEGIN_UPDATE(name) void name(bitmap_rgb32 &bitmap, const rectangle &cliprect)
typedef device_delegate<void (bitmap_rgb32 &bitmap, const rectangle &cliprect, UINT16 ma, UINT8 ra,
- UINT16 y, UINT8 x_count, INT8 cursor_x, int de, int hbp, int vbp)> mc6845_update_row_delegate;
+ UINT16 y, UINT8 x_count, INT8 cursor_x, int de, int hbp, int vbp)> mc6845_update_row_delegate;
#define MC6845_UPDATE_ROW(name) void name(bitmap_rgb32 &bitmap, const rectangle &cliprect, UINT16 ma, UINT8 ra, \
UINT16 y, UINT8 x_count, INT8 cursor_x, int de, int hbp, int vbp)
@@ -97,7 +97,7 @@ public:
mc6845_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);
static void set_show_border_area(device_t &device, bool show) { downcast<mc6845_device &>(device).m_show_border_area = show; }
- static void set_visarea_adjust(device_t &device, int min_x, int max_x, int min_y, int max_y)
+ static void set_visarea_adjust(device_t &device, int min_x, int max_x, int min_y, int max_y)
{
mc6845_device &dev = downcast<mc6845_device &>(device);
dev.m_visarea_adjust_min_x = min_x;
@@ -116,7 +116,7 @@ public:
template<class _Object> static devcb_base &set_out_cur_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_cur_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_hsync_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_hsync_cb.set_callback(object); }
template<class _Object> static devcb_base &set_out_vsync_callback(device_t &device, _Object object) { return downcast<mc6845_device &>(device).m_out_vsync_cb.set_callback(object); }
-
+
/* select one of the registers for reading or writing */
DECLARE_WRITE8_MEMBER( address_w );
@@ -238,7 +238,7 @@ protected:
emu_timer *m_light_pen_latch_timer;
emu_timer *m_upd_adr_timer;
emu_timer *m_upd_trans_timer;
-
+
/* computed values - do NOT state save these! */
/* These computed are used to define the screen parameters for a driver */
UINT16 m_horiz_pix_total;
@@ -271,45 +271,45 @@ protected:
/************************
interface CRTC - driver
************************/
-
+
bool m_show_border_area; /* visible screen area (false) active display (true) active display + blanking */
-
+
/* visible screen area adjustment */
int m_visarea_adjust_min_x;
int m_visarea_adjust_max_x;
int m_visarea_adjust_min_y;
int m_visarea_adjust_max_y;
-
+
int m_hpixels_per_column; /* number of pixels per video memory address */
/* if specified, this gets called before any pixel update,
optionally return a pointer that will be passed to the
update and tear down callbacks */
mc6845_begin_update_delegate m_begin_update_cb;
-
+
/* this gets called for every row, the driver must output
x_count * hpixels_per_column pixels.
cursor_x indicates the character position where the cursor is, or -1
if there is no cursor on this row */
mc6845_update_row_delegate m_update_row_cb;
-
+
/* if specified, this gets called after all row updating is complete */
mc6845_end_update_delegate m_end_update_cb;
-
+
/* Called whenever the update address changes
* For vblank/hblank timing strobe indicates the physical update.
* vblank/hblank timing not supported yet! */
mc6845_on_update_addr_changed_delegate m_on_update_addr_changed_cb;
-
+
/* if specified, this gets called for every change of the disply enable pin (pin 18) */
devcb_write_line m_out_de_cb;
-
+
/* if specified, this gets called for every change of the cursor pin (pin 19) */
devcb_write_line m_out_cur_cb;
-
+
/* if specified, this gets called for every change of the HSYNC pin (pin 39) */
devcb_write_line m_out_hsync_cb;
-
+
/* if specified, this gets called for every change of the VSYNC pin (pin 40) */
devcb_write_line m_out_vsync_cb;
};
diff --git a/src/emu/video/mc6847.h b/src/emu/video/mc6847.h
index b86c8d5a4de..eea69cbaa27 100644
--- a/src/emu/video/mc6847.h
+++ b/src/emu/video/mc6847.h
@@ -269,11 +269,11 @@ protected:
// callbacks
devcb_write_line m_write_hsync;
devcb_write_line m_write_fsync;
-
+
/* if specified, this reads the external char rom off of the driver state */
// moved here from mc6847_base_device so to be useable in GIME
mc6847_get_char_rom_delegate m_charrom_cb;
-
+
// incidentals
character_map m_character_map;
artifacter m_artifacter;
@@ -546,7 +546,7 @@ protected:
virtual void field_sync_changed(bool line);
virtual void record_body_scanline(UINT16 physical_scanline, UINT16 scanline);
virtual void record_partial_body_scanline(UINT16 physical_scanline, UINT16 logical_scanline, INT32 start_clock, INT32 end_clock);
-
+
void set_custom_palette(const pixel_t *custom_palette)
{
if ( m_palette != m_bw_palette )
@@ -568,7 +568,7 @@ private:
static const UINT32 s_palette[PALETTE_LENGTH];
// callbacks
-
+
/* if specified, this gets called whenever reading a byte (offs_t ~0 specifies DA* entering the tristate mode) */
devcb_read8 m_input_cb;
@@ -616,7 +616,7 @@ private:
// setup functions
void setup_fixed_mode();
-
+
// runtime functions
void record_body_scanline(UINT16 physical_scanline, UINT16 scanline, INT32 start_pos, INT32 end_pos);
pixel_t border_value(UINT8 mode, const pixel_t *palette, bool is_mc6847t1);
@@ -678,7 +678,7 @@ class s68047_device : public mc6847_base_device
{
public:
s68047_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
void hack_black_becomes_blue(bool flag);
private:
@@ -687,7 +687,7 @@ private:
class m5c6847p1_device : public mc6847_base_device
{
-public:
+public:
m5c6847p1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
diff --git a/src/emu/video/ramdac.h b/src/emu/video/ramdac.h
index 310f17deadf..967646c012b 100644
--- a/src/emu/video/ramdac.h
+++ b/src/emu/video/ramdac.h
@@ -73,7 +73,7 @@ private:
const address_space_config m_space_config;
required_device<palette_device> m_palette;
-
+
UINT8 m_split_read_reg; // read register index is separated, seen in rltennis
};
diff --git a/src/emu/video/snes_ppu.h b/src/emu/video/snes_ppu.h
index 80c95444573..5f628e76259 100644
--- a/src/emu/video/snes_ppu.h
+++ b/src/emu/video/snes_ppu.h
@@ -54,7 +54,7 @@ enum
struct SNES_SCANLINE
{
int enable, clip;
-
+
UINT16 buffer[SNES_SCR_WIDTH];
UINT8 priority[SNES_SCR_WIDTH];
UINT8 layer[SNES_SCR_WIDTH];
@@ -74,9 +74,9 @@ public:
template<class _Object> static devcb_base &static_set_open_bus_callback(device_t &device, _Object object) { return downcast<snes_ppu_device &>(device).m_openbus_cb.set_callback(object); }
UINT8 m_regs[0x40];
-
+
SNES_SCANLINE m_scanlines[2];
-
+
struct
{
/* clipmasks */
@@ -85,23 +85,23 @@ public:
UINT8 wlog_mask;
/* color math enabled */
UINT8 color_math;
-
+
UINT8 charmap;
UINT8 tilemap;
UINT8 tilemap_size;
-
+
UINT8 tile_size;
UINT8 mosaic_enabled; // actually used only for layers 0->3!
-
+
UINT8 main_window_enabled;
UINT8 sub_window_enabled;
UINT8 main_bg_enabled;
UINT8 sub_bg_enabled;
-
+
UINT16 hoffs;
UINT16 voffs;
} m_layer[6]; // this is for the BG1 - BG2 - BG3 - BG4 - OBJ - color layers
-
+
struct
{
UINT8 address_low;
@@ -119,7 +119,7 @@ public:
UINT8 flip;
UINT16 write_latch;
} m_oam;
-
+
struct
{
UINT16 latch_horz;
@@ -129,7 +129,7 @@ public:
UINT8 last_visible_line;
UINT8 interlace_count;
} m_beam;
-
+
struct
{
UINT8 repeat;
@@ -145,7 +145,7 @@ public:
UINT16 ver_offset;
UINT8 extbg;
} m_mode7;
-
+
struct OAM
{
UINT16 tile;
@@ -153,19 +153,19 @@ public:
UINT8 size, vflip, hflip, priority_bits, pal;
int height, width;
};
-
+
struct OAM m_oam_spritelist[SNES_SCR_WIDTH / 2];
-
+
UINT8 m_oam_itemlist[32];
-
+
struct TILELIST {
INT16 x;
UINT16 priority, pal, tileaddr;
int hflip;
};
-
+
struct TILELIST m_oam_tilelist[34];
-
+
#if SNES_LAYER_DEBUG
struct DEBUGOPTS
{
@@ -180,7 +180,7 @@ public:
};
struct DEBUGOPTS m_debug_options;
#endif
-
+
UINT8 m_mosaic_size;
UINT8 m_clip_to_black;
UINT8 m_prevent_color_math;
@@ -188,13 +188,13 @@ public:
UINT8 m_bg3_priority_bit;
UINT8 m_direct_color;
UINT8 m_ppu_last_scroll; /* as per Anomie's doc and Theme Park, all scroll regs shares (but mode 7 ones) the same
- 'previous' scroll value */
+ 'previous' scroll value */
UINT8 m_mode7_last_scroll; /* as per Anomie's doc mode 7 scroll regs use a different value, shared with mode 7 matrix! */
-
+
UINT8 m_ppu1_open_bus, m_ppu2_open_bus;
UINT8 m_ppu1_version, m_ppu2_version;
UINT8 m_window1_left, m_window1_right, m_window2_left, m_window2_right;
-
+
UINT16 m_mosaic_table[16][4096];
UINT8 m_clipmasks[6][SNES_SCR_WIDTH];
UINT8 m_update_windows;
@@ -209,7 +209,7 @@ public:
UINT8 m_color_modes;
UINT8 m_stat77;
UINT8 m_stat78;
-
+
UINT16 m_htmult; /* in 512 wide, we run HTOTAL double and halve it on latching */
UINT16 m_cgram_address; /* CGRAM address */
UINT8 m_read_ophct;
@@ -221,7 +221,7 @@ public:
UINT16 m_vram_fgr_shift;
UINT16 m_vram_read_buffer;
UINT16 m_vmadd;
-
+
inline UINT16 get_bgcolor(UINT8 direct_colors, UINT16 palette, UINT8 color);
inline void set_scanline_pixel(int screen, INT16 x, UINT16 color, UINT8 priority, UINT8 layer, int blend);
inline void draw_bgtile_lores(UINT8 layer, INT16 ii, UINT8 colour, UINT16 pal, UINT8 direct_colors, UINT8 priority);
@@ -249,15 +249,15 @@ public:
void update_offsets(void);
inline void draw_blend(UINT16 offset, UINT16 *colour, UINT8 prevent_color_math, UINT8 black_pen_clip, int switch_screens);
void refresh_scanline(running_machine &machine, bitmap_rgb32 &bitmap, UINT16 curline);
-
+
void latch_counters(running_machine &machine);
void dynamic_res_change(running_machine &machine);
inline UINT32 get_vram_address(running_machine &machine);
UINT8 dbg_video(running_machine &machine, UINT16 curline);
-
+
UINT8 read(address_space &space, UINT32 offset, UINT8 wrio_bit7);
void write(address_space &space, UINT32 offset, UINT8 data);
-
+
DECLARE_READ8_MEMBER( oam_read );
DECLARE_WRITE8_MEMBER( oam_write );
DECLARE_READ8_MEMBER( cgram_read );
@@ -271,7 +271,7 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_reset() {};
+ virtual void device_reset() {};
private:
devcb_read16 m_openbus_cb;
diff --git a/src/emu/video/t6a04.h b/src/emu/video/t6a04.h
index 2685f8b38b4..2fe5b68bd33 100644
--- a/src/emu/video/t6a04.h
+++ b/src/emu/video/t6a04.h
@@ -29,7 +29,7 @@ public:
dev.m_width = w;
dev.m_height = h;
}
-
+
// device interface
DECLARE_WRITE8_MEMBER(control_write);
DECLARE_READ8_MEMBER(control_read);
diff --git a/src/emu/video/tms3556.h b/src/emu/video/tms3556.h
index 6de8f1b880b..5914780397f 100644
--- a/src/emu/video/tms3556.h
+++ b/src/emu/video/tms3556.h
@@ -108,14 +108,14 @@ private:
// register interface
int m_reg_access_phase;
-
+
int m_row_col_written;
int m_bamp_written;
int m_colrow;
- dma_mode_tt m_vdp_acmpxy_mode;
- UINT16 m_vdp_acmpxy;
- UINT16 m_vdp_acmp;
- int m_init_read;
+ dma_mode_tt m_vdp_acmpxy_mode;
+ UINT16 m_vdp_acmpxy;
+ UINT16 m_vdp_acmp;
+ int m_init_read;
int m_scanline; // scanline counter
int m_blink, m_blink_count; // blinking
diff --git a/src/emu/video/tms9928a.h b/src/emu/video/tms9928a.h
index 19ba5a69226..4baebba655a 100644
--- a/src/emu/video/tms9928a.h
+++ b/src/emu/video/tms9928a.h
@@ -39,13 +39,13 @@
#define TMS9928A_VERT_DISPLAY_START_PAL (13 + 51)
#define TMS9928A_VERT_DISPLAY_START_NTSC (13 + 27)
-// MCFG_DEVICE_ADD(_tag, _variant, XTAL_10_738635MHz / 2 )
+// MCFG_DEVICE_ADD(_tag, _variant, XTAL_10_738635MHz / 2 )
#define MCFG_TMS9928A_VRAM_SIZE(_size) \
tms9928a_device::set_vram_size(*device, _size);
#define MCFG_TMS9928A_OUT_INT_LINE_CB(_devcb) \
- devcb = &tms9928a_device::set_out_int_line_callback(*device, DEVCB_##_devcb);
+ devcb = &tms9928a_device::set_out_int_line_callback(*device, DEVCB_##_devcb);
#define MCFG_TMS9928A_SET_SCREEN MCFG_VIDEO_SET_SCREEN
@@ -85,7 +85,7 @@ public:
static void set_vram_size(device_t &device, int vram_size) { downcast<tms9928a_device &>(device).m_vram_size = vram_size; }
template<class _Object> static devcb_base &set_out_int_line_callback(device_t &device, _Object object) { return downcast<tms9928a_device &>(device).m_out_int_line_cb.set_callback(object); }
-
+
DECLARE_READ8_MEMBER( vram_read );
DECLARE_WRITE8_MEMBER( vram_write );
DECLARE_READ8_MEMBER( register_read );
@@ -115,7 +115,7 @@ private:
void set_palette();
static const device_timer_id TIMER_LINE = 0;
-
+
int m_vram_size; /* 4K, 8K, or 16K. This should be replaced by fetching data from an address space? */
devcb_write_line m_out_int_line_cb; /* Callback is called whenever the state of the INT output changes */
diff --git a/src/emu/video/vic4567.h b/src/emu/video/vic4567.h
index 1c0c27df27d..4582c537d7e 100644
--- a/src/emu/video/vic4567.h
+++ b/src/emu/video/vic4567.h
@@ -135,7 +135,7 @@ public:
template<class _Object> static devcb_base &set_lightpen_x_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_lightpen_x_cb.set_callback(object); }
template<class _Object> static devcb_base &set_lightpen_y_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_lightpen_y_cb.set_callback(object); }
template<class _Object> static devcb_base &set_c64_mem_r_callback(device_t &device, _Object object) { return downcast<vic3_device &>(device).m_c64_mem_r_cb.set_callback(object); }
-
+
DECLARE_WRITE8_MEMBER(port_w);
DECLARE_WRITE8_MEMBER(palette_w);
DECLARE_READ8_MEMBER(port_r);
@@ -221,7 +221,7 @@ private:
devcb_read8 m_lightpen_button_cb;
devcb_read8 m_lightpen_x_cb;
devcb_read8 m_lightpen_y_cb;
-
+
/* C64 memory access */
devcb_read8 m_c64_mem_r_cb;
@@ -239,10 +239,10 @@ extern const device_type VIC3;
#define MCFG_VIC3_CPU(_tag) \
vic3_device::static_set_cpu_tag(*device, "^"_tag);
-
+
#define MCFG_VIC3_TYPE(_type) \
vic3_device::set_vic3_type(*device, _type);
-
+
#define MCFG_VIC3_DMA_READ_CB(_devcb) \
devcb = &vic3_device::set_dma_read_callback(*device, DEVCB_##_devcb);
diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h
index b75737c2b75..8cb4a34ba18 100644
--- a/src/emu/video/vooddefs.h
+++ b/src/emu/video/vooddefs.h
@@ -3400,10 +3400,10 @@ do
/* add clocal or alocal to alpha */ \
if (FBZCP_CCA_ADD_ACLOCAL(FBZCOLORPATH)) \
a += c_local.rgb.a; \
- \
+ \
/* clamp */ \
CLAMP(a, 0x00, 0xff); \
- \
+ \
/* invert */ \
if (FBZCP_CCA_INVERT_OUTPUT(FBZCOLORPATH)) \
a ^= 0xff; \
diff --git a/src/emu/video/voodoo.h b/src/emu/video/voodoo.h
index 70234ab4148..dcd03d38876 100644
--- a/src/emu/video/voodoo.h
+++ b/src/emu/video/voodoo.h
@@ -39,23 +39,23 @@ enum
***************************************************************************/
#define MCFG_VOODOO_FBMEM(_value) \
- voodoo_device::static_set_fbmem(*device, _value);
+ voodoo_device::static_set_fbmem(*device, _value);
#define MCFG_VOODOO_TMUMEM(_value1, _value2) \
- voodoo_device::static_set_tmumem(*device, _value1, _value2);
+ voodoo_device::static_set_tmumem(*device, _value1, _value2);
#define MCFG_VOODOO_SCREEN_TAG(_tag) \
- voodoo_device::static_set_screen_tag(*device, _tag);
+ voodoo_device::static_set_screen_tag(*device, _tag);
#define MCFG_VOODOO_CPU_TAG(_tag) \
- voodoo_device::static_set_cpu_tag(*device, _tag);
+ voodoo_device::static_set_cpu_tag(*device, _tag);
#define MCFG_VOODOO_VBLANK_CB(_devcb) \
devcb = &voodoo_device::static_set_vblank_callback(*device, DEVCB_##_devcb);
-
+
#define MCFG_VOODOO_STALL_CB(_devcb) \
devcb = &voodoo_device::static_set_stall_callback(*device, DEVCB_##_devcb);
-
+
/***************************************************************************
FUNCTION PROTOTYPES
@@ -81,14 +81,14 @@ public:
static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<voodoo_device &>(device).m_cputag = tag; }
template<class _Object> static devcb_base &static_set_vblank_callback(device_t &device, _Object object) { return downcast<voodoo_device &>(device).m_vblank.set_callback(object); }
template<class _Object> static devcb_base &static_set_stall_callback(device_t &device, _Object object) { return downcast<voodoo_device &>(device).m_stall.set_callback(object); }
-
+
DECLARE_READ32_MEMBER( voodoo_r );
DECLARE_WRITE32_MEMBER( voodoo_w );
// access to legacy token
struct voodoo_state *token() const { assert(m_token != NULL); return m_token; }
void common_start_voodoo(UINT8 type);
-
+
UINT8 m_fbmem;
UINT8 m_tmumem0;
UINT8 m_tmumem1;
@@ -96,7 +96,7 @@ public:
const char * m_cputag;
devcb_write_line m_vblank;
devcb_write_line m_stall;
-
+
protected:
// device-level overrides
virtual void device_config_complete();