diff --git a/src/emu/machine/6821pia.c b/src/emu/machine/6821pia.c
index 8def1535caa..9e3fb2af2c4 100644
--- a/src/emu/machine/6821pia.c
+++ b/src/emu/machine/6821pia.c
@@ -114,9 +114,8 @@ static pia6821 pias[MAX_PIA];
  *
  *************************************/
 
-void pia_config(int which, const pia6821_interface *intf)
+void pia_config(running_machine *machine, int which, const pia6821_interface *intf)
 {
-	running_machine *machine = Machine;
 	pia6821 *p;
 
 	assert_always(mame_get_phase(machine) == MAME_PHASE_INIT, "Can only call pia_config at init time!");
diff --git a/src/emu/machine/6821pia.h b/src/emu/machine/6821pia.h
index a2478e47d09..94dcdc46614 100644
--- a/src/emu/machine/6821pia.h
+++ b/src/emu/machine/6821pia.h
@@ -48,7 +48,7 @@ struct _pia6821_interface
 
 /*------------------ Configuration -----------------------*/
 
-void pia_config(int which, const pia6821_interface *intf);
+void pia_config(running_machine *machine, int which, const pia6821_interface *intf);
 
 
 
diff --git a/src/emu/machine/7474.c b/src/emu/machine/7474.c
index f57b08c56b4..dba5628cba1 100644
--- a/src/emu/machine/7474.c
+++ b/src/emu/machine/7474.c
@@ -38,7 +38,6 @@
 *****************************************************************************/
 
 #include "driver.h"
-#include "deprecat.h"
 #include "7474.h"
 
 
@@ -139,9 +138,8 @@ int TTL7474_output_comp_r(int which)
 }
 
 
-void TTL7474_config(int which, const struct TTL7474_interface *intf)
+void TTL7474_config(running_machine *machine, int which, const struct TTL7474_interface *intf)
 {
-	running_machine *machine = Machine;
 	struct TTL7474 *chip = &chips[which];
 
 	if (which >= MAX_TTL7474)
diff --git a/src/emu/machine/7474.h b/src/emu/machine/7474.h
index 77ada157ce7..79e6cf13ce5 100644
--- a/src/emu/machine/7474.h
+++ b/src/emu/machine/7474.h
@@ -48,7 +48,7 @@ struct TTL7474_interface
 };
 
 
-void TTL7474_config(int which, const struct TTL7474_interface *intf);
+void TTL7474_config(running_machine *machine, int which, const struct TTL7474_interface *intf);
 
 /* must call TTL7474_update() after setting the inputs */
 void TTL7474_update(int which);
diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c
index a5fd3643f3d..0ea49f64d21 100644
--- a/src/emu/machine/8042kbdc.c
+++ b/src/emu/machine/8042kbdc.c
@@ -174,7 +174,6 @@
 
 
 #include "driver.h"
-#include "deprecat.h"
 #include "memconv.h"
 
 #include "machine/pckeybrd.h"
@@ -267,7 +266,7 @@ static TIMER_CALLBACK( kbdc8042_time )
 
 
 
-void kbdc8042_init(const struct kbdc8042_interface *intf)
+void kbdc8042_init(running_machine *machine, const struct kbdc8042_interface *intf)
 {
 	poll_delay = 10;
 	memset(&kbdc8042, 0, sizeof(kbdc8042));
@@ -280,7 +279,7 @@ void kbdc8042_init(const struct kbdc8042_interface *intf)
 	kbdc8042.inport = 0xa0;
 	at_8042_set_outport(0xfe, 1);
 
-	timer_pulse(Machine, ATTOTIME_IN_HZ(60), NULL, 0, kbdc8042_time);
+	timer_pulse(machine, ATTOTIME_IN_HZ(60), NULL, 0, kbdc8042_time);
 }
 
 static void at_8042_receive(UINT8 data)
diff --git a/src/emu/machine/8042kbdc.h b/src/emu/machine/8042kbdc.h
index 06fa4cc3b87..126da17e138 100644
--- a/src/emu/machine/8042kbdc.h
+++ b/src/emu/machine/8042kbdc.h
@@ -28,7 +28,7 @@ struct kbdc8042_interface
 
 
 
-void kbdc8042_init(const struct kbdc8042_interface *intf);
+void kbdc8042_init(running_machine *machine, const struct kbdc8042_interface *intf);
 
 READ8_HANDLER(kbdc8042_8_r);
 WRITE8_HANDLER(kbdc8042_8_w);
diff --git a/src/emu/machine/adc083x.c b/src/emu/machine/adc083x.c
index 232b1868aca..496f9b01efa 100644
--- a/src/emu/machine/adc083x.c
+++ b/src/emu/machine/adc083x.c
@@ -63,9 +63,8 @@ struct adc083x_chip
 
 static struct adc083x_chip adc083x[ MAX_ADC083X_CHIPS ];
 
-void adc083x_init( int chip, int type, double (*input_callback)(int input) )
+void adc083x_init( running_machine *machine, int chip, int type, double (*input_callback)(int input) )
 {
-	running_machine *machine = Machine;
 	struct adc083x_chip *c;
 
 	if( chip >= MAX_ADC083X_CHIPS )
diff --git a/src/emu/machine/adc083x.h b/src/emu/machine/adc083x.h
index 4d5bc6fe5ca..b3edb70d0d0 100644
--- a/src/emu/machine/adc083x.h
+++ b/src/emu/machine/adc083x.h
@@ -27,7 +27,7 @@
 #define ADC0834 ( 2 )
 #define ADC0838 ( 3 )
 
-void adc083x_init( int chip, int type, double (*input_callback)( int input ) );
+void adc083x_init( running_machine *machine, int chip, int type, double (*input_callback)( int input ) );
 extern void adc083x_cs_write( int chip, int cs );
 extern void adc083x_clk_write( int chip, int clk );
 extern void adc083x_di_write( int chip, int di );
diff --git a/src/emu/machine/am53cf96.c b/src/emu/machine/am53cf96.c
index c97dd0062fd..48e34d13d15 100644
--- a/src/emu/machine/am53cf96.c
+++ b/src/emu/machine/am53cf96.c
@@ -10,7 +10,6 @@
  */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "am53cf96.h"
 
 static UINT8 scsi_regs[32], fifo[16], fptr = 0, xfer_state, last_id;
@@ -209,9 +208,8 @@ WRITE32_HANDLER( am53cf96_w )
 	}
 }
 
-void am53cf96_init( const struct AM53CF96interface *interface )
+void am53cf96_init( running_machine *machine, const struct AM53CF96interface *interface )
 {
-	running_machine *machine = Machine;
 	int i;
 
 	// save interface pointer for later
diff --git a/src/emu/machine/am53cf96.h b/src/emu/machine/am53cf96.h
index 8ab9b5a8ac2..1eeb728bb63 100644
--- a/src/emu/machine/am53cf96.h
+++ b/src/emu/machine/am53cf96.h
@@ -14,7 +14,7 @@ struct AM53CF96interface
 	void (*irq_callback)(running_machine *machine);	/* irq callback */
 };
 
-extern void am53cf96_init( const struct AM53CF96interface *interface );
+extern void am53cf96_init( running_machine *machine, const struct AM53CF96interface *interface );
 extern void am53cf96_exit( const struct AM53CF96interface *interface );
 extern void am53cf96_read_data(int bytes, UINT8 *pData);
 void am53cf96_write_data(int bytes, UINT8 *pData);
diff --git a/src/emu/machine/ds2401.c b/src/emu/machine/ds2401.c
index 6b377f9bfbe..b093c67030b 100644
--- a/src/emu/machine/ds2401.c
+++ b/src/emu/machine/ds2401.c
@@ -139,9 +139,8 @@ static TIMER_CALLBACK( ds2401_tick )
 	}
 }
 
-void ds2401_init( int which, const UINT8 *data )
+void ds2401_init( running_machine *machine, int which, const UINT8 *data )
 {
-	running_machine *machine = Machine;
 	struct ds2401_chip *c = &ds2401[ which ];
 
 	c->state = STATE_IDLE;
diff --git a/src/emu/machine/ds2401.h b/src/emu/machine/ds2401.h
index 6acd33b786e..8cabf41e4d1 100644
--- a/src/emu/machine/ds2401.h
+++ b/src/emu/machine/ds2401.h
@@ -11,7 +11,7 @@
 
 #define DS2401_MAXCHIP ( 3 )
 
-extern void ds2401_init( int which, const UINT8 *data );
+extern void ds2401_init( running_machine *machine, int which, const UINT8 *data );
 extern void ds2401_write( int which, int data );
 extern int ds2401_read( int which );
 
diff --git a/src/emu/machine/ds2404.c b/src/emu/machine/ds2404.c
index 1e46f7f5e10..4bd33bc93c3 100644
--- a/src/emu/machine/ds2404.c
+++ b/src/emu/machine/ds2404.c
@@ -1,7 +1,6 @@
 /* Dallas DS2404 RTC/NVRAM */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "ds2404.h"
 #include <time.h>
 
@@ -283,7 +282,7 @@ static TIMER_CALLBACK( DS2404_tick )
 	}
 }
 
-void DS2404_init(int ref_year, int ref_month, int ref_day)
+void DS2404_init(running_machine *machine, int ref_year, int ref_month, int ref_day)
 {
 	struct tm ref_tm;
 	time_t ref_time;
@@ -306,7 +305,7 @@ void DS2404_init(int ref_year, int ref_month, int ref_day)
 	ds2404.rtc[ 3 ] = ( current_time >> 16 ) & 0xff;
 	ds2404.rtc[ 4 ] = ( current_time >> 24 ) & 0xff;
 
-	timer = timer_alloc( Machine, DS2404_tick , NULL);
+	timer = timer_alloc( machine, DS2404_tick , NULL);
 	timer_adjust_periodic( timer, ATTOTIME_IN_HZ( 256 ), 0, ATTOTIME_IN_HZ( 256 ) );
 }
 
diff --git a/src/emu/machine/ds2404.h b/src/emu/machine/ds2404.h
index 44a88230a9a..39e2de7ffdf 100644
--- a/src/emu/machine/ds2404.h
+++ b/src/emu/machine/ds2404.h
@@ -1,7 +1,7 @@
 #ifndef DS2404_H
 #define DS2404_H
 
-void DS2404_init(int ref_year, int ref_month, int ref_day);
+void DS2404_init(running_machine *machine, int ref_year, int ref_month, int ref_day);
 void DS2404_load(mame_file *file);
 void DS2404_save(mame_file *file);
 
diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c
index 7a66d7d6768..8db3e9ab6f0 100644
--- a/src/emu/machine/eeprom.c
+++ b/src/emu/machine/eeprom.c
@@ -1,5 +1,4 @@
 #include "driver.h"
-#include "deprecat.h"
 #include "eeprom.h"
 
 #define VERBOSE 0
@@ -112,7 +111,7 @@ NVRAM_HANDLER( 93C46 )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 		if (file)	eeprom_load(file);
 	}
 }
@@ -123,14 +122,13 @@ NVRAM_HANDLER( 93C66B )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C66B);
+		eeprom_init(machine, &eeprom_interface_93C66B);
 		if (file)	eeprom_load(file);
 	}
 }
 
-void eeprom_init(const eeprom_interface *interface)
+void eeprom_init(running_machine *machine, const eeprom_interface *interface)
 {
-	running_machine *machine = Machine;
 	intf = interface;
 
 	if ((1 << intf->address_bits) * intf->data_bits / 8 > MEMORY_SIZE)
diff --git a/src/emu/machine/eeprom.h b/src/emu/machine/eeprom.h
index 75098cb74c5..73adef0a92d 100644
--- a/src/emu/machine/eeprom.h
+++ b/src/emu/machine/eeprom.h
@@ -17,7 +17,7 @@ struct _eeprom_interface
 };
 
 
-void eeprom_init(const eeprom_interface *interface);
+void eeprom_init(running_machine *machine, const eeprom_interface *interface);
 
 void eeprom_write_bit(int bit);
 int eeprom_read_bit(void);
diff --git a/src/emu/machine/i2cmem.c b/src/emu/machine/i2cmem.c
index 827bac5ccd1..9ead94da52f 100644
--- a/src/emu/machine/i2cmem.c
+++ b/src/emu/machine/i2cmem.c
@@ -79,9 +79,8 @@ struct i2cmem_chip
 
 static struct i2cmem_chip i2cmem[ I2CMEM_MAXCHIP ];
 
