diff options
author | Aaron Giles <aaron@aarongiles.com> | 2010-09-01 05:03:27 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2010-09-01 05:03:27 +0000 |
commit | f6b83b62c5f14751c4017cdc6b9b6c0d3a29a3c4 (patch) | |
tree | 9b52f318ea41cc4567d0b1f405432867be5f1220 /src/mame/drivers/firebeat.c | |
parent | ce3c3205ccf83ec9898825f7a9e8583f6b4c8eb1 (diff) |
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.
Diffstat (limited to 'src/mame/drivers/firebeat.c')
-rw-r--r-- | src/mame/drivers/firebeat.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index 5ae15a5ea17..0cbc1750b9c 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -1912,7 +1912,7 @@ static MACHINE_RESET( firebeat ) cdda_set_cdrom(machine->device("cdda"), cd); } -static MACHINE_DRIVER_START(firebeat) +static MACHINE_CONFIG_START( firebeat, driver_data_t ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", PPC403GCX, 66000000) @@ -1951,9 +1951,9 @@ static MACHINE_DRIVER_START(firebeat) MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) -MACHINE_DRIVER_END +MACHINE_CONFIG_END -static MACHINE_DRIVER_START(firebeat2) +static MACHINE_CONFIG_START( firebeat2, driver_data_t ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", PPC403GCX, 66000000) @@ -1997,16 +1997,14 @@ static MACHINE_DRIVER_START(firebeat2) MDRV_SOUND_ADD("cdda", CDDA, 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(firebeat_spu) - - MDRV_IMPORT_FROM(firebeat) +static MACHINE_CONFIG_DERIVED( firebeat_spu, firebeat ) MDRV_CPU_ADD("audiocpu", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(spu_map) -MACHINE_DRIVER_END +MACHINE_CONFIG_END /*****************************************************************************/ /* Security dongle is a Dallas DS1411 RS232 Adapter with a DS1991 Multikey iButton */ |