summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-06-28 13:32:51 +1000
committer Vas Crabb <vas@vastheman.com>2018-06-28 13:32:51 +1000
commit85a16dfb9d98283b6dfccb4b1b915fd19c432361 (patch)
tree644fda249aaa0aea57b90f487a400b9962608cd1
parentb8f7bce7e237a0eff49f141c0f4f17463cdb0adf (diff)
misc cleanup (nw)
-rw-r--r--src/mame/drivers/decwritr.cpp4
-rw-r--r--src/mame/drivers/vt220.cpp2
-rw-r--r--src/mame/includes/dietgo.h6
-rw-r--r--src/mame/includes/kingobox.h13
-rw-r--r--src/mame/includes/pktgaldx.h14
-rw-r--r--src/mame/includes/pokechmp.h13
-rw-r--r--src/mame/machine/deco146.h3
7 files changed, 42 insertions, 13 deletions
diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp
index a2ea7d79b18..8290ac08105 100644
--- a/src/mame/drivers/decwritr.cpp
+++ b/src/mame/drivers/decwritr.cpp
@@ -32,8 +32,8 @@ class decwriter_state : public driver_device
{
public:
// constructor
- decwriter_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ decwriter_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_speaker(*this, "beeper"),
m_usart(*this, "usart"),
diff --git a/src/mame/drivers/vt220.cpp b/src/mame/drivers/vt220.cpp
index 4205f9eb532..5485dfed592 100644
--- a/src/mame/drivers/vt220.cpp
+++ b/src/mame/drivers/vt220.cpp
@@ -110,7 +110,7 @@ MACHINE_CONFIG_START(vt220_state::vt220)
MCFG_DEVICE_ADD("maincpu", I8051, XTAL(11'059'200)) // from schematic for earlier version
MCFG_DEVICE_PROGRAM_MAP(vt220_mem)
MCFG_DEVICE_IO_MAP(vt220_io)
- MCFG_MCS51_PORT_P1_IN_CB(NOOP) // ???
+ MCFG_MCS51_PORT_P1_IN_CB(CONSTANT(0)) // ???
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", MCS51_INT1_LINE))
diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h
index 0d504ec9eed..6189e28b068 100644
--- a/src/mame/includes/dietgo.h
+++ b/src/mame/includes/dietgo.h
@@ -5,6 +5,10 @@
Diet Go Go
*************************************************************************/
+#ifndef MAME_INCLUDES_DIETGO_H
+#define MAME_INCLUDES_DIETGO_H
+
+#pragma once
#include "cpu/h6280/h6280.h"
#include "video/decospr.h"
@@ -51,3 +55,5 @@ private:
void dietgo_map(address_map &map);
void sound_map(address_map &map);
};
+
+#endif // MAME_INCLUDES_DIETGO_H
diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h
index 204d54d1ad2..2e25f4f8c31 100644
--- a/src/mame/includes/kingobox.h
+++ b/src/mame/includes/kingobox.h
@@ -5,6 +5,10 @@
King of Boxer - Ring King
*************************************************************************/
+#ifndef MAME_INCLUDES_KINGOBOX_H
+#define MAME_INCLUDES_KINGOBOX_H
+
+#pragma once
#include "machine/gen_latch.h"
#include "machine/input_merger.h"
@@ -13,8 +17,8 @@
class kingofb_state : public driver_device
{
public:
- kingofb_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ kingofb_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_scroll_y(*this, "scroll_y"),
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram"),
@@ -28,7 +32,8 @@ public:
m_nmigate(*this, "nmigate"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
- m_soundlatch(*this, "soundlatch") { }
+ m_soundlatch(*this, "soundlatch")
+ { }
/* memory pointers */
required_shared_ptr<uint8_t> m_scroll_y;
@@ -92,3 +97,5 @@ public:
void ringking_sprite_map(address_map &map);
void ringking_video_map(address_map &map);
};
+
+#endif // MAME_INCLUDES_KINGOBOX_H
diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h
index 7e6e8c91b45..29364294db5 100644
--- a/src/mame/includes/pktgaldx.h
+++ b/src/mame/includes/pktgaldx.h
@@ -5,6 +5,11 @@
Pocket Gal Deluxe
*************************************************************************/
+#ifndef MAME_INCLUDES_PKTGALDX_H
+#define MAME_INCLUDES_PKTGALDX_H
+
+#pragma once
+
#include "sound/okim6295.h"
#include "video/decospr.h"
#include "video/deco16ic.h"
@@ -14,8 +19,8 @@
class pktgaldx_state : public driver_device
{
public:
- pktgaldx_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ pktgaldx_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_deco104(*this, "ioprot104"),
m_pf1_rowscroll(*this, "pf1_rowscroll"),
m_pf2_rowscroll(*this, "pf2_rowscroll"),
@@ -28,7 +33,8 @@ public:
m_deco_tilegen1(*this, "tilegen1"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
- m_decrypted_opcodes(*this, "decrypted_opcodes") { }
+ m_decrypted_opcodes(*this, "decrypted_opcodes")
+ { }
optional_device<deco104_device> m_deco104;
@@ -68,3 +74,5 @@ public:
void pktgaldb_map(address_map &map);
void pktgaldx_map(address_map &map);
};
+
+#endif // MAME_INCLUDES_PKTGALDX_H
diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h
index af6315d7e7e..d52eced2559 100644
--- a/src/mame/includes/pokechmp.h
+++ b/src/mame/includes/pokechmp.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_INCLUDES_POKECHMP_H
+#define MAME_INCLUDES_POKECHMP_H
+
+#pragma once
#include "machine/gen_latch.h"
#include "emupal.h"
@@ -7,15 +11,16 @@
class pokechmp_state : public driver_device
{
public:
- pokechmp_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ pokechmp_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
m_spriteram(*this, "spriteram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
- m_soundlatch(*this, "soundlatch") { }
+ m_soundlatch(*this, "soundlatch")
+ { }
required_shared_ptr<uint8_t> m_videoram;
tilemap_t *m_bg_tilemap;
@@ -41,3 +46,5 @@ public:
void pokechmp_oki_map(address_map &map);
void pokechmp_sound_map(address_map &map);
};
+
+#endif // MAME_INCLUDES_POKECHMP_H
diff --git a/src/mame/machine/deco146.h b/src/mame/machine/deco146.h
index 991f59f3d46..fd9bc753154 100644
--- a/src/mame/machine/deco146.h
+++ b/src/mame/machine/deco146.h
@@ -25,7 +25,7 @@
downcast<deco_146_base_device &>(*device).set_interface_scramble(a9,a8,a7,a6,a5,a4,a3,a2,a1,a0);
#define MCFG_DECO146_SET_INTERFACE_SCRAMBLE_REVERSE \
- downcast<deco_146_base_device &>(*device).set_interface_scramble(0,1,2,3,4,5,6,7,8,9);
+ downcast<deco_146_base_device &>(*device).set_interface_scramble_reverse();
#define MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE \
downcast<deco_146_base_device &>(*device).set_interface_scramble_interleave();
@@ -98,6 +98,7 @@ public:
m_external_addrswap[1] = a1;
m_external_addrswap[0] = a0;
}
+ void set_interface_scramble_reverse() { set_interface_scramble(0,1,2,3,4,5,6,7,8,9); }
void set_interface_scramble_interleave() { set_interface_scramble(4, 5, 3, 6, 2, 7, 1, 8, 0, 9); }
void set_use_magic_read_address_xor(bool use_xor) { m_magic_read_address_xor_enabled = use_xor; }