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/cabal.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/cabal.c')
-rw-r--r-- | src/mame/drivers/cabal.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index eea01624e2e..8c74913873e 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -484,9 +484,7 @@ static const msm5205_interface msm5205_interface_2 = MSM5205_SEX_4B }; -static MACHINE_DRIVER_START( cabal ) - - MDRV_DRIVER_DATA(cabal_state) +static MACHINE_CONFIG_START( cabal, cabal_state ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */ @@ -524,13 +522,11 @@ static MACHINE_DRIVER_START( cabal ) MDRV_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000) /* it should use the msm5205 */ MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.40) -MACHINE_DRIVER_END +MACHINE_CONFIG_END /* the bootleg has different sound hardware (2 extra Z80s for ADPCM playback) */ -static MACHINE_DRIVER_START( cabalbl ) - - MDRV_DRIVER_DATA(cabal_state) +static MACHINE_CONFIG_START( cabalbl, cabal_state ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */ @@ -583,7 +579,7 @@ static MACHINE_DRIVER_START( cabalbl ) MDRV_SOUND_ADD("msm2", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator)*/ MDRV_SOUND_CONFIG(msm5205_interface_2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) -MACHINE_DRIVER_END +MACHINE_CONFIG_END ROM_START( cabal ) ROM_REGION( 0x50000, "maincpu", 0 ) /* 64k for cpu code */ |