summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-05-08 07:35:22 +1000
committer Vas Crabb <vas@vastheman.com>2018-05-08 07:35:22 +1000
commit4ef4464aec13029fa7e394671743e9ea96394528 (patch)
tree757cd23c65c626d63f4c98afb366362f4c2d6bdb /src/mame/includes
parent765d625ac78ea14cec1e1a84c56567d980924869 (diff)
Add support for custom device constructors when replacing devices.
Current syntax: MCFG_DEVICE_REPLACE(tag_or_finder, TYPE, ...) Next-generation syntax: TYPE(config.replace(), tag_or_finder, ...) (nw) Kill off some more low-value macros that aren't needed any more, and get rid of the token-pasting voodoo and casts in the discrete sound macros.
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/8080bw.h8
-rw-r--r--src/mame/includes/atarifb.h4
-rw-r--r--src/mame/includes/bsktball.h2
-rw-r--r--src/mame/includes/canyon.h2
-rw-r--r--src/mame/includes/circus.h6
-rw-r--r--src/mame/includes/dragrace.h2
-rw-r--r--src/mame/includes/firetrk.h6
-rw-r--r--src/mame/includes/galaga.h4
-rw-r--r--src/mame/includes/grchamp.h2
-rw-r--r--src/mame/includes/hitme.h8
-rw-r--r--src/mame/includes/m79amb.h9
-rw-r--r--src/mame/includes/madalien.h6
-rw-r--r--src/mame/includes/nitedrvr.h2
-rw-r--r--src/mame/includes/norautp.h13
-rw-r--r--src/mame/includes/orbit.h2
-rw-r--r--src/mame/includes/poolshrk.h2
-rw-r--r--src/mame/includes/skydiver.h2
-rw-r--r--src/mame/includes/skyraid.h2
-rw-r--r--src/mame/includes/sprint2.h12
-rw-r--r--src/mame/includes/sprint8.h2
-rw-r--r--src/mame/includes/starshp1.h2
-rw-r--r--src/mame/includes/subs.h6
-rw-r--r--src/mame/includes/tank8.h2
-rw-r--r--src/mame/includes/triplhnt.h2
-rw-r--r--src/mame/includes/videopin.h2
25 files changed, 72 insertions, 38 deletions
diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h
index 5445758f042..143fb928b0f 100644
--- a/src/mame/includes/8080bw.h
+++ b/src/mame/includes/8080bw.h
@@ -247,9 +247,9 @@ public:
extern const char *const lrescue_sample_names[];
extern const char *const lupin3_sample_names[];
-DISCRETE_SOUND_EXTERN( ballbomb );
-DISCRETE_SOUND_EXTERN( indianbt );
-DISCRETE_SOUND_EXTERN( polaris );
-DISCRETE_SOUND_EXTERN( schaser );
+DISCRETE_SOUND_EXTERN( ballbomb_discrete );
+DISCRETE_SOUND_EXTERN( indianbt_discrete );
+DISCRETE_SOUND_EXTERN( polaris_discrete );
+DISCRETE_SOUND_EXTERN( schaser_discrete );
#endif // MAME_INCLUDES_8080BW_H
diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h
index cbc9b167e98..c7327c47130 100644
--- a/src/mame/includes/atarifb.h
+++ b/src/mame/includes/atarifb.h
@@ -109,5 +109,5 @@ public:
};
/*----------- defined in audio/atarifb.c -----------*/
-DISCRETE_SOUND_EXTERN( atarifb );
-DISCRETE_SOUND_EXTERN( abaseb );
+DISCRETE_SOUND_EXTERN( atarifb_discrete );
+DISCRETE_SOUND_EXTERN( abaseb_discrete );
diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h
index e865bf29d62..5d81556b962 100644
--- a/src/mame/includes/bsktball.h
+++ b/src/mame/includes/bsktball.h
@@ -87,6 +87,6 @@ private:
/*----------- defined in audio/bsktball.c -----------*/
-DISCRETE_SOUND_EXTERN( bsktball );
+DISCRETE_SOUND_EXTERN( bsktball_discrete );
#endif // MAME_INCLUDES_BSKTBALL_H
diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h
index b4fe2dcc8db..2b7d0f653dc 100644
--- a/src/mame/includes/canyon.h
+++ b/src/mame/includes/canyon.h
@@ -75,6 +75,6 @@ private:
/*----------- defined in audio/canyon.c -----------*/
-DISCRETE_SOUND_EXTERN( canyon );
+DISCRETE_SOUND_EXTERN( canyon_discrete );
#endif // MAME_INCLUDES_CANYON_H
diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h
index c60f6e84aa7..a3c16b3d8da 100644
--- a/src/mame/includes/circus.h
+++ b/src/mame/includes/circus.h
@@ -69,9 +69,9 @@ public:
};
/*----------- defined in audio/circus.c -----------*/
-DISCRETE_SOUND_EXTERN( circus );
-DISCRETE_SOUND_EXTERN( robotbwl );
-DISCRETE_SOUND_EXTERN( crash );
+DISCRETE_SOUND_EXTERN( circus_discrete );
+DISCRETE_SOUND_EXTERN( robotbwl_discrete );
+DISCRETE_SOUND_EXTERN( crash_discrete );
extern const char *const circus_sample_names[];
extern const char *const crash_sample_names[];
extern const char *const ripcord_sample_names[];
diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h
index edfbff1d496..be30d8fc8bd 100644
--- a/src/mame/includes/dragrace.h
+++ b/src/mame/includes/dragrace.h
@@ -85,6 +85,6 @@ private:
};
/*----------- defined in audio/dragrace.c -----------*/
-DISCRETE_SOUND_EXTERN( dragrace );
+DISCRETE_SOUND_EXTERN( dragrace_discrete );
#endif // MAME_INCLUDES_DRAGRACE_H
diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h
index 0044bed38de..b5e533cef40 100644
--- a/src/mame/includes/firetrk.h
+++ b/src/mame/includes/firetrk.h
@@ -162,6 +162,6 @@ public:
/*----------- defined in audio/firetrk.c -----------*/
-DISCRETE_SOUND_EXTERN( firetrk );
-DISCRETE_SOUND_EXTERN( superbug );
-DISCRETE_SOUND_EXTERN( montecar );
+DISCRETE_SOUND_EXTERN( firetrk_discrete );
+DISCRETE_SOUND_EXTERN( superbug_discrete );
+DISCRETE_SOUND_EXTERN( montecar_discrete );
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index b0320f7ab4b..0078fe69ed7 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -102,7 +102,7 @@ public:
void gatsbee_main_map(address_map &map);
};
-DISCRETE_SOUND_EXTERN( galaga );
-DISCRETE_SOUND_EXTERN( bosco );
+DISCRETE_SOUND_EXTERN( galaga_discrete );
+DISCRETE_SOUND_EXTERN( bosco_discrete );
#endif // MAME_INCLUDES_GALAGA_H
diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h
index 3c7d5ea3c76..17d1b1efaea 100644
--- a/src/mame/includes/grchamp.h
+++ b/src/mame/includes/grchamp.h
@@ -137,4 +137,4 @@ private:
/*----------- defined in audio/grchamp.c -----------*/
-DISCRETE_SOUND_EXTERN( grchamp );
+DISCRETE_SOUND_EXTERN( grchamp_discrete );
diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h
index e8a43f5722e..bfc2a61103e 100644
--- a/src/mame/includes/hitme.h
+++ b/src/mame/includes/hitme.h
@@ -5,6 +5,10 @@
Hitme hardware
*************************************************************************/
+#ifndef MAME_INCLUDES_HITME_H
+#define MAME_INCLUDES_HITME_H
+
+#pragma once
#include "sound/discrete.h"
#include "screen.h"
@@ -62,4 +66,6 @@ public:
/*----------- defined in audio/hitme.c -----------*/
-DISCRETE_SOUND_EXTERN( hitme );
+DISCRETE_SOUND_EXTERN( hitme_discrete );
+
+#endif // MAME_INCLUDES_HITME_H
diff --git a/src/mame/includes/m79amb.h b/src/mame/includes/m79amb.h
index 63a3df47201..367e331efb3 100644
--- a/src/mame/includes/m79amb.h
+++ b/src/mame/includes/m79amb.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Al Kossow
+#ifndef MAME_INCLUDES_M79AMB_H
+#define MAME_INCLUDES_M79AMB_H
+
+#pragma once
+
#include "sound/discrete.h"
class m79amb_state : public driver_device
@@ -48,4 +53,6 @@ protected:
/*----------- defined in audio/m79amb.c -----------*/
-DISCRETE_SOUND_EXTERN( m79amb );
+DISCRETE_SOUND_EXTERN( m79amb_discrete );
+
+#endif // MAME_INCLUDES_M79AMB_H
diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h
index 293b9b5f254..e253ccd5ac0 100644
--- a/src/mame/includes/madalien.h
+++ b/src/mame/includes/madalien.h
@@ -7,6 +7,8 @@
Original driver by Norbert Kehrer (February 2004)
***************************************************************************/
+#ifndef MAME_INCLUDES_MADALIEN_H
+#define MAME_INCLUDES_MADALIEN_H
#include "machine/gen_latch.h"
#include "sound/discrete.h"
@@ -91,8 +93,10 @@ public:
/*----------- defined in audio/madalien.c -----------*/
-DISCRETE_SOUND_EXTERN( madalien );
+DISCRETE_SOUND_EXTERN( madalien_discrete );
/* Discrete Sound Input Nodes */
#define MADALIEN_8910_PORTA NODE_01
#define MADALIEN_8910_PORTB NODE_02
+
+#endif // MAME_INCLUDES_MADALIEN_H
diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h
index c10615ad9a3..e4151e6dc94 100644
--- a/src/mame/includes/nitedrvr.h
+++ b/src/mame/includes/nitedrvr.h
@@ -83,6 +83,6 @@ private:
};
/*----------- defined in audio/nitedrvr.c -----------*/
-DISCRETE_SOUND_EXTERN( nitedrvr );
+DISCRETE_SOUND_EXTERN( nitedrvr_discrete );
#endif // MAME_INCLUDES_NITEDRVR_H
diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h
index 8e78ffc0548..55ddb2cef2a 100644
--- a/src/mame/includes/norautp.h
+++ b/src/mame/includes/norautp.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese, Roberto Fresca
+#ifndef MAME_INCLUDES_NORAUTP_H
+#define MAME_INCLUDES_NORAUTP_H
+
+#pragma once
+
#include "machine/i8255.h"
#include "sound/discrete.h"
#include "screen.h"
@@ -73,6 +78,8 @@ public:
};
/*----------- defined in audio/norautp.c -----------*/
-DISCRETE_SOUND_EXTERN( norautp );
-DISCRETE_SOUND_EXTERN( dphl );
-DISCRETE_SOUND_EXTERN( kimble );
+DISCRETE_SOUND_EXTERN( norautp_discrete );
+DISCRETE_SOUND_EXTERN( dphl_discrete );
+DISCRETE_SOUND_EXTERN( kimble_discrete );
+
+#endif // MAME_INCLUDES_NORAUTP_H
diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h
index 697959510a9..4395aeeae91 100644
--- a/src/mame/includes/orbit.h
+++ b/src/mame/includes/orbit.h
@@ -84,6 +84,6 @@ private:
};
/*----------- defined in audio/orbit.c -----------*/
-DISCRETE_SOUND_EXTERN( orbit );
+DISCRETE_SOUND_EXTERN( orbit_discrete );
#endif // MAME_INCLUDES_ORBIT_H
diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h
index d2dccbd175f..6244aba26f8 100644
--- a/src/mame/includes/poolshrk.h
+++ b/src/mame/includes/poolshrk.h
@@ -69,6 +69,6 @@ private:
/*----------- defined in audio/poolshrk.c -----------*/
-DISCRETE_SOUND_EXTERN( poolshrk );
+DISCRETE_SOUND_EXTERN( poolshrk_discrete );
#endif // MAME_INCLUDES_POOLSHRK_H
diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h
index 9c88d887b69..2e8f27545be 100644
--- a/src/mame/includes/skydiver.h
+++ b/src/mame/includes/skydiver.h
@@ -108,6 +108,6 @@ private:
};
/*----------- defined in audio/skydiver.c -----------*/
-DISCRETE_SOUND_EXTERN( skydiver );
+DISCRETE_SOUND_EXTERN( skydiver_discrete );
#endif // MAME_INCLUDES_SKYDIVER_H
diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h
index 1b77e50acd9..c350c39a601 100644
--- a/src/mame/includes/skyraid.h
+++ b/src/mame/includes/skyraid.h
@@ -62,6 +62,6 @@ private:
};
/*----------- defined in audio/skyraid.c -----------*/
-DISCRETE_SOUND_EXTERN( skyraid );
+DISCRETE_SOUND_EXTERN( skyraid_discrete );
#endif // MAME_INCLUDES_SKYRAID_H
diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h
index 6a5b2b8c4f3..975205cd779 100644
--- a/src/mame/includes/sprint2.h
+++ b/src/mame/includes/sprint2.h
@@ -5,6 +5,10 @@
Atari Sprint hardware
*************************************************************************/
+#ifndef MAME_INCLUDES_SPRINT2_H
+#define MAME_INCLUDES_SPRINT2_H
+
+#pragma once
#include "machine/74259.h"
#include "machine/watchdog.h"
@@ -95,6 +99,8 @@ public:
};
/*----------- defined in audio/sprint2.c -----------*/
-DISCRETE_SOUND_EXTERN( sprint2 );
-DISCRETE_SOUND_EXTERN( sprint1 );
-DISCRETE_SOUND_EXTERN( dominos );
+DISCRETE_SOUND_EXTERN( sprint2_discrete );
+DISCRETE_SOUND_EXTERN( sprint1_discrete );
+DISCRETE_SOUND_EXTERN( dominos_discrete );
+
+#endif // MAME_INCLUDES_SPRINT2_H
diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h
index ad1efed31f2..d9149494453 100644
--- a/src/mame/includes/sprint8.h
+++ b/src/mame/includes/sprint8.h
@@ -81,6 +81,6 @@ private:
};
/*----------- defined in audio/sprint8.c -----------*/
-DISCRETE_SOUND_EXTERN( sprint8 );
+DISCRETE_SOUND_EXTERN( sprint8_discrete );
#endif // MAME_INCLUDES_SPRINT8_H
diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h
index 6f4784d2807..d666e9db81d 100644
--- a/src/mame/includes/starshp1.h
+++ b/src/mame/includes/starshp1.h
@@ -140,7 +140,7 @@ private:
/*----------- defined in audio/starshp1.c -----------*/
-DISCRETE_SOUND_EXTERN( starshp1 );
+DISCRETE_SOUND_EXTERN( starshp1_discrete );
/* Discrete Sound Input Nodes */
#define STARSHP1_NOISE_AMPLITUDE NODE_01
diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h
index 8cc15820021..4be02524ac5 100644
--- a/src/mame/includes/subs.h
+++ b/src/mame/includes/subs.h
@@ -5,6 +5,8 @@
Atari Subs hardware
*************************************************************************/
+#ifndef MAME_INCLUDES_SUBS_H
+#define MAME_INCLUDES_SUBS_H
#include "sound/discrete.h"
@@ -70,4 +72,6 @@ public:
/*----------- defined in audio/subs.c -----------*/
-DISCRETE_SOUND_EXTERN( subs );
+DISCRETE_SOUND_EXTERN( subs_discrete );
+
+#endif // MAME_INCLUDES_SUBS_H
diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h
index 9666cd6cde1..a2210e11992 100644
--- a/src/mame/includes/tank8.h
+++ b/src/mame/includes/tank8.h
@@ -108,6 +108,6 @@ private:
/*----------- defined in audio/tank8.c -----------*/
-DISCRETE_SOUND_EXTERN( tank8 );
+DISCRETE_SOUND_EXTERN( tank8_discrete );
#endif // MAME_INCLUDES_TANK8_H
diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h
index bab6e60d32e..edf00b4a0ec 100644
--- a/src/mame/includes/triplhnt.h
+++ b/src/mame/includes/triplhnt.h
@@ -105,7 +105,7 @@ private:
};
/*----------- defined in audio/triplhnt.cpp -----------*/
-DISCRETE_SOUND_EXTERN( triplhnt );
+DISCRETE_SOUND_EXTERN( triplhnt_discrete );
extern const char *const triplhnt_sample_names[];
#endif // MAME_INCLUDES_TRIPLHNT_H
diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h
index 2ae279b8a07..31049b7fa07 100644
--- a/src/mame/includes/videopin.h
+++ b/src/mame/includes/videopin.h
@@ -86,6 +86,6 @@ private:
};
/*----------- defined in audio/videopin.c -----------*/
-DISCRETE_SOUND_EXTERN( videopin );
+DISCRETE_SOUND_EXTERN( videopin_discrete );
#endif // MAME_INCLUDES_VIDEOPIN_H