-void i2cmem_init( int chip, int slave_address, int page_size, int data_size, unsigned char *data )
+void i2cmem_init( running_machine *machine, int chip, int slave_address, int page_size, int data_size, unsigned char *data )
 {
-	running_machine *machine = Machine;
 	struct i2cmem_chip *c;
 	unsigned char *page = NULL;
 
diff --git a/src/emu/machine/i2cmem.h b/src/emu/machine/i2cmem.h
index 1a8eb3680a1..fdf7269ca29 100644
--- a/src/emu/machine/i2cmem.h
+++ b/src/emu/machine/i2cmem.h
@@ -19,7 +19,7 @@ I2C Memory
 #define I2CMEM_SLAVE_ADDRESS ( 0xa0 )
 #define I2CMEM_SLAVE_ADDRESS_ALT ( 0xb0 )
 
-extern void i2cmem_init( int chip, int slave_address, int page_size, int data_size, unsigned char *data );
+extern void i2cmem_init( running_machine *machine, int chip, int slave_address, int page_size, int data_size, unsigned char *data );
 extern void i2cmem_write( int chip, int line, int data );
 extern int i2cmem_read( int chip, int line );
 extern NVRAM_HANDLER( i2cmem_0 );
diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c
index 8e0f8565a42..552cb3af9dd 100644
--- a/src/emu/machine/intelfsh.c
+++ b/src/emu/machine/intelfsh.c
@@ -12,7 +12,6 @@
 */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "intelfsh.h"
 
 enum
@@ -78,9 +77,8 @@ void* intelflash_getmemptr(int chip)
 	return c->flash_memory;
 }
 
-void intelflash_init(int chip, int type, void *data)
+void intelflash_init(running_machine *machine, int chip, int type, void *data)
 {
-	running_machine *machine = Machine;
 	struct flash_chip *c;
 	if( chip >= FLASH_CHIPS_MAX )
 	{
diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h
index f756141e691..a077b383fb9 100644
--- a/src/emu/machine/intelfsh.h
+++ b/src/emu/machine/intelfsh.h
@@ -14,7 +14,7 @@
 #define FLASH_INTEL_TE28F160 ( 4 )
 #define FLASH_SHARP_LH28F016S ( 5 )
 
-extern void intelflash_init( int chip, int type, void *data );
+extern void intelflash_init( running_machine *machine, int chip, int type, void *data );
 extern UINT32 intelflash_read( int chip, UINT32 address );
 extern void intelflash_write( int chip, UINT32 address, UINT32 value );
 extern void nvram_handler_intelflash( running_machine *machine, int chip, mame_file *file, int read_or_write );
diff --git a/src/emu/machine/mb3773.c b/src/emu/machine/mb3773.c
index 7528520e042..c89c248720d 100644
--- a/src/emu/machine/mb3773.c
+++ b/src/emu/machine/mb3773.c
@@ -7,7 +7,6 @@
  */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "machine/mb3773.h"
 
 static emu_timer *watchdog_timer;
@@ -32,9 +31,9 @@ void mb3773_set_ck( UINT8 new_ck )
 	ck = new_ck;
 }
 
-void mb3773_init( void )
+void mb3773_init( running_machine *machine )
 {
-	watchdog_timer = timer_alloc(Machine, watchdog_timeout, NULL);
+	watchdog_timer = timer_alloc(machine, watchdog_timeout, NULL);
 	reset_timer();
-	state_save_register_global(Machine,  ck );
+	state_save_register_global(machine,  ck );
 }
diff --git a/src/emu/machine/mb3773.h b/src/emu/machine/mb3773.h
index 90ba5ec5ed8..7a5503fecbd 100644
--- a/src/emu/machine/mb3773.h
+++ b/src/emu/machine/mb3773.h
@@ -7,6 +7,6 @@
 #define MB3773_H ( 1 )
 
 extern void mb3773_set_ck( UINT8 new_ck );
-extern void mb3773_init( void );
+extern void mb3773_init( running_machine *machine );
 
 #endif
diff --git a/src/emu/machine/microtch.c b/src/emu/machine/microtch.c
index 87b495becc0..efa7d044abb 100644
--- a/src/emu/machine/microtch.c
+++ b/src/emu/machine/microtch.c
@@ -10,7 +10,6 @@
 */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "microtch.h"
 
 static struct
@@ -108,10 +107,9 @@ static TIMER_CALLBACK(microtouch_timer_callback)
 	}
 };
 
