Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-03 19:36:26 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed the MACHINE_DRIVER_* macros, as follows:

Browse Source 
1. Renamed MACHINE_DRIVER_* to MACHINE_CONFIG_* to match the name
    of the object it actually describes. The MDRV_* prefix may
    eventually be bulk updated at some point, but not now.

 2. MACHINE_CONFIG_START() now takes a driver_data_t-derived
    class as a required second parameter. This means that
    MDRV_DRIVER_DATA() is no longer required, and every "root"
    machine config *must* specify a driver data class (or driver_data_t
    itself if the driver has not yet been updated to use driver data).

 3. New MACHINE_CONFIG_DERIVED() macro defines a machine_config
    that is derived from another machine_config. This takes the place
    of the very typical MACHINE_DRIVER_START()/MDRV_IMPORT_FROM()
    combination.

 4. New MACHINE_CONFIG_FRAGMENT() macro defines a partial 
    machine_config that can only be included in another "root"
    machine_config. This is also used for machine_configs that are
    specified as part of a device.

 5. Changed MDRV_IMPORT_FROM() to MDRV_FRAGMENT_ADD() to more
    accurately describe what is happening.

 6. Added asserts to the above three macros to ensure they are
    properly used.

Updated all machine drivers to use the new macros. Search & replace
lists below cover 99% of the changes, with just a few manual fixups.

S: MACHINE_DRIVER_START\( *([a-zA-Z0-9_]+) *\)[\r\n\t ]*MDRV_DRIVER_DATA\( *([a-zA-Z0-9_]+) *\)
R: MACHINE_CONFIG_START\( \1, \2 \)

S: MACHINE_DRIVER_START\( *([a-zA-Z0-9_]+) *\)[\r\n\t ]*/\* driver data \*/[\r\n\t ]*MDRV_DRIVER_DATA\( *([a-zA-Z0-9_]+) *\)
R: MACHINE_CONFIG_START\( \1, \2 \)

S: MACHINE_DRIVER_START\( *([a-zA-Z0-9_]+) *\)[\r\n\t ]*MDRV_IMPORT_FROM\( *([a-zA-Z0-9_]+) *\)
R: MACHINE_CONFIG_DERIVED\( \1, \2 \)

S: MACHINE_DRIVER_START\( *([a-zA-Z0-9_]+) *\)[\r\n\t ]*/\* basic machine hardware \*/[\r\n\t ]*MDRV_IMPORT_FROM\( *([a-zA-Z0-9_]+) *\)
R: MACHINE_CONFIG_DERIVED\( \1, \2 \)\r\n\r\n\t/\* basic machine hardware \*/

For all files outside of mame/drivers....
S: MACHINE_DRIVER_START
R: MACHINE_CONFIG_FRAGMENT in all non-drivers

For all files within mame/drivers....
S: MACHINE_DRIVER_START\( *([a-zA-Z0-9_]+) *\)
R: MACHINE_CONFIG_START\( \1, driver_data_t \)

S: MDRV_IMPORT_FROM
R: MDRV_FRAGMENT_ADD

S: MACHINE_DRIVER_END
R: MACHINE_CONFIG_END

S: MACHINE_DRIVER_NAME
R: MACHINE_CONFIG_NAME

S: MACHINE_DRIVER_EXTERN
R: MACHINE_CONFIG_EXTERN

Final step: run mame -valid and fix the incorrect macros at the lines
where the asserts show up.
This commit is contained in:
Aaron Giles 2010-09-01 05:03:27 +00:00
parent ce3c3205cc
commit f6b83b62c5
1165 changed files with 6780 additions and 10422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/devtempl.h
View File

@ -170,7 +170,7 @@ DEVICE_GET_INFO( DEVTEMPLATE_ID(,) )
case DEVINFO_PTR_ROM_REGION: info->romregion = DEVTEMPLATE_ID1(ROM_NAME()); break;
#endif
#if ((DEVTEMPLATE_FEATURES) & DT_HAS_MACHINE_CONFIG)
case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = DEVTEMPLATE_ID1(MACHINE_DRIVER_NAME()); break;
case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = DEVTEMPLATE_ID1(MACHINE_CONFIG_NAME()); break;
#endif
#if ((DEVTEMPLATE_FEATURES) & DT_HAS_PROGRAM_SPACE)
#ifdef DEVTEMPLATE_PGM_INTMAP
@ -277,7 +277,7 @@ DEVICE_GET_INFO( DEVTEMPLATE_DERIVED_ID(,) )
case DEVINFO_PTR_ROM_REGION: info->romregion = DEVTEMPLATE_DERIVED_ID1(ROM_NAME()); break;
#endif
#if ((DEVTEMPLATE_DERIVED_FEATURES) & DT_HAS_MACHINE_CONFIG)
case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = DEVTEMPLATE_DERIVED_ID1(MACHINE_DRIVER_NAME()); break;
case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = DEVTEMPLATE_DERIVED_ID1(MACHINE_CONFIG_NAME()); break;
#endif
/* --- the following bits of info are returned as pointers to data or functions --- */

2
src/emu/driver.h
View File

@ -105,7 +105,7 @@ extern const game_driver GAME_NAME(NAME) = \
FULLNAME, \
#YEAR, \
COMPANY, \
MACHINE_DRIVER_NAME(MACHINE), \
MACHINE_CONFIG_NAME(MACHINE), \
INPUT_PORTS_NAME(INPUT), \
DRIVER_INIT_NAME(INIT), \
ROM_NAME(NAME), \

4
src/emu/drivers/empty.c
View File

@ -34,7 +34,7 @@ static MACHINE_START( empty )
*
*************************************/
static MACHINE_DRIVER_START( empty )
static MACHINE_CONFIG_START( empty, driver_data_t )
MDRV_MACHINE_START(empty)
@ -44,7 +44,7 @@ static MACHINE_DRIVER_START( empty )
MDRV_SCREEN_SIZE(640,480)
MDRV_SCREEN_VISIBLE_AREA(0,639, 0,479)
MDRV_SCREEN_REFRESH_RATE(30)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

10
src/emu/machine.c
View File

@ -1008,6 +1008,16 @@ driver_data_t::~driver_data_t()
}
//-------------------------------------------------
// alloc - static allocator for this class
//-------------------------------------------------
driver_data_t *driver_data_t::alloc(running_machine &machine)
{
return auto_alloc_clear(&machine, driver_data_t(machine));
}
//-------------------------------------------------
// machine_start - default implementation which
// calls to the legacy machine_start function

4
src/emu/machine.h
View File

