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/namcos23.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/namcos23.c')
-rw-r--r-- | src/mame/drivers/namcos23.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 06a438a4e51..c67bcbe1043 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -2871,7 +2871,7 @@ static const mips3_config r4650_config = 8192 /* data cache size - VERIFIED */ }; -static MACHINE_DRIVER_START( gorgon ) +static MACHINE_CONFIG_START( gorgon, driver_data_t ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*4) @@ -2916,9 +2916,9 @@ static MACHINE_DRIVER_START( gorgon ) MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) -MACHINE_DRIVER_END +MACHINE_CONFIG_END -static MACHINE_DRIVER_START( s23 ) +static MACHINE_CONFIG_START( s23, driver_data_t ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*4) MDRV_CPU_CONFIG(r4650_config) @@ -2962,9 +2962,9 @@ static MACHINE_DRIVER_START( s23 ) MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) -MACHINE_DRIVER_END +MACHINE_CONFIG_END -static MACHINE_DRIVER_START( ss23 ) +static MACHINE_CONFIG_START( ss23, driver_data_t ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*5) MDRV_CPU_CONFIG(r4650_config) @@ -3004,10 +3004,9 @@ static MACHINE_DRIVER_START( ss23 ) MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) -MACHINE_DRIVER_END +MACHINE_CONFIG_END -static MACHINE_DRIVER_START( ss23io ) - MDRV_IMPORT_FROM( ss23 ) +static MACHINE_CONFIG_DERIVED( ss23io, ss23 ) MDRV_CPU_MODIFY("audiocpu") MDRV_CPU_IO_MAP( s23h8iomap ) @@ -3015,10 +3014,9 @@ static MACHINE_DRIVER_START( ss23io ) MDRV_CPU_ADD("ioboard", H83334, 14745600 ) MDRV_CPU_PROGRAM_MAP( s23iobrdmap ) MDRV_CPU_IO_MAP( s23iobrdiomap ) -MACHINE_DRIVER_END +MACHINE_CONFIG_END -static MACHINE_DRIVER_START( ss23e2 ) - MDRV_IMPORT_FROM( ss23 ) +static MACHINE_CONFIG_DERIVED( ss23e2, ss23 ) MDRV_CPU_MODIFY("maincpu") MDRV_CPU_CLOCK(S23_BUSCLOCK*6) @@ -3029,10 +3027,9 @@ static MACHINE_DRIVER_START( ss23e2 ) MDRV_CPU_ADD("ioboard", H83334, 14745600 ) MDRV_CPU_PROGRAM_MAP( s23iobrdmap ) MDRV_CPU_IO_MAP( s23iobrdiomap ) -MACHINE_DRIVER_END +MACHINE_CONFIG_END -static MACHINE_DRIVER_START( gmen ) - MDRV_IMPORT_FROM( s23 ) +static MACHINE_CONFIG_DERIVED( gmen, s23 ) MDRV_CPU_MODIFY("maincpu") MDRV_CPU_CLOCK(S23_BUSCLOCK*5) @@ -3042,7 +3039,7 @@ static MACHINE_DRIVER_START( gmen ) MDRV_CPU_PROGRAM_MAP(gmen_sh2_map) MDRV_MACHINE_RESET(gmen) -MACHINE_DRIVER_END +MACHINE_CONFIG_END ROM_START( rapidrvr ) ROM_REGION32_BE( 0x400000, "user1", 0 ) /* 4 megs for main R4650 code */ |