-void microtouch_init(void (*tx_cb)(UINT8 data),
+void microtouch_init(running_machine *machine, void (*tx_cb)(UINT8 data),
 							int (*touch_cb)(int *touch_x, int *touch_y))
 {
-	running_machine *machine = Machine;
 	memset(&microtouch, 0, sizeof(microtouch));
 
 	microtouch.last_touch_state = -1;
diff --git a/src/emu/machine/microtch.h b/src/emu/machine/microtch.h
index 2dd2a31eed4..1533e3037d4 100644
--- a/src/emu/machine/microtch.h
+++ b/src/emu/machine/microtch.h
@@ -3,7 +3,7 @@
 
 INPUT_PORTS_EXTERN(microtouch);
 
-void microtouch_init(void (*tx_cb)(UINT8 data), int (*touch_cb)(int *touch_x, int *touch_y));
+void microtouch_init(running_machine *machine, void (*tx_cb)(UINT8 data), int (*touch_cb)(int *touch_x, int *touch_y));
 void microtouch_rx(int count, UINT8* data);
 
 #endif //_MICROTOUCH_H
diff --git a/src/emu/machine/pd4990a.c b/src/emu/machine/pd4990a.c
index bab05965545..441bfc637f4 100644
--- a/src/emu/machine/pd4990a.c
+++ b/src/emu/machine/pd4990a.c
@@ -31,7 +31,6 @@
  */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "machine/pd4990a.h"
 
 
@@ -327,9 +326,8 @@ WRITE16_HANDLER( pd4990a_control_16_w )
 	pd4990a_serial_control(data&0x7);
 }
 
-void pd4990a_init(void)
+void pd4990a_init(running_machine *machine)
 {
-	running_machine *machine = Machine;
 	pd4990a = pd4990a_initval;
 	shiftlo = 0;
 	shifthi = 0;
diff --git a/src/emu/machine/pd4990a.h b/src/emu/machine/pd4990a.h
index 10428528d6f..937d69f95d7 100644
--- a/src/emu/machine/pd4990a.h
+++ b/src/emu/machine/pd4990a.h
@@ -17,7 +17,7 @@ struct pd4990a_s
 extern struct pd4990a_s pd4990a;
 
 void pd4990a_addretrace (void);
-void pd4990a_init(void);
+void pd4990a_init(running_machine *machine);
 READ8_HANDLER( pd4990a_testbit_r );
 READ8_HANDLER( pd4990a_databit_r );
 WRITE16_HANDLER( pd4990a_control_16_w );
diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c
index 6e6ff774b67..255f9bb0977 100644
--- a/src/emu/machine/rp5h01.c
+++ b/src/emu/machine/rp5h01.c
@@ -1,5 +1,4 @@
 #include "driver.h"
-#include "deprecat.h"
 #include "machine/rp5h01.h"
 
 /****************************************************************************/
@@ -26,7 +25,7 @@ static RP5H01 RP5H01_state[MAX_RP5H01];
 
 /****************************************************************************/
 
-int RP5H01_init( const struct RP5H01_interface *interface ) {
+int RP5H01_init( running_machine *machine, const struct RP5H01_interface *interface ) {
 	int i;
 
 	/* setup our local copy of the interface */
@@ -41,7 +40,7 @@ int RP5H01_init( const struct RP5H01_interface *interface ) {
 	for( i = 0; i < intf->num; i++ ) {
 		RP5H01_state[i].counter = 0;
 		RP5H01_state[i].counter_mode = COUNTER_MODE_6_BITS;
-		RP5H01_state[i].data = &( memory_region( Machine, intf->region[i] )[ intf->offset[i] ] );
+		RP5H01_state[i].data = &( memory_region( machine, intf->region[i] )[ intf->offset[i] ] );
 		RP5H01_state[i].enabled = 0;
 		RP5H01_state[i].old_reset = -1;
 		RP5H01_state[i].old_clock = -1;
diff --git a/src/emu/machine/rp5h01.h b/src/emu/machine/rp5h01.h
index f9afe51d1c3..453b96c2c57 100644
--- a/src/emu/machine/rp5h01.h
+++ b/src/emu/machine/rp5h01.h
@@ -10,7 +10,7 @@ struct RP5H01_interface {
 	int offset[MAX_RP5H01];		/* memory offset within the above region where data resides */
 };
 
-int RP5H01_init( const struct RP5H01_interface *interface );
+int RP5H01_init( running_machine *machine, const struct RP5H01_interface *interface );
 void RP5H01_enable_w( int which, int data );				/* /CE */
 void RP5H01_reset_w( int which, int data );				/* RESET */
 void RP5H01_clock_w( int which, int data );				/* DATA CLOCK (active low) */
diff --git a/src/emu/machine/rtc65271.c b/src/emu/machine/rtc65271.c
index 5994380ffc5..d595c936fb8 100644
--- a/src/emu/machine/rtc65271.c
+++ b/src/emu/machine/rtc65271.c
@@ -16,7 +16,6 @@
 */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "rtc65271.h"
 
 static void field_interrupts(void);
@@ -311,15 +310,15 @@ int rtc65271_file_save(mame_file *file)
     interrupt_callback: callback called when interrupt pin state changes (may
         be NULL)
 */
-void rtc65271_init(UINT8 *xram, void (*interrupt_callback)(int state))
+void rtc65271_init(running_machine *machine, UINT8 *xram, void (*interrupt_callback)(int state))
 {
 	memset(&rtc, 0, sizeof(rtc));
 
 	rtc.xram = xram;
 
-	rtc.update_timer = timer_alloc(Machine, rtc_begin_update_callback, NULL);
+	rtc.update_timer = timer_alloc(machine, rtc_begin_update_callback, NULL);
 	timer_adjust_periodic(rtc.update_timer, ATTOTIME_IN_SEC(1), 0, ATTOTIME_IN_SEC(1));
-	rtc.SQW_timer = timer_alloc(Machine, rtc_SQW_callback, NULL);
+	rtc.SQW_timer = timer_alloc(machine, rtc_SQW_callback, NULL);
 	rtc.interrupt_callback = interrupt_callback;
 }
 
diff --git a/src/emu/machine/rtc65271.h b/src/emu/machine/rtc65271.h
index 67fdccaa1b9..5bae6e13169 100644
--- a/src/emu/machine/rtc65271.h
+++ b/src/emu/machine/rtc65271.h
@@ -4,6 +4,6 @@
 
 extern int rtc65271_file_load(running_machine *machine, mame_file *file);
 extern int rtc65271_file_save(mame_file *file);
-extern void rtc65271_init(UINT8 *xram, void (*interrupt_callback)(int state));
+extern void rtc65271_init(running_machine *machine, UINT8 *xram, void (*interrupt_callback)(int state));
 extern UINT8 rtc65271_r(int xramsel, offs_t offset);
 extern void rtc65271_w(int xramsel, offs_t offset, UINT8 data);
diff --git a/src/emu/machine/upd4701.c b/src/emu/machine/upd4701.c
index 83825c1d23e..bb95764e498 100644
--- a/src/emu/machine/upd4701.c
+++ b/src/emu/machine/upd4701.c
@@ -6,7 +6,6 @@
  */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "machine/upd4701.h"
 
 struct uPD4701_chip
@@ -32,14 +31,13 @@ static struct uPD4701_chip uPD4701[ UPD4701_MAXCHIP ];
 #define MASK_SWITCHES ( 7 )
 #define MASK_COUNTER ( 0xfff )
 
-void uPD4701_init( int chip )
+void uPD4701_init( running_machine *machine, int chip )
 {
-	running_machine *machine = Machine;
 	struct uPD4701_chip *c;
 
 	if( chip < 0 || chip >= UPD4701_MAXCHIP )
 	{
-		logerror( "uPD4701_init( %d ) invalid chip\n", chip );
+		logerror( "uPD4701_init( machine, %d ) invalid chip\n", chip );
 		return;
 	}
 
diff --git a/src/emu/machine/upd4701.h b/src/emu/machine/upd4701.h
index ec038965cc1..af7534835dd 100644
--- a/src/emu/machine/upd4701.h
+++ b/src/emu/machine/upd4701.h
@@ -9,7 +9,7 @@
 
 #define UPD4701_MAXCHIP ( 1 )
 
-extern void uPD4701_init( int chip );
+extern void uPD4701_init( running_machine *machine, int chip );
 extern void uPD4701_cs_w( int chip, int cs );
 extern void uPD4701_xy_w( int chip, int xy );
 extern void uPD4701_ul_w( int chip, int ul );
diff --git a/src/emu/machine/wd33c93.c b/src/emu/machine/wd33c93.c
index afda58e9f7f..bdb787bbed1 100644
--- a/src/emu/machine/wd33c93.c
+++ b/src/emu/machine/wd33c93.c
@@ -779,7 +779,7 @@ READ8_HANDLER(wd33c93_r)
 	return 0;
 }
 
-extern void wd33c93_init( const struct WD33C93interface *interface )
+void wd33c93_init( running_machine *machine, const struct WD33C93interface *interface )
 {
 	int i;
 
@@ -796,14 +796,14 @@ extern void wd33c93_init( const struct WD33C93interface *interface )
 	}
 
 	/* allocate a timer for commands */
-	scsi_data.cmd_timer = timer_alloc(Machine, wd33c93_complete_cb, NULL);
+	scsi_data.cmd_timer = timer_alloc(machine, wd33c93_complete_cb, NULL);
 
 	scsi_data.temp_input = auto_malloc( TEMP_INPUT_LEN );
 
-//  state_save_register_item_array(Machine, "wd33c93", NULL, 0, scsi_data);
+//  state_save_register_item_array(machine, "wd33c93", NULL, 0, scsi_data);
 }
 
-extern void wd33c93_exit( const struct WD33C93interface *interface )
+void wd33c93_exit( const struct WD33C93interface *interface )
 {
 	int i;
 
diff --git a/src/emu/machine/wd33c93.h b/src/emu/machine/wd33c93.h
index 7cf1b4b3f6a..7598aa99cb4 100644
--- a/src/emu/machine/wd33c93.h
+++ b/src/emu/machine/wd33c93.h
@@ -14,7 +14,7 @@ struct WD33C93interface
 	void (*irq_callback)(running_machine *machine, int state); /* irq callback */
 };
 
-extern void wd33c93_init( const struct WD33C93interface *interface );
+extern void wd33c93_init( running_machine *machine, const struct WD33C93interface *interface );
 extern void wd33c93_exit( const struct WD33C93interface *interface );
 extern void wd33c93_get_dma_data(int bytes, UINT8 *pData);
 extern void wd33c93_write_data(int bytes, UINT8 *pData);
diff --git a/src/emu/machine/x76f041.c b/src/emu/machine/x76f041.c
index 019d2038580..d9726d87e26 100644
--- a/src/emu/machine/x76f041.c
+++ b/src/emu/machine/x76f041.c
@@ -108,9 +108,8 @@ static struct x76f041_chip x76f041[ X76F041_MAXCHIP ];
 #define STATE_READ_CONFIGURATION_REGISTERS ( 8 )
 #define STATE_WRITE_CONFIGURATION_REGISTERS ( 9 )
 
-void x76f041_init( int chip, UINT8 *data )
+void x76f041_init( running_machine *machine, int chip, UINT8 *data )
 {
-	running_machine *machine = Machine;
 	int offset;
 	struct x76f041_chip *c;
 
diff --git a/src/emu/machine/x76f041.h b/src/emu/machine/x76f041.h
index f41ea45efdb..f10790bb591 100644
--- a/src/emu/machine/x76f041.h
+++ b/src/emu/machine/x76f041.h
@@ -9,7 +9,7 @@
 
 #define X76F041_MAXCHIP ( 2 )
 
-extern void x76f041_init( int chip, UINT8 *data );
+extern void x76f041_init( running_machine *machine, int chip, UINT8 *data );
 extern void x76f041_cs_write( int chip, int cs );
 extern void x76f041_rst_write( int chip, int rst );
 extern void x76f041_scl_write( int chip, int scl );
diff --git a/src/emu/machine/x76f100.c b/src/emu/machine/x76f100.c
index 663603b335e..75d72a7fee0 100644
--- a/src/emu/machine/x76f100.c
+++ b/src/emu/machine/x76f100.c
@@ -77,9 +77,8 @@ static struct x76f100_chip x76f100[ X76F100_MAXCHIP ];
 #define STATE_READ_DATA ( 6 )
 #define STATE_WRITE_DATA ( 7 )
 
-void x76f100_init( int chip, UINT8 *data )
+void x76f100_init( running_machine *machine, int chip, UINT8 *data )
 {
-	running_machine *machine = Machine;
 	int offset;
 	struct x76f100_chip *c;
 
diff --git a/src/emu/machine/x76f100.h b/src/emu/machine/x76f100.h
index 1232556ac99..52b6125b400 100644
--- a/src/emu/machine/x76f100.h
+++ b/src/emu/machine/x76f100.h
@@ -9,7 +9,7 @@
 
 #define X76F100_MAXCHIP ( 2 )
 
-extern void x76f100_init( int chip, UINT8 *data );
+extern void x76f100_init( running_machine *machine, int chip, UINT8 *data );
 extern void x76f100_cs_write( int chip, int cs );
 extern void x76f100_rst_write( int chip, int rst );
 extern void x76f100_scl_write( int chip, int scl );
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index 7fdd1b6bef2..f18acf47f85 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -664,8 +664,9 @@ static void *venture_common_sh_start(const device_config *device, int clock, con
 
 static CUSTOM_START( venture_sh_start )
 {
-	pia_config(0, &venture_pia_0_intf);
-	pia_config(1, &venture_pia_1_intf);
+	running_machine *machine = device->machine;
+	pia_config(machine, 0, &venture_pia_0_intf);
+	pia_config(machine, 1, &venture_pia_1_intf);
 
 	return venture_common_sh_start(device, clock, config, FALSE);
 }
@@ -861,7 +862,7 @@ static const pia6821_interface victory_pia_e5_intf =
 static CUSTOM_START( victory_sh_start )
 {
 	running_machine *machine = device->machine;
-	pia_config(1, &victory_pia_e5_intf);
+	pia_config(machine, 1, &victory_pia_e5_intf);
 
 	state_save_register_global(machine, victory_sound_response_ack_clk);
 
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index 6a0bce467a4..2c6c56db25b 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -132,7 +132,7 @@ void mcr_sound_init(running_machine *machine, UINT8 config)
 	/* Turbo Chip Squeak */
 	if (mcr_sound_config & MCR_TURBO_CHIP_SQUEAK)
 	{
-		pia_config(0, &turbocs_pia_intf);
+		pia_config(machine, 0, &turbocs_pia_intf);
 		turbocs_dac_index = dac_index++;
 		turbocs_sound_cpu = sound_cpu++;
 		state_save_register_global(machine, turbocs_status);
@@ -141,7 +141,7 @@ void mcr_sound_init(running_machine *machine, UINT8 config)
 	/* Chip Squeak Deluxe */
 	if (mcr_sound_config & MCR_CHIP_SQUEAK_DELUXE)
 	{
-		pia_config(0, &csdeluxe_pia_intf);
+		pia_config(machine, 0, &csdeluxe_pia_intf);
 		csdeluxe_dac_index = dac_index++;
 		csdeluxe_sound_cpu = sound_cpu++;
 		state_save_register_global(machine, csdeluxe_status);
@@ -151,7 +151,7 @@ void mcr_sound_init(running_machine *machine, UINT8 config)
 	if (mcr_sound_config & MCR_SOUNDS_GOOD)
 	{
 		/* special case: Spy Hunter 2 has both Turbo CS and Sounds Good, so we use PIA slot 1 */
-		pia_config(1, &soundsgood_pia_intf);
+		pia_config(machine, 1, &soundsgood_pia_intf);
 		soundsgood_dac_index = dac_index++;
 		soundsgood_sound_cpu = sound_cpu++;
 		state_save_register_global(machine, soundsgood_status);
@@ -160,8 +160,8 @@ void mcr_sound_init(running_machine *machine, UINT8 config)
 	/* Squawk n Talk */
 	if (mcr_sound_config & MCR_SQUAWK_N_TALK)
 	{
-		pia_config(0, &squawkntalk_pia0_intf);
-		pia_config(1, &squawkntalk_pia1_intf);
+		pia_config(machine, 0, &squawkntalk_pia0_intf);
+		pia_config(machine, 1, &squawkntalk_pia1_intf);
 		squawkntalk_sound_cpu = sound_cpu++;
 		state_save_register_global(machine, squawkntalk_tms_command);
 		state_save_register_global(machine, squawkntalk_tms_strobes);
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index 86ce402bad6..4fe8e9ba6e6 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -378,7 +378,7 @@ static const pia6821_interface demoneye_pia_intf =
 
 static SOUND_START( demoneye )
 {
-	pia_config(0, &demoneye_pia_intf);
+	pia_config(machine, 0, &demoneye_pia_intf);
 
 	state_save_register_global(machine, ay8910_latch_1);
 	state_save_register_global(machine, ay8910_latch_2);
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index 77a7ec919c9..6cdddbc8585 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -211,9 +211,10 @@ static const struct TTL7474_interface sfx_sh_7474_intf =
 
 void scramble_sh_init(void)
 {
-	cpu_set_irq_callback(Machine->cpu[1], scramble_sh_irq_callback);
+	running_machine *machine = Machine;
+	cpu_set_irq_callback(machine->cpu[1], scramble_sh_irq_callback);
 
-	TTL7474_config(2, &scramble_sh_7474_intf);
+	TTL7474_config(machine, 2, &scramble_sh_7474_intf);
 
 	/* PR is always 0, D is always 1 */
 	TTL7474_d_w(2, 1);
@@ -221,9 +222,10 @@ void scramble_sh_init(void)
 
 void sfx_sh_init(void)
 {
-	cpu_set_irq_callback(Machine->cpu[2], sfx_sh_irq_callback);
+	running_machine *machine = Machine;
+	cpu_set_irq_callback(machine->cpu[2], sfx_sh_irq_callback);
 
-	TTL7474_config(3, &sfx_sh_7474_intf);
+	TTL7474_config(machine, 3, &sfx_sh_7474_intf);
 
 	/* PR is always 0, D is always 1 */
 	TTL7474_d_w(3, 1);
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index 93aaea945a9..eb15ac00167 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -261,19 +261,20 @@ MACHINE_DRIVER_END
 
 void williams_cvsd_init(int pianum)
 {
+	running_machine *machine = Machine;
 	UINT8 *ROM;
 	int bank;
 
 	/* configure the CPU */
-	sound_cpu = cputag_get_cpu(Machine, "cvsd");
+	sound_cpu = cputag_get_cpu(machine, "cvsd");
 	soundalt_cpu = NULL;
 
 	/* configure the PIA */
 	williams_pianum = pianum;
-	pia_config(pianum, &cvsd_pia_intf);
+	pia_config(machine, pianum, &cvsd_pia_intf);
 
 	/* configure master CPU banks */
-	ROM = memory_region(Machine, "cvsd");
+	ROM = memory_region(machine, "cvsd");
 	for (bank = 0; bank < 16; bank++)
 	{
 		/*
@@ -282,16 +283,16 @@ void williams_cvsd_init(int pianum)
             D3 -> A16
          */
 		offs_t offset = 0x8000 * ((bank >> 2) & 3) + 0x20000 * (bank & 3);
-		memory_configure_bank(Machine, 5, bank, 1, &ROM[0x10000 + offset], 0);
+		memory_configure_bank(machine, 5, bank, 1, &ROM[0x10000 + offset], 0);
 	}
-	memory_set_bank(sound_cpu->machine, 5, 0);
+	memory_set_bank(machine, 5, 0);
 
 	/* reset the IRQ state */
 	pia_set_input_ca1(williams_pianum, 1);
 
 	/* register for save states */
-	state_save_register_global(sound_cpu->machine, williams_sound_int_state);
-	state_save_register_global(sound_cpu->machine, audio_talkback);
+	state_save_register_global(machine, williams_sound_int_state);
+	state_save_register_global(machine, audio_talkback);
 }
 
 
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index b94faee7c3c..44b09154c35 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -117,7 +117,7 @@ static NVRAM_HANDLER( eeprom )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index fccb6d9f240..a3105ad35d0 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -186,7 +186,7 @@ static UINT8 duart_input(const device_config *device)
 
 static MACHINE_START( skattv )
 {
-	microtouch_init(microtouch_tx, 0);
+	microtouch_init(machine, microtouch_tx, 0);
 }
 
 static MACHINE_RESET( skattv )
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 409d0be5d65..0c46f524862 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -34,21 +34,13 @@ static const eeprom_interface eeprom_intf =
 	"1100110000000" /* unlock command */
 };
 
-#if 0
-static void eeprom_init(void)
-{
-	eeprom_init(&eeprom_intf);
-	init_eeprom_count = 0;
-}
-#endif
-
 static NVRAM_HANDLER( asterix )
 {
 	if (read_or_write)
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index 7e0f7235e62..a6e19b9f4eb 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -239,7 +239,7 @@ static NVRAM_HANDLER( showhand )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 
 		if (file) eeprom_load(file);
 		else
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index 14e16211220..92313f8ef5b 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -659,7 +659,7 @@ static DRIVER_INIT( ataxx )
 		0x14,0x5a04,
 		0xffff
 	};
-	ataxx_init_eeprom(0x00, ataxx_eeprom_data, 0x00);
+	ataxx_init_eeprom(machine, 0x00, ataxx_eeprom_data, 0x00);
 
 	leland_rotate_memory(machine, "master");
 	leland_rotate_memory(machine, "slave");
@@ -682,7 +682,7 @@ static DRIVER_INIT( ataxxj )
 		0x3f,0x3c0c,
 		0xffff
 	};
-	ataxx_init_eeprom(0x00, ataxxj_eeprom_data, 0x00);
+	ataxx_init_eeprom(machine, 0x00, ataxxj_eeprom_data, 0x00);
 
 	leland_rotate_memory(machine, "master");
 	leland_rotate_memory(machine, "slave");
@@ -705,7 +705,7 @@ static DRIVER_INIT( wsf )
 		0x28,0xff00,
 		0xffff
 	};
-	ataxx_init_eeprom(0x00, wsf_eeprom_data, 0x00);
+	ataxx_init_eeprom(machine, 0x00, wsf_eeprom_data, 0x00);
 
 	leland_rotate_memory(machine, "master");
 	leland_rotate_memory(machine, "slave");
@@ -730,7 +730,7 @@ static DRIVER_INIT( indyheat )
 		0x31,0xfafa,
 		0xffff
 	};
-	ataxx_init_eeprom(0x00, indyheat_eeprom_data, 0x00);
+	ataxx_init_eeprom(machine, 0x00, indyheat_eeprom_data, 0x00);
 
 	leland_rotate_memory(machine, "master");
 	leland_rotate_memory(machine, "slave");
@@ -760,7 +760,7 @@ static DRIVER_INIT( brutforc )
 		0x36,0x0104,
 		0xffff
 	};
-	ataxx_init_eeprom(0x00, brutforc_eeprom_data, 0x00);
+	ataxx_init_eeprom(machine, 0x00, brutforc_eeprom_data, 0x00);
 
 	leland_rotate_memory(machine, "master");
 	leland_rotate_memory(machine, "slave");
@@ -785,7 +785,7 @@ static DRIVER_INIT( asylum )
 		0x07,0x0400,
 		0xffff
 	};
-	ataxx_init_eeprom(0x00, asylum_eeprom_data, 0x00);
+	ataxx_init_eeprom(machine, 0x00, asylum_eeprom_data, 0x00);
 
 	leland_rotate_memory(machine, "master");
 	leland_rotate_memory(machine, "slave");
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index f0ed07f0472..7abc0ead1db 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -1858,14 +1858,14 @@ static const acia6850_interface acia6850_intf =
 
 static MACHINE_START( sys903 )
 {
-	pia_config(0, &sys903_pia0_intf);
-	pia_config(1, &sys903_pia1_intf);
+	pia_config(machine, 0, &sys903_pia0_intf);
+	pia_config(machine, 1, &sys903_pia1_intf);
 }
 
 static MACHINE_START( sys905 )
 {
-	pia_config(0, &sys905_pia0_intf);
-	pia_config(1, &sys905_pia1_intf);
+	pia_config(machine, 0, &sys905_pia0_intf);
+	pia_config(machine, 1, &sys905_pia1_intf);
 }
 
 static MACHINE_RESET( calomega )
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 2c874f7a68d..5d6ec871dfb 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -418,7 +418,7 @@ static NVRAM_HANDLER( cave )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 
 		if (file) eeprom_load(file);
 		else
@@ -449,7 +449,7 @@ static NVRAM_HANDLER( korokoro )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46_8bit);
+		eeprom_init(machine, &eeprom_interface_93C46_8bit);
 
 		if (file) eeprom_load(file);
 		else
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index 158eab8df41..5f91ea0745f 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -106,7 +106,7 @@ static NVRAM_HANDLER( cbasebal )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index 8b262b6316a..4006e7185c1 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -597,9 +597,9 @@ static const pia6821_interface trailblz_pia_2_intf =
 
 static MACHINE_START( quizmstr )
 {
-	pia_config(0, &quizmstr_pia_0_intf);
-	pia_config(1, &quizmstr_pia_1_intf);
-	pia_config(2, &quizmstr_pia_2_intf);
+	pia_config(machine, 0, &quizmstr_pia_0_intf);
+	pia_config(machine, 1, &quizmstr_pia_1_intf);
+	pia_config(machine, 2, &quizmstr_pia_2_intf);
 }
 
 static MACHINE_RESET( quizmstr )
@@ -609,9 +609,9 @@ static MACHINE_RESET( quizmstr )
 
 static MACHINE_START( trailblz )
 {
-	pia_config(0, &trailblz_pia_0_intf);
-	pia_config(1, &trailblz_pia_1_intf);
-	pia_config(2, &trailblz_pia_2_intf);
+	pia_config(machine, 0, &trailblz_pia_0_intf);
+	pia_config(machine, 1, &trailblz_pia_1_intf);
+	pia_config(machine, 2, &trailblz_pia_2_intf);
 }
 
 static MACHINE_RESET( trailblz )
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 08197332adc..b1c87c8f5cb 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -434,7 +434,7 @@ static NVRAM_HANDLER( qsound )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&qsound_eeprom_interface);
+		eeprom_init(machine, &qsound_eeprom_interface);
 
 		if (file)
 			eeprom_load(file);
@@ -447,7 +447,7 @@ static NVRAM_HANDLER( pang3 )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&pang3_eeprom_interface);
+		eeprom_init(machine, &pang3_eeprom_interface);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 46a0903f1d5..998977e64ef 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -713,7 +713,7 @@ static NVRAM_HANDLER( cps2 )
 		eeprom_save(file);
 	else
 	{
-        eeprom_init(&cps2_eeprom_interface);
+        eeprom_init(machine, &cps2_eeprom_interface);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 76432fb0abb..efcdb003533 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -759,7 +759,7 @@ static DRIVER_INIT( cps3 )
 	// flash roms
 
 	for (i=0;i<48;i++)
-		intelflash_init( i, FLASH_FUJITSU_29F016A, NULL );
+		intelflash_init( machine, i, FLASH_FUJITSU_29F016A, NULL );
 
 	cps3_eeprom = auto_malloc(0x400);
 
@@ -2366,7 +2366,7 @@ static void cps3_exit(running_machine *machine)
 
 static MACHINE_START( cps3 )
 {
-	wd33c93_init(&scsi_intf);
+	wd33c93_init(machine, &scsi_intf);
 	add_exit_callback(machine, cps3_exit);
 }
 
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 5507373c915..42a99a3ec7a 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -220,7 +220,7 @@ static NVRAM_HANDLER( darkhors )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file) eeprom_load(file);
 		else
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 805e9f2b8fa..53d8c95f4e8 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1846,7 +1846,7 @@ static NVRAM_HANDLER(tattass)
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_tattass);
+		eeprom_init(machine, &eeprom_interface_tattass);
 		if (file) eeprom_load(file);
 		else memcpy(eeprom_get_data_pointer(NULL,NULL),tattass_default_eprom,0x160);
 	}
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index c295f4b7fd3..0afda8cd000 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -86,7 +86,7 @@ static NVRAM_HANDLER( eolith )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C66);
+		eeprom_init(machine, &eeprom_interface_93C66);
 		if (file)	eeprom_load(file);
 	}
 }
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index 4b05be37309..d67a9fd628d 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -132,7 +132,7 @@ static NVRAM_HANDLER( eolith16_eeprom )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C66);
+		eeprom_init(machine, &eeprom_interface_93C66);
 		if (file)	eeprom_load(file);
 	}
 }
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index b1eb8355683..08e9ef08dfb 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -1844,7 +1844,7 @@ static NVRAM_HANDLER(firebeat)
 	}
 	else
 	{
-		rtc65271_init(xram, NULL);
+		rtc65271_init(machine, xram, NULL);
 
 		if (file != NULL)
 		{
@@ -2277,11 +2277,11 @@ static void init_firebeat(running_machine *machine)
 	UINT8 *rom = memory_region(machine, "user2");
 
 	atapi_init(machine);
-	intelflash_init(0, FLASH_FUJITSU_29F016A, NULL);
-	intelflash_init(1, FLASH_FUJITSU_29F016A, NULL);
-	intelflash_init(2, FLASH_FUJITSU_29F016A, NULL);
+	intelflash_init(machine, 0, FLASH_FUJITSU_29F016A, NULL);
+	intelflash_init(machine, 1, FLASH_FUJITSU_29F016A, NULL);
+	intelflash_init(machine, 2, FLASH_FUJITSU_29F016A, NULL);
 
-	rtc65271_init(xram, NULL);
+	rtc65271_init(machine, xram, NULL);
 
 	pc16552d_init(0, 19660800, comm_uart_irq_callback, 0);		// Network UART
 	pc16552d_init(1, 24000000, midi_uart_irq_callback, 0);		// MIDI UART
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 0e974e985b9..b721dca75f1 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -2555,8 +2555,8 @@ ROM_END
 static DRIVER_INIT( funworld )
 {
 	/* Initializing PIAs... */
-	pia_config(0, &pia0_intf);
-	pia_config(1, &pia1_intf);
+	pia_config(machine, 0, &pia0_intf);
+	pia_config(machine, 1, &pia1_intf);
 }
 
 static DRIVER_INIT( tabblue )
@@ -2596,8 +2596,8 @@ static DRIVER_INIT( tabblue )
 	}
 
 	/* Initializing PIAs... */
-	pia_config(0, &pia0_intf);
-	pia_config(1, &pia1_intf);
+	pia_config(machine, 0, &pia0_intf);
+	pia_config(machine, 1, &pia1_intf);
 }
 
 static DRIVER_INIT( jolyc980 )
