summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Zsolt Vasvari <zsoltvas@mamedev.org>2008-01-22 04:41:11 +0000
committer Zsolt Vasvari <zsoltvas@mamedev.org>2008-01-22 04:41:11 +0000
commit268595ffef8191d28949193e28f1cc293c63de81 (patch)
treec6f8ef2b131056847d681d30a4fcbd8eccdc9675
parent817b3526f9d9e84b46e1ea461ecf696e374614df (diff)
Replaced driver_init_* calls with macro
-rw-r--r--src/mame/drivers/aladbl.c2
-rw-r--r--src/mame/drivers/bublbobl.c2
-rw-r--r--src/mame/drivers/cave.c2
-rw-r--r--src/mame/drivers/cischeat.c2
-rw-r--r--src/mame/drivers/cps1.c10
-rw-r--r--src/mame/drivers/cps2.c6
-rw-r--r--src/mame/drivers/cps3.c36
-rw-r--r--src/mame/drivers/dec8.c4
-rw-r--r--src/mame/drivers/decocass.c2
-rw-r--r--src/mame/drivers/djmain.c22
-rw-r--r--src/mame/drivers/dynax.c2
-rw-r--r--src/mame/drivers/exerion.c2
-rw-r--r--src/mame/drivers/galaga.c6
-rw-r--r--src/mame/drivers/gticlub.c2
-rw-r--r--src/mame/drivers/hng64.c4
-rw-r--r--src/mame/drivers/hshavoc.c2
-rw-r--r--src/mame/drivers/itech32.c4
-rw-r--r--src/mame/drivers/kaneko16.c2
-rw-r--r--src/mame/drivers/kinstb.c2
-rw-r--r--src/mame/drivers/konamigv.c8
-rw-r--r--src/mame/drivers/ksys573.c20
-rw-r--r--src/mame/drivers/liberate.c2
-rw-r--r--src/mame/drivers/mappy.c4
-rw-r--r--src/mame/drivers/megaplay.c2
-rw-r--r--src/mame/drivers/megatech.c6
-rw-r--r--src/mame/drivers/metro.c4
-rw-r--r--src/mame/drivers/model3.c42
-rw-r--r--src/mame/drivers/ms32.c6
-rw-r--r--src/mame/drivers/namcos12.c4
-rw-r--r--src/mame/drivers/neodrvr.c114
-rw-r--r--src/mame/drivers/nmk16.c2
-rw-r--r--src/mame/drivers/nwk-tr.c6
-rw-r--r--src/mame/drivers/paranoia.c2
-rw-r--r--src/mame/drivers/pcktgal.c4
-rw-r--r--src/mame/drivers/polepos.c2
-rw-r--r--src/mame/drivers/segae.c10
-rw-r--r--src/mame/drivers/segas16b.c44
-rw-r--r--src/mame/drivers/segas18.c6
-rw-r--r--src/mame/drivers/seta.c2
-rw-r--r--src/mame/drivers/sg1000a.c2
-rw-r--r--src/mame/drivers/simpl156.c14
-rw-r--r--src/mame/drivers/ssf2md.c2
-rw-r--r--src/mame/drivers/stv.c2
-rw-r--r--src/mame/drivers/stvinit.c82
-rw-r--r--src/mame/drivers/tmnt.c4
-rw-r--r--src/mame/drivers/tumbleb.c4
-rw-r--r--src/mame/drivers/turbo.c4
-rw-r--r--src/mame/drivers/uapce.c2
-rw-r--r--src/mame/drivers/viper.c4
-rw-r--r--src/mame/drivers/zaxxon.c10
-rw-r--r--src/mame/machine/cps2crpt.c2
-rw-r--r--src/mame/machine/galaxian.c6
-rw-r--r--src/mame/machine/playch10.c30
-rw-r--r--src/mame/machine/scramble.c58
-rw-r--r--src/mame/machine/stfight.c2
-rw-r--r--src/mame/machine/vsnes.c34
56 files changed, 333 insertions, 333 deletions
diff --git a/src/mame/drivers/aladbl.c b/src/mame/drivers/aladbl.c
index 4c67e39e798..d1cf0681924 100644
--- a/src/mame/drivers/aladbl.c
+++ b/src/mame/drivers/aladbl.c
@@ -158,7 +158,7 @@ static DRIVER_INIT( aladbl )
// 220000 = writes to mcu? 330000 = reads?
memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x220000, 0x220001, 0, 0, aladbl_w);
memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x330000, 0x330001, 0, 0, aladbl_r);
- driver_init_megadrij(machine);
+ DRIVER_INIT_CALL(megadrij);
}
GAME( 1993, aladbl , 0, megadriv, aladbl, aladbl, ROT0, "bootleg / Sega", "Aladdin (bootleg of Japanese Megadrive version)", 0)
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 8fdec443c19..919f0bd1fa7 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -1333,7 +1333,7 @@ static DRIVER_INIT( tokiob )
{
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xfe00, 0xfe00, 0, 0, tokiob_mcu_r );
- driver_init_tokio(machine);
+ DRIVER_INIT_CALL(tokio);
}
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 791a18790c5..7acc76b930b 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -4295,7 +4295,7 @@ static DRIVER_INIT( pwrinst2 )
{
/* this patch fixes on of the moves, why is it needed? is the rom bad or is there another
problem? does the Japan set need it or not? */
- driver_init_pwrins2j(machine);
+ DRIVER_INIT_CALL(pwrins2j);
#if 1 //ROM PATCH
{
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 960af69ef61..42d6ed9a1e0 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -2687,7 +2687,7 @@ static DRIVER_INIT( wildplt )
{
memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x080000, 0x087fff, 0, 0, wildplt_vregs_r );
- driver_init_f1gpstar(machine);
+ DRIVER_INIT_CALL(f1gpstar);
}
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 53d931648c2..eb8a6486dfc 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -7285,25 +7285,25 @@ ROM_END
static DRIVER_INIT( wof )
{
wof_decode();
- driver_init_cps1(machine);
+ DRIVER_INIT_CALL(cps1);
}
static DRIVER_INIT( dino )
{
dino_decode();
- driver_init_cps1(machine);
+ DRIVER_INIT_CALL(cps1);
}
static DRIVER_INIT( punisher )
{
punisher_decode();
- driver_init_cps1(machine);
+ DRIVER_INIT_CALL(cps1);
}
static DRIVER_INIT( slammast )
{
slammast_decode();
- driver_init_cps1(machine);
+ DRIVER_INIT_CALL(cps1);
}
static DRIVER_INIT( pang3 )
@@ -7327,7 +7327,7 @@ static DRIVER_INIT( pang3 )
rom[A/2] = dst;
}
- driver_init_cps1(machine);
+ DRIVER_INIT_CALL(cps1);
}
#endif
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index e8f75e5ba39..3e819e11d7e 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -7189,13 +7189,13 @@ ROM_END
static DRIVER_INIT( cps2 )
{
/* Decrypt the game - see machine/cps2crpt.c */
- driver_init_cps2crpt(machine);
+ DRIVER_INIT_CALL(cps2crpt);
cps2networkpresent = 0;
}
static DRIVER_INIT( ssf2tb )
{
- driver_init_cps2(machine);
+ DRIVER_INIT_CALL(cps2);
cps2networkpresent = 0;
/* we don't emulate the network board, so don't say it's present for now, otherwise the game will
@@ -7206,7 +7206,7 @@ static DRIVER_INIT( ssf2tb )
static DRIVER_INIT ( puzloop2 )
{
- driver_init_cps2(machine);
+ DRIVER_INIT_CALL(cps2);
memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x804000, 0x804001, 0, 0, pl2_port_0_word_r);
}
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index ef6449d721a..f66eac37806 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -3120,9 +3120,9 @@ static DRIVER_INIT( jojo )
// rom[0x1fecc/4]^=0x01000000; // nocd
cps3_use_fastboot = 0;
- driver_init_cps3crpt(machine);
- driver_init_cps3_speedups(machine);
- driver_init_cps3_testhacks(machine);
+ DRIVER_INIT_CALL(cps3crpt);
+ DRIVER_INIT_CALL(cps3_speedups);
+ DRIVER_INIT_CALL(cps3_testhacks);
}
@@ -3146,9 +3146,9 @@ static DRIVER_INIT (jojoba)
// rom[0x1fec8/4]^=0x00000070; // DEV mode
// rom[0x1fecc/4]^=0x01000000; // nocd
- driver_init_cps3crpt(machine);
- driver_init_cps3_speedups(machine);
- driver_init_cps3_testhacks(machine);
+ DRIVER_INIT_CALL(cps3crpt);
+ DRIVER_INIT_CALL(cps3_speedups);
+ DRIVER_INIT_CALL(cps3_testhacks);
cps3_use_fastboot = 0;
}
@@ -3172,9 +3172,9 @@ static DRIVER_INIT( warzard )
// any actual NCD dumps to compare (or it expects SCSI to report there being
// no cd drive?)
- driver_init_cps3crpt(machine);
- driver_init_cps3_speedups(machine);
- driver_init_cps3_testhacks(machine);
+ DRIVER_INIT_CALL(cps3crpt);
+ DRIVER_INIT_CALL(cps3_speedups);
+ DRIVER_INIT_CALL(cps3_testhacks);
cps3_use_fastboot = 0; // required due to cd check, even with ASIA NO CD selected, not req. with CD emulation
}
@@ -3200,9 +3200,9 @@ static DRIVER_INIT( sfiii )
cps3_use_fastboot = 0;
- driver_init_cps3crpt(machine);
- driver_init_cps3_speedups(machine);
- driver_init_cps3_testhacks(machine);
+ DRIVER_INIT_CALL(cps3crpt);
+ DRIVER_INIT_CALL(cps3_speedups);
+ DRIVER_INIT_CALL(cps3_testhacks);
}
@@ -3224,9 +3224,9 @@ static DRIVER_INIT( sfiii2 )
cps3_use_fastboot = 0; // not required
- driver_init_cps3crpt(machine);
- driver_init_cps3_speedups(machine);
- driver_init_cps3_testhacks(machine);
+ DRIVER_INIT_CALL(cps3crpt);
+ DRIVER_INIT_CALL(cps3_speedups);
+ DRIVER_INIT_CALL(cps3_testhacks);
}
@@ -3246,9 +3246,9 @@ static DRIVER_INIT( sfiii3 )
// rom[0x1fec8/4]^=0x00000001; // region
// rom[0x1fecc/4]^=0x01000000; // nocd
- driver_init_cps3crpt(machine);
- driver_init_cps3_speedups(machine);
- driver_init_cps3_testhacks(machine);
+ DRIVER_INIT_CALL(cps3crpt);
+ DRIVER_INIT_CALL(cps3_speedups);
+ DRIVER_INIT_CALL(cps3_testhacks);
cps3_use_fastboot = 0;
}
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 98f7ae8b3f5..9cca766062b 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -3407,8 +3407,8 @@ static DRIVER_INIT( meikyuh )
static DRIVER_INIT( ghostb )
{
- driver_init_deco222(machine);
- driver_init_meikyuh(machine);
+ DRIVER_INIT_CALL(deco222);
+ DRIVER_INIT_CALL(meikyuh);
}
/******************************************************************************/
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index 4eaded5f32b..1b84614dcbc 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -1129,7 +1129,7 @@ static DRIVER_INIT( decocrom )
int i;
/* standard init */
- driver_init_decocass(machine);
+ DRIVER_INIT_CALL(decocass);
/* decrypt the ROMs */
for (i = 0; i < romlength; i++)
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 9f150c94022..62c546e2568 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -1751,7 +1751,7 @@ static DRIVER_INIT( hmcompmx )
0x6b, 0x09, 0x02, 0x0f, 0x05, 0x00, 0x7d, 0x1b
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_master_password(0, beatmania_master_password);
ide_set_user_password(0, hmcompmx_user_password);
@@ -1768,7 +1768,7 @@ static DRIVER_INIT( bm4thmix )
0x18, 0x06, 0x1e, 0x07, 0x77, 0x1a, 0x7d, 0x77
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_user_password(0, bm4thmix_user_password);
}
@@ -1784,7 +1784,7 @@ static DRIVER_INIT( bm5thmix )
0x6b, 0x1a, 0x1e, 0x06, 0x04, 0x01, 0x7d, 0x1f
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_master_password(0, beatmania_master_password);
ide_set_user_password(0, bm5thmix_user_password);
@@ -1801,7 +1801,7 @@ static DRIVER_INIT( bmclubmx )
0x0a, 0x1a, 0x71, 0x07, 0x1e, 0x19, 0x7d, 0x02
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_master_password(0, beatmania_master_password);
ide_set_user_password(0, bmclubmx_user_password);
@@ -1819,7 +1819,7 @@ static DRIVER_INIT( bmcompm2 )
0x6b, 0x0d, 0x71, 0x0f, 0x1d, 0x10, 0x7d, 0x7a
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_master_password(0, beatmania_master_password);
ide_set_user_password(0, bmcompm2_user_password);
@@ -1836,7 +1836,7 @@ static DRIVER_INIT( hmcompm2 )
0x09, 0x68, 0x71, 0x0b, 0x77, 0x15, 0x17, 0x1e
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_master_password(0, beatmania_master_password);
ide_set_user_password(0, hmcompm2_user_password);
@@ -1853,7 +1853,7 @@ static DRIVER_INIT( bmdct )
0x0e, 0x0a, 0x05, 0x0f, 0x13, 0x74, 0x09, 0x19
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_master_password(0, beatmania_master_password);
ide_set_user_password(0, bmdct_user_password);
@@ -1870,7 +1870,7 @@ static DRIVER_INIT( bmcorerm )
0x05, 0x09, 0x14, 0x0d, 0x7a, 0x74, 0x7d, 0x7a
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_master_password(0, beatmania_master_password);
ide_set_user_password(0, bmcorerm_user_password);
@@ -1887,7 +1887,7 @@ static DRIVER_INIT( bm6thmix )
0x02, 0x06, 0x09, 0x0f, 0x7a, 0x74, 0x7d, 0x7a
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_master_password(0, beatmania_master_password);
ide_set_user_password(0, bm6thmix_user_password);
@@ -1904,7 +1904,7 @@ static DRIVER_INIT( bm7thmix )
0x0c, 0x06, 0x7c, 0x6e, 0x77, 0x74, 0x7d, 0x7a
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_master_password(0, beatmania_master_password);
ide_set_user_password(0, bm7thmix_user_password);
@@ -1922,7 +1922,7 @@ static DRIVER_INIT( bmfinal )
0x0c, 0x06, 0x71, 0x6e, 0x77, 0x79, 0x7d, 0x7a
};
- driver_init_beatmania(machine);
+ DRIVER_INIT_CALL(beatmania);
ide_set_master_password(0, beatmania_master_password);
ide_set_user_password(0, bmfinal_user_password);
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index a6c421b9889..6ff2bb7a72b 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -5125,7 +5125,7 @@ static DRIVER_INIT( mjelct3a )
}
free(rom1);
- driver_init_mjelct3(machine);
+ DRIVER_INIT_CALL(mjelct3);
}
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index e7d7132cce1..714d67c4cc9 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -473,7 +473,7 @@ static DRIVER_INIT( exerionb )
ram[addr] = (ram[addr] & 0xf9) | ((ram[addr] & 2) << 1) | ((ram[addr] & 4) >> 1);
/* also convert the gfx as in Exerion */
- driver_init_exerion(machine);
+ DRIVER_INIT_CALL(exerion);
}
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index f805359cd26..535ae9a0c8f 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -3033,7 +3033,7 @@ static DRIVER_INIT (galaga)
static DRIVER_INIT (gatsbee)
{
- driver_init_galaga(machine);
+ DRIVER_INIT_CALL(galaga);
/* Gatsbee has a larger character ROM, we need a handler for banking */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1000, 0x1000, 0, 0, gatsbee_bank_w);
@@ -3071,7 +3071,7 @@ static DRIVER_INIT( xevios )
rom[A] = BITSWAP8(rom[A],3,7,5,1,2,6,4,0);
}
- driver_init_xevious(machine);
+ DRIVER_INIT_CALL(xevious);
}
@@ -3083,7 +3083,7 @@ static DRIVER_INIT( battles )
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x7000, 0x700f, 0, 0, battles_customio_data0_w );
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x7100, 0x7100, 0, 0, battles_customio0_w );
- driver_init_xevious(machine);
+ DRIVER_INIT_CALL(xevious);
}
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index ab4fb1eb9d2..974f91633f2 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -1026,7 +1026,7 @@ static DRIVER_INIT(hangplt)
static DRIVER_INIT(slrasslt)
{
- driver_init_gticlub(machine);
+ DRIVER_INIT_CALL(gticlub);
// enable self-modifying code checks
cpunum_set_info_int(0, CPUINFO_INT_PPC_DRC_OPTIONS, PPCDRC_OPTIONS_CHECK_SELFMOD_CODE);
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 1bd91fb4056..fddd8381642 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1409,13 +1409,13 @@ static DRIVER_INIT( hng64 )
static DRIVER_INIT(hng64_fght)
{
no_machine_error_code=0x01010101;
- driver_init_hng64(machine);
+ DRIVER_INIT_CALL(hng64);
}
static DRIVER_INIT(hng64_race)
{
no_machine_error_code=0x02020202;
- driver_init_hng64(machine);
+ DRIVER_INIT_CALL(hng64);
}
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index 60f44ec9e22..630f2990056 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -317,7 +317,7 @@ static DRIVER_INIT(hshavoc)
- driver_init_genesis(machine);
+ DRIVER_INIT_CALL(genesis);
}
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 96864dccffe..d6562eeadad 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -3860,7 +3860,7 @@ static DRIVER_INIT( aamat )
/*
Tournament Version
*/
- driver_init_aama(machine);
+ DRIVER_INIT_CALL(aama);
timekeeper_init( 0, TIMEKEEPER_M48T02, NULL );
memory_install_read32_handler (0, ADDRESS_SPACE_PROGRAM, 0x681000, 0x6817ff, 0, 0, timekeeper_0_32be_r);
memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x681000, 0x6817ff, 0, 0, timekeeper_0_32be_w);
@@ -3898,7 +3898,7 @@ static DRIVER_INIT( gtclassp )
{
/* a little extra protection */
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x680000, 0x680003, 0, 0, gtclass_prot_result_r);
- driver_init_aama(machine);
+ DRIVER_INIT_CALL(aama);
/* The protection code is:
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 20902b98b00..9d7b5d7768b 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -3208,7 +3208,7 @@ ROM_END
static DRIVER_INIT( shogwarr )
{
- driver_init_kaneko16(machine);
+ DRIVER_INIT_CALL(kaneko16);
/*
ROM test at 2237e:
diff --git a/src/mame/drivers/kinstb.c b/src/mame/drivers/kinstb.c
index 71714fda57a..318a3defa90 100644
--- a/src/mame/drivers/kinstb.c
+++ b/src/mame/drivers/kinstb.c
@@ -265,7 +265,7 @@ static DRIVER_INIT(kinstb)
{
memory_region(REGION_USER3)[i]=BITSWAP8(memory_region(REGION_USER3)[i],5,0,6,1,7,4,3,2 );
}
- driver_init_snes_hirom(machine);
+ DRIVER_INIT_CALL(snes_hirom);
}
ROM_START( kinstb )
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 453ec1bc247..0d9e02b02f6 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -551,7 +551,7 @@ static DRIVER_INIT( simpbowl )
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1f6800c0, 0x1f6800c7, 0, 0, trackball_r );
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1f6800c8, 0x1f6800cb, 0, 0, unknown_r ); /* ?? */
- driver_init_konamigv(machine);
+ DRIVER_INIT_CALL(konamigv);
}
static MACHINE_DRIVER_START( simpbowl )
@@ -640,7 +640,7 @@ static DRIVER_INIT( btchamp )
memory_install_read32_handler (0, ADDRESS_SPACE_PROGRAM, 0x1f380000, 0x1f3fffff, 0, 0, btcflash_r );
memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1f380000, 0x1f3fffff, 0, 0, btcflash_w );
- driver_init_konamigv(machine);
+ DRIVER_INIT_CALL(konamigv);
}
static MACHINE_DRIVER_START( btchamp )
@@ -695,7 +695,7 @@ static DRIVER_INIT( tokimosh )
memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f680080, 0x1f680083, 0, 0, tokimeki_serial_r );
memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f680090, 0x1f680093, 0, 0, tokimeki_serial_w );
- driver_init_konamigv(machine);
+ DRIVER_INIT_CALL(konamigv);
}
/*
@@ -732,7 +732,7 @@ static DRIVER_INIT( kdeadeye )
memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f380000, 0x1f3fffff, 0, 0, btcflash_r );
memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f380000, 0x1f3fffff, 0, 0, btcflash_w );
- driver_init_konamigv(machine);
+ DRIVER_INIT_CALL(konamigv);
}
static MACHINE_DRIVER_START( kdeadeye )
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index bc9fd9c0c72..1a9e2d85499 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -1672,7 +1672,7 @@ static WRITE32_HANDLER( ge765pwbba_w )
static DRIVER_INIT( ge765pwbba )
{
- driver_init_konami573( machine );
+ DRIVER_INIT_CALL(konami573);
uPD4701_init( 0 );
@@ -1972,7 +1972,7 @@ static void gn845pwbb_output_callback( int offset, int data )
static DRIVER_INIT( ddr )
{
- driver_init_konami573( machine );
+ DRIVER_INIT_CALL(konami573);
gx700pwfbf_init( gn845pwbb_output_callback );
@@ -2030,7 +2030,7 @@ static WRITE32_HANDLER( gtrfrks_io_w )
static DRIVER_INIT( gtrfrks )
{
- driver_init_konami573( machine );
+ DRIVER_INIT_CALL(konami573);
memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f600000, 0x1f6000ff, 0, 0, gtrfrks_io_r );
memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f600000, 0x1f6000ff, 0, 0, gtrfrks_io_w );
@@ -2340,7 +2340,7 @@ static void gx894pwbba_init( void (*output_callback)( int offset, int data ) )
static DRIVER_INIT( ddrdigital )
{
- driver_init_konami573( machine );
+ DRIVER_INIT_CALL(konami573);
gx894pwbba_init( gn845pwbb_output_callback );
}
@@ -2349,7 +2349,7 @@ static DRIVER_INIT( ddrdigital )
static DRIVER_INIT( gtrfrkdigital )
{
- driver_init_konami573( machine );
+ DRIVER_INIT_CALL(konami573);
gx894pwbba_init( NULL );
@@ -2414,7 +2414,7 @@ static void ddrsolo_output_callback( int offset, int data )
static DRIVER_INIT( ddrsolo )
{
- driver_init_konami573( machine );
+ DRIVER_INIT_CALL(konami573);
gx894pwbba_init( ddrsolo_output_callback );
}
@@ -2487,14 +2487,14 @@ static void drmn_output_callback( int offset, int data )
static DRIVER_INIT( drmn )
{
- driver_init_konami573( machine );
+ DRIVER_INIT_CALL(konami573);
gx700pwfbf_init( drmn_output_callback );
}
static DRIVER_INIT( drmndigital )
{
- driver_init_konami573( machine );
+ DRIVER_INIT_CALL(konami573);
gx894pwbba_init( drmn_output_callback );
}
@@ -2643,7 +2643,7 @@ static WRITE32_HANDLER( dmx_io_w )
static DRIVER_INIT( dmx )
{
- driver_init_konami573( machine );
+ DRIVER_INIT_CALL(konami573);
gx894pwbba_init( dmx_output_callback );
@@ -2711,7 +2711,7 @@ static void salarymc_lamp_clk_write( int data )
static DRIVER_INIT( salarymc )
{
- driver_init_konami573( machine );
+ DRIVER_INIT_CALL(konami573);
security_bit7_write = salarymc_lamp_data_write;
security_bit6_write = salarymc_lamp_rst_write;
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index a65168fe3aa..2003c733196 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -923,7 +923,7 @@ static DRIVER_INIT( prosport )
static DRIVER_INIT( yellowcb )
{
- driver_init_prosport(machine);
+ DRIVER_INIT_CALL(prosport);
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xa000, 0, 0, input_port_0_r);
}
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 0a19d440919..e1203ecdc21 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -2132,14 +2132,14 @@ static DRIVER_INIT( grobda )
*/
memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x0002, 0x0002, 0, 0, grobda_DAC_w );
- driver_init_58_56(machine);
+ DRIVER_INIT_CALL(58_56);
}
static DRIVER_INIT( digdug2 )
{
/* appears to not use the watchdog */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x8000, 0, 0, MWA8_NOP);
- driver_init_58_56(machine);
+ DRIVER_INIT_CALL(58_56);
}
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index b8570f1a9ea..998cb1c90c4 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -1010,7 +1010,7 @@ static DRIVER_INIT (megaplay)
ic37_ram = auto_malloc(0x10000);
genesis_io_ram = auto_malloc(0x20);
- driver_init_megadrij(machine);
+ DRIVER_INIT_CALL(megadrij);
megplay_stat();
/* for now ... */
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index ee7930aa344..783c57c938c 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -101,7 +101,7 @@ extern void machine_reset_megadriv(running_machine *machine);
extern UINT32 video_update_megatech_bios(running_machine *machine, int screen, mame_bitmap *bitmap, const rectangle *cliprect);
extern void video_eof_megatech_bios(running_machine *machine);
extern void machine_reset_megatech_bios(running_machine *machine);
-extern void driver_init_megatech_bios(running_machine *machine);
+extern DRIVER_INIT(megatech_bios);
/* not currently used */
@@ -597,8 +597,8 @@ ADDRESS_MAP_END
static DRIVER_INIT(mtnew)
{
megatech_banked_ram = auto_malloc(0x1000*8);
- driver_init_megadriv(Machine);
- driver_init_megatech_bios(Machine);
+ DRIVER_INIT_CALL(megadriv);
+ DRIVER_INIT_CALL(megatech_bios);
}
static VIDEO_START(mtnew)
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 4113bffaef4..86dd840754c 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -4562,7 +4562,7 @@ int i;
for (i = 0;i < (0x20000*3)/2;i++)
RAM[i] = mame_rand(machine);
- driver_init_metro(machine);
+ DRIVER_INIT_CALL(metro);
}
static DRIVER_INIT( daitorid )
@@ -4618,7 +4618,7 @@ static DRIVER_INIT( dharmak )
src[i+3] = dat;
}
- driver_init_metro(machine);
+ DRIVER_INIT_CALL(metro);
}
static DRIVER_INIT( blzntrnd )
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 0c375fdbe36..b454555a14f 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -4298,7 +4298,7 @@ static DRIVER_INIT( lostwsga )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_15(machine);
+ DRIVER_INIT_CALL(model3_15);
/* TODO: there's an M68K device at 0xC0000000 - FF, maybe lightgun controls ? */
memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc1000000, 0xc10000ff, 0, 0, scsi_r );
memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc1000000, 0xc10000ff, 0, 0, scsi_w );
@@ -4310,7 +4310,7 @@ static DRIVER_INIT( scud )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_15(machine);
+ DRIVER_INIT_CALL(model3_15);
/* TODO: network device at 0xC0000000 - FF */
memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf9000000, 0xf90000ff, 0, 0, scsi_r );
memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf9000000, 0xf90000ff, 0, 0, scsi_w );
@@ -4323,7 +4323,7 @@ static DRIVER_INIT( scudp )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_15(machine);
+ DRIVER_INIT_CALL(model3_15);
/* TODO: network device at 0xC0000000 - FF */
memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc1000000, 0xc10000ff, 0, 0, scsi_r );
memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc1000000, 0xc10000ff, 0, 0, scsi_w );
@@ -4340,7 +4340,7 @@ static DRIVER_INIT( scudp )
static DRIVER_INIT( lemans24 )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_15(machine);
+ DRIVER_INIT_CALL(model3_15);
memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc1000000, 0xc10000ff, 0, 0, scsi_r );
memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc1000000, 0xc10000ff, 0, 0, scsi_w );
@@ -4356,7 +4356,7 @@ static DRIVER_INIT( vf3 )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_10(machine);
+ DRIVER_INIT_CALL(model3_10);
rom[(0x713c7c^4)/4] = 0x60000000;
rom[(0x713e54^4)/4] = 0x60000000;
@@ -4461,7 +4461,7 @@ static DRIVER_INIT( vs2 )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x705884^4)/4] = 0x60000000;
rom[(0x7058a4^4)/4] = 0x60000000;
@@ -4471,7 +4471,7 @@ static DRIVER_INIT( vs298 )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x603868^4)/4] = 0x60000000;
rom[(0x603888^4)/4] = 0x60000000;
@@ -4482,7 +4482,7 @@ static DRIVER_INIT( vs2v991 )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x603868^4)/4] = 0x60000000;
rom[(0x603888^4)/4] = 0x60000000;
@@ -4492,7 +4492,7 @@ static DRIVER_INIT( vs299 )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x603868^4)/4] = 0x60000000;
rom[(0x603888^4)/4] = 0x60000000;
@@ -4501,7 +4501,7 @@ static DRIVER_INIT( vs299 )
static DRIVER_INIT( harley )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc0000000, 0xc00fffff, 0, 0, network_r );
memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc0000000, 0xc00fffff, 0, 0, network_w );
@@ -4516,7 +4516,7 @@ static DRIVER_INIT( harley )
static DRIVER_INIT( srally2 )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x7c0c4^4)/4] = 0x60000000;
rom[(0x7c0c8^4)/4] = 0x60000000;
@@ -4526,7 +4526,7 @@ static DRIVER_INIT( srally2 )
static DRIVER_INIT( swtrilgy )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0xf0e48^4)/4] = 0x60000000;
rom[(0x043dc^4)/4] = 0x48000090;
@@ -4537,7 +4537,7 @@ static DRIVER_INIT( swtrilgy )
static DRIVER_INIT( swtrilga )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0xf6dd0^4)/4] = 0x60000000;
}
@@ -4545,7 +4545,7 @@ static DRIVER_INIT( swtrilga )
static DRIVER_INIT( von2 )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x189168^4)/4] = 0x60000000;
rom[(0x1890ac^4)/4] = 0x60000000;
@@ -4557,7 +4557,7 @@ static DRIVER_INIT( von2 )
static DRIVER_INIT( dirtdvls )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x0600a0^4)/4] = 0x60000000;
rom[(0x0608a4^4)/4] = 0x60000000;
@@ -4570,7 +4570,7 @@ static DRIVER_INIT( dirtdvls )
static DRIVER_INIT( daytona2 )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc3800000, 0xc3800007, 0, 0, daytona2_rombank_w );
@@ -4583,7 +4583,7 @@ static DRIVER_INIT( daytona2 )
static DRIVER_INIT( dayto2pe )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc3800000, 0xc3800007, 0, 0, daytona2_rombank_w );
@@ -4597,7 +4597,7 @@ static DRIVER_INIT( dayto2pe )
static DRIVER_INIT( spikeout )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x6059cc^4)/4] = 0x60000000;
rom[(0x6059ec^4)/4] = 0x60000000;
@@ -4606,7 +4606,7 @@ static DRIVER_INIT( spikeout )
static DRIVER_INIT( spikeofe )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x6059cc^4)/4] = 0x60000000;
rom[(0x6059ec^4)/4] = 0x60000000;
@@ -4615,7 +4615,7 @@ static DRIVER_INIT( spikeofe )
static DRIVER_INIT( eca )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x535580^4)/4] = 0x60000000;
rom[(0x5023b4^4)/4] = 0x60000000;
@@ -4625,7 +4625,7 @@ static DRIVER_INIT( eca )
static DRIVER_INIT( skichamp )
{
UINT32 *rom = (UINT32*)memory_region(REGION_USER1);
- driver_init_model3_20(machine);
+ DRIVER_INIT_CALL(model3_20);
rom[(0x5263c8^4)/4] = 0x60000000;
rom[(0x5263e8^4)/4] = 0x60000000;
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index ea6243b840f..c04d2fb03d8 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -2195,7 +2195,7 @@ static DRIVER_INIT (kirarast)
// { 0xfcc00004, 0xfcc00007, ms32_mahjong_read_inputs1 }
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0xfcc00004, 0xfcc00007, 0, 0, ms32_mahjong_read_inputs1 );
- driver_init_ss92047_01(machine);
+ DRIVER_INIT_CALL(ss92047_01);
}
static DRIVER_INIT (47pie2)
@@ -2203,7 +2203,7 @@ static DRIVER_INIT (47pie2)
// { 0xfcc00004, 0xfcc00007, ms32_mahjong_read_inputs1 }
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0xfcc00004, 0xfcc00007, 0, 0, ms32_mahjong_read_inputs1 );
- driver_init_ss92048_01(machine);
+ DRIVER_INIT_CALL(ss92048_01);
}
static DRIVER_INIT (f1superb)
@@ -2212,7 +2212,7 @@ static DRIVER_INIT (f1superb)
UINT32 *pROM = (UINT32 *)memory_region(REGION_CPU1);
pROM[0x19d04/4]=0x167a021a; // bne->br : sprite Y offset table is always copied to RAM
#endif
- driver_init_ss92046_01(machine);
+ DRIVER_INIT_CALL(ss92046_01);
}
/********** GAME DRIVERS **********/
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index e2d7585a125..9824ece1d07 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1457,7 +1457,7 @@ static DRIVER_INIT( namcos12 )
static DRIVER_INIT( ptblank2 )
{
- driver_init_namcos12(machine);
+ DRIVER_INIT_CALL(namcos12);
/* patch out wait for dma 5 to complete */
*( (UINT32 *)( memory_region( REGION_USER1 ) + 0x331c4 ) ) = 0;
@@ -1467,7 +1467,7 @@ static DRIVER_INIT( ptblank2 )
static DRIVER_INIT( ghlpanic )
{
- driver_init_namcos12(machine);
+ DRIVER_INIT_CALL(namcos12);
system11gun_install();
}
diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c
index e7f92ba0e8f..30fa2507e34 100644
--- a/src/mame/drivers/neodrvr.c
+++ b/src/mame/drivers/neodrvr.c
@@ -6612,14 +6612,14 @@ ROM_END
static DRIVER_INIT( fatfury2 )
{
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
fatfury2_install_protection();
}
static DRIVER_INIT( mslugx )
{
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
mslugx_install_protection();
}
@@ -6628,7 +6628,7 @@ static DRIVER_INIT( kof99 )
kof99_decrypt_68k();
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0x00);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
kof99_install_protection();
}
@@ -6637,7 +6637,7 @@ static DRIVER_INIT( garou )
garou_decrypt_68k();
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0x06);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
garou_install_protection();
}
@@ -6646,7 +6646,7 @@ static DRIVER_INIT( garouo )
garouo_decrypt_68k();
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0x06);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
garouo_install_protection();
}
@@ -6654,7 +6654,7 @@ static DRIVER_INIT( garoubl )
{
neogeo_bootleg_sx_decrypt(2);
neogeo_bootleg_cx_decrypt();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( mslug3 )
@@ -6662,7 +6662,7 @@ static DRIVER_INIT( mslug3 )
mslug3_decrypt_68k();
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0xad);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
mslug3_install_protection();
}
@@ -6671,21 +6671,21 @@ static DRIVER_INIT( kof2000 )
kof2000_decrypt_68k();
neogeo_fixed_layer_bank_type = 2;
kof2000_neogeo_gfx_decrypt(0x00);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
kof2000_install_protection();
}
static DRIVER_INIT( kof2001 )
{
kof2000_neogeo_gfx_decrypt(0x1e);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( mslug4 )
{
neogeo_fixed_layer_bank_type = 1; /* USA violent content screen is wrong -- not a bug, confirmed on real hardware! */
kof2000_neogeo_gfx_decrypt(0x31);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
neo_pcm2_snk_1999(8);
}
@@ -6693,76 +6693,76 @@ static DRIVER_INIT( kof99n )
{
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0x00);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( ganryu )
{
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0x07);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( s1945p )
{
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0x05);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( preisle2 )
{
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0x9f);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( mslug3n )
{
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0xad);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( kof2000n )
{
neogeo_fixed_layer_bank_type = 2;
kof2000_neogeo_gfx_decrypt(0x00);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( bangbead )
{
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0xf8);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( nitd )
{
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0xff);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( zupapa )
{
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0xbd);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( sengoku3 )
{
neogeo_fixed_layer_bank_type = 1;
kof99_neogeo_gfx_decrypt(0xfe);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT ( kof98 )
{
kof98_decrypt_68k();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_kof98_protection();
}
@@ -6771,7 +6771,7 @@ static DRIVER_INIT( rotd )
neo_pcm2_snk_1999(16);
neogeo_fixed_layer_bank_type = 1;
kof2000_neogeo_gfx_decrypt(0x3f);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
@@ -6780,7 +6780,7 @@ static DRIVER_INIT( kof2002 )
kof2002_decrypt_68k();
neo_pcm2_swap(0 );
kof2000_neogeo_gfx_decrypt(0xec);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( kf2k2pls )
@@ -6788,7 +6788,7 @@ static DRIVER_INIT( kf2k2pls )
kof2002_decrypt_68k();
neo_pcm2_swap(0 );
cmc50_neogeo_gfx_decrypt(0xec);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( kf2k2mp )
@@ -6797,7 +6797,7 @@ static DRIVER_INIT( kf2k2mp )
neo_pcm2_swap(0 );
neogeo_bootleg_sx_decrypt(2);
cmc50_neogeo_gfx_decrypt(0xec);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( kof2km2 )
@@ -6806,7 +6806,7 @@ static DRIVER_INIT( kof2km2 )
neo_pcm2_swap(0 );
neogeo_bootleg_sx_decrypt(1);
cmc50_neogeo_gfx_decrypt(0xec);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( matrim )
@@ -6815,7 +6815,7 @@ static DRIVER_INIT( matrim )
neo_pcm2_swap(1);
neogeo_fixed_layer_bank_type = 2;
kof2000_neogeo_gfx_decrypt(0x6a);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( pnyaa )
@@ -6823,7 +6823,7 @@ static DRIVER_INIT( pnyaa )
neo_pcm2_snk_1999(4);
neogeo_fixed_layer_bank_type = 1;
kof2000_neogeo_gfx_decrypt(0x2e);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( mslug5 )
@@ -6832,7 +6832,7 @@ static DRIVER_INIT( mslug5 )
neo_pcm2_swap(2);
neogeo_fixed_layer_bank_type = 1;
kof2000_neogeo_gfx_decrypt(0x19);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_pvc_protection();
}
@@ -6844,7 +6844,7 @@ static DRIVER_INIT( ms5pcb )
neogeo_fixed_layer_bank_type = 2;
svcpcb_s1data_decrypt();
neo_pcm2_swap(2);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_pvc_protection();
}
@@ -6855,7 +6855,7 @@ static DRIVER_INIT( ms5plus )
// decrypt_ms5plus_s1();
neogeo_bootleg_sx_decrypt(1);
neogeo_fixed_layer_bank_type = 1;
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_ms5plus_protection();
}
@@ -6878,7 +6878,7 @@ static DRIVER_INIT( svcpcb )
svcpcb_s1data_decrypt();
neo_pcm2_swap(3);
neogeo_fixed_layer_bank_type = 2;
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_pvc_protection();
}
@@ -6888,7 +6888,7 @@ static DRIVER_INIT( svc )
neo_pcm2_swap(3);
neogeo_fixed_layer_bank_type = 2;
kof2000_neogeo_gfx_decrypt(0x57);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_pvc_protection();
}
@@ -6896,7 +6896,7 @@ static DRIVER_INIT( svcboot )
{
svcboot_px_decrypt();
svcboot_cx_decrypt();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_pvc_protection();
}
@@ -6907,7 +6907,7 @@ static DRIVER_INIT( svcplus )
// svcplus_sx_decrypt();
neogeo_bootleg_sx_decrypt(1);
svcplus_px_hack();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( svcplusa )
@@ -6915,7 +6915,7 @@ static DRIVER_INIT( svcplusa )
svcplusa_px_decrypt();
svcboot_cx_decrypt();
svcplus_px_hack();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( svcsplus )
@@ -6925,7 +6925,7 @@ static DRIVER_INIT( svcsplus )
neogeo_bootleg_sx_decrypt(2);
svcboot_cx_decrypt();
svcsplus_px_hack();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_pvc_protection();
}
@@ -6935,7 +6935,7 @@ static DRIVER_INIT( samsho5 )
neo_pcm2_swap(4);
neogeo_fixed_layer_bank_type = 1;
kof2000_neogeo_gfx_decrypt(0x0f);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( samsho5b )
@@ -6944,7 +6944,7 @@ static DRIVER_INIT( samsho5b )
neogeo_fixed_layer_bank_type = 1;
kof2000_neogeo_gfx_decrypt(0x0f);
samsh5bl_px_decrypt();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( kf2k3pcb )
@@ -6957,7 +6957,7 @@ static DRIVER_INIT( kf2k3pcb )
/* rom[i] = BITSWAP8(rom[i], 5, 6, 1, 4, 3, 0, 7, 2) -- extra encrypted m1 swap? not confirmed */
neo_pcm2_swap(5);
neogeo_fixed_layer_bank_type = 2;
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_pvc_protection();
memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xc00000, 0xc7ffff, 0, 0, MRA16_BANK6 ); // 512k bios
}
@@ -6969,7 +6969,7 @@ static DRIVER_INIT( kof2003 )
neo_pcm2_swap(5);
neogeo_fixed_layer_bank_type = 2;
kof2000_neogeo_gfx_decrypt(0x9d);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_pvc_protection();
}
@@ -6977,7 +6977,7 @@ static DRIVER_INIT( kof2003b )
{
// kof2003b_sx_decrypt();
neogeo_bootleg_sx_decrypt(1);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
kof2003b_install_protection();
}
@@ -6986,7 +6986,7 @@ static DRIVER_INIT( kof2k3pl )
kof2k3pl_px_decrypt();
//decrypt_ms5plus_s1();
neogeo_bootleg_sx_decrypt(1);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
kf2k3pl_install_protection();
}
@@ -6996,7 +6996,7 @@ static DRIVER_INIT( kof2k3up )
kof2k3up_px_decrypt();
// kof2k3up_sx_decrypt();
neogeo_bootleg_sx_decrypt(2);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
kof2k3up_install_protection();
}
@@ -7008,7 +7008,7 @@ static DRIVER_INIT( samsh5sp )
neo_pcm2_swap(6);
neogeo_fixed_layer_bank_type = 1;
kof2000_neogeo_gfx_decrypt(0x0d);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
@@ -7029,7 +7029,7 @@ static DRIVER_INIT( jockeygp )
// memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x280000, 0x280001, 0, 0, port_tag_to_handler16("IN5") );
// memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x2c0000, 0x2c0001, 0, 0, port_tag_to_handler16("IN6") );
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( vliner )
@@ -7046,7 +7046,7 @@ static DRIVER_INIT( vliner )
memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x280000, 0x280001, 0, 0, port_tag_to_handler16("IN5") );
memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x2c0000, 0x2c0001, 0, 0, port_tag_to_handler16("IN6") );
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
@@ -7058,55 +7058,55 @@ static DRIVER_INIT( kog )
kog_px_decrypt();
neogeo_bootleg_sx_decrypt(1);
neogeo_bootleg_cx_decrypt();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( kof10th )
{
decrypt_kof10th();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
install_kof10th_protection();
}
static DRIVER_INIT( kf10thep )
{
decrypt_kf10thep();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( kf2k5uni )
{
decrypt_kf2k5uni();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( cthd2003 )
{
decrypt_cthd2003();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
patch_cthd2003();
}
static DRIVER_INIT ( ct2k3sp )
{
decrypt_ct2k3sp();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
patch_cthd2003();
}
static DRIVER_INIT ( ct2k3sa )
{
decrypt_ct2k3sa();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
patch_ct2k3sa();
}
static DRIVER_INIT( kof2k4se )
{
decrypt_kof2k4se_68k();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( lans2004 )
@@ -7115,14 +7115,14 @@ static DRIVER_INIT( lans2004 )
lans2004_vx_decrypt();
neogeo_bootleg_sx_decrypt(1);
neogeo_bootleg_cx_decrypt();
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
static DRIVER_INIT( mslug3b6 )
{
neogeo_bootleg_sx_decrypt(2);
cmc42_neogeo_gfx_decrypt(0xad);
- driver_init_neogeo(machine);
+ DRIVER_INIT_CALL(neogeo);
}
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index cc126d41c84..4d94590fe8c 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -4735,7 +4735,7 @@ static DRIVER_INIT( ssmissin )
static DRIVER_INIT( bjtwin )
{
- driver_init_nmk(machine);
+ DRIVER_INIT_CALL(nmk);
/* Patch rom to enable test mode */
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 75f2207d799..065dc3f73ef 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -1029,7 +1029,7 @@ static DRIVER_INIT(thrilld)
backup_ram[0x0e] = (checksum >> 8) & 0xff; // checksum
backup_ram[0x0f] = (checksum >> 0) & 0xff; // checksum
- driver_init_nwktr(machine);
+ DRIVER_INIT_CALL(nwktr);
}
static DRIVER_INIT(racingj)
@@ -1063,7 +1063,7 @@ static DRIVER_INIT(racingj)
backup_ram[0x0e] = (checksum >> 8) & 0xff; // checksum
backup_ram[0x0f] = (checksum >> 0) & 0xff; // checksum
- driver_init_nwktr(machine);
+ DRIVER_INIT_CALL(nwktr);
}
static DRIVER_INIT(racingj2)
@@ -1097,7 +1097,7 @@ static DRIVER_INIT(racingj2)
backup_ram[0x0e] = (checksum >> 8) & 0xff; // checksum
backup_ram[0x0f] = (checksum >> 0) & 0xff; // checksum
- driver_init_nwktr(machine);
+ DRIVER_INIT_CALL(nwktr);
}
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index a581851e053..13e6e2b1fcc 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -182,7 +182,7 @@ ROM_END
static DRIVER_INIT(paranoia)
{
- driver_init_pce(machine);
+ DRIVER_INIT_CALL(pce);
};
GAME( 1990, paranoia, 0, paranoia, paranoia, paranoia, ROT0, "Naxat Soft", "Paranoia", GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index 6e80cb4fe11..31e747a0f6e 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -461,8 +461,8 @@ static DRIVER_INIT( graphics )
static DRIVER_INIT( pcktgal )
{
- driver_init_deco222(machine);
- driver_init_graphics(machine);
+ DRIVER_INIT_CALL(deco222);
+ DRIVER_INIT_CALL(graphics);
}
/***************************************************************************/
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 0b1889b1bd1..9ff01016095 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -1695,7 +1695,7 @@ static DRIVER_INIT( polepos2 )
/* note that the bootleg version doesn't need this custom IC; it has a hacked ROM in its place */
memory_install_read16_handler(1, ADDRESS_SPACE_PROGRAM, 0x4000, 0x5fff, 0, 0, polepos2_ic25_r);
- driver_init_polepos(machine);
+ DRIVER_INIT_CALL(polepos);
}
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index 8b498233e3d..9e6c10c80f0 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -2353,7 +2353,7 @@ static WRITE8_HANDLER (segae_ridleofp_port_fa_w)
static DRIVER_INIT( ridleofp )
{
- driver_init_segasyse(machine);
+ DRIVER_INIT_CALL(segasyse);
memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0xf8, 0xf8, 0, 0, segae_ridleofp_port_f8_r);
memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0xfa, 0xfa, 0, 0, segae_ridleofp_port_fa_w);
@@ -2362,7 +2362,7 @@ static DRIVER_INIT( ridleofp )
static DRIVER_INIT( hangonjr )
{
- driver_init_segasyse(machine);
+ DRIVER_INIT_CALL(segasyse);
memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0xf8, 0xf8, 0, 0, segae_hangonjr_port_f8_r);
memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0xfa, 0xfa, 0, 0, segae_hangonjr_port_fa_w);
@@ -2370,21 +2370,21 @@ static DRIVER_INIT( hangonjr )
static DRIVER_INIT( opaopa )
{
- driver_init_segasyse(machine);
+ DRIVER_INIT_CALL(segasyse);
mc8123_decrypt_rom(0, memory_region(REGION_USER1), 1, 8);
}
static DRIVER_INIT( fantzn2 )
{
- driver_init_segasyse(machine);
+ DRIVER_INIT_CALL(segasyse);
mc8123_decrypt_rom(0, memory_region(REGION_USER1), 0, 0);
}
static DRIVER_INIT( astrofl )
{
- driver_init_segasyse(machine);
+ DRIVER_INIT_CALL(segasyse);
astrofl_decode();
}
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index ec21bafae41..508e7bce480 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -5994,35 +5994,35 @@ static DRIVER_INIT( generic_5797 )
static DRIVER_INIT( aliensy3_5358 )
{
void fd1089_decrypt_0033(void);
- driver_init_generic_5358(machine);
+ DRIVER_INIT_CALL(generic_5358);
fd1089_decrypt_0033();
}
static DRIVER_INIT( altbeast_5521 )
{
- driver_init_generic_5521(machine);
+ DRIVER_INIT_CALL(generic_5521);
i8751_vblank_hook = altbeast_i8751_sim;
}
static DRIVER_INIT( altbeasj_5521 )
{
- driver_init_generic_5521(machine);
+ DRIVER_INIT_CALL(generic_5521);
i8751_vblank_hook = altbeasj_i8751_sim;
}
static DRIVER_INIT( altbeas5_5521 )
{
- driver_init_generic_5521(machine);
+ DRIVER_INIT_CALL(generic_5521);
i8751_vblank_hook = altbeas5_i8751_sim;
}
static DRIVER_INIT( altbeas4_5521 )
{
- driver_init_generic_5521(machine);
+ DRIVER_INIT_CALL(generic_5521);
mc8123_decrypt_rom(1, memory_region(REGION_USER2), 0, 0);
}
@@ -6030,7 +6030,7 @@ static DRIVER_INIT( altbeas4_5521 )
static DRIVER_INIT( aurail1_5704 )
{
void fd1089_decrypt_0168(void);
- driver_init_generic_5704(machine);
+ DRIVER_INIT_CALL(generic_5704);
fd1089_decrypt_0168();
}
@@ -6038,14 +6038,14 @@ static DRIVER_INIT( aurail1_5704 )
static DRIVER_INIT( aurailj_5704 )
{
void fd1089_decrypt_0167(void);
- driver_init_generic_5704(machine);
+ DRIVER_INIT_CALL(generic_5704);
fd1089_decrypt_0167();
}
static DRIVER_INIT( ddux_5704 )
{
- driver_init_generic_5704(machine);
+ DRIVER_INIT_CALL(generic_5704);
i8751_vblank_hook = ddux_i8751_sim;
}
@@ -6053,7 +6053,7 @@ static DRIVER_INIT( ddux_5704 )
static DRIVER_INIT( dunkshot_5358 )
{
void fd1089_decrypt_0022(void);
- driver_init_generic_5358(machine);
+ DRIVER_INIT_CALL(generic_5358);
fd1089_decrypt_0022();
custom_io_r = dunkshot_custom_io_r;
}
@@ -6061,14 +6061,14 @@ static DRIVER_INIT( dunkshot_5358 )
static DRIVER_INIT( exctleag_5358 )
{
- driver_init_generic_5358(machine);
+ DRIVER_INIT_CALL(generic_5358);
custom_io_r = sdi_custom_io_r;
}
static DRIVER_INIT( goldnaxe_5704 )
{
- driver_init_generic_5704(machine);
+ DRIVER_INIT_CALL(generic_5704);
goldnaxe_i8751_init();
i8751_vblank_hook = goldnaxe_i8751_sim;
}
@@ -6076,7 +6076,7 @@ static DRIVER_INIT( goldnaxe_5704 )
static DRIVER_INIT( goldnaxe_5797 )
{
- driver_init_generic_5797(machine);
+ DRIVER_INIT_CALL(generic_5797);
goldnaxe_i8751_init();
i8751_vblank_hook = goldnaxe_i8751_sim;
}
@@ -6084,7 +6084,7 @@ static DRIVER_INIT( goldnaxe_5797 )
static DRIVER_INIT( hwchamp_5521 )
{
- driver_init_generic_5521(machine);
+ DRIVER_INIT_CALL(generic_5521);
custom_io_r = hwchamp_custom_io_r;
custom_io_w = hwchamp_custom_io_w;
}
@@ -6092,14 +6092,14 @@ static DRIVER_INIT( hwchamp_5521 )
static DRIVER_INIT( sdi_5358 )
{
- driver_init_generic_5358(machine);
+ DRIVER_INIT_CALL(generic_5358);
custom_io_r = sdi_custom_io_r;
}
static DRIVER_INIT( defense_5358 )
{
void fd1089_decrypt_0028(void);
- driver_init_generic_5358(machine);
+ DRIVER_INIT_CALL(generic_5358);
fd1089_decrypt_0028();
custom_io_r = sdi_custom_io_r;
}
@@ -6107,7 +6107,7 @@ static DRIVER_INIT( defense_5358 )
static DRIVER_INIT( shinobi3_5358 )
{
- driver_init_generic_5358(machine);
+ DRIVER_INIT_CALL(generic_5358);
mc8123_decrypt_rom(1, memory_region(REGION_USER2), 0, 0);
}
@@ -6115,7 +6115,7 @@ static DRIVER_INIT( shinobi3_5358 )
static DRIVER_INIT( sjryuko_5358 )
{
void fd1089_decrypt_5021(void);
- driver_init_generic_5358(machine);
+ DRIVER_INIT_CALL(generic_5358);
fd1089_decrypt_5021();
custom_io_r = sjryuko_custom_io_r;
custom_io_w = sjryuko_custom_io_w;
@@ -6124,34 +6124,34 @@ static DRIVER_INIT( sjryuko_5358 )
static DRIVER_INIT( passshtj_5358 )
{
- driver_init_generic_5358(machine);
+ DRIVER_INIT_CALL(generic_5358);
custom_io_r = passshtj_custom_io_r;
}
static DRIVER_INIT( tturf_5704 )
{
- driver_init_generic_5704(machine);
+ DRIVER_INIT_CALL(generic_5704);
i8751_vblank_hook = tturf_i8751_sim;
}
static DRIVER_INIT( tturf_5358 )
{
- driver_init_generic_5358(machine);
+ DRIVER_INIT_CALL(generic_5358);
i8751_vblank_hook = tturf_i8751_sim;
}
static DRIVER_INIT( wb3_5704 )
{
- driver_init_generic_5704(machine);
+ DRIVER_INIT_CALL(generic_5704);
i8751_vblank_hook = wb3_i8751_sim;
}
static DRIVER_INIT( wrestwar_8751 )
{
- driver_init_generic_5704(machine);
+ DRIVER_INIT_CALL(generic_5704);
i8751_vblank_hook = wrestwar_i8751_sim;
}
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 07907c793b6..2560e55cdee 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -2212,20 +2212,20 @@ static DRIVER_INIT( generic_5987 )
static DRIVER_INIT( ddcrew )
{
- driver_init_generic_5987(machine);
+ DRIVER_INIT_CALL(generic_5987);
custom_io_r = ddcrew_custom_io_r;
}
static DRIVER_INIT( lghost )
{
- driver_init_generic_5987(machine);
+ DRIVER_INIT_CALL(generic_5987);
custom_io_r = lghost_custom_io_r;
custom_io_w = lghost_custom_io_w;
}
static DRIVER_INIT( wwally )
{
- driver_init_generic_5987(machine);
+ DRIVER_INIT_CALL(generic_5987);
custom_io_r = wwally_custom_io_r;
custom_io_w = wwally_custom_io_w;
}
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 2738ce32d46..5461ce1c425 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -9654,7 +9654,7 @@ static DRIVER_INIT( crazyfgt )
seta_vregs = (UINT16*)auto_malloc(sizeof(UINT16)*3);
seta_vregs[0] = seta_vregs[1] = seta_vregs[2] = 0;
- driver_init_blandia(machine);
+ DRIVER_INIT_CALL(blandia);
}
/***************************************************************************
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index f6ebd3ea0cf..1e2f832cc8c 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -323,7 +323,7 @@ static DRIVER_INIT( sg1000a )
static DRIVER_INIT(chwrestl)
{
- driver_init_sg1000a(machine);
+ DRIVER_INIT_CALL(sg1000a);
regulus_decode();
}
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index 05908457286..64e4bb7f5b2 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -1162,7 +1162,7 @@ static READ32_HANDLER( joemacr_speedup_r )
static DRIVER_INIT (joemacr)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x0201018, 0x020101b, 0, 0, joemacr_speedup_r );
- driver_init_simpl156(machine);
+ DRIVER_INIT_CALL(simpl156);
}
static READ32_HANDLER( chainrec_speedup_r )
@@ -1174,7 +1174,7 @@ static READ32_HANDLER( chainrec_speedup_r )
static DRIVER_INIT (chainrec)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x0201018, 0x020101b, 0, 0, chainrec_speedup_r );
- driver_init_simpl156(machine);
+ DRIVER_INIT_CALL(simpl156);
simpl156_default_eeprom = chainrec_eeprom;
}
@@ -1187,14 +1187,14 @@ static READ32_HANDLER( prtytime_speedup_r )
static DRIVER_INIT (prtytime)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x0201ae0, 0x0201ae3, 0, 0, prtytime_speedup_r );
- driver_init_simpl156(machine);
+ DRIVER_INIT_CALL(simpl156);
simpl156_default_eeprom = prtytime_eeprom;
}
static DRIVER_INIT (gangonta)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x0201ae0, 0x0201ae3, 0, 0, prtytime_speedup_r );
- driver_init_simpl156(machine);
+ DRIVER_INIT_CALL(simpl156);
simpl156_default_eeprom = gangonta_eeprom;
}
@@ -1208,7 +1208,7 @@ static READ32_HANDLER( charlien_speedup_r )
static DRIVER_INIT (charlien)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x0201010, 0x0201013, 0, 0, charlien_speedup_r );
- driver_init_simpl156(machine);
+ DRIVER_INIT_CALL(simpl156);
}
static READ32_HANDLER( osman_speedup_r )
@@ -1220,7 +1220,7 @@ static READ32_HANDLER( osman_speedup_r )
static DRIVER_INIT (osman)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x0201010, 0x0201013, 0, 0, osman_speedup_r );
- driver_init_simpl156(machine);
+ DRIVER_INIT_CALL(simpl156);
simpl156_default_eeprom = osman_eeprom;
}
@@ -1228,7 +1228,7 @@ static DRIVER_INIT (osman)
static DRIVER_INIT (candance)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x0201010, 0x0201013, 0, 0, osman_speedup_r );
- driver_init_simpl156(machine);
+ DRIVER_INIT_CALL(simpl156);
simpl156_default_eeprom = candance_eeprom;
}
diff --git a/src/mame/drivers/ssf2md.c b/src/mame/drivers/ssf2md.c
index 6f198f9b625..e0d0fcce2cc 100644
--- a/src/mame/drivers/ssf2md.c
+++ b/src/mame/drivers/ssf2md.c
@@ -26,7 +26,7 @@ static DRIVER_INIT( ssf2ghw )
memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x770070, 0x770075, 0, 0, ssf2ghw_dsw_r );
- driver_init_megadrij(machine);
+ DRIVER_INIT_CALL(megadrij);
}
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index a1d0e9fb9f4..14daa3973b7 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -3806,7 +3806,7 @@ static DRIVER_INIT( sanjeon )
}
- driver_init_sasissu(Machine);
+ DRIVER_INIT_CALL(sasissu);
}
GAME( 1996, stvbios, 0, stv, stv, stv, ROT0, "Sega", "ST-V Bios", GAME_IS_BIOS_ROOT )
diff --git a/src/mame/drivers/stvinit.c b/src/mame/drivers/stvinit.c
index ff44c0b9f85..c2eb569eb07 100644
--- a/src/mame/drivers/stvinit.c
+++ b/src/mame/drivers/stvinit.c
@@ -77,7 +77,7 @@ static void ic13_shifter(void)
DRIVER_INIT ( ic13 )
{
ic13_shifter();
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
}
/*
EEPROM write 0000 to address 2d
@@ -226,7 +226,7 @@ DRIVER_INIT(shienryu)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ae8e0, 0x60ae8e3, 0, 0, shienryu_speedup_r ); // after you enable sound cpu
memory_install_read32_handler(1, ADDRESS_SPACE_PROGRAM, 0x60ae8e4, 0x60ae8e7, 0, 0, shienryu_slave_speedup_r ); // after you enable sound cpu
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
}
static READ32_HANDLER( prikura_speedup_r )
@@ -254,7 +254,7 @@ DRIVER_INIT(prikura)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60b9228, 0x60b922b, 0, 0, prikura_speedup_r );
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)prikura_slave_speedup );
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
minit_boost = sinit_boost = 0;
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
@@ -299,7 +299,7 @@ DRIVER_INIT(hanagumi)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x6094188, 0x609418b, 0, 0, hanagumi_speedup_r );
memory_install_read32_handler(1, ADDRESS_SPACE_PROGRAM, 0x6015438, 0x601543b, 0, 0, hanagumi_slave_off );
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
}
@@ -341,7 +341,7 @@ DRIVER_INIT(puyosun)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, puyosun_speedup_r ); // idle loop of main cpu
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)puyosun_slave_speedup );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost = sinit_boost = 0;
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
@@ -368,7 +368,7 @@ DRIVER_INIT(mausuke)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, mausuke_speedup_r ); // idle loop of main cpu
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost = sinit_boost = 0;
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
@@ -406,7 +406,7 @@ DRIVER_INIT(cottonbm)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, cottonbm_speedup_r ); // idle loop of main cpu
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)cottonbm_slave_speedup );
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(10);
}
@@ -442,7 +442,7 @@ DRIVER_INIT(cotton2)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, cotton2_speedup_r ); // idle loop of main cpu
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)cotton2_slave_speedup );
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
}
@@ -494,7 +494,7 @@ DRIVER_INIT(dnmtdeka)
memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x060e0ad4, 0x060e0bc3, 0, 0, dnmtdeka_cmd_write );
memory_install_read32_handler(1, ADDRESS_SPACE_PROGRAM, 0x060e0ad4, 0x060e0bc3, 0, 0, dnmtdeka_cmd_read );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
}
static int diehard_pending_commands;
@@ -571,7 +571,7 @@ DRIVER_INIT(diehard)
memory_install_write32_handler(1, ADDRESS_SPACE_PROGRAM, 0x060e0dd8, 0x060e0dd8, 0, 0, diehard_cmd_ack_write );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
}
@@ -604,7 +604,7 @@ DRIVER_INIT(fhboxers)
memory_install_read32_handler(1, ADDRESS_SPACE_PROGRAM, 0x6090740, 0x6090743, 0, 0, fhboxers_speedup2_r ); // idle loop of second cpu
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x06090bb4, 0x06090bb7, 0, 0, fhboxers_speedup3_r ); // idle loop of main cpu
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
}
@@ -637,7 +637,7 @@ DRIVER_INIT(bakubaku)
memory_install_read32_handler(1, ADDRESS_SPACE_PROGRAM, 0x60fdfe8, 0x60fdfeb, 0, 0, bakubaku_speedup2_r ); // turn off slave sh2, is it needed after boot ??
//memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x6033660, 0x6033663, 0, 0, bakubaku_hangskip_r ); // it waits for a ram address to change what should change it?
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
}
static READ32_HANDLER( groovef_hack1_r )
@@ -691,7 +691,7 @@ DRIVER_INIT( groovef )
// memory_install_read32_handler(1, ADDRESS_SPACE_PROGRAM, 0x60060dc, 0x60060df, 0, 0, groovef_second_cpu_off_r ); // not a good idea, needs it for ai.
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)groovef_slave_speedup );
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
minit_boost = sinit_boost = 0;
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
@@ -753,7 +753,7 @@ DRIVER_INIT( danchih )
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, danchih_speedup_r );
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)danchih_slave_speedup );
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(5);
@@ -802,7 +802,7 @@ DRIVER_INIT( astrass )
install_astrass_protection();
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
}
/* Treasure Hunt idle loop skipping */
@@ -857,7 +857,7 @@ DRIVER_INIT(thunt)
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf *)thunt_slave_speedup);
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(1);
}
@@ -887,7 +887,7 @@ DRIVER_INIT(sandor)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x060314f8, 0x060314fb, 0, 0, sandor_speedup_r );
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x06075a2c, 0x06075a2f, 0, 0, sandor_speedup2_r );
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf *)sandor_slave_speedup);
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(1);
}
@@ -934,7 +934,7 @@ DRIVER_INIT(grdforce)
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf *)grdforce_slave_speedup);
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
}
@@ -961,7 +961,7 @@ DRIVER_INIT(batmanfr)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x0602acf0, 0x0602acf3, 0, 0, batmanfr_speedup_r );
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)batmanfr_slave_speedup );
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
minit_boost = sinit_boost = 0;
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
@@ -983,7 +983,7 @@ DRIVER_INIT(colmns97)
{
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)colmns97_slave_speedup );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost = sinit_boost = 0;
@@ -1008,7 +1008,7 @@ DRIVER_INIT(winterht)
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)winterht_slave_speedup );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(2);
}
@@ -1033,7 +1033,7 @@ DRIVER_INIT(seabass)
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)seabass_slave_speedup );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(5);
}
@@ -1056,7 +1056,7 @@ DRIVER_INIT(vfremix)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x06074f98, 0x06074f9b, 0, 0, vfremix_speedup_r );
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)vfremix_slave_speedup );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(20);
}
@@ -1081,7 +1081,7 @@ DRIVER_INIT(sss)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x060ffc10, 0x060ffc13, 0, 0, sss_speedup_r );
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)sss_slave_speedup );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
}
@@ -1108,7 +1108,7 @@ DRIVER_INIT(othellos)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x060ffc10, 0x060ffc13, 0, 0, othellos_speedup_r );
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)othellos_slave_speedup );
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
@@ -1125,7 +1125,7 @@ DRIVER_INIT(sasissu)
{
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)sasissu_slave_speedup );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(2);
}
@@ -1139,7 +1139,7 @@ static READ32_HANDLER(gaxeduel_speedup_r)
DRIVER_INIT(gaxeduel)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x002f4068, 0x002f406b, 0, 0, gaxeduel_speedup_r);
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
}
static READ32_HANDLER(suikoenb_speedup_r)
@@ -1151,7 +1151,7 @@ static READ32_HANDLER(suikoenb_speedup_r)
DRIVER_INIT(suikoenb)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x060705d0, 0x060705d3, 0, 0, suikoenb_speedup_r);
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
}
static void sokyugrt_slave_speedup( UINT32 data )
@@ -1173,7 +1173,7 @@ DRIVER_INIT(sokyugrt)
{
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)sokyugrt_slave_speedup );
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x060788cc, 0x060788cf, 0, 0, sokyugrt_speedup_r);
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
}
@@ -1207,7 +1207,7 @@ DRIVER_INIT(znpwfv)
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)znpwfv_slave_speedup );
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, znpwfv_speedup_r );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_NSEC(500);
}
@@ -1229,7 +1229,7 @@ DRIVER_INIT(twcup98)
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)twcup98_slave_speedup );
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, twcup98_speedup_r );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
install_standard_protection();
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(5);
@@ -1253,7 +1253,7 @@ DRIVER_INIT(smleague)
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)smleague_slave_speedup );
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, smleague_speedup_r );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
}
@@ -1269,7 +1269,7 @@ DRIVER_INIT(finlarch)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, finlarch_speedup_r );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
}
@@ -1300,7 +1300,7 @@ DRIVER_INIT(maruchan)
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)maruchan_slave_speedup );
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, maruchan_speedup_r );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(50);
}
@@ -1317,7 +1317,7 @@ DRIVER_INIT(pblbeach)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x0606c398, 0x0606c39b, 0, 0, pblbeach_speedup_r );
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
}
static READ32_HANDLER( shanhigw_speedup_r )
@@ -1331,7 +1331,7 @@ DRIVER_INIT(shanhigw)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x06095cd8, 0x06095cdb, 0, 0, shanhigw_speedup_r );
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
}
static READ32_HANDLER( elandore_speedup_r )
@@ -1358,7 +1358,7 @@ DRIVER_INIT(elandore)
install_standard_protection();
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, elandore_speedup_r );
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf *)elandore_slave_speedup);
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(0);
}
@@ -1387,7 +1387,7 @@ DRIVER_INIT(rsgun)
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60ffc10, 0x60ffc13, 0, 0, rsgun_speedup_r );
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf *)rsgun_slave_speedup);
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
minit_boost_timeslice = sinit_boost_timeslice = ATTOTIME_IN_USEC(20);
@@ -1396,13 +1396,13 @@ DRIVER_INIT(rsgun)
DRIVER_INIT(ffreveng)
{
install_standard_protection();
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
}
DRIVER_INIT(decathlt)
{
install_decathlt_protection();
- driver_init_ic13(machine);
+ DRIVER_INIT_CALL(ic13);
}
static READ32_HANDLER( nameclv3_speedup_r )
@@ -1422,5 +1422,5 @@ DRIVER_INIT(nameclv3)
{
memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x60452c0, 0x60452c3, 0, 0, nameclv3_speedup_r );
cpunum_set_info_fct(1, CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK, (genf*)nameclv3_slave_speedup );
- driver_init_stv(machine);
+ DRIVER_INIT_CALL(stv);
}
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 359d575057c..d73c1de6323 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -3917,7 +3917,7 @@ static DRIVER_INIT( mia )
UINT8 *temp;
- driver_init_gfx(machine);
+ DRIVER_INIT_CALL(gfx);
/*
along with the normal byte reordering, TMNT also needs the bits to
@@ -4012,7 +4012,7 @@ static DRIVER_INIT( tmnt )
UINT8 *temp;
- driver_init_gfx(machine);
+ DRIVER_INIT_CALL(gfx);
/*
along with the normal byte reordering, TMNT also needs the bits to
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index fb9fc7a286e..3d4c4c6c08a 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -3670,7 +3670,7 @@ static DRIVER_INIT( suprtrio )
static DRIVER_INIT( chokchok )
{
- driver_init_htchctch(machine);
+ DRIVER_INIT_CALL(htchctch);
/* different palette format, closer to tumblep -- is this controlled by a register? the palette was right with the hatch catch trojan */
memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x140000, 0x140fff, 0, 0, paletteram16_xxxxBBBBGGGGRRRR_word_w);
@@ -3681,7 +3681,7 @@ static DRIVER_INIT( chokchok )
static DRIVER_INIT( wlstar )
{
- driver_init_htchctch(machine);
+ DRIVER_INIT_CALL(htchctch);
/* slightly different banking */
memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x100002, 0x100003, 0, 0, wlstar_tilebank_w);
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index 5e5eb523729..9a14370e07c 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -1542,7 +1542,7 @@ static DRIVER_INIT( turbo )
static DRIVER_INIT( turbo_enc )
{
turbo_rom_decode();
- driver_init_turbo(machine);
+ DRIVER_INIT_CALL(turbo);
}
@@ -1580,7 +1580,7 @@ static DRIVER_INIT( buckrog )
static DRIVER_INIT( buckrog_enc )
{
buckrog_decode();
- driver_init_buckrog(machine);
+ DRIVER_INIT_CALL(buckrog);
}
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index 3e66ac35307..1f2bbaca445 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -224,7 +224,7 @@ ROM_END
static DRIVER_INIT(uapce)
{
- driver_init_pce(machine);
+ DRIVER_INIT_CALL(pce);
};
GAME( 1989, blazlaz, 0, uapce, uapce, uapce, ROT0, "Hudson Soft", "Blazing Lazers", GAME_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index 761c2c1336e..480bb05000c 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -700,7 +700,7 @@ static DRIVER_INIT(viper)
static DRIVER_INIT(vipercf)
{
- driver_init_viper(machine);
+ DRIVER_INIT_CALL(viper);
memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff000fff, 0, 0, cf_card_data_r );
memory_install_write64_handler(0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff000fff, 0, 0, cf_card_data_w );
@@ -710,7 +710,7 @@ static DRIVER_INIT(vipercf)
static DRIVER_INIT(ppp2nd)
{
- driver_init_viper(machine);
+ DRIVER_INIT_CALL(viper);
/*
backup_ram[0x0000] = 0x50; // P
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 31d38310db6..6d35d5d46a8 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -1427,28 +1427,28 @@ static DRIVER_INIT( zaxxon )
static DRIVER_INIT( zaxxonb )
{
zaxxonb_decode();
- driver_init_zaxxon(machine);
+ DRIVER_INIT_CALL(zaxxon);
}
static DRIVER_INIT( szaxxon )
{
szaxxon_decode();
- driver_init_zaxxon(machine);
+ DRIVER_INIT_CALL(zaxxon);
}
static DRIVER_INIT( futspy )
{
futspy_decode();
- driver_init_zaxxon(machine);
+ DRIVER_INIT_CALL(zaxxon);
}
static DRIVER_INIT( razmataz )
{
nprinces_decode();
- driver_init_zaxxon(machine);
+ DRIVER_INIT_CALL(zaxxon);
/* additional input ports are wired */
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc004, 0xc004, 0, 0x18f3, port_tag_to_handler8("SW04"));
@@ -1471,7 +1471,7 @@ static DRIVER_INIT( razmataz )
static DRIVER_INIT( ixion )
{
szaxxon_decode();
- driver_init_zaxxon(machine);
+ DRIVER_INIT_CALL(zaxxon);
/* connect the universal sound board */
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xe03c, 0xe03c, 0, 0x1f00, sega_usb_status_r);
diff --git a/src/mame/machine/cps2crpt.c b/src/mame/machine/cps2crpt.c
index 0b4e803b62d..55d88407c9d 100644
--- a/src/mame/machine/cps2crpt.c
+++ b/src/mame/machine/cps2crpt.c
@@ -974,5 +974,5 @@ DRIVER_INIT( cps2crpt )
++k;
}
- driver_init_cps2_video(machine);
+ DRIVER_INIT_CALL(cps2_video);
}
diff --git a/src/mame/machine/galaxian.c b/src/mame/machine/galaxian.c
index 667d3a2319d..abb0b862458 100644
--- a/src/mame/machine/galaxian.c
+++ b/src/mame/machine/galaxian.c
@@ -406,7 +406,7 @@ DRIVER_INIT( mooncrst )
for (i = 0;i < memory_region_length(REGION_CPU1);i++)
rom[i] = decode_mooncrst(rom[i],i);
- driver_init_mooncrsu(machine);
+ DRIVER_INIT_CALL(mooncrsu);
}
DRIVER_INIT( mooncrgx )
@@ -493,7 +493,7 @@ Pin layout is such that links can replace the PAL if encryption is not used.
DRIVER_INIT( gteikob2 )
{
- driver_init_pisces(machine);
+ DRIVER_INIT_CALL(pisces);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x7006, 0x7006, 0, 0, gteikob2_flip_screen_x_w);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x7007, 0x7007, 0, 0, gteikob2_flip_screen_y_w);
@@ -501,7 +501,7 @@ DRIVER_INIT( gteikob2 )
DRIVER_INIT( azurian )
{
- driver_init_pisces(machine);
+ DRIVER_INIT_CALL(pisces);
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6800, 0x6800, 0, 0, azurian_IN1_r);
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x7000, 0x7000, 0, 0, azurian_IN2_r);
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index bc1404d9ed1..b8e57ad63d4 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -292,7 +292,7 @@ DRIVER_INIT( playch10 )
DRIVER_INIT( pc_gun )
{
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
/* set the control type */
pc10_gun_controller = 1;
@@ -304,7 +304,7 @@ DRIVER_INIT( pc_gun )
DRIVER_INIT( pc_hrz )
{
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
/* setup mirroring */
mirroring = PPU_MIRROR_HORZ;
@@ -438,7 +438,7 @@ DRIVER_INIT( pcaboard )
memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8000, 0x8fff, 0, 0, aboard_vrom_switch_w );
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
/* set the mirroring here */
mirroring = PPU_MIRROR_VERT;
@@ -465,7 +465,7 @@ DRIVER_INIT( pcbboard )
memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, bboard_rom_switch_w );
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
/* set the mirroring here */
mirroring = PPU_MIRROR_VERT;
@@ -486,7 +486,7 @@ DRIVER_INIT( pccboard )
memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x6000, 0, 0, cboard_vrom_switch_w );
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
}
/**********************************************************************************/
@@ -505,7 +505,7 @@ DRIVER_INIT( pcdboard )
memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
}
/* D Board games with extra ram (Metroid) */
@@ -517,7 +517,7 @@ DRIVER_INIT( pcdboard_2 )
memory_set_bankptr(1, auto_malloc(0x2000));
/* common init */
- driver_init_pcdboard(machine);
+ DRIVER_INIT_CALL(pcdboard);
}
/**********************************************************************************/
@@ -609,7 +609,7 @@ DRIVER_INIT( pceboard )
memory_set_bankptr(1, auto_malloc(0x1000));
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
}
/**********************************************************************************/
@@ -628,7 +628,7 @@ DRIVER_INIT( pcfboard )
memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
}
/* F Board games with extra ram (Baseball Stars) */
@@ -640,7 +640,7 @@ DRIVER_INIT( pcfboard_2 )
memory_set_bankptr(1, auto_malloc(0x1000));
/* common init */
- driver_init_pcfboard(machine);
+ DRIVER_INIT_CALL(pcfboard);
}
/**********************************************************************************/
@@ -815,13 +815,13 @@ DRIVER_INIT( pcgboard )
gboard_4screen = 0;
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
}
DRIVER_INIT( pcgboard_type2 )
{
/* common init */
- driver_init_pcgboard(machine);
+ DRIVER_INIT_CALL(pcgboard);
/* enable 4 screen mirror */
gboard_4screen = 1;
@@ -853,7 +853,7 @@ DRIVER_INIT( pciboard )
memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, iboard_rom_switch_w );
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
}
/**********************************************************************************/
@@ -878,7 +878,7 @@ DRIVER_INIT( pchboard )
gboard_scanline_latch = 0;
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
}
/**********************************************************************************/
@@ -901,5 +901,5 @@ DRIVER_INIT( pckboard )
memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
/* common init */
- driver_init_playch10(machine);
+ DRIVER_INIT_CALL(playch10);
}
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index 866ec9c6cf9..fbe8f3b10b2 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -331,21 +331,21 @@ DRIVER_INIT( scramble_ppi )
DRIVER_INIT( scobra )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa803, 0xa803, 0, 0, scramble_background_enable_w);
}
DRIVER_INIT( atlantis )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6803, 0x6803, 0, 0, scramble_background_enable_w);
}
DRIVER_INIT( scramble )
{
- driver_init_atlantis(machine);
+ DRIVER_INIT_CALL(atlantis);
ppi8255_set_portCread (1, scramble_protection_r);
ppi8255_set_portCwrite(1, scramble_protection_w);
@@ -353,7 +353,7 @@ DRIVER_INIT( scramble )
DRIVER_INIT( scrambls )
{
- driver_init_atlantis(machine);
+ DRIVER_INIT_CALL(atlantis);
ppi8255_set_portCread(0, scrambls_input_port_2_r);
ppi8255_set_portCread(1, scrambls_protection_r);
@@ -362,14 +362,14 @@ DRIVER_INIT( scrambls )
DRIVER_INIT( theend )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
ppi8255_set_portCwrite(0, theend_coin_counter_w);
}
DRIVER_INIT( stratgyx )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb000, 0xb000, 0, 0, scramble_background_green_w);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb002, 0xb002, 0, 0, scramble_background_blue_w);
@@ -381,14 +381,14 @@ DRIVER_INIT( stratgyx )
DRIVER_INIT( tazmani2 )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb002, 0xb002, 0, 0, scramble_background_enable_w);
}
DRIVER_INIT( amidar )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
/* Amidar has a the DIP switches connected to port C of the 2nd 8255 */
ppi8255_set_portCread(1, input_port_3_r);
@@ -396,7 +396,7 @@ DRIVER_INIT( amidar )
DRIVER_INIT( ckongs )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
ppi8255_set_portBread(0, ckongs_input_port_1_r);
ppi8255_set_portCread(0, ckongs_input_port_2_r);
@@ -404,7 +404,7 @@ DRIVER_INIT( ckongs )
DRIVER_INIT( mariner )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
/* extra ROM */
memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5800, 0x67ff, 0, 0, MRA8_BANK1, MWA8_UNMAP);
@@ -423,7 +423,7 @@ DRIVER_INIT( frogger )
UINT8 *ROM;
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
/* the first ROM of the second CPU has data lines D0 and D1 swapped. Decode it. */
@@ -443,7 +443,7 @@ DRIVER_INIT( froggers )
UINT8 *ROM;
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
/* the first ROM of the second CPU has data lines D0 and D1 swapped. Decode it. */
ROM = memory_region(REGION_CPU2);
@@ -457,7 +457,7 @@ DRIVER_INIT( devilfsh )
UINT8 *RAM;
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
/* Address lines are scrambled on the main CPU */
@@ -486,7 +486,7 @@ DRIVER_INIT( devilfsh )
DRIVER_INIT( mars )
{
- driver_init_devilfsh(machine);
+ DRIVER_INIT_CALL(devilfsh);
/* extra port */
ppi8255_set_portCread(1, input_port_3_r);
@@ -503,7 +503,7 @@ DRIVER_INIT( cavelon )
{
UINT8 *ROM = memory_region(REGION_CPU1);
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
/* banked ROM */
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, MRA8_BANK1);
@@ -522,7 +522,7 @@ DRIVER_INIT( cavelon )
DRIVER_INIT( moonwar )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
/* special handler for the spinner */
ppi8255_set_portAread (0, moonwar_input_port_0_r);
@@ -533,7 +533,7 @@ DRIVER_INIT( moonwar )
DRIVER_INIT( darkplnt )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
/* special handler for the spinner */
ppi8255_set_portBread(0, darkplnt_input_port_1_r);
@@ -574,21 +574,21 @@ DRIVER_INIT( mimonkey )
ctr++;
}
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa804, 0xa804, 0, 0, scramble_background_enable_w);
}
DRIVER_INIT( mimonsco )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa804, 0xa804, 0, 0, scramble_background_enable_w);
}
DRIVER_INIT( mimonscr )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6804, 0x6804, 0, 0, scramble_background_enable_w);
}
@@ -607,7 +607,7 @@ DRIVER_INIT( anteater )
UINT8 *scratch;
- driver_init_scobra(machine);
+ DRIVER_INIT_CALL(scobra);
/*
* Code To Decode Lost Tomb by Mirko Buffoni
@@ -643,7 +643,7 @@ DRIVER_INIT( rescue )
UINT8 *scratch;
- driver_init_scobra(machine);
+ DRIVER_INIT_CALL(scobra);
/*
* Code To Decode Lost Tomb by Mirko Buffoni
@@ -679,7 +679,7 @@ DRIVER_INIT( minefld )
UINT8 *scratch;
- driver_init_scobra(machine);
+ DRIVER_INIT_CALL(scobra);
/*
* Code To Decode Minefield by Mike Balfour and Nicola Salmoria
@@ -715,7 +715,7 @@ DRIVER_INIT( losttomb )
UINT8 *scratch;
- driver_init_scramble(machine);
+ DRIVER_INIT_CALL(scramble);
/*
* Code To Decode Lost Tomb by Mirko Buffoni
@@ -750,7 +750,7 @@ DRIVER_INIT( superbon )
UINT8 *RAM;
- driver_init_scramble(machine);
+ DRIVER_INIT_CALL(scramble);
/* Deryption worked out by hand by Chris Hardy. */
@@ -783,7 +783,7 @@ DRIVER_INIT( hustler )
offs_t A;
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
for (A = 0;A < 0x4000;A++)
@@ -825,7 +825,7 @@ DRIVER_INIT( billiard )
offs_t A;
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
for (A = 0;A < 0x4000;A++)
@@ -874,7 +874,7 @@ DRIVER_INIT( billiard )
DRIVER_INIT( mrkougar )
{
- driver_init_devilfsh(machine);
+ DRIVER_INIT_CALL(devilfsh);
/* no sound enabled bit */
ppi8255_set_portBwrite(1, mrkougar_sh_irqtrigger_w);
@@ -882,7 +882,7 @@ DRIVER_INIT( mrkougar )
DRIVER_INIT( mrkougb )
{
- driver_init_scramble_ppi(machine);
+ DRIVER_INIT_CALL(scramble_ppi);
/* no sound enabled bit */
ppi8255_set_portBwrite(1, mrkougar_sh_irqtrigger_w);
diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c
index 842f530766b..3fa330eb0bd 100644
--- a/src/mame/machine/stfight.c
+++ b/src/mame/machine/stfight.c
@@ -68,7 +68,7 @@ DRIVER_INIT( empcity )
DRIVER_INIT( stfight )
{
- driver_init_empcity(machine);
+ DRIVER_INIT_CALL(empcity);
/* patch out a tight loop during startup - is the code waiting */
/* for NMI to wake it up? */
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index 2db4340f079..6234b26c146 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -314,7 +314,7 @@ DRIVER_INIT( suprmrio )
init_vsnes(machine);
/* normal banking */
- driver_init_vsnormal(machine);
+ DRIVER_INIT_CALL(vsnormal);
/* extra ram at $6000 is enabled with bit 1 of $4016 */
memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_BANK1 );
@@ -466,7 +466,7 @@ DRIVER_INIT( vspinbal )
init_vsnes(machine);
/* normal banking */
- driver_init_vsnormal(machine);
+ DRIVER_INIT_CALL(vsnormal);
/* now override the vidaccess callback */
remapped_colortable = rp2c04001_colortable;
@@ -682,7 +682,7 @@ DRIVER_INIT( excitebk )
init_vsnes(machine);
/* normal banking */
- driver_init_vsnormal(machine);
+ DRIVER_INIT_CALL(vsnormal);
/* now override the vidaccess callback */
/* we need to remap color tables */
@@ -696,7 +696,7 @@ DRIVER_INIT( excitbkj )
init_vsnes(machine);
/* normal banking */
- driver_init_vsnormal(machine);
+ DRIVER_INIT_CALL(vsnormal);
/* now override the vidaccess callback */
/* we need to remap color tables */
@@ -715,7 +715,7 @@ DRIVER_INIT( machridr )
init_vsnes(machine);
/* normal banking */
- driver_init_vsnormal(machine);
+ DRIVER_INIT_CALL(vsnormal);
/* now override the vidaccess callback */
/* we need to remap color tables */
@@ -1009,7 +1009,7 @@ static READ8_HANDLER( rbi_hack_r)
DRIVER_INIT( rbibb )
{
- driver_init_MMC3(machine);
+ DRIVER_INIT_CALL(MMC3);
/* RBI Base ball hack */
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5e00, 0x5e01, 0, 0, rbi_hack_r) ;
@@ -1059,7 +1059,7 @@ static READ8_HANDLER( supxevs_read_prot_4_r )
DRIVER_INIT( supxevs )
{
- driver_init_MMC3(machine);
+ DRIVER_INIT_CALL(MMC3);
/* Vs. Super Xevious Protection */
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x54ff, 0x54ff, 0, 0, supxevs_read_prot_1_r );
@@ -1094,7 +1094,7 @@ static READ8_HANDLER( tko_security_r )
DRIVER_INIT( tkoboxng )
{
- driver_init_MMC3(machine);
+ DRIVER_INIT_CALL(MMC3);
/* security device at $5e00-$5e01 */
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5e00, 0x5e01, 0, 0, tko_security_r );
@@ -1109,7 +1109,7 @@ DRIVER_INIT( tkoboxng )
DRIVER_INIT( vsfdf )
{
- driver_init_MMC3(machine);
+ DRIVER_INIT_CALL(MMC3);
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4016, 0x4016, 0, 0, gun_in0_r );
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4016, 0x4016, 0, 0, gun_in0_w );
@@ -1201,7 +1201,7 @@ DRIVER_INIT( bnglngby )
init_vsnes(machine);
/* normal banking */
- driver_init_vsnormal(machine);
+ DRIVER_INIT_CALL(vsnormal);
remapped_colortable = rp2c04002_colortable;
}
@@ -1229,7 +1229,7 @@ DRIVER_INIT( jajamaru )
init_vsnes(machine);
/* normal banking */
- driver_init_vsnormal(machine);
+ DRIVER_INIT_CALL(vsnormal);
}
/***********************************************************************/
@@ -1294,7 +1294,7 @@ DRIVER_INIT( wrecking )
{
/* only differance between this and vstennis is the colors */
- driver_init_vstennis(machine);
+ DRIVER_INIT_CALL(vstennis);
remapped_colortable = rp2c04002_colortable;
}
@@ -1305,7 +1305,7 @@ DRIVER_INIT( balonfgt )
{
/* only differance between this and vstennis is the colors */
- driver_init_vstennis(machine);
+ DRIVER_INIT_CALL(vstennis);
remapped_colortable = rp2c04003_colortable;
}
@@ -1318,7 +1318,7 @@ DRIVER_INIT( vsbball )
{
/* only differance between this and vstennis is the colors */
- driver_init_vstennis(machine);
+ DRIVER_INIT_CALL(vstennis);
remapped_colortable = rp2c04001_colortable;
@@ -1332,7 +1332,7 @@ DRIVER_INIT( iceclmrj )
{
/* only differance between this and vstennis is the colors */
- driver_init_vstennis(machine);
+ DRIVER_INIT_CALL(vstennis);
remapped_colortable = rp2c05004_colortable;
@@ -1343,7 +1343,7 @@ DRIVER_INIT( iceclmrj )
DRIVER_INIT( btlecity )
{
init_vsnes(machine);
- driver_init_vsnormal(machine);
+ DRIVER_INIT_CALL(vsnormal);
remapped_colortable = rp2c04003_colortable;
}
@@ -1356,6 +1356,6 @@ DRIVER_INIT( vstetris )
memory_set_bankptr(1, auto_malloc(0x2000));
init_vsnes(machine);
- driver_init_vsnormal(machine);
+ DRIVER_INIT_CALL(vsnormal);
remapped_colortable = rp2c04003_colortable;
}