Removed address_map2 items from the CPU config, etc.

This commit is contained in:
Aaron Giles 2009-05-09 05:30:43 +00:00
parent 0f1e0cc8e5
commit 09d58a6c7f
3 changed files with 1 additions and 11 deletions

View File

@ -63,8 +63,7 @@ struct _cpu_config
{
cpu_type type; /* index for the CPU type */
UINT32 flags; /* flags; see #defines below */
const addrmap_token *address_map[ADDRESS_SPACES]; /* 2 memory maps per address space */
const addrmap_token *address_map2[ADDRESS_SPACES]; /* 2 memory maps per address space */
const addrmap_token *address_map[ADDRESS_SPACES]; /* 1 memory map per address space */
cpu_interrupt_func vblank_interrupt; /* for interrupts tied to VBLANK */
int vblank_interrupts_per_frame;/* usually 1 */
const char * vblank_interrupt_screen; /* the screen that causes the VBLANK interrupt */

View File

@ -778,8 +778,6 @@ address_map *address_map_alloc(const device_config *device, const game_driver *d
/* construct the standard map */
if (cpuconfig->address_map[spacenum] != NULL)
map_detokenize(map, driver, device->tag, cpuconfig->address_map[spacenum]);
if (cpuconfig->address_map2[spacenum] != NULL)
map_detokenize(map, driver, device->tag, cpuconfig->address_map2[spacenum]);
return map;
}

View File

@ -782,13 +782,6 @@ static int validate_cpu(int drivnum, const machine_config *config, const input_p
address_map_entry *entry;
address_map *map;
/* check to see that the same map is not used twice */
if (cpuconfig->address_map[spacenum] != NULL && cpuconfig->address_map[spacenum] == cpuconfig->address_map2[spacenum])
{
mame_printf_error("%s: %s uses identical memory maps for CPU '%s' spacenum %d\n", driver->source_file, driver->name, device->tag, spacenum);
error = TRUE;
}
/* construct the maps */
map = address_map_alloc(device, driver, spacenum);