@@ -2622,8 +2622,8 @@ static DRIVER_INIT( jolyc980 )
 //  ROM[0xc1fe] = 0x80;
 
 	/* Initializing PIAs... */
-	pia_config(0, &pia0_intf);
-	pia_config(1, &pia1_intf);
+	pia_config(machine, 0, &pia0_intf);
+	pia_config(machine, 1, &pia1_intf);
 }
 
 static DRIVER_INIT( magicd2a )
@@ -2646,8 +2646,8 @@ static DRIVER_INIT( magicd2a )
 	ROM[0xc1c6] = 0x92;
 
 	/* Initializing PIAs... */
-	pia_config(0, &pia0_intf);
-	pia_config(1, &pia1_intf);
+	pia_config(machine, 0, &pia0_intf);
+	pia_config(machine, 1, &pia1_intf);
 }
 
 static DRIVER_INIT( magicd2b )
@@ -2671,8 +2671,8 @@ static DRIVER_INIT( magicd2b )
 	ROM[0xc1c6] = 0x92;
 
 	/* Initializing PIAs... */
-	pia_config(0, &pia0_intf);
-	pia_config(1, &pia1_intf);
+	pia_config(machine, 0, &pia0_intf);
+	pia_config(machine, 1, &pia1_intf);
 }
 
 static DRIVER_INIT( soccernw )
@@ -2691,8 +2691,8 @@ static DRIVER_INIT( soccernw )
 //  ROM[0xa33c] = 0xea;
 
 	/* Initializing PIAs... */
-	pia_config(0, &pia0_intf);
-	pia_config(1, &pia1_intf);
+	pia_config(machine, 0, &pia0_intf);
+	pia_config(machine, 1, &pia1_intf);
 }
 
 static DRIVER_INIT( saloon )
diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c
index 5c9853c6fcf..eb8a2c44f38 100644
--- a/src/mame/drivers/galastrm.c
+++ b/src/mame/drivers/galastrm.c
@@ -329,7 +329,7 @@ static NVRAM_HANDLER( galastrm )
 	if (read_or_write)
 		eeprom_save(file);
 	else {
-		eeprom_init(&galastrm_eeprom_interface);
+		eeprom_init(machine, &galastrm_eeprom_interface);
 		if (file)
 			eeprom_load(file);
 		else
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index 28d0d062804..735be086064 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -733,7 +733,7 @@ static DRIVER_INIT( gamecstl )
 
 	intel82439tx_init();
 
-	kbdc8042_init(&at8042);
+	kbdc8042_init(machine, &at8042);
 }
 
 /*****************************************************************************/
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index b8b59c39658..f0fa0d65a2e 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -63,21 +63,13 @@ static const eeprom_interface eeprom_intf =
 	"0100110000000" /* unlock command */
 };
 
