diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c
index 4ac5d97e598..f7e6b4e5733 100644
--- a/src/emu/cpuexec.c
+++ b/src/emu/cpuexec.c
@@ -135,11 +135,11 @@ static int get_register_string_max_width(const device_config *device, void *base
 ***************************************************************************/
 
 /*-------------------------------------------------
-    cpu_get_class_data - return a pointer to
-    the class data
+    get_class_data - return a pointer to the
+    class data
 -------------------------------------------------*/
 
-INLINE cpu_class_data *cpu_get_class_data(const device_config *device)
+INLINE cpu_class_data *get_class_data(const device_config *device)
 {
 	assert(device != NULL);
 	assert(device->class == DEVICE_CLASS_CPU_CHIP);
@@ -148,6 +148,35 @@ INLINE cpu_class_data *cpu_get_class_data(const device_config *device)
 }
 
 
+/*-------------------------------------------------
+    get_minimum_quantum - return the minimum
+    quantum required for a given CPU device
+-------------------------------------------------*/
+
+INLINE attoseconds_t get_minimum_quantum(const device_config *device)
+{
+	attoseconds_t basetick = 0;
+	
+	/* fetch the base clock from the classdata if present */
+	if (device->token != NULL)
+	{
+		cpu_class_data *classdata = get_class_data(device);
+		if (classdata->attoseconds_per_cycle != 0)
+			basetick = classdata->attoseconds_per_cycle;
+	}
+
+	/* otherwise compute it from the raw data */
+	if (basetick == 0)
+	{
+		UINT32 baseclock = (UINT64)device->clock * cpu_get_clock_multiplier(device) / cpu_get_clock_divider(device);
+		basetick = HZ_TO_ATTOSECONDS(baseclock);
+	}
+
+	/* apply the minimum cycle count */
+	return basetick * cpu_get_min_cycles(device);
+}
+
+
 /*-------------------------------------------------
     suspend_until_trigger - suspend execution
     until the given trigger fires
@@ -155,7 +184,7 @@ INLINE cpu_class_data *cpu_get_class_data(const device_config *device)
 
 INLINE void suspend_until_trigger(const device_config *device, int trigger, int eatcycles)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* suspend the CPU immediately if it's not already */
 	cpu_suspend(device, SUSPEND_REASON_TRIGGER, eatcycles);
@@ -177,20 +206,28 @@ INLINE void suspend_until_trigger(const device_config *device, int trigger, int
 
 void cpuexec_init(running_machine *machine)
 {
-	int numscreens = video_screen_count(machine->config);
-	attoseconds_t refresh_attosecs;
-	int ipf;
+	attotime min_quantum;
 
 	/* allocate global state */
 	machine->cpuexec_data = auto_malloc(sizeof(*machine->cpuexec_data));
 	memset(machine->cpuexec_data, 0, sizeof(*machine->cpuexec_data));
 
 	/* set the core scheduling quantum */
-	ipf = machine->config->cpu_slices_per_frame;
-	if (ipf <= 0)
-		ipf = 1;
-	refresh_attosecs = (numscreens == 0) ? HZ_TO_ATTOSECONDS(60) : video_screen_get_frame_period(machine->primary_screen).attoseconds;
-	timer_add_scheduling_quantum(machine, refresh_attosecs / ipf, attotime_never);
+	min_quantum = machine->config->minimum_quantum;
+	if (attotime_compare(min_quantum, attotime_zero) == 0)
+		min_quantum = ATTOTIME_IN_HZ(60);
+	if (machine->config->perfect_cpu_quantum != NULL)
+	{
+		const device_config *cpu = cputag_get_cpu(machine, machine->config->perfect_cpu_quantum);
+		attotime cpu_quantum;
+
+		if (cpu == NULL)
+			fatalerror("CPU '%s' specified for perfect interleave is not present!", machine->config->perfect_cpu_quantum);
+		cpu_quantum = attotime_make(0, get_minimum_quantum(cpu));
+		min_quantum = attotime_min(cpu_quantum, min_quantum); 
+	}
+	assert(min_quantum.seconds == 0);
+	timer_add_scheduling_quantum(machine, min_quantum.attoseconds, attotime_never);
 }
 
 
@@ -214,7 +251,7 @@ void cpuexec_timeslice(running_machine *machine)
 	/* apply pending suspension changes */
 	for (cpu = machine->cpu[0]; cpu != NULL; cpu = cpu->typenext)
 	{
-		cpu_class_data *classdata = cpu_get_class_data(cpu);
+		cpu_class_data *classdata = get_class_data(cpu);
 		classdata->suspend = classdata->nextsuspend;
 		classdata->nextsuspend &= ~SUSPEND_REASON_TIMESLICE;
 		classdata->eatcycles = classdata->nexteatcycles;
@@ -223,7 +260,7 @@ void cpuexec_timeslice(running_machine *machine)
 	/* loop over non-suspended CPUs */
 	for (cpu = machine->cpu[0]; cpu != NULL; cpu = cpu->typenext)
 	{
-		cpu_class_data *classdata = cpu_get_class_data(cpu);
+		cpu_class_data *classdata = get_class_data(cpu);
 		if (classdata->suspend == 0)
 		{
 			attotime delta = attotime_sub(target, classdata->localtime);
@@ -275,7 +312,7 @@ void cpuexec_timeslice(running_machine *machine)
 	/* update the local times of all CPUs */
 	for (cpu = machine->cpu[0]; cpu != NULL; cpu = cpu->typenext)
 	{
-		cpu_class_data *classdata = cpu_get_class_data(cpu);
+		cpu_class_data *classdata = get_class_data(cpu);
 
 		/* if we're suspended and counting, process */
 		if (classdata->suspend != 0 && classdata->eatcycles && attotime_compare(classdata->localtime, target) < 0)
@@ -382,7 +419,7 @@ static DEVICE_START( cpu )
 	/* get pointers to our data */
 	config = device->inline_config;
 	header = cpu_get_class_header(device);
-	classdata = cpu_get_class_data(device);
+	classdata = get_class_data(device);
 	
 	/* add ourself to the global array */
 	if (index < ARRAY_LENGTH(device->machine->cpu))
@@ -480,7 +517,7 @@ static DEVICE_START( cpu )
 
 static DEVICE_RESET( cpu )
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	const cpu_config *config = device->inline_config;
 	cpu_reset_func reset;
 	int line;
@@ -575,7 +612,7 @@ static DEVICE_SET_INFO( cpu )
 			/* if we have a state pointer, we can handle some stuff for free */
 			if (device->token != NULL)
 			{
-				const cpu_class_data *classdata = cpu_get_class_data(device);
+				const cpu_class_data *classdata = get_class_data(device);
 				if (classdata->state != NULL)
 				{
 					if (state >= CPUINFO_INT_REGISTER && state <= CPUINFO_INT_REGISTER_LAST)
@@ -638,7 +675,7 @@ DEVICE_GET_INFO( cpu )
 			/* if we have a state pointer, we can handle some stuff for free */
 			if (device->token != NULL)
 			{
-				const cpu_class_data *classdata = cpu_get_class_data(device);
+				const cpu_class_data *classdata = get_class_data(device);
 				if (classdata->state != NULL)
 				{
 					if (state >= CPUINFO_INT_REGISTER && state <= CPUINFO_INT_REGISTER_LAST)
@@ -690,7 +727,7 @@ DEVICE_GET_INFO( cpu )
 
 void cpu_suspend(const device_config *device, int reason, int eatcycles)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* set the suspend reason and eat cycles flag */
 	classdata->nextsuspend |= reason;
@@ -708,7 +745,7 @@ void cpu_suspend(const device_config *device, int reason, int eatcycles)
 
 void cpu_resume(const device_config *device, int reason)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* clear the suspend reason and eat cycles flag */
 	classdata->nextsuspend &= ~reason;
@@ -737,7 +774,7 @@ int cpu_is_executing(const device_config *device)
 
 int cpu_is_suspended(const device_config *device, int reason)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* return true if the given reason is indicated */
 	return ((classdata->nextsuspend & reason) != 0);
@@ -756,9 +793,14 @@ int cpu_is_suspended(const device_config *device, int reason)
 
 int cpu_get_clock(const device_config *device)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata;
 
+	/* if we haven't been started yet, compute it manually */
+	if (device->token == NULL)
+		return (UINT64)device->clock * cpu_get_clock_multiplier(device) / cpu_get_clock_divider(device);
+	
 	/* return the current clock value */
+	classdata = get_class_data(device);
 	return classdata->clock;
 }
 
@@ -770,7 +812,7 @@ int cpu_get_clock(const device_config *device)
 
 void cpu_set_clock(const device_config *device, int clock)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* set the clock and update the information */
 	classdata->clock = clock;
@@ -785,7 +827,7 @@ void cpu_set_clock(const device_config *device, int clock)
 
 double cpu_get_clockscale(const device_config *device)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* return the current clock scale factor */
 	return classdata->clockscale;
@@ -799,7 +841,7 @@ double cpu_get_clockscale(const device_config *device)
 
 void cpu_set_clockscale(const device_config *device, double clockscale)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* set the scale factor and update the information */
 	classdata->clockscale = clockscale;
@@ -814,7 +856,7 @@ void cpu_set_clockscale(const device_config *device, double clockscale)
 
 attotime cpu_clocks_to_attotime(const device_config *device, UINT64 clocks)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	if (clocks < classdata->cycles_per_second)
 		return attotime_make(0, clocks * classdata->attoseconds_per_cycle);
 	else
@@ -833,7 +875,7 @@ attotime cpu_clocks_to_attotime(const device_config *device, UINT64 clocks)
 
 UINT64 cpu_attotime_to_clocks(const device_config *device, attotime duration)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	return mulu_32x32(duration.seconds, classdata->cycles_per_second) + (UINT64)duration.attoseconds * (UINT64)classdata->attoseconds_per_cycle;
 }
 
@@ -850,7 +892,7 @@ UINT64 cpu_attotime_to_clocks(const device_config *device, attotime duration)
 
 attotime cpu_get_local_time(const device_config *device)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	attotime result;
 
 	/* if we're active, add in the time from the current slice */
@@ -887,7 +929,7 @@ attotime cpuexec_override_local_time(running_machine *machine, attotime default_
 
 UINT64 cpu_get_total_cycles(const device_config *device)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	if (device == device->machine->cpuexec_data->executingcpu)
 		return classdata->totalcycles + classdata->cycles_running - *classdata->icount;
@@ -903,7 +945,7 @@ UINT64 cpu_get_total_cycles(const device_config *device)
 
 void cpu_eat_cycles(const device_config *device, int cycles)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* ignore if not the executing CPU */
 	if (device != device->machine->cpuexec_data->executingcpu)
@@ -922,7 +964,7 @@ void cpu_eat_cycles(const device_config *device, int cycles)
 
 void cpu_adjust_icount(const device_config *device, int delta)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* ignore if not the executing CPU */
 	if (device != device->machine->cpuexec_data->executingcpu)
@@ -940,7 +982,7 @@ void cpu_adjust_icount(const device_config *device, int delta)
 
 void cpu_abort_timeslice(const device_config *device)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	int delta;
 
 	/* ignore if not the executing CPU */
@@ -1006,7 +1048,7 @@ void cpu_spinuntil_trigger(const device_config *device, int trigger)
 
 void cpu_spinuntil_int(const device_config *device)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* suspend until the given trigger fires */
 	suspend_until_trigger(device, classdata->inttrigger, TRUE);
@@ -1047,7 +1089,7 @@ void cpuexec_trigger(running_machine *machine, int trigger)
 	/* look for suspended CPUs waiting for this trigger and unsuspend them */
 	for (cpu = machine->cpu[0]; cpu != NULL; cpu = cpu->typenext)
 	{
-		cpu_class_data *classdata = cpu_get_class_data(cpu);
+		cpu_class_data *classdata = get_class_data(cpu);
 
 		/* if we're executing, for an immediate abort */
 		cpu_abort_timeslice(cpu);
@@ -1080,7 +1122,7 @@ void cpuexec_triggertime(running_machine *machine, int trigger, attotime duratio
 
 void cpu_triggerint(const device_config *device)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* signal this CPU's interrupt trigger */
 	cpuexec_trigger(device->machine, classdata->inttrigger);
@@ -1100,7 +1142,7 @@ void cpu_triggerint(const device_config *device)
 
 void cpu_set_input_line(const device_config *device, int line, int state)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	int vector = (line >= 0 && line < MAX_INPUT_LINES) ? classdata->input[line].vector : 0xff;
 	cpu_set_input_line_and_vector(device, line, state, vector);
 }
@@ -1114,7 +1156,7 @@ void cpu_set_input_line(const device_config *device, int line, int state)
 
 void cpu_set_input_line_vector(const device_config *device, int line, int vector)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	if (line >= 0 && line < MAX_INPUT_LINES)
 	{
 		classdata->input[line].vector = vector;
@@ -1132,7 +1174,7 @@ void cpu_set_input_line_vector(const device_config *device, int line, int vector
 
 void cpu_set_input_line_and_vector(const device_config *device, int line, int state, int vector)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	/* catch errors where people use PULSE_LINE for CPUs that don't support it */
 	if (state == PULSE_LINE && line != INPUT_LINE_NMI && line != INPUT_LINE_RESET)
@@ -1175,7 +1217,7 @@ void cpu_set_input_line_and_vector(const device_config *device, int line, int st
 
 void cpu_set_irq_callback(const device_config *device, cpu_irq_callback callback)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	classdata->driver_irq = callback;
 }
 
@@ -1192,7 +1234,7 @@ void cpu_set_irq_callback(const device_config *device, cpu_irq_callback callback
 
 int cpu_getiloops(const device_config *device)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	return classdata->iloops;
 }
 
@@ -1209,12 +1251,12 @@ int cpu_getiloops(const device_config *device)
 
 static void update_clock_information(const device_config *device)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	INT64 attos;
 
 	/* recompute cps and spc */
 	classdata->cycles_per_second = (double)classdata->clock * classdata->clockscale;
-	classdata->attoseconds_per_cycle = ATTOSECONDS_PER_SECOND / ((double)classdata->clock * classdata->clockscale);
+	classdata->attoseconds_per_cycle = HZ_TO_ATTOSECONDS((double)classdata->clock * classdata->clockscale);
 
 	/* update the CPU's divisor */
 	attos = classdata->attoseconds_per_cycle;
@@ -1238,29 +1280,26 @@ static void update_clock_information(const device_config *device)
 
 static void compute_perfect_interleave(running_machine *machine)
 {
-	if (machine->cpu[0] != NULL && machine->cpu[0]->token != NULL)
+	if (machine->cpu[0] != NULL)
 	{
-		cpu_class_data *classdata = cpu_get_class_data(machine->cpu[0]);
-		attoseconds_t smallest = classdata->attoseconds_per_cycle * cpu_get_min_cycles(machine->cpu[0]);
+		attoseconds_t smallest = get_minimum_quantum(machine->cpu[0]);
 		attoseconds_t perfect = ATTOSECONDS_PER_SECOND - 1;
 		const device_config *cpu;
 
 		/* start with a huge time factor and find the 2nd smallest cycle time */
 		for (cpu = machine->cpu[0]->typenext; cpu != NULL; cpu = cpu->typenext)
-			if (cpu->token != NULL)
-			{
-				cpu_class_data *classdata = cpu_get_class_data(cpu);
-				attoseconds_t curtime = classdata->attoseconds_per_cycle * cpu_get_min_cycles(cpu);
+		{
+			attoseconds_t curquantum = get_minimum_quantum(cpu);
 
-				/* find the 2nd smallest cycle interval */
-				if (curtime < smallest)
-				{
-					perfect = smallest;
-					smallest = curtime;
-				}
-				else if (curtime < perfect)
-					perfect = classdata->attoseconds_per_cycle;
+			/* find the 2nd smallest cycle interval */
+			if (curquantum < smallest)
+			{
+				perfect = smallest;
+				smallest = curquantum;
 			}
+			else if (curquantum < perfect)
+				perfect = curquantum;
+		}
 
 		/* adjust the final value */
 		timer_set_minimum_quantum(machine, perfect);
@@ -1286,7 +1325,7 @@ static void on_vblank(const device_config *device, void *param, int vblank_state
 		for (cpu = device->machine->cpu[0]; cpu != NULL; cpu = cpu->typenext)
 		{
 			const cpu_config *config = cpu->inline_config;
-			cpu_class_data *classdata = cpu_get_class_data(cpu);
+			cpu_class_data *classdata = get_class_data(cpu);
 			int cpu_interested;
 
 			/* start the interrupt counter */
@@ -1334,7 +1373,7 @@ static TIMER_CALLBACK( trigger_partial_frame_interrupt )
 {
 	const device_config *device = ptr;
 	const cpu_config *config = device->inline_config;
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 
 	if (classdata->iloops == 0)
 		classdata->iloops = config->vblank_interrupts_per_frame;
@@ -1386,7 +1425,7 @@ static TIMER_CALLBACK( triggertime_callback )
 static TIMER_CALLBACK( empty_event_queue )
 {
 	const device_config *device = ptr;
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	cpu_input_data *inputline = &classdata->input[param];
 	int curevent;
 
@@ -1475,7 +1514,7 @@ static TIMER_CALLBACK( empty_event_queue )
 
 static IRQ_CALLBACK( standard_irq_callback )
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	cpu_input_data *inputline = &classdata->input[irqline];
 	int vector = inputline->curvector;
 
@@ -1508,7 +1547,7 @@ static IRQ_CALLBACK( standard_irq_callback )
 
 static void register_save_states(const device_config *device)
 {
-	cpu_class_data *classdata = cpu_get_class_data(device);
+	cpu_class_data *classdata = get_class_data(device);
 	int line;
 
 	state_save_register_device_item(device, 0, classdata->suspend);
diff --git a/src/emu/debug/debugvw.c b/src/emu/debug/debugvw.c
index 9ad5020aa2d..171c03f8580 100644
--- a/src/emu/debug/debugvw.c
+++ b/src/emu/debug/debugvw.c
@@ -3022,6 +3022,7 @@ static int memory_view_read(debug_view_memory *memdata, UINT8 size, offs_t offs,
 		int ismapped;
 
 		ismapped = memdata->no_translation ? TRUE : memory_address_physical(space, TRANSLATE_READ_DEBUG, &dummyaddr);
+		*data = ~(UINT64)0;
 		if (ismapped)
 		{
 			switch (size)
diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c
index 9246cdad361..4e9e8b2b66d 100644
--- a/src/emu/mconfig.c
+++ b/src/emu/mconfig.c
@@ -272,9 +272,13 @@ static void machine_config_detokenize(machine_config *config, const machine_conf
 				TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, config->driver_data_size, 24);
 				break;
 
-			case MCONFIG_TOKEN_INTERLEAVE:
-				TOKEN_UNGET_UINT32(tokens);
-				TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, config->cpu_slices_per_frame, 24);
+			case MCONFIG_TOKEN_QUANTUM_TIME:
+				TOKEN_EXTRACT_UINT64(tokens, data64);
+				config->minimum_quantum = UINT64_ATTOTIME_TO_ATTOTIME(data64);
+				break;
+
+			case MCONFIG_TOKEN_QUANTUM_PERFECT_CPU:
+				config->perfect_cpu_quantum = TOKEN_GET_STRING(tokens);
 				break;
 
 			case MCONFIG_TOKEN_WATCHDOG_VBLANK:
diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h
index f35b23d74e2..70a2471f34a 100644
--- a/src/emu/mconfig.h
+++ b/src/emu/mconfig.h
@@ -46,7 +46,8 @@ enum
 	MCONFIG_TOKEN_DEVICE_CONFIG_DATAFP64,
 
 	MCONFIG_TOKEN_DRIVER_DATA,
-	MCONFIG_TOKEN_INTERLEAVE,
+	MCONFIG_TOKEN_QUANTUM_TIME,
+	MCONFIG_TOKEN_QUANTUM_PERFECT_CPU,
 	MCONFIG_TOKEN_WATCHDOG_VBLANK,
 	MCONFIG_TOKEN_WATCHDOG_TIME,
 
@@ -113,7 +114,8 @@ struct _machine_config
 {
 	UINT32					driver_data_size;		/* amount of memory needed for driver_data */
 
-	UINT32					cpu_slices_per_frame;	/* number of times to interleave execution per frame */
+	attotime				minimum_quantum;		/* minimum scheduling quantum */
+	const char *			perfect_cpu_quantum;	/* tag of CPU to use for "perfect" scheduling */
 	INT32					watchdog_vblank_count;	/* number of VBLANKs until the watchdog kills us */
 	attotime				watchdog_time;			/* length of time until the watchdog kills us */
 
@@ -271,15 +273,20 @@ union _machine_config_token
 #define MDRV_DRIVER_DATA(_struct) \
 	TOKEN_UINT32_PACK2(MCONFIG_TOKEN_DRIVER_DATA, 8, sizeof(_struct), 24),
 
-#define MDRV_INTERLEAVE(_interleave) \
-	TOKEN_UINT32_PACK2(MCONFIG_TOKEN_INTERLEAVE, 8, _interleave, 24),
+#define MDRV_QUANTUM_TIME(_time) \
+	TOKEN_UINT32_PACK1(MCONFIG_TOKEN_QUANTUM_TIME, 8), \
+	TOKEN_UINT64(UINT64_ATTOTIME_IN_##_time),
+
+#define MDRV_QUANTUM_PERFECT_CPU(_cputag) \
+	TOKEN_UINT32_PACK1(MCONFIG_TOKEN_QUANTUM_PERFECT_CPU, 8), \
+	TOKEN_STRING(_cputag),
 
 #define MDRV_WATCHDOG_VBLANK_INIT(_count) \
 	TOKEN_UINT32_PACK2(MCONFIG_TOKEN_WATCHDOG_VBLANK, 8, _count, 24),
 
 #define MDRV_WATCHDOG_TIME_INIT(_time) \
 	TOKEN_UINT32_PACK1(MCONFIG_TOKEN_WATCHDOG_TIME, 8), \
-	TOKEN_UINT64(_time),
+	TOKEN_UINT64(UINT64_ATTOTIME_IN_##_time),
 
 
 /* core functions */
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index d1ee7fe6e20..9ec267e6e52 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -300,7 +300,7 @@ MACHINE_DRIVER_START( carnival_audio )
 	MDRV_CPU_PROGRAM_MAP(carnival_audio_map,0)
 	MDRV_CPU_IO_MAP(carnival_audio_io_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_SOUND_ADD("psg", AY8910, PSG_CLOCK)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index b390abeadf0..195bd8ec805 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -1034,7 +1034,7 @@ static MACHINE_DRIVER_START( 40love )
 	MDRV_CPU_ADD("mcu",M68705,18432000/6) /* OK */
 	MDRV_CPU_PROGRAM_MAP(mcu_map,0)
 
-	MDRV_INTERLEAVE(100)	/* high interleave to ensure proper synchronization of CPUs */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* high interleave to ensure proper synchronization of CPUs */
 	MDRV_MACHINE_RESET(ta7630)	/* init machine */
 
 	/* video hardware */
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 0b8343e6419..2569e57ed4b 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -619,10 +619,10 @@ static MACHINE_DRIVER_START( airbustr )
 	MDRV_CPU_IO_MAP(sound_io_map, 0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)		// nmi are caused by sub cpu writing a sound command
 
-	MDRV_INTERLEAVE(100)	// Palette RAM is filled by sub cpu with data supplied by main cpu
+	MDRV_QUANTUM_TIME(HZ(6000))	// Palette RAM is filled by sub cpu with data supplied by main cpu
 							// Maybe a high value is safer in order to avoid glitches
 	MDRV_MACHINE_RESET(airbustr)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(3))	/* a guess, and certainly wrong */
+	MDRV_WATCHDOG_TIME_INIT(SEC(3))	/* a guess, and certainly wrong */
 
 	// video hardware
 
@@ -656,7 +656,7 @@ MACHINE_DRIVER_END
 
 static MACHINE_DRIVER_START( airbusb )
 	MDRV_IMPORT_FROM(airbustr)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(0)) // no protection device or watchdog
+	MDRV_WATCHDOG_TIME_INIT(SEC(0)) // no protection device or watchdog
 MACHINE_DRIVER_END
 
 
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 2adbd2c7d34..f765f3ffe09 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -239,7 +239,7 @@ static MACHINE_DRIVER_START( ajax )
 	MDRV_CPU_ADD("audio", Z80, 3579545)	/* 3.58 MHz */
 	MDRV_CPU_PROGRAM_MAP(ajax_sound_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(ajax)
 
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index 17308e2e08b..a27cae57078 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -1025,7 +1025,7 @@ static MACHINE_DRIVER_START( ampoker2 )
 	MDRV_CPU_PROGRAM_MAP(ampoker2_map, 0)
 	MDRV_CPU_IO_MAP(ampoker2_io_map, 0)
 	MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1536)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_MSEC(200))	/* 200 ms, measured */
+	MDRV_WATCHDOG_TIME_INIT(MSEC(200))	/* 200 ms, measured */
 
 	MDRV_NVRAM_HANDLER(generic_0fill)
 
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index 80266dfba1d..13d922bba55 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -608,7 +608,7 @@ static MACHINE_DRIVER_START( angelkds )
 	MDRV_CPU_PROGRAM_MAP(sub_map,0)
 	MDRV_CPU_IO_MAP(sub_portmap,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index 29b299e08a0..b24f4a1b335 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -525,7 +525,7 @@ static MACHINE_DRIVER_START( argus )
 	MDRV_CPU_IO_MAP(sound_portmap_2,0)
 #endif
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -579,7 +579,7 @@ static MACHINE_DRIVER_START( valtric )
 	MDRV_CPU_PROGRAM_MAP(sound_map_a,0)
 	MDRV_CPU_IO_MAP(sound_portmap_2,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -624,7 +624,7 @@ static MACHINE_DRIVER_START( butasan )
 	MDRV_CPU_PROGRAM_MAP(sound_map_b,0)
 	MDRV_CPU_IO_MAP(sound_portmap_2,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 7f835b03296..b47d3a52561 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -768,7 +768,7 @@ static MACHINE_DRIVER_START( arkanoid )
 	MDRV_CPU_ADD("mcu", M68705, XTAL_12MHz/4) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(mcu_map, 0)
 
-	MDRV_INTERLEAVE(100)					// 100 CPU slices per second to synchronize between the MCU and the main CPU
+	MDRV_QUANTUM_TIME(HZ(6000))					// 100 CPU slices per second to synchronize between the MCU and the main CPU
 
 	MDRV_MACHINE_START(arkanoid)
 	MDRV_MACHINE_RESET(arkanoid)
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 9e1b6ea044b..b5fc1f6ce5f 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -700,7 +700,7 @@ static MACHINE_DRIVER_START( artmagic )
 	MDRV_CPU_PROGRAM_MAP(tms_map,0)
 
 	MDRV_MACHINE_RESET(artmagic)
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 	MDRV_NVRAM_HANDLER(generic_1fill)
 
 	/* video hardware */
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index 42bc54f20a4..b2fa055269b 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -797,7 +797,7 @@ static MACHINE_DRIVER_START( bonzeadv )
 	MDRV_CPU_ADD("audio", Z80,4000000)    /* sound CPU, also required for test mode */
 	MDRV_CPU_PROGRAM_MAP(bonzeadv_z80_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -836,7 +836,7 @@ static MACHINE_DRIVER_START( asuka )
 	MDRV_CPU_ADD("audio", Z80, XTAL_16MHz/4)	/* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(z80_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -878,7 +878,7 @@ static MACHINE_DRIVER_START( cadash )
 	MDRV_CPU_ADD("audio", Z80, XTAL_8MHz/2)	/* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -916,7 +916,7 @@ static MACHINE_DRIVER_START( mofflott )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz ??? */
 	MDRV_CPU_PROGRAM_MAP(z80_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -958,7 +958,7 @@ static MACHINE_DRIVER_START( galmedes )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz ??? */
 	MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -996,7 +996,7 @@ static MACHINE_DRIVER_START( eto )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz ??? */
 	MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index d0002f82f81..bf3a778b2b1 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -1194,7 +1194,7 @@ static MACHINE_DRIVER_START( balsente )
 	MDRV_CPU_PROGRAM_MAP(cpu2_map,0)
 	MDRV_CPU_IO_MAP(cpu2_io_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(balsente)
 	MDRV_NVRAM_HANDLER(generic_0fill)
@@ -1247,7 +1247,7 @@ static MACHINE_DRIVER_START( shrike )
 	MDRV_CPU_ADD("68k", M68000, 8000000)
 	MDRV_CPU_PROGRAM_MAP(shrike68k_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 MACHINE_DRIVER_END
 
 
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index b77f025b6c1..2cd3850300c 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -402,7 +402,7 @@ static MACHINE_DRIVER_START( baraduke )
 	MDRV_CPU_IO_MAP(mcu_port_map,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100)		/* we need heavy synch */
+	MDRV_QUANTUM_TIME(HZ(6000))		/* we need heavy synch */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index d448757b155..9a91df0c9d8 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -262,7 +262,7 @@ static MACHINE_DRIVER_START( battlane )
 	MDRV_CPU_ADD("sub", M6809, 1250000)        /* 1.25 MHz ? */
 	MDRV_CPU_PROGRAM_MAP(battlane_map, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index 9bb693e0e0c..b1d24cc94b1 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -2220,7 +2220,7 @@ INPUT_PORTS_END
 
 static MACHINE_DRIVER_START( scorpion2_vid )
 	MDRV_MACHINE_RESET( init )							// main scorpion2 board initialisation
-	MDRV_INTERLEAVE(16)									// needed for serial communication !!
+	MDRV_QUANTUM_TIME(HZ(960))									// needed for serial communication !!
 	MDRV_CPU_ADD("main", M6809, MASTER_CLOCK/4 )	// 6809 CPU at 2 Mhz
 	MDRV_CPU_PROGRAM_MAP(memmap_vid,0)					// setup scorpion2 board memorymap
 	MDRV_CPU_PERIODIC_INT(timer_irq, 1000)				// generate 1000 IRQ's per second
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index eed935bfc44..b42ea77218b 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -446,7 +446,7 @@ static MACHINE_DRIVER_START( bigevglf )
 	MDRV_CPU_ADD("mcu", M68705,2000000)	/* ??? */
 	MDRV_CPU_PROGRAM_MAP(m68705_map,0)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - interleaving is forced on the fly */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - interleaving is forced on the fly */
 
 	MDRV_MACHINE_RESET(bigevglf)
 	/* video hardware */
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index d9526410d4c..7dc44ba5fe9 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -484,7 +484,7 @@ static MACHINE_DRIVER_START( bking3 )
 
 	MDRV_MACHINE_RESET(buggychl)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 MACHINE_DRIVER_END
 
 /***************************************************************************
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index 680c4b2a5ee..40d43459749 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -322,7 +322,7 @@ static MACHINE_DRIVER_START( bladestl )
 	MDRV_CPU_ADD("audio", M6809, 2000000)
 	MDRV_CPU_PROGRAM_MAP(sound_map, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index 87c7cb89c52..56dc854658e 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -1337,7 +1337,7 @@ static MACHINE_DRIVER_START( bnstars )
 //  MDRV_CPU_ADD("audio", Z80, 4000000)
 //  MDRV_CPU_PROGRAM_MAP(bnstars_z80_map, 0)
 
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 
 	MDRV_MACHINE_RESET(ms32)
 
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 4b8c531b3dc..5c76483f48a 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -701,7 +701,7 @@ static MACHINE_DRIVER_START( tokio )
 	MDRV_CPU_ADD("audio", Z80, MAIN_XTAL/8)	// 3 MHz
 	MDRV_CPU_PROGRAM_MAP(tokio_sound_map, 0) // NMIs are triggered by the main CPU, IRQs are triggered by the YM2203
 
-	MDRV_INTERLEAVE(100) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
+	MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
 
 	// video hardware
 
@@ -745,7 +745,7 @@ static MACHINE_DRIVER_START( bublbobl )
 	MDRV_CPU_PROGRAM_MAP(mcu_map, 0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) // comes from the same clock that latches the INT pin on the second Z80
 
-	MDRV_INTERLEAVE(100) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
+	MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
 
 	// video hardware
 
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index e8d550d5758..e27d010bfb5 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -399,7 +399,7 @@ static MACHINE_DRIVER_START( bwing )
 	MDRV_CPU_IO_MAP(bwp3_io_map,0)
 	MDRV_CPU_PERIODIC_INT(bwp3_interrupt, 1000)
 
-	MDRV_INTERLEAVE(300)		// high enough?
+	MDRV_QUANTUM_TIME(HZ(18000))		// high enough?
 
 	MDRV_MACHINE_RESET(bwing)
 
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 076cabf46c4..a34eadef02c 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -560,7 +560,7 @@ static MACHINE_DRIVER_START( cabalbl )
 	MDRV_CPU_IO_MAP(cabalbl_talk2_portmap,0)
 	MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(cabalbl)
 
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index a0c9135dd4d..dd39e444859 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -2326,7 +2326,7 @@ static MACHINE_DRIVER_START( mazinger )
 	MDRV_CPU_PROGRAM_MAP(mazinger_sound_readmem,mazinger_sound_writemem)
 	MDRV_CPU_IO_MAP(mazinger_sound_readport,mazinger_sound_writeport)
 
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(3))	/* a guess, and certainly wrong */
+	MDRV_WATCHDOG_TIME_INIT(SEC(3))	/* a guess, and certainly wrong */
 
 	MDRV_MACHINE_RESET(cave)
 	MDRV_NVRAM_HANDLER(cave)
@@ -2382,7 +2382,7 @@ static MACHINE_DRIVER_START( metmqstr )
 	MDRV_CPU_PROGRAM_MAP(metmqstr_sound_readmem,metmqstr_sound_writemem)
 	MDRV_CPU_IO_MAP(metmqstr_sound_readport,metmqstr_sound_writeport)
 
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(3))	/* a guess, and certainly wrong */
+	MDRV_WATCHDOG_TIME_INIT(SEC(3))	/* a guess, and certainly wrong */
 
 	MDRV_MACHINE_RESET(cave)	/* start with the watchdog armed */
 	MDRV_NVRAM_HANDLER(cave)
@@ -2498,7 +2498,7 @@ static MACHINE_DRIVER_START( sailormn )
 	MDRV_CPU_PROGRAM_MAP(sailormn_sound_readmem,sailormn_sound_writemem)
 	MDRV_CPU_IO_MAP(sailormn_sound_readport,sailormn_sound_writeport)
 
-//  MDRV_INTERLEAVE(10)
+//  MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(cave)
 	MDRV_NVRAM_HANDLER(cave)
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index abbfc5a732c..139b8efdff0 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -639,7 +639,7 @@ static MACHINE_DRIVER_START( champmcu )
 	MDRV_CPU_PROGRAM_MAP(mcu_map,0)
 
 	/* to MCU timeout champbbj */
-	MDRV_INTERLEAVE(50)
+	MDRV_QUANTUM_TIME(HZ(3000))
 MACHINE_DRIVER_END
 
 
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index 7c20d4731ae..782c31303af 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -506,7 +506,7 @@ static MACHINE_DRIVER_START( chinagat )
 	MDRV_CPU_ADD("audio", Z80, 3579545)	/* 3.579545 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_map,0)
 
-	MDRV_INTERLEAVE(100) /* heavy interleaving to sync up sprite<->main cpu's */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
 
 	MDRV_MACHINE_RESET(chinagat)
 
@@ -554,7 +554,7 @@ static MACHINE_DRIVER_START( saiyugb1 )
 	MDRV_CPU_PROGRAM_MAP(i8748_map,0)
 	MDRV_CPU_IO_MAP(i8748_portmap,0)
 
-	MDRV_INTERLEAVE(100)	/* heavy interleaving to sync up sprite<->main cpu's */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* heavy interleaving to sync up sprite<->main cpu's */
 
 	MDRV_MACHINE_RESET(chinagat)
 
@@ -598,7 +598,7 @@ static MACHINE_DRIVER_START( saiyugb2 )
 	MDRV_CPU_ADD("audio", Z80, 3579545)		/* 3.579545 MHz oscillator */
 	MDRV_CPU_PROGRAM_MAP(ym2203c_sound_map,0)
 
-	MDRV_INTERLEAVE(100) /* heavy interleaving to sync up sprite<->main cpu's */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
 
 	MDRV_MACHINE_RESET(chinagat)
 
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index b59a04142b6..c423fdfce1a 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -354,7 +354,7 @@ static MACHINE_DRIVER_START( chqflag )
 	MDRV_CPU_ADD("audio", Z80, XTAL_3_579545MHz) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(chqflag_readmem_sound,chqflag_writemem_sound)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index ea730d371f7..bef9a045e3f 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -1778,7 +1778,7 @@ static MACHINE_DRIVER_START( bigrun )
 	MDRV_CPU_PROGRAM_MAP(bigrun_sound_readmem,bigrun_sound_writemem)
 	MDRV_CPU_VBLANK_INT_HACK(irq4_line_hold,CISCHEAT_SOUND_INTERRUPT_NUM)
 
-	MDRV_INTERLEAVE(20)
+	MDRV_QUANTUM_TIME(HZ(1200))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK | VIDEO_HAS_SHADOWS)
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index 75c4e2b25da..64b2db1e330 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -338,7 +338,7 @@ static MACHINE_DRIVER_START( cloak )
 	MDRV_CPU_PROGRAM_MAP(slave_map,0)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
 
-	MDRV_INTERLEAVE(5)
+	MDRV_QUANTUM_TIME(HZ(300))
 
 	MDRV_NVRAM_HANDLER(generic_0fill)
 
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index 4d50056320e..afa26c354c6 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -583,7 +583,7 @@ static MACHINE_DRIVER_START( combasc )
 	MDRV_CPU_ADD("audio", Z80,3579545)	/* 3.579545 MHz */
 	MDRV_CPU_PROGRAM_MAP(combasc_readmem_sound,combasc_writemem_sound)
 
-	MDRV_INTERLEAVE(20)
+	MDRV_QUANTUM_TIME(HZ(1200))
 
 	MDRV_MACHINE_RESET(combasc)
 
@@ -624,7 +624,7 @@ static MACHINE_DRIVER_START( combascb )
 	MDRV_CPU_ADD("audio", Z80,3579545)	/* 3.579545 MHz */
 	MDRV_CPU_PROGRAM_MAP(combasc_readmem_sound,combasc_writemem_sound) /* FAKE */
 
-	MDRV_INTERLEAVE(20)
+	MDRV_QUANTUM_TIME(HZ(1200))
 
 	MDRV_MACHINE_RESET(combasc)
 
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index f28a9e02b08..fde77355ae3 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -256,7 +256,7 @@ static MACHINE_DRIVER_START( contra )
  	MDRV_CPU_ADD("audio", M6809, 2000000)
 	MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index 8a5e22f67a0..c56cb83d6e6 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -376,7 +376,7 @@ static MACHINE_DRIVER_START( crgolf )
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
 	MDRV_MACHINE_START(crgolf)
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_IMPORT_FROM(crgolf_video)
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index ee1b0dacd71..766b2a9d885 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -505,7 +505,7 @@ static MACHINE_DRIVER_START( cubeqst )
 	MDRV_CPU_PROGRAM_MAP(line_sound_map, 0)
 	MDRV_CPU_CONFIG(snd_config)
 
-	MDRV_INTERLEAVE(800)
+	MDRV_QUANTUM_TIME(HZ(48000))
 
 	MDRV_MACHINE_START(cubeqst)
 	MDRV_MACHINE_RESET(cubeqst)
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index dfc1fcc1f77..aef39444c3f 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -426,7 +426,7 @@ static MACHINE_DRIVER_START( cyberbal )
 	MDRV_CPU_PROGRAM_MAP(sound_68k_map,0)
 	MDRV_CPU_PERIODIC_INT(cyberbal_sound_68k_irq_gen, 10000)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(cyberbal)
 	MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index ae7546dc0e6..e7e8d6907cb 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -574,7 +574,7 @@ static MACHINE_DRIVER_START( cybertnk )
 	MDRV_CPU_ADD("audio", Z80,3579500)
 	MDRV_CPU_PROGRAM_MAP(sound_mem,0)
 
-	MDRV_INTERLEAVE(100)//arbitrary value,needed to get the communication to work
+	MDRV_QUANTUM_TIME(HZ(6000))//arbitrary value,needed to get the communication to work
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 0a8b6255070..db5185d65db 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -846,7 +846,7 @@ static MACHINE_DRIVER_START( darius )
 	MDRV_CPU_PROGRAM_MAP(darius_sound2_readmem,darius_sound2_writemem)
 	MDRV_CPU_IO_MAP(darius_sound2_io_map,0)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame ? */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame ? */
 
 	MDRV_MACHINE_START(darius)
 	MDRV_MACHINE_RESET(darius)
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 16031b9ddac..dd7ac5cd573 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -565,7 +565,7 @@ static MACHINE_DRIVER_START( dassault )
 	MDRV_CPU_ADD("audio", H6280,32220000/8)	/* Accurate */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(140) /* 140 CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(8400)) /* 140 CPU slices per frame */
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index ba3ca191b9d..d6342c8c506 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -409,7 +409,7 @@ static MACHINE_DRIVER_START( ddayjlc )
 	MDRV_CPU_PROGRAM_MAP(sound_cpu,0)
 	MDRV_CPU_VBLANK_INT("main", ddayjlc_snd_interrupt)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 55d20db7b2b..575d5b3038f 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -987,7 +987,7 @@ static MACHINE_DRIVER_START( ddragon )
  	MDRV_CPU_ADD("sound", M6809, MAIN_CLOCK/2)	/* 6MHz / 4 internally */
 	MDRV_CPU_PROGRAM_MAP(sound_map,0)
 
-	MDRV_INTERLEAVE(1000) /* heavy interleaving to sync up sprite<->main cpu's */
+	MDRV_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
 
 	MDRV_MACHINE_START(ddragon)
 	MDRV_MACHINE_RESET(ddragon)
@@ -1052,7 +1052,7 @@ static MACHINE_DRIVER_START( ddgn6809 )
  	MDRV_CPU_ADD("sound", M6809, MAIN_CLOCK/2)	/* 6MHz / 4 internally */
 	MDRV_CPU_PROGRAM_MAP(sound_map,0)
 
-	MDRV_INTERLEAVE(1000) /* heavy interleaving to sync up sprite<->main cpu's */
+	MDRV_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
 
 	MDRV_MACHINE_START(ddragon)
 	MDRV_MACHINE_RESET(ddragon)
@@ -1098,7 +1098,7 @@ static MACHINE_DRIVER_START( ddragon2 )
 	MDRV_CPU_ADD("sound", Z80, 3579545)
 	MDRV_CPU_PROGRAM_MAP(dd2_sound_map,0)
 
-	MDRV_INTERLEAVE(1000) /* heavy interleaving to sync up sprite<->main cpu's */
+	MDRV_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
 
 	MDRV_MACHINE_START(ddragon)
 	MDRV_MACHINE_RESET(ddragon)
diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c
index 7b94fb07c5c..4958ab47424 100644
--- a/src/mame/drivers/ddrible.c
+++ b/src/mame/drivers/ddrible.c
@@ -350,7 +350,7 @@ static MACHINE_DRIVER_START( ddribble )
 	MDRV_CPU_ADD("cpu2", M6809,	XTAL_18_432MHz/12)	/* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(readmem_cpu2,writemem_cpu2)
 
-	MDRV_INTERLEAVE(100)	/* we need heavy synch */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* we need heavy synch */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index 3393705172b..1bdc30f13dd 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -238,7 +238,7 @@ static MACHINE_DRIVER_START( deadang )
 
 	SEIBU3A_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4)
 
-	MDRV_INTERLEAVE(1) // the game stops working with higher interleave rates..
+	MDRV_QUANTUM_TIME(HZ(60)) // the game stops working with higher interleave rates..
 
 	MDRV_MACHINE_RESET(seibu_sound)
 
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 2f76f93691a..7e06a7c6776 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -984,7 +984,7 @@ static MACHINE_DRIVER_START( robocop )
 	MDRV_CPU_ADD("sub", H6280,21477200/16) /* 21.4772MHz clock */
 	MDRV_CPU_PROGRAM_MAP(robocop_sub_readmem,robocop_sub_writemem)
 
-	MDRV_INTERLEAVE(50)	/* Interleave between HuC6280 & 68000 */
+	MDRV_QUANTUM_TIME(HZ(3000))	/* Interleave between HuC6280 & 68000 */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -1073,7 +1073,7 @@ static MACHINE_DRIVER_START( hippodrm )
 	MDRV_CPU_ADD("sub", H6280,21477200/16) /* 21.4772MHz clock */
 	MDRV_CPU_PROGRAM_MAP(hippodrm_sub_readmem,hippodrm_sub_writemem)
 
-	MDRV_INTERLEAVE(5)	/* Interleave between H6280 & 68000 */
+	MDRV_QUANTUM_TIME(HZ(300))	/* Interleave between H6280 & 68000 */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 69c6f859ebb..4fe38ebc38e 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -2223,7 +2223,7 @@ static MACHINE_DRIVER_START( oscar )
 	MDRV_CPU_ADD("audio", M6502, XTAL_12MHz/8)
 	MDRV_CPU_PROGRAM_MAP(dec8_s_readmem,oscar_s_writemem)
 								/* NMIs are caused by the main CPU */
-	MDRV_INTERLEAVE(40) /* 40 CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(2400)) /* 40 CPU slices per frame */
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -2267,7 +2267,7 @@ static MACHINE_DRIVER_START( lastmiss )
 	MDRV_CPU_ADD("audio", M6502, 1500000)
 	MDRV_CPU_PROGRAM_MAP(ym3526_s_readmem,ym3526_s_writemem)
 								/* NMIs are caused by the main CPU */
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -2311,7 +2311,7 @@ static MACHINE_DRIVER_START( shackled )
 	MDRV_CPU_ADD("audio", M6502, 1500000)
 	MDRV_CPU_PROGRAM_MAP(ym3526_s_readmem,ym3526_s_writemem)
 								/* NMIs are caused by the main CPU */
-	MDRV_INTERLEAVE(80)
+	MDRV_QUANTUM_TIME(HZ(4800))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -2356,7 +2356,7 @@ static MACHINE_DRIVER_START( csilver )
 	MDRV_CPU_ADD("audio", M6502, XTAL_12MHz/8) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(csilver_s_readmem,csilver_s_writemem)
 								/* NMIs are caused by the main CPU */
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index d23b292a735..909e0613309 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -390,7 +390,7 @@ static MACHINE_DRIVER_START( decocass )
 	MDRV_CPU_ADD("mcu", I8041,500000*15) /* 500 kHz ( I doubt it is 400kHz Al! )*/
 	MDRV_CPU_IO_MAP(decocass_mcu_portmap,0)
 
-	MDRV_INTERLEAVE(70)				/* interleave CPUs */
+	MDRV_QUANTUM_TIME(HZ(4200))				/* interleave CPUs */
 
 	MDRV_MACHINE_RESET(decocass)
 
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index 049543b249f..1a89d57ac3c 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -841,7 +841,7 @@ static MACHINE_DRIVER_START( djboy )
 	MDRV_CPU_IO_MAP(cpu2_port_am,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_SCREEN_ADD("main", RASTER)
 	MDRV_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 5318809d8b3..39bfacb03e2 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -743,7 +743,7 @@ static MACHINE_DRIVER_START( dleuro )
 	MDRV_Z80CTC_ADD("ctc", MASTER_CLOCK_EURO/4 /* same as "main" */, ctc_intf)
 	MDRV_Z80SIO_ADD("sio", MASTER_CLOCK_EURO/4 /* same as "main" */, sio_intf)
 
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_HZ(MASTER_CLOCK_EURO/(16*16*16*16*16*8)))
+	MDRV_WATCHDOG_TIME_INIT(HZ(MASTER_CLOCK_EURO/(16*16*16*16*16*8)))
 
 	MDRV_MACHINE_START(dlair)
 	MDRV_MACHINE_RESET(dlair)
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 3c71f2491af..23ac78f4990 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -249,7 +249,7 @@ static MACHINE_DRIVER_START( dogfgt )
 	MDRV_CPU_ADD("sub", M6502, 1500000)	/* 1.5 MHz ???? */
 	MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index 6eda33f1b55..ed880c7f12a 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -225,7 +225,7 @@ static MACHINE_DRIVER_START( drmicro )
 	MDRV_CPU_IO_MAP(io_map,0)
 	MDRV_CPU_VBLANK_INT("main", drmicro_interrupt)
 
-	MDRV_INTERLEAVE(1)
+	MDRV_QUANTUM_TIME(HZ(60))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 93d206cffc2..6cda5148e3b 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -680,7 +680,7 @@ static MACHINE_DRIVER_START( dunhuang )
 	MDRV_CPU_IO_MAP(dunhuang_io_map,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(5))
+	MDRV_WATCHDOG_TIME_INIT(SEC(5))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index 7bfd5dd90c6..ee655fc1147 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -293,7 +293,7 @@ static MACHINE_DRIVER_START( dynduke )
 
 	SEIBU_SOUND_SYSTEM_CPU(14318180/4)
 
-	MDRV_INTERLEAVE(60)
+	MDRV_QUANTUM_TIME(HZ(3600))
 
 	MDRV_MACHINE_RESET(seibu_sound)
 
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index 07b8ce82dd9..1448c5bf0a2 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -417,7 +417,7 @@ static MACHINE_DRIVER_START( eprom )
 	MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
 	MDRV_CPU_PROGRAM_MAP(extra_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(eprom)
 	MDRV_NVRAM_HANDLER(atarigen)
@@ -448,7 +448,7 @@ static MACHINE_DRIVER_START( klaxp )
 	MDRV_CPU_PROGRAM_MAP(main_map,0)
 	MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(klaxp)
 	MDRV_NVRAM_HANDLER(atarigen)
@@ -478,7 +478,7 @@ static MACHINE_DRIVER_START( guts )
 	MDRV_CPU_PROGRAM_MAP(guts_map,0)
 	MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(eprom)
 	MDRV_NVRAM_HANDLER(atarigen)
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index fc2a7abb64b..cfc95503cef 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -844,7 +844,7 @@ static MACHINE_DRIVER_START( venture )
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_PROGRAM_MAP(exidy_map,venture_map)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(venture_audio)
@@ -865,7 +865,7 @@ static MACHINE_DRIVER_START( mtrap )
 	/* basic machine hardware */
 	MDRV_IMPORT_FROM(venture)
 
-	MDRV_INTERLEAVE(32)
+	MDRV_QUANTUM_TIME(HZ(1920))
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(mtrap_cvsd_audio)
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index bce99bc9165..b283ceaeb2d 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -501,7 +501,7 @@ static MACHINE_DRIVER_START( galsnew )
 	MDRV_PALETTE_INIT(berlwall)
 
 	/* arm watchdog */
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(3))	/* a guess, and certainly wrong */
+	MDRV_WATCHDOG_TIME_INIT(SEC(3))	/* a guess, and certainly wrong */
 
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
@@ -520,7 +520,7 @@ static MACHINE_DRIVER_START( fantasia )
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_PROGRAM_MAP(fantasia_map,0)
 
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(0))	/* a guess, and certainly wrong */
+	MDRV_WATCHDOG_TIME_INIT(SEC(0))	/* a guess, and certainly wrong */
 
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index 94cc66d43a5..208dba5d7da 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -489,7 +489,7 @@ static MACHINE_DRIVER_START( exterm )
 	MDRV_CPU_ADD("audioslave", M6502, 2000000)
 	MDRV_CPU_PROGRAM_MAP(sound_slave_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(exterm)
 	MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index 079297aaf86..a7f6da1c76f 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -341,7 +341,7 @@ static MACHINE_DRIVER_START( exzisus )
 	MDRV_CPU_PROGRAM_MAP(cpuc_readmem,cpuc_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 97992bb21a2..e5f128c2c4b 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -485,7 +485,7 @@ static MACHINE_DRIVER_START( f1gp )
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 	MDRV_CPU_IO_MAP(sound_io_map,0)
 
-	MDRV_INTERLEAVE(100) /* 100 CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -524,7 +524,7 @@ static MACHINE_DRIVER_START( f1gpb )
 	MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
 
 	/* NO sound CPU */
-	MDRV_INTERLEAVE(100) /* 100 CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index 479e4c4ebd1..e5d79cea484 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -830,7 +830,7 @@ static MACHINE_DRIVER_START( fantland )
 
 	MDRV_MACHINE_RESET(fantland)
 
-	MDRV_INTERLEAVE(8000/60)	// sound irq must feed the DAC at 8kHz
+	MDRV_QUANTUM_TIME(HZ(8000))	// sound irq must feed the DAC at 8kHz
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index ff697efe51f..abe2acfb82a 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -658,10 +658,10 @@ static MACHINE_DRIVER_START( firefox )
 	MDRV_CPU_ADD("audio", M6502, MASTER_XTAL/8)
 	MDRV_CPU_PROGRAM_MAP(audio_map, 0)
 
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 
 	MDRV_MACHINE_START(firefox)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_HZ((double)MASTER_XTAL/8/16/16/16/16))
+	MDRV_WATCHDOG_TIME_INIT(HZ((double)MASTER_XTAL/8/16/16/16/16))
 
 	/* video hardware */
 	MDRV_LASERDISC_SCREEN_ADD_NTSC("main", BITMAP_FORMAT_RGB32)
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 0ec67391896..dc7d67d7d09 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -290,7 +290,7 @@ static MACHINE_DRIVER_START( flkatck )
 	MDRV_CPU_ADD("audio", Z80,3579545)	/* NEC D780C-1, 3.579545 MHz */
 	MDRV_CPU_PROGRAM_MAP(flkatck_readmem_sound,flkatck_writemem_sound)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(flkatck)
 
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index d4af580ac9a..fc7df384a57 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -668,7 +668,7 @@ static MACHINE_DRIVER_START( flstory )
 	MDRV_CPU_ADD("mcu", M68705,XTAL_18_432MHz/6)	/* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(flstory_m68705_map,0)
 
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_RESET(ta7630)
 
@@ -725,7 +725,7 @@ static MACHINE_DRIVER_START( onna34ro )
 //  MDRV_CPU_ADD("mcu", M68705,4000000)  /* ??? */
 //  MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem)
 
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_RESET(ta7630)
 
@@ -782,7 +782,7 @@ static MACHINE_DRIVER_START( victnine )
 //  MDRV_CPU_ADD("mcu", M68705,4000000)  /* ??? */
 //  MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem)
 
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_RESET(ta7630)
 
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 584da4e748c..ce61fcd30b6 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -231,7 +231,7 @@ static MACHINE_DRIVER_START( bigkarnk )
 	MDRV_CPU_ADD("audio", M6809, 8867000/4)	/* 68B09, 2.21675 MHz? */
 	MDRV_CPU_PROGRAM_MAP(bigkarnk_readmem_snd,bigkarnk_writemem_snd)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -624,7 +624,7 @@ static MACHINE_DRIVER_START( squash )
 	MDRV_CPU_PROGRAM_MAP(squash_readmem,squash_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -775,7 +775,7 @@ static MACHINE_DRIVER_START( thoop )
 	MDRV_CPU_PROGRAM_MAP(squash_readmem,thoop_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index c070b87523d..60309dd689e 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -940,7 +940,7 @@ static MACHINE_DRIVER_START( gaelco3d )
 	MDRV_MACHINE_RESET(gaelco3d)
 	MDRV_NVRAM_HANDLER(93C66B)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index dec2140b931..03ed8305627 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -1649,7 +1649,7 @@ static MACHINE_DRIVER_START( bosco )
 	MDRV_CPU_IO_MAP(namco_54xx_map_io,0)
 
 	MDRV_WATCHDOG_VBLANK_INIT(8)
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_START(galaga)
 	MDRV_MACHINE_RESET(bosco)
@@ -1708,7 +1708,7 @@ static MACHINE_DRIVER_START( galaga )
 	MDRV_CPU_IO_MAP(namco_54xx_map_io,0)
 
 	MDRV_WATCHDOG_VBLANK_INIT(8)
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_START(galaga)
 	MDRV_MACHINE_RESET(galaga)
@@ -1782,7 +1782,7 @@ static MACHINE_DRIVER_START( xevious )
 	MDRV_CPU_IO_MAP(namco_54xx_map_io,0)
 
 	MDRV_WATCHDOG_VBLANK_INIT(8)
-	MDRV_INTERLEAVE(1000)	/* 1000 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(60000))	/* 1000 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_START(galaga)
 	MDRV_MACHINE_RESET(xevious)
@@ -1855,7 +1855,7 @@ static MACHINE_DRIVER_START( digdug )
 	MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK/6)	/* 3.072 MHz */
 	MDRV_CPU_PROGRAM_MAP(digdug_map,0)
 
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_START(galaga)
 	MDRV_MACHINE_RESET(digdug)
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index 6dbef3d4cad..9b58ff6519a 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -967,7 +967,7 @@ static MACHINE_DRIVER_START( galpania )
 	MDRV_IMPORT_FROM(galpanic)
 
 	/* arm watchdog */
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(3))	/* a guess, and certainly wrong */
+	MDRV_WATCHDOG_TIME_INIT(SEC(3))	/* a guess, and certainly wrong */
 MACHINE_DRIVER_END
 
 static MACHINE_DRIVER_START( comad )
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index 1853975fbc9..9cca4a4c3ef 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -553,7 +553,7 @@ static MACHINE_DRIVER_START( gaplus )
 	MDRV_CPU_PROGRAM_MAP(readmem_cpu3,writemem_cpu3)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
 
-	MDRV_INTERLEAVE(100)	/* a high value to ensure proper synchronization of the CPUs */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* a high value to ensure proper synchronization of the CPUs */
 	MDRV_MACHINE_RESET(gaplus)
 
 	/* video hardware */
diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c
index 77b21d69b7a..6880bd18fb7 100644
--- a/src/mame/drivers/genesis.c
+++ b/src/mame/drivers/genesis.c
@@ -653,7 +653,7 @@ static MACHINE_DRIVER_START( genesis_base )
 	MDRV_CPU_PROGRAM_MAP(genesis_z80_readmem, genesis_z80_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* from vdp at scanline 0xe0 */
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_START(genesis)
 	MDRV_MACHINE_RESET(genesis)
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index 59a49723ab7..4bdc62fd098 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -705,7 +705,7 @@ static MACHINE_DRIVER_START( ppking )
 	MDRV_CPU_ADD("audio", M6809, XTAL_12MHz/16) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(ppking_cpu3_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(ppking)
 	MDRV_NVRAM_HANDLER(generic_0fill)
@@ -754,7 +754,7 @@ static MACHINE_DRIVER_START( gladiatr )
 	MDRV_CPU_ADD("audio", M6809, XTAL_12MHz/16) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(gladiatr_cpu3_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(gladiator)
 	MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 8800cceecc9..9a1204f2be9 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -349,7 +349,7 @@ static MACHINE_DRIVER_START( gradius3 )
 	MDRV_CPU_ADD("audio", Z80, 3579545)
 	MDRV_CPU_PROGRAM_MAP(gradius3_s_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(gradius3)
 
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index 7e06f5d1b70..d894f645f97 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -692,7 +692,7 @@ static MACHINE_DRIVER_START( grchamp )
 
 	MDRV_MACHINE_RESET(grchamp)
 	MDRV_WATCHDOG_VBLANK_INIT(8)
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index 0c21996cb78..2f687357be6 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -707,13 +707,13 @@ static MACHINE_DRIVER_START( gsword )
 	MDRV_CPU_ADD("audio", Z80, XTAL_18MHz/6) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(cpu3_map,0)
 
-	MDRV_INTERLEAVE(200) /* Allow time for 2nd cpu to interleave*/
+	MDRV_QUANTUM_TIME(HZ(12000)) /* Allow time for 2nd cpu to interleave*/
 
 	MDRV_MACHINE_RESET(gsword)
 
 #if 1
 	/* to MCU timeout champbbj */
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 #endif
 
 	/* video hardware */
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index 4ecd39556c5..ec6a50120e5 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -924,7 +924,7 @@ static MACHINE_DRIVER_START( gticlub )
 	MDRV_CPU_CONFIG(sharc_cfg)
 	MDRV_CPU_DATA_MAP(sharc_map, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_NVRAM_HANDLER(gticlub)
 	MDRV_MACHINE_START(gticlub)
@@ -972,7 +972,7 @@ static MACHINE_DRIVER_START( hangplt )
 	MDRV_CPU_CONFIG(sharc_cfg)
 	MDRV_CPU_DATA_MAP(hangplt_sharc1_map, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_NVRAM_HANDLER(gticlub)
 	MDRV_MACHINE_START(gticlub)
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index 98d9afa0cd1..3808c50db80 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -521,7 +521,7 @@ static MACHINE_DRIVER_START( gyruss )
 	MDRV_CPU_PROGRAM_MAP(audio_cpu2_map,0)
 	MDRV_CPU_IO_MAP(audio_cpu2_io_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 25a2155259f..a56b1e9f814 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -1015,7 +1015,7 @@ static MACHINE_DRIVER_START( driver_nomsp )
 	MDRV_CPU_PROGRAM_MAP(driver_gsp_map,0)
 	MDRV_CPU_CONFIG(gsp_config_driver)
 
-	MDRV_INTERLEAVE(500)
+	MDRV_QUANTUM_TIME(HZ(30000))
 
 	MDRV_MACHINE_START(harddriv)
 	MDRV_MACHINE_RESET(harddriv)
@@ -1112,7 +1112,7 @@ static MACHINE_DRIVER_START( ds3 )
 	MDRV_CPU_PROGRAM_MAP(ds3_program_map,0)
 	MDRV_CPU_DATA_MAP(ds3_data_map,0)
 
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 MACHINE_DRIVER_END
 
 
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index 7403d63685e..a96ed8a1344 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -1287,7 +1287,7 @@ static MACHINE_DRIVER_START( reikaids )
 	MDRV_CPU_IO_MAP(reikaids_upd7807_io_map,0)
 	MDRV_CPU_VBLANK_INT("main", upd7807_irq)
 
-	MDRV_INTERLEAVE(500)	// very high interleave required to sync for startup tests
+	MDRV_QUANTUM_TIME(HZ(30000))	// very high interleave required to sync for startup tests
 
 	MDRV_MACHINE_RESET(reikaids_upd7807)
 
@@ -1337,7 +1337,7 @@ static MACHINE_DRIVER_START( pteacher )
 	MDRV_CPU_IO_MAP(pteacher_upd7807_io_map,0)
 	MDRV_CPU_VBLANK_INT("main", upd7807_irq)
 
-	MDRV_INTERLEAVE(100)	// should be enough
+	MDRV_QUANTUM_TIME(HZ(6000))	// should be enough
 
 	MDRV_MACHINE_RESET(pteacher_upd7807)
 
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index b8de2e1d399..ee2cbeed416 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -1056,7 +1056,7 @@ static MACHINE_DRIVER_START( hornet )
 	MDRV_CPU_CONFIG(sharc_cfg)
 	MDRV_CPU_DATA_MAP(sharc0_map, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_START( hornet )
 	MDRV_MACHINE_RESET( hornet )
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index e64abd59fe1..4c191033ac6 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -141,7 +141,7 @@ static MACHINE_DRIVER_START( genesis_base )
 	MDRV_CPU_PROGRAM_MAP(genesis_z80_readmem, genesis_z80_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* from vdp at scanline 0xe0 */
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_START(genesis)
 	MDRV_MACHINE_RESET(genesis)
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index 59526846f8a..d731093d782 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -202,7 +202,7 @@ static MACHINE_DRIVER_START( ikki )
 	MDRV_CPU_PROGRAM_MAP(ikki_cpu2,0)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index 5f2da1a7d81..eea48ec2abd 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -415,7 +415,7 @@ static MACHINE_DRIVER_START( imolagp )
 	MDRV_CPU_IO_MAP(readport_slave,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
 
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 28ec4a383f9..a2346e4bd37 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -1747,7 +1747,7 @@ static MACHINE_DRIVER_START( drivedge )
 //  MDRV_CPU_ADD("comm", M6803, 8000000/4) -- network CPU
 
 	MDRV_MACHINE_RESET(drivedge)
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 MACHINE_DRIVER_END
 
 
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index f435d889177..3fe66bf5c06 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -307,7 +307,7 @@ static MACHINE_DRIVER_START( jackal )
 	MDRV_CPU_ADD("slave", M6809, MASTER_CLOCK/12) // verified on pcb
 	MDRV_CPU_PROGRAM_MAP(slave_map, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(jackal)
 
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index b2b875796fb..a3f9a979f1f 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -349,7 +349,7 @@ static MACHINE_DRIVER_START( jedi )
 	MDRV_CPU_ADD("main", M6502, JEDI_MAIN_CPU_CLOCK)
 	MDRV_CPU_PROGRAM_MAP(main_map,0)
 
-	MDRV_INTERLEAVE(4)
+	MDRV_QUANTUM_TIME(HZ(240))
 
 	MDRV_MACHINE_START(jedi)
 	MDRV_MACHINE_RESET(jedi)
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index e6aede55e09..1f3983f56a6 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -851,7 +851,7 @@ static MACHINE_DRIVER_START( jpmimpct )
 	MDRV_CPU_CONFIG(tms_config)
 	MDRV_CPU_PROGRAM_MAP(tms_program_map, 0)
 
-	MDRV_INTERLEAVE(500)
+	MDRV_QUANTUM_TIME(HZ(30000))
 	MDRV_MACHINE_RESET(jpmimpct)
 	MDRV_NVRAM_HANDLER(generic_0fill)
 
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index 28d229eb9e6..7714adc20b4 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -560,7 +560,7 @@ static MACHINE_DRIVER_START( kingofb )
 	MDRV_CPU_IO_MAP(sound_io_map,0)
 	MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 6000)	/* Hz */
 
-	MDRV_INTERLEAVE(100) /* We really need heavy synching among the processors */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* We really need heavy synching among the processors */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -610,7 +610,7 @@ static MACHINE_DRIVER_START( ringking )
 	MDRV_CPU_IO_MAP(rk_sound_io_map,0)
 	MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 6000)	/* Hz */
 
-	MDRV_INTERLEAVE(100) /* We really need heavy synching among the processors */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* We really need heavy synching among the processors */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index d20162f4f3a..f1df9a792d9 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -1310,7 +1310,7 @@ static MACHINE_DRIVER_START( konamigx )
 	MDRV_CPU_PROGRAM_MAP(gxsndmap, 0)
 	MDRV_CPU_PERIODIC_INT(irq2_line_hold, 480)
 
-	MDRV_INTERLEAVE(32)
+	MDRV_QUANTUM_TIME(HZ(1920))
 
 	MDRV_MACHINE_START(konamigx)
 	MDRV_MACHINE_RESET(konamigx)
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index 446875ced3d..f32a831be37 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -250,7 +250,7 @@ static MACHINE_DRIVER_START( ksayakyu )
 	MDRV_CPU_PROGRAM_MAP(soundcpu_map,0)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
 
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index eb940ca142d..604e3d1f6fd 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -473,7 +473,7 @@ static MACHINE_DRIVER_START( gyrodine )
 	MDRV_CPU_IO_MAP(gyrodine_sub_portmap,0)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(kyugo)
 
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index ac0cc573919..0931112dd84 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -290,7 +290,7 @@ static MACHINE_DRIVER_START( ladyfrog )
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
 
 	/* video hardware */
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index c277346a098..9e87eb47d9b 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -473,7 +473,7 @@ static MACHINE_DRIVER_START( base )
 	MDRV_CPU_ADD("audio", M6502, 600000)
 	MDRV_CPU_PROGRAM_MAP(lasso_audio_map, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index d6dfcd9d0bd..68d1091c842 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -525,7 +525,7 @@ static MACHINE_DRIVER_START( liberate )
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 	MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16)
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -596,7 +596,7 @@ static MACHINE_DRIVER_START( prosport )
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 	MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16)
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index d17f7a7c254..0941d28ec30 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -473,8 +473,8 @@ static MACHINE_DRIVER_START( lockon )
 	MDRV_CPU_PROGRAM_MAP(sound_prg, 0)
 	MDRV_CPU_IO_MAP(sound_io, 0)
 
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_NSEC(PERIOD_OF_555_ASTABLE_NSEC(10000, 4700, 10000e-12) * 4096))
-	MDRV_INTERLEAVE(10)
+	MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_ASTABLE_NSEC(10000, 4700, 10000e-12) * 4096))
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
 
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index f883fdd76f5..5f0e06de0f8 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -570,7 +570,7 @@ static MACHINE_DRIVER_START( lsasquad )
 	MDRV_CPU_ADD("mcu", M68705,4000000)	/* ? */
 	MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem)
 
-	MDRV_INTERLEAVE(500)	/* 500 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(30000))	/* 500 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 							/* main<->sound synchronization depends on this */
 
@@ -613,7 +613,7 @@ static MACHINE_DRIVER_START( daikaiju )
 	MDRV_CPU_PROGRAM_MAP(sound_mem_daikaiju, 0)
 	/* IRQs are triggered by the YM2203 */
 
-	MDRV_INTERLEAVE(500)	/* 500 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(30000))	/* 500 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 							/* main<->sound synchronization depends on this */
 
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 7384c9ace04..18692161d0f 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -378,7 +378,7 @@ static MACHINE_DRIVER_START( magmax )
 	MDRV_CPU_PROGRAM_MAP(magmax_soundreadmem,magmax_soundwritemem)
 	MDRV_CPU_IO_MAP(magmax_sound_io_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_START(magmax)
 	MDRV_MACHINE_RESET(magmax)
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index b1d1bea59f9..b193149b158 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -1584,7 +1584,7 @@ static MACHINE_DRIVER_START( superpac )
 	MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
 
 	MDRV_WATCHDOG_VBLANK_INIT(8)
-	MDRV_INTERLEAVE(100)    /* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))    /* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_RESET(superpac)
 
@@ -1635,7 +1635,7 @@ static MACHINE_DRIVER_START( phozon )
 	MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
 
 	MDRV_WATCHDOG_VBLANK_INIT(8)
-	MDRV_INTERLEAVE(100)    /* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))    /* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_RESET(phozon)
 
@@ -1672,7 +1672,7 @@ static MACHINE_DRIVER_START( mappy )
 	MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
 
 	MDRV_WATCHDOG_VBLANK_INIT(8)
-	MDRV_INTERLEAVE(100)    /* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))    /* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_RESET(mappy)
 
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index 936c2b5c489..653a5942eea 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -207,7 +207,7 @@ static MACHINE_DRIVER_START( markham )
 	MDRV_CPU_PROGRAM_MAP(readmem2,writemem2)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index a7154ffb715..2dfc3213c0e 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -329,7 +329,7 @@ static MACHINE_DRIVER_START( matmania )
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 	MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,15)	/* ???? */
 								/* IRQs are caused by the main CPU */
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -386,7 +386,7 @@ static MACHINE_DRIVER_START( maniach )
 	MDRV_CPU_ADD("mcu", M68705, 1500000*2)	/* (don't know really how fast, but it doesn't need to even be this fast) */
 	MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem)
 
-	MDRV_INTERLEAVE(100)	/* 100 CPU slice per frame - high interleaving to sync main and mcu */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slice per frame - high interleaving to sync main and mcu */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 04f8dcf6267..cb941559c42 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -492,7 +492,7 @@ static MACHINE_DRIVER_START( mcatadv )
 	MDRV_GFXDECODE(mcatadv)
 	MDRV_PALETTE_LENGTH(0x2000/2)
 
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(3))	/* a guess, and certainly wrong */
+	MDRV_WATCHDOG_TIME_INIT(SEC(3))	/* a guess, and certainly wrong */
 
 	MDRV_VIDEO_START(mcatadv)
 	MDRV_VIDEO_EOF(mcatadv) // Buffer Spriteram
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index 3a1b1f2d143..50333d5b59b 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -597,7 +597,7 @@ static MACHINE_DRIVER_START( meadows )
 	MDRV_CPU_PROGRAM_MAP(audio_map,0)
 	MDRV_CPU_PERIODIC_INT(audio_interrupt, (double)5000000/131072)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 0a1cb49c220..bfdfd679ce4 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -6375,7 +6375,7 @@ MACHINE_DRIVER_START( genesis_32x )
 	//
 	// boosting the interleave here actually makes Kolibri run incorrectly however, that
 	// one works best just boosting the interleave on communications?!
-	MDRV_INTERLEAVE(30000)
+	MDRV_QUANTUM_TIME(HZ(1800000))
 MACHINE_DRIVER_END
 
 
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 1da7a67b495..cfeeea2a04d 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -795,7 +795,7 @@ static MACHINE_DRIVER_START( mpnew )
 	MDRV_CPU_IO_MAP(megaplay_bios_io_map,0)
 	MDRV_CPU_VBLANK_INT_HACK(megaplay_bios_irq, 262)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) /* 3.58 MHz */
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index c6aebd9eb79..b64cd66e979 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -606,7 +606,7 @@ static MACHINE_DRIVER_START( system_A )
 	MDRV_CPU_ADD("sound", M68000, SOUND_CPU_CLOCK) /* 7MHz verified */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem_A,sound_writemem_A)
 
-	MDRV_INTERLEAVE(2000)
+	MDRV_QUANTUM_TIME(HZ(120000))
 
 	MDRV_MACHINE_RESET(megasys1)
 
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index d77fea804ec..5abaf679a65 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -320,7 +320,7 @@ static MACHINE_DRIVER_START( megazone )
 	MDRV_CPU_PROGRAM_MAP(i8039_readmem,i8039_writemem)
 	MDRV_CPU_IO_MAP(i8039_io_map,0)
 
-	MDRV_INTERLEAVE(15)
+	MDRV_QUANTUM_TIME(HZ(900))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index f06cacb2db4..ad92f868dc5 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -945,7 +945,7 @@ static MACHINE_DRIVER_START(meritm_crt260)
 
 	MDRV_PPI8255_RECONFIG( "ppi8255", crt260_ppi8255_intf )
 
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_MSEC(1200))	// DS1232, TD connected to VCC
+	MDRV_WATCHDOG_TIME_INIT(MSEC(1200))	// DS1232, TD connected to VCC
 	MDRV_MACHINE_START(meritm_crt260)
 
 	MDRV_NVRAM_HANDLER(meritm_crt260)
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index cdb33ddf236..25e50af1bcd 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -385,7 +385,7 @@ static MACHINE_DRIVER_START( mexico86 )
 	MDRV_CPU_PROGRAM_MAP(sub_cpu_map,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100)    /* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))    /* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 
 	/* video hardware */
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 752d8b921c5..e9bea349906 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -874,7 +874,7 @@ static MACHINE_DRIVER_START( micro3d )
 	MDRV_CPU_IO_MAP(soundmem_io,0)
 
 	MDRV_MACHINE_RESET(micro3d)
-	MDRV_INTERLEAVE(50)
+	MDRV_QUANTUM_TIME(HZ(3000))
 
 	MDRV_PALETTE_LENGTH(32768)
 
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 60f998e7e76..355e708c4be 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -369,7 +369,7 @@ static MACHINE_DRIVER_START( missb2 )
 //  MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 	MDRV_CPU_VBLANK_INT("main", missb2_interrupt)
 
-	MDRV_INTERLEAVE(100) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
+	MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
 
 	// video hardware
 
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index d20ba426323..7e5dbf4e7b4 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -1890,7 +1890,7 @@ static MACHINE_DRIVER_START( model2b )
 	//MDRV_CPU_CONFIG(sharc_cfg)
 	//MDRV_CPU_DATA_MAP(geo_sharc_map, 0)
 
-	MDRV_INTERLEAVE(300)
+	MDRV_QUANTUM_TIME(HZ(18000))
 
 	MDRV_MACHINE_RESET(model2b)
 	MDRV_NVRAM_HANDLER( model2 )
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 5952eb1ce4d..946338bba6a 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -4343,7 +4343,7 @@ static MACHINE_DRIVER_START( model3_10 )
 	MDRV_CPU_ADD("audio", M68000, 12000000)
 	MDRV_CPU_PROGRAM_MAP(model3_snd, 0)
 
- 	MDRV_INTERLEAVE(10)
+ 	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_START(model3_10)
 	MDRV_MACHINE_RESET(model3_10)
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index f48e2274387..03ddee96b35 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -1669,7 +1669,7 @@ static MACHINE_DRIVER_START( mpu4_vid )
 	MDRV_CPU_PROGRAM_MAP(mpu4_68k_map,0)
 	MDRV_CPU_VBLANK_INT("main", mpu4_vid_irq)
 
-	MDRV_INTERLEAVE(16)
+	MDRV_QUANTUM_TIME(HZ(960))
 
 	MDRV_MACHINE_START(mpu4_vid)
 	MDRV_MACHINE_RESET(mpu4_vid)
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index a25cac81727..6c379a0f291 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -278,7 +278,7 @@ static MACHINE_DRIVER_START( mrflea )
 	MDRV_CPU_IO_MAP(inout_io_map,0)
 	MDRV_CPU_VBLANK_INT_HACK(mrflea_io_interrupt,2)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index d3319222018..c98b1f61dbb 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -1216,7 +1216,7 @@ static MACHINE_DRIVER_START( ms32 )
 	MDRV_CPU_ADD("audio", Z80, 4000000)
 	MDRV_CPU_PROGRAM_MAP(ms32_snd_readmem, ms32_snd_writemem)
 
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 
 	MDRV_MACHINE_RESET(ms32)
 
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index 5433affe2f6..27c8b5d4a98 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -835,7 +835,7 @@ static MACHINE_DRIVER_START( zzzap )
 	MDRV_IMPORT_FROM(mw8080bw_root)
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(zzzap_io_map,0)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_M(1), CAP_U(1)))) /* 1.1s */
+	MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_M(1), CAP_U(1)))) /* 1.1s */
 
 	/* audio hardware */
 	/* MDRV_IMPORT_FROM(zzzap_audio) */
@@ -947,7 +947,7 @@ static MACHINE_DRIVER_START( maze )
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(maze_io_map,0)
 	MDRV_MACHINE_START(maze)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
+	MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(maze_audio)
@@ -1038,7 +1038,7 @@ static MACHINE_DRIVER_START( boothill )
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(boothill_io_map,0)
 	MDRV_MACHINE_START(boothill)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
+	MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(boothill_audio)
@@ -1140,7 +1140,7 @@ static MACHINE_DRIVER_START( checkmat )
 	MDRV_IMPORT_FROM(mw8080bw_root)
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(checkmat_io_map,0)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
+	MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(checkmat_audio)
@@ -1276,7 +1276,7 @@ static MACHINE_DRIVER_START( desertgu )
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(desertgu_io_map,0)
 	MDRV_MACHINE_START(desertgu)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(desertgu_audio)
@@ -1473,7 +1473,7 @@ static MACHINE_DRIVER_START( dplay )
 	MDRV_IMPORT_FROM(mw8080bw_root)
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(dplay_io_map,0)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(dplay_audio)
@@ -1655,7 +1655,7 @@ static MACHINE_DRIVER_START( m4 )
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(m4_io_map,0)
 	MDRV_MACHINE_START(m4)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(m4_audio)
@@ -1829,7 +1829,7 @@ static MACHINE_DRIVER_START( clowns )
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(clowns_io_map,0)
 	MDRV_MACHINE_START(clowns)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(clowns_audio)
@@ -1907,7 +1907,7 @@ static MACHINE_DRIVER_START( shuffle )
 	MDRV_IMPORT_FROM(mw8080bw_root)
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(shuffle_io_map,0)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* audio hardware */
 	/* MDRV_IMPORT_FROM(shuffle_audio) */
@@ -1992,7 +1992,7 @@ static MACHINE_DRIVER_START( dogpatch )
 	MDRV_CPU_IO_MAP(dogpatch_io_map,0)
 	/* the watch dog time is unknown, but all other */
 	/* Midway boards of the era used the same circuit */
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(dogpatch_audio)
@@ -2158,7 +2158,7 @@ static MACHINE_DRIVER_START( spcenctr )
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(spcenctr_io_map,0)
 	MDRV_MACHINE_START(spcenctr)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* timers */
 	MDRV_TIMER_ADD_PERIODIC("strobeon", spcenctr_strobe_timer_callback, HZ(SPCENCTR_STROBE_FREQ))
@@ -2266,7 +2266,7 @@ static MACHINE_DRIVER_START( phantom2 )
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(phantom2_io_map,0)
 	MDRV_MACHINE_START(phantom2)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* video hardware */
 	MDRV_VIDEO_UPDATE(phantom2)
@@ -2402,7 +2402,7 @@ static MACHINE_DRIVER_START( bowler )
 	MDRV_IMPORT_FROM(mw8080bw_root)
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(bowler_io_map,0)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(bowler_audio)
@@ -2628,7 +2628,7 @@ MACHINE_DRIVER_START( invaders )
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(invaders_io_map,0)
 	MDRV_MACHINE_START(invaders)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* video hardware */
 	MDRV_VIDEO_UPDATE(invaders)
@@ -2707,7 +2707,7 @@ static MACHINE_DRIVER_START( blueshrk )
 	MDRV_IMPORT_FROM(mw8080bw_root)
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(blueshrk_io_map,0)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(blueshrk_audio)
@@ -2805,7 +2805,7 @@ static MACHINE_DRIVER_START( invad2ct )
 	MDRV_IMPORT_FROM(mw8080bw_root)
 	MDRV_CPU_MODIFY("main")
 	MDRV_CPU_IO_MAP(invad2ct_io_map,0)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+	MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
 
 	/* audio hardware */
 	MDRV_IMPORT_FROM(invad2ct_audio)
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 842c1b1da7a..6e4c694983b 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -942,7 +942,7 @@ static MACHINE_DRIVER_START( mystwarr )
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 	MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 480)
 
-	MDRV_INTERLEAVE(32)
+	MDRV_QUANTUM_TIME(HZ(1920))
 
 	MDRV_NVRAM_HANDLER(mystwarr)
 	MDRV_MACHINE_START(mystwarr)
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 678dc56acee..620da8831c7 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -1020,7 +1020,7 @@ static MACHINE_DRIVER_START( namcona1 )
 	MDRV_NVRAM_HANDLER(namcosna1)
 	MDRV_MACHINE_START(namcona1)
 	MDRV_MACHINE_RESET(namcona1_mcu)
-	MDRV_INTERLEAVE(40)
+	MDRV_QUANTUM_TIME(HZ(2400))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index 0741ff5f084..8cc601836ac 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -294,7 +294,7 @@ static MACHINE_DRIVER_START( namcond1 )
 	MDRV_CPU_IO_MAP( nd1h8iomap, 0 )
 	MDRV_CPU_VBLANK_INT("main", mcu_interrupt)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_START(namcond1)
 	MDRV_MACHINE_RESET(namcond1)
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index 3719b577bd7..2b114cb0da9 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -990,7 +990,7 @@ static MACHINE_DRIVER_START( ns1 )
 	MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
 
 	// heavy sync required to prevent CPUs from fighting for video RAM access and going into deadlocks
-	MDRV_INTERLEAVE(640)
+	MDRV_QUANTUM_TIME(HZ(38400))
 
 	MDRV_MACHINE_RESET(namcos1)
 	MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index 261c0fc0bd4..f43cd558d5d 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -1604,7 +1604,7 @@ static MACHINE_DRIVER_START( default )
 	MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100) /* CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
 
 	MDRV_MACHINE_START(namcos2)
 	MDRV_MACHINE_RESET(namcos2)
@@ -1678,7 +1678,7 @@ static MACHINE_DRIVER_START( gollygho )
 	MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100) /* CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
 
 	MDRV_MACHINE_START(namcos2)
 	MDRV_MACHINE_RESET(namcos2)
@@ -1728,7 +1728,7 @@ static MACHINE_DRIVER_START( finallap )
 	MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100) /* CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
 
 	MDRV_MACHINE_START(namcos2)
 	MDRV_MACHINE_RESET(namcos2)
@@ -1778,7 +1778,7 @@ static MACHINE_DRIVER_START( sgunner )
 	MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100) /* CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
 
 	MDRV_MACHINE_START(namcos2)
 	MDRV_MACHINE_RESET(namcos2)
@@ -1828,7 +1828,7 @@ static MACHINE_DRIVER_START( luckywld )
 	MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100) /* CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
 
 	MDRV_MACHINE_START(namcos2)
 	MDRV_MACHINE_RESET(namcos2)
@@ -1878,7 +1878,7 @@ static MACHINE_DRIVER_START( metlhawk )
 	MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100) /* CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
 
 	MDRV_MACHINE_START(namcos2)
 	MDRV_MACHINE_RESET(namcos2)
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index 8745bbe2415..ae0a5dbcf3b 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -1561,7 +1561,7 @@ static MACHINE_DRIVER_START( s21base )
 	MDRV_CPU_DATA_MAP(slave_dsp_data,0)
 	MDRV_CPU_IO_MAP(slave_dsp_io,0)
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	MDRV_MACHINE_START(namcos2)
 	MDRV_MACHINE_RESET(namcos2)
@@ -1635,7 +1635,7 @@ static MACHINE_DRIVER_START( driveyes )
 	MDRV_CPU_DATA_MAP(winrun_dsp_data,0)
 	MDRV_CPU_IO_MAP(winrun_dsp_io,0)
 
-	MDRV_INTERLEAVE(100) /* 100 CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
 
 	MDRV_MACHINE_START(namcos2)
 	MDRV_MACHINE_RESET(namcos2)
@@ -1694,7 +1694,7 @@ static MACHINE_DRIVER_START( winrun_c140_typeB )
 	MDRV_CPU_PROGRAM_MAP(am_gpu_winrun,0)
 	MDRV_CPU_VBLANK_INT("main", namcos2_68k_gpu_vblank)
 
-	MDRV_INTERLEAVE(100) /* 100 CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
 
 	MDRV_MACHINE_START(namcos2)
 	MDRV_MACHINE_RESET(namcos2)
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index a94e1e57c93..5d9f39b5955 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -2791,7 +2791,7 @@ static MACHINE_DRIVER_START( namcos22s )
 	MDRV_CPU_IO_MAP( mcu_io, 0 )
 	MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_NVRAM_HANDLER(namcos22)
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index 0819f1bf6ce..0233d570f5b 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -1301,7 +1301,7 @@ static MACHINE_DRIVER_START( gorgon )
 	MDRV_CPU_IO_MAP( s23h8iomap, 0 )
 	MDRV_CPU_VBLANK_INT("main", irq1_line_pulse)
 
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 
 	MDRV_SCREEN_ADD("main", RASTER)
 	MDRV_SCREEN_REFRESH_RATE(60)
@@ -1345,7 +1345,7 @@ static MACHINE_DRIVER_START( s23 )
 	MDRV_CPU_VBLANK_INT("main", irq1_line_pulse)
 
 
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 
 	MDRV_SCREEN_ADD("main", RASTER)
 	MDRV_SCREEN_REFRESH_RATE(60)
@@ -1384,7 +1384,7 @@ static MACHINE_DRIVER_START( ss23 )
 	MDRV_CPU_IO_MAP( s23h8iomap, 0 )
 	MDRV_CPU_VBLANK_INT("main", irq1_line_pulse)
 
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 
 	MDRV_SCREEN_ADD("main", RASTER)
 	MDRV_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 2afadc4c29b..baee20024bd 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -1070,7 +1070,7 @@ static MACHINE_DRIVER_START( hopmappy )
 	MDRV_CPU_IO_MAP(mcu_port_map,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)	/* ??? */
 
-	MDRV_INTERLEAVE(800)	/* heavy interleaving needed to avoid hangs in rthunder */
+	MDRV_QUANTUM_TIME(HZ(48000))	/* heavy interleaving needed to avoid hangs in rthunder */
 
 	MDRV_MACHINE_RESET(namco86)
 
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 2ef46870c43..ec883ebbd66 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1235,7 +1235,7 @@ static MACHINE_DRIVER_START( neogeo )
 	MDRV_CPU_PROGRAM_MAP(audio_map,0)
 	MDRV_CPU_IO_MAP(auido_io_map,0)
 
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_USEC(128762))
+	MDRV_WATCHDOG_TIME_INIT(USEC(128762))
 
 	MDRV_MACHINE_START(neogeo)
 	MDRV_MACHINE_RESET(neogeo)
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 956d61401e1..14b9b4acb5d 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -632,7 +632,7 @@ static MACHINE_DRIVER_START( ninjaw )
 	MDRV_CPU_PROGRAM_MAP(ninjaw_cpub_readmem,ninjaw_cpub_writemem)
 	MDRV_CPU_VBLANK_INT("left", irq4_line_hold)
 
-	MDRV_INTERLEAVE(100)	/* CPU slices */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* CPU slices */
 
 	MDRV_MACHINE_START(ninjaw)
 	MDRV_MACHINE_RESET(ninjaw)
@@ -705,7 +705,7 @@ static MACHINE_DRIVER_START( darius2 )
 	MDRV_CPU_PROGRAM_MAP(darius2_cpub_readmem,darius2_cpub_writemem)
 	MDRV_CPU_VBLANK_INT("left", irq4_line_hold)
 
-	MDRV_INTERLEAVE(100)	/* CPU slices */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* CPU slices */
 
 	MDRV_MACHINE_START(ninjaw)
 	MDRV_MACHINE_RESET(ninjaw)
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index e02618a91f5..01bc2e21531 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -744,7 +744,7 @@ static MACHINE_DRIVER_START( ninjakun )
 	MDRV_CPU_PROGRAM_MAP(ninjakun_cpu2_map,0)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */
 
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame */
 
 	MDRV_MACHINE_START(ninjakun)
 
@@ -820,7 +820,7 @@ static MACHINE_DRIVER_START( raiders5 )
 	MDRV_CPU_PROGRAM_MAP(raiders5_cpu2_map,0)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)	/* ? */
 
-	MDRV_INTERLEAVE(400)
+	MDRV_QUANTUM_TIME(HZ(24000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index d1b1d15e3a2..874dfd3c3de 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -420,7 +420,7 @@ static MACHINE_DRIVER_START( snes )
 	MDRV_CPU_ADD("audio", SPC700, 2048000/2)	/* 2.048 Mhz, but internal divider */
 	MDRV_CPU_PROGRAM_MAP(spc_mem, 0)
 
-	MDRV_INTERLEAVE(400)
+	MDRV_QUANTUM_TIME(HZ(24000))
 
 	MDRV_MACHINE_START( snes )
 	MDRV_MACHINE_RESET( snes )
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index b897ebb55aa..369717897fb 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -1103,7 +1103,7 @@ static MACHINE_DRIVER_START( nwktr )
 	MDRV_CPU_CONFIG(sharc_cfg)
 	MDRV_CPU_DATA_MAP(sharc_map, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_START(nwktr)
 	MDRV_MACHINE_RESET(nwktr)
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index 63d14eb9264..5064319013a 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -784,7 +784,7 @@ static MACHINE_DRIVER_START( nycaptor )
 	MDRV_CPU_ADD("mcu", M68705,2000000)
 	MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem)
 
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame - an high value to ensure proper */
 
 	/* synchronization of the CPUs */
 	MDRV_MACHINE_RESET(ta7630)
@@ -848,7 +848,7 @@ static MACHINE_DRIVER_START( cyclshtg )
 	MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem)
 #endif
 
-	MDRV_INTERLEAVE(1)
+	MDRV_QUANTUM_TIME(HZ(60))
 	MDRV_MACHINE_RESET(ta7630)
 
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -906,7 +906,7 @@ static MACHINE_DRIVER_START( bronx )
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
 
-	MDRV_INTERLEAVE(2)
+	MDRV_QUANTUM_TIME(HZ(120))
 	MDRV_MACHINE_RESET(ta7630)
 
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 55430523480..5b4f737b7db 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -336,7 +336,7 @@ static MACHINE_DRIVER_START( ohmygod )
 	MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
 
 	MDRV_MACHINE_RESET(ohmygod)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(3))	/* a guess, and certainly wrong */
+	MDRV_WATCHDOG_TIME_INIT(SEC(3))	/* a guess, and certainly wrong */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index d7c47095535..22ba255c035 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -586,7 +586,7 @@ static MACHINE_DRIVER_START( opwolf )
 	MDRV_CPU_ADD("audio", Z80, SOUND_CPU_CLOCK )	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(z80_readmem,z80_writemem)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	MDRV_MACHINE_START(opwolf)
 	MDRV_MACHINE_RESET(opwolf)
@@ -639,7 +639,7 @@ static MACHINE_DRIVER_START( opwolfb ) /* OSC clocks unknown for the bootleg, bu
 	MDRV_CPU_PROGRAM_MAP(sub_z80_readmem,sub_z80_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	MDRV_MACHINE_START(opwolf)
 
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 9d5738d93a0..32b97ffbf25 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -402,7 +402,7 @@ static MACHINE_DRIVER_START( overdriv )
 						/* 60 fps, that's how I fixed it for now. */
 	MDRV_CPU_PROGRAM_MAP(overdriv_s_readmem,overdriv_s_writemem)
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	MDRV_MACHINE_RESET(overdriv)
 	MDRV_NVRAM_HANDLER(overdriv)
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 4599b050712..0806d577a1f 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -423,7 +423,7 @@ static MACHINE_DRIVER_START( pacland )
 	MDRV_CPU_IO_MAP(mcu_port_map,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
 
-	MDRV_INTERLEAVE(100)	/* we need heavy synching between the MCU and the CPU */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* we need heavy synching between the MCU and the CPU */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 827ea93fc35..c351720c44f 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -392,7 +392,7 @@ static MACHINE_DRIVER_START( pandoras )
 	MDRV_CPU_PROGRAM_MAP(i8039_readmem,i8039_writemem)
 	MDRV_CPU_IO_MAP(i8039_io_map,0)
 
-	MDRV_INTERLEAVE(50)	/* slices per frame */
+	MDRV_QUANTUM_TIME(HZ(3000))	/* slices per frame */
 
 	MDRV_MACHINE_RESET(pandoras)
 
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index 2194a1c0dc4..8a38562ba56 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -137,7 +137,7 @@ static MACHINE_DRIVER_START( paranoia )
 	MDRV_CPU_IO_MAP(pce_io, 0)
 	MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF)
 
-	MDRV_INTERLEAVE(1)
+	MDRV_QUANTUM_TIME(HZ(60))
 
 	MDRV_CPU_ADD("sub", 8085A, 18000000/3)
 	MDRV_CPU_PROGRAM_MAP(paranoia_8085_map,0)
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index ee3588e23f7..2a74d13d0aa 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -268,7 +268,7 @@ static MACHINE_DRIVER_START( pitnrun )
 
 	MDRV_MACHINE_RESET(pitnrun)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 6c7a1f6b10b..e279cdb797c 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -643,7 +643,7 @@ static MACHINE_DRIVER_START( plygonet )
 	MDRV_NVRAM_HANDLER(polygonet)
 
 	/* TODO: TEMPORARY!  UNTIL A MORE LOCALIZED SYNC CAN BE MADE */
-	MDRV_INTERLEAVE(20000)
+	MDRV_QUANTUM_TIME(HZ(1200000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 5a9b434b492..f729d1e0dd1 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -859,7 +859,7 @@ static MACHINE_DRIVER_START( polepos )
 
 	MDRV_WATCHDOG_VBLANK_INIT(16)	// 128V clocks the same as VBLANK
 
-	MDRV_INTERLEAVE(100)	/* some interleaving */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* some interleaving */
 
 	MDRV_MACHINE_RESET(polepos)
 	MDRV_NVRAM_HANDLER(generic_1fill)
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index ef4fdfb8d8a..12d53109c3e 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -319,7 +319,7 @@ static MACHINE_DRIVER_START( popper )
 	MDRV_CPU_PROGRAM_MAP(popper_sound_readmem,popper_sound_writemem)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)		//NMIs caused by the main CPU
 
-	MDRV_INTERLEAVE(30)
+	MDRV_QUANTUM_TIME(HZ(1800))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index a7203c7ee5a..7d8c2273cd4 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -692,7 +692,7 @@ static MACHINE_DRIVER_START( psychic5 )
 	MDRV_CPU_PROGRAM_MAP(psychic5_sound_map,0)
 	MDRV_CPU_IO_MAP(psychic5_soundport_map,0)
 
-	MDRV_INTERLEAVE(10)      /* Allow time for 2nd cpu to interleave */
+	MDRV_QUANTUM_TIME(HZ(600))      /* Allow time for 2nd cpu to interleave */
 	MDRV_MACHINE_RESET(psychic5)
 
 	/* video hardware */
@@ -739,7 +739,7 @@ static MACHINE_DRIVER_START( bombsa )
 	MDRV_CPU_PROGRAM_MAP(bombsa_sound_map,0)
 	MDRV_CPU_IO_MAP(bombsa_soundport_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 	MDRV_MACHINE_RESET(psychic5)
 
 	/* video hardware */
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 9ffc56d4958..dcb20612313 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -464,7 +464,7 @@ static MACHINE_DRIVER_START( pushman )
 	MDRV_CPU_ADD("mcu", M68705, 4000000)	/* No idea */
 	MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem)
 
-	MDRV_INTERLEAVE(60)
+	MDRV_QUANTUM_TIME(HZ(3600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -502,7 +502,7 @@ static MACHINE_DRIVER_START( bballs )
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 	MDRV_CPU_IO_MAP(sound_io_map,0)
 
-	MDRV_INTERLEAVE(60)
+	MDRV_QUANTUM_TIME(HZ(3600))
 
 	MDRV_MACHINE_RESET(bballs)
 
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index 0fcc408df7b..ac9501f3277 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -560,7 +560,7 @@ static MACHINE_DRIVER_START( qix )
 
 	/* high interleave needed to ensure correct text in service mode */
 	/* Zookeeper settings and high score table seem especially sensitive to this */
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 
 	MDRV_MACHINE_START(qix)
 	MDRV_MACHINE_RESET(qix)
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index 022bd467d3b..50ecc8087f9 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -335,7 +335,7 @@ static MACHINE_DRIVER_START( quasar )
 
 	MDRV_MACHINE_START( cvs )
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 68c9eb864fa..30a35789dba 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -245,7 +245,7 @@ static MACHINE_DRIVER_START( raiden )
 
 	SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verified on pcb */
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	MDRV_MACHINE_RESET(seibu_sound)
 
@@ -284,7 +284,7 @@ static MACHINE_DRIVER_START( raidena )
 
 	SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verified on pcb */
 
-	MDRV_INTERLEAVE(120)
+	MDRV_QUANTUM_TIME(HZ(7200))
 
 	MDRV_MACHINE_RESET(seibu_sound)
 
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 1004376555b..b6018d6a904 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -618,7 +618,7 @@ static MACHINE_DRIVER_START( rainbow )
 	MDRV_CPU_ADD("audio", Z80, XTAL_16MHz/4) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(rainbow_s_readmem,rainbow_s_writemem)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -655,7 +655,7 @@ static MACHINE_DRIVER_START( jumping )
 	MDRV_CPU_ADD("audio", Z80, XTAL_18_432MHz/6)	/* not verified but music tempo matches original */
 	MDRV_CPU_PROGRAM_MAP(jumping_sound_readmem,jumping_sound_writemem)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough ? */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough ? */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 29fbd5c6ea6..c0ba6ae0561 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -392,7 +392,7 @@ static MACHINE_DRIVER_START( rastan )
 	MDRV_CPU_ADD("audio", Z80, XTAL_16MHz/4)	/* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(rastan_s_map,0)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index 896c54a308f..8bd321b2d13 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -354,7 +354,7 @@ static MACHINE_DRIVER_START( retofinv )
 	MDRV_CPU_ADD("68705", M68705,18432000/6)	/* 3.072 MHz? */
 	MDRV_CPU_PROGRAM_MAP(mcu_map,0)
 
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index 3e38acd63a5..03aa940e25f 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -336,7 +336,7 @@ static MACHINE_DRIVER_START( rng )
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 	MDRV_CPU_PERIODIC_INT(audio_interrupt, 480)
 
-	MDRV_INTERLEAVE(100) // higher if sound stutters
+	MDRV_QUANTUM_TIME(HZ(6000)) // higher if sound stutters
 
 	MDRV_GFXDECODE(rungun)
 
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 26c485fe165..3bddf62b196 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -443,7 +443,7 @@ static MACHINE_DRIVER_START( sandscrp )
 	MDRV_CPU_PROGRAM_MAP(sandscrp_soundmem,0)
 	MDRV_CPU_IO_MAP(sandscrp_soundport,0)
 
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(3))	/* a guess, and certainly wrong */
+	MDRV_WATCHDOG_TIME_INIT(SEC(3))	/* a guess, and certainly wrong */
 
 	MDRV_MACHINE_RESET(sandscrp)
 
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index ccabb89d973..eba68744315 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -882,7 +882,7 @@ static MACHINE_DRIVER_START( hangon_base )
 	MDRV_CPU_PROGRAM_MAP(sub_map,0)
 
 	MDRV_MACHINE_RESET(hangon)
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_PPI8255_ADD( "ppi8255_0", hangon_ppi_intf[0] )
 	MDRV_PPI8255_ADD( "ppi8255_1", hangon_ppi_intf[1] )
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index f043e6edaf6..0f466008bd3 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -817,7 +817,7 @@ static MACHINE_DRIVER_START( outrundx )
 	MDRV_CPU_IO_MAP(sound_portmap,0)
 
 	MDRV_MACHINE_RESET(outrun)
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_PPI8255_ADD( "ppi8255", single_ppi_intf )
 
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index 2e0908194e2..3241d013cc1 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -1812,7 +1812,7 @@ static MACHINE_DRIVER_START( system24 )
 	MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK/2)
 	MDRV_CPU_PROGRAM_MAP(system24_cpu2_map, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_START(system24)
 	MDRV_MACHINE_RESET(system24)
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index a61bbcfedbc..b86b934d7ff 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -1139,7 +1139,7 @@ static MACHINE_DRIVER_START( xboard )
 
 	MDRV_MACHINE_RESET(xboard)
 	MDRV_NVRAM_HANDLER(xboard)
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_GFXDECODE(segaxbd)
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 7acc1285509..1b70f010807 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -968,7 +968,7 @@ static MACHINE_DRIVER_START( yboard )
 
 	MDRV_MACHINE_RESET(yboard)
 	MDRV_NVRAM_HANDLER(yboard)
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index e3b6dd61170..f595fd632f7 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1746,7 +1746,7 @@ static MACHINE_DRIVER_START( spi )
 	MDRV_CPU_ADD("sound", Z80, 28636360/4)
 	MDRV_CPU_PROGRAM_MAP(spisound_map, 0)
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	MDRV_MACHINE_RESET(spi)
 	MDRV_NVRAM_HANDLER(spi)
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index cfd321f38d2..5ead6f34648 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -412,7 +412,7 @@ static MACHINE_DRIVER_START( nvram )
 	MDRV_CPU_ADD("mcu", NSC8105, 6000000)	/* ??? */
 	MDRV_CPU_PROGRAM_MAP(mcu_nvram_map,0)
 
-	MDRV_INTERLEAVE(20)	/* 20 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(1200))	/* 20 CPU slices per frame - an high value to ensure proper */
 						/* synchronization of the CPUs */
 	MDRV_MACHINE_RESET(friskyt)
 	MDRV_NVRAM_HANDLER(seicross)
diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c
index 58706ba87f9..188c3ce0ea9 100644
--- a/src/mame/drivers/sfkick.c
+++ b/src/mame/drivers/sfkick.c
@@ -465,7 +465,7 @@ static MACHINE_DRIVER_START( sfkick )
 	MDRV_CPU_IO_MAP(main_io,0)
 	MDRV_CPU_VBLANK_INT_HACK(sfkick_interrupt,262)
 
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 
 	MDRV_CPU_ADD("sound",Z80,MASTER_CLOCK/6)
 	MDRV_CPU_PROGRAM_MAP(sound_mem,0)
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 0ae41f2a3fe..6b466570ca2 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -497,7 +497,7 @@ static MACHINE_DRIVER_START( kothello )
 
 	SEIBU3A_SOUND_SYSTEM_CPU(14318180/4)
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	MDRV_MACHINE_RESET(seibu_sound)
 
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index 58601731b83..4c7d76ccfa7 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -399,7 +399,7 @@ static MACHINE_DRIVER_START( chinhero )
 
 	MDRV_MACHINE_RESET(chinhero)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index bb98b5f6577..638dae50ad1 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -388,7 +388,7 @@ static MACHINE_DRIVER_START( shougi )
 	MDRV_CPU_ADD("mcu", ALPHA8201, 10000000/4/8)
 	MDRV_CPU_PROGRAM_MAP(mcu_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 	MDRV_WATCHDOG_VBLANK_INIT(16)	// assuming it's the same as champbas
 
 	/* video hardware */
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index 19c9c21a65e..599d0c534cc 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -813,7 +813,7 @@ static MACHINE_DRIVER_START( whizz )
 	MDRV_CPU_IO_MAP(whizz_io_map,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index 4a1f702063a..dd49e408f6b 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -460,7 +460,7 @@ static MACHINE_DRIVER_START( skykid )
 	MDRV_CPU_IO_MAP(mcu_port_map,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
 
-	MDRV_INTERLEAVE(100)	/* we need heavy synch */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* we need heavy synch */
 
 	MDRV_MACHINE_START(skykid)
 
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 0b0a63f6a4a..e93768c5b84 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -933,7 +933,7 @@ static MACHINE_DRIVER_START( perfrman )
 	MDRV_CPU_PROGRAM_MAP(perfrman_sound_readmem,perfrman_sound_writemem)
 	MDRV_CPU_VBLANK_INT_HACK(getstar_interrupt,4)	/* music speed, verified */
 
-	MDRV_INTERLEAVE(10)		/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))		/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	MDRV_MACHINE_RESET(slapfight)
 
@@ -980,7 +980,7 @@ static MACHINE_DRIVER_START( tigerhb )
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 	MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,6)    /* ??? */
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	MDRV_MACHINE_RESET(slapfight)
 
@@ -1029,7 +1029,7 @@ static MACHINE_DRIVER_START( tigerh )
 	MDRV_CPU_ADD("mcu", M68705,XTAL_36MHz/12) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	MDRV_MACHINE_RESET(slapfight)
 
@@ -1076,7 +1076,7 @@ static MACHINE_DRIVER_START( slapfigh )
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 	MDRV_CPU_VBLANK_INT_HACK(getstar_interrupt, 3)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	MDRV_MACHINE_RESET(slapfight)
 
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 8746fbf55fc..ecda90462a9 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -536,7 +536,7 @@ static MACHINE_DRIVER_START( slapshot )
 	MDRV_CPU_ADD("audio", Z80,32000000/8)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_START(slapshot)
 
@@ -578,7 +578,7 @@ static MACHINE_DRIVER_START( opwolf3 )
 	MDRV_CPU_ADD("audio", Z80,32000000/8)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c
index 790dea3ad0a..b8624127b1d 100644
--- a/src/mame/drivers/snesb.c
+++ b/src/mame/drivers/snesb.c
@@ -553,7 +553,7 @@ static MACHINE_DRIVER_START( kinstb )
 	MDRV_CPU_ADD("sound", SPC700, 2048000/2)	/* 2.048 Mhz, but internal divider */
 	MDRV_CPU_PROGRAM_MAP(spc_mem, 0)
 
-	MDRV_INTERLEAVE(600)
+	MDRV_QUANTUM_TIME(HZ(36000))
 
 	MDRV_MACHINE_START( snes )
 	MDRV_MACHINE_RESET( snes )
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 0eb3c8b91cd..f7a2c743b42 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -3585,7 +3585,7 @@ static MACHINE_DRIVER_START( marvins )
 	MDRV_CPU_IO_MAP(marvins_sound_portmap,0)
 	MDRV_CPU_PERIODIC_INT(nmi_line_assert, 244)	// schematics show a separate 244Hz timer
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
@@ -3646,7 +3646,7 @@ static MACHINE_DRIVER_START( jcross )
 	MDRV_CPU_IO_MAP(jcross_sound_portmap,0)
 	MDRV_CPU_PERIODIC_INT(irq0_line_assert, 244)	// Marvin's frequency, sounds ok
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
@@ -3729,7 +3729,7 @@ static MACHINE_DRIVER_START( tnk3 )
 	MDRV_CPU_ADD("audio", Z80, XTAL_8MHz/2) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(tnk3_YM3526_sound_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
@@ -3820,7 +3820,7 @@ static MACHINE_DRIVER_START( ikari )
 	MDRV_CPU_ADD("audio", Z80, XTAL_8MHz/2) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
@@ -3880,7 +3880,7 @@ static MACHINE_DRIVER_START( bermudat )
 	MDRV_CPU_ADD("audio", Z80, XTAL_8MHz/2) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0)
 
-	MDRV_INTERLEAVE(400)
+	MDRV_QUANTUM_TIME(HZ(24000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -3991,7 +3991,7 @@ static MACHINE_DRIVER_START( tdfever )
 	MDRV_CPU_ADD("audio", Z80, 4000000)
 	MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 02c88de74f0..5b228f0df8d 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -339,7 +339,7 @@ static MACHINE_DRIVER_START( spacefb )
 	MDRV_CPU_PROGRAM_MAP(spacefb_audio_map,0)
 	MDRV_CPU_IO_MAP(spacefb_audio_io_map,0)
 
-	MDRV_INTERLEAVE(3)
+	MDRV_QUANTUM_TIME(HZ(180))
 
 	MDRV_MACHINE_START(spacefb)
 	MDRV_MACHINE_RESET(spacefb)
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index 4a5a5441d64..a15e35a3430 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -331,7 +331,7 @@ static MACHINE_DRIVER_START( speglsht )
 	MDRV_CPU_PROGRAM_MAP(speglsht_mem,0)
 	MDRV_CPU_VBLANK_INT("main", irq4_gen)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 	MDRV_MACHINE_RESET(speglsht)
 
 	/* video hardware */
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index 31b6339c4b5..57304479ede 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -640,7 +640,7 @@ static MACHINE_DRIVER_START( srmp5 )
 	MDRV_CPU_PROGRAM_MAP(srmp5_mem,0)
 	MDRV_CPU_VBLANK_INT("main", irq4_gen)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c
index 9665078d9a2..392a29277dd 100644
--- a/src/mame/drivers/st0016.c
+++ b/src/mame/drivers/st0016.c
@@ -453,7 +453,7 @@ static MACHINE_DRIVER_START( mayjinsn )
 	MDRV_CPU_IO_MAP(st0016_m2_io,0)
 	MDRV_CPU_ADD("sub", V810, 10000000)//25 Mhz ?
 	MDRV_CPU_PROGRAM_MAP(v810_mem,0)
-	MDRV_INTERLEAVE(1)
+	MDRV_QUANTUM_TIME(HZ(60))
 MACHINE_DRIVER_END
 
 /*************************************
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index f33c29efaf8..45a8386bce5 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -320,7 +320,7 @@ static MACHINE_DRIVER_START( starwars )
 	MDRV_CPU_ADD("main", M6809, MASTER_CLOCK / 8)
 	MDRV_CPU_PROGRAM_MAP(main_map,0)
 	MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_HZ(CLOCK_3KHZ / 128))
+	MDRV_WATCHDOG_TIME_INIT(HZ(CLOCK_3KHZ / 128))
 
 	MDRV_CPU_ADD("audio", M6809, MASTER_CLOCK / 8)
 	MDRV_CPU_PROGRAM_MAP(sound_map,0)
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index 82b0524b022..e2018f5e8b0 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -463,7 +463,7 @@ static MACHINE_DRIVER_START( stfight )
 	MDRV_CPU_PROGRAM_MAP(readmem_cpu2,writemem_cpu2)
 	MDRV_CPU_PERIODIC_INT(irq0_line_hold,120)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(stfight)
 
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index d31c7466853..23fa070b18d 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -346,7 +346,7 @@ static MACHINE_DRIVER_START( strnskil )
 	MDRV_CPU_PROGRAM_MAP(strnskil_readmem2,strnskil_writemem2)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index abdf5d8569f..54f455726ad 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -855,7 +855,7 @@ static MACHINE_DRIVER_START( bssoccer )
 	MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_2_readmem,bssoccer_pcm_2_writemem)
 	MDRV_CPU_IO_MAP(bssoccer_pcm_2_io_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -913,7 +913,7 @@ static MACHINE_DRIVER_START( uballoon )
 
 	/* 2nd PCM Z80 missing */
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(uballoon)
 
@@ -964,7 +964,7 @@ static MACHINE_DRIVER_START( sunaq )
 
 	/* 2nd PCM Z80 missing */
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -1036,7 +1036,7 @@ static MACHINE_DRIVER_START( bestbest )
 
 	/* 2nd PCM Z80 missing */
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 49e6df48b2a..c6bf1ae067d 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -422,7 +422,7 @@ static MACHINE_DRIVER_START( superchs )
 	MDRV_CPU_PROGRAM_MAP(superchs_cpub_readmem,superchs_cpub_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */
 
-	MDRV_INTERLEAVE(8)	/* CPU slices - Need to interleave Cpu's 1 & 3 */
+	MDRV_QUANTUM_TIME(HZ(480))	/* CPU slices - Need to interleave Cpu's 1 & 3 */
 
 	MDRV_MACHINE_RESET(superchs)
 	MDRV_NVRAM_HANDLER(superchs)
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 0b9688ecbef..391c745517c 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -1061,7 +1061,7 @@ static MACHINE_DRIVER_START( sqix )
 	MDRV_CPU_ADD("mcu", I8751, 12000000/3)	/* ??? */
 	MDRV_CPU_IO_MAP(mcu_io_map,0)
 
-	MDRV_INTERLEAVE(500)
+	MDRV_QUANTUM_TIME(HZ(30000))
 
 	MDRV_MACHINE_START(superqix)
 
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 469a6bcf099..5b75cc73d66 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -2428,7 +2428,7 @@ static MACHINE_DRIVER_START( rastsag2 )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2466,7 +2466,7 @@ static MACHINE_DRIVER_START( ashura )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2504,7 +2504,7 @@ static MACHINE_DRIVER_START( crimec )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2542,7 +2542,7 @@ static MACHINE_DRIVER_START( tetrist )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2579,7 +2579,7 @@ static MACHINE_DRIVER_START( tetrista )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(masterw_sound_readmem,masterw_sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2617,7 +2617,7 @@ static MACHINE_DRIVER_START( hitice )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(viofight_sound_readmem, viofight_sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2661,7 +2661,7 @@ static MACHINE_DRIVER_START( rambo3 )
 	MDRV_CPU_ADD("audio", Z80, XTAL_24MHz/6)	/* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2699,7 +2699,7 @@ static MACHINE_DRIVER_START( rambo3a )
 	MDRV_CPU_ADD("audio", Z80, XTAL_24MHz/6)	/* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2737,7 +2737,7 @@ static MACHINE_DRIVER_START( pbobble )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(mb87078)
 	MDRV_NVRAM_HANDLER(taito_b)
@@ -2778,7 +2778,7 @@ static MACHINE_DRIVER_START( spacedx )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(mb87078)
 	MDRV_NVRAM_HANDLER(taito_b)
@@ -2819,7 +2819,7 @@ static MACHINE_DRIVER_START( spacedxo )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2857,7 +2857,7 @@ static MACHINE_DRIVER_START( qzshowby )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(mb87078)
 	MDRV_NVRAM_HANDLER(taito_b)
@@ -2898,7 +2898,7 @@ static MACHINE_DRIVER_START( viofight )
 	MDRV_CPU_ADD("audio", Z80, 6000000)	/* 6 MHz verified */
 	MDRV_CPU_PROGRAM_MAP(viofight_sound_readmem, viofight_sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2940,7 +2940,7 @@ static MACHINE_DRIVER_START( masterw )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(masterw_sound_readmem,masterw_sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -2979,7 +2979,7 @@ static MACHINE_DRIVER_START( silentd )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -3017,7 +3017,7 @@ static MACHINE_DRIVER_START( selfeena )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -3064,7 +3064,7 @@ static MACHINE_DRIVER_START( ryujin )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -3109,7 +3109,7 @@ static MACHINE_DRIVER_START( sbm )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index d3d528b8526..252bd475346 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -591,7 +591,7 @@ static MACHINE_DRIVER_START( syvalion )
 	MDRV_MACHINE_START(taitoh)
 	MDRV_MACHINE_RESET(taitoh)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -631,7 +631,7 @@ static MACHINE_DRIVER_START( recordbr )
 	MDRV_MACHINE_START(taitoh)
 	MDRV_MACHINE_RESET(taitoh)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -671,7 +671,7 @@ static MACHINE_DRIVER_START( dleague )
 	MDRV_MACHINE_START(taitoh)
 	MDRV_MACHINE_RESET(taitoh)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index 988c042d4c4..54cb27e2b50 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -2115,7 +2115,7 @@ static MACHINE_DRIVER_START( fhawk )
 	MDRV_CPU_PROGRAM_MAP(fhawk_2_readmem,fhawk_2_writemem)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,3) /* fixes slow down problems */
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(fhawk)
 
@@ -2211,7 +2211,7 @@ static MACHINE_DRIVER_START( kurikint )
 	MDRV_CPU_PROGRAM_MAP(kurikint_2_readmem,kurikint_2_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(kurikint)
 
@@ -2351,7 +2351,7 @@ static MACHINE_DRIVER_START( evilston )
 	MDRV_CPU_PROGRAM_MAP(evilston_2_readmem,evilston_2_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(evilston)
 
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 6dbd5dff8d4..405f7a4db4c 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -1005,7 +1005,7 @@ static MACHINE_DRIVER_START( superman )
 	MDRV_CPU_ADD("audio", Z80, XTAL_16MHz/4)	/* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	MDRV_MACHINE_START(taitox)
 	MDRV_MACHINE_RESET(cchip1)
@@ -1045,7 +1045,7 @@ static MACHINE_DRIVER_START( daisenpu )
 	MDRV_CPU_ADD("audio", Z80, XTAL_16MHz/4)	/* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(daisenpu_sound_readmem,daisenpu_sound_writemem)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	MDRV_MACHINE_START(taitox)
 
@@ -1082,7 +1082,7 @@ static MACHINE_DRIVER_START( gigandes )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz ??? */
 	MDRV_CPU_PROGRAM_MAP(ballbros_sound_readmem,ballbros_sound_writemem)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	MDRV_MACHINE_START(taitox)
 
@@ -1121,7 +1121,7 @@ static MACHINE_DRIVER_START( ballbros )
 	MDRV_CPU_ADD("audio", Z80, 4000000)	/* 4 MHz ??? */
 	MDRV_CPU_PROGRAM_MAP(ballbros_sound_readmem,ballbros_sound_writemem)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - enough for the sound CPU to read all commands */
 
 	MDRV_MACHINE_START(taitox)
 
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index b6a7016d725..a731ddcb456 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -3254,7 +3254,7 @@ static MACHINE_DRIVER_START( enforce )
 
 	MDRV_MACHINE_START(taitoz)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -3308,7 +3308,7 @@ static MACHINE_DRIVER_START( bshark )
 
 	MDRV_MACHINE_START(taitoz)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -3363,7 +3363,7 @@ static MACHINE_DRIVER_START( sci )
 
 	MDRV_MACHINE_START(taitoz)
 
-	MDRV_INTERLEAVE(50)
+	MDRV_QUANTUM_TIME(HZ(3000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -3418,7 +3418,7 @@ static MACHINE_DRIVER_START( nightstr )
 
 	MDRV_MACHINE_START(taitoz)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -3474,7 +3474,7 @@ static MACHINE_DRIVER_START( aquajack )
 
 	MDRV_MACHINE_START(taitoz)
 
-	MDRV_INTERLEAVE(500)
+	MDRV_QUANTUM_TIME(HZ(30000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -3581,7 +3581,7 @@ static MACHINE_DRIVER_START( dblaxle )
 
 	MDRV_MACHINE_START(taitoz)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -3635,7 +3635,7 @@ static MACHINE_DRIVER_START( racingb )
 	MDRV_CPU_VBLANK_INT("main", dblaxle_cpub_interrupt)
 
 	MDRV_MACHINE_START(taitoz)
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index 295054f7dc2..3ae3c205aec 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -613,7 +613,7 @@ static MACHINE_DRIVER_START( airsys )
 	MDRV_CPU_DATA_MAP(DSP_map_data, 0)
 	MDRV_CPU_IO_MAP(DSP_map_io, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_START(taitoair)
 
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index 447d830c65c..32f6ba3fd5c 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -1309,7 +1309,7 @@ static MACHINE_DRIVER_START( taitojc )
 	MDRV_CPU_PROGRAM_MAP(tms_program_map, 0)
 	MDRV_CPU_DATA_MAP(tms_data_map, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(taitojc)
 	MDRV_NVRAM_HANDLER(93C46)
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index 6b2ed9c059e..f1b0573c6ae 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -1884,7 +1884,7 @@ static MACHINE_DRIVER_START( mcu )
 	MDRV_CPU_ADD("mcu", M68705,3000000)      /* xtal is 3MHz, divided by 4 internally */
 	MDRV_CPU_PROGRAM_MAP(taitosj_mcu_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 MACHINE_DRIVER_END
 
 
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index 3ad1d621c2d..ddea501a53d 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -351,7 +351,7 @@ static MACHINE_DRIVER_START( tankbust )
 	MDRV_CPU_PROGRAM_MAP(map_cpu2,0)
 	MDRV_CPU_IO_MAP(port_map_cpu2,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET( tankbust )
 
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 69f4f61e238..b312b155097 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -849,7 +849,7 @@ static MACHINE_DRIVER_START( apache3 )
 	MDRV_CPU_ADD("sub2", Z80, 8000000) //???
 	MDRV_CPU_PROGRAM_MAP(apache3_z80_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -892,7 +892,7 @@ static MACHINE_DRIVER_START( roundup5 )
 	MDRV_CPU_ADD("audio", Z80, 4000000) //???
 	MDRV_CPU_PROGRAM_MAP(roundup5_z80_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -936,7 +936,7 @@ static MACHINE_DRIVER_START( cyclwarr )
 	MDRV_CPU_ADD("audio", Z80, 16000000 / 4) /* Confirmed */
 	MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map,0)
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -980,7 +980,7 @@ static MACHINE_DRIVER_START( bigfight )
 	MDRV_CPU_ADD("audio", Z80, 16000000 / 4) /* Confirmed */
 	MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map,0)
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index 3c27b79f3ed..32bb5ee4970 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -374,7 +374,7 @@ static MACHINE_DRIVER_START( taxidrvr )
 	MDRV_CPU_IO_MAP(cpu3_port_map,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)	/* ??? */
 
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 
 	MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 031a22c3976..f3294b31560 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -493,7 +493,7 @@ static MACHINE_DRIVER_START( tbowl )
 	MDRV_CPU_ADD("audio", Z80, 4000000) /* Actual Z80 */
 	MDRV_CPU_PROGRAM_MAP(6206A_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_GFXDECODE(tbowl)
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 2966f7d7558..708c65c4992 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -400,7 +400,7 @@ static MACHINE_DRIVER_START( tceptor )
 	MDRV_CPU_IO_MAP(mcu_io_map,0)
 	MDRV_CPU_VBLANK_INT("2d", mcu_vb_interrupt)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_NVRAM_HANDLER(generic_1fill)
 
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index a5d117feac4..88df925fcd5 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -447,7 +447,7 @@ static MACHINE_DRIVER_START( fstarfrc )
 	MDRV_CPU_ADD("audio", Z80,8000000/2)			/* 4MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 								/* NMIs are triggered by the main CPU */
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -487,7 +487,7 @@ static MACHINE_DRIVER_START( ginkun )
 	MDRV_CPU_ADD("audio", Z80,8000000/2)			/* 4MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
 								/* NMIs are triggered by the main CPU */
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index ab601cdb168..5493a6b0f3f 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -671,7 +671,7 @@ static MACHINE_DRIVER_START( tehkanwc )
 	MDRV_CPU_IO_MAP(sound_port,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - seems enough to keep the CPUs in sync */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - seems enough to keep the CPUs in sync */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index 30f0fa42865..829f0a0c38e 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -555,7 +555,7 @@ static MACHINE_DRIVER_START( tempest )
 	MDRV_CPU_ADD("main", M6502, MASTER_CLOCK / 8)
 	MDRV_CPU_PROGRAM_MAP(main_map, 0)
 	MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
-	MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_HZ(CLOCK_3KHZ / 256))
+	MDRV_WATCHDOG_TIME_INIT(HZ(CLOCK_3KHZ / 256))
 	MDRV_NVRAM_HANDLER(atari_vg)
 
 	/* video hardware */
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index 6dd74c64bc3..77ac6c05222 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -325,7 +325,7 @@ static MACHINE_DRIVER_START( thunderj )
 
 	MDRV_MACHINE_RESET(thunderj)
 	MDRV_NVRAM_HANDLER(atarigen)
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index 03546ea0dd5..369a3519d0e 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -271,7 +271,7 @@ static MACHINE_DRIVER_START( timelimt )
 	MDRV_CPU_IO_MAP(sound_io_map,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ? */
 
-	MDRV_INTERLEAVE(50)
+	MDRV_QUANTUM_TIME(HZ(3000))
 
 	MDRV_MACHINE_START(timelimt)
 	MDRV_MACHINE_RESET(timelimt)
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 51c44c3e763..5bdde18bdad 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -1649,7 +1649,7 @@ static MACHINE_DRIVER_START( arknoid2 )
 	MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(10000)
+	MDRV_QUANTUM_PERFECT_CPU("main")//TIME(HZ(600000))
 
 	MDRV_MACHINE_RESET(tnzs)
 
@@ -1688,7 +1688,7 @@ static MACHINE_DRIVER_START( drtoppel )
 	MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(10000)
+	MDRV_QUANTUM_TIME(HZ(600000))
 
 	MDRV_MACHINE_RESET(tnzs)
 
@@ -1730,7 +1730,7 @@ static MACHINE_DRIVER_START( tnzs )
 	MDRV_CPU_ADD("mcu", I8742 ,12000000/2)	/* 400KHz ??? - Main board Crystal is 12MHz */
 	MDRV_CPU_IO_MAP(i8742_io_map,0)
 
-	MDRV_INTERLEAVE(10000)
+	MDRV_QUANTUM_TIME(HZ(600000))
 
 	MDRV_MACHINE_RESET(tnzs)
 
@@ -1768,7 +1768,7 @@ static MACHINE_DRIVER_START( insectx )
 	MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(10000)
+	MDRV_QUANTUM_TIME(HZ(600000))
 
 	MDRV_MACHINE_RESET(tnzs)
 
@@ -1806,7 +1806,7 @@ static MACHINE_DRIVER_START( kageki )
 	MDRV_CPU_PROGRAM_MAP(kageki_sub_readmem,kageki_sub_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(10000)
+	MDRV_QUANTUM_TIME(HZ(600000))
 
 	MDRV_MACHINE_RESET(tnzs)
 
@@ -1855,7 +1855,7 @@ static MACHINE_DRIVER_START( tnzsb )
 	MDRV_CPU_PROGRAM_MAP(tnzsb_cpu2_map,0)
 	MDRV_CPU_IO_MAP(tnzsb_io_map,0)
 
-	MDRV_INTERLEAVE(10000)
+	MDRV_QUANTUM_TIME(HZ(600000))
 
 	MDRV_MACHINE_RESET(tnzs)
 
@@ -1919,7 +1919,7 @@ static MACHINE_DRIVER_START( jpopnics )
 	MDRV_CPU_PROGRAM_MAP(jpopnics_sub_map,0)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
 
-	MDRV_INTERLEAVE(10000)
+	MDRV_QUANTUM_TIME(HZ(600000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index 05827d7480c..1fc3ba33371 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -1251,7 +1251,7 @@ static MACHINE_DRIVER_START( rallybik )
 	MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
 	MDRV_CPU_IO_MAP(rallybik_sound_io_map, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(toaplan1)
 
@@ -1291,7 +1291,7 @@ static MACHINE_DRIVER_START( truxton )
 	MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
 	MDRV_CPU_IO_MAP(truxton_sound_io_map, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(toaplan1)
 
@@ -1331,7 +1331,7 @@ static MACHINE_DRIVER_START( hellfire )
 	MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
 	MDRV_CPU_IO_MAP(hellfire_sound_io_map, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(toaplan1)
 
@@ -1371,7 +1371,7 @@ static MACHINE_DRIVER_START( zerowing )
 	MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
 	MDRV_CPU_IO_MAP(zerowing_sound_io_map, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(zerozone)
 
@@ -1415,7 +1415,7 @@ static MACHINE_DRIVER_START( demonwld )
 	MDRV_CPU_PROGRAM_MAP(DSP_program_map,0)
 	MDRV_CPU_IO_MAP(DSP_io_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(demonwld)
 
@@ -1489,7 +1489,7 @@ static MACHINE_DRIVER_START( outzone )
 	MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0)
 	MDRV_CPU_IO_MAP(outzone_sound_io_map, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(zerozone)
 
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 4c756131e90..2b1b69ed661 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -3584,7 +3584,7 @@ static MACHINE_DRIVER_START( pipibibs )
 	MDRV_CPU_ADD("audio", Z80,XTAL_27MHz/8)			/* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(toaplan2)
 
@@ -3624,7 +3624,7 @@ static MACHINE_DRIVER_START( whoopee )
 											/* Change this to 10MHz when HD647180 gets dumped. 10MHz Oscillator */
 	MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(toaplan2)
 
@@ -3663,7 +3663,7 @@ static MACHINE_DRIVER_START( pipibibi )
 	MDRV_CPU_ADD("audio", Z80, XTAL_27MHz/8)			/* ??? 3.37MHz */
 	MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(toaplan2)
 
@@ -3916,7 +3916,7 @@ static MACHINE_DRIVER_START( mahoudai )
 	MDRV_CPU_ADD("audio", Z80, XTAL_32MHz/8)		/* 4MHz , 32MHz Oscillator */
 	MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(toaplan2)
 
@@ -3958,7 +3958,7 @@ static MACHINE_DRIVER_START( shippumd )
 	MDRV_CPU_ADD("audio", Z80, XTAL_32MHz/8)		/* 4MHz , 32MHz Oscillator */
 	MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(toaplan2)
 
@@ -4000,7 +4000,7 @@ static MACHINE_DRIVER_START( bgaregga )
 	MDRV_CPU_ADD("audio", Z80, XTAL_32MHz/8)		/* 4MHz , 32MHz Oscillator */
 	MDRV_CPU_PROGRAM_MAP(bgaregga_sound_z80_mem, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(bgaregga)
 
@@ -4043,7 +4043,7 @@ static MACHINE_DRIVER_START( batrider )
 	MDRV_CPU_PROGRAM_MAP(batrider_sound_z80_mem, 0)
 	MDRV_CPU_IO_MAP(batrider_sound_z80_port, 0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(bgaregga)
 
@@ -4089,7 +4089,7 @@ static MACHINE_DRIVER_START( bbakraid )
 	MDRV_CPU_IO_MAP(bbakraid_sound_z80_port, 0)
 	MDRV_CPU_PERIODIC_INT(bbakraid_snd_interrupt, 448)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	MDRV_MACHINE_RESET(toaplan2)
 	MDRV_NVRAM_HANDLER(bbakraid)
diff --git a/src/mame/drivers/topshoot.c b/src/mame/drivers/topshoot.c
index 51b1448c017..6900c35dc42 100644
--- a/src/mame/drivers/topshoot.c
+++ b/src/mame/drivers/topshoot.c
@@ -246,7 +246,7 @@ static MACHINE_DRIVER_START( genesis_base )
 	MDRV_CPU_PROGRAM_MAP(genesis_z80_readmem, genesis_z80_writemem)
 	MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* from vdp at scanline 0xe0 */
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_START(genesis)
 	MDRV_MACHINE_RESET(genesis)
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 8a5ea75d327..09d79970065 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -582,7 +582,7 @@ static MACHINE_DRIVER_START( liblrabl )
 	MDRV_CPU_PROGRAM_MAP(readmem_68k,writemem_68k)
 	MDRV_CPU_VBLANK_INT("main", toypop_m68000_interrupt)
 
-	MDRV_INTERLEAVE(100)    /* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))    /* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	MDRV_MACHINE_RESET(toypop)
 
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index cf90b220101..d3dc52b94db 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -431,7 +431,7 @@ static MACHINE_DRIVER_START( tp84 )
 	MDRV_CPU_ADD("audio", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
 	MDRV_CPU_PROGRAM_MAP(audio_map,0)
 
-	MDRV_INTERLEAVE(100)	/* 100 CPU slices per frame - an high value to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(6000))	/* 100 CPU slices per frame - an high value to ensure proper */
 							/* synchronization of the CPUs */
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 2c4440d861a..91e18151db4 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -918,7 +918,7 @@ static MACHINE_DRIVER_START( tubep )
 	MDRV_CPU_ADD("nsc",NSC8105,6000000)	/* 6 MHz Xtal - divided internally ??? */
 	MDRV_CPU_PROGRAM_MAP(nsc_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_START(tubep)
 	MDRV_MACHINE_RESET(tubep)
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index 0de78bef02a..ec9e3c471f8 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -1145,7 +1145,7 @@ static MACHINE_DRIVER_START( buckrog )
 	MDRV_CPU_PROGRAM_MAP(buckrog_cpu2_map,0)
 	MDRV_CPU_IO_MAP(buckrog_cpu2_portmap,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 	MDRV_MACHINE_RESET(buckrog)
 
 	MDRV_PPI8255_ADD( "ppi8255_0", buckrog_8255_intf[0] )
diff --git a/src/mame/drivers/turbosub.c b/src/mame/drivers/turbosub.c
index 430fded5cb6..8c3ba4fdd1e 100644
--- a/src/mame/drivers/turbosub.c
+++ b/src/mame/drivers/turbosub.c
@@ -350,7 +350,7 @@ static MACHINE_DRIVER_START( turbosub )
 
 	MDRV_PALETTE_LENGTH(512)
 	MDRV_MACHINE_RESET( turbosub )
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_VIDEO_START(turbosub)
 	MDRV_VIDEO_UPDATE(turbosub)
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index f23622d0b8a..c786326758a 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -905,7 +905,7 @@ static MACHINE_DRIVER_START( twin16 )
 	MDRV_CPU_ADD("audio", Z80, 3579545)
 	MDRV_CPU_PROGRAM_MAP(sound_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	// video hardware
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
@@ -945,7 +945,7 @@ MACHINE_DRIVER_END
 
 static MACHINE_DRIVER_START( devilw )
 	MDRV_IMPORT_FROM(twin16)
-	MDRV_INTERLEAVE(1000)
+	MDRV_QUANTUM_TIME(HZ(60000))
 MACHINE_DRIVER_END
 
 static MACHINE_DRIVER_START( fround )
@@ -957,7 +957,7 @@ static MACHINE_DRIVER_START( fround )
 	MDRV_CPU_ADD("audio", Z80, 3579545)
 	MDRV_CPU_PROGRAM_MAP(sound_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index e732acacc40..d4fd41af7bf 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -717,7 +717,7 @@ static MACHINE_DRIVER_START( twincobr )
 	/* Data Map is internal to the CPU */
 	MDRV_CPU_IO_MAP(DSP_io_map, 0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(twincobr)	/* Reset fshark bootleg 8741 MCU data */
 
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index a02b957c64c..a39baab3736 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -188,7 +188,7 @@ static MACHINE_DRIVER_START( uapce )
 	MDRV_CPU_ADD("sub", Z80, 1400000)
 	MDRV_CPU_PROGRAM_MAP(z80_map, 0)
 
-	MDRV_INTERLEAVE(1)
+	MDRV_QUANTUM_TIME(HZ(60))
 
 	MDRV_MACHINE_RESET( uapce )
 
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index 87f955ff8f1..7ac4cc89e2c 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -253,7 +253,7 @@ static MACHINE_DRIVER_START( ultraman )
 	MDRV_CPU_PROGRAM_MAP(sound_map,0)
 	MDRV_CPU_IO_MAP(sound_io_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index 668af3e062a..4fe7f87fd79 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -240,7 +240,7 @@ static MACHINE_DRIVER_START( ultrsprt )
 	MDRV_CPU_PROGRAM_MAP(sound_map, 0)
 	MDRV_CPU_PERIODIC_INT(irq5_line_hold, 1)	// ???
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 
 	MDRV_NVRAM_HANDLER(ultrsprt)
 	MDRV_MACHINE_START(ultrsprt)
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index ee493f4cb88..0b006e2e6e3 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -773,7 +773,7 @@ static MACHINE_DRIVER_START( cbombers )
 	MDRV_CPU_PROGRAM_MAP(cbombers_cpub_map, 0)
 	MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
 
-	MDRV_INTERLEAVE(8)	/* CPU slices - Need to interleave Cpu's 1 & 3 */
+	MDRV_QUANTUM_TIME(HZ(480))	/* CPU slices - Need to interleave Cpu's 1 & 3 */
 
 	MDRV_MACHINE_RESET(undrfire)
 	MDRV_NVRAM_HANDLER(undrfire)
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index 4bdf3904f4f..bd9181133ea 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -318,7 +318,7 @@ static MACHINE_DRIVER_START( vastar )
 	MDRV_CPU_IO_MAP(cpu2_port_map,0)
 	MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)	/* ??? */
 
-	MDRV_INTERLEAVE(10)	/* 10 CPU slices per frame - seems enough to ensure proper */
+	MDRV_QUANTUM_TIME(HZ(600))	/* 10 CPU slices per frame - seems enough to ensure proper */
 						/* synchronization of the CPUs */
 	MDRV_MACHINE_RESET(vastar)
 
diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c
index f60b2366e35..52e7f261807 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -134,7 +134,7 @@ static MACHINE_DRIVER_START( vcombat )
 
 	/*MDRV_PALETTE_LENGTH(0x100)*/
 
-	MDRV_INTERLEAVE(2000)	/* Temporary */
+	MDRV_QUANTUM_TIME(HZ(120000))	/* Temporary */
 
 	MDRV_VIDEO_UPDATE(vcombat)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index 0ad6f20bb3c..cae7ecf81cd 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -248,7 +248,7 @@ static MACHINE_DRIVER_START( volfied )
 	MDRV_CPU_ADD("audio", Z80, 4000000)   /* sound CPU, required to run the game */
 	MDRV_CPU_PROGRAM_MAP(z80_map,0)
 
-	MDRV_INTERLEAVE(20)
+	MDRV_QUANTUM_TIME(HZ(1200))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index bc39728dce0..19fe7ed8eba 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -452,7 +452,7 @@ static MACHINE_DRIVER_START( wardner )
 	/* Data Map is internal to the CPU */
 	MDRV_CPU_IO_MAP(DSP_io_map, 0)
 
-	MDRV_INTERLEAVE(100)					/* 100 CPU slices per frame */
+	MDRV_QUANTUM_TIME(HZ(6000))					/* 100 CPU slices per frame */
 
 	MDRV_MACHINE_RESET(wardner)
 
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index 12e760d4f78..2f809a5388a 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -1091,7 +1091,7 @@ static MACHINE_DRIVER_START( wecleman )
 	MDRV_CPU_ADD("audio", Z80, 3579545)
 	MDRV_CPU_PROGRAM_MAP(wecleman_sound_map,0)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_RESET(wecleman)
 
@@ -1148,7 +1148,7 @@ static MACHINE_DRIVER_START( hotchase )
 
 	/* Amuse: every 2 ms */
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index 0561ba0b70e..89ed86db6a5 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -970,7 +970,7 @@ static MACHINE_DRIVER_START( wgp )
 	MDRV_MACHINE_START(wgp)
 	MDRV_MACHINE_RESET(wgp)
 
-	MDRV_INTERLEAVE(500)
+	MDRV_QUANTUM_TIME(HZ(30000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
@@ -1001,7 +1001,7 @@ MACHINE_DRIVER_END
 static MACHINE_DRIVER_START( wgp2 )
 	MDRV_IMPORT_FROM(wgp)
 
-	MDRV_INTERLEAVE(200)
+	MDRV_QUANTUM_TIME(HZ(12000))
 	/* video hardware */
 	MDRV_VIDEO_START(wgp2)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index 6a06931386f..952d6c6222c 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -256,7 +256,7 @@ static MACHINE_DRIVER_START( wrally )
 	MDRV_CPU_PROGRAM_MAP(dallas_rom, 0)
 	MDRV_CPU_IO_MAP(dallas_ram, 0)
 
-	MDRV_INTERLEAVE(640)					/* heavy sync */
+	MDRV_QUANTUM_TIME(HZ(38400))					/* heavy sync */
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index 4e73f1b29c2..7996701fc47 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -475,7 +475,7 @@ static MACHINE_DRIVER_START( xsleena )
 
 	MDRV_MACHINE_START(xsleena)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 0f090e6ca20..9f3bef6ed37 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -464,7 +464,7 @@ static MACHINE_DRIVER_START( xexex )
 	MDRV_CPU_ADD("audio", Z80, 8000000)
 	MDRV_CPU_PROGRAM_MAP(sound_map,0)
 
-	MDRV_INTERLEAVE(32)
+	MDRV_QUANTUM_TIME(HZ(1920))
 
 	MDRV_MACHINE_START(xexex)
 	MDRV_MACHINE_RESET(xexex)
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index 8df5c8e326b..1352867e745 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -205,7 +205,7 @@ static MACHINE_DRIVER_START( xorworld )
 	MDRV_CPU_PROGRAM_MAP(xorworld_map, 0)
 	MDRV_CPU_VBLANK_INT_HACK(xorworld_interrupt, 4)	// 1 IRQ2 + 1 IRQ4 + 1 IRQ6
 
-	MDRV_INTERLEAVE(1)
+	MDRV_QUANTUM_TIME(HZ(60))
 
 	MDRV_NVRAM_HANDLER(xorworld)
 
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index c6b6fdb2476..3536ee43049 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -318,7 +318,7 @@ static MACHINE_DRIVER_START( xxmissio )
 	MDRV_CPU_PROGRAM_MAP(map2,0)
 	MDRV_CPU_VBLANK_INT_HACK(xxmissio_interrupt_s,2)
 
-	MDRV_INTERLEAVE(100)
+	MDRV_QUANTUM_TIME(HZ(6000))
 
 	MDRV_MACHINE_START(xxmissio)
 
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index 04dab750011..d0daa220fb0 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -183,7 +183,7 @@ static MACHINE_DRIVER_START( zerozone )
 	MDRV_CPU_ADD("audio", Z80, 1000000)	/* 1 MHz ??? */
 	MDRV_CPU_PROGRAM_MAP(sound_map,0)
 
-	MDRV_INTERLEAVE(10)
+	MDRV_QUANTUM_TIME(HZ(600))
 
 	/* video hardware */
 	MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index b4e1b236302..d92799e7e35 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -748,7 +748,7 @@ static MACHINE_DRIVER_START( zr107 )
 	MDRV_CPU_CONFIG(sharc_cfg)
 	MDRV_CPU_DATA_MAP(sharc_map, 0)
 
-	MDRV_INTERLEAVE(500)
+	MDRV_QUANTUM_TIME(HZ(30000))
 
 	MDRV_NVRAM_HANDLER(93C46)
 	MDRV_MACHINE_START(zr107)
@@ -793,7 +793,7 @@ static MACHINE_DRIVER_START( jetwave )
 	MDRV_CPU_CONFIG(sharc_cfg)
 	MDRV_CPU_DATA_MAP(sharc_map, 0)
 
-	MDRV_INTERLEAVE(500)
+	MDRV_QUANTUM_TIME(HZ(30000))
 
 	MDRV_NVRAM_HANDLER(93C46)
 	MDRV_MACHINE_START(zr107)