summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/norautp.c
diff options
context:
space:
mode:
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
commitf6b83b62c5f14751c4017cdc6b9b6c0d3a29a3c4 (patch)
tree9b52f318ea41cc4567d0b1f405432867be5f1220 /src/mame/drivers/norautp.c
parentce3c3205ccf83ec9898825f7a9e8583f6b4c8eb1 (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/norautp.c')
-rw-r--r--src/mame/drivers/norautp.c69
1 files changed, 28 insertions, 41 deletions
diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c
index c9ada0190b1..6e0f6c94578 100644
--- a/src/mame/drivers/norautp.c
+++ b/src/mame/drivers/norautp.c
@@ -1235,7 +1235,7 @@ static I8255A_INTERFACE (ppi8255_intf_1)
* Machine Drivers *
*************************/
-static MACHINE_DRIVER_START( noraut_base )
+static MACHINE_CONFIG_START( noraut_base, driver_data_t )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", Z80, NORAUT_CPU_CLOCK)
@@ -1269,20 +1269,18 @@ static MACHINE_DRIVER_START( noraut_base )
MDRV_SOUND_ADD("discrete", DISCRETE, 0)
MDRV_SOUND_CONFIG_DISCRETE(norautp)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
-static MACHINE_DRIVER_START( norautp )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( norautp, noraut_base )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
-static MACHINE_DRIVER_START( norautpl )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( norautpl, noraut_base )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
@@ -1291,53 +1289,48 @@ static MACHINE_DRIVER_START( norautpl )
/* sound hardware */
MDRV_SOUND_MODIFY("discrete")
MDRV_SOUND_CONFIG_DISCRETE(kimble)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
-static MACHINE_DRIVER_START( norautxp )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( norautxp, noraut_base )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(norautxp_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
-static MACHINE_DRIVER_START( nortest1 )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( nortest1, noraut_base )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(nortest1_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
-static MACHINE_DRIVER_START( norautx4 )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( norautx4, noraut_base )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(norautx4_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
#ifdef UNUSED_CODE
-static MACHINE_DRIVER_START( norautx8 )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( norautx8, noraut_base )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(norautx8_map)
MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
#endif
-static MACHINE_DRIVER_START( kimble )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( kimble, noraut_base )
/* basic machine hardware */
MDRV_CPU_MODIFY("maincpu")
@@ -1347,14 +1340,13 @@ static MACHINE_DRIVER_START( kimble )
/* sound hardware */
MDRV_SOUND_MODIFY("discrete")
MDRV_SOUND_CONFIG_DISCRETE(kimble)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
/********** 8080 based **********/
-static MACHINE_DRIVER_START( dphl )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( dphl, noraut_base )
/* basic machine hardware */
MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
@@ -1364,11 +1356,10 @@ static MACHINE_DRIVER_START( dphl )
/* sound hardware */
MDRV_SOUND_MODIFY("discrete")
MDRV_SOUND_CONFIG_DISCRETE(dphl)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
-static MACHINE_DRIVER_START( dphla )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( dphla, noraut_base )
/* basic machine hardware */
MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
@@ -1378,11 +1369,10 @@ static MACHINE_DRIVER_START( dphla )
/* sound hardware */
MDRV_SOUND_MODIFY("discrete")
MDRV_SOUND_CONFIG_DISCRETE(dphl)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
-static MACHINE_DRIVER_START( kimbldhl )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( kimbldhl, noraut_base )
/* basic machine hardware */
MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
@@ -1392,11 +1382,10 @@ static MACHINE_DRIVER_START( kimbldhl )
/* sound hardware */
MDRV_SOUND_MODIFY("discrete")
MDRV_SOUND_CONFIG_DISCRETE(kimble)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
-static MACHINE_DRIVER_START( dphltest )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( dphltest, noraut_base )
/* basic machine hardware */
MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
@@ -1406,11 +1395,10 @@ static MACHINE_DRIVER_START( dphltest )
/* sound hardware */
MDRV_SOUND_MODIFY("discrete")
MDRV_SOUND_CONFIG_DISCRETE(dphl)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
-static MACHINE_DRIVER_START( drhl )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( drhl, noraut_base )
/* basic machine hardware */
MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
@@ -1420,11 +1408,10 @@ static MACHINE_DRIVER_START( drhl )
/* sound hardware */
MDRV_SOUND_MODIFY("discrete")
MDRV_SOUND_CONFIG_DISCRETE(dphl)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
-static MACHINE_DRIVER_START( ssjkrpkr )
- MDRV_IMPORT_FROM(noraut_base)
+static MACHINE_CONFIG_DERIVED( ssjkrpkr, noraut_base )
/* basic machine hardware */
MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
@@ -1434,7 +1421,7 @@ static MACHINE_DRIVER_START( ssjkrpkr )
/* sound hardware */
MDRV_SOUND_MODIFY("discrete")
MDRV_SOUND_CONFIG_DISCRETE(dphl)
-MACHINE_DRIVER_END
+MACHINE_CONFIG_END
/*************************