-#if 0
-static void eeprom_init(void)
-{
-	eeprom_init(&eeprom_intf);
-	init_eeprom_count = 0;
-}
-#endif
-
 static NVRAM_HANDLER( gijoe )
 {
 	if (read_or_write)
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index 5039ff60de6..9c9f05cb242 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -3158,14 +3158,14 @@ ROM_END
 
 static DRIVER_INIT( goldnpkr )
 {
-	pia_config(0, &goldnpkr_pia0_intf);
-	pia_config(1, &goldnpkr_pia1_intf);
+	pia_config(machine, 0, &goldnpkr_pia0_intf);
+	pia_config(machine, 1, &goldnpkr_pia1_intf);
 }
 
 static DRIVER_INIT( pottnpkr )
 {
-	pia_config(0, &pottnpkr_pia0_intf);
-	pia_config(1, &pottnpkr_pia1_intf);
+	pia_config(machine, 0, &pottnpkr_pia0_intf);
+	pia_config(machine, 1, &pottnpkr_pia1_intf);
 }
 
 /*
@@ -3214,8 +3214,8 @@ static DRIVER_INIT( royale )
 //  ROM[0x60bb] = 0xea;
 //  ROM[0x60bc] = 0xea;
 
-	pia_config(0, &pottnpkr_pia0_intf);
-	pia_config(1, &pottnpkr_pia1_intf);
+	pia_config(machine, 0, &pottnpkr_pia0_intf);
+	pia_config(machine, 1, &pottnpkr_pia1_intf);
 }
 
 /*************************
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index 424e428adf4..790132b65c4 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -143,7 +143,7 @@ static NVRAM_HANDLER( groundfx )
 	if (read_or_write)
 		eeprom_save(file);
 	else {
-		eeprom_init(&groundfx_eeprom_interface);
+		eeprom_init(machine, &groundfx_eeprom_interface);
 		if (file)
 			eeprom_load(file);
 		else
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index 97643137956..4efc924a7ae 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -332,7 +332,7 @@ static void eeprom_handler(running_machine *machine, mame_file *file, int read_o
 	}
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 		if (file)
 		{
 			eeprom_load(file);
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index 18c0b50e8af..f37ba03f71f 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -349,7 +349,7 @@ static NVRAM_HANDLER( gunbustr )
 	if (read_or_write)
 		eeprom_save(file);
 	else {
-		eeprom_init(&gunbustr_eeprom_interface);
+		eeprom_init(machine, &gunbustr_eeprom_interface);
 		if (file)
 			eeprom_load(file);
 		else
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index a7afca66464..fda046192d7 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -653,7 +653,7 @@ static TIMER_CALLBACK( behind_the_beam_update );
 
 static MACHINE_START( itech8 )
 {
-	pia_config(0, &pia_interface);
+	pia_config(machine, 0, &pia_interface);
 }
 
 static MACHINE_START( sstrike )
diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c
index d5cb164cf7b..0d0c6d7ae61 100644
--- a/src/mame/drivers/jokrwild.c
+++ b/src/mame/drivers/jokrwild.c
@@ -420,8 +420,8 @@ static DRIVER_INIT( jokrwild )
 	}
 
 	/* Initializing PIAs... */
-//  pia_config(0, &pia0_intf);
-//  pia_config(1, &pia1_intf);
+//  pia_config(machine, 0, &pia0_intf);
+//  pia_config(machine, 1, &pia1_intf);
 }
 
 
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 50cae4185e2..20be401d070 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -452,7 +452,7 @@ static NVRAM_HANDLER( kickgoal )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 
 		if (file) eeprom_load(file);
 		else
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index 5c45a4f4f54..f57ec4d32ee 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -111,7 +111,7 @@ static NVRAM_HANDLER( konamigq_93C46 )
 	}
 	else
 	{
-		eeprom_init( &eeprom_interface_93C46 );
+		eeprom_init( machine, &eeprom_interface_93C46 );
 		if( file )
 		{
 			eeprom_load( file );
@@ -349,7 +349,7 @@ static void konamigq_exit(running_machine *machine)
 static MACHINE_START( konamigq )
 {
 	/* init the scsi controller and hook up it's DMA */
-	am53cf96_init(&scsi_intf);
+	am53cf96_init(machine, &scsi_intf);
 	add_exit_callback(machine, konamigq_exit);
 	psx_dma_install_read_handler(5, scsi_dma_read);
 	psx_dma_install_write_handler(5, scsi_dma_write);
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 72f773aeb84..37d17f1a87b 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -142,7 +142,7 @@ static NVRAM_HANDLER( konamigv_93C46 )
 	}
 	else
 	{
-		eeprom_init( &eeprom_interface_93C46 );
+		eeprom_init( machine, &eeprom_interface_93C46 );
 
 		if( file )
 		{
@@ -311,7 +311,7 @@ static DRIVER_INIT( konamigv )
 	psx_driver_init(machine);
 
 	/* init the scsi controller and hook up it's DMA */
-	am53cf96_init(&scsi_intf);
+	am53cf96_init(machine, &scsi_intf);
 	add_exit_callback(machine, konamigv_exit);
 	psx_dma_install_read_handler(5, scsi_dma_read);
 	psx_dma_install_write_handler(5, scsi_dma_write);
@@ -537,10 +537,10 @@ static READ32_HANDLER( unknown_r )
 
 static DRIVER_INIT( simpbowl )
 {
-	intelflash_init( 0, FLASH_FUJITSU_29F016A, NULL );
-	intelflash_init( 1, FLASH_FUJITSU_29F016A, NULL );
-	intelflash_init( 2, FLASH_FUJITSU_29F016A, NULL );
-	intelflash_init( 3, FLASH_FUJITSU_29F016A, NULL );
+	intelflash_init( machine, 0, FLASH_FUJITSU_29F016A, NULL );
+	intelflash_init( machine, 1, FLASH_FUJITSU_29F016A, NULL );
+	intelflash_init( machine, 2, FLASH_FUJITSU_29F016A, NULL );
+	intelflash_init( machine, 3, FLASH_FUJITSU_29F016A, NULL );
 
 	memory_install_readwrite32_handler( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1f680080, 0x1f68008f, 0, 0, flash_r, flash_w );
 	memory_install_read32_handler     ( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1f6800c0, 0x1f6800c7, 0, 0, trackball_r );
@@ -628,7 +628,7 @@ static NVRAM_HANDLER( btchamp )
 
 static DRIVER_INIT( btchamp )
 {
-	intelflash_init( 0, FLASH_SHARP_LH28F400, NULL );
+	intelflash_init( machine, 0, FLASH_SHARP_LH28F400, NULL );
 
 	memory_install_readwrite32_handler( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1f680080, 0x1f68008f, 0, 0, btc_trackball_r, btc_trackball_w );
 	memory_install_write32_handler    ( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1f6800e0, 0x1f6800e3, 0, 0, SMH_NOP );
@@ -715,7 +715,7 @@ static WRITE32_HANDLER( kdeadeye_0_w )
 
 static DRIVER_INIT( kdeadeye )
 {
-	intelflash_init( 0, FLASH_SHARP_LH28F400, NULL );
+	intelflash_init( machine, 0, FLASH_SHARP_LH28F400, NULL );
 
 	memory_install_read32_handler     ( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1f680080, 0x1f680083, 0, 0, input_port_read_handler32(machine->portconfig, "GUNX1") );
 	memory_install_read32_handler     ( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1f680090, 0x1f680093, 0, 0, input_port_read_handler32(machine->portconfig, "GUNY1") );
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 956f0c2704f..8e8897f8959 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -468,7 +468,7 @@ static NVRAM_HANDLER(konamigx_93C46)
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 
 		if (file)
 		{
@@ -3331,7 +3331,7 @@ static DRIVER_INIT(konamigx)
 	int i, match;
 	int readback = 0;
 
-	adc083x_init( 0, ADC0834, adc0834_callback );
+	adc083x_init( machine, 0, ADC0834, adc0834_callback );
 
 	konamigx_cfgport = -1;
 	last_prot_op = -1;
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index eb1d53ee7ef..ec7ad6ef48b 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -1361,7 +1361,7 @@ static void flash_init( running_machine *machine )
 			*( flash_init[ i ].start ) = flash_chips;
 			for( chip = 0; chip < flash_init[ i ].chips; chip++ )
 			{
-				intelflash_init( flash_chips, flash_init[ i ].type, data + size );
+				intelflash_init( machine, flash_chips, flash_init[ i ].type, data + size );
 				size += flash_init[ i ].size;
 				flash_chips++;
 			}
@@ -1419,7 +1419,7 @@ static void security_cart_init( running_machine *machine, int cart, const char *
 		switch( eeprom_length )
 		{
 		case 0x224:
-			x76f041_init( cart, eeprom_rom );
+			x76f041_init( machine, cart, eeprom_rom );
 			chiptype[ cart ] = 1;
 
 			switch( cart )
@@ -1435,7 +1435,7 @@ static void security_cart_init( running_machine *machine, int cart, const char *
 			break;
 
 		case 0x84:
-			x76f100_init( cart, eeprom_rom );
+			x76f100_init( machine, cart, eeprom_rom );
 			chiptype[ cart ] = 2;
 
 			switch( cart )
@@ -1478,7 +1478,7 @@ static void security_cart_init( running_machine *machine, int cart, const char *
 
 	if( chiptype[ cart ] != 3 && ds2401_rom != NULL )
 	{
-		ds2401_init( cart, ds2401_rom );
+		ds2401_init( machine, cart, ds2401_rom );
 		has_ds2401[ cart ] = 1;
 	}
 	else
@@ -1511,7 +1511,7 @@ static DRIVER_INIT( konami573 )
 	state_save_register_item_array( machine, "KSYS573", NULL, 0, m_p_n_root_target );
 	state_save_register_item_array( machine, "KSYS573", NULL, 0, m_p_n_root_start );
 
-	adc083x_init( 0, ADC0834, analogue_inputs_callback );
+	adc083x_init( machine, 0, ADC0834, analogue_inputs_callback );
 	flash_init(machine);
 }
 
@@ -1674,7 +1674,7 @@ static DRIVER_INIT( ge765pwbba )
 {
 	DRIVER_INIT_CALL(konami573);
 
-	uPD4701_init( 0 );
+	uPD4701_init( machine, 0 );
 
 	memory_install_readwrite32_handler( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1f640000, 0x1f6400ff, 0, 0, ge765pwbba_r, ge765pwbba_w );
 }
@@ -2326,7 +2326,7 @@ static void gx894pwbba_init( running_machine *machine, void (*output_callback_fu
 	gx894_ram_read_offset = 0;
 	gx894_ram = auto_malloc( gx894_ram_size );
 
-	ds2401_init( 2, ds2401_xid ); /* todo: load this from roms */
+	ds2401_init( machine, 2, ds2401_xid ); /* todo: load this from roms */
 
 	state_save_register_global_array(machine,  gx894pwbba_output_data );
 	state_save_register_global_pointer(machine,  gx894_ram, gx894_ram_size / 4 );
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 1bb8036945b..0b3ca792944 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -670,7 +670,7 @@ static const ay8910_interface ay8910_config =
 
 static MACHINE_START( catnmous )
 {
-	pia_config(0, &pia_0_intf);
+	pia_config(machine, 0, &pia_0_intf);
 }
 
 static MACHINE_RESET( catnmous )
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index 9efb67cb8c4..45cc5376053 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -1887,7 +1887,7 @@ static DRIVER_INIT( cerberus )
 		0x3f,0x001d,
 		0xffff
 	};
-	leland_init_eeprom(0x00, cerberus_eeprom_data, 0, SERIAL_TYPE_NONE);
+	leland_init_eeprom(machine, 0x00, cerberus_eeprom_data, 0, SERIAL_TYPE_NONE);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = cerberus_bankswitch;
@@ -1935,7 +1935,7 @@ static DRIVER_INIT( mayhem )
 		0x3f,0x0818,
 		0xffff
 	};
-	leland_init_eeprom(0x00, mayhem_eeprom_data, 0x28, SERIAL_TYPE_ADD);
+	leland_init_eeprom(machine, 0x00, mayhem_eeprom_data, 0x28, SERIAL_TYPE_ADD);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = mayhem_bankswitch;
@@ -1964,7 +1964,7 @@ static DRIVER_INIT( powrplay )
 		0x2c,0xfffb,
 		0xffff
 	};
-	leland_init_eeprom(0xff, powrplay_eeprom_data, 0x2d, SERIAL_TYPE_ADD_XOR);
+	leland_init_eeprom(machine, 0xff, powrplay_eeprom_data, 0x2d, SERIAL_TYPE_ADD_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = mayhem_bankswitch;
@@ -1985,7 +1985,7 @@ static DRIVER_INIT( wseries )
 		0x1d,0x00ff,
 		0xffff
 	};
-	leland_init_eeprom(0xff, wseries_eeprom_data, 0x12, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, wseries_eeprom_data, 0x12, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = mayhem_bankswitch;
@@ -2008,7 +2008,7 @@ static DRIVER_INIT( alleymas )
 		0x37,0x00ff,
 		0xffff
 	};
-	leland_init_eeprom(0xff, alleymas_eeprom_data, 0x0c, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, alleymas_eeprom_data, 0x0c, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = mayhem_bankswitch;
@@ -2038,7 +2038,7 @@ static DRIVER_INIT( upyoural )
 		0x37,0x00ff,
 		0xffff
 	};
-	leland_init_eeprom(0xff, upyoural_eeprom_data, 0x0c, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, upyoural_eeprom_data, 0x0c, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = mayhem_bankswitch;
@@ -2063,7 +2063,7 @@ static DRIVER_INIT( dangerz )
 		0x3a,0x8007,
 		0xffff
 	};
-	leland_init_eeprom(0xff, dangerz_eeprom_data, 0x10, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, dangerz_eeprom_data, 0x10, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = dangerz_bankswitch;
@@ -2089,7 +2089,7 @@ static DRIVER_INIT( basebal2 )
 		0x1d,0x00ff,
 		0xffff
 	};
-	leland_init_eeprom(0xff, basebal2_eeprom_data, 0x12, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, basebal2_eeprom_data, 0x12, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = basebal2_bankswitch;
@@ -2111,7 +2111,7 @@ static DRIVER_INIT( dblplay )
 		0x3b,0xffe1,
 		0xffff
 	};
-	leland_init_eeprom(0xff, dblplay_eeprom_data, 0x11, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, dblplay_eeprom_data, 0x11, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = basebal2_bankswitch;
@@ -2133,7 +2133,7 @@ static DRIVER_INIT( strkzone )
 		0x1b,0xffe1,
 		0xffff
 	};
-	leland_init_eeprom(0xff, strkzone_eeprom_data, 0x0f, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, strkzone_eeprom_data, 0x0f, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = basebal2_bankswitch;
@@ -2154,7 +2154,7 @@ static DRIVER_INIT( redlin2p )
 		0x22,0xfffe,
 		0xffff
 	};
-	leland_init_eeprom(0xff, redlin2p_eeprom_data, 0x18, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, redlin2p_eeprom_data, 0x18, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = redline_bankswitch;
@@ -2185,7 +2185,7 @@ static DRIVER_INIT( quarterb )
 		0x3a,0xffd9,
 		0xffff
 	};
-	leland_init_eeprom(0xff, quarterb_eeprom_data, 0x24, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, quarterb_eeprom_data, 0x24, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = viper_bankswitch;
@@ -2210,7 +2210,7 @@ static DRIVER_INIT( viper )
 		0x1b,0xfffe,
 		0xffff
 	};
-	leland_init_eeprom(0xff, viper_eeprom_data, 0x0c, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, viper_eeprom_data, 0x0c, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = viper_bankswitch;
@@ -2241,7 +2241,7 @@ static DRIVER_INIT( teamqb )
 		0x3b,0xffd9,
 		0xffff
 	};
-	leland_init_eeprom(0xff, teamqb_eeprom_data, 0x1a, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, teamqb_eeprom_data, 0x1a, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = viper_bankswitch;
@@ -2271,7 +2271,7 @@ static DRIVER_INIT( aafb )
 		0x3b,0xffd9,
 		0xffff
 	};
-	leland_init_eeprom(0xff, aafb_eeprom_data, 0x1a, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, aafb_eeprom_data, 0x1a, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = viper_bankswitch;
@@ -2301,7 +2301,7 @@ static DRIVER_INIT( aafbb )
 		0x3b,0xffd9,
 		0xffff
 	};
-	leland_init_eeprom(0xff, aafb_eeprom_data, 0x1a, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, aafb_eeprom_data, 0x1a, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = viper_bankswitch;
@@ -2331,7 +2331,7 @@ static DRIVER_INIT( aafbd2p )
 		0x3b,0xffd9,
 		0xffff
 	};
-	leland_init_eeprom(0xff, aafb_eeprom_data, 0x1a, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, aafb_eeprom_data, 0x1a, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = viper_bankswitch;
@@ -2366,7 +2366,7 @@ static DRIVER_INIT( offroad )
 		0x3b,0xffad,
 		0xffff
 	};
-	leland_init_eeprom(0xff, offroad_eeprom_data, 0x00, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, offroad_eeprom_data, 0x00, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = offroad_bankswitch;
@@ -2403,7 +2403,7 @@ static DRIVER_INIT( offroadt )
 		0x3b,0xffad,
 		0xffff
 	};
-	leland_init_eeprom(0xff, offroadt_eeprom_data, 0x00, SERIAL_TYPE_ENCRYPT_XOR);
+	leland_init_eeprom(machine, 0xff, offroadt_eeprom_data, 0x00, SERIAL_TYPE_ENCRYPT_XOR);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = offroad_bankswitch;
@@ -2437,7 +2437,7 @@ static DRIVER_INIT( pigout )
 		0x3b,0xfffc,
 		0xffff
 	};
-	leland_init_eeprom(0xff, pigout_eeprom_data, 0x00, SERIAL_TYPE_ENCRYPT);
+	leland_init_eeprom(machine, 0xff, pigout_eeprom_data, 0x00, SERIAL_TYPE_ENCRYPT);
 
 	/* master CPU bankswitching */
 	leland_update_master_bank = offroad_bankswitch;
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index 7fa19593034..80c0473e8f5 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -214,7 +214,7 @@ static NVRAM_HANDLER( lethalen )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 1347ceaeb19..e383a367021 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -1116,7 +1116,7 @@ static void init_mediagx(running_machine *machine)
 	init_pc_common(machine, PCCOMMON_KEYBOARD_AT,mediagx_set_keyb_int);
 	mc146818_init(machine, MC146818_STANDARD);
 
-	kbdc8042_init(&at8042);
+	kbdc8042_init(machine, &at8042);
 }
 
 #if SPEEDUP_HACKS
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index dbf59a70367..2ca30234b2b 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -873,7 +873,7 @@ static MACHINE_START(meritm_crt260)
 	meritm_switch_banks();
 	MACHINE_START_CALL(merit_common);
 	pc16552d_init(0, UART_CLK, NULL, pc16650d_tx_callback);
-	microtouch_init(meritm_microtouch_tx_callback, meritm_touch_coord_transform);
+	microtouch_init(machine, meritm_microtouch_tx_callback, meritm_touch_coord_transform);
 	state_save_register_global(machine, meritm_bank);
 	state_save_register_global(machine, meritm_psd_a15);
 	state_save_register_global_pointer(machine, meritm_ram, 0x8000);
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 66b4f21a618..5c8142f81ad 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -4222,7 +4222,7 @@ static NVRAM_HANDLER( dokyusp )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 		if (file)	eeprom_load(file);
 		else		eeprom_set_data(def_data,sizeof(def_data)/sizeof(def_data[0]));
 	}
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index 9643bf6544b..a31a956c437 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -150,7 +150,7 @@ static NVRAM_HANDLER( mitchell )
 	}
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index ebeb10932bf..bb94e7c010f 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -918,27 +918,28 @@ static const eeprom_interface eeprom_intf =
 	5				/* reset_delay (Lost World needs this, very similar to wbeachvl in playmark.c) */
 };
 
-static void eeprom_handler(mame_file *file,int read_or_write)
+static void eeprom_handler(running_machine *machine, mame_file *file, int read_or_write)
 {
 	if (read_or_write)
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 		if (file)	eeprom_load(file);
 	}
 }
 
 static NVRAM_HANDLER( model3 )
 {
-	if( mame_stricmp(machine->gamedrv->name, "lostwsga") == 0 ||
-		mame_stricmp(machine->gamedrv->name, "dirtdvls") == 0 ||
-		mame_stricmp(machine->gamedrv->name, "dirtdvla") == 0 ||
-		mame_stricmp(machine->gamedrv->name, "lemans24") == 0 ||
-		mame_stricmp(machine->gamedrv->name, "von2") == 0 ||
-		mame_stricmp(machine->gamedrv->name, "von254g") == 0)
+	const char *name = machine->gamedrv->name;
+	if( mame_stricmp(name, "lostwsga") == 0 ||
+		mame_stricmp(name, "dirtdvls") == 0 ||
+		mame_stricmp(name, "dirtdvla") == 0 ||
+		mame_stricmp(name, "lemans24") == 0 ||
+		mame_stricmp(name, "von2") == 0 ||
+		mame_stricmp(name, "von254g") == 0)
 	{
-		eeprom_handler(file, read_or_write);
+		eeprom_handler(machine, file, read_or_write);
 	} else {
 		NVRAM_HANDLER_CALL(93C46);
 	}
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index ede92b7d630..cb40f1b929c 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -77,7 +77,7 @@ static NVRAM_HANDLER( moo )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index e7f5cd54755..7b2538c0818 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -1241,12 +1241,12 @@ static const stepper_interface barcrest_reel_interface =
 /* Common configurations */
 static void mpu4_config_common(running_machine *machine)
 {
-	pia_config(0,&pia_ic3_intf);
-	pia_config(1,&pia_ic4_intf);
-	pia_config(2,&pia_ic5_intf);
-	pia_config(3,&pia_ic6_intf);
-	pia_config(4,&pia_ic7_intf);
-	pia_config(5,&pia_ic8_intf);
+	pia_config(machine, 0,&pia_ic3_intf);
+	pia_config(machine, 1,&pia_ic4_intf);
+	pia_config(machine, 2,&pia_ic5_intf);
+	pia_config(machine, 3,&pia_ic6_intf);
+	pia_config(machine, 4,&pia_ic7_intf);
+	pia_config(machine, 5,&pia_ic8_intf);
 
 	ic24_timer = timer_alloc(machine, ic24_timeout, NULL);
 	/* setup 6840ptm */
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 63e3082a6e2..842c1b1da7a 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -85,7 +85,7 @@ static NVRAM_HANDLER(mystwarr)
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
@@ -103,7 +103,7 @@ static NVRAM_HANDLER(gaiapols)
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf_gaia);
+		eeprom_init(machine, &eeprom_intf_gaia);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 05494c4c772..491f16326f8 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -703,7 +703,7 @@ static NVRAM_HANDLER( naomi_eeproms )
 		/*eeprom_save(file)*/;
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 		/*if (file)
             eeprom_load(file);
         else*/
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index d8d5aac3123..a13e32fd269 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -233,8 +233,8 @@ static const ttl74123_config ic48_1_config =
 
 static MACHINE_START( nyny )
 {
-	pia_config(1, &pia_1_intf);
-	pia_config(2, &pia_2_intf);
+	pia_config(machine, 1, &pia_1_intf);
+	pia_config(machine, 2, &pia_2_intf);
 
 	/* setup for save states */
 	state_save_register_global(machine, flipscreen);
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 32d66d5ab2e..a3e79f866d1 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -327,7 +327,7 @@ static NVRAM_HANDLER( othunder )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 0608c5f5dee..67002d44dda 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -114,7 +114,7 @@ static NVRAM_HANDLER( overdriv )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 886d785c99b..f2bf619c873 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -1025,10 +1025,10 @@ MACHINE_DRIVER_END
 *****************/
 
 /* Normal board */
-static void peplus_init(void)
+static void peplus_init(running_machine *machine)
 {
     /* EEPROM is a X2404P 4K-bit Serial I2C Bus */
-	i2cmem_init(0, I2CMEM_SLAVE_ADDRESS, 8, eeprom_NVRAM_SIZE, NULL);
+	i2cmem_init(machine, 0, I2CMEM_SLAVE_ADDRESS, 8, eeprom_NVRAM_SIZE, NULL);
 
 	/* default : no address to patch in program RAM to enable autohold feature */
 	autohold_addr = 0;
@@ -1042,7 +1042,7 @@ static void peplus_init(void)
 /* Normal board */
 static DRIVER_INIT( peplus )
 {
-	peplus_init();
+	peplus_init(machine);
 }
 
 /* Superboard */
@@ -1058,7 +1058,7 @@ static DRIVER_INIT( peplussb )
     memcpy(sd000_ram, &super_data[0xd000], 0x1000);
     memcpy(sf000_ram, &super_data[0xf000], 0x1000);
 
-	peplus_init();
+	peplus_init(machine);
 }
 
 /*************************
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 622def1a053..66872d107c2 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -119,7 +119,7 @@ static NVRAM_HANDLER( pirates )
 	if (read_or_write) eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 		if (file) eeprom_load(file);
 	}
 }
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 77d49054a0e..f24790cb025 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -91,7 +91,7 @@ static NVRAM_HANDLER( wbeachvl )
 	}
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 13fd037fd48..d860d6bc044 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -122,7 +122,7 @@ static NVRAM_HANDLER( polygonet )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index 9657980cd9a..aadb5b05657 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -141,7 +141,7 @@ static NVRAM_HANDLER( pntnpuzl )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 0cd6e59781a..5ea8573ee2a 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -262,7 +262,7 @@ static NVRAM_HANDLER( policetr )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_policetr);
+		eeprom_init(machine, &eeprom_interface_policetr);
 		if (file)	eeprom_load(file);
 	}
 }
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 5780ff0122d..3ecb87935f9 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -48,7 +48,7 @@ static NVRAM_HANDLER( magicstk )
 	}
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index 31b04818eb2..302215132b4 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -181,7 +181,7 @@ static NVRAM_HANDLER(93C56)
 	}
 	else
 	{
-		eeprom_init(&eeprom_interface_93C56);
+		eeprom_init(machine, &eeprom_interface_93C56);
 		if (file)
 		{
 			eeprom_load(file);
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index 713bf492be0..e25d4f1a4eb 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -339,7 +339,7 @@ static NVRAM_HANDLER(93C56)
 	}
 	else
 	{
-		eeprom_init(&eeprom_interface_93C56);
+		eeprom_init(machine, &eeprom_interface_93C56);
 		if (file)
 		{
 			eeprom_load(file);
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index a4e34c401f7..9d50ac8b9a8 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -275,8 +275,8 @@ static const pia6821_interface pia_audio_intf =
 
 static MACHINE_START( r2dtank )
 {
-	pia_config(0, &pia_main_intf);
-	pia_config(1, &pia_audio_intf);
+	pia_config(machine, 0, &pia_main_intf);
+	pia_config(machine, 1, &pia_audio_intf);
 
 	/* setup for save states */
 	state_save_register_global(machine, flipscreen);
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 9a1f94acb73..b124a226b02 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -1853,7 +1853,7 @@ static NVRAM_HANDLER( rdx_v33 )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 
 		if (file) eeprom_load(file);
 		else
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index f14b0521401..0ca1c968ef1 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -464,7 +464,7 @@ static NVRAM_HANDLER( syf )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 		if (file)
 		{
 			eeprom_load(file);
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index a61816232ff..3e38acd63a5 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -74,7 +74,7 @@ static NVRAM_HANDLER( rungun )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 67e75b54cad..41b10b5f0cb 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -1163,7 +1163,7 @@ static NVRAM_HANDLER( system32 )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index cf9d03248bf..7c23d4be006 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1648,7 +1648,7 @@ static NVRAM_HANDLER( spi )
 	if( read_or_write ) {
 		DS2404_save(file);
 	} else {
-		DS2404_init(1995, 1, 1);
+		DS2404_init(machine, 1995, 1, 1);
 
 		if(file) {
 			DS2404_load(file);
@@ -1678,7 +1678,7 @@ static NVRAM_HANDLER( sxx2f )
 	if( read_or_write ) {
 		eeprom_save(file);
 	} else {
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if(file)
 			eeprom_load(file);
@@ -1943,8 +1943,8 @@ static READ32_HANDLER ( rfjet_speedup_r )
 
 static void init_spi(running_machine *machine)
 {
-	intelflash_init( 0, FLASH_INTEL_E28F008SA, NULL );
-	intelflash_init( 1, FLASH_INTEL_E28F008SA, NULL );
+	intelflash_init( machine, 0, FLASH_INTEL_E28F008SA, NULL );
+	intelflash_init( machine, 1, FLASH_INTEL_E28F008SA, NULL );
 
 	seibuspi_text_decrypt(memory_region(machine, "gfx1"));
 	seibuspi_bg_decrypt(memory_region(machine, "gfx2"), memory_region_length(machine, "gfx2"));
@@ -2005,8 +2005,8 @@ static DRIVER_INIT( viprp1o )
 
 static void init_rf2(running_machine *machine)
 {
-	intelflash_init( 0, FLASH_INTEL_E28F008SA, NULL );
-	intelflash_init( 1, FLASH_INTEL_E28F008SA, NULL );
+	intelflash_init( machine, 0, FLASH_INTEL_E28F008SA, NULL );
+	intelflash_init( machine, 1, FLASH_INTEL_E28F008SA, NULL );
 
 	memory_install_read32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x0282AC, 0x0282AF, 0, 0, rf2_speedup_r );
 	seibuspi_rise10_text_decrypt(memory_region(machine, "gfx1"));
@@ -2029,8 +2029,8 @@ static DRIVER_INIT( rdft2us )
 
 static DRIVER_INIT( rfjet )
 {
-	intelflash_init( 0, FLASH_INTEL_E28F008SA, NULL );
-	intelflash_init( 1, FLASH_INTEL_E28F008SA, NULL );
+	intelflash_init( machine, 0, FLASH_INTEL_E28F008SA, NULL );
+	intelflash_init( machine, 1, FLASH_INTEL_E28F008SA, NULL );
 
 	memory_install_read32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x002894c, 0x002894f, 0, 0, rfjet_speedup_r );
 	seibuspi_rise11_text_decrypt(memory_region(machine, "gfx1"));
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 689c927a929..dc3182a43c4 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -9615,8 +9615,8 @@ static DRIVER_INIT( inttoote )
 	ROM[0x368a/2] = 0x50f9;	// betting count down
 
 	/* Initializing PIAs... (to be done) */
-	pia_config(0, &inttoote_pia0_intf);
-	pia_config(1, &inttoote_pia1_intf);
+	pia_config(machine, 0, &inttoote_pia0_intf);
+	pia_config(machine, 1, &inttoote_pia1_intf);
 }
 
 /***************************************************************************
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index 5fe8d2dd7b8..1faee0dd9c8 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -494,7 +494,7 @@ static NVRAM_HANDLER(93C46_gundamex)
 	}
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 		if (file)
 		{
 			eeprom_load(file);
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index d51b38b20c8..5816b24066b 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -459,7 +459,7 @@ static NVRAM_HANDLER( simpl156 )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);// 93c45
+		eeprom_init(machine, &eeprom_interface_93C46);// 93c45
 
 		if (file) eeprom_load(file);
 		else
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index bd492328830..4fc79841c1a 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -370,10 +370,10 @@ static const ttl74123_config ic60_intf =
 
 static MACHINE_START( spiders )
 {
-	pia_config(1, &pia_1_intf);
-	pia_config(2, &pia_2_intf);
-	pia_config(3, &pia_3_intf);
-	pia_config(4, &pia_4_intf);
+	pia_config(machine, 1, &pia_1_intf);
+	pia_config(machine, 2, &pia_2_intf);
+	pia_config(machine, 3, &pia_3_intf);
+	pia_config(machine, 4, &pia_4_intf);
 
 	/* setup for save states */
 	state_save_register_global(machine, flipscreen);
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 43d758915a5..4ea97e2a75e 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -368,7 +368,7 @@ static NVRAM_HANDLER( gdfs )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 
 		if (file) eeprom_load(file);
 		else
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index 0f66b9fb30d..97406257818 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -221,7 +221,7 @@ static NVRAM_HANDLER( stlforce )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 		if (file)
 		{
 			eeprom_load(file);
diff --git a/src/mame/drivers/stvinit.c b/src/mame/drivers/stvinit.c
index 45c455c6cc8..3bc6311dd33 100644
--- a/src/mame/drivers/stvinit.c
+++ b/src/mame/drivers/stvinit.c
@@ -85,7 +85,7 @@ NVRAM_HANDLER( stv )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 
 		if (file) eeprom_load(file);
 		else
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index dec3fdb5333..49e6df48b2a 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -400,7 +400,7 @@ static NVRAM_HANDLER( superchs )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&superchs_eeprom_interface);
+		eeprom_init(machine, &superchs_eeprom_interface);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 397ae21df4f..fbbe0797b29 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -375,7 +375,7 @@ static NVRAM_HANDLER( taito_b )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 		if (file)
 		{
 			eeprom_load(file);
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index e282c39fc78..b7c4e27039a 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -389,7 +389,7 @@ static NVRAM_HANDLER( taito_f3 )
 
 		// RecalH does not initialise it's eeprom on first boot, so we provide one.
 		// Same applies to gseeker.
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 		if (file)
 			eeprom_load(file);
 		else if (f3_game==RECALH)
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index 7b2af54406e..15a172eea39 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -1061,7 +1061,7 @@ static NVRAM_HANDLER( spacegun )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 			eeprom_load(file);
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index c42708380b2..3440cf504a2 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -682,7 +682,7 @@ static DRIVER_INIT( taitowlf )
 
 	intel82439tx_init();
 
-	kbdc8042_init(&at8042);
+	kbdc8042_init(machine, &at8042);
 }
 
 /*****************************************************************************/
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index e7512d384ce..1b14ffd81d3 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -504,7 +504,7 @@ static NVRAM_HANDLER( galgames )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&galgames_eeprom_interface);
+		eeprom_init(machine, &galgames_eeprom_interface);
 		if (file)	eeprom_load(file);
 	}
 }
@@ -744,7 +744,7 @@ INPUT_PORTS_END
 
 static MACHINE_START( tmaster )
 {
-	microtouch_init(microtouch_tx, 0);
+	microtouch_init(machine, microtouch_tx, 0);
 }
 
 static MACHINE_RESET( tmaster )
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index f82328c0c5b..e4f1c590438 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -444,7 +444,7 @@ static NVRAM_HANDLER( eeprom )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
@@ -544,7 +544,7 @@ static NVRAM_HANDLER( thndrx2 )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&thndrx2_eeprom_interface);
+		eeprom_init(machine, &thndrx2_eeprom_interface);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index fccae17ec27..3749cd0518f 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -1230,7 +1230,7 @@ static NVRAM_HANDLER( bbakraid )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C66);
+		eeprom_init(machine, &eeprom_interface_93C66);
 
 		if (file) eeprom_load(file);
 		else
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index acbf39a0cc0..d488cb84a81 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -303,9 +303,9 @@ static const pia6821_interface pia_u3_intf =
 
 static MACHINE_START( toratora )
 {
-	pia_config(0, &pia_u1_intf);
-	pia_config(1, &pia_u3_intf);
-	pia_config(2, &pia_u2_intf);
+	pia_config(machine, 0, &pia_u1_intf);
+	pia_config(machine, 1, &pia_u3_intf);
+	pia_config(machine, 2, &pia_u2_intf);
 }
 
 
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index 2e6d77e347d..44d6ec86271 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -173,8 +173,8 @@ static TIMER_CALLBACK( interrupt_gen )
 
 static MACHINE_START( tugboat )
 {
-	pia_config(0, &pia0_intf);
-	pia_config(1, &pia1_intf);
+	pia_config(machine, 0, &pia0_intf);
+	pia_config(machine, 1, &pia1_intf);
 }
 
 static MACHINE_RESET( tugboat )
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index 6919cfa0281..32e35105d7f 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -205,7 +205,7 @@ static INPUT_PORTS_START( ultrsprt )
 	PORT_BIT( 0xfff, 0x800, IPT_AD_STICK_Y ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
 INPUT_PORTS_END
 
-static void eeprom_handler(mame_file *file, int read_or_write)
+static NVRAM_HANDLER(ultrsprt)
 {
 	if (read_or_write)
 	{
@@ -213,7 +213,7 @@ static void eeprom_handler(mame_file *file, int read_or_write)
 	}
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 		if (file)
 		{
 			eeprom_load(file);
@@ -221,11 +221,6 @@ static void eeprom_handler(mame_file *file, int read_or_write)
 	}
 }
 
-static NVRAM_HANDLER(ultrsprt)
-{
-	eeprom_handler(file, read_or_write);
-}
-
 static INTERRUPT_GEN( ultrsprt_vblank )
 {
 	cpu_set_input_line(device, INPUT_LINE_IRQ1, ASSERT_LINE);
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index 8f55ac401bb..ee493f4cb88 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -272,7 +272,7 @@ static NVRAM_HANDLER( undrfire )
 	if (read_or_write)
 		eeprom_save(file);
 	else {
-		eeprom_init(&undrfire_eeprom_interface);
+		eeprom_init(machine, &undrfire_eeprom_interface);
 		if (file)
 			eeprom_load(file);
 		else
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 0c39b332ae0..93217232926 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -656,7 +656,7 @@ static NVRAM_HANDLER( zeropnt2 )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&zeropnt2_eeprom_interface);
+		eeprom_init(machine, &zeropnt2_eeprom_interface);
 		if (file)	eeprom_load(file);
 	}
 }
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index bf822eb9c56..8e907087b61 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -530,7 +530,7 @@ static NVRAM_HANDLER( 93C46_vamphalf )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 		if (file)
 		{
 			eeprom_load(file);
@@ -552,7 +552,7 @@ static NVRAM_HANDLER( finalgdr )
 	}
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 		if (file)
 		{
 			eeprom_load(file);
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index ae23a8c42af..c89d7e53a4d 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -129,7 +129,7 @@ static NVRAM_HANDLER( vendetta )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index 71f97a39ab2..74d1d5243d1 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -2599,9 +2599,9 @@ ROM_END
 	williams2_tilemap_config = x
 
 #define CONFIGURE_PIAS(a,b,c) \
-	pia_config(0, &a);\
-	pia_config(1, &b);\
-	pia_config(2, &c)
+	pia_config(machine, 0, &a);\
+	pia_config(machine, 1, &b);\
+	pia_config(machine, 2, &c)
 
 
 
@@ -2721,7 +2721,7 @@ static DRIVER_INIT( spdball )
 	CONFIGURE_PIAS(williams_pia_0_intf, williams_pia_1_intf, williams_snd_pia_intf);
 
 	/* add a third PIA */
-	pia_config(3, &spdball_pia_3_intf);
+	pia_config(machine, 3, &spdball_pia_3_intf);
 	memory_install_readwrite8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xc808, 0xc80b, 0, 0, pia_3_r, pia_3_w);
 
 	/* install extra input handlers */
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index df6e621c803..78ae44bfcee 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -103,7 +103,7 @@ static NVRAM_HANDLER( xexex )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 8a99d55d4e0..4d679b29583 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -57,7 +57,7 @@ static NVRAM_HANDLER( xmen )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index d5f47496c79..8df5c8e326b 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -55,7 +55,7 @@ static NVRAM_HANDLER( xorworld )
 	}
 	else
 	{
-		eeprom_init(&eeprom_interface_93C46);
+		eeprom_init(machine, &eeprom_interface_93C46);
 
 		if (file)
 		{
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index 737cd455e9b..a96af536d4e 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -246,8 +246,8 @@ static const ppi8255_interface ppi8255_intf =
 
 static MACHINE_START( zaccaria )
 {
-	pia_config(0, &pia_0_intf);
-	pia_config(1, &pia_1_intf);
+	pia_config(machine, 0, &pia_0_intf);
+	pia_config(machine, 1, &pia_1_intf);
 }
 
 static MACHINE_RESET( zaccaria )
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index f6cb3b4789c..602f2e67193 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -1179,7 +1179,7 @@ static DRIVER_INIT( coh1000ta )
 	memory_install_readwrite32_handler( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, SMH_BANK2, SMH_BANK2 );
 
 	zn_driver_init(machine);
-	mb3773_init();
+	mb3773_init(machine);
 }
 
 static MACHINE_RESET( coh1000ta )
@@ -1279,7 +1279,7 @@ static DRIVER_INIT( coh1000tb )
 	memory_install_readwrite32_handler( cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size2 - 1 ), 0, 0, SMH_BANK3, SMH_BANK3 );
 
 	zn_driver_init(machine);
-	mb3773_init();
+	mb3773_init(machine);
 }
 
 static MACHINE_RESET( coh1000tb )
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index bba01f066d1..01fdaeeb28f 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -848,7 +848,7 @@ static void init_zr107(running_machine *machine)
 
 	K056800_init(machine, sound_irq_callback);
 
-	adc083x_init(0, ADC0838, adc0838_callback);
+	adc083x_init(machine, 0, ADC0838, adc0838_callback);
 }
 
 static DRIVER_INIT(zr107)
diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h
index f58ba3f9254..ffd4be1b7b5 100644
--- a/src/mame/includes/leland.h
+++ b/src/mame/includes/leland.h
@@ -63,8 +63,8 @@ void viper_bankswitch(running_machine *machine);
 void offroad_bankswitch(running_machine *machine);
 void ataxx_bankswitch(running_machine *machine);
 
-void leland_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offset, UINT8 serial_type);
-void ataxx_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offset);
+void leland_init_eeprom(running_machine *machine, UINT8 default_val, const UINT16 *data, UINT8 serial_offset, UINT8 serial_type);
+void ataxx_init_eeprom(running_machine *machine, UINT8 default_val, const UINT16 *data, UINT8 serial_offset);
 
 READ8_HANDLER( ataxx_eeprom_r );
 WRITE8_HANDLER( ataxx_eeprom_w );
diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c
index d8998a3d670..f31e3997439 100644
--- a/src/mame/machine/atari.c
+++ b/src/mame/machine/atari.c
@@ -755,7 +755,7 @@ static void atari_machine_start(running_machine *machine, int type, const pia682
 	/* PIA */
 	if (pia_intf)
 	{
-		pia_config(0, pia_intf);
+		pia_config(machine, 0, pia_intf);
 		add_reset_callback(machine, _pia_reset);
 	}
 
diff --git a/src/mame/machine/carpolo.c b/src/mame/machine/carpolo.c
index b1d13f88f6f..179487c809e 100644
--- a/src/mame/machine/carpolo.c
+++ b/src/mame/machine/carpolo.c
@@ -513,8 +513,8 @@ static const struct TTL7474_interface TTL7474_2U_2_intf =
 MACHINE_START( carpolo )
 {
 	/* set up the PIA's */
-	pia_config(0, &pia_0_intf);
-	pia_config(1, &pia_1_intf);
+	pia_config(machine, 0, &pia_0_intf);
+	pia_config(machine, 1, &pia_1_intf);
 }
 
 MACHINE_RESET( carpolo )
@@ -525,10 +525,10 @@ MACHINE_RESET( carpolo )
 
 
 	/* set up the coin handling flip-flops */
-	TTL7474_config(TTL7474_2S_1, &TTL7474_2S_1_intf);
-	TTL7474_config(TTL7474_2S_2, &TTL7474_2S_2_intf);
-	TTL7474_config(TTL7474_2U_1, &TTL7474_2U_1_intf);
-	TTL7474_config(TTL7474_2U_2, &TTL7474_2U_2_intf);
+	TTL7474_config(machine, TTL7474_2S_1, &TTL7474_2S_1_intf);
+	TTL7474_config(machine, TTL7474_2S_2, &TTL7474_2S_2_intf);
+	TTL7474_config(machine, TTL7474_2U_1, &TTL7474_2U_1_intf);
+	TTL7474_config(machine, TTL7474_2U_2, &TTL7474_2U_2_intf);
 
 	TTL7474_d_w     (TTL7474_2S_1, 1);
 	TTL7474_preset_w(TTL7474_2S_1, 1);
@@ -544,14 +544,14 @@ MACHINE_RESET( carpolo )
 
 
 	/* set up the steering handling flip-flops */
-	TTL7474_config(TTL7474_1F_1, 0);
-	TTL7474_config(TTL7474_1F_2, 0);
-	TTL7474_config(TTL7474_1D_1, 0);
-	TTL7474_config(TTL7474_1D_2, 0);
-	TTL7474_config(TTL7474_1C_1, 0);
-	TTL7474_config(TTL7474_1C_2, 0);
-	TTL7474_config(TTL7474_1A_1, 0);
-	TTL7474_config(TTL7474_1A_2, 0);
+	TTL7474_config(machine, TTL7474_1F_1, 0);
+	TTL7474_config(machine, TTL7474_1F_2, 0);
+	TTL7474_config(machine, TTL7474_1D_1, 0);
+	TTL7474_config(machine, TTL7474_1D_2, 0);
+	TTL7474_config(machine, TTL7474_1C_1, 0);
+	TTL7474_config(machine, TTL7474_1C_2, 0);
+	TTL7474_config(machine, TTL7474_1A_1, 0);
+	TTL7474_config(machine, TTL7474_1A_2, 0);
 
 	TTL7474_d_w     (TTL7474_1F_1, 1);
 	TTL7474_preset_w(TTL7474_1F_1, 1);
diff --git a/src/mame/machine/cubocd32.c b/src/mame/machine/cubocd32.c
index 7de972f05c0..30de51da7ef 100644
--- a/src/mame/machine/cubocd32.c
+++ b/src/mame/machine/cubocd32.c
@@ -79,7 +79,7 @@ static void amiga_akiko_exit(running_machine* machine)
 
 void amiga_akiko_init(running_machine* machine)
 {
-	i2cmem_init( 0, I2CMEM_SLAVE_ADDRESS, NVRAM_PAGE_SIZE, NVRAM_SIZE, NULL );
+	i2cmem_init( machine, 0, I2CMEM_SLAVE_ADDRESS, NVRAM_PAGE_SIZE, NVRAM_SIZE, NULL );
 
 	akiko.c2p_input_index = 0;
 	akiko.c2p_output_index = 0;
diff --git a/src/mame/machine/gaelco2.c b/src/mame/machine/gaelco2.c
index b3c3155835d..a16cb9b85a7 100644
--- a/src/mame/machine/gaelco2.c
+++ b/src/mame/machine/gaelco2.c
@@ -282,7 +282,7 @@ NVRAM_HANDLER( gaelco2 )
 	if (read_or_write){
 		eeprom_save(file);
 	} else {
-		eeprom_init(&gaelco2_eeprom_interface);
+		eeprom_init(machine, &gaelco2_eeprom_interface);
 
 		if (file) eeprom_load(file);
 	}
diff --git a/src/mame/machine/galaxold.c b/src/mame/machine/galaxold.c
index 1ebe4e0b255..0917c8ef1d3 100644
--- a/src/mame/machine/galaxold.c
+++ b/src/mame/machine/galaxold.c
@@ -70,11 +70,11 @@ static void machine_reset_common(running_machine *machine, int line)
 	irq_line = line;
 
 	/* initalize main CPU interrupt generator flip-flops */
-	TTL7474_config(0, &galaxold_7474_9M_2_intf);
+	TTL7474_config(machine, 0, &galaxold_7474_9M_2_intf);
 	TTL7474_preset_w(0, 1);
 	TTL7474_clear_w (0, 1);
 
-	TTL7474_config(1, &galaxold_7474_9M_1_intf);
+	TTL7474_config(machine, 1, &galaxold_7474_9M_1_intf);
 	TTL7474_clear_w (1, 1);
 	TTL7474_d_w     (1, 0);
 	TTL7474_preset_w(1, 0);
diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c
index 1463c9fcebd..3a17e4a03b9 100644
--- a/src/mame/machine/leland.c
+++ b/src/mame/machine/leland.c
@@ -677,7 +677,7 @@ void ataxx_bankswitch(running_machine *machine)
  *
  *************************************/
 
-void leland_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offset, UINT8 serial_type)
+void leland_init_eeprom(running_machine *machine, UINT8 default_val, const UINT16 *data, UINT8 serial_offset, UINT8 serial_type)
 {
 	static const eeprom_interface eeprom_intf =
 	{
@@ -759,7 +759,7 @@ void leland_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offs
 		}
 	}
 
-	eeprom_init(&eeprom_intf);
+	eeprom_init(machine, &eeprom_intf);
 }
 
 