@ -160,11 +160,11 @@ typedef tagged_list<region_info> region_list;
// base class for all driver data structures
class driver_data_t : public bindable_object
{
friend class running_machine;
public:
driver_data_t(running_machine &machine);
virtual ~driver_data_t();
static driver_data_t *alloc(running_machine &machine);
virtual void machine_start();
virtual void machine_reset();

14
src/emu/machine/ldpr8210.c
View File

@ -285,10 +285,10 @@ static ADDRESS_MAP_START( pr8210_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static MACHINE_DRIVER_START( pr8210 )
static MACHINE_CONFIG_FRAGMENT( pr8210 )
MDRV_CPU_ADD("pr8210", I8049, XTAL_4_41MHz)
MDRV_CPU_IO_MAP(pr8210_portmap)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( pr8210 )
@ -308,7 +308,7 @@ const ldplayer_interface pr8210_interface =
sizeof(ldplayer_data), /* size of the state */
"Pioneer PR-8210", /* name of the player */
ROM_NAME(pr8210), /* pointer to ROM region information */
MACHINE_DRIVER_NAME(pr8210), /* pointer to machine configuration */
MACHINE_CONFIG_NAME(pr8210), /* pointer to machine configuration */
pr8210_init, /* initialization callback */
pr8210_vsync, /* vsync callback */
pr8210_update, /* update callback */
@ -996,12 +996,12 @@ static ADDRESS_MAP_START( simutrek_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static MACHINE_DRIVER_START( simutrek )
static MACHINE_CONFIG_FRAGMENT( simutrek )
MDRV_CPU_ADD("simutrek", I8748, XTAL_6MHz)
MDRV_CPU_IO_MAP(simutrek_portmap)
MDRV_IMPORT_FROM(pr8210)
MACHINE_DRIVER_END
MDRV_FRAGMENT_ADD(pr8210)
MACHINE_CONFIG_END
ROM_START( simutrek )
@ -1024,7 +1024,7 @@ const ldplayer_interface simutrek_interface =
sizeof(ldplayer_data), /* size of the state */
"Simutrek Modified PR-8210", /* name of the player */
ROM_NAME(simutrek), /* pointer to ROM region information */
MACHINE_DRIVER_NAME(simutrek), /* pointer to machine configuration */
MACHINE_CONFIG_NAME(simutrek), /* pointer to machine configuration */
simutrek_init, /* initialization callback */
simutrek_vsync, /* vsync callback */
simutrek_update, /* update callback */

6
src/emu/machine/ldv1000.c
View File

@ -166,7 +166,7 @@ static const z80_daisy_config daisy_chain[] =
};
static MACHINE_DRIVER_START( ldv1000 )
static MACHINE_CONFIG_FRAGMENT( ldv1000 )
MDRV_CPU_ADD("ldv1000", Z80, XTAL_5MHz/2)
MDRV_CPU_CONFIG(daisy_chain)
MDRV_CPU_PROGRAM_MAP(ldv1000_map)
@ -176,7 +176,7 @@ static MACHINE_DRIVER_START( ldv1000 )
MDRV_PPI8255_ADD("ldvppi0", ppi0intf)
MDRV_PPI8255_ADD("ldvppi1", ppi1intf)
MDRV_TIMER_ADD("multitimer", multijump_timer)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( ldv1000 )
@ -196,7 +196,7 @@ const ldplayer_interface ldv1000_interface =
sizeof(ldplayer_data), /* size of the state */
"Pioneer LD-V1000", /* name of the player */
ROM_NAME(ldv1000), /* pointer to ROM region information */
MACHINE_DRIVER_NAME(ldv1000), /* pointer to machine configuration */
MACHINE_CONFIG_NAME(ldv1000), /* pointer to machine configuration */
ldv1000_init, /* initialization callback */
ldv1000_vsync, /* vsync callback */
ldv1000_update, /* update callback */

6
src/emu/machine/ldvp931.c
View File

@ -133,11 +133,11 @@ static ADDRESS_MAP_START( vp931_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static MACHINE_DRIVER_START( vp931 )
static MACHINE_CONFIG_FRAGMENT( vp931 )
MDRV_CPU_ADD("vp931", I8049, XTAL_11MHz)
MDRV_CPU_IO_MAP(vp931_portmap)
MDRV_TIMER_ADD("tracktimer", track_timer)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( vp931 )
@ -157,7 +157,7 @@ const ldplayer_interface vp931_interface =
sizeof(ldplayer_data), /* size of the state */
"Phillips 22VP931", /* name of the player */
ROM_NAME(vp931), /* pointer to ROM region information */
MACHINE_DRIVER_NAME(vp931), /* pointer to machine configuration */
MACHINE_CONFIG_NAME(vp931), /* pointer to machine configuration */
vp931_init, /* initialization callback */
vp931_vsync, /* vsync callback */
vp931_update, /* update callback */

2
src/emu/machine/pcshare.h
View File

@ -11,4 +11,4 @@ void pc_keyb_clear(void);
extern IRQ_CALLBACK(pcat_irq_callback);
ADDRESS_MAP_EXTERN(pcat32_io_common, 32);
MACHINE_DRIVER_EXTERN(pcat_common);
MACHINE_CONFIG_EXTERN(pcat_common);

42
src/emu/mconfig.h
View File

@ -228,34 +228,54 @@ private:
//**************************************************************************
// start/end tags for the machine driver
#define MACHINE_DRIVER_NAME(_name) construct_machine_config_##_name
#define MACHINE_CONFIG_NAME(_name) construct_machine_config_##_name
#define MACHINE_DRIVER_START(_name) \
void MACHINE_DRIVER_NAME(_name)(machine_config &config, device_config *owner) \
#define MACHINE_CONFIG_START(_name, _class) \
void MACHINE_CONFIG_NAME(_name)(machine_config &config, device_config *owner) \
{ \
device_config *device = NULL; \
const char *tag; \
astring tempstring; \
(void)device; \
(void)tag; \
assert(config.m_driver_data_alloc == NULL); \
config.m_driver_data_alloc = &_class::alloc; \
#define MACHINE_DRIVER_END \
#define MACHINE_CONFIG_FRAGMENT(_name) \
void MACHINE_CONFIG_NAME(_name)(machine_config &config, device_config *owner) \
{ \
device_config *device = NULL; \
const char *tag; \
astring tempstring; \
(void)device; \
(void)tag; \
assert(config.m_driver_data_alloc != NULL); \
#define MACHINE_CONFIG_DERIVED(_name, _base) \
void MACHINE_CONFIG_NAME(_name)(machine_config &config, device_config *owner) \
{ \
device_config *device = NULL; \
const char *tag; \
astring tempstring; \
(void)device; \
(void)tag; \
MACHINE_CONFIG_NAME(_base)(config, owner); \
assert(config.m_driver_data_alloc != NULL); \
#define MACHINE_CONFIG_END \
}
// use this to declare external references to a machine driver
#define MACHINE_DRIVER_EXTERN(_name) \
extern void MACHINE_DRIVER_NAME(_name)(machine_config &config, device_config *owner)
#define MACHINE_CONFIG_EXTERN(_name) \
extern void MACHINE_CONFIG_NAME(_name)(machine_config &config, device_config *owner)
// importing data from other machine drivers
#define MDRV_IMPORT_FROM(_name) \
MACHINE_DRIVER_NAME(_name)(config, owner);
#define MDRV_FRAGMENT_ADD(_name) \
MACHINE_CONFIG_NAME(_name)(config, owner);
// core parameters
#define MDRV_DRIVER_DATA(_class) \
config.m_driver_data_alloc = &_class::alloc; \
#define MDRV_QUANTUM_TIME(_time) \
config.m_minimum_quantum = ATTOTIME_IN_##_time; \

8
src/emu/video/pc_vga.c
View File

@ -179,7 +179,7 @@ static const unsigned short vga_colortable[] =
15, 0,15, 1,15, 2,15, 3,15, 4,15, 5,15, 6,15, 7,15, 8,15, 9,15,10,15,11,15,12,15,13,15,14,15,15
};
MACHINE_DRIVER_START( pcvideo_vga )
MACHINE_CONFIG_FRAGMENT( pcvideo_vga )
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
MDRV_SCREEN_SIZE(720, 480)
@ -190,9 +190,9 @@ MACHINE_DRIVER_START( pcvideo_vga )
MDRV_VIDEO_START(vga)
MDRV_VIDEO_RESET(vga)
MDRV_VIDEO_UPDATE(pc_video)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( pcvideo_pc1640 )
MACHINE_CONFIG_FRAGMENT( pcvideo_pc1640 )
MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
MDRV_SCREEN_SIZE(720, 350)
@ -203,7 +203,7 @@ MACHINE_DRIVER_START( pcvideo_pc1640 )
MDRV_VIDEO_START(ega)
MDRV_VIDEO_RESET(ega)
MDRV_VIDEO_UPDATE(pc_video)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/***************************************************************************/

4
src/emu/video/pc_vga.h
View File

@ -12,8 +12,8 @@
#include "osdepend.h"
#include "pc_video.h"
MACHINE_DRIVER_EXTERN( pcvideo_vga );
MACHINE_DRIVER_EXTERN( pcvideo_pc1640 );
MACHINE_CONFIG_EXTERN( pcvideo_vga );
MACHINE_CONFIG_EXTERN( pcvideo_pc1640 );
struct pc_vga_interface
{

4
src/emu/video/tms9928a.c
View File

@ -817,7 +817,7 @@ VIDEO_START( tms9928a )
}
MACHINE_DRIVER_START( tms9928a )
MACHINE_CONFIG_FRAGMENT( tms9928a )
/* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
@ -832,5 +832,5 @@ MACHINE_DRIVER_START( tms9928a )
MDRV_VIDEO_START(tms9928a)
MDRV_VIDEO_UPDATE(tms9928a)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

2
src/emu/video/tms9928a.h
View File

@ -85,4 +85,4 @@ void TMS9928A_post_load (running_machine *machine);
/*
** MachineDriver video declarations for the TMS9928A chip
*/
MACHINE_DRIVER_EXTERN( tms9928a );
MACHINE_CONFIG_EXTERN( tms9928a );

19
src/ldplayer/ldplayer.c
View File

@ -555,7 +555,7 @@ INPUT_PORTS_END
*
*************************************/
static MACHINE_DRIVER_START( ldplayer_core )
static MACHINE_CONFIG_FRAGMENT( ldplayer_core )
MDRV_MACHINE_START(ldplayer)
MDRV_MACHINE_RESET(ldplayer)
@ -566,29 +566,26 @@ static MACHINE_DRIVER_START( ldplayer_core )
MDRV_SOUND_ADD("ldsound", LASERDISC, 0)
MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( ldplayer_ntsc )
MDRV_IMPORT_FROM(ldplayer_core)
static MACHINE_CONFIG_DERIVED( ldplayer_ntsc, ldplayer_core )
MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( ldv1000 )
MDRV_IMPORT_FROM(ldplayer_ntsc)
static MACHINE_CONFIG_DERIVED( ldv1000, ldplayer_ntsc )
MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
MDRV_LASERDISC_GET_DISC(get_disc)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( pr8210 )
MDRV_IMPORT_FROM(ldplayer_ntsc)
static MACHINE_CONFIG_DERIVED( pr8210, ldplayer_ntsc )
MDRV_MACHINE_START(pr8210)
MDRV_MACHINE_RESET(pr8210)
MDRV_LASERDISC_ADD("laserdisc", PIONEER_PR8210, "screen", "ldsound")
MDRV_LASERDISC_GET_DISC(get_disc)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

12
src/mame/audio/astrof.c
View File

@ -149,12 +149,12 @@ static const samples_interface astrof_samples_interface =
MACHINE_DRIVER_START( astrof_audio )
MACHINE_CONFIG_FRAGMENT( astrof_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(astrof_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -170,9 +170,9 @@ WRITE8_HANDLER( spfghmk2_audio_w )
}
MACHINE_DRIVER_START( spfghmk2_audio )
MACHINE_CONFIG_FRAGMENT( spfghmk2_audio )
/* nothing yet */
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -234,9 +234,9 @@ static const sn76477_interface tomahawk_sn76477_interface =
};
MACHINE_DRIVER_START( tomahawk_audio )
MACHINE_CONFIG_FRAGMENT( tomahawk_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("snsnd", SN76477, 0)
MDRV_SOUND_CONFIG(tomahawk_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

36
src/mame/audio/atarijsa.c
View File

@ -803,7 +803,7 @@ static const ym2151_interface ym2151_config =
*************************************/
/* Used by Blasteroids */
MACHINE_DRIVER_START( jsa_i_stereo )
MACHINE_CONFIG_FRAGMENT( jsa_i_stereo )
/* basic machine hardware */
MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
@ -817,38 +817,36 @@ MACHINE_DRIVER_START( jsa_i_stereo )
MDRV_SOUND_CONFIG(ym2151_config)
MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* Used by Xybots */
MACHINE_DRIVER_START( jsa_i_stereo_swapped )
MACHINE_CONFIG_DERIVED( jsa_i_stereo_swapped, jsa_i_stereo )
/* basic machine hardware */
MDRV_IMPORT_FROM(jsa_i_stereo)
/* sound hardware */
MDRV_SOUND_REPLACE("ymsnd", YM2151, JSA_MASTER_CLOCK)
MDRV_SOUND_CONFIG(ym2151_config)
MDRV_SOUND_ROUTE(0, "rspeaker", 0.60)
MDRV_SOUND_ROUTE(1, "lspeaker", 0.60)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* Used by Toobin', Vindicators */
MACHINE_DRIVER_START( jsa_i_stereo_pokey )
MACHINE_CONFIG_DERIVED( jsa_i_stereo_pokey, jsa_i_stereo )
/* basic machine hardware */
MDRV_IMPORT_FROM(jsa_i_stereo)
/* sound hardware */
MDRV_SOUND_ADD("pokey", POKEY, JSA_MASTER_CLOCK/2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* Used by Escape from the Planet of the Robot Monsters */
MACHINE_DRIVER_START( jsa_i_mono_speech )
MACHINE_CONFIG_FRAGMENT( jsa_i_mono_speech )
/* basic machine hardware */
MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
@ -865,11 +863,11 @@ MACHINE_DRIVER_START( jsa_i_mono_speech )
MDRV_SOUND_ADD("tms", TMS5220C, JSA_MASTER_CLOCK*2/11) /* potentially JSA_MASTER_CLOCK/9 as well */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* Used by Cyberball 2072, STUN Runner, Skull & Crossbones, ThunderJaws, Hydra, Pit Fighter */
MACHINE_DRIVER_START( jsa_ii_mono )
MACHINE_CONFIG_FRAGMENT( jsa_ii_mono )
/* basic machine hardware */
MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
@ -886,35 +884,33 @@ MACHINE_DRIVER_START( jsa_ii_mono )
MDRV_OKIM6295_ADD("adpcm", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* Used by Batman, Guardians of the 'Hood, Road Riot 4WD, Steel Talons */
MACHINE_DRIVER_START( jsa_iii_mono )
MACHINE_CONFIG_DERIVED( jsa_iii_mono, jsa_ii_mono )
/* basic machine hardware */
MDRV_IMPORT_FROM(jsa_ii_mono)
MDRV_CPU_MODIFY("jsa")
MDRV_CPU_PROGRAM_MAP(atarijsa3_map)
MDRV_DEVICE_MODIFY("adpcm")
MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* Used by Off the Wall */
MACHINE_DRIVER_START( jsa_iii_mono_noadpcm )
MACHINE_CONFIG_DERIVED( jsa_iii_mono_noadpcm, jsa_iii_mono )
/* basic machine hardware */
MDRV_IMPORT_FROM(jsa_iii_mono)
/* sound hardware */
MDRV_DEVICE_REMOVE("adpcm")
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* Used by Space Lords, Moto Frenzy, Road Riot's Revenge Rally */
MACHINE_DRIVER_START( jsa_iiis_stereo )
MACHINE_CONFIG_FRAGMENT( jsa_iiis_stereo )
/* basic machine hardware */
MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
@ -936,7 +932,7 @@ MACHINE_DRIVER_START( jsa_iiis_stereo )
MDRV_OKIM6295_ADD("adpcmr", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki2_map)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************************

16
src/mame/audio/atarijsa.h
View File

@ -9,14 +9,14 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask)
void atarijsa_reset(void);
MACHINE_DRIVER_EXTERN( jsa_i_stereo );
MACHINE_DRIVER_EXTERN( jsa_i_stereo_swapped );
MACHINE_DRIVER_EXTERN( jsa_i_stereo_pokey );
MACHINE_DRIVER_EXTERN( jsa_i_mono_speech );
MACHINE_DRIVER_EXTERN( jsa_ii_mono );
MACHINE_DRIVER_EXTERN( jsa_iii_mono );
MACHINE_DRIVER_EXTERN( jsa_iii_mono_noadpcm );
MACHINE_DRIVER_EXTERN( jsa_iiis_stereo );
MACHINE_CONFIG_EXTERN( jsa_i_stereo );
MACHINE_CONFIG_EXTERN( jsa_i_stereo_swapped );
MACHINE_CONFIG_EXTERN( jsa_i_stereo_pokey );
MACHINE_CONFIG_EXTERN( jsa_i_mono_speech );
MACHINE_CONFIG_EXTERN( jsa_ii_mono );
MACHINE_CONFIG_EXTERN( jsa_iii_mono );
MACHINE_CONFIG_EXTERN( jsa_iii_mono_noadpcm );
MACHINE_CONFIG_EXTERN( jsa_iiis_stereo );
/* Board-specific port definitions */

4
src/mame/audio/bzone.c
View File

@ -407,7 +407,7 @@ WRITE8_DEVICE_HANDLER( bzone_sounds_w )
}
MACHINE_DRIVER_START( bzone_audio )
MACHINE_CONFIG_FRAGMENT( bzone_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
@ -419,4 +419,4 @@ MACHINE_DRIVER_START( bzone_audio )
MDRV_SOUND_CONFIG_DISCRETE(bzone)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0 / BZ_FINAL_GAIN)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

9
src/mame/audio/cage.c
View File

@ -647,7 +647,7 @@ ADDRESS_MAP_END
*
*************************************/
MACHINE_DRIVER_START( cage )
MACHINE_CONFIG_FRAGMENT( cage )
/* basic machine hardware */
MDRV_CPU_ADD("cage", TMS32031, 33868800)
@ -680,12 +680,11 @@ MACHINE_DRIVER_START( cage )
MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
#endif
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( cage_seattle )
MDRV_IMPORT_FROM(cage)
MACHINE_CONFIG_DERIVED( cage_seattle, cage )
MDRV_CPU_MODIFY("cage")
MDRV_CPU_PROGRAM_MAP(cage_map_seattle)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

4
src/mame/audio/cage.h
View File

@ -7,8 +7,8 @@
#define CAGE_IRQ_REASON_DATA_READY (1)
#define CAGE_IRQ_REASON_BUFFER_EMPTY (2)
MACHINE_DRIVER_EXTERN( cage );
MACHINE_DRIVER_EXTERN( cage_seattle );
MACHINE_CONFIG_EXTERN( cage );
MACHINE_CONFIG_EXTERN( cage_seattle );
void cage_init(running_machine *machine, offs_t speedup);
void cage_set_irq_handler(void (*irqhandler)(running_machine *, int));

4
src/mame/audio/carnival.c
View File

@ -296,7 +296,7 @@ static ADDRESS_MAP_START( carnival_audio_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
MACHINE_DRIVER_START( carnival_audio )
MACHINE_CONFIG_FRAGMENT( carnival_audio )
MDRV_CPU_ADD("audiocpu", I8039, 3579545)
MDRV_CPU_PROGRAM_MAP(carnival_audio_map)
MDRV_CPU_IO_MAP(carnival_audio_io_map)
@ -309,4 +309,4 @@ MACHINE_DRIVER_START( carnival_audio )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(carnival_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

65
src/mame/audio/cinemat.c
View File

@ -209,7 +209,7 @@ static MACHINE_RESET( spacewar )
generic_init(machine, spacewar_sound_w);
}
MACHINE_DRIVER_START( spacewar_sound )
MACHINE_CONFIG_FRAGMENT( spacewar_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(spacewar)
@ -218,7 +218,7 @@ MACHINE_DRIVER_START( spacewar_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(spacewar_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -265,7 +265,7 @@ static MACHINE_RESET( barrier )
generic_init(machine, barrier_sound_w);
}
MACHINE_DRIVER_START( barrier_sound )
MACHINE_CONFIG_FRAGMENT( barrier_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(barrier)
@ -274,7 +274,7 @@ MACHINE_DRIVER_START( barrier_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(barrier_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -326,7 +326,7 @@ static MACHINE_RESET( speedfrk )
generic_init(machine, speedfrk_sound_w);
}
MACHINE_DRIVER_START( speedfrk_sound )
MACHINE_CONFIG_FRAGMENT( speedfrk_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(speedfrk)
@ -335,7 +335,7 @@ MACHINE_DRIVER_START( speedfrk_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(speedfrk_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -403,7 +403,7 @@ static MACHINE_RESET( starhawk )
generic_init(machine, starhawk_sound_w);
}
MACHINE_DRIVER_START( starhawk_sound )
MACHINE_CONFIG_FRAGMENT( starhawk_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(starhawk)
@ -412,7 +412,7 @@ MACHINE_DRIVER_START( starhawk_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(starhawk_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -474,7 +474,7 @@ static MACHINE_RESET( sundance )
generic_init(machine, sundance_sound_w);
}
MACHINE_DRIVER_START( sundance_sound )
MACHINE_CONFIG_FRAGMENT( sundance_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(sundance)
@ -483,7 +483,7 @@ MACHINE_DRIVER_START( sundance_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(sundance_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -564,7 +564,7 @@ static MACHINE_RESET( tailg )
generic_init(machine, tailg_sound_w);
}
MACHINE_DRIVER_START( tailg_sound )
MACHINE_CONFIG_FRAGMENT( tailg_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(tailg)
@ -573,7 +573,7 @@ MACHINE_DRIVER_START( tailg_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(tailg_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -634,7 +634,7 @@ static MACHINE_RESET( warrior )
generic_init(machine, warrior_sound_w);
}
MACHINE_DRIVER_START( warrior_sound )
MACHINE_CONFIG_FRAGMENT( warrior_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(warrior)
@ -643,7 +643,7 @@ MACHINE_DRIVER_START( warrior_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(warrior_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -730,7 +730,7 @@ static MACHINE_RESET( armora )
generic_init(machine, armora_sound_w);
}
MACHINE_DRIVER_START( armora_sound )
MACHINE_CONFIG_FRAGMENT( armora_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(armora)
@ -739,7 +739,7 @@ MACHINE_DRIVER_START( armora_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(armora_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -823,7 +823,7 @@ static MACHINE_RESET( ripoff )
generic_init(machine, ripoff_sound_w);
}
MACHINE_DRIVER_START( ripoff_sound )
MACHINE_CONFIG_FRAGMENT( ripoff_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(ripoff)
@ -832,7 +832,7 @@ MACHINE_DRIVER_START( ripoff_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(ripoff_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -937,7 +937,7 @@ static MACHINE_RESET( starcas )
generic_init(machine, starcas_sound_w);
}
MACHINE_DRIVER_START( starcas_sound )
MACHINE_CONFIG_FRAGMENT( starcas_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(starcas)
@ -946,7 +946,7 @@ MACHINE_DRIVER_START( starcas_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(starcas_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -1074,7 +1074,7 @@ static MACHINE_RESET( solarq )
generic_init(machine, solarq_sound_w);
}
MACHINE_DRIVER_START( solarq_sound )
MACHINE_CONFIG_FRAGMENT( solarq_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(solarq)
@ -1083,7 +1083,7 @@ MACHINE_DRIVER_START( solarq_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(solarq_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -1210,7 +1210,7 @@ static MACHINE_RESET( boxingb )
generic_init(machine, boxingb_sound_w);
}
MACHINE_DRIVER_START( boxingb_sound )
MACHINE_CONFIG_FRAGMENT( boxingb_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(boxingb)
@ -1219,7 +1219,7 @@ MACHINE_DRIVER_START( boxingb_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(boxingb_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -1324,7 +1324,7 @@ static MACHINE_RESET( wotw )
generic_init(machine, wotw_sound_w);
}
MACHINE_DRIVER_START( wotw_sound )
MACHINE_CONFIG_FRAGMENT( wotw_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(wotw)
@ -1333,7 +1333,7 @@ MACHINE_DRIVER_START( wotw_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(wotw_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -1438,7 +1438,7 @@ static MACHINE_RESET( wotwc )
generic_init(machine, wotwc_sound_w);
}
MACHINE_DRIVER_START( wotwc_sound )
MACHINE_CONFIG_FRAGMENT( wotwc_sound )
MDRV_MACHINE_START(generic)
MDRV_MACHINE_RESET(wotwc)
@ -1447,7 +1447,7 @@ MACHINE_DRIVER_START( wotwc_sound )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(wotwc_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -1585,7 +1585,7 @@ static const z80_daisy_config daisy_chain[] =
};
MACHINE_DRIVER_START( demon_sound )
MACHINE_CONFIG_FRAGMENT( demon_sound )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", Z80, 3579545)
@ -1611,7 +1611,7 @@ MACHINE_DRIVER_START( demon_sound )
MDRV_SOUND_ADD("ay3", AY8910, 3579545)
MDRV_SOUND_CONFIG(demon_ay8910_interface_3)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -1639,7 +1639,6 @@ static MACHINE_RESET( qb3_sound )
}
MACHINE_DRIVER_START( qb3_sound )
MDRV_IMPORT_FROM(demon_sound)
MACHINE_CONFIG_DERIVED( qb3_sound, demon_sound )
MDRV_MACHINE_RESET(qb3_sound)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

4
src/mame/audio/crbaloon.c
View File

@ -167,7 +167,7 @@ static const sn76477_interface crbaloon_sn76477_interface =
MACHINE_DRIVER_START( crbaloon_audio )
MACHINE_CONFIG_FRAGMENT( crbaloon_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
@ -178,4 +178,4 @@ MACHINE_DRIVER_START( crbaloon_audio )
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(crbaloon)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

31
src/mame/audio/dcs.c
View File

@ -608,7 +608,7 @@ static const adsp21xx_config adsp_config =
*************************************/
/* Basic DCS system with ADSP-2105 and 2k of SRAM (T-unit, V-unit, Killer Instinct) */
MACHINE_DRIVER_START( dcs_audio_2k )
MACHINE_CONFIG_FRAGMENT( dcs_audio_2k )
MDRV_CPU_ADD("dcs", ADSP2105, XTAL_10MHz)
MDRV_CPU_CONFIG(adsp_config)
MDRV_CPU_PROGRAM_MAP(dcs_2k_program_map)
@ -621,26 +621,24 @@ MACHINE_DRIVER_START( dcs_audio_2k )
MDRV_SOUND_ADD("dac", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* Basic DCS system with ADSP-2105 and 2k of SRAM, using a UART for communications (X-unit) */
MACHINE_DRIVER_START( dcs_audio_2k_uart )
MDRV_IMPORT_FROM(dcs_audio_2k)
MACHINE_CONFIG_DERIVED( dcs_audio_2k_uart, dcs_audio_2k )
MDRV_CPU_MODIFY("dcs")
MDRV_CPU_DATA_MAP(dcs_2k_uart_data_map)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* Basic DCS system with ADSP-2105 and 8k of SRAM (Wolf-unit) */
MACHINE_DRIVER_START( dcs_audio_8k )
MDRV_IMPORT_FROM(dcs_audio_2k)
MACHINE_CONFIG_DERIVED( dcs_audio_8k, dcs_audio_2k )
MDRV_CPU_MODIFY("dcs")
MDRV_CPU_PROGRAM_MAP(dcs_8k_program_map)
MDRV_CPU_DATA_MAP(dcs_8k_data_map)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -650,7 +648,7 @@ MACHINE_DRIVER_END
*
*************************************/
MACHINE_DRIVER_START( dcs2_audio_2115 )
MACHINE_CONFIG_FRAGMENT( dcs2_audio_2115 )
MDRV_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz)
MDRV_CPU_CONFIG(adsp_config)
MDRV_CPU_PROGRAM_MAP(dcs2_2115_program_map)
@ -668,16 +666,15 @@ MACHINE_DRIVER_START( dcs2_audio_2115 )
MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( dcs2_audio_2104 )
MDRV_IMPORT_FROM(dcs2_audio_2115)
MACHINE_CONFIG_DERIVED( dcs2_audio_2104, dcs2_audio_2115 )
MDRV_CPU_REPLACE("dcs2", ADSP2104, XTAL_16MHz)
MDRV_CPU_CONFIG(adsp_config)
MDRV_CPU_PROGRAM_MAP(dcs2_2104_program_map)
MDRV_CPU_DATA_MAP(dcs2_2104_data_map)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -687,7 +684,7 @@ MACHINE_DRIVER_END
*
*************************************/
MACHINE_DRIVER_START( dcs2_audio_dsio )
MACHINE_CONFIG_FRAGMENT( dcs2_audio_dsio )
MDRV_CPU_ADD("dsio", ADSP2181, XTAL_32MHz)
MDRV_CPU_CONFIG(adsp_config)
MDRV_CPU_PROGRAM_MAP(dsio_program_map)
@ -701,7 +698,7 @@ MACHINE_DRIVER_START( dcs2_audio_dsio )
MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -711,7 +708,7 @@ MACHINE_DRIVER_END
*
*************************************/
MACHINE_DRIVER_START( dcs2_audio_denver )
MACHINE_CONFIG_FRAGMENT( dcs2_audio_denver )
MDRV_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz)
MDRV_CPU_CONFIG(adsp_config)
MDRV_CPU_PROGRAM_MAP(denver_program_map)
@ -737,7 +734,7 @@ MACHINE_DRIVER_START( dcs2_audio_denver )
MDRV_SOUND_ADD("dac6", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

14
src/mame/audio/dcs.h
View File

@ -4,13 +4,13 @@
****************************************************************************/
MACHINE_DRIVER_EXTERN( dcs_audio_2k );
MACHINE_DRIVER_EXTERN( dcs_audio_2k_uart );
MACHINE_DRIVER_EXTERN( dcs_audio_8k );
MACHINE_DRIVER_EXTERN( dcs2_audio_2115 );
MACHINE_DRIVER_EXTERN( dcs2_audio_2104 );
MACHINE_DRIVER_EXTERN( dcs2_audio_dsio );
MACHINE_DRIVER_EXTERN( dcs2_audio_denver );
MACHINE_CONFIG_EXTERN( dcs_audio_2k );
MACHINE_CONFIG_EXTERN( dcs_audio_2k_uart );
MACHINE_CONFIG_EXTERN( dcs_audio_8k );
MACHINE_CONFIG_EXTERN( dcs2_audio_2115 );
MACHINE_CONFIG_EXTERN( dcs2_audio_2104 );
MACHINE_CONFIG_EXTERN( dcs2_audio_dsio );
MACHINE_CONFIG_EXTERN( dcs2_audio_denver );
void dcs_init(running_machine *machine);
void dcs2_init(running_machine *machine, int dram_in_mb, offs_t polling_offset);

4
src/mame/audio/depthch.c
View File

@ -36,11 +36,11 @@ static const samples_interface depthch_samples_interface =
};
MACHINE_DRIVER_START( depthch_audio )
MACHINE_CONFIG_FRAGMENT( depthch_audio )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(depthch_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* sample IDs - must match sample file name table above */

24
src/mame/audio/dkong.c
View File

@ -1312,7 +1312,7 @@ const tms5110_interface tms_interface = {
*
*************************************/
MACHINE_DRIVER_START( dkong2b_audio )
MACHINE_CONFIG_FRAGMENT( dkong2b_audio )
MDRV_SOUND_START( dkong )
@ -1350,21 +1350,17 @@ MACHINE_DRIVER_START( dkong2b_audio )
MDRV_SOUND_CONFIG_DISCRETE(dkong2b)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( radarscp_audio )
MDRV_IMPORT_FROM( dkong2b_audio )
MACHINE_CONFIG_DERIVED( radarscp_audio, dkong2b_audio )
MDRV_SOUND_MODIFY("discrete")
MDRV_SOUND_CONFIG_DISCRETE(radarscp)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.7)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( radarscp1_audio )
MDRV_IMPORT_FROM( radarscp_audio )
MACHINE_CONFIG_DERIVED( radarscp1_audio, radarscp_audio )
MDRV_CPU_MODIFY("soundcpu")
MDRV_CPU_IO_MAP(radarscp1_sound_io_map)
@ -1381,9 +1377,9 @@ MACHINE_DRIVER_START( radarscp1_audio )
MDRV_DEVICE_CONFIG(tms_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( dkongjr_audio )
MACHINE_CONFIG_FRAGMENT( dkongjr_audio )
/* sound latches */
@ -1418,9 +1414,9 @@ MACHINE_DRIVER_START( dkongjr_audio )
MDRV_SOUND_CONFIG_DISCRETE(dkongjr)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( dkong3_audio )
MACHINE_CONFIG_FRAGMENT( dkong3_audio )
MDRV_CPU_ADD("n2a03a", N2A03,N2A03_DEFAULTCLOCK)
MDRV_CPU_PROGRAM_MAP(dkong3_sound1_map)
@ -1444,6 +1440,6 @@ MACHINE_DRIVER_START( dkong3_audio )
MDRV_SOUND_CONFIG(nes_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

12
src/mame/audio/exidy.c
View File

@ -833,7 +833,7 @@ static ADDRESS_MAP_START( venture_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
MACHINE_DRIVER_START( venture_audio )
MACHINE_CONFIG_FRAGMENT( venture_audio )
MDRV_CPU_ADD("audiocpu", M6502, 3579545/4)
MDRV_CPU_PROGRAM_MAP(venture_audio_map)
@ -847,7 +847,7 @@ MACHINE_DRIVER_START( venture_audio )
MDRV_SOUND_ADD("custom", EXIDY_VENTURE, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -897,7 +897,7 @@ static ADDRESS_MAP_START( cvsd_iomap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
MACHINE_DRIVER_START( mtrap_cvsd_audio )
MACHINE_CONFIG_FRAGMENT( mtrap_cvsd_audio )
MDRV_CPU_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK)
MDRV_CPU_PROGRAM_MAP(cvsd_map)
@ -906,7 +906,7 @@ MACHINE_DRIVER_START( mtrap_cvsd_audio )
/* audio hardware */
MDRV_SOUND_ADD("cvsd", MC3417, CVSD_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -1060,7 +1060,7 @@ static ADDRESS_MAP_START( victory_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
MACHINE_DRIVER_START( victory_audio )
MACHINE_CONFIG_FRAGMENT( victory_audio )
MDRV_CPU_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(victory_audio_map)
@ -1075,4 +1075,4 @@ MACHINE_DRIVER_START( victory_audio )
MDRV_SOUND_ADD("tms", TMS5220, 640000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

4
src/mame/audio/exidy440.c
View File

@ -939,7 +939,7 @@ DEFINE_LEGACY_SOUND_DEVICE(EXIDY440, exidy440_sound);
*
*************************************/
MACHINE_DRIVER_START( exidy440_audio )
MACHINE_CONFIG_FRAGMENT( exidy440_audio )
MDRV_CPU_ADD("audiocpu", M6809, EXIDY440_AUDIO_CLOCK)
MDRV_CPU_PROGRAM_MAP(exidy440_audio_map)
@ -962,4 +962,4 @@ MACHINE_DRIVER_START( exidy440_audio )
// MDRV_SOUND_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

8
src/mame/audio/galaxian.c
View File

@ -479,7 +479,7 @@ WRITE8_DEVICE_HANDLER( galaxian_sound_w )
*
*************************************/
MACHINE_DRIVER_START( galaxian_audio )
MACHINE_CONFIG_FRAGMENT( galaxian_audio )
MDRV_SOUND_START(galaxian)
@ -487,9 +487,9 @@ MACHINE_DRIVER_START( galaxian_audio )
MDRV_SOUND_CONFIG_DISCRETE(galaxian)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( mooncrst_audio )
MACHINE_CONFIG_FRAGMENT( mooncrst_audio )
MDRV_SOUND_START(galaxian)
@ -497,4 +497,4 @@ MACHINE_DRIVER_START( mooncrst_audio )
MDRV_SOUND_CONFIG_DISCRETE(mooncrst)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

8
src/mame/audio/gottlieb.c
View File

@ -326,7 +326,7 @@ ADDRESS_MAP_END
*
*************************************/
MACHINE_DRIVER_START( gottlieb_soundrev1 )
MACHINE_CONFIG_FRAGMENT( gottlieb_soundrev1 )
MDRV_SOUND_START(gottlieb1)
MDRV_RIOT6532_ADD("riot", SOUND1_CLOCK/4, gottlieb_riot6532_intf)
@ -337,7 +337,7 @@ MACHINE_DRIVER_START( gottlieb_soundrev1 )
/* sound hardware */
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -575,7 +575,7 @@ ADDRESS_MAP_END
*
*************************************/
MACHINE_DRIVER_START( gottlieb_soundrev2 )
MACHINE_CONFIG_FRAGMENT( gottlieb_soundrev2 )
/* audio CPUs */
MDRV_CPU_ADD("audiocpu", M6502, SOUND2_CLOCK/4)
MDRV_CPU_PROGRAM_MAP(gottlieb_audio2_map)
@ -600,7 +600,7 @@ MACHINE_DRIVER_START( gottlieb_soundrev2 )
MDRV_SOUND_ADD("spsnd", SP0250, SOUND2_SPEECH_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

4
src/mame/audio/invinco.c
View File

@ -42,11 +42,11 @@ static const samples_interface invinco_samples_interface =
};
MACHINE_DRIVER_START( invinco_audio )
MACHINE_CONFIG_FRAGMENT( invinco_audio )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(invinco_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* sample IDs - must match sample file name table above */

18
src/mame/audio/irem.c
View File

@ -390,7 +390,7 @@ ADDRESS_MAP_END
*
*************************************/
static MACHINE_DRIVER_START( irem_audio_base )
static MACHINE_CONFIG_FRAGMENT( irem_audio_base )
MDRV_SOUND_START(irem_audio)
@ -416,9 +416,9 @@ static MACHINE_DRIVER_START( irem_audio_base )
MDRV_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(irem_msm5205_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( m52_sound_c_audio )
MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio )
MDRV_SOUND_START(irem_audio)
@ -446,21 +446,19 @@ MACHINE_DRIVER_START( m52_sound_c_audio )
MDRV_SOUND_CONFIG_DISCRETE(m52_sound_c)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( m52_large_audio ) /* 10 yard fight */
MDRV_IMPORT_FROM(irem_audio_base)
MACHINE_CONFIG_DERIVED( m52_large_audio, irem_audio_base ) /* 10 yard fight */
/* basic machine hardware */
MDRV_CPU_MODIFY("iremsound")
MDRV_CPU_PROGRAM_MAP(m52_large_sound_map)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( m62_audio )
MDRV_IMPORT_FROM(irem_audio_base)
MACHINE_CONFIG_DERIVED( m62_audio, irem_audio_base )
/* basic machine hardware */
MDRV_CPU_MODIFY("iremsound")
MDRV_CPU_PROGRAM_MAP(m62_sound_map)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

4
src/mame/audio/jedi.c
View File

@ -200,7 +200,7 @@ ADDRESS_MAP_END
*
*************************************/
MACHINE_DRIVER_START( jedi_audio )
MACHINE_CONFIG_FRAGMENT( jedi_audio )
MDRV_CPU_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(audio_map)
@ -227,4 +227,4 @@ MACHINE_DRIVER_START( jedi_audio )
MDRV_SOUND_ADD("tms", TMS5220, JEDI_TMS5220_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

8
src/mame/audio/mario.c
View File

@ -683,7 +683,7 @@ static const ay8910_interface ay8910_config =
*
*************************************/
MACHINE_DRIVER_START( mario_audio )
MACHINE_CONFIG_FRAGMENT( mario_audio )
#if USE_8039
MDRV_CPU_ADD("audiocpu", I8039, I8035_CLOCK) /* 730 kHz */
@ -701,9 +701,9 @@ MACHINE_DRIVER_START( mario_audio )
MDRV_SOUND_CONFIG_DISCRETE(mario)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.5)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( masao_audio )
MACHINE_CONFIG_FRAGMENT( masao_audio )
MDRV_CPU_ADD("audiocpu", Z80,24576000/16) /* ???? */
MDRV_CPU_PROGRAM_MAP(masao_sound_map)
@ -717,5 +717,5 @@ MACHINE_DRIVER_START( masao_audio )
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

24
src/mame/audio/mcr.c
View File

@ -462,7 +462,7 @@ ADDRESS_MAP_END
/********* machine driver ***********/
MACHINE_DRIVER_START(mcr_ssio)
MACHINE_CONFIG_FRAGMENT(mcr_ssio)
MDRV_CPU_ADD("ssiocpu", Z80, SSIO_CLOCK/2/4)
MDRV_CPU_PROGRAM_MAP(ssio_map)
MDRV_CPU_PERIODIC_INT(ssio_14024_clock, SSIO_CLOCK/2/16/10)
@ -475,7 +475,7 @@ MACHINE_DRIVER_START(mcr_ssio)
MDRV_SOUND_ADD("ssio.2", AY8910, SSIO_CLOCK/2/4)
MDRV_SOUND_CONFIG(ssio_ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -593,7 +593,7 @@ static const pia6821_interface csdeluxe_pia_intf =
/********* machine driver ***********/
MACHINE_DRIVER_START(chip_squeak_deluxe)
MACHINE_CONFIG_FRAGMENT(chip_squeak_deluxe)
MDRV_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(csdeluxe_map)
@ -602,9 +602,9 @@ MACHINE_DRIVER_START(chip_squeak_deluxe)
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("csddac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START(chip_squeak_deluxe_stereo)
MACHINE_CONFIG_FRAGMENT(chip_squeak_deluxe_stereo)
MDRV_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(csdeluxe_map)
@ -613,7 +613,7 @@ MACHINE_DRIVER_START(chip_squeak_deluxe_stereo)
MDRV_SOUND_ADD("csddac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -712,7 +712,7 @@ static const pia6821_interface soundsgood_pia_intf =
/********* machine driver ***********/
MACHINE_DRIVER_START(sounds_good)
MACHINE_CONFIG_FRAGMENT(sounds_good)
MDRV_CPU_ADD("sgcpu", M68000, SOUNDSGOOD_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(soundsgood_map)
@ -721,7 +721,7 @@ MACHINE_DRIVER_START(sounds_good)
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("sgdac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -814,7 +814,7 @@ static const pia6821_interface turbocs_pia_intf =
/********* machine driver ***********/
MACHINE_DRIVER_START(turbo_chip_squeak)
MACHINE_CONFIG_FRAGMENT(turbo_chip_squeak)
MDRV_CPU_ADD("tcscpu", M6809E, TURBOCS_CLOCK)
MDRV_CPU_PROGRAM_MAP(turbocs_map)
@ -823,7 +823,7 @@ MACHINE_DRIVER_START(turbo_chip_squeak)
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("tcsdac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -975,7 +975,7 @@ static const pia6821_interface squawkntalk_pia1_intf =
/********* machine driver ***********/
MACHINE_DRIVER_START(squawk_n_talk)
MACHINE_CONFIG_FRAGMENT(squawk_n_talk)
MDRV_CPU_ADD("sntcpu", M6802, SQUAWKTALK_CLOCK)
MDRV_CPU_PROGRAM_MAP(squawkntalk_map)
@ -989,4 +989,4 @@ MACHINE_DRIVER_START(squawk_n_talk)
/* the board also supports an AY-8912 and/or an 8-bit DAC, neither of */
/* which are populated on the Discs of Tron board */
MACHINE_DRIVER_END
MACHINE_CONFIG_END

12
src/mame/audio/mcr.h
View File

@ -63,9 +63,9 @@ void squawkntalk_reset_w(running_machine *machine, int state);
/************ External definitions ***************/
MACHINE_DRIVER_EXTERN( mcr_ssio );
MACHINE_DRIVER_EXTERN( chip_squeak_deluxe );
MACHINE_DRIVER_EXTERN( chip_squeak_deluxe_stereo );
MACHINE_DRIVER_EXTERN( sounds_good );
MACHINE_DRIVER_EXTERN( turbo_chip_squeak );
MACHINE_DRIVER_EXTERN( squawk_n_talk );
MACHINE_CONFIG_EXTERN( mcr_ssio );
MACHINE_CONFIG_EXTERN( chip_squeak_deluxe );
MACHINE_CONFIG_EXTERN( chip_squeak_deluxe_stereo );
MACHINE_CONFIG_EXTERN( sounds_good );
MACHINE_CONFIG_EXTERN( turbo_chip_squeak );
MACHINE_CONFIG_EXTERN( squawk_n_talk );

88
src/mame/audio/mw8080bw.c
View File

@ -153,14 +153,14 @@ static const samples_interface seawolf_samples_interface =
};
MACHINE_DRIVER_START( seawolf_audio )
MACHINE_CONFIG_FRAGMENT( seawolf_audio )
MDRV_SOUND_START(samples)
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(seawolf_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_HANDLER( seawolf_audio_w )
@ -214,7 +214,7 @@ static const samples_interface gunfight_samples_interface =
};
MACHINE_DRIVER_START( gunfight_audio )
MACHINE_CONFIG_FRAGMENT( gunfight_audio )
MDRV_SOUND_START(samples)
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@ -226,7 +226,7 @@ MACHINE_DRIVER_START( gunfight_audio )
MDRV_SOUND_ADD("samples2", SAMPLES, 0)
MDRV_SOUND_CONFIG(gunfight_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_HANDLER( gunfight_audio_w )
@ -323,12 +323,12 @@ static DISCRETE_SOUND_START(tornbase)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( tornbase_audio )
MACHINE_CONFIG_FRAGMENT( tornbase_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(tornbase)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( tornbase_audio_w )
@ -367,9 +367,9 @@ WRITE8_DEVICE_HANDLER( tornbase_audio_w )
*
*************************************/
MACHINE_DRIVER_START( zzzap_audio )
MACHINE_CONFIG_FRAGMENT( zzzap_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_HANDLER( zzzap_audio_1_w )
@ -569,12 +569,12 @@ static DISCRETE_SOUND_START(maze)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( maze_audio )
MACHINE_CONFIG_FRAGMENT( maze_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(maze)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
void maze_write_discrete(running_device *device, UINT8 maze_tone_timing_state)
@ -815,13 +815,13 @@ static DISCRETE_SOUND_START(boothill)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( boothill_audio )
MACHINE_CONFIG_FRAGMENT( boothill_audio )
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(boothill)
MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( boothill_audio_w )
@ -1045,12 +1045,12 @@ static DISCRETE_SOUND_START(checkmat)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( checkmat_audio )
MACHINE_CONFIG_FRAGMENT( checkmat_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(checkmat)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( checkmat_audio_w )
@ -1256,12 +1256,12 @@ static DISCRETE_SOUND_START(desertgu)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( desertgu_audio )
MACHINE_CONFIG_FRAGMENT( desertgu_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(desertgu)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( desertgu_audio_1_w )
@ -1523,12 +1523,12 @@ static DISCRETE_SOUND_START(dplay)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( dplay_audio )
MACHINE_CONFIG_FRAGMENT( dplay_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(dplay)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( dplay_audio_w )
@ -1572,7 +1572,7 @@ static const samples_interface gmissile_samples_interface =
};
MACHINE_DRIVER_START( gmissile_audio )
MACHINE_CONFIG_FRAGMENT( gmissile_audio )
MDRV_SOUND_START(samples)
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@ -1584,7 +1584,7 @@ MACHINE_DRIVER_START( gmissile_audio )
MDRV_SOUND_ADD("samples2", SAMPLES, 0)
MDRV_SOUND_CONFIG(gmissile_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.9)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_HANDLER( gmissile_audio_1_w )
@ -1671,7 +1671,7 @@ static const samples_interface m4_samples_interface =
};
MACHINE_DRIVER_START( m4_audio )
MACHINE_CONFIG_FRAGMENT( m4_audio )
MDRV_SOUND_START(samples)
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@ -1683,7 +1683,7 @@ MACHINE_DRIVER_START( m4_audio )
MDRV_SOUND_ADD("samples2", SAMPLES, 0)
MDRV_SOUND_CONFIG(m4_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_HANDLER( m4_audio_1_w )
@ -1933,7 +1933,7 @@ static const samples_interface clowns_samples_interface =
};
MACHINE_DRIVER_START( clowns_audio )
MACHINE_CONFIG_FRAGMENT( clowns_audio )
MDRV_SOUND_START(samples)
MDRV_SPEAKER_STANDARD_MONO("mono")
@ -1945,7 +1945,7 @@ MACHINE_DRIVER_START( clowns_audio )
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(clowns)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_HANDLER( clowns_audio_1_w )
@ -2307,13 +2307,13 @@ DISCRETE_GAIN(NODE_RELATIVE(SPACWALK_SPRINGBOARD_HIT1_SND, _num - 1),
DISCRETE_OUTPUT(NODE_90, 11000)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( spacwalk_audio )
MACHINE_CONFIG_FRAGMENT( spacwalk_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(spacwalk)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( spacwalk_audio_1_w )
{
@ -2538,13 +2538,13 @@ static DISCRETE_SOUND_START(shuffle)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( shuffle_audio )
MACHINE_CONFIG_FRAGMENT( shuffle_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(shuffle)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( shuffle_audio_1_w )
@ -2603,12 +2603,12 @@ static DISCRETE_SOUND_START(dogpatch)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( dogpatch_audio )
MACHINE_CONFIG_FRAGMENT( dogpatch_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(dogpatch)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.3)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_HANDLER( dogpatch_audio_w )
@ -3136,7 +3136,7 @@ static DISCRETE_SOUND_START(spcenctr)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( spcenctr_audio )
MACHINE_CONFIG_FRAGMENT( spcenctr_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("snsnd", SN76477, 0)
@ -3146,7 +3146,7 @@ MACHINE_DRIVER_START( spcenctr_audio )
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(spcenctr)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -3222,14 +3222,14 @@ static const samples_interface phantom2_samples_interface =
};
MACHINE_DRIVER_START( phantom2_audio )
MACHINE_CONFIG_FRAGMENT( phantom2_audio )
MDRV_SOUND_START(samples)
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(phantom2_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_HANDLER( phantom2_audio_1_w )
@ -3352,13 +3352,13 @@ static DISCRETE_SOUND_START(bowler)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( bowler_audio )
MACHINE_CONFIG_FRAGMENT( bowler_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(bowler)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( bowler_audio_1_w )
@ -3503,7 +3503,7 @@ static const samples_interface invaders_samples_interface =
/* left in for all games that hack into invaders samples for audio */
MACHINE_DRIVER_START( invaders_samples_audio )
MACHINE_CONFIG_FRAGMENT( invaders_samples_audio )
MDRV_SOUND_START(samples)
MDRV_SPEAKER_STANDARD_MONO("mono")
@ -3515,7 +3515,7 @@ MACHINE_DRIVER_START( invaders_samples_audio )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(invaders_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* nodes - inputs */
@ -4072,7 +4072,7 @@ static DISCRETE_SOUND_START(invaders)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( invaders_audio )
MACHINE_CONFIG_FRAGMENT( invaders_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("snsnd", SN76477, 0)
@ -4082,7 +4082,7 @@ MACHINE_DRIVER_START( invaders_audio )
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(invaders)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( invaders_audio_1_w )
@ -4482,12 +4482,12 @@ static DISCRETE_SOUND_START(blueshrk)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( blueshrk_audio )
MACHINE_CONFIG_FRAGMENT( blueshrk_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(blueshrk)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( blueshrk_audio_w )
@ -4700,7 +4700,7 @@ static DISCRETE_SOUND_START(invad2ct)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( invad2ct_audio )
MACHINE_CONFIG_FRAGMENT( invad2ct_audio )
MDRV_SPEAKER_STANDARD_STEREO("spk1", "spk2")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
@ -4715,7 +4715,7 @@ MACHINE_DRIVER_START( invad2ct_audio )
MDRV_SOUND_ADD("sn2", SN76477, 0)
MDRV_SOUND_CONFIG(invad2ct_p2_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "spk2", 0.3)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( invad2ct_audio_1_w )

12
src/mame/audio/n8080.c
View File

@ -585,7 +585,7 @@ static ADDRESS_MAP_START( helifire_sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
MACHINE_DRIVER_START( spacefev_sound )
MACHINE_CONFIG_FRAGMENT( spacefev_sound )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", I8035, 6000000)
@ -603,10 +603,10 @@ MACHINE_DRIVER_START( spacefev_sound )
MDRV_SOUND_ADD("snsnd", SN76477, 0)
MDRV_SOUND_CONFIG(spacefev_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( sheriff_sound )
MACHINE_CONFIG_FRAGMENT( sheriff_sound )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", I8035, 6000000)
@ -622,10 +622,10 @@ MACHINE_DRIVER_START( sheriff_sound )
MDRV_SOUND_ADD("snsnd", SN76477, 0)
MDRV_SOUND_CONFIG(sheriff_sn76477_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( helifire_sound )
MACHINE_CONFIG_FRAGMENT( helifire_sound )
/* basic machine hardware */
MDRV_CPU_ADD("audiocpu", I8035, 6000000)
@ -639,4 +639,4 @@ MACHINE_DRIVER_START( helifire_sound )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

4
src/mame/audio/namco52.c
View File

@ -182,10 +182,10 @@ static ADDRESS_MAP_START( namco_52xx_map_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static MACHINE_DRIVER_START( namco_52xx )
static MACHINE_CONFIG_FRAGMENT( namco_52xx )
MDRV_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
MDRV_CPU_IO_MAP(namco_52xx_map_io)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( namco_52xx )

4
src/mame/audio/namco54.c
View File

@ -146,10 +146,10 @@ static ADDRESS_MAP_START( namco_54xx_map_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static MACHINE_DRIVER_START( namco_54xx )
static MACHINE_CONFIG_FRAGMENT( namco_54xx )
MDRV_CPU_ADD("mcu", MB8844, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
MDRV_CPU_IO_MAP(namco_54xx_map_io)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( namco_54xx )

4
src/mame/audio/pulsar.c
View File

@ -59,11 +59,11 @@ static const samples_interface pulsar_samples_interface =
};
MACHINE_DRIVER_START( pulsar_audio )
MACHINE_CONFIG_FRAGMENT( pulsar_audio )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(pulsar_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* sample IDs - must match sample file name table above */

8
src/mame/audio/qix.c
View File

@ -239,7 +239,7 @@ static const pia6821_interface slithersnd_pia_0_intf =
*
*************************************/
MACHINE_DRIVER_START( qix_audio )
MACHINE_CONFIG_FRAGMENT( qix_audio )
MDRV_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */
MDRV_CPU_PROGRAM_MAP(audio_map)
@ -253,10 +253,10 @@ MACHINE_DRIVER_START( qix_audio )
MDRV_SOUND_CONFIG_DISCRETE(qix)
MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( slither_audio )
MACHINE_CONFIG_FRAGMENT( slither_audio )
MDRV_PIA6821_ADD("sndpia0", slithersnd_pia_0_intf)
MDRV_SPEAKER_STANDARD_MONO("mono")
@ -266,4 +266,4 @@ MACHINE_DRIVER_START( slither_audio )
MDRV_SOUND_ADD("sn2", SN76489, SLITHER_CLOCK_OSC/4/4)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

26
src/mame/audio/redalert.c
View File

@ -217,7 +217,7 @@ static SOUND_START( redalert )
*
*************************************/
static MACHINE_DRIVER_START( redalert_audio_m37b )
static MACHINE_CONFIG_FRAGMENT( redalert_audio_m37b )
MDRV_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(redalert_audio_map)
@ -229,7 +229,7 @@ static MACHINE_DRIVER_START( redalert_audio_m37b )
MDRV_SOUND_ROUTE(1, "mono", 0.50)
/* channel C is used a noise source and is not connected to a speaker */
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************************
*
@ -237,7 +237,7 @@ MACHINE_DRIVER_END
*
*************************************/
static MACHINE_DRIVER_START( redalert_audio_voice )
static MACHINE_CONFIG_FRAGMENT( redalert_audio_voice )
MDRV_CPU_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK)
MDRV_CPU_CONFIG(redalert_voice_i8085_config)
@ -245,7 +245,7 @@ static MACHINE_DRIVER_START( redalert_audio_voice )
MDRV_SOUND_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************************
*
@ -253,16 +253,16 @@ MACHINE_DRIVER_END
*
*************************************/
MACHINE_DRIVER_START( redalert_audio )
MACHINE_CONFIG_FRAGMENT( redalert_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_IMPORT_FROM( redalert_audio_m37b )
MDRV_IMPORT_FROM( redalert_audio_voice )
MDRV_FRAGMENT_ADD( redalert_audio_m37b )
MDRV_FRAGMENT_ADD( redalert_audio_voice )
MDRV_SOUND_START( redalert )
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************************
*
@ -270,15 +270,15 @@ MACHINE_DRIVER_END
*
*************************************/
MACHINE_DRIVER_START( ww3_audio )
MACHINE_CONFIG_FRAGMENT( ww3_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_IMPORT_FROM( redalert_audio_m37b )
MDRV_FRAGMENT_ADD( redalert_audio_m37b )
MDRV_SOUND_START( redalert_audio )
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************************
*
@ -405,7 +405,7 @@ static SOUND_START( demoneye )
*
*************************************/
MACHINE_DRIVER_START( demoneye_audio )
MACHINE_CONFIG_FRAGMENT( demoneye_audio )
MDRV_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(demoneye_audio_map)
@ -423,4 +423,4 @@ MACHINE_DRIVER_START( demoneye_audio )
MDRV_SOUND_ADD("ay2", AY8910, DEMONEYE_AY8910_CLOCK)
MDRV_SOUND_CONFIG(demoneye_ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

4
src/mame/audio/scramble.c
View File

@ -338,7 +338,7 @@ static const tms5110_interface ad2083_tms5110_interface =
MACHINE_DRIVER_START( ad2083_audio )
MACHINE_CONFIG_FRAGMENT( ad2083_audio )
MDRV_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
MDRV_CPU_PROGRAM_MAP(ad2083_sound_map)
@ -361,4 +361,4 @@ MACHINE_DRIVER_START( ad2083_audio )
MDRV_SOUND_ADD("tms", TMS5110A, AD2083_TMS5110_CLOCK)
MDRV_SOUND_CONFIG(ad2083_tms5110_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

16
src/mame/audio/segag80r.c
View File

@ -208,7 +208,7 @@ static const samples_interface astrob_samples_interface =
};
MACHINE_DRIVER_START( astrob_sound_board )
MACHINE_CONFIG_FRAGMENT( astrob_sound_board )
MDRV_SOUND_START(astrob)
@ -216,7 +216,7 @@ MACHINE_DRIVER_START( astrob_sound_board )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(astrob_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -436,7 +436,7 @@ static const ppi8255_interface ppi8255_005_intf =
};
MACHINE_DRIVER_START( 005_sound_board )
MACHINE_CONFIG_FRAGMENT( 005_sound_board )
MDRV_PPI8255_ADD( "ppi8255", ppi8255_005_intf )
@ -449,7 +449,7 @@ MACHINE_DRIVER_START( 005_sound_board )
MDRV_SOUND_ADD("005", 005, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -673,7 +673,7 @@ static const samples_interface spaceod_samples_interface =
};
MACHINE_DRIVER_START( spaceod_sound_board )
MACHINE_CONFIG_FRAGMENT( spaceod_sound_board )
/* sound hardware */
MDRV_SOUND_START(spaceod)
@ -681,7 +681,7 @@ MACHINE_DRIVER_START( spaceod_sound_board )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(spaceod_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -840,7 +840,7 @@ static const ppi8255_interface monsterb_ppi_intf =
};
MACHINE_DRIVER_START( monsterb_sound_board )
MACHINE_CONFIG_FRAGMENT( monsterb_sound_board )
MDRV_PPI8255_ADD( "ppi8255", monsterb_ppi_intf )
@ -863,7 +863,7 @@ MACHINE_DRIVER_START( monsterb_sound_board )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

13
src/mame/audio/segasnd.c
View File

@ -275,7 +275,7 @@ static const struct sp0250_interface sp0250_interface =
*
*************************************/
MACHINE_DRIVER_START( sega_speech_board )
MACHINE_CONFIG_FRAGMENT( sega_speech_board )
/* CPU for the speech board */
MDRV_CPU_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */
@ -286,7 +286,7 @@ MACHINE_DRIVER_START( sega_speech_board )
MDRV_SOUND_ADD("speech", SP0250, SPEECH_MASTER_CLOCK)
MDRV_SOUND_CONFIG(sp0250_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -915,7 +915,7 @@ ADDRESS_MAP_END
*
*************************************/
MACHINE_DRIVER_START( sega_universal_sound_board )
MACHINE_CONFIG_FRAGMENT( sega_universal_sound_board )
/* CPU for the usb board */
MDRV_CPU_ADD("usbcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */
@ -927,13 +927,12 @@ MACHINE_DRIVER_START( sega_universal_sound_board )
/* sound hardware */
MDRV_SOUND_ADD("usbsnd", USB, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( sega_universal_sound_board_rom )
MDRV_IMPORT_FROM( sega_universal_sound_board )
MACHINE_CONFIG_DERIVED( sega_universal_sound_board_rom, sega_universal_sound_board )
/* CPU for the usb board */
MDRV_CPU_MODIFY("usbcpu")
MDRV_CPU_PROGRAM_MAP(usb_map_rom)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

6
src/mame/audio/segasnd.h
View File

@ -4,15 +4,15 @@
*************************************************************************/
MACHINE_DRIVER_EXTERN( sega_speech_board );
MACHINE_CONFIG_EXTERN( sega_speech_board );
WRITE8_HANDLER( sega_speech_data_w );
WRITE8_HANDLER( sega_speech_control_w );
MACHINE_DRIVER_EXTERN( sega_universal_sound_board );
MACHINE_DRIVER_EXTERN( sega_universal_sound_board_rom );
MACHINE_CONFIG_EXTERN( sega_universal_sound_board );
MACHINE_CONFIG_EXTERN( sega_universal_sound_board_rom );
void sega_usb_reset(running_machine *machine, UINT8 t1_clock_mask);

4
src/mame/audio/spacefb.c
View File

@ -86,7 +86,7 @@ static const samples_interface spacefb_samples_interface =
};
MACHINE_DRIVER_START( spacefb_audio )
MACHINE_CONFIG_FRAGMENT( spacefb_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("dac", DAC, 0)
@ -95,4 +95,4 @@ MACHINE_DRIVER_START( spacefb_audio )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(spacefb_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

4
src/mame/audio/spiders.c
View File

@ -200,10 +200,10 @@ WRITE8_DEVICE_HANDLER( spiders_audio_ctrl_w )
}
MACHINE_DRIVER_START( spiders_audio )
MACHINE_CONFIG_FRAGMENT( spiders_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(spiders)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

4
src/mame/audio/taito_en.c
View File

@ -271,7 +271,7 @@ static const es5505_interface es5505_taito_f3_config =
NULL /* irq */
};
MACHINE_DRIVER_START( taito_f3_sound )
MACHINE_CONFIG_FRAGMENT( taito_f3_sound )
MDRV_TIMER_ADD("timer_68681", taito_en_timer_callback)
MDRV_SOUND_RESET( taito_f3_soundsystem_reset )
@ -284,4 +284,4 @@ MACHINE_DRIVER_START( taito_f3_sound )
MDRV_SOUND_CONFIG(es5505_taito_f3_config)
MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

2
src/mame/audio/taito_en.h
View File

@ -3,4 +3,4 @@
SOUND_RESET( taito_f3_soundsystem_reset );
MACHINE_DRIVER_EXTERN( taito_f3_sound );
MACHINE_CONFIG_EXTERN( taito_f3_sound );

4
src/mame/audio/taito_zm.c
View File

@ -50,7 +50,7 @@ static const zsg2_interface zsg2_taito_config =
"zsg2" /* sample region */
};
MACHINE_DRIVER_START( taito_zoom_sound )
MACHINE_CONFIG_FRAGMENT( taito_zoom_sound )
MDRV_CPU_ADD("mn10200", MN10200, 25000000/2)
MDRV_CPU_PROGRAM_MAP(taitozoom_map)
MDRV_CPU_IO_MAP(taitozoom_io_map)
@ -61,4 +61,4 @@ MACHINE_DRIVER_START( taito_zoom_sound )
MDRV_SOUND_CONFIG(zsg2_taito_config)
MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

2
src/mame/audio/taito_zm.h
View File

@ -1 +1 @@
MACHINE_DRIVER_EXTERN( taito_zoom_sound );
MACHINE_CONFIG_EXTERN( taito_zoom_sound );

8
src/mame/audio/targ.c
View File

@ -197,7 +197,7 @@ static const samples_interface targ_samples_interface =
};
MACHINE_DRIVER_START( spectar_audio )
MACHINE_CONFIG_FRAGMENT( spectar_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
@ -207,10 +207,10 @@ MACHINE_DRIVER_START( spectar_audio )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( targ_audio )
MACHINE_CONFIG_FRAGMENT( targ_audio )
MDRV_SPEAKER_STANDARD_MONO("mono")
@ -220,4 +220,4 @@ MACHINE_DRIVER_START( targ_audio )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

9
src/mame/audio/timeplt.c
View File

@ -187,7 +187,7 @@ static const ay8910_interface timeplt_ay8910_interface =
*
*************************************/
MACHINE_DRIVER_START( timeplt_sound )
MACHINE_CONFIG_FRAGMENT( timeplt_sound )
/* basic machine hardware */
MDRV_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8)
@ -222,13 +222,12 @@ MACHINE_DRIVER_START( timeplt_sound )
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MDRV_SOUND_ADD("filter.1.2", FILTER_RC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( locomotn_sound )
MDRV_IMPORT_FROM(timeplt_sound)
MACHINE_CONFIG_DERIVED( locomotn_sound, timeplt_sound )
/* basic machine hardware */
MDRV_CPU_MODIFY("tpsound")
MDRV_CPU_PROGRAM_MAP(locomotn_sound_map)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

12
src/mame/audio/turbo.c
View File

@ -193,7 +193,7 @@ static const samples_interface turbo_samples_interface =
};
MACHINE_DRIVER_START( turbo_samples )
MACHINE_CONFIG_FRAGMENT( turbo_samples )
/* this is the cockpit speaker configuration */
MDRV_SPEAKER_ADD("fspeaker", 0.0, 0.0, 1.0) /* front */
@ -238,7 +238,7 @@ MACHINE_DRIVER_START( turbo_samples )
/* channel 9 = OSEL -> OCAR.W/WM */
MDRV_SOUND_ROUTE(9, "bspeaker", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*
Cockpit: CN2 1+2 -> FRONT
@ -451,7 +451,7 @@ static const samples_interface subroc3d_samples_interface =
};
MACHINE_DRIVER_START( subroc3d_samples )
MACHINE_CONFIG_FRAGMENT( subroc3d_samples )
MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MDRV_SOUND_ADD("samples", SAMPLES, 0)
@ -488,7 +488,7 @@ MACHINE_DRIVER_START( subroc3d_samples )
/* PROLOGUE sound in channel 11 */
MDRV_SOUND_ROUTE(11, "lspeaker", 0.25)
MDRV_SOUND_ROUTE(11, "rspeaker", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -606,12 +606,12 @@ static const samples_interface buckrog_samples_interface =
};
MACHINE_DRIVER_START( buckrog_samples )
MACHINE_CONFIG_FRAGMENT( buckrog_samples )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(buckrog_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

8
src/mame/audio/vicdual.c
View File

@ -119,7 +119,7 @@ static const samples_interface frogs_samples_interface =
};
MACHINE_DRIVER_START( frogs_audio )
MACHINE_CONFIG_FRAGMENT( frogs_audio )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(frogs_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
@ -127,7 +127,7 @@ MACHINE_DRIVER_START( frogs_audio )
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(frogs)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static TIMER_CALLBACK( frogs_croak_callback )
@ -453,12 +453,12 @@ static DISCRETE_SOUND_START(headon)
DISCRETE_SOUND_END
MACHINE_DRIVER_START( headon_audio )
MACHINE_CONFIG_FRAGMENT( headon_audio )
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(headon)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
WRITE8_HANDLER( headon_audio_w )
{

12
src/mame/audio/williams.c
View File

@ -193,7 +193,7 @@ static const ym2151_interface adpcm_ym2151_interface =
MACHINE DRIVERS
****************************************************************************/
MACHINE_DRIVER_START( williams_cvsd_sound )
MACHINE_CONFIG_FRAGMENT( williams_cvsd_sound )
MDRV_CPU_ADD("cvsdcpu", M6809E, CVSD_MASTER_CLOCK)
MDRV_CPU_PROGRAM_MAP(williams_cvsd_map)
@ -210,10 +210,10 @@ MACHINE_DRIVER_START( williams_cvsd_sound )
MDRV_SOUND_ADD("cvsd", HC55516, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( williams_narc_sound )
MACHINE_CONFIG_FRAGMENT( williams_narc_sound )
MDRV_CPU_ADD("narc1cpu", M6809E, NARC_MASTER_CLOCK)
MDRV_CPU_PROGRAM_MAP(williams_narc_master_map)
@ -238,10 +238,10 @@ MACHINE_DRIVER_START( williams_narc_sound )
MDRV_SOUND_ADD("cvsd", HC55516, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
MACHINE_DRIVER_START( williams_adpcm_sound )
MACHINE_CONFIG_FRAGMENT( williams_adpcm_sound )
MDRV_CPU_ADD("adpcm", M6809E, ADPCM_MASTER_CLOCK)
MDRV_CPU_PROGRAM_MAP(williams_adpcm_map)
@ -256,7 +256,7 @@ MACHINE_DRIVER_START( williams_adpcm_sound )
MDRV_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

6
src/mame/audio/williams.h
View File

@ -4,9 +4,9 @@
****************************************************************************/
MACHINE_DRIVER_EXTERN( williams_cvsd_sound );
MACHINE_DRIVER_EXTERN( williams_adpcm_sound );
MACHINE_DRIVER_EXTERN( williams_narc_sound );
MACHINE_CONFIG_EXTERN( williams_cvsd_sound );
MACHINE_CONFIG_EXTERN( williams_adpcm_sound );
MACHINE_CONFIG_EXTERN( williams_narc_sound );
void williams_cvsd_init(running_machine *machine);
void williams_cvsd_data_w(running_machine *machine, int data);

8
src/mame/audio/zaxxon.c
View File

@ -97,11 +97,11 @@ static const samples_interface zaxxon_samples_interface =
};
MACHINE_DRIVER_START( zaxxon_samples )
MACHINE_CONFIG_FRAGMENT( zaxxon_samples )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(zaxxon_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -209,11 +209,11 @@ static const samples_interface congo_samples_interface =
};
MACHINE_DRIVER_START( congo_samples )
MACHINE_CONFIG_FRAGMENT( congo_samples )
MDRV_SOUND_ADD("samples", SAMPLES, 0)
MDRV_SOUND_CONFIG(congo_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

6
src/mame/drivers/1942.c
View File

@ -253,9 +253,7 @@ static MACHINE_RESET( 1942 )
state->scroll[1] = 0;
}
static MACHINE_DRIVER_START( 1942 )
MDRV_DRIVER_DATA(_1942_state)
static MACHINE_CONFIG_START( 1942, _1942_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
@ -291,7 +289,7 @@ static MACHINE_DRIVER_START( 1942 )
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MDRV_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

6
src/mame/drivers/1943.c
View File

@ -257,9 +257,7 @@ static MACHINE_RESET( 1943 )
state->bg2_on = 0;
}
static MACHINE_DRIVER_START( 1943 )
MDRV_DRIVER_DATA(_1943_state)
static MACHINE_CONFIG_START( 1943, _1943_state )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
@ -300,7 +298,7 @@ static MACHINE_DRIVER_START( 1943 )
MDRV_SOUND_ROUTE(1, "mono", 0.15)
MDRV_SOUND_ROUTE(2, "mono", 0.15)
MDRV_SOUND_ROUTE(3, "mono", 0.10)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* ROMs */

7
src/mame/drivers/1945kiii.c
View File

@ -251,10 +251,7 @@ static MACHINE_START( 1945kiii )
{
}
static MACHINE_DRIVER_START( k3 )
/* driver data */
MDRV_DRIVER_DATA(k3_state)
static MACHINE_CONFIG_START( k3, k3_state )
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
MDRV_CPU_PROGRAM_MAP(k3_map)
@ -282,7 +279,7 @@ static MACHINE_DRIVER_START( k3 )
MDRV_OKIM6295_ADD("oki2", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

8
src/mame/drivers/20pacgal.c
View File

@ -330,9 +330,7 @@ static MACHINE_RESET( 20pacgal )
state->game_selected = 0;
}
static MACHINE_DRIVER_START( 20pacgal )
MDRV_DRIVER_DATA(_20pacgal_state)
static MACHINE_CONFIG_START( 20pacgal, _20pacgal_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z180, MAIN_CPU_CLOCK)
@ -346,7 +344,7 @@ static MACHINE_DRIVER_START( 20pacgal )
MDRV_EEPROM_ADD("eeprom", _20pacgal_eeprom_intf)
/* video hardware */
MDRV_IMPORT_FROM(20pacgal_video)
MDRV_FRAGMENT_ADD(20pacgal_video)
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
@ -357,7 +355,7 @@ static MACHINE_DRIVER_START( 20pacgal )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

5
src/mame/drivers/2mindril.c
View File

@ -444,8 +444,7 @@ static MACHINE_RESET( drill )
state->shutter_sensor = 0;
}
static MACHINE_DRIVER_START( drill )
MDRV_DRIVER_DATA(_2mindril_state)
static MACHINE_CONFIG_START( drill, _2mindril_state )
MDRV_CPU_ADD("maincpu", M68000, 16000000 )
MDRV_CPU_PROGRAM_MAP(drill_map)
@ -474,7 +473,7 @@ static MACHINE_DRIVER_START( drill )
MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( 2mindril )

6
src/mame/drivers/39in1.c
View File

@ -1584,9 +1584,7 @@ static MACHINE_START(39in1)
pxa255_start(machine);
}
static MACHINE_DRIVER_START( 39in1 )
MDRV_DRIVER_DATA( _39in1_state )
static MACHINE_CONFIG_START( 39in1, _39in1_state )
MDRV_CPU_ADD("maincpu", PXA255, 200000000)
MDRV_CPU_PROGRAM_MAP(39in1_map)
@ -1613,7 +1611,7 @@ static MACHINE_DRIVER_START( 39in1 )
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( 39in1 )
// main program, encrypted

4
src/mame/drivers/3super8.c
View File

@ -64,7 +64,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( 3super8 )
static MACHINE_CONFIG_START( 3super8, driver_data_t )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,24000000/4) /* 6 MHz */
MDRV_CPU_PROGRAM_MAP(map)
@ -89,7 +89,7 @@ static MACHINE_DRIVER_START( 3super8 )
MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

14
src/mame/drivers/40love.c
View File

@ -1119,10 +1119,7 @@ static MACHINE_RESET( undoukai )
}
}
static MACHINE_DRIVER_START( 40love )
/* driver data */
MDRV_DRIVER_DATA(buggychl_state)
static MACHINE_CONFIG_START( 40love, buggychl_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000/2) /* OK */
@ -1177,12 +1174,9 @@ static MACHINE_DRIVER_START( 40love )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( undoukai )
/* driver data */
MDRV_DRIVER_DATA(buggychl_state)
static MACHINE_CONFIG_START( undoukai, buggychl_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000/2)
@ -1236,7 +1230,7 @@ static MACHINE_DRIVER_START( undoukai )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************************************/

6
src/mame/drivers/4enraya.c
View File

@ -163,9 +163,7 @@ static MACHINE_RESET( 4enraya )
state->last_snd_ctrl = 0;
}
static MACHINE_DRIVER_START( 4enraya )
MDRV_DRIVER_DATA(_4enraya_state)
static MACHINE_CONFIG_START( 4enraya, _4enraya_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",Z80,8000000/2)
@ -193,7 +191,7 @@ static MACHINE_DRIVER_START( 4enraya )
MDRV_SPEAKER_STANDARD_MONO("mono")
MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4 /* guess */)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/***************************************************************************

4
src/mame/drivers/4roses.c
View File

@ -379,7 +379,7 @@ static const mc6845_interface mc6845_intf =
* Machine Drivers *
**************************/
static MACHINE_DRIVER_START( 4roses )
static MACHINE_CONFIG_START( 4roses, driver_data_t )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */
MDRV_CPU_PROGRAM_MAP(4roses_map)
@ -411,7 +411,7 @@ static MACHINE_DRIVER_START( 4roses )
MDRV_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz, guess */
MDRV_SOUND_CONFIG(ay8910_intf)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************

4
src/mame/drivers/5clown.c
View File

@ -1027,7 +1027,7 @@ static const ay8910_interface ay8910_config =
* Machine Drivers *
*************************/
static MACHINE_DRIVER_START( fclown )
static MACHINE_CONFIG_START( fclown, driver_data_t )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
@ -1069,7 +1069,7 @@ static MACHINE_DRIVER_START( fclown )
MDRV_OKIM6295_ADD("oki6295", MASTER_CLOCK/12, OKIM6295_PIN7_LOW) /* guess, seems ok; pin7 guessed, seems ok */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.20)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************

133
src/mame/drivers/8080bw.c
View File

@ -379,10 +379,9 @@ INPUT_PORTS_END
/* same as regular invaders, but with a color board added */
static MACHINE_DRIVER_START( invadpt2 )
static MACHINE_CONFIG_DERIVED( invadpt2, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(invadpt2_io_map)
MDRV_MACHINE_START(extra_8080bw)
@ -398,9 +397,9 @@ static MACHINE_DRIVER_START( invadpt2 )
MDRV_VIDEO_UPDATE(invadpt2)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
/* */
@ -438,10 +437,9 @@ static INPUT_PORTS_START( spcewars )
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
static MACHINE_DRIVER_START( spcewars )
static MACHINE_CONFIG_DERIVED( spcewars, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(spcewars_io_map)
MDRV_MACHINE_START(extra_8080bw)
@ -450,13 +448,13 @@ static MACHINE_DRIVER_START( spcewars )
MDRV_MB14241_ADD("mb14241")
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
/* extra audio channel */
MDRV_SOUND_ADD("speaker", SPEAKER, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
/* */
@ -513,14 +511,13 @@ static INPUT_PORTS_START( astropal )
INPUT_PORTS_END
static MACHINE_DRIVER_START( astropal )
static MACHINE_CONFIG_DERIVED( astropal, invaders )
/* basic machine hardware */
MDRV_IMPORT_FROM(invaders)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(astropal_io_map)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
/* */
@ -563,10 +560,9 @@ static INPUT_PORTS_START( cosmo )
PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW1:8" ) /* must be HIGH normally or the joystick won't work */
INPUT_PORTS_END
static MACHINE_DRIVER_START( cosmo )
static MACHINE_CONFIG_DERIVED( cosmo, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(cosmo_map)
MDRV_CPU_IO_MAP(cosmo_io_map)
@ -576,9 +572,9 @@ static MACHINE_DRIVER_START( cosmo )
MDRV_VIDEO_UPDATE(cosmo)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
/* */
@ -686,10 +682,9 @@ static INPUT_PORTS_START( invrvnge )
INPUT_PORTS_END
static MACHINE_DRIVER_START( invrvnge )
static MACHINE_CONFIG_DERIVED( invrvnge, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(invrvnge_io_map)
@ -697,9 +692,9 @@ static MACHINE_DRIVER_START( invrvnge )
MDRV_MB14241_ADD("mb14241")
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
@ -792,10 +787,9 @@ static INPUT_PORTS_START( lrescue )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x00, "SW1:8" )
INPUT_PORTS_END
static MACHINE_DRIVER_START( lrescue )
static MACHINE_CONFIG_DERIVED( lrescue, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(lrescue_io_map)
MDRV_MACHINE_START(extra_8080bw)
@ -817,7 +811,7 @@ static MACHINE_DRIVER_START( lrescue )
MDRV_SOUND_ADD("speaker", SPEAKER, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
@ -940,10 +934,9 @@ static INPUT_PORTS_START( rollingc )
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
static MACHINE_DRIVER_START( rollingc )
static MACHINE_CONFIG_DERIVED( rollingc, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(rollingc_map)
MDRV_CPU_IO_MAP(rollingc_io_map)
@ -955,9 +948,9 @@ static MACHINE_DRIVER_START( rollingc )
MDRV_VIDEO_UPDATE(rollingc)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -1055,10 +1048,9 @@ static MACHINE_RESET( schaser )
MACHINE_RESET_CALL(mw8080bw);
}
static MACHINE_DRIVER_START( schaser )
static MACHINE_CONFIG_DERIVED( schaser, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
MDRV_CPU_PROGRAM_MAP(schaser_map)
MDRV_CPU_IO_MAP(schaser_io_map)
@ -1083,7 +1075,7 @@ static MACHINE_DRIVER_START( schaser )
MDRV_SOUND_CONFIG_DISCRETE(schaser)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
@ -1126,10 +1118,9 @@ static INPUT_PORTS_START( schasercv )
PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x00, "SW1:8" )
INPUT_PORTS_END
static MACHINE_DRIVER_START( schasercv )
static MACHINE_CONFIG_DERIVED( schasercv, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(schaser_map)
MDRV_CPU_IO_MAP(schasercv_io_map)
@ -1142,12 +1133,12 @@ static MACHINE_DRIVER_START( schasercv )
MDRV_VIDEO_UPDATE(schasercv)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MDRV_SOUND_ADD("speaker", SPEAKER, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
@ -1218,10 +1209,9 @@ static INPUT_PORTS_START( sflush )
INPUT_PORTS_END
static MACHINE_DRIVER_START( sflush )
static MACHINE_CONFIG_DERIVED( sflush, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_REPLACE("maincpu",M6800,2000000) /* ?? */
MDRV_CPU_PROGRAM_MAP(sflush_map)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_pulse,2)
@ -1233,7 +1223,7 @@ static MACHINE_DRIVER_START( sflush )
/* video hardware */
MDRV_VIDEO_UPDATE(sflush)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
@ -1326,10 +1316,9 @@ static INPUT_PORTS_START( lupin3a )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
INPUT_PORTS_END
static MACHINE_DRIVER_START( lupin3 )
static MACHINE_CONFIG_DERIVED( lupin3, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(lupin3_io_map)
MDRV_MACHINE_START(extra_8080bw)
@ -1341,14 +1330,13 @@ static MACHINE_DRIVER_START( lupin3 )
MDRV_VIDEO_UPDATE(indianbt)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( lupin3a )
static MACHINE_CONFIG_DERIVED( lupin3a, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(schaser_map)
MDRV_CPU_IO_MAP(lupin3_io_map)
@ -1361,9 +1349,9 @@ static MACHINE_DRIVER_START( lupin3a )
MDRV_VIDEO_UPDATE(lupin3)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
@ -1464,10 +1452,9 @@ static INPUT_PORTS_START( polaris )
PORT_ADJUSTER( 90, "Sub Volume VR3" )
INPUT_PORTS_END
static MACHINE_DRIVER_START( polaris )
static MACHINE_CONFIG_DERIVED( polaris, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
MDRV_CPU_PROGRAM_MAP(schaser_map)
MDRV_CPU_IO_MAP(polaris_io_map)
@ -1488,7 +1475,7 @@ static MACHINE_DRIVER_START( polaris )
MDRV_SOUND_CONFIG_DISCRETE(polaris)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
@ -1593,10 +1580,9 @@ static INPUT_PORTS_START( ballbomb )
PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x00, "SW1:8" )
INPUT_PORTS_END
static MACHINE_DRIVER_START( ballbomb )
static MACHINE_CONFIG_DERIVED( ballbomb, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(ballbomb_io_map)
MDRV_MACHINE_START(extra_8080bw)
@ -1608,9 +1594,9 @@ static MACHINE_DRIVER_START( ballbomb )
MDRV_VIDEO_UPDATE(ballbomb)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
@ -1670,19 +1656,18 @@ static INPUT_PORTS_START( yosakdon )
INPUT_PORTS_END
static MACHINE_DRIVER_START( yosakdon )
static MACHINE_CONFIG_DERIVED( yosakdon, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(yosakdon_map)
MDRV_CPU_IO_MAP(yosakdon_io_map)
MDRV_MACHINE_START(extra_8080bw)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
@ -1768,10 +1753,9 @@ static ADDRESS_MAP_START( indianbt_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static MACHINE_DRIVER_START( indianbt )
static MACHINE_CONFIG_DERIVED( indianbt, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(indianbt_io_map)
MDRV_MACHINE_START(extra_8080bw)
@ -1783,13 +1767,13 @@ static MACHINE_DRIVER_START( indianbt )
MDRV_VIDEO_UPDATE(indianbt)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(indianbt)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*******************************************************/
/* */
@ -1842,10 +1826,9 @@ static INPUT_PORTS_START( steelwkr )
INPUT_PORTS_END
static MACHINE_DRIVER_START( steelwkr )
static MACHINE_CONFIG_DERIVED( steelwkr, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(steelwkr_io_map)
MDRV_MACHINE_START(extra_8080bw)
@ -1857,9 +1840,9 @@ static MACHINE_DRIVER_START( steelwkr )
MDRV_VIDEO_UPDATE(invadpt2)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*****************************************************
@ -1978,10 +1961,9 @@ static ADDRESS_MAP_START( shuttlei_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static MACHINE_DRIVER_START( shuttlei )
static MACHINE_CONFIG_DERIVED( shuttlei, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(shuttlei_map)
MDRV_CPU_IO_MAP(shuttlei_io_map)
@ -1993,9 +1975,9 @@ static MACHINE_DRIVER_START( shuttlei )
MDRV_VIDEO_UPDATE(shuttlei)
/* sound hardware */
MDRV_IMPORT_FROM(invaders_samples_audio)
MDRV_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
@ -2088,10 +2070,9 @@ static INPUT_PORTS_START( darthvdr )
INVADERS_CAB_TYPE_PORT
INPUT_PORTS_END
static MACHINE_DRIVER_START( darthvdr )
static MACHINE_CONFIG_DERIVED( darthvdr, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(darthvdr_map)
MDRV_CPU_IO_MAP(darthvdr_io_map)
@ -2100,7 +2081,7 @@ static MACHINE_DRIVER_START( darthvdr )
MDRV_MACHINE_START(darthvdr)
MDRV_MACHINE_RESET(darthvdr)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************************
*
@ -2161,10 +2142,9 @@ static INPUT_PORTS_START( vortex )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) )
INPUT_PORTS_END
MACHINE_DRIVER_START( vortex )
MACHINE_CONFIG_DERIVED( vortex, mw8080bw_root )
/* basic machine hardware */
MDRV_IMPORT_FROM(mw8080bw_root)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(vortex_io_map)
MDRV_MACHINE_START(extra_8080bw)
@ -2178,9 +2158,9 @@ MACHINE_DRIVER_START( vortex )
MDRV_MB14241_ADD("mb14241")
/* audio hardware */
MDRV_IMPORT_FROM(invaders_audio)
MDRV_FRAGMENT_ADD(invaders_audio)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* decrypt function for vortex */
static DRIVER_INIT( vortex )
@ -2368,14 +2348,13 @@ static ADDRESS_MAP_START( modelr_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
MACHINE_DRIVER_START( modelr )
MACHINE_CONFIG_DERIVED( modelr, invaders )
/* basic machine hardware */
MDRV_IMPORT_FROM(invaders)
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(modelr_io_map)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( searthin )

4
src/mame/drivers/86lions.c
View File

@ -353,7 +353,7 @@ static PALETTE_INIT( lions )
}
}
static MACHINE_DRIVER_START( lions )
static MACHINE_CONFIG_START( lions, driver_data_t )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK/4) /* 3 MHz.(guess) */
MDRV_CPU_PROGRAM_MAP(lions_map)
@ -383,7 +383,7 @@ static MACHINE_DRIVER_START( lions )
MDRV_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/8) /* 1.5 MHz.(guess) */
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( 86lions )

7
src/mame/drivers/88games.c
View File

@ -375,10 +375,7 @@ static const k051316_interface _88games_k051316_intf =
_88games_zoom_callback
};
static MACHINE_DRIVER_START( 88games )
/* driver data */
MDRV_DRIVER_DATA(_88games_state)
static MACHINE_CONFIG_START( 88games, _88games_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
@ -422,7 +419,7 @@ static MACHINE_DRIVER_START( 88games )
MDRV_SOUND_ADD("upd2", UPD7759, UPD7759_STANDARD_CLOCK)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

7
src/mame/drivers/ace.c
View File

@ -343,10 +343,7 @@ static MACHINE_RESET( ace )
state->objpos[i] = 0;
}
static MACHINE_DRIVER_START( ace )
/* driver data */
MDRV_DRIVER_DATA(ace_state)
static MACHINE_CONFIG_START( ace, ace_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 2 MHz ? */
@ -372,7 +369,7 @@ static MACHINE_DRIVER_START( ace )
/* sound hardware */
/* ???? */
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/***************************************************************************

4
src/mame/drivers/acefruit.c
View File

@ -547,7 +547,7 @@ static GFXDECODE_START( acefruit )
GFXDECODE_ENTRY( "gfx1", 0x1800, charlayout, 8, 4 )
GFXDECODE_END
static MACHINE_DRIVER_START( acefruit )
static MACHINE_CONFIG_START( acefruit, driver_data_t )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 2500000) /* 2.5MHz */
@ -572,7 +572,7 @@ static MACHINE_DRIVER_START( acefruit )
MDRV_VIDEO_UPDATE(acefruit)
/* sound hardware */
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static DRIVER_INIT( sidewndr )
{

4
src/mame/drivers/acommand.c
View File

@ -558,7 +558,7 @@ static INTERRUPT_GEN( acommand_irq )
}
}
static MACHINE_DRIVER_START( acommand )
static MACHINE_CONFIG_START( acommand, driver_data_t )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,12000000)
@ -588,7 +588,7 @@ static MACHINE_DRIVER_START( acommand )
MDRV_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/***************************************************************************

14
src/mame/drivers/actfancr.c
View File

@ -316,10 +316,7 @@ static MACHINE_RESET( triothep )
/******************************************************************************/
static MACHINE_DRIVER_START( actfancr )
/* driver data */
MDRV_DRIVER_DATA(actfancr_state)
static MACHINE_CONFIG_START( actfancr, actfancr_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",H6280,21477200/3) /* Should be accurate */
@ -362,12 +359,9 @@ static MACHINE_DRIVER_START( actfancr )
MDRV_OKIM6295_ADD("oki", 1024188, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( triothep )
/* driver data */
MDRV_DRIVER_DATA(actfancr_state)
static MACHINE_CONFIG_START( triothep, actfancr_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
@ -410,7 +404,7 @@ static MACHINE_DRIVER_START( triothep )
MDRV_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/******************************************************************************/

36
src/mame/drivers/adp.c
View File

@ -632,10 +632,7 @@ static const ay8910_interface ay8910_config =
static const hd63484_interface adp_hd63484_intf = { 0 };
static const hd63484_interface skattva_hd63484_intf = { 1 }; // skattva hd63484 hack. to be removed once the video controller emulation is complete!
static MACHINE_DRIVER_START( quickjac )
/* driver data */
MDRV_DRIVER_DATA(adp_state)
static MACHINE_CONFIG_START( quickjac, adp_state )
MDRV_CPU_ADD("maincpu", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(quickjac_mem)
@ -665,12 +662,9 @@ static MACHINE_DRIVER_START( quickjac )
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( skattv )
/* driver data */
MDRV_DRIVER_DATA(adp_state)
static MACHINE_CONFIG_START( skattv, adp_state )
MDRV_CPU_ADD("maincpu", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(skattv_mem)
@ -700,19 +694,15 @@ static MACHINE_DRIVER_START( skattv )
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( skattva )
MDRV_IMPORT_FROM( skattv )
static MACHINE_CONFIG_DERIVED( skattva, skattv )
MDRV_DEVICE_REMOVE("hd63484")
MDRV_HD63484_ADD("hd63484", skattva_hd63484_intf)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( backgamn )
/* driver data */
MDRV_DRIVER_DATA(adp_state)
static MACHINE_CONFIG_START( backgamn, adp_state )
MDRV_CPU_ADD("maincpu", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(backgamn_mem)
@ -741,22 +731,20 @@ static MACHINE_DRIVER_START( backgamn )
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( funland )
MDRV_IMPORT_FROM( skattv )
static MACHINE_CONFIG_DERIVED( funland, skattv )
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(funland_mem)
MDRV_PALETTE_LENGTH(0x100)
MDRV_PALETTE_INIT(all_black)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( fstation )
MDRV_IMPORT_FROM( skattv )
static MACHINE_CONFIG_DERIVED( fstation, skattv )
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(fstation_mem)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( quickjac )

7
src/mame/drivers/aeroboto.c
View File

@ -252,10 +252,7 @@ static MACHINE_RESET( formatz )
state->sy = 0;
}
static MACHINE_DRIVER_START( formatz )
/* driver data */
MDRV_DRIVER_DATA(aeroboto_state)
static MACHINE_CONFIG_START( formatz, aeroboto_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, XTAL_10MHz/8) /* verified on pcb */
@ -294,7 +291,7 @@ static MACHINE_DRIVER_START( formatz )
MDRV_SOUND_ADD("ay2", AY8910, XTAL_10MHz/16) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

84
src/mame/drivers/aerofgt.c
View File

@ -1327,10 +1327,7 @@ static MACHINE_RESET( aerofgt )
memory_set_bank(machine, "bank1", 0); /* needed by spinlbrk */
}
static MACHINE_DRIVER_START( pspikes )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( pspikes, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
@ -1368,12 +1365,9 @@ static MACHINE_DRIVER_START( pspikes )
MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( spikes91 )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( spikes91, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@ -1404,13 +1398,10 @@ static MACHINE_DRIVER_START( spikes91 )
1x OKI M5205 (sound)(ic145)
2x LM324N (sound)(ic152, ic153)
*/
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( pspikesb )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( pspikesb, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@ -1438,12 +1429,9 @@ static MACHINE_DRIVER_START( pspikesb )
MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( pspikesc )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( pspikesc, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@ -1471,12 +1459,9 @@ static MACHINE_DRIVER_START( pspikesc )
MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( karatblz )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( karatblz, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@ -1513,12 +1498,9 @@ static MACHINE_DRIVER_START( karatblz )
MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( spinlbrk )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( spinlbrk, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
@ -1555,12 +1537,9 @@ static MACHINE_DRIVER_START( spinlbrk )
MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( turbofrc )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( turbofrc, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
@ -1597,12 +1576,9 @@ static MACHINE_DRIVER_START( turbofrc )
MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( aerofgtb )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( aerofgtb, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@ -1640,12 +1616,9 @@ static MACHINE_DRIVER_START( aerofgtb )
MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( aerofgt )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( aerofgt, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
@ -1683,12 +1656,9 @@ static MACHINE_DRIVER_START( aerofgt )
MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( aerfboot )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( aerfboot, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@ -1720,12 +1690,9 @@ static MACHINE_DRIVER_START( aerfboot )
MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( aerfboo2 )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( aerfboo2, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@ -1754,12 +1721,9 @@ static MACHINE_DRIVER_START( aerfboo2 )
MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( wbbc97 )
/* driver data */
MDRV_DRIVER_DATA(aerofgt_state)
static MACHINE_CONFIG_START( wbbc97, aerofgt_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@ -1795,7 +1759,7 @@ static MACHINE_DRIVER_START( wbbc97 )
MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

12
src/mame/drivers/airbustr.c
View File

@ -630,10 +630,7 @@ static const kaneko_pandora_interface airbustr_pandora_config =
0, 0 /* x_offs, y_offs */
};
static MACHINE_DRIVER_START( airbustr )
/* driver data */
MDRV_DRIVER_DATA(airbustr_state)
static MACHINE_CONFIG_START( airbustr, airbustr_state )
/* basic machine hardware */
MDRV_CPU_ADD("master", Z80, 6000000) // ???
@ -685,12 +682,11 @@ static MACHINE_DRIVER_START( airbustr )
MDRV_OKIM6295_ADD("oki", 12000000/4, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( airbustrb )
MDRV_IMPORT_FROM(airbustr)
static MACHINE_CONFIG_DERIVED( airbustrb, airbustr )
MDRV_WATCHDOG_TIME_INIT(SEC(0)) // no protection device or watchdog
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/* ROMs */

7
src/mame/drivers/ajax.c
View File

@ -205,10 +205,7 @@ static const k051316_interface ajax_k051316_intf =
ajax_zoom_callback
};
static MACHINE_DRIVER_START( ajax )
/* driver data */
MDRV_DRIVER_DATA(ajax_state)
static MACHINE_CONFIG_START( ajax, ajax_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* 12/4 MHz*/
@ -262,7 +259,7 @@ static MACHINE_DRIVER_START( ajax )
MDRV_SOUND_CONFIG(k007232_interface_2)
MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*

7
src/mame/drivers/albazc.c
View File

@ -259,10 +259,7 @@ static const ay8910_interface ay8910_config =
};
static MACHINE_DRIVER_START( hanaroku )
/* driver data */
MDRV_DRIVER_DATA(albazc_state)
static MACHINE_CONFIG_START( hanaroku, albazc_state )
MDRV_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(hanaroku_map)
@ -289,7 +286,7 @@ static MACHINE_DRIVER_START( hanaroku )
MDRV_SOUND_ADD("aysnd", AY8910, 1500000) /* ? MHz */
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( hanaroku )

7
src/mame/drivers/albazg.c
View File

@ -395,10 +395,7 @@ static MACHINE_RESET( yumefuda )
state->prot_lock = 0;
}
static MACHINE_DRIVER_START( yumefuda )
/* driver data */
MDRV_DRIVER_DATA(albazg_state)
static MACHINE_CONFIG_START( yumefuda, albazg_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80 , MASTER_CLOCK/2) /* xtal is 12 Mhz, unknown divider*/
@ -437,7 +434,7 @@ static MACHINE_DRIVER_START( yumefuda )
MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/16) /* guessed to use the same xtal as the crtc */
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/***************************************************************************************/

6
src/mame/drivers/aleck64.c
View File

@ -567,9 +567,7 @@ static INTERRUPT_GEN( n64_vblank )
signal_rcp_interrupt(device->machine, VI_INTERRUPT);
}
static MACHINE_DRIVER_START( aleck64 )
MDRV_DRIVER_DATA(_n64_state)
static MACHINE_CONFIG_START( aleck64, _n64_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", VR4300BE, 93750000)
@ -601,7 +599,7 @@ static MACHINE_DRIVER_START( aleck64 )
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MDRV_SOUND_ADD("dac2", DMADAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static DRIVER_INIT( aleck64 )
{

14
src/mame/drivers/alg.c
View File

@ -403,7 +403,7 @@ static const mos6526_interface cia_1_intf =
DEVCB_NULL /* port B */
};
static MACHINE_DRIVER_START( alg_r1 )
static MACHINE_CONFIG_START( alg_r1, driver_data_t )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
@ -444,19 +444,17 @@ static MACHINE_DRIVER_START( alg_r1 )
/* cia */
MDRV_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
MDRV_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( alg_r2 )
MDRV_IMPORT_FROM(alg_r1)
static MACHINE_CONFIG_DERIVED( alg_r2, alg_r1 )
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(main_map_r2)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( picmatic )
MDRV_IMPORT_FROM(alg_r1)
static MACHINE_CONFIG_DERIVED( picmatic, alg_r1 )
/* adjust for PAL specs */
MDRV_CPU_REPLACE("maincpu", M68000, AMIGA_68000_PAL_CLOCK)
@ -466,7 +464,7 @@ static MACHINE_DRIVER_START( picmatic )
MDRV_SCREEN_REFRESH_RATE(50)
MDRV_SCREEN_SIZE(512*2, 312)
MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 300+8-1)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

7
src/mame/drivers/aliens.c
View File

@ -261,10 +261,7 @@ static MACHINE_RESET( aliens )
state->palette_selected = 0;
}
static MACHINE_DRIVER_START( aliens )
/* driver data */
MDRV_DRIVER_DATA(aliens_state)
static MACHINE_CONFIG_START( aliens, aliens_state )
/* basic machine hardware */
@ -310,7 +307,7 @@ static MACHINE_DRIVER_START( aliens )
MDRV_SOUND_CONFIG(k007232_config)
MDRV_SOUND_ROUTE(0, "mono", 0.20)
MDRV_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/***************************************************************************

68
src/mame/drivers/alpha68k.c
View File

@ -1937,10 +1937,7 @@ static MACHINE_START( alpha68k_II )
}
static MACHINE_DRIVER_START( sstingry )
/* driver data */
MDRV_DRIVER_DATA(alpha68k_state)
static MACHINE_CONFIG_START( sstingry, alpha68k_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
@ -1988,12 +1985,9 @@ static MACHINE_DRIVER_START( sstingry )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
//ZT
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( kyros )
/* driver data */
MDRV_DRIVER_DATA(alpha68k_state)
static MACHINE_CONFIG_START( kyros, alpha68k_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
@ -2040,12 +2034,9 @@ static MACHINE_DRIVER_START( kyros )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
//ZT
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( jongbou )
/* driver data */
MDRV_DRIVER_DATA(alpha68k_state)
static MACHINE_CONFIG_START( jongbou, alpha68k_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
@ -2079,12 +2070,9 @@ static MACHINE_DRIVER_START( jongbou )
MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( alpha68k_I )
/* driver data */
MDRV_DRIVER_DATA(alpha68k_state)
static MACHINE_CONFIG_START( alpha68k_I, alpha68k_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
@ -2117,12 +2105,9 @@ static MACHINE_DRIVER_START( alpha68k_I )
MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
MDRV_SOUND_CONFIG(ym3812_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( alpha68k_II )
/* driver data */
MDRV_DRIVER_DATA(alpha68k_state)
static MACHINE_CONFIG_START( alpha68k_II, alpha68k_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000) /* Correct */
@ -2162,19 +2147,15 @@ static MACHINE_DRIVER_START( alpha68k_II )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( btlfieldb )
MDRV_IMPORT_FROM(alpha68k_II)
static MACHINE_CONFIG_DERIVED( btlfieldb, alpha68k_II )
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
//AT
static MACHINE_DRIVER_START( alpha68k_II_gm )
/* driver data */
MDRV_DRIVER_DATA(alpha68k_state)
static MACHINE_CONFIG_START( alpha68k_II_gm, alpha68k_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 8000000)
@ -2214,13 +2195,10 @@ static MACHINE_DRIVER_START( alpha68k_II_gm )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
//ZT
static MACHINE_DRIVER_START( alpha68k_V )
/* driver data */
MDRV_DRIVER_DATA(alpha68k_state)
static MACHINE_CONFIG_START( alpha68k_V, alpha68k_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
@ -2260,12 +2238,9 @@ static MACHINE_DRIVER_START( alpha68k_V )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( alpha68k_V_sb )
/* driver data */
MDRV_DRIVER_DATA(alpha68k_state)
static MACHINE_CONFIG_START( alpha68k_V_sb, alpha68k_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
@ -2305,12 +2280,9 @@ static MACHINE_DRIVER_START( alpha68k_V_sb )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( tnextspc )
/* driver data */
MDRV_DRIVER_DATA(alpha68k_state)
static MACHINE_CONFIG_START( tnextspc, alpha68k_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */
@ -2343,7 +2315,7 @@ static MACHINE_DRIVER_START( tnextspc )
MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
MDRV_SOUND_CONFIG(ym3812_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/******************************************************************************/

4
src/mame/drivers/amaticmg.c
View File

@ -610,7 +610,7 @@ GFXDECODE_END
* Machine Drivers *
************************************/
static MACHINE_DRIVER_START( amaticmg )
static MACHINE_CONFIG_START( amaticmg, driver_data_t )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* WRONG! */
MDRV_CPU_PROGRAM_MAP(amaticmg_map)
@ -651,7 +651,7 @@ static MACHINE_DRIVER_START( amaticmg )
// MDRV_SOUND_ADD("dac", DAC, 0) /* Y3014B */
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/************************************

7
src/mame/drivers/ambush.c
View File

@ -226,10 +226,7 @@ static const ay8910_interface ay8910_interface_2 =
*
*************************************/
static MACHINE_DRIVER_START( ambush )
/* driver data */
MDRV_DRIVER_DATA(ambush_state)
static MACHINE_CONFIG_START( ambush, ambush_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.00 MHz??? */
@ -260,7 +257,7 @@ static MACHINE_DRIVER_START( ambush )
MDRV_SOUND_ADD("ay2", AY8910, 1500000)
MDRV_SOUND_CONFIG(ay8910_interface_2)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************************

10
src/mame/drivers/ampoker2.c
View File

@ -1054,7 +1054,7 @@ static const ay8910_interface ay8910_config =
* Machine Driver *
*************************/
static MACHINE_DRIVER_START( ampoker2 )
static MACHINE_CONFIG_START( ampoker2, driver_data_t )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/2) /* 3 MHz */
@ -1087,16 +1087,16 @@ static MACHINE_DRIVER_START( ampoker2 )
MDRV_SOUND_ADD("aysnd", AY8910,MASTER_CLOCK/4) /* 1.5 MHz, measured */
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sigma2k, ampoker2 )
static MACHINE_DRIVER_START( sigma2k )
/* basic machine hardware */
MDRV_IMPORT_FROM(ampoker2)
/* video hardware */
MDRV_GFXDECODE(sigma2k)
MDRV_VIDEO_START(sigma2k)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************

7
src/mame/drivers/amspdwy.c
View File

@ -271,10 +271,7 @@ static MACHINE_RESET( amspdwy )
state->wheel_return[1] = 0;
}
static MACHINE_DRIVER_START( amspdwy )
/* driver data */
MDRV_DRIVER_DATA(amspdwy_state)
static MACHINE_CONFIG_START( amspdwy, amspdwy_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,3000000)
@ -308,7 +305,7 @@ static MACHINE_DRIVER_START( amspdwy )
MDRV_SOUND_CONFIG(amspdwy_ym2151_interface)
MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

7
src/mame/drivers/angelkds.c
View File

@ -604,10 +604,7 @@ static MACHINE_RESET( angelkds )
state->bgtopbank = 0;
}
static MACHINE_DRIVER_START( angelkds )
/* driver data */
MDRV_DRIVER_DATA(angelkds_state)
static MACHINE_CONFIG_START( angelkds, angelkds_state )
MDRV_CPU_ADD("maincpu", Z80, 8000000) /* 8MHz? 6 seems too slow? */
MDRV_CPU_PROGRAM_MAP(main_map)
@ -650,7 +647,7 @@ static MACHINE_DRIVER_START( angelkds )
MDRV_SOUND_ROUTE(1, "mono", 0.65)
MDRV_SOUND_ROUTE(2, "mono", 0.65)
MDRV_SOUND_ROUTE(3, "mono", 0.45)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*** Rom Loading

21
src/mame/drivers/appoooh.c
View File

@ -421,10 +421,7 @@ static MACHINE_RESET( appoooh )
state->priority = 0;
}
static MACHINE_DRIVER_START( appoooh_common )
/* driver data */
MDRV_DRIVER_DATA(appoooh_state)
static MACHINE_CONFIG_START( appoooh_common, appoooh_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
@ -450,13 +447,10 @@ static MACHINE_DRIVER_START( appoooh_common )
MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( appoooh )
/* common machine hardware */
MDRV_IMPORT_FROM(appoooh_common)
static MACHINE_CONFIG_DERIVED( appoooh, appoooh_common )
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@ -471,13 +465,10 @@ static MACHINE_DRIVER_START( appoooh )
MDRV_PALETTE_INIT(appoooh)
MDRV_VIDEO_START(appoooh)
MDRV_VIDEO_UPDATE(appoooh)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
static MACHINE_DRIVER_START( robowres )
/* common machine hardware */
MDRV_IMPORT_FROM(appoooh_common)
static MACHINE_CONFIG_DERIVED( robowres, appoooh_common )
/* video hardware */
MDRV_SCREEN_ADD("screen", RASTER)
@ -492,7 +483,7 @@ static MACHINE_DRIVER_START( robowres )
MDRV_PALETTE_INIT(robowres)
MDRV_VIDEO_START(appoooh)
MDRV_VIDEO_UPDATE(robowres)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
/*************************************
*

7
src/mame/drivers/aquarium.c
View File

@ -357,10 +357,7 @@ static MACHINE_RESET( aquarium )
#endif
}
static MACHINE_DRIVER_START( aquarium )
/* driver data */
MDRV_DRIVER_DATA(aquarium_state)
static MACHINE_CONFIG_START( aquarium, aquarium_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, 32000000/2)
@ -398,7 +395,7 @@ static MACHINE_DRIVER_START( aquarium )
MDRV_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_DRIVER_END
MACHINE_CONFIG_END
ROM_START( aquarium )
ROM_REGION( 0x080000, "maincpu", 0 ) /* 68000 code */

7
src/mame/drivers/arabian.c
View File

@ -390,10 +390,7 @@ static MACHINE_RESET( arabian )
state->flip_screen = 0;
}
static MACHINE_DRIVER_START( arabian )
/* driver data */
MDRV_DRIVER_DATA(arabian_state)
static MACHINE_CONFIG_START( arabian, arabian_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, MAIN_OSC/4)
@ -423,7 +420,7 @@ static MACHINE_DRIVER_START( arabian )
MDRV_SOUND_ADD("aysnd", AY8910, MAIN_OSC/4/2)
MDRV_SOUND_CONFIG(ay8910_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

5
src/mame/drivers/arcadecl.c
View File

@ -323,8 +323,7 @@ GFXDECODE_END
*
*************************************/
static MACHINE_DRIVER_START( arcadecl )
MDRV_DRIVER_DATA(rampart_state)
static MACHINE_CONFIG_START( arcadecl, rampart_state )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
@ -354,7 +353,7 @@ static MACHINE_DRIVER_START( arcadecl )
MDRV_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, OKIM6295_PIN7_LOW)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
MACHINE_CONFIG_END

Some files were not shown because too many files have changed in this diff Show More