From f6b83b62c5f14751c4017cdc6b9b6c0d3a29a3c4 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Wed, 1 Sep 2010 05:03:27 +0000 Subject: Changed the MACHINE_DRIVER_* macros, as follows: 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. --- src/ldplayer/ldplayer.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/ldplayer') diff --git a/src/ldplayer/ldplayer.c b/src/ldplayer/ldplayer.c index eebd49f558f..9a5caa977f3 100644 --- a/src/ldplayer/ldplayer.c +++ b/src/ldplayer/ldplayer.c @@ -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 -- cgit v1.2.3-70-g09d2