@@ -770,7 +770,7 @@ void leland_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offs
  *
  *************************************/
 
-void ataxx_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offset)
+void ataxx_init_eeprom(running_machine *machine, UINT8 default_val, const UINT16 *data, UINT8 serial_offset)
 {
 	static const eeprom_interface eeprom_intf =
 	{
@@ -836,7 +836,7 @@ void ataxx_init_eeprom(UINT8 default_val, const UINT16 *data, UINT8 serial_offse
 		eeprom_data[0x7f * 2 + 0] = (sum >> 8) & 0xff;
 		eeprom_data[0x7f * 2 + 1] = sum & 0xff;
 
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 	}
 }
 
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index dc96378121a..f1eb6d7d975 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -379,9 +379,9 @@ MACHINE_RESET( mcr68 )
 MACHINE_START( zwackery )
 {
 	/* append our PIA state onto the existing one and reinit */
-	pia_config(2, &zwackery_pia_2_intf);
-	pia_config(3, &zwackery_pia_3_intf);
-	pia_config(4, &zwackery_pia_4_intf);
+	pia_config(machine, 2, &zwackery_pia_2_intf);
+	pia_config(machine, 3, &zwackery_pia_3_intf);
+	pia_config(machine, 4, &zwackery_pia_4_intf);
 
 	MACHINE_START_CALL(mcr68);
 }
diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c
index 99b5cd887db..c70448fb9f1 100644
--- a/src/mame/machine/naomibd.c
+++ b/src/mame/machine/naomibd.c
@@ -579,7 +579,7 @@ static DEVICE_NVRAM( naomibd )
 		/*if (file)
             eeprom_load(file);
         else*/
-		x76f100_init( 0, eeprom_romboard );
+		x76f100_init( device->machine, 0, eeprom_romboard );
 		memcpy(eeprom_romboard+20,"\241\011                              0000000000000000",48);
 	}
 }
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 901cf4c07d3..b76020ce6a2 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -272,7 +272,7 @@ static const struct RP5H01_interface rp5h01_interface =
 DRIVER_INIT( playch10 )
 {
 	/* initialize the security chip */
-	if ( RP5H01_init( &rp5h01_interface ) )
+	if ( RP5H01_init( machine, &rp5h01_interface ) )
 	{
 		fatalerror("rp5h01_interface initualization failed");
 	}
diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c
index 63cbafc772f..364fd4f17da 100644
--- a/src/mame/machine/qix.c
+++ b/src/mame/machine/qix.c
@@ -206,12 +206,12 @@ static const pia6821_interface slither_pia_3_intf =
 MACHINE_START( qix )
 {
 	/* configure the PIAs */
-	pia_config(0, &qix_pia_0_intf);
-	pia_config(1, &qix_pia_1_intf);
-	pia_config(2, &qix_pia_2_intf);
-	pia_config(3, &qix_pia_3_intf);
-	pia_config(4, &qix_pia_4_intf);
-	pia_config(5, &qix_pia_5_intf);
+	pia_config(machine, 0, &qix_pia_0_intf);
+	pia_config(machine, 1, &qix_pia_1_intf);
+	pia_config(machine, 2, &qix_pia_2_intf);
+	pia_config(machine, 3, &qix_pia_3_intf);
+	pia_config(machine, 4, &qix_pia_4_intf);
+	pia_config(machine, 5, &qix_pia_5_intf);
 }
 
 MACHINE_RESET( qix )
@@ -231,12 +231,12 @@ MACHINE_START( qixmcu )
 	qix_state *state = machine->driver_data;
 
 	/* configure the PIAs */
-	pia_config(0, &qixmcu_pia_0_intf);
-	pia_config(1, &qix_pia_1_intf);
-	pia_config(2, &qixmcu_pia_2_intf);
-	pia_config(3, &qix_pia_3_intf);
-	pia_config(4, &qix_pia_4_intf);
-	pia_config(5, &qix_pia_5_intf);
+	pia_config(machine, 0, &qixmcu_pia_0_intf);
+	pia_config(machine, 1, &qix_pia_1_intf);
+	pia_config(machine, 2, &qixmcu_pia_2_intf);
+	pia_config(machine, 3, &qix_pia_3_intf);
+	pia_config(machine, 4, &qix_pia_4_intf);
+	pia_config(machine, 5, &qix_pia_5_intf);
 
 	/* set up save states */
 	state_save_register_global_array(machine, state->_68705_port_in);
@@ -246,10 +246,10 @@ MACHINE_START( qixmcu )
 MACHINE_START( slither )
 {
 	/* configure the PIAs */
-	pia_config(0, &qix_pia_0_intf);
-	pia_config(1, &slither_pia_1_intf);
-	pia_config(2, &slither_pia_2_intf);
-	pia_config(3, &slither_pia_3_intf);
+	pia_config(machine, 0, &qix_pia_0_intf);
+	pia_config(machine, 1, &slither_pia_1_intf);
+	pia_config(machine, 2, &slither_pia_2_intf);
+	pia_config(machine, 3, &slither_pia_3_intf);
 }
 
 
diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c
index e78b1728dea..d40ce36a1a4 100644
--- a/src/mame/machine/simpsons.c
+++ b/src/mame/machine/simpsons.c
@@ -33,7 +33,7 @@ NVRAM_HANDLER( simpsons )
 		eeprom_save(file);
 	else
 	{
-		eeprom_init(&eeprom_intf);
+		eeprom_init(machine, &eeprom_intf);
 
 		if (file)
 		{