summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-05-15 05:43:28 +1000
committer Vas Crabb <vas@vastheman.com>2018-05-15 05:43:28 +1000
commit23325728009b85bad264dcc175c8f1b8c5e51678 (patch)
tree47e270288dae6d6e6f2cce33c779e94ffc2d39ab /src/mame/machine
parentd1f8569f4d2729631ef5c3fd6de4e3cfca9856e8 (diff)
More cleanup/streamlining of machine configuration and macros:
* Get rid of implicit prefix for GFX decode names and prefix them all * Get rid of special macro for adding GFXDECODE in favour of constructor * Make empty GFX decode a static member of interface * Allow palette to be specified to GFXDECODE as a device finder * Removed diserial.h from emu.h as it's used relatively infrequently Also fix darkseal and vaportra propely. The palette device automatically attaches itself to a share with matching tag. The correct solution here is to rename one or the other out of the way, since it was never attached to a share before.
Diffstat (limited to 'src/mame/machine')
-rw-r--r--src/mame/machine/apollo_kbd.h3
-rw-r--r--src/mame/machine/cit101_kbd.h1
-rw-r--r--src/mame/machine/dec_lk201.h3
-rw-r--r--src/mame/machine/esqpanel.h2
-rw-r--r--src/mame/machine/megacd.cpp4
-rw-r--r--src/mame/machine/midikbd.h2
-rw-r--r--src/mame/machine/ms7004.h4
-rw-r--r--src/mame/machine/saturn.cpp2
-rw-r--r--src/mame/machine/wangpckb.h3
-rw-r--r--src/mame/machine/zx8302.h1
10 files changed, 18 insertions, 7 deletions
diff --git a/src/mame/machine/apollo_kbd.h b/src/mame/machine/apollo_kbd.h
index 096a1be7710..aba8281ba3a 100644
--- a/src/mame/machine/apollo_kbd.h
+++ b/src/mame/machine/apollo_kbd.h
@@ -15,6 +15,9 @@
#include "sound/beep.h"
+#include "diserial.h"
+
+
// BSD-derived systems get very sad when you party with system reserved names.
#ifdef getchar
#undef getchar
diff --git a/src/mame/machine/cit101_kbd.h b/src/mame/machine/cit101_kbd.h
index 5818c4c6033..9404d0ea4a6 100644
--- a/src/mame/machine/cit101_kbd.h
+++ b/src/mame/machine/cit101_kbd.h
@@ -13,6 +13,7 @@
#include "machine/keyboard.h"
#include "sound/beep.h"
+#include "diserial.h"
//**************************************************************************
diff --git a/src/mame/machine/dec_lk201.h b/src/mame/machine/dec_lk201.h
index 48cc32bb73f..06c0d29beef 100644
--- a/src/mame/machine/dec_lk201.h
+++ b/src/mame/machine/dec_lk201.h
@@ -7,6 +7,9 @@
#include "sound/beep.h"
+#include "diserial.h"
+
+
//**************************************************************************
// MACROS / CONSTANTS
//**************************************************************************
diff --git a/src/mame/machine/esqpanel.h b/src/mame/machine/esqpanel.h
index 3cd91a86fdc..730a46b2bc8 100644
--- a/src/mame/machine/esqpanel.h
+++ b/src/mame/machine/esqpanel.h
@@ -8,6 +8,8 @@
#include "machine/esqvfd.h"
#include "machine/esqlcd.h"
+#include "diserial.h"
+
#include <vector>
//**************************************************************************
diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp
index 593e4de3e25..c9a0291e37f 100644
--- a/src/mame/machine/megacd.cpp
+++ b/src/mame/machine/megacd.cpp
@@ -272,7 +272,7 @@ _32x32_START
_32x32_SEQUENCE_1_FLIP
_32x32_END
-static GFXDECODE_START( segacd )
+static GFXDECODE_START( gfx_segacd )
GFXDECODE_DEVICE_RAM( "dataram", 0, sega_16x16_r00_f0_layout, 0, 0 )
GFXDECODE_DEVICE_RAM( "dataram", 0, sega_16x16_r01_f0_layout, 0, 0 )
GFXDECODE_DEVICE_RAM( "dataram", 0, sega_16x16_r10_f0_layout, 0, 0 )
@@ -324,7 +324,7 @@ MACHINE_CONFIG_END
sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, type, tag, owner, clock),
- device_gfx_interface(mconfig, *this, GFXDECODE_NAME( segacd )),
+ device_gfx_interface(mconfig, *this, gfx_segacd),
m_scdcpu(*this, "segacd_68k"),
m_rfsnd(*this, "rfsnd"),
m_lc89510_temp(*this, "tempcdc"),
diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h
index ea7c69f9cef..993003cbd80 100644
--- a/src/mame/machine/midikbd.h
+++ b/src/mame/machine/midikbd.h
@@ -5,6 +5,8 @@
#pragma once
+#include "diserial.h"
+
#define MCFG_MIDI_KBD_ADD(_tag, _devcb, _clock) \
MCFG_DEVICE_ADD(_tag, MIDI_KBD, _clock) \
diff --git a/src/mame/machine/ms7004.h b/src/mame/machine/ms7004.h
index 78452904777..608ba702723 100644
--- a/src/mame/machine/ms7004.h
+++ b/src/mame/machine/ms7004.h
@@ -9,9 +9,7 @@
#include "machine/i8243.h"
#include "sound/beep.h"
-//**************************************************************************
-// MACROS / CONSTANTS
-//**************************************************************************
+#include "diserial.h"
//**************************************************************************
diff --git a/src/mame/machine/saturn.cpp b/src/mame/machine/saturn.cpp
index 6483bd5b8a3..2fbc430a1f7 100644
--- a/src/mame/machine/saturn.cpp
+++ b/src/mame/machine/saturn.cpp
@@ -319,7 +319,7 @@ static const gfx_layout tiles16x16x8_layout =
-GFXDECODE_START( stv )
+GFXDECODE_START( gfx_stv )
GFXDECODE_ENTRY( nullptr, 0, tiles8x8x4_layout, 0x00, (0x80*(2+1)) )
GFXDECODE_ENTRY( nullptr, 0, tiles16x16x4_layout, 0x00, (0x80*(2+1)) )
GFXDECODE_ENTRY( nullptr, 0, tiles8x8x8_layout, 0x00, (0x08*(2+1)) )
diff --git a/src/mame/machine/wangpckb.h b/src/mame/machine/wangpckb.h
index b9cb4e927b4..02a4e803896 100644
--- a/src/mame/machine/wangpckb.h
+++ b/src/mame/machine/wangpckb.h
@@ -11,10 +11,11 @@
#pragma once
-
#include "cpu/mcs51/mcs51.h"
+
#include "sound/sn76496.h"
+#include "diserial.h"
//**************************************************************************
diff --git a/src/mame/machine/zx8302.h b/src/mame/machine/zx8302.h
index d3a78401f62..f49bfddd72e 100644
--- a/src/mame/machine/zx8302.h
+++ b/src/mame/machine/zx8302.h
@@ -34,6 +34,7 @@
#pragma once
+#include "diserial.h"
///*************************************************************************