diff options
Diffstat (limited to 'src/emu/machine/generic.c')
-rw-r--r-- | src/emu/machine/generic.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c index 730bd8cbaca..74d3b673d1f 100644 --- a/src/emu/machine/generic.c +++ b/src/emu/machine/generic.c @@ -55,7 +55,7 @@ struct _generic_machine_private are enabled for the given CPU -------------------------------------------------*/ -INLINE int interrupt_enabled(const device_config *device) +INLINE int interrupt_enabled(running_device *device) { generic_machine_private *state = device->machine->generic_machine_data; int cpunum = cpu_get_index(device); @@ -328,7 +328,7 @@ mame_file *nvram_fopen(running_machine *machine, UINT32 openflags) void nvram_load(running_machine *machine) { mame_file *nvram_file = NULL; - const device_config *device; + running_device *device; /* read data from general NVRAM handler first */ if (machine->config->nvram_handler != NULL) @@ -338,9 +338,9 @@ void nvram_load(running_machine *machine) } /* find all devices with NVRAM handlers, and read from them next */ - for (device = machine->config->devicelist.first(); device != NULL; device = device->next) + for (device = machine->devicelist.first(); device != NULL; device = device->next) { - device_nvram_func nvram = (device_nvram_func)device_get_info_fct(device, DEVINFO_FCT_NVRAM); + device_nvram_func nvram = (device_nvram_func)device->get_config_fct(DEVINFO_FCT_NVRAM); if (nvram != NULL) { if (nvram_file == NULL) @@ -361,7 +361,7 @@ void nvram_load(running_machine *machine) void nvram_save(running_machine *machine) { mame_file *nvram_file = NULL; - const device_config *device; + running_device *device; /* write data from general NVRAM handler first */ if (machine->config->nvram_handler != NULL) @@ -371,9 +371,9 @@ void nvram_save(running_machine *machine) } /* find all devices with NVRAM handlers, and write them next */ - for (device = machine->config->devicelist.first(); device != NULL; device = device->next) + for (device = machine->devicelist.first(); device != NULL; device = device->next) { - device_nvram_func nvram = (device_nvram_func)device_get_info_fct(device, DEVINFO_FCT_NVRAM); + device_nvram_func nvram = (device_nvram_func)device->get_config_fct(DEVINFO_FCT_NVRAM); if (nvram != NULL) { if (nvram_file == NULL) @@ -633,7 +633,7 @@ static void interrupt_reset(running_machine *machine) static TIMER_CALLBACK( clear_all_lines ) { - const device_config *device = (const device_config *)ptr; + running_device *device = (running_device *)ptr; int inputcount = cpu_get_input_lines(device); int line; @@ -650,7 +650,7 @@ static TIMER_CALLBACK( clear_all_lines ) static TIMER_CALLBACK( irq_pulse_clear ) { - const device_config *device = (const device_config *)ptr; + running_device *device = (running_device *)ptr; int irqline = param; cpu_set_input_line(device, irqline, CLEAR_LINE); } @@ -662,7 +662,7 @@ static TIMER_CALLBACK( irq_pulse_clear ) later -------------------------------------------------*/ -void generic_pulse_irq_line(const device_config *device, int irqline) +void generic_pulse_irq_line(running_device *device, int irqline) { int multiplier = cpu_get_clock_multiplier(device); int clocks = (cpu_get_min_cycles(device) * cpu_get_clock_divider(device) + multiplier - 1) / multiplier; @@ -678,7 +678,7 @@ void generic_pulse_irq_line(const device_config *device, int irqline) 1 cycle later, specifying a vector -------------------------------------------------*/ -void generic_pulse_irq_line_and_vector(const device_config *device, int irqline, int vector) +void generic_pulse_irq_line_and_vector(running_device *device, int irqline, int vector) { assert(irqline != INPUT_LINE_NMI && irqline != INPUT_LINE_RESET); cpu_set_input_line_and_vector(device, irqline, ASSERT_LINE, vector); @@ -691,7 +691,7 @@ void generic_pulse_irq_line_and_vector(const device_config *device, int irqline, disable value for global interrupts -------------------------------------------------*/ -void cpu_interrupt_enable(const device_config *device, int enabled) +void cpu_interrupt_enable(running_device *device, int enabled) { generic_machine_private *state = device->machine->generic_machine_data; int cpunum = cpu_get_index(device); |