diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c index 8a2916981c2..296c2a98333 100644 --- a/src/emu/cpu/mips/psx.c +++ b/src/emu/cpu/mips/psx.c @@ -1315,9 +1315,8 @@ static void mips_update_scratchpad( const address_space *space ) } else { - memory_install_readwrite32_handler( space, 0x1f800000, 0x1f8003ff, 0, 0, (read32_space_func)SMH_BANK(32), (write32_space_func)SMH_BANK(32) ); - - memory_set_bankptr(space->machine, 32, psxcpu->dcache ); + memory_install_readwrite_bank_handler( space, 0x1f800000, 0x1f8003ff, 0, 0, "bank32" ); + memory_set_bankptr(space->machine, "bank32", psxcpu->dcache ); } } diff --git a/src/emu/memory.c b/src/emu/memory.c index d1152422331..9982175aa4f 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -134,9 +134,7 @@ ***************************************************************************/ /* banking constants */ -#define MAX_BANKS (STATIC_BANKMAX - STATIC_BANK1) /* maximum number of banks */ #define MAX_BANK_ENTRIES 4096 /* maximum number of possible bank values */ -#define MAX_EXPLICIT_BANKS 96 /* maximum number of explicitly-defined banks */ /* address map lookup table definitions */ #define LEVEL1_BITS 18 /* number of address bits in the level 1 table */ @@ -176,7 +174,6 @@ typedef enum _read_or_write read_or_write; #define HANDLER_IS_STATIC(h) ((FPTR)(h) < STATIC_COUNT) #define HANDLER_TO_BANK(h) ((UINT32)(FPTR)(h)) -#define BANK_TO_HANDLER(b) ((genf *)(FPTR)(b)) #define SUBTABLE_PTR(tabledata, entry) (&(tabledata)->table[(1 << LEVEL1_BITS) + (((entry) - SUBTABLE_BASE) << LEVEL2_BITS)]) @@ -206,19 +203,22 @@ struct _bank_reference }; /* a bank is a global pointer to memory that can be shared across devices and changed dynamically */ -typedef struct _bank_data bank_info; -struct _bank_data +typedef struct _bank_info bank_info; +struct _bank_info { - UINT8 used; /* is this bank used? */ - UINT8 dynamic; /* is this bank allocated dynamically? */ - bank_reference * reflist; /* linked list of address spaces referencing this bank */ + bank_info * next; /* next bank in sequence */ + UINT8 index; /* array index for this handler */ UINT8 read; /* is this bank used for reads? */ UINT8 write; /* is this bank used for writes? */ + void * handler; /* SMH_BANK(n) handler for this bank */ + bank_reference * reflist; /* linked list of address spaces referencing this bank */ offs_t bytestart; /* byte-adjusted start offset */ offs_t byteend; /* byte-adjusted end offset */ UINT16 curentry; /* current entry */ void * entry[MAX_BANK_ENTRIES];/* array of entries for this bank */ void * entryd[MAX_BANK_ENTRIES];/* array of decrypted entries for this bank */ + char * name; /* friendly name for this bank */ + char tag[1]; /* tag associated with this bank */ }; /* In memory.h: typedef struct _direct_range direct_range; */ @@ -263,7 +263,11 @@ struct _memory_private memory_block * memory_block_list; /* head of the list of memory blocks */ - bank_info bankdata[STATIC_COUNT]; /* data gathered for each bank */ + tagmap * bankmap; /* map for fast bank lookups */ + bank_info * banklist; /* data gathered for each bank */ + UINT8 banknext; /* next bank to allocate */ + + tagmap * sharemap; /* map for share lookups */ UINT8 * wptable; /* watchpoint-fill table */ }; @@ -326,8 +330,7 @@ static void *space_find_backing_memory(const address_space *space, offs_t bytead static int space_needs_backing_store(const address_space *space, const address_map_entry *entry); /* banking helpers */ -static void bank_assign_static(int banknum, const address_space *space, read_or_write readorwrite, offs_t bytestart, offs_t byteend); -static genf *bank_assign_dynamic(const address_space *space, read_or_write readorwrite, offs_t bytestart, offs_t byteend); +static void *bank_find_or_allocate(const address_space *space, const char *tag, offs_t bytestart, offs_t byteend, read_or_write readorwrite); static STATE_POSTLOAD( bank_reattach ); /* table management */ @@ -358,7 +361,7 @@ static memory_handler get_stub_handler(read_or_write readorwrite, int spacedbits static genf *get_static_handler(int handlerbits, int readorwrite, int which); /* debugging */ -static const char *handler_to_string(const address_table *table, UINT8 entry); +static const char *handler_to_string(const address_space *space, const address_table *table, UINT8 entry); static void dump_map(FILE *file, const address_space *space, const address_table *table); static void mem_dump(running_machine *machine); @@ -720,6 +723,10 @@ void memory_init(running_machine *machine) /* allocate our private data */ memdata = machine->memory_data = auto_alloc_clear(machine, memory_private); + memdata->bankmap = tagmap_alloc(); + memdata->sharemap = tagmap_alloc(); + if (memdata->bankmap == NULL || memdata->sharemap == NULL) + fatalerror("Out of memory allocating maps for memory constructs!"); /* build up the list of address spaces */ memory_init_spaces(machine); @@ -836,25 +843,24 @@ void memory_set_decrypted_region(const address_space *space, offs_t addrstart, o { offs_t bytestart = memory_address_to_byte(space, addrstart); offs_t byteend = memory_address_to_byte_end(space, addrend); - int banknum, found = FALSE; + int found = FALSE; + bank_info *bank; /* loop over banks looking for a match */ - for (banknum = 0; banknum < STATIC_COUNT; banknum++) + for (bank = space->machine->memory_data->banklist; bank != NULL; bank = bank->next) { - bank_info *bank = &space->machine->memory_data->bankdata[banknum]; - /* consider this bank if it is used for reading and matches the address space */ - if (bank->used && bank->read && bank_references_space(bank, space)) + if (bank->read && bank_references_space(bank, space)) { /* verify that the region fully covers the decrypted range */ if (bank->bytestart >= bytestart && bank->byteend <= byteend) { /* set the decrypted pointer for the corresponding memory bank */ - space->machine->memory_data->bankd_ptr[banknum] = (UINT8 *)base + bank->bytestart - bytestart; + space->machine->memory_data->bankd_ptr[bank->index] = (UINT8 *)base + bank->bytestart - bytestart; found = TRUE; /* if we are executing from here, force an opcode base update */ - if (space->direct.entry == banknum) + if (space->direct.entry == bank->index) force_opbase_update(space); } @@ -1014,17 +1020,15 @@ void *memory_get_write_ptr(const address_space *space, offs_t byteaddress) addresses for a bank -------------------------------------------------*/ -void memory_configure_bank(running_machine *machine, int banknum, int startentry, int numentries, void *base, offs_t stride) +void memory_configure_bank(running_machine *machine, const char *tag, int startentry, int numentries, void *base, offs_t stride) { memory_private *memdata = machine->memory_data; - bank_info *bank = &memdata->bankdata[banknum]; + bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag); int entrynum; - + /* validation checks */ - if (banknum < STATIC_BANK1 || banknum > MAX_EXPLICIT_BANKS || !bank->used) - fatalerror("memory_configure_bank called with invalid bank %d", banknum); - if (bank->dynamic) - fatalerror("memory_configure_bank called with dynamic bank %d", banknum); + if (bank == NULL) + fatalerror("memory_configure_bank called for unknown bank '%s'", tag); if (startentry < 0 || startentry + numentries > MAX_BANK_ENTRIES) fatalerror("memory_configure_bank called with out-of-range entries %d-%d", startentry, startentry + numentries - 1); if (!base) @@ -1035,8 +1039,8 @@ void memory_configure_bank(running_machine *machine, int banknum, int startentry bank->entry[entrynum] = (UINT8 *)base + (entrynum - startentry) * stride; /* if we have no bankptr yet, set it to the first entry */ - if (memdata->bank_ptr[banknum] == NULL) - memdata->bank_ptr[banknum] = (UINT8 *)bank->entry[0]; + if (memdata->bank_ptr[bank->index] == NULL) + memdata->bank_ptr[bank->index] = (UINT8 *)bank->entry[0]; } @@ -1045,19 +1049,17 @@ void memory_configure_bank(running_machine *machine, int banknum, int startentry the decrypted addresses for a bank -------------------------------------------------*/ -void memory_configure_bank_decrypted(running_machine *machine, int banknum, int startentry, int numentries, void *base, offs_t stride) +void memory_configure_bank_decrypted(running_machine *machine, const char *tag, int startentry, int numentries, void *base, offs_t stride) { memory_private *memdata = machine->memory_data; - bank_info *bank = &memdata->bankdata[banknum]; + bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag); int entrynum; /* validation checks */ - if (banknum < STATIC_BANK1 || banknum > MAX_EXPLICIT_BANKS || !bank->used) - fatalerror("memory_configure_bank called with invalid bank %d", banknum); - if (bank->dynamic) - fatalerror("memory_configure_bank called with dynamic bank %d", banknum); + if (bank == NULL) + fatalerror("memory_configure_bank_decrypted called for unknown bank '%s'", tag); if (startentry < 0 || startentry + numentries > MAX_BANK_ENTRIES) - fatalerror("memory_configure_bank called with out-of-range entries %d-%d", startentry, startentry + numentries - 1); + fatalerror("memory_configure_bank_decrypted called with out-of-range entries %d-%d", startentry, startentry + numentries - 1); if (!base) fatalerror("memory_configure_bank_decrypted called NULL base"); @@ -1066,8 +1068,8 @@ void memory_configure_bank_decrypted(running_machine *machine, int banknum, int bank->entryd[entrynum] = (UINT8 *)base + (entrynum - startentry) * stride; /* if we have no bankptr yet, set it to the first entry */ - if (memdata->bankd_ptr[banknum] == NULL) - memdata->bankd_ptr[banknum] = (UINT8 *)bank->entryd[0]; + if (memdata->bankd_ptr[bank->index] == NULL) + memdata->bankd_ptr[bank->index] = (UINT8 *)bank->entryd[0]; } @@ -1076,26 +1078,24 @@ void memory_configure_bank_decrypted(running_machine *machine, int banknum, int entry to be the new bank base -------------------------------------------------*/ -void memory_set_bank(running_machine *machine, int banknum, int entrynum) +void memory_set_bank(running_machine *machine, const char *tag, int entrynum) { memory_private *memdata = machine->memory_data; - bank_info *bank = &memdata->bankdata[banknum]; + bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag); bank_reference *ref; /* validation checks */ - if (banknum < STATIC_BANK1 || banknum > MAX_EXPLICIT_BANKS || !bank->used) - fatalerror("memory_set_bank called with invalid bank %d", banknum); - if (bank->dynamic) - fatalerror("memory_set_bank called with dynamic bank %d", banknum); + if (bank == NULL) + fatalerror("memory_set_bank called for unknown bank '%s'", tag); if (entrynum < 0 || entrynum > MAX_BANK_ENTRIES) fatalerror("memory_set_bank called with out-of-range entry %d", entrynum); if (!bank->entry[entrynum]) - fatalerror("memory_set_bank called for bank %d with invalid bank entry %d", banknum, entrynum); + fatalerror("memory_set_bank called for bank '%s' with invalid bank entry %d", tag, entrynum); /* set the base */ bank->curentry = entrynum; - memdata->bank_ptr[banknum] = (UINT8 *)bank->entry[entrynum]; - memdata->bankd_ptr[banknum] = (UINT8 *)bank->entryd[entrynum]; + memdata->bank_ptr[bank->index] = (UINT8 *)bank->entry[entrynum]; + memdata->bankd_ptr[bank->index] = (UINT8 *)bank->entryd[entrynum]; /* invalidate all the direct references to any referenced address spaces */ for (ref = bank->reflist; ref != NULL; ref = ref->next) @@ -1108,16 +1108,14 @@ void memory_set_bank(running_machine *machine, int banknum, int entrynum) selected bank -------------------------------------------------*/ -int memory_get_bank(running_machine *machine, int banknum) +int memory_get_bank(running_machine *machine, const char *tag) { memory_private *memdata = machine->memory_data; - bank_info *bank = &memdata->bankdata[banknum]; + bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag); /* validation checks */ - if (banknum < STATIC_BANK1 || banknum > MAX_EXPLICIT_BANKS || !bank->used) - fatalerror("memory_get_bank called with invalid bank %d", banknum); - if (bank->dynamic) - fatalerror("memory_get_bank called with dynamic bank %d", banknum); + if (bank == NULL) + fatalerror("memory_get_bank called for unknown bank '%s'", tag); return bank->curentry; } @@ -1126,24 +1124,22 @@ int memory_get_bank(running_machine *machine, int banknum) memory_set_bankptr - set the base of a bank -------------------------------------------------*/ -void memory_set_bankptr(running_machine *machine, int banknum, void *base) +void memory_set_bankptr(running_machine *machine, const char *tag, void *base) { memory_private *memdata = machine->memory_data; - bank_info *bank = &memdata->bankdata[banknum]; + bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag); bank_reference *ref; /* validation checks */ - if (banknum < STATIC_BANK1 || banknum > MAX_EXPLICIT_BANKS || !bank->used) - fatalerror("memory_set_bankptr called with invalid bank %d", banknum); - if (bank->dynamic) - fatalerror("memory_set_bankptr called with dynamic bank %d", banknum); + if (bank == NULL) + fatalerror("memory_set_bankptr called for unknown bank '%s'", tag); if (base == NULL) fatalerror("memory_set_bankptr called NULL base"); if (ALLOW_ONLY_AUTO_MALLOC_BANKS) validate_auto_malloc_memory(base, bank->byteend - bank->bytestart + 1); /* set the base */ - memdata->bank_ptr[banknum] = (UINT8 *)base; + memdata->bank_ptr[bank->index] = (UINT8 *)base; /* invalidate all the direct references to any referenced address spaces */ for (ref = bank->reflist; ref != NULL; ref = ref->next) @@ -1151,24 +1147,6 @@ void memory_set_bankptr(running_machine *machine, int banknum, void *base) } -/*------------------------------------------------- - memory_find_unused_bank - return the index of - an unused bank --------------------------------------------------*/ - -int memory_find_unused_bank(running_machine *machine) -{ - memory_private *memdata = machine->memory_data; - int banknum; - - for (banknum = STATIC_BANK1; banknum <= MAX_EXPLICIT_BANKS; banknum++) - if (!memdata->bankdata[banknum].used) - return banknum; - - return -1; -} - - /*************************************************************************** DYNAMIC ADDRESS SPACE MAPPING @@ -1393,6 +1371,31 @@ void _memory_install_port_handler(const address_space *space, offs_t addrstart, } +/*------------------------------------------------- + _memory_install_bank_handler - install a + new port handler into the given address space +-------------------------------------------------*/ + +void _memory_install_bank_handler(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag) +{ + address_space *spacerw = (address_space *)space; + + if (rtag != NULL) + { + void *handler = bank_find_or_allocate(space, rtag, addrstart, addrend, ROW_READ); + space_map_range(spacerw, ROW_READ, space->dbits, 0, addrstart, addrend, addrmask, addrmirror, handler, spacerw, rtag); + } + + if (wtag != NULL) + { + void *handler = bank_find_or_allocate(space, wtag, addrstart, addrend, ROW_WRITE); + space_map_range(spacerw, ROW_WRITE, space->dbits, 0, addrstart, addrend, addrmask, addrmirror, handler, spacerw, wtag); + } + + mem_dump(space->machine); +} + + /*************************************************************************** DEBUGGER HELPERS @@ -1415,7 +1418,7 @@ const char *memory_get_handler_string(const address_space *space, int read0_or_w entry = table->table[LEVEL2_INDEX(entry, byteaddress)]; /* 8-bit case: RAM/ROM */ - return handler_to_string(table, entry); + return handler_to_string(space, table, entry); } @@ -1640,9 +1643,9 @@ static void memory_init_preflight(running_machine *machine) { memory_private *memdata = machine->memory_data; address_space *space; - - /* zap the bank data */ - memset(&memdata->bankdata, 0, sizeof(memdata->bankdata)); + + /* reset the banking state */ + memdata->banknext = STATIC_BANK1; /* loop over valid address spaces */ for (space = (address_space *)memdata->spacelist; space != NULL; space = (address_space *)space->next) @@ -1699,12 +1702,6 @@ static void memory_init_preflight(running_machine *machine) /* convert any region-relative entries to their memory pointers */ if (entry->region != NULL) entry->memory = memory_region(machine, entry->region) + entry->rgnoffs; - - /* assign static banks for explicitly specified entries */ - if (HANDLER_IS_BANK(entry->read.generic)) - bank_assign_static(HANDLER_TO_BANK(entry->read.generic), space, ROW_READ, entry->bytestart, entry->byteend); - if (HANDLER_IS_BANK(entry->write.generic)) - bank_assign_static(HANDLER_TO_BANK(entry->write.generic), space, ROW_WRITE, entry->bytestart, entry->byteend); } /* now loop over all the handlers and enforce the address mask */ @@ -1785,6 +1782,20 @@ static void memory_init_populate(running_machine *machine) space_map_range_private(space, ROW_WRITE, bits, entry->write_mask, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, handler, (void *)port, entry->write_porttag); } + /* if we have a read bank tag, look it up */ + if (entry->read_banktag != NULL) + { + void *handler = bank_find_or_allocate(space, entry->read_banktag, entry->addrstart, entry->addrend, ROW_READ); + space_map_range_private(space, ROW_READ, space->dbits, entry->read_mask, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, handler, space, entry->read_banktag); + } + + /* if we have a write bank tag, look it up */ + if (entry->write_banktag != NULL) + { + void *handler = bank_find_or_allocate(space, entry->write_banktag, entry->addrstart, entry->addrend, ROW_WRITE); + space_map_range_private(space, ROW_WRITE, space->dbits, entry->write_mask, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, handler, space, entry->write_banktag); + } + /* install the read handler if present */ if (rhandler.generic != NULL) { @@ -1907,7 +1918,7 @@ static void memory_init_locate(running_machine *machine) { memory_private *memdata = machine->memory_data; address_space *space; - int banknum; + bank_info *bank; /* loop over valid address spaces */ for (space = (address_space *)memdata->spacelist; space != NULL; space = (address_space *)space->next) @@ -1934,30 +1945,26 @@ static void memory_init_locate(running_machine *machine) } /* once this is done, find the starting bases for the banks */ - for (banknum = 1; banknum <= MAX_BANKS; banknum++) + for (bank = memdata->banklist; bank != NULL; bank = bank->next) { - bank_info *bank = &memdata->bankdata[banknum]; - if (bank->used) - { - address_map_entry *entry; - bank_reference *ref; - int foundit = FALSE; + address_map_entry *entry; + bank_reference *ref; + int foundit = FALSE; - /* set the initial bank pointer */ - for (ref = bank->reflist; !foundit && ref != NULL; ref = ref->next) - for (entry = ref->space->map->entrylist; entry != NULL; entry = entry->next) - if (entry->bytestart == bank->bytestart) - { - memdata->bank_ptr[banknum] = (UINT8 *)entry->memory; - foundit = TRUE; - VPRINTF(("assigned bank %d pointer to memory from range %08X-%08X [%p]\n", banknum, entry->addrstart, entry->addrend, entry->memory)); - break; - } + /* set the initial bank pointer */ + for (ref = bank->reflist; !foundit && ref != NULL; ref = ref->next) + for (entry = ref->space->map->entrylist; entry != NULL; entry = entry->next) + if (entry->bytestart == bank->bytestart && entry->memory != NULL) + { + memdata->bank_ptr[bank->index] = (UINT8 *)entry->memory; + foundit = TRUE; + VPRINTF(("assigned bank '%s' pointer to memory from range %08X-%08X [%p]\n", bank->tag, entry->addrstart, entry->addrend, entry->memory)); + break; + } - /* if the entry was set ahead of time, override the automatically found pointer */ - if (!bank->dynamic && bank->curentry != MAX_BANK_ENTRIES) - memdata->bank_ptr[banknum] = (UINT8 *)bank->entry[bank->curentry]; - } + /* if the entry was set ahead of time, override the automatically found pointer */ + if (bank->tag[0] != '~' && bank->curentry != MAX_BANK_ENTRIES) + memdata->bank_ptr[bank->index] = (UINT8 *)bank->entry[bank->curentry]; } /* request a callback to fix up the banks when done */ @@ -1973,7 +1980,6 @@ static void memory_exit(running_machine *machine) { memory_private *memdata = machine->memory_data; address_space *space, *nextspace; - int banknum; /* free the memory blocks */ while (memdata->memory_block_list != NULL) @@ -1982,17 +1988,22 @@ static void memory_exit(running_machine *machine) memdata->memory_block_list = block->next; free(block); } - - /* free all the bank references */ - for (banknum = 0; banknum < STATIC_COUNT; banknum++) + + /* free banks */ + while (memdata->banklist != NULL) { - bank_info *bank = &memdata->bankdata[banknum]; + bank_info *bank = memdata->banklist; + + /* free references within each bank */ while (bank->reflist != NULL) { bank_reference *ref = bank->reflist; bank->reflist = ref->next; free(ref); } + + memdata->banklist = bank->next; + free(bank); } /* free all the address spaces and tables */ @@ -2029,6 +2040,12 @@ static void memory_exit(running_machine *machine) free(space); } + + /* free the maps */ + if (memdata->bankmap != NULL) + tagmap_free(memdata->bankmap); + if (memdata->sharemap != NULL) + tagmap_free(memdata->sharemap); } @@ -2184,6 +2201,16 @@ static void map_detokenize(address_map *map, const game_driver *driver, const ch entry->write_porttag = TOKEN_GET_STRING(tokens); break; + case ADDRMAP_TOKEN_READ_BANK: + check_entry_field(read_banktag); + entry->read_banktag = TOKEN_GET_STRING(tokens); + break; + + case ADDRMAP_TOKEN_WRITE_BANK: + check_entry_field(write_banktag); + entry->write_banktag = TOKEN_GET_STRING(tokens); + break; + case ADDRMAP_TOKEN_REGION: check_entry_field(region); TOKEN_UNGET_UINT32(tokens); @@ -2276,7 +2303,7 @@ static void space_map_range_private(address_space *space, read_or_write readorwr adjust_addresses(space, &bytestart, &byteend, &bytemask, &bytemirror); /* assign a bank to the adjusted addresses */ - handler = (genf *)bank_assign_dynamic(space, readorwrite, bytestart, byteend); + handler = bank_find_or_allocate(space, NULL, bytestart, byteend, readorwrite); if (memdata->bank_ptr[HANDLER_TO_BANK(handler)] == NULL) memdata->bank_ptr[HANDLER_TO_BANK(handler)] = (UINT8 *)space_find_backing_memory(space, bytestart); } @@ -2319,10 +2346,6 @@ static void space_map_range(address_space *space, read_or_write readorwrite, int assert_always((bytestart & (space->dbits / 8 - 1)) == 0, "space_map_range called with misaligned start address"); assert_always((byteend & (space->dbits / 8 - 1)) == (space->dbits / 8 - 1), "space_map_range called with misaligned end address"); - /* if we're installing a new bank, make sure we mark it */ - if (HANDLER_IS_BANK(handler)) - bank_assign_static(HANDLER_TO_BANK(handler), space, readorwrite, bytestart, byteend); - /* get the final handler index */ entry = table_assign_handler(space, tabledata->handlers, object, handler, handler_name, bytestart, byteend, bytemask); @@ -2395,32 +2418,20 @@ static void *space_find_backing_memory(const address_space *space, offs_t bytead static int space_needs_backing_store(const address_space *space, const address_map_entry *entry) { - FPTR handler; - + /* if we are asked to provide a base pointer, then yes, we do need backing */ if (entry->baseptr != NULL || entry->baseptroffs_plus1 != 0 || entry->genbaseptroffs_plus1 != 0) return TRUE; - handler = (FPTR)entry->write.generic; - if (handler < STATIC_COUNT) - { - if (handler != STATIC_INVALID && - handler != STATIC_ROM && - handler != STATIC_NOP && - handler != STATIC_UNMAP) - return TRUE; - } - - handler = (FPTR)entry->read.generic; - if (handler < STATIC_COUNT) - { - if (handler != STATIC_INVALID && - (handler < STATIC_BANK1 || handler > STATIC_BANK1 + MAX_BANKS - 1) && - (handler != STATIC_ROM || space->spacenum != ADDRESS_SPACE_0 || entry->addrstart >= memory_region_length(space->machine, space->cpu->tag)) && - handler != STATIC_NOP && - handler != STATIC_UNMAP) - return TRUE; - } - + /* if we're writing to any sort of bank or RAM, then yes, we do need backing */ + if (entry->write_banktag != NULL || (FPTR)entry->write.generic == STATIC_RAM) + return TRUE; + + /* if we're reading from RAM or from ROM outside of address space 0 or its region, then yes, we do need backing */ + if ((FPTR)entry->read.generic == STATIC_RAM || + ((FPTR)entry->read.generic == STATIC_ROM && (space->spacenum != ADDRESS_SPACE_0 || entry->addrstart >= memory_region_length(space->machine, space->cpu->tag)))) + return TRUE; + + /* all other cases don't need backing */ return FALSE; } @@ -2431,66 +2442,89 @@ static int space_needs_backing_store(const address_space *space, const address_m ***************************************************************************/ /*------------------------------------------------- - bank_assign_static - assign and tag a static - bank + bank_find_or_allocate - allocate a new + bank, or find an existing one, and return the + SMH_BANK(n) handler -------------------------------------------------*/ -static void bank_assign_static(int banknum, const address_space *space, read_or_write readorwrite, offs_t bytestart, offs_t byteend) +void *bank_find_or_allocate(const address_space *space, const char *tag, offs_t bytestart, offs_t byteend, read_or_write readorwrite) { - bank_info *bank = &space->machine->memory_data->bankdata[banknum]; - - /* if we're not yet used, fill in the data */ - if (!bank->used) + memory_private *memdata = space->machine->memory_data; + bank_info *bank = NULL; + char temptag[10]; + char name[30]; + + /* if this bank is named, look it up */ + if (tag != NULL) + bank = tagmap_find_hash_only(memdata->bankmap, tag); + + /* else try to find an exact match */ + else { - /* if we're allowed to, wire up state saving for the entry */ - if (state_save_registration_allowed(space->machine)) - state_save_register_item(space->machine, "memory", NULL, banknum, bank->curentry); - - /* fill in information about the bank */ - bank->used = TRUE; - bank->dynamic = FALSE; - add_bank_reference(bank, space); + for (bank = memdata->banklist; bank != NULL; bank = bank->next) + if (bank->tag[0] == '~' && bank->bytestart == bytestart && bank->byteend == byteend && bank->reflist != NULL && bank->reflist->space == space) + break; + } + + /* if we don't have a bank yet, find a free one */ + if (bank == NULL) + { + int banknum = memdata->banknext++; + + /* handle failure */ + if (banknum > STATIC_BANKMAX) + { + if (tag != NULL) + fatalerror("Unable to allocate new bank '%s'", tag); + else + fatalerror("Unable to allocate bank for RAM/ROM area %X-%X\n", bytestart, byteend); + } + + /* generate an internal tag if we don't have one */ + if (tag == NULL) + { + sprintf(temptag, "~%d~", banknum); + tag = temptag; + sprintf(name, "Internal bank #%d", banknum); + } + else + sprintf(name, "Bank '%s'", tag); + + /* allocate the bank */ + bank = (bank_info *)alloc_array_clear_or_die(UINT8, sizeof(bank_info) + strlen(tag) + 1 + strlen(name)); + + /* populate it */ + bank->index = banknum; + bank->handler = SMH_BANK(banknum); bank->bytestart = bytestart; bank->byteend = byteend; bank->curentry = MAX_BANK_ENTRIES; - } - - /* update the read/write status of the bank */ - if (readorwrite == ROW_READ) - bank->read = TRUE; - else - bank->write = TRUE; -} - - -/*------------------------------------------------- - bank_assign_dynamic - finds a free or exact - matching bank --------------------------------------------------*/ - -static genf *bank_assign_dynamic(const address_space *space, read_or_write readorwrite, offs_t bytestart, offs_t byteend) -{ - int banknum; - - /* loop over banks, searching for an exact match or an empty */ - for (banknum = MAX_BANKS; banknum >= 1; banknum--) - { - bank_info *bank = &space->machine->memory_data->bankdata[banknum]; - if (!bank->used || (bank->dynamic && bank_references_space(bank, space) && bank->bytestart == bytestart)) + strcpy(bank->tag, tag); + bank->name = bank->tag + strlen(tag) + 1; + strcpy(bank->name, name); + + /* add us to the list */ + bank->next = memdata->banklist; + memdata->banklist = bank; + + /* for named banks, add to the map and register for save states */ + if (tag[0] != '~') { - bank->used = TRUE; - bank->dynamic = TRUE; - add_bank_reference(bank, space); - bank->bytestart = bytestart; - bank->byteend = byteend; - VPRINTF(("Assigned bank %d to '%s',%s,%08X\n", banknum, space->cpu->tag, space->name, bytestart)); - return BANK_TO_HANDLER(banknum); + tagmap_add_unique_hash(memdata->bankmap, tag, bank); + if (state_save_registration_allowed(space->machine)) + state_save_register_item(space->machine, "memory", bank->tag, 0, bank->curentry); } } + + /* update the read/write state for this bank */ + if (readorwrite == ROW_READ) + bank->read = TRUE; + if (readorwrite == ROW_WRITE) + bank->write = TRUE; - /* if we got here, we failed */ - fatalerror("Device '%s': ran out of banks for RAM/ROM regions!", space->cpu->tag); - return NULL; + /* add a reference for this space */ + add_bank_reference(bank, space); + return bank->handler; } @@ -2501,19 +2535,16 @@ static genf *bank_assign_dynamic(const address_space *space, read_or_write reado static STATE_POSTLOAD( bank_reattach ) { memory_private *memdata = machine->memory_data; - int banknum; + bank_info *bank; /* once this is done, find the starting bases for the banks */ - for (banknum = 1; banknum <= MAX_BANKS; banknum++) - { - bank_info *bank = &memdata->bankdata[banknum]; - if (bank->used && !bank->dynamic) + for (bank = memdata->banklist; bank != NULL; bank = bank->next) + if (bank->tag[0] != '~') { /* if this entry has a changed entry, set the appropriate pointer */ if (bank->curentry != MAX_BANK_ENTRIES) - memdata->bank_ptr[banknum] = (UINT8 *)bank->entry[bank->curentry]; + memdata->bank_ptr[bank->index] = (UINT8 *)bank->entry[bank->curentry]; } - } } @@ -3480,7 +3511,7 @@ static genf *get_static_handler(int handlerbits, int readorwrite, int which) description of a handler -------------------------------------------------*/ -static const char *handler_to_string(const address_table *table, UINT8 entry) +static const char *handler_to_string(const address_space *space, const address_table *table, UINT8 entry) { static const char *const strings[] = { @@ -3508,16 +3539,25 @@ static const char *handler_to_string(const address_table *table, UINT8 entry) "bank 84", "bank 85", "bank 86", "bank 87", "bank 88", "bank 89", "bank 90", "bank 91", "bank 92", "bank 93", "bank 94", "bank 95", - "bank 96", "ram[97]", "ram[98]", "ram[99]", - "ram[100]", "ram[101]", "ram[102]", "ram[103]", - "ram[104]", "ram[105]", "ram[106]", "ram[107]", - "ram[108]", "ram[109]", "ram[110]", "ram[111]", - "ram[112]", "ram[113]", "ram[114]", "ram[115]", - "ram[116]", "ram[117]", "ram[118]", "ram[119]", - "ram[120]", "ram[121]", "ram[122]", "ram", + "bank 96", "bank 97", "bank 98", "bank 99", + "bank 100", "bank 101", "bank 102", "bank 103", + "bank 104", "bank 105", "bank 106", "bank 107", + "bank 108", "bank 109", "bank 110", "bank 111", + "bank 112", "bank 113", "bank 114", "bank 115", + "bank 116", "bank 117", "bank 118", "bank 119", + "bank 120", "bank 121", "bank 122", "ram", "rom", "nop", "unmapped", "watchpoint" }; - + + /* banks have names */ + if (entry >= STATIC_BANK1 && entry <= STATIC_BANKMAX) + { + bank_info *info; + for (info = space->machine->memory_data->banklist; info != NULL; info = info->next) + if (info->index == entry) + return info->name; + } + /* constant strings for lower entries */ if (entry < STATIC_COUNT) return strings[entry]; @@ -3548,7 +3588,7 @@ static void dump_map(FILE *file, const address_space *space, const address_table { UINT8 entry = table_derive_range(table, byteaddress, &bytestart, &byteend); fprintf(file, "%08X-%08X = %02X: %s [offset=%08X]\n", - bytestart, byteend, entry, handler_to_string(table, entry), table->handlers[entry]->bytestart); + bytestart, byteend, entry, handler_to_string(space, table, entry), table->handlers[entry]->bytestart); } } diff --git a/src/emu/memory.h b/src/emu/memory.h index 1f975cc3f0a..92844f7fd27 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -73,6 +73,8 @@ enum ADDRMAP_TOKEN_DEVICE_WRITE, ADDRMAP_TOKEN_READ_PORT, ADDRMAP_TOKEN_WRITE_PORT, + ADDRMAP_TOKEN_READ_BANK, + ADDRMAP_TOKEN_WRITE_BANK, ADDRMAP_TOKEN_REGION, ADDRMAP_TOKEN_SHARE, ADDRMAP_TOKEN_BASEPTR, @@ -229,6 +231,8 @@ struct _address_map_entry const char * read_devtag; /* read tag for the relevant device */ const char * read_porttag; /* tag for input port reading */ const char * write_porttag; /* tag for output port writing */ + const char * read_banktag; /* tag for bank reading */ + const char * write_banktag; /* tag for bank writing */ write_handler write; /* write handler callback */ UINT8 write_bits; /* bits for the write handler callback (0=default, 1=8, 2=16, 3=32) */ UINT8 write_mask; /* mask bits indicating which subunits to process */ @@ -502,6 +506,8 @@ union _addrmap64_token #define memory_install_read_port_handler(space, start, end, mask, mirror, rtag) \ _memory_install_port_handler(space, start, end, mask, mirror, rtag, NULL) +#define memory_install_read_bank_handler(space, start, end, mask, mirror, rtag) \ + _memory_install_bank_handler(space, start, end, mask, mirror, rtag, NULL) /* wrappers for dynamic write handler installation */ #define memory_install_write_handler(space, start, end, mask, mirror, whandler) \ @@ -528,6 +534,8 @@ union _addrmap64_token #define memory_install_write_port_handler(space, start, end, mask, mirror, wtag) \ _memory_install_port_handler(space, start, end, mask, mirror, NULL, wtag) +#define memory_install_write_bank_handler(space, start, end, mask, mirror, wtag) \ + _memory_install_bank_handler(space, start, end, mask, mirror, NULL, wtag) /* wrappers for dynamic read/write handler installation */ #define memory_install_readwrite_handler(space, start, end, mask, mirror, rhandler, whandler) \ @@ -554,6 +562,8 @@ union _addrmap64_token #define memory_install_readwrite_port_handler(space, start, end, mask, mirror, rtag, wtag) \ _memory_install_port_handler(space, start, end, mask, mirror, rtag, wtag) +#define memory_install_readwrite_bank_handler(space, start, end, mask, mirror, tag) \ + _memory_install_bank_handler(space, start, end, mask, mirror, tag, tag) /* macros for accessing bytes and words within larger chunks */ @@ -755,6 +765,14 @@ union _addrmap64_token TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_WRITE_PORT, 8, 0, 8, 0, 8), \ TOKEN_STRING(_tag), +#define AM_READ_BANK(_tag) \ + TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_READ_BANK, 8, 0, 8, 0, 8), \ + TOKEN_STRING(_tag), + +#define AM_WRITE_BANK(_tag) \ + TOKEN_UINT32_PACK3(ADDRMAP_TOKEN_WRITE_BANK, 8, 0, 8, 0, 8), \ + TOKEN_STRING(_tag), + #define AM_REGION(_tag, _offs) \ TOKEN_UINT64_PACK2(ADDRMAP_TOKEN_REGION, 8, _offs, 32), \ TOKEN_STRING(_tag), @@ -795,10 +813,10 @@ union _addrmap64_token #define AM_DEVREADWRITE32(_tag,_read,_write,_mask) AM_DEVREAD32(_tag,_read,_mask) AM_DEVWRITE32(_tag,_write,_mask) #define AM_ROM AM_READ(SMH_ROM) -#define AM_ROMBANK(_bank) AM_READ(SMH_BANK(_bank)) +#define AM_ROMBANK(_bank) AM_READ_BANK(_bank) #define AM_RAM AM_READWRITE(SMH_RAM, SMH_RAM) -#define AM_RAMBANK(_bank) AM_READWRITE(SMH_BANK(_bank), SMH_BANK(_bank)) +#define AM_RAMBANK(_bank) AM_READ_BANK(_bank) AM_WRITE_BANK(_bank) #define AM_RAM_WRITE(_write) AM_READWRITE(SMH_RAM, _write) #define AM_WRITEONLY AM_WRITE(SMH_RAM) @@ -867,22 +885,19 @@ void *memory_get_write_ptr(const address_space *space, offs_t byteaddress) ATTR_ /* ----- memory banking ----- */ /* configure the addresses for a bank */ -void memory_configure_bank(running_machine *machine, int banknum, int startentry, int numentries, void *base, offs_t stride) ATTR_NONNULL(1, 5); +void memory_configure_bank(running_machine *machine, const char *tag, int startentry, int numentries, void *base, offs_t stride) ATTR_NONNULL(1, 5); /* configure the decrypted addresses for a bank */ -void memory_configure_bank_decrypted(running_machine *machine, int banknum, int startentry, int numentries, void *base, offs_t stride) ATTR_NONNULL(1, 5); +void memory_configure_bank_decrypted(running_machine *machine, const char *tag, int startentry, int numentries, void *base, offs_t stride) ATTR_NONNULL(1, 5); /* select one pre-configured entry to be the new bank base */ -void memory_set_bank(running_machine *machine, int banknum, int entrynum) ATTR_NONNULL(1); +void memory_set_bank(running_machine *machine, const char *tag, int entrynum) ATTR_NONNULL(1); /* return the currently selected bank */ -int memory_get_bank(running_machine *machine, int banknum) ATTR_NONNULL(1); +int memory_get_bank(running_machine *machine, const char *tag) ATTR_NONNULL(1); /* set the absolute address of a bank base */ -void memory_set_bankptr(running_machine *machine, int banknum, void *base) ATTR_NONNULL(1, 3); - -/* return the index of an unused bank */ -int memory_find_unused_bank(running_machine *machine) ATTR_NONNULL(1); +void memory_set_bankptr(running_machine *machine, const char *tag, void *base) ATTR_NONNULL(1, 3); @@ -921,6 +936,9 @@ UINT64 *_memory_install_device_handler64(const address_space *space, const devic /* install a new port handler into the given address space */ void _memory_install_port_handler(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag) ATTR_NONNULL(1); +/* install a new bank handler into the given address space */ +void _memory_install_bank_handler(const address_space *space, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *rtag, const char *wtag) ATTR_NONNULL(1); + /* ----- debugger helpers ----- */ diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c index d528771797f..7614a80f4b6 100644 --- a/src/emu/sound/okim6295.c +++ b/src/emu/sound/okim6295.c @@ -50,7 +50,7 @@ struct _okim6295_state struct ADPCMVoice voice[OKIM6295_VOICES]; const device_config *device; INT32 command; - INT32 bank_num; + UINT8 bank_installed; INT32 bank_offs; sound_stream *stream; /* which stream are we playing on? */ UINT32 master_clock; /* master clock frequency */ @@ -352,7 +352,7 @@ static DEVICE_START( okim6295 ) compute_tables(); info->command = -1; - info->bank_num = -1; + info->bank_installed = FALSE; info->bank_offs = 0; info->device = device; @@ -404,21 +404,18 @@ void okim6295_set_bank_base(const device_config *device, int base) stream_update(info->stream); /* if we are setting a non-zero base, and we have no bank, allocate one */ - if (info->bank_num == -1 && base != 0) + if (!info->bank_installed && base != 0) { - info->bank_num = memory_find_unused_bank(device->machine); - if (info->bank_num == -1) - fatalerror("Unable to allocate bank for oki6295 device '%s'", device->tag); - /* override our memory map with a bank */ - memory_install_read8_handler(device->space[0], 0x00000, 0x3ffff, 0, 0, (read8_space_func)SMH_BANK(info->bank_num)); + memory_install_read_bank_handler(device->space[0], 0x00000, 0x3ffff, 0, 0, device->tag); + info->bank_installed = TRUE; } /* if we have a bank number, set the base pointer */ - if (info->bank_num != -1) + if (info->bank_installed) { info->bank_offs = base; - memory_set_bankptr(device->machine, info->bank_num, device->region + base); + memory_set_bankptr(device->machine, device->tag, device->region + base); } } diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c index a9ee776fd4a..458a85077ae 100644 --- a/src/mame/audio/atarijsa.c +++ b/src/mame/audio/atarijsa.c @@ -82,13 +82,13 @@ static WRITE8_HANDLER( jsa3_io_w ); *************************************/ static ADDRESS_MAP_START( jsa3_oki_map, 0, 8 ) - AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK(12) - AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK(13) + AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("bank12") + AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank13") ADDRESS_MAP_END static ADDRESS_MAP_START( jsa3_oki2_map, 0, 8 ) - AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK(14) - AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK(15) + AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("bank14") + AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank15") ADDRESS_MAP_END @@ -161,10 +161,11 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask) UINT8 *base = memory_region(machine, regions[rgn]); if (base != NULL && memory_region_length(machine, regions[rgn]) >= 0x80000) { - int banknum = (rgn != 2) ? 12 : 14; - memory_configure_bank(machine, banknum, 0, 2, base + 0x00000, 0x00000); - memory_configure_bank(machine, banknum, 2, 2, base + 0x20000, 0x20000); - memory_set_bankptr(machine, banknum + 1, base + 0x60000); + const char *bank = (rgn != 2) ? "bank12" : "bank14"; + const char *bank_plus_1 = (rgn != 2) ? "bank13" : "bank15"; + memory_configure_bank(machine, bank, 0, 2, base + 0x00000, 0x00000); + memory_configure_bank(machine, bank, 2, 2, base + 0x20000, 0x20000); + memory_set_bankptr(machine, bank_plus_1, base + 0x60000); } } } @@ -531,7 +532,7 @@ static WRITE8_HANDLER( jsa3_io_w ) /* update the OKI bank */ if (oki6295 != NULL) - memory_set_bank(space->machine, 12, (memory_get_bank(space->machine, 12) & 2) | ((data >> 1) & 1)); + memory_set_bank(space->machine, "bank12", (memory_get_bank(space->machine, "bank12") & 2) | ((data >> 1) & 1)); /* update the bank */ memcpy(bank_base, &bank_source_data[0x1000 * ((data >> 6) & 3)], 0x1000); @@ -556,7 +557,7 @@ static WRITE8_HANDLER( jsa3_io_w ) /* update the OKI bank */ if (oki6295 != NULL) - memory_set_bank(space->machine, 12, (memory_get_bank(space->machine, 12) & 1) | ((data >> 3) & 2)); + memory_set_bank(space->machine, "bank12", (memory_get_bank(space->machine, "bank12") & 1) | ((data >> 3) & 2)); /* update the volumes */ ym2151_volume = ((data >> 1) & 7) * 100 / 7; @@ -661,7 +662,7 @@ static WRITE8_HANDLER( jsa3s_io_w ) */ /* update the OKI bank */ - memory_set_bank(space->machine, 12, (memory_get_bank(space->machine, 12) & 2) | ((data >> 1) & 1)); + memory_set_bank(space->machine, "bank12", (memory_get_bank(space->machine, "bank12") & 2) | ((data >> 1) & 1)); /* update the bank */ memcpy(bank_base, &bank_source_data[0x1000 * ((data >> 6) & 3)], 0x1000); @@ -686,8 +687,8 @@ static WRITE8_HANDLER( jsa3s_io_w ) */ /* update the OKI bank */ - memory_set_bank(space->machine, 12, (memory_get_bank(space->machine, 12) & 1) | ((data >> 3) & 2)); - memory_set_bank(space->machine, 14, data >> 6); + memory_set_bank(space->machine, "bank12", (memory_get_bank(space->machine, "bank12") & 1) | ((data >> 3) & 2)); + memory_set_bank(space->machine, "bank14", data >> 6); /* update the volumes */ ym2151_volume = ((data >> 1) & 7) * 100 / 7; diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c index 38e072efe60..e04a6551fe0 100644 --- a/src/mame/audio/cage.c +++ b/src/mame/audio/cage.c @@ -160,8 +160,8 @@ void cage_init(running_machine *machine, offs_t speedup) cage_irqhandler = NULL; - memory_set_bankptr(machine, 10, memory_region(machine, "cageboot")); - memory_set_bankptr(machine, 11, memory_region(machine, "cage")); + memory_set_bankptr(machine, "bank10", memory_region(machine, "cageboot")); + memory_set_bankptr(machine, "bank11", memory_region(machine, "cage")); cage_cpu = cputag_get_cpu(machine, "cage"); cage_cpu_clock_period = ATTOTIME_IN_HZ(cpu_get_clock(cage_cpu)); @@ -619,24 +619,24 @@ static const tms32031_config cage_config = static ADDRESS_MAP_START( cage_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_RANGE(0x200000, 0x200000) AM_WRITENOP - AM_RANGE(0x400000, 0x47ffff) AM_ROMBANK(10) + AM_RANGE(0x400000, 0x47ffff) AM_ROMBANK("bank10") AM_RANGE(0x808000, 0x8080ff) AM_READWRITE(tms32031_io_r, tms32031_io_w) AM_BASE(&tms32031_io_regs) AM_RANGE(0x809800, 0x809fff) AM_RAM AM_RANGE(0xa00000, 0xa00000) AM_READWRITE(cage_from_main_r, cage_to_main_w) - AM_RANGE(0xc00000, 0xffffff) AM_ROMBANK(11) + AM_RANGE(0xc00000, 0xffffff) AM_ROMBANK("bank11") ADDRESS_MAP_END static ADDRESS_MAP_START( cage_map_seattle, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_RANGE(0x200000, 0x200000) AM_WRITENOP - AM_RANGE(0x400000, 0x47ffff) AM_ROMBANK(10) + AM_RANGE(0x400000, 0x47ffff) AM_ROMBANK("bank10") AM_RANGE(0x808000, 0x8080ff) AM_READWRITE(tms32031_io_r, tms32031_io_w) AM_BASE(&tms32031_io_regs) AM_RANGE(0x809800, 0x809fff) AM_RAM AM_RANGE(0xa00000, 0xa00000) AM_READWRITE(cage_from_main_r, cage_from_main_ack_w) AM_RANGE(0xa00001, 0xa00001) AM_WRITE(cage_to_main_w) AM_RANGE(0xa00003, 0xa00003) AM_READ(cage_io_status_r) - AM_RANGE(0xc00000, 0xffffff) AM_ROMBANK(11) + AM_RANGE(0xc00000, 0xffffff) AM_ROMBANK("bank11") ADDRESS_MAP_END diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c index 196e7f91d90..600e3ba7d6d 100644 --- a/src/mame/audio/cyberbal.c +++ b/src/mame/audio/cyberbal.c @@ -25,7 +25,7 @@ void cyberbal_sound_reset(running_machine *machine) { /* reset the sound system */ bank_base = &memory_region(machine, "audiocpu")[0x10000]; - memory_set_bankptr(machine, 8, &bank_base[0x0000]); + memory_set_bankptr(machine, "bank8", &bank_base[0x0000]); fast_68k_int = io_68k_int = 0; sound_data_from_68k = sound_data_from_6502 = 0; sound_data_from_68k_ready = sound_data_from_6502_ready = 0; @@ -60,7 +60,7 @@ READ8_HANDLER( cyberbal_sound_6502_stat_r ) WRITE8_HANDLER( cyberbal_sound_bank_select_w ) { - memory_set_bankptr(space->machine, 8, &bank_base[0x1000 * ((data >> 6) & 3)]); + memory_set_bankptr(space->machine, "bank8", &bank_base[0x1000 * ((data >> 6) & 3)]); coin_counter_w(space->machine, 1, (data >> 5) & 1); coin_counter_w(space->machine, 0, (data >> 4) & 1); cputag_set_input_line(space->machine, "dac", INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index 8af7a13db87..b1118089e84 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -440,7 +440,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dcs_2k_data_map, ADDRESS_SPACE_DATA, 16 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_READWRITE(dcs_dataram_r, dcs_dataram_w) - AM_RANGE(0x2000, 0x2fff) AM_ROMBANK(20) + AM_RANGE(0x2000, 0x2fff) AM_ROMBANK("bank20") AM_RANGE(0x3000, 0x33ff) AM_WRITE(dcs_data_bank_select_w) AM_RANGE(0x3400, 0x37ff) AM_READWRITE(input_latch_r, output_latch_w) AM_RANGE(0x3800, 0x39ff) AM_RAM @@ -451,7 +451,7 @@ ADDRESS_MAP_END /* DCS 2k with UART memory map */ static ADDRESS_MAP_START( dcs_2k_uart_data_map, ADDRESS_SPACE_DATA, 16 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_READWRITE(dcs_dataram_r, dcs_dataram_w) - AM_RANGE(0x2000, 0x2fff) AM_ROMBANK(20) + AM_RANGE(0x2000, 0x2fff) AM_ROMBANK("bank20") AM_RANGE(0x3000, 0x33ff) AM_WRITE(dcs_data_bank_select_w) AM_RANGE(0x3400, 0x3402) AM_NOP /* UART (ignored) */ AM_RANGE(0x3403, 0x3403) AM_READWRITE(input_latch_r, output_latch_w) @@ -470,7 +470,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dcs_8k_data_map, ADDRESS_SPACE_DATA, 16 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_RANGE(0x0800, 0x1fff) AM_READWRITE(dcs_dataram_r, dcs_dataram_w) - AM_RANGE(0x2000, 0x2fff) AM_ROMBANK(20) + AM_RANGE(0x2000, 0x2fff) AM_ROMBANK("bank20") AM_RANGE(0x3000, 0x33ff) AM_WRITE(dcs_data_bank_select_w) AM_RANGE(0x3400, 0x37ff) AM_READWRITE(input_latch_r, output_latch_w) AM_RANGE(0x3800, 0x39ff) AM_RAM @@ -536,7 +536,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dsio_data_map, ADDRESS_SPACE_DATA, 16 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x03ff) AM_RAMBANK(20) + AM_RANGE(0x0000, 0x03ff) AM_RAMBANK("bank20") AM_RANGE(0x0400, 0x3fdf) AM_RAM AM_RANGE(0x3fe0, 0x3fff) AM_READWRITE(adsp_control_r, adsp_control_w) ADDRESS_MAP_END @@ -568,7 +568,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( denver_data_map, ADDRESS_SPACE_DATA, 16 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x07ff) AM_RAMBANK(20) + AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("bank20") AM_RANGE(0x0800, 0x3fdf) AM_RAM AM_RANGE(0x3fe0, 0x3fff) AM_READWRITE(adsp_control_r, adsp_control_w) ADDRESS_MAP_END @@ -809,7 +809,7 @@ static TIMER_CALLBACK( dcs_reset ) /* rev 1: just reset the bank to 0 */ case 1: dcs.sounddata_bank = 0; - memory_set_bank(machine, 20, 0); + memory_set_bank(machine, "bank20", 0); break; /* rev 2: reset the SDRC ASIC */ @@ -945,7 +945,7 @@ void dcs_init(running_machine *machine) dcs.sounddata = dcs.bootrom; dcs.sounddata_words = dcs.bootrom_words; dcs.sounddata_banks = dcs.sounddata_words / 0x1000; - memory_configure_bank(machine, 20, 0, dcs.sounddata_banks, dcs.sounddata, 0x1000*2); + memory_configure_bank(machine, "bank20", 0, dcs.sounddata_banks, dcs.sounddata, 0x1000*2); /* create the timers */ dcs.internal_timer = timer_alloc(machine, internal_timer_callback, NULL); @@ -1007,7 +1007,7 @@ void dcs2_init(running_machine *machine, int dram_in_mb, offs_t polling_offset) } dcs.sounddata_banks = dcs.sounddata_words / soundbank_words; if (dcs.rev != 2) - memory_configure_bank(machine, 20, 0, dcs.sounddata_banks, dcs.sounddata, soundbank_words*2); + memory_configure_bank(machine, "bank20", 0, dcs.sounddata_banks, dcs.sounddata, soundbank_words*2); /* allocate memory for the SRAM */ dcs_sram = auto_alloc_array(machine, UINT16, 0x8000*4/2); @@ -1068,7 +1068,7 @@ static WRITE16_HANDLER( dcs_dataram_w ) static WRITE16_HANDLER( dcs_data_bank_select_w ) { dcs.sounddata_bank = data & 0x7ff; - memory_set_bank(space->machine, 20, dcs.sounddata_bank % dcs.sounddata_banks); + memory_set_bank(space->machine, "bank20", dcs.sounddata_bank % dcs.sounddata_banks); /* bit 11 = sound board led */ #if 0 @@ -1095,15 +1095,15 @@ INLINE void sdrc_update_bank_pointers(running_machine *machine) { /* ROM-based; use the memory page to select from ROM */ if (SDRC_ROM_MS == 1 && SDRC_ROM_ST != 3) - memory_set_bankptr(machine, 25, &dcs.sounddata[(SDRC_EPM_PG * pagesize) % dcs.sounddata_words]); + memory_set_bankptr(machine, "bank25", &dcs.sounddata[(SDRC_EPM_PG * pagesize) % dcs.sounddata_words]); } else { /* RAM-based; use the ROM page to select from ROM, and the memory page to select from RAM */ if (SDRC_ROM_MS == 1 && SDRC_ROM_ST != 3) - memory_set_bankptr(machine, 25, &dcs.bootrom[(SDRC_ROM_PG * 4096 /*pagesize*/) % dcs.bootrom_words]); + memory_set_bankptr(machine, "bank25", &dcs.bootrom[(SDRC_ROM_PG * 4096 /*pagesize*/) % dcs.bootrom_words]); if (SDRC_DM_ST != 0) - memory_set_bankptr(machine, 26, &dcs.sounddata[(SDRC_DM_PG * 1024) % dcs.sounddata_words]); + memory_set_bankptr(machine, "bank26", &dcs.sounddata[(SDRC_DM_PG * 1024) % dcs.sounddata_words]); } } } @@ -1122,29 +1122,29 @@ static void sdrc_remap_memory(running_machine *machine) else { /* first start with a clean program map */ - memory_install_readwrite32_handler(dcs.program, 0x0800, 0x3fff, 0, 0, (read32_space_func)SMH_BANK(21), (write32_space_func)SMH_BANK(21)); - memory_set_bankptr(machine, 21, dcs_sram + 0x4800); + memory_install_readwrite_bank_handler(dcs.program, 0x0800, 0x3fff, 0, 0, "bank21"); + memory_set_bankptr(machine, "bank21", dcs_sram + 0x4800); /* set up the data map based on the SRAM banking */ /* map 0: ram from 0800-37ff */ if (SDRC_SM_BK == 0) { - memory_install_readwrite16_handler(dcs.data, 0x0800, 0x17ff, 0, 0, (read16_space_func)SMH_BANK(22), (write16_space_func)SMH_BANK(22)); - memory_install_readwrite16_handler(dcs.data, 0x1800, 0x27ff, 0, 0, (read16_space_func)SMH_BANK(23), (write16_space_func)SMH_BANK(23)); - memory_install_readwrite16_handler(dcs.data, 0x2800, 0x37ff, 0, 0, (read16_space_func)SMH_BANK(24), (write16_space_func)SMH_BANK(24)); - memory_set_bankptr(machine, 22, dcs_sram + 0x0000); - memory_set_bankptr(machine, 23, dcs_sram + 0x1000); - memory_set_bankptr(machine, 24, dcs_sram + 0x2000); + memory_install_readwrite_bank_handler(dcs.data, 0x0800, 0x17ff, 0, 0, "bank22"); + memory_install_readwrite_bank_handler(dcs.data, 0x1800, 0x27ff, 0, 0, "bank23"); + memory_install_readwrite_bank_handler(dcs.data, 0x2800, 0x37ff, 0, 0, "bank24"); + memory_set_bankptr(machine, "bank22", dcs_sram + 0x0000); + memory_set_bankptr(machine, "bank23", dcs_sram + 0x1000); + memory_set_bankptr(machine, "bank24", dcs_sram + 0x2000); } /* map 1: nothing from 0800-17ff, alternate RAM at 1800-27ff, same RAM at 2800-37ff */ else { memory_install_readwrite16_handler(dcs.data, 0x0800, 0x17ff, 0, 0, (read16_space_func)SMH_UNMAP, (write16_space_func)SMH_UNMAP); - memory_install_readwrite16_handler(dcs.data, 0x1800, 0x27ff, 0, 0, (read16_space_func)SMH_BANK(23), (write16_space_func)SMH_BANK(23)); - memory_install_readwrite16_handler(dcs.data, 0x2800, 0x37ff, 0, 0, (read16_space_func)SMH_BANK(24), (write16_space_func)SMH_BANK(24)); - memory_set_bankptr(machine, 23, dcs_sram + 0x3000); - memory_set_bankptr(machine, 24, dcs_sram + 0x2000); + memory_install_readwrite_bank_handler(dcs.data, 0x1800, 0x27ff, 0, 0, "bank23"); + memory_install_readwrite_bank_handler(dcs.data, 0x2800, 0x37ff, 0, 0, "bank24"); + memory_set_bankptr(machine, "bank23", dcs_sram + 0x3000); + memory_set_bankptr(machine, "bank24", dcs_sram + 0x2000); } } @@ -1153,14 +1153,14 @@ static void sdrc_remap_memory(running_machine *machine) { int baseaddr = (SDRC_ROM_ST == 0) ? 0x0000 : (SDRC_ROM_ST == 1) ? 0x3000 : 0x3400; int pagesize = (SDRC_ROM_SZ == 0 && SDRC_ROM_ST != 0) ? 4096 : 1024; - memory_install_read16_handler(dcs.data, baseaddr, baseaddr + pagesize - 1, 0, 0, (read16_space_func)SMH_BANK(25)); + memory_install_read_bank_handler(dcs.data, baseaddr, baseaddr + pagesize - 1, 0, 0, "bank25"); } /* map the DRAM page as bank 26 */ if (SDRC_DM_ST != 0) { int baseaddr = (SDRC_DM_ST == 1) ? 0x0000 : (SDRC_DM_ST == 2) ? 0x3000 : 0x3400; - memory_install_readwrite16_handler(dcs.data, baseaddr, baseaddr + 0x3ff, 0, 0, (read16_space_func)SMH_BANK(26), (write16_space_func)SMH_BANK(26)); + memory_install_readwrite_bank_handler(dcs.data, baseaddr, baseaddr + 0x3ff, 0, 0, "bank26"); } /* update the bank pointers */ @@ -1352,7 +1352,7 @@ static WRITE16_HANDLER( dsio_w ) /* offset 2 controls RAM pages */ case 2: dsio.reg[2] = data; - memory_set_bank(space->machine, 20, DSIO_DM_PG % dcs.sounddata_banks); + memory_set_bank(space->machine, "bank20", DSIO_DM_PG % dcs.sounddata_banks); break; } } @@ -1418,7 +1418,7 @@ static WRITE16_HANDLER( denver_w ) /* offset 2 controls RAM pages */ case 2: dsio.reg[2] = data; - memory_set_bank(space->machine, 20, DENV_DM_PG % dcs.sounddata_bank); + memory_set_bank(space->machine, "bank20", DENV_DM_PG % dcs.sounddata_bank); break; /* offset 3 controls FIFO reset */ diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index 379e90f9d47..9c4b224e3d4 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -453,7 +453,7 @@ static void set_ea(const address_space *space, int ea) mario_state *state = (mario_state *)space->machine->driver_data; //printf("ea: %d\n", ea); //cputag_set_input_line(machine, "audiocpu", MCS48_INPUT_EA, (ea) ? ASSERT_LINE : CLEAR_LINE); - if (state->eabank != 0) + if (state->eabank != NULL) memory_set_bank(space->machine, state->eabank, ea); } @@ -473,13 +473,13 @@ static SOUND_START( mario ) SND[0x1001] = 0x01; #endif - state->eabank = 0; + state->eabank = NULL; if (audiocpu != NULL && cpu_get_type(audiocpu) != CPU_Z80) { - state->eabank = 1; - memory_install_read8_handler(cpu_get_address_space(audiocpu, ADDRESS_SPACE_PROGRAM), 0x000, 0x7ff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_configure_bank(machine, 1, 0, 1, memory_region(machine, "audiocpu"), 0); - memory_configure_bank(machine, 1, 1, 1, memory_region(machine, "audiocpu") + 0x1000, 0x800); + state->eabank = "bank1"; + memory_install_read_bank_handler(cpu_get_address_space(audiocpu, ADDRESS_SPACE_PROGRAM), 0x000, 0x7ff, 0, 0, "bank1"); + memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "audiocpu"), 0); + memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "audiocpu") + 0x1000, 0x800); } state_save_register_global(machine, state->last); @@ -641,7 +641,7 @@ WRITE8_HANDLER( mario_sh3_w ) *************************************/ static ADDRESS_MAP_START( mario_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_ROMBANK(1) AM_REGION("audiocpu", 0) + AM_RANGE(0x0000, 0x07ff) AM_ROMBANK("bank1") AM_REGION("audiocpu", 0) AM_RANGE(0x0800, 0x0fff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c index f7e8167623f..9945a497243 100644 --- a/src/mame/audio/seibu.c +++ b/src/mame/audio/seibu.c @@ -120,7 +120,7 @@ void seibu_sound_decrypt(running_machine *machine,const char *cpu,int length) } if (length > 0x10000) - memory_configure_bank_decrypted(machine, 1, 0, (length - 0x10000) / 0x8000, decrypt + 0x10000, 0x8000); + memory_configure_bank_decrypted(machine, "bank1", 0, (length - 0x10000) / 0x8000, decrypt + 0x10000, 0x8000); } @@ -337,7 +337,7 @@ MACHINE_RESET( seibu_sound ) sound_cpu=cputag_get_cpu(machine, "audiocpu"); update_irq_lines(machine, VECTOR_INIT); if (romlength > 0x10000) - memory_configure_bank(machine, 1, 0, (romlength - 0x10000) / 0x8000, rom + 0x10000, 0x8000); + memory_configure_bank(machine, "bank1", 0, (romlength - 0x10000) / 0x8000, rom + 0x10000, 0x8000); } /***************************************************************************/ @@ -347,7 +347,7 @@ static int main2sub_pending,sub2main_pending; WRITE8_HANDLER( seibu_bank_w ) { - memory_set_bank(space->machine, 1, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); } WRITE8_HANDLER( seibu_coin_w ) @@ -482,7 +482,7 @@ ADDRESS_MAP_START( seibu_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END @@ -501,7 +501,7 @@ ADDRESS_MAP_START( seibu2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END ADDRESS_MAP_START( seibu2_raiden2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -520,7 +520,7 @@ ADDRESS_MAP_START( seibu2_raiden2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) AM_RANGE(0x6000, 0x6000) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x6002, 0x6002) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END @@ -539,7 +539,7 @@ ADDRESS_MAP_START( seibu3_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) AM_RANGE(0x6008, 0x6009) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END ADDRESS_MAP_START( seibu3_adpcm_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -561,5 +561,5 @@ ADDRESS_MAP_START( seibu3_adpcm_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6005, 0x6006) AM_DEVWRITE("adpcm2", seibu_adpcm_adr_w) AM_RANGE(0x6008, 0x6009) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0x601a, 0x601a) AM_DEVWRITE("adpcm2", seibu_adpcm_ctl_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c index a2fd18de4b3..d751db3179c 100644 --- a/src/mame/audio/taito_en.c +++ b/src/mame/audio/taito_en.c @@ -241,9 +241,9 @@ ADDRESS_MAP_START( f3_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x280000, 0x28001f) AM_READWRITE(f3_68681_r, f3_68681_w) AM_RANGE(0x300000, 0x30003f) AM_WRITE(f3_es5505_bank_w) AM_RANGE(0x340000, 0x340003) AM_WRITE(f3_volume_w) /* 8 channel volume control */ - AM_RANGE(0xc00000, 0xc1ffff) AM_ROMBANK(1) - AM_RANGE(0xc20000, 0xc3ffff) AM_ROMBANK(2) - AM_RANGE(0xc40000, 0xc7ffff) AM_ROMBANK(3) + AM_RANGE(0xc00000, 0xc1ffff) AM_ROMBANK("bank1") + AM_RANGE(0xc20000, 0xc3ffff) AM_ROMBANK("bank2") + AM_RANGE(0xc40000, 0xc7ffff) AM_ROMBANK("bank3") AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE(1) // mirror ADDRESS_MAP_END @@ -251,9 +251,9 @@ void taito_f3_soundsystem_reset(running_machine *machine) { /* Sound cpu program loads to 0xc00000 so we use a bank */ UINT16 *ROM = (UINT16 *)memory_region(machine, "audiocpu"); - memory_set_bankptr(machine, 1,&ROM[0x80000]); - memory_set_bankptr(machine, 2,&ROM[0x90000]); - memory_set_bankptr(machine, 3,&ROM[0xa0000]); + memory_set_bankptr(machine, "bank1",&ROM[0x80000]); + memory_set_bankptr(machine, "bank2",&ROM[0x90000]); + memory_set_bankptr(machine, "bank3",&ROM[0xa0000]); sound_ram[0]=ROM[0x80000]; /* Stack and Reset vectors */ sound_ram[1]=ROM[0x80001]; diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c index 74e1a39a1bc..91b59177919 100644 --- a/src/mame/audio/williams.c +++ b/src/mame/audio/williams.c @@ -102,7 +102,7 @@ static ADDRESS_MAP_START( williams_cvsd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_DEVWRITE("cvsd", cvsd_digit_clock_clear_w) AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07ff) AM_DEVWRITE("cvsd", cvsd_clock_set_w) AM_RANGE(0x7800, 0x7800) AM_MIRROR(0x07ff) AM_WRITE(cvsd_bank_select_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(5) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank5") ADDRESS_MAP_END @@ -116,8 +116,8 @@ static ADDRESS_MAP_START( williams_narc_master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_READ(narc_command_r) AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x03ff) AM_WRITE(narc_master_bank_select_w) AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x03ff) AM_WRITE(narc_master_sync_w) - AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(5) - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(6) + AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank5") + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank6") ADDRESS_MAP_END /* NARC slave readmem/writemem structures */ @@ -130,8 +130,8 @@ static ADDRESS_MAP_START( williams_narc_slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_READ(narc_command2_r) AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x03ff) AM_WRITE(narc_slave_bank_select_w) AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x03ff) AM_WRITE(narc_slave_sync_w) - AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(7) - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(8) + AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank7") + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank8") ADDRESS_MAP_END @@ -145,8 +145,8 @@ static ADDRESS_MAP_START( williams_adpcm_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_READ(adpcm_command_r) AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_DEVWRITE("oki", adpcm_6295_bank_select_w) AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x03ff) AM_WRITE(adpcm_talkback_w) - AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(5) - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(6) + AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank5") + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank6") ADDRESS_MAP_END @@ -284,9 +284,9 @@ void williams_cvsd_init(running_machine *machine) D3 -> A16 */ offs_t offset = 0x8000 * ((bank >> 2) & 3) + 0x20000 * (bank & 3); - memory_configure_bank(machine, 5, bank, 1, &ROM[0x10000 + offset], 0); + memory_configure_bank(machine, "bank5", bank, 1, &ROM[0x10000 + offset], 0); } - memory_set_bank(machine, 5, 0); + memory_set_bank(machine, "bank5", 0); /* reset the IRQ state */ pia6821_ca1_w(devtag_get_device(machine, "cvsdpia"), 0, 1); @@ -316,9 +316,9 @@ void williams_narc_init(running_machine *machine) D3 -> A16 */ offs_t offset = 0x8000 * (bank & 1) + 0x10000 * ((bank >> 3) & 1) + 0x20000 * ((bank >> 1) & 3); - memory_configure_bank(machine, 5, bank, 1, &ROM[0x10000 + offset], 0); + memory_configure_bank(machine, "bank5", bank, 1, &ROM[0x10000 + offset], 0); } - memory_set_bankptr(machine, 6, &ROM[0x10000 + 0x4000 + 0x8000 + 0x10000 + 0x20000 * 3]); + memory_set_bankptr(machine, "bank6", &ROM[0x10000 + 0x4000 + 0x8000 + 0x10000 + 0x20000 * 3]); /* configure slave CPU banks */ ROM = memory_region(machine, "narc2cpu"); @@ -330,9 +330,9 @@ void williams_narc_init(running_machine *machine) D3 -> A16 */ offs_t offset = 0x8000 * (bank & 1) + 0x10000 * ((bank >> 3) & 1) + 0x20000 * ((bank >> 1) & 3); - memory_configure_bank(machine, 7, bank, 1, &ROM[0x10000 + offset], 0); + memory_configure_bank(machine, "bank7", bank, 1, &ROM[0x10000 + offset], 0); } - memory_set_bankptr(machine, 8, &ROM[0x10000 + 0x4000 + 0x8000 + 0x10000 + 0x20000 * 3]); + memory_set_bankptr(machine, "bank8", &ROM[0x10000 + 0x4000 + 0x8000 + 0x10000 + 0x20000 * 3]); /* register for save states */ state_save_register_global(machine, williams_sound_int_state); @@ -351,8 +351,8 @@ void williams_adpcm_init(running_machine *machine) /* configure banks */ ROM = memory_region(machine, "adpcm"); - memory_configure_bank(machine, 5, 0, 8, &ROM[0x10000], 0x8000); - memory_set_bankptr(machine, 6, &ROM[0x10000 + 0x4000 + 7 * 0x8000]); + memory_configure_bank(machine, "bank5", 0, 8, &ROM[0x10000], 0x8000); + memory_set_bankptr(machine, "bank6", &ROM[0x10000 + 0x4000 + 7 * 0x8000]); /* expand ADPCM data */ /* it is assumed that U12 is loaded @ 0x00000 and U13 is loaded @ 0x40000 */ @@ -442,7 +442,7 @@ static void adpcm_ym2151_irq(const device_config *device, int state) static WRITE8_HANDLER( cvsd_bank_select_w ) { - memory_set_bank(space->machine, 5, data & 0x0f); + memory_set_bank(space->machine, "bank5", data & 0x0f); } @@ -509,13 +509,13 @@ void williams_cvsd_reset_w(int state) static WRITE8_HANDLER( narc_master_bank_select_w ) { - memory_set_bank(space->machine, 5, data & 0x0f); + memory_set_bank(space->machine, "bank5", data & 0x0f); } static WRITE8_HANDLER( narc_slave_bank_select_w ) { - memory_set_bank(space->machine, 7, data & 0x0f); + memory_set_bank(space->machine, "bank7", data & 0x0f); } @@ -628,7 +628,7 @@ int williams_narc_talkback_r(void) static WRITE8_HANDLER( adpcm_bank_select_w ) { - memory_set_bank(space->machine, 5, data & 0x07); + memory_set_bank(space->machine, "bank5", data & 0x07); } diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index 6e785f0d0b2..51bd201e096 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -72,7 +72,7 @@ correctly. static WRITE8_HANDLER( c1942_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x03); + memory_set_bank(space->machine, "bank1", data & 0x03); } static INTERRUPT_GEN( c1942_interrupt ) @@ -86,7 +86,7 @@ static INTERRUPT_GEN( c1942_interrupt ) static ADDRESS_MAP_START( c1942_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P2") @@ -507,7 +507,7 @@ ROM_END static DRIVER_INIT( 1942 ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 3, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 3, &ROM[0x10000], 0x4000); } diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c index 4a48b982c6b..f5f068e3584 100644 --- a/src/mame/drivers/1943.c +++ b/src/mame/drivers/1943.c @@ -45,10 +45,10 @@ static READ8_HANDLER( c1943_protection_r ) static ADDRESS_MAP_START( c1943_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8fff) AM_ROMBANK(1) - AM_RANGE(0x9000, 0x9fff) AM_ROMBANK(2) - AM_RANGE(0xa000, 0xafff) AM_ROMBANK(3) - AM_RANGE(0xb000, 0xbfff) AM_ROMBANK(4) + AM_RANGE(0x8000, 0x8fff) AM_ROMBANK("bank1") + AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("bank2") + AM_RANGE(0xa000, 0xafff) AM_ROMBANK("bank3") + AM_RANGE(0xb000, 0xbfff) AM_ROMBANK("bank4") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P2") @@ -464,10 +464,10 @@ ROM_END static DRIVER_INIT( 1943 ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 28, &ROM[0x10000], 0x1000); - memory_configure_bank(machine, 2, 0, 28, &ROM[0x11000], 0x1000); - memory_configure_bank(machine, 3, 0, 28, &ROM[0x12000], 0x1000); - memory_configure_bank(machine, 4, 0, 28, &ROM[0x13000], 0x1000); + memory_configure_bank(machine, "bank1", 0, 28, &ROM[0x10000], 0x1000); + memory_configure_bank(machine, "bank2", 0, 28, &ROM[0x11000], 0x1000); + memory_configure_bank(machine, "bank3", 0, 28, &ROM[0x12000], 0x1000); + memory_configure_bank(machine, "bank4", 0, 28, &ROM[0x13000], 0x1000); } /* Game Drivers */ diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index 2382b33e1b2..b9e5d108631 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -291,7 +291,7 @@ static WRITE8_HANDLER( bank_select_w ) // popmessage("WRONG BANK SELECT = %x !!!!\n",data); } - memory_set_bank(space->machine, 1, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); } static WRITE8_HANDLER( pix1_w ) @@ -580,7 +580,7 @@ static DRIVER_INIT( undoukai ) { buggychl_state *state = (buggychl_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 2, &ROM[0x10000], 0x2000); + memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x2000); state->pix_color[0] = 0x000; state->pix_color[1] = 0x1e3; @@ -592,7 +592,7 @@ static DRIVER_INIT( 40love ) { buggychl_state *state = (buggychl_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 2, &ROM[0x10000], 0x2000); + memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x2000); #if 0 /* character ROM hack @@ -657,13 +657,13 @@ static ADDRESS_MAP_START( 40love_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9840, 0x987f) AM_RAM AM_BASE_SIZE_MEMBER(buggychl_state, spriteram, spriteram_size) /* sprites part 1 */ AM_RANGE(0x9880, 0x98bf) AM_READWRITE(fortyl_bg_colorram_r, fortyl_bg_colorram_w) AM_BASE_MEMBER(buggychl_state, colorram) /* background attributes (2 bytes per line) */ AM_RANGE(0x98c0, 0x98ff) AM_RAM AM_BASE_SIZE_MEMBER(buggychl_state, spriteram2, spriteram2_size)/* sprites part 2 */ - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xffff) AM_READWRITE(fortyl_pixram_r, fortyl_pixram_w) /* banked pixel layer */ ADDRESS_MAP_END static ADDRESS_MAP_START( undoukai_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE_MEMBER(buggychl_state, mcu_ram) /* M5517P on main board */ AM_RANGE(0xa800, 0xa800) AM_READWRITE(undoukai_mcu_r, undoukai_mcu_w) AM_RANGE(0xa801, 0xa801) AM_READWRITE(undoukai_mcu_status_r, pix1_w) //pixel layer related diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 3b29d995314..4bd07ef2a15 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -112,7 +112,7 @@ static WRITE8_HANDLER( pending_command_clear_w ) static WRITE8_HANDLER( aerofgt_sh_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x03); + memory_set_bank(space->machine, "bank1", data & 0x03); } @@ -380,7 +380,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( turbofrc_sound_portmap, ADDRESS_SPACE_IO, 8 ) @@ -1305,7 +1305,7 @@ static MACHINE_START( aerofgt ) { UINT8 *rom = memory_region(machine, "audiocpu"); - memory_configure_bank(machine, 1, 0, 4, &rom[0x10000], 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, &rom[0x10000], 0x8000); MACHINE_START_CALL(common); } @@ -1320,7 +1320,7 @@ static MACHINE_RESET( aerofgt ) { MACHINE_RESET_CALL(common); - memory_set_bank(machine, 1, 0); /* needed by spinlbrk */ + memory_set_bank(machine, "bank1", 0); /* needed by spinlbrk */ } static MACHINE_DRIVER_START( pspikes ) diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index 16893a01e4d..443988d63df 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -280,7 +280,7 @@ static WRITE8_HANDLER( master_nmi_trigger_w ) cputag_set_input_line(space->machine, "slave", INPUT_LINE_NMI, PULSE_LINE); } -static void airbustr_bankswitch(running_machine *machine, const char *cpu, int bank, int data) +static void airbustr_bankswitch(running_machine *machine, const char *cpu, const char *bank, int data) { UINT8 *ROM = memory_region(machine, cpu); @@ -294,12 +294,12 @@ static void airbustr_bankswitch(running_machine *machine, const char *cpu, int b static WRITE8_HANDLER( master_bankswitch_w ) { - airbustr_bankswitch(space->machine, "master", 1, data); + airbustr_bankswitch(space->machine, "master", "bank1", data); } static WRITE8_HANDLER( slave_bankswitch_w ) { - airbustr_bankswitch(space->machine, "slave", 2, data); + airbustr_bankswitch(space->machine, "slave", "bank2", data); flip_screen_set(space->machine, data & 0x10); @@ -309,7 +309,7 @@ static WRITE8_HANDLER( slave_bankswitch_w ) static WRITE8_HANDLER( sound_bankswitch_w ) { - airbustr_bankswitch(space->machine, "audiocpu", 3, data); + airbustr_bankswitch(space->machine, "audiocpu", "bank3", data); } static READ8_HANDLER( soundcommand_status_r ) @@ -369,7 +369,7 @@ static WRITE8_HANDLER( airbustr_coin_counter_w ) static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_READWRITE(pandora_spriteram_r, pandora_spriteram_w) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xefff) AM_RAM AM_BASE(&devram) // shared with protection device @@ -385,7 +385,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(airbustr_videoram2_w) AM_BASE(&airbustr_videoram2) AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(airbustr_colorram2_w) AM_BASE(&airbustr_colorram2) AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(airbustr_videoram_w) AM_BASE_GENERIC(videoram) @@ -411,7 +411,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(3) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3") AM_RANGE(0xc000, 0xdfff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c index 156ed4be131..84da732cb97 100644 --- a/src/mame/drivers/ajax.c +++ b/src/mame/drivers/ajax.c @@ -32,7 +32,7 @@ static ADDRESS_MAP_START( ajax_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE_GENERIC(paletteram)/* palette */ AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE(1) /* shared RAM with the 6809 */ AM_RANGE(0x4000, 0x5fff) AM_RAM /* RAM 6264L at K10 */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(2) /* banked ROM */ + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank2") /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM N11 */ ADDRESS_MAP_END @@ -43,7 +43,7 @@ static ADDRESS_MAP_START( ajax_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x1800) AM_WRITE(ajax_bankswitch_2_w) /* bankswitch control */ AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE(1) /* shared RAM with the 052001 */ AM_RANGE(0x4000, 0x7fff) AM_READWRITE(K052109_r, K052109_w) /* video RAM + color RAM + video registers */ - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM I16 */ ADDRESS_MAP_END diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index 78051c0a2fa..98cdf4e28b3 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -195,7 +195,7 @@ static WRITE8_DEVICE_HANDLER( mux_w ) if( state->bank != new_bank) { state->bank = new_bank; - memory_set_bank(device->machine, 1, state->bank); + memory_set_bank(device->machine, "bank1", state->bank); } state->mux_data = data & ~0xc0; @@ -249,7 +249,7 @@ static const ppi8255_interface ppi8255_intf = static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa7fc, 0xa7fc) AM_WRITE(prot_lock_w) AM_RANGE(0xa7ff, 0xa7ff) AM_WRITE_PORT("EEPROMOUT") AM_RANGE(0xaf80, 0xafff) AM_READWRITE(custom_ram_r, custom_ram_w) AM_BASE_MEMBER(albazg_state, cus_ram) @@ -375,7 +375,7 @@ static MACHINE_START( yumefuda ) albazg_state *state = (albazg_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 4, &ROM[0x10000], 0x2000); + memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); state_save_register_global(machine, state->mux_data); state_save_register_global(machine, state->bank); diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index e522c5590e6..0ca9868a20c 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -201,12 +201,12 @@ static WRITE8_DEVICE_HANDLER( alg_cia_0_porta_w ) const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM); /* switch banks as appropriate */ - memory_set_bank(device->machine, 1, data & 1); + memory_set_bank(device->machine, "bank1", data & 1); /* swap the write handlers between ROM and bank 1 based on the bit */ if ((data & 1) == 0) /* overlay disabled, map RAM on 0x000000 */ - memory_install_write16_handler(space, 0x000000, 0x07ffff, 0, 0, (write16_space_func)SMH_BANK(1)); + memory_install_write_bank_handler(space, 0x000000, 0x07ffff, 0, 0, "bank1"); else /* overlay enabled, map Amiga system ROM on 0x000000 */ @@ -256,7 +256,7 @@ static WRITE8_DEVICE_HANDLER( alg_cia_1_porta_w ) static ADDRESS_MAP_START( main_map_r1, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_BASE(&amiga_custom_regs) AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w) @@ -269,7 +269,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_map_r2, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_BASE(&amiga_custom_regs) AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w) @@ -282,7 +282,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_map_picmatic, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_BASE(&amiga_custom_regs) AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w) @@ -669,8 +669,8 @@ static void alg_init(running_machine *machine) amiga_machine_config(machine, &alg_intf); /* set up memory */ - memory_configure_bank(machine, 1, 0, 1, amiga_chip_ram, 0); - memory_configure_bank(machine, 1, 1, 1, memory_region(machine, "user1"), 0); + memory_configure_bank(machine, "bank1", 0, 1, amiga_chip_ram, 0); + memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user1"), 0); } diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index 7e9b69a3570..c376dce7380 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -93,7 +93,7 @@ static WRITE8_DEVICE_HANDLER( aliens_snd_bankswitch_w ) static ADDRESS_MAP_START( aliens_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE(&ram) /* palette + work RAM */ AM_RANGE(0x0400, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x5f80, 0x5f80) AM_READ_PORT("DSW3") AM_RANGE(0x5f81, 0x5f81) AM_READ_PORT("P1") AM_RANGE(0x5f82, 0x5f82) AM_READ_PORT("P2") @@ -476,7 +476,7 @@ static KONAMI_SETLINES_CALLBACK( aliens_banking ) if (lines & 0x10) offs -= 0x8000; offs += (lines & 0x0f)*0x2000; - memory_set_bankptr(device->machine, 1, &RAM[offs] ); + memory_set_bankptr(device->machine, "bank1", &RAM[offs] ); } static MACHINE_RESET( aliens ) @@ -486,7 +486,7 @@ static MACHINE_RESET( aliens ) konami_configure_set_lines(cputag_get_cpu(machine, "maincpu"), aliens_banking); /* init the default bank */ - memory_set_bankptr(machine, 1, &RAM[0x10000]); + memory_set_bankptr(machine, "bank1", &RAM[0x10000]); } diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index 0d1da9842e3..53b4c1f8d15 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -695,7 +695,7 @@ static ADDRESS_MAP_START( alpha68k_II_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE_MEMBER(alpha68k_state, spriteram) AM_RANGE(0x300000, 0x3001ff) AM_READWRITE(alpha_II_trigger_r, alpha_microcontroller_w) AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(alpha68k_paletteram_w) AM_BASE_MEMBER(alpha68k_state, paletteram) - AM_RANGE(0x800000, 0x83ffff) AM_ROMBANK(8) + AM_RANGE(0x800000, 0x83ffff) AM_ROMBANK("bank8") ADDRESS_MAP_END static ADDRESS_MAP_START( alpha68k_V_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -713,7 +713,7 @@ static ADDRESS_MAP_START( alpha68k_V_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300000, 0x3001ff) AM_WRITE(alpha_microcontroller_w) AM_RANGE(0x303e00, 0x303fff) AM_WRITE(alpha_microcontroller_w) /* Gang Wars mirror */ AM_RANGE(0x400000, 0x401fff) AM_RAM_WRITE(alpha68k_paletteram_w) AM_BASE_MEMBER(alpha68k_state, paletteram) - AM_RANGE(0x800000, 0x83ffff) AM_ROMBANK(8) + AM_RANGE(0x800000, 0x83ffff) AM_ROMBANK("bank8") ADDRESS_MAP_END static READ16_HANDLER(sound_cpu_r) { return 1; } @@ -740,13 +740,13 @@ ADDRESS_MAP_END static WRITE8_HANDLER( sound_bank_w ) { - memory_set_bank(space->machine, 7, data); + memory_set_bank(space->machine, "bank7", data); } static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(7) + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank7") ADDRESS_MAP_END static ADDRESS_MAP_START( kyros_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -1889,7 +1889,7 @@ static MACHINE_START( alpha68k_V ) alpha68k_state *state = (alpha68k_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "audiocpu"); - memory_configure_bank(machine, 7, 0, 32, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank7", 0, 32, &ROM[0x10000], 0x4000); MACHINE_START_CALL(common); @@ -1925,7 +1925,7 @@ static MACHINE_START( alpha68k_II ) alpha68k_state *state = (alpha68k_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "audiocpu"); - memory_configure_bank(machine, 7, 0, 28, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank7", 0, 28, &ROM[0x10000], 0x4000); MACHINE_START_CALL(common); @@ -3300,7 +3300,7 @@ static DRIVER_INIT( skysoldr ) { alpha68k_state *state = (alpha68k_state *)machine->driver_data; memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40008, 0x40009, 0, 0, skysoldr_cycle_r); - memory_set_bankptr(machine, 8, (memory_region(machine, "user1")) + 0x40000); + memory_set_bankptr(machine, "bank8", (memory_region(machine, "user1")) + 0x40000); state->invert_controls = 0; state->microcontroller_id = 0; state->coin_id = 0x22 | (0x22 << 8); @@ -3317,7 +3317,7 @@ static DRIVER_INIT( goldmedl ) static DRIVER_INIT( goldmeda ) { alpha68k_state *state = (alpha68k_state *)machine->driver_data; - memory_set_bankptr(machine, 8, memory_region(machine, "maincpu") + 0x20000); + memory_set_bankptr(machine, "bank8", memory_region(machine, "maincpu") + 0x20000); state->invert_controls = 0; state->microcontroller_id = 0x8803; //Guess - routine to handle coinage is the same as in 'goldmedl' state->coin_id = 0x23 | (0x24 << 8); @@ -3345,7 +3345,7 @@ static DRIVER_INIT( gangwars ) { alpha68k_state *state = (alpha68k_state *)machine->driver_data; memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40206, 0x40207, 0, 0, gangwars_cycle_r); - memory_set_bankptr(machine, 8, memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank8", memory_region(machine, "user1")); state->invert_controls = 0; state->microcontroller_id = 0x8512; state->coin_id = 0x23 | (0x24 << 8); @@ -3355,7 +3355,7 @@ static DRIVER_INIT( gangwarb ) { alpha68k_state *state = (alpha68k_state *)machine->driver_data; memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40206, 0x40207, 0, 0, gangwarb_cycle_r); - memory_set_bankptr(machine, 8, memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank8", memory_region(machine, "user1")); state->invert_controls = 0; state->microcontroller_id = 0x8512; state->coin_id = 0x23 | (0x24 << 8); diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c index c65e2041563..2984dc280ce 100644 --- a/src/mame/drivers/angelkds.c +++ b/src/mame/drivers/angelkds.c @@ -143,7 +143,7 @@ static WRITE8_HANDLER( angelkds_sub_sound_w ); static WRITE8_HANDLER( angelkds_cpu_bank_write ) { - memory_set_bank(space->machine, 1, data & 0x0f); // shall we check (data & 0x0f) < # of available banks (8 or 10 resp.)? + memory_set_bank(space->machine, "bank1", data & 0x0f); // shall we check (data & 0x0f) < # of available banks (8 or 10 resp.)? } @@ -197,7 +197,7 @@ contain a level. static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(angelkds_bgtopvideoram_w) AM_BASE_MEMBER(angelkds_state, bgtopvideoram) /* Top Half of Screen */ AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE(angelkds_bgbotvideoram_w) AM_BASE_MEMBER(angelkds_state, bgbotvideoram) /* Bottom Half of Screen */ @@ -755,7 +755,7 @@ ROM_END static DRIVER_INIT( angelkds ) { UINT8 *RAM = memory_region(machine, "user1"); - memory_configure_bank(machine, 1, 0, 8, &RAM[0x0000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, &RAM[0x0000], 0x4000); } static DRIVER_INIT( spcpostn ) @@ -763,7 +763,7 @@ static DRIVER_INIT( spcpostn ) UINT8 *RAM = memory_region(machine, "user1"); spcpostn_decode(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 10, &RAM[0x0000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 10, &RAM[0x0000], 0x4000); } diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index 88ba7ac5243..f04b8ab4e2a 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -216,7 +216,7 @@ static WRITE8_HANDLER( appoooh_adpcm_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_ROM - AM_RANGE(0xa000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_RANGE(0xe800, 0xefff) AM_RAM /* RAM ? */ diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index ed087b9d944..a845e68585b 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -101,7 +101,7 @@ static WRITE16_HANDLER( aquarium_sound_w ) static WRITE8_HANDLER( aquarium_z80_bank_w ) { - memory_set_bank(space->machine, 1, data & 0x07); + memory_set_bank(space->machine, "bank1", data & 0x07); } static UINT8 aquarium_snd_bitswap( UINT8 scrambled_data ) @@ -155,7 +155,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( snd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( snd_portmap, ADDRESS_SPACE_IO, 8 ) @@ -314,8 +314,8 @@ static DRIVER_INIT( aquarium ) } /* configure and set up the sound bank */ - memory_configure_bank(machine, 1, 0, 7, &Z80[0x18000], 0x8000); - memory_set_bank(machine, 1, 1); + memory_configure_bank(machine, "bank1", 0, 7, &Z80[0x18000], 0x8000); + memory_set_bank(machine, "bank1", 1); } diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c index 1ff5cb1ac0c..dc89b7a7eef 100644 --- a/src/mame/drivers/arcadia.c +++ b/src/mame/drivers/arcadia.c @@ -72,7 +72,10 @@ static UINT8 coin_counter[2]; static WRITE16_HANDLER( arcadia_multibios_change_game ) { - memory_install_read16_handler(space, 0x800000, 0x97ffff, 0, 0, (read16_space_func)((data == 0) ? SMH_BANK(2) : SMH_NOP)); + if (data == 0) + memory_install_read_bank_handler(space, 0x800000, 0x97ffff, 0, 0, "bank2"); + else + memory_install_read16_handler(space, 0x800000, 0x97ffff, 0, 0, (read16_space_func)SMH_NOP); } @@ -95,12 +98,12 @@ static WRITE16_HANDLER( arcadia_multibios_change_game ) static WRITE8_DEVICE_HANDLER( arcadia_cia_0_porta_w ) { /* switch banks as appropriate */ - memory_set_bank(device->machine, 1, data & 1); + memory_set_bank(device->machine, "bank1", data & 1); /* swap the write handlers between ROM and bank 1 based on the bit */ if ((data & 1) == 0) /* overlay disabled, map RAM on 0x000000 */ - memory_install_write16_handler(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, (write16_space_func)SMH_BANK(1)); + memory_install_write_bank_handler(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1"); else /* overlay enabled, map Amiga system ROM on 0x000000 */ @@ -180,13 +183,13 @@ static void arcadia_reset_coins(running_machine *machine) static ADDRESS_MAP_START( amiga_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_BASE(&amiga_custom_regs) AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w) AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION("user1", 0) /* Kickstart BIOS */ - AM_RANGE(0x800000, 0x97ffff) AM_ROMBANK(2) AM_REGION("user3", 0) + AM_RANGE(0x800000, 0x97ffff) AM_ROMBANK("bank2") AM_REGION("user3", 0) AM_RANGE(0x980000, 0x9fbfff) AM_ROM AM_REGION("user2", 0) AM_RANGE(0x9fc000, 0x9ffffd) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0x9ffffe, 0x9fffff) AM_WRITE(arcadia_multibios_change_game) @@ -760,8 +763,8 @@ static void arcadia_init(running_machine *machine) amiga_machine_config(machine, &arcadia_intf); /* set up memory */ - memory_configure_bank(machine, 1, 0, 1, amiga_chip_ram, 0); - memory_configure_bank(machine, 1, 1, 1, memory_region(machine, "user1"), 0); + memory_configure_bank(machine, "bank1", 0, 1, amiga_chip_ram, 0); + memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user1"), 0); /* OnePlay bios is encrypted, TenPlay is not */ biosrom = (UINT16 *)memory_region(machine, "user2"); diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c index 9dc38dcb9ad..e0938f91698 100644 --- a/src/mame/drivers/argus.c +++ b/src/mame/drivers/argus.c @@ -169,7 +169,7 @@ static WRITE8_HANDLER( argus_bankselect_w ) int bankaddress; bankaddress = 0x10000 + ((data & 7) * 0x4000); - memory_set_bankptr(space->machine, 1, &RAM[bankaddress]); /* Select 8 banks of 16k */ + memory_set_bankptr(space->machine, "bank1", &RAM[bankaddress]); /* Select 8 banks of 16k */ } @@ -181,7 +181,7 @@ static WRITE8_HANDLER( argus_bankselect_w ) static ADDRESS_MAP_START( argus_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_RAMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P2") @@ -205,7 +205,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( valtric_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_RAMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P2") @@ -229,7 +229,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( butasan_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_RAMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P2") diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index d956036aa41..d52292b7bf0 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -141,7 +141,7 @@ static READ8_HANDLER( sound_latch_status_r ) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(4) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank4") ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) @@ -291,7 +291,7 @@ static WRITE8_DEVICE_HANDLER( ym2203_write_a ) static WRITE8_DEVICE_HANDLER( ym2203_write_b ) { - memory_set_bank(device->machine, 4, data & 0x0f); + memory_set_bank(device->machine, "bank4", data & 0x0f); } static const ym2203_interface ym2203_config = @@ -471,9 +471,9 @@ ROM_END static DRIVER_INIT( ashnojoe ) { UINT8 *ROM = memory_region(machine, "adpcm"); - memory_configure_bank(machine, 4, 0, 16, &ROM[0x00000], 0x8000); + memory_configure_bank(machine, "bank4", 0, 16, &ROM[0x00000], 0x8000); - memory_set_bank(machine, 4, 0); + memory_set_bank(machine, "bank4", 0); } GAME( 1990, scessjoe, 0, ashnojoe, ashnojoe, ashnojoe, ROT0, "WAVE / Taito Corporation", "Success Joe (World)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c index 34f91a2b7ae..bc047dda5f3 100644 --- a/src/mame/drivers/asteroid.c +++ b/src/mame/drivers/asteroid.c @@ -237,8 +237,8 @@ static WRITE8_HANDLER( llander_led_w ) static ADDRESS_MAP_START( asteroid_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x0200, 0x02ff) AM_RAMBANK(1) AM_BASE(&asteroid_ram1) - AM_RANGE(0x0300, 0x03ff) AM_RAMBANK(2) AM_BASE(&asteroid_ram2) + AM_RANGE(0x0200, 0x02ff) AM_RAMBANK("bank1") AM_BASE(&asteroid_ram1) + AM_RANGE(0x0300, 0x03ff) AM_RAMBANK("bank2") AM_BASE(&asteroid_ram2) AM_RANGE(0x2000, 0x2007) AM_READ(asteroid_IN0_r) /* IN0 */ AM_RANGE(0x2400, 0x2407) AM_READ(asteroid_IN1_r) /* IN1 */ AM_RANGE(0x2800, 0x2803) AM_READ(asteroid_DSW1_r) /* DSW1 */ @@ -258,8 +258,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( astdelux_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x0200, 0x02ff) AM_RAMBANK(1) AM_BASE(&asteroid_ram1) - AM_RANGE(0x0300, 0x03ff) AM_RAMBANK(2) AM_BASE(&asteroid_ram2) + AM_RANGE(0x0200, 0x02ff) AM_RAMBANK("bank1") AM_BASE(&asteroid_ram1) + AM_RANGE(0x0300, 0x03ff) AM_RAMBANK("bank2") AM_BASE(&asteroid_ram2) AM_RANGE(0x2000, 0x2007) AM_READ(asteroid_IN0_r) /* IN0 */ AM_RANGE(0x2400, 0x2407) AM_READ(asteroid_IN1_r) /* IN1 */ AM_RANGE(0x2800, 0x2803) AM_READ(asteroid_DSW1_r) /* DSW1 */ diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index 801a58afb19..9572118bc27 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -428,8 +428,8 @@ static WRITE8_HANDLER( profpac_banksw_w ) profpac_bank = data; /* set the main banking */ - memory_install_read8_handler(space, 0x4000, 0xbfff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "user1") + 0x8000 * bank); + memory_install_read_bank_handler(space, 0x4000, 0xbfff, 0, 0, "bank1"); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "user1") + 0x8000 * bank); /* bank 0 reads video RAM in the 4000-7FFF range */ if (bank == 0) @@ -444,8 +444,8 @@ static WRITE8_HANDLER( profpac_banksw_w ) /* if the bank is in range, map the appropriate bank */ if (bank < 0x28) { - memory_install_read8_handler(space, 0x4000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(2)); - memory_set_bankptr(space->machine, 2, memory_region(space->machine, "user2") + 0x4000 * bank); + memory_install_read_bank_handler(space, 0x4000, 0x7fff, 0, 0, "bank2"); + memory_set_bankptr(space->machine, "bank2", memory_region(space->machine, "user2") + 0x4000 * bank); } else memory_install_read8_handler(space, 0x4000, 0x7fff, 0, 0, (read8_space_func)SMH_UNMAP); @@ -629,7 +629,7 @@ static ADDRESS_MAP_START( profpac_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w) AM_RANGE(0x4000, 0x7fff) AM_READWRITE(profpac_videoram_r, profpac_videoram_w) - AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_ROM AM_RANGE(0xe000, 0xe1ff) AM_READWRITE(protected_ram_r, protected_ram_w) AM_BASE(&protected_ram) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) @@ -641,7 +641,7 @@ static ADDRESS_MAP_START( demndrgn_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w) AM_RANGE(0x4000, 0x7fff) AM_READWRITE(profpac_videoram_r, profpac_videoram_w) - AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_ROM AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0xe800, 0xffff) AM_RAM diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index e287a424bae..9d79b43b70b 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -257,12 +257,12 @@ static INTERRUPT_GEN( cadash_interrupt ) static WRITE8_HANDLER( sound_bankswitch_w ) { - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "audiocpu") + ((data-1) & 0x03) * 0x4000 + 0x10000 ); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "audiocpu") + ((data-1) & 0x03) * 0x4000 + 0x10000 ); } static WRITE8_DEVICE_HANDLER( sound_bankswitch_2151_w ) { - memory_set_bankptr(device->machine, 1, memory_region(device->machine, "audiocpu") + ((data-1) & 0x03) * 0x4000 + 0x10000 ); + memory_set_bankptr(device->machine, "bank1", memory_region(device->machine, "audiocpu") + ((data-1) & 0x03) * 0x4000 + 0x10000 ); } @@ -303,8 +303,8 @@ static WRITE8_DEVICE_HANDLER( asuka_msm5205_stop_w ) static MACHINE_START( asuka ) { /* configure the banks */ - memory_configure_bank(machine, 1, 0, 1, memory_region(machine, "audiocpu"), 0); - memory_configure_bank(machine, 1, 1, 3, memory_region(machine, "audiocpu") + 0x10000, 0x04000); + memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "audiocpu"), 0); + memory_configure_bank(machine, "bank1", 1, 3, memory_region(machine, "audiocpu") + 0x10000, 0x04000); state_save_register_global(machine, adpcm_pos); } @@ -389,7 +389,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bonzeadv_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) @@ -403,7 +403,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // AM_RANGE(0x9002, 0x9100) AM_READNOP @@ -417,7 +417,7 @@ ADDRESS_MAP_END /* no MSM5205 */ static ADDRESS_MAP_START( cadash_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c index 618d94f074c..b3c40c18771 100644 --- a/src/mame/drivers/ataxx.c +++ b/src/mame/drivers/ataxx.c @@ -46,8 +46,8 @@ static ADDRESS_MAP_START( master_map_program, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x9fff) AM_ROMBANK(1) - AM_RANGE(0xa000, 0xdfff) AM_ROMBANK(2) + AM_RANGE(0x2000, 0x9fff) AM_ROMBANK("bank1") + AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank2") AM_RANGE(0xa000, 0xdfff) AM_WRITE(ataxx_battery_ram_w) AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xffff) AM_READWRITE(ataxx_paletteram_and_misc_r, ataxx_paletteram_and_misc_w) AM_BASE_GENERIC(paletteram) @@ -76,7 +76,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_map_program, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x9fff) AM_ROMBANK(3) + AM_RANGE(0x2000, 0x9fff) AM_ROMBANK("bank3") AM_RANGE(0xa000, 0xdfff) AM_ROM AM_RANGE(0xe000, 0xefff) AM_RAM AM_RANGE(0xfffc, 0xfffd) AM_WRITE(leland_slave_video_addr_w) @@ -777,8 +777,8 @@ static DRIVER_INIT( asylum ) leland_rotate_memory(machine, "slave"); /* asylum appears to have some extra RAM for the slave CPU */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "slave", ADDRESS_SPACE_PROGRAM), 0xf000, 0xfffb, 0, 0, (read8_space_func)SMH_BANK(4), (write8_space_func)SMH_BANK(4)); - memory_set_bankptr(machine, 4, auto_alloc_array(machine, UINT8, 0x1000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "slave", ADDRESS_SPACE_PROGRAM), 0xf000, 0xfffb, 0, 0, "bank4"); + memory_set_bankptr(machine, "bank4", auto_alloc_array(machine, UINT8, 0x1000)); /* set up additional input ports */ memory_install_read_port_handler(cputag_get_address_space(machine, "master", ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P2"); diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c index b697f1d3c58..a5b457f1315 100644 --- a/src/mame/drivers/balsente.c +++ b/src/mame/drivers/balsente.c @@ -259,8 +259,8 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9a00, 0x9a03) AM_READ(balsente_random_num_r) AM_RANGE(0x9a04, 0x9a05) AM_READWRITE(balsente_m6850_r, balsente_m6850_w) AM_RANGE(0x9b00, 0x9cff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* system+cart NOVRAM */ - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(2) + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank2") ADDRESS_MAP_END diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c index a9c141ab70a..67173de173a 100644 --- a/src/mame/drivers/battlera.c +++ b/src/mame/drivers/battlera.c @@ -81,7 +81,7 @@ static ADDRESS_MAP_START( battlera_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x100000, 0x10ffff) AM_READWRITE(HuC6270_debug_r, HuC6270_debug_w) /* Cheat to edit vram data */ AM_RANGE(0x1e0800, 0x1e0801) AM_WRITE(battlera_sound_w) AM_RANGE(0x1e1000, 0x1e13ff) AM_WRITE(battlera_palette_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) /* Main ram */ + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") /* Main ram */ AM_RANGE(0x1fe000, 0x1fe001) AM_READWRITE(HuC6270_register_r, HuC6270_register_w) AM_RANGE(0x1fe002, 0x1fe003) AM_WRITE(HuC6270_data_w) AM_RANGE(0x1ff000, 0x1ff001) AM_READWRITE(control_data_r, control_data_w) @@ -124,7 +124,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x040000, 0x040001) AM_DEVWRITE("ymsnd", ym2203_w) AM_RANGE(0x080000, 0x080001) AM_WRITE(battlera_adpcm_data_w) AM_RANGE(0x1fe800, 0x1fe80f) AM_DEVWRITE("c6280", c6280_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(7) /* Main ram */ + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank7") /* Main ram */ AM_RANGE(0x1ff000, 0x1ff001) AM_READ(soundlatch_r) AM_DEVWRITE("msm", battlera_adpcm_reset_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index 5797571f62d..26a97af9145 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -40,7 +40,7 @@ static WRITE8_HANDLER( battlnts_bankswitch_w ) /* bits 6 & 7 = bank number */ bankaddress = 0x10000 + ((data & 0xc0) >> 6) * 0x4000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); /* bits 4 & 5 = coin counters */ coin_counter_w(space->machine, 0,data & 0x10); @@ -65,7 +65,7 @@ static ADDRESS_MAP_START( battlnts_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2e10, 0x2e10) AM_WRITE(watchdog_reset_w) /* watchdog reset */ AM_RANGE(0x2e14, 0x2e14) AM_WRITE(soundlatch_w) /* sound code # */ AM_RANGE(0x2e18, 0x2e18) AM_WRITE(battlnts_sh_irqtrigger_w) /* cause interrupt on audio CPU */ - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM 777e02.bin */ ADDRESS_MAP_END diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c index c75c522d20f..19eb3fb6a7f 100644 --- a/src/mame/drivers/beezer.c +++ b/src/mame/drivers/beezer.c @@ -16,7 +16,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_RAM AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) - AM_RANGE(0xc000, 0xcfff) AM_ROMBANK(1) + AM_RANGE(0xc000, 0xcfff) AM_ROMBANK("bank1") AM_RANGE(0xd000, 0xffff) AM_ROM AM_WRITE(beezer_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index 40220f24750..dfb51929027 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -121,7 +121,7 @@ static UINT32 mux_outputlatch; /* Function prototypes */ -INLINE void z80_bank(running_machine *machine, int num, int data); +INLINE void z80_bank(running_machine *machine, const char *bank, int data); static void update_irqs(running_machine *machine) @@ -882,12 +882,13 @@ static WRITE8_HANDLER( chipset_w ) case 0x02: case 0x03: { + static const char * const bankname[] = { "bank1", "bank2", "bank3" }; if (data > 0x3f) popmessage("%x: Unusual bank access (%x)\n", cpu_get_previouspc(space->cpu), data); data &= 0x3f; bank[offset] = data; - z80_bank(space->machine, offset, data); + z80_bank(space->machine, bankname[offset - 1], data); break; } @@ -962,7 +963,7 @@ static WRITE8_HANDLER( chipset_w ) } } -INLINE void z80_bank(running_machine *machine, int num, int data) +INLINE void z80_bank(running_machine *machine, const char *bank, int data) { if (data < 0x08) { @@ -975,24 +976,24 @@ INLINE void z80_bank(running_machine *machine, int num, int data) UINT32 offset = ((bank[0] >> 1) * 0x20000) + offs_table[bank[0] & 0x1][data]; - memory_set_bankptr(machine, num, memory_region(machine, "user1") + offset); + memory_set_bankptr(machine, bank, memory_region(machine, "user1") + offset); } else if (data < 0x10) { - memory_set_bankptr(machine, num, &video_ram[(data - 0x08) * 0x4000]); + memory_set_bankptr(machine, bank, &video_ram[(data - 0x08) * 0x4000]); } else { - memory_set_bankptr(machine, num, &work_ram[(data - 0x10) * 0x4000]); + memory_set_bankptr(machine, bank, &work_ram[(data - 0x10) * 0x4000]); } } static WRITE8_HANDLER( rombank_w ) { bank[0] = data; - z80_bank(space->machine, 1, bank[1]); - z80_bank(space->machine, 2, bank[2]); - z80_bank(space->machine, 3, bank[3]); + z80_bank(space->machine, "bank1", bank[1]); + z80_bank(space->machine, "bank2", bank[2]); + z80_bank(space->machine, "bank3", bank[3]); } @@ -1306,10 +1307,10 @@ static MACHINE_RESET( bfcobra ) ***************************************************************************/ static ADDRESS_MAP_START( z80_prog_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(4) - AM_RANGE(0x4000, 0x7fff) AM_RAMBANK(1) - AM_RANGE(0x8000, 0xbfff) AM_RAMBANK(2) - AM_RANGE(0xc000, 0xffff) AM_RAMBANK(3) + AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank4") + AM_RANGE(0x4000, 0x7fff) AM_RAMBANK("bank1") + AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank2") + AM_RANGE(0xc000, 0xffff) AM_RAMBANK("bank3") ADDRESS_MAP_END static ADDRESS_MAP_START( z80_io_map, ADDRESS_SPACE_IO, 8 ) @@ -1700,7 +1701,7 @@ static DRIVER_INIT( bfcobra ) bank[3] = 0; /* Fixed 16kB ROM region */ - memory_set_bankptr(machine, 4, memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank4", memory_region(machine, "user1")); /* TODO: Properly sort out the data ACIA */ data_r = 1; diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c index a7688710a01..293a0df90e8 100644 --- a/src/mame/drivers/bfm_sc1.c +++ b/src/mame/drivers/bfm_sc1.c @@ -152,7 +152,7 @@ static int Scorpion1_GetSwitchState(int strobe, int data) static WRITE8_HANDLER( bankswitch_w ) { - memory_set_bank(space->machine,1,data & 0x03); + memory_set_bank(space->machine,"bank1",data & 0x03); } /////////////////////////////////////////////////////////////////////////// @@ -752,10 +752,10 @@ static MACHINE_RESET( bfm_sc1 ) { UINT8 *rom = memory_region(machine, "maincpu"); - memory_configure_bank(machine,1, 0, 1, &rom[0x10000], 0); - memory_configure_bank(machine,1, 1, 3, &rom[0x02000], 0x02000); + memory_configure_bank(machine,"bank1", 0, 1, &rom[0x10000], 0); + memory_configure_bank(machine,"bank1", 1, 3, &rom[0x02000], 0x02000); - memory_set_bank(machine,1,3); + memory_set_bank(machine,"bank1",3); } } @@ -797,7 +797,7 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3800, 0x39FF) AM_WRITE(reel56_w) // reel 5+6 latch AM_RANGE(0x4000, 0x5FFF) AM_ROM // 8k ROM - AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) // 8k paged ROM (4 pages) + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK("bank1") // 8k paged ROM (4 pages) AM_RANGE(0x8000, 0xFFFF) AM_RAM AM_WRITE(watchdog_w) // 32k ROM ADDRESS_MAP_END @@ -845,7 +845,7 @@ static ADDRESS_MAP_START( memmap_adder2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3E01, 0x3E01) AM_READWRITE(vid_uart_rx_r,vid_uart_tx_w) // video uart receive reg AM_RANGE(0x4000, 0x5FFF) AM_ROM // 8k ROM - AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) // 8k paged ROM (4 pages) + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK("bank1") // 8k paged ROM (4 pages) AM_RANGE(0x8000, 0xFFFF) AM_ROM AM_WRITE(watchdog_w) // 32k ROM ADDRESS_MAP_END @@ -890,7 +890,7 @@ static ADDRESS_MAP_START( sc1_nec_uk, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3800, 0x39FF) AM_DEVWRITE("upd", nec_latch_w) AM_RANGE(0x4000, 0x5FFF) AM_ROM // 8k ROM - AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) // 8k paged ROM (4 pages) + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK("bank1") // 8k paged ROM (4 pages) AM_RANGE(0x8000, 0xFFFF) AM_ROM AM_WRITE(watchdog_w) // 32k ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 2b8d3ef063a..3e32847f6a7 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -369,10 +369,10 @@ send data to them, although obviously there's no response. */ { UINT8 *rom = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 1, &rom[0x10000], 0); - memory_configure_bank(machine, 1, 1, 3, &rom[0x02000], 0x02000); + memory_configure_bank(machine, "bank1", 0, 1, &rom[0x10000], 0); + memory_configure_bank(machine, "bank1", 1, 3, &rom[0x02000], 0x02000); - memory_set_bank(machine, 1,3); + memory_set_bank(machine, "bank1",3); } } @@ -487,7 +487,7 @@ static WRITE8_HANDLER( watchdog_w ) static WRITE8_HANDLER( bankswitch_w ) { - memory_set_bank(space->machine, 1,data & 0x03); + memory_set_bank(space->machine, "bank1",data & 0x03); } /////////////////////////////////////////////////////////////////////////// @@ -1556,7 +1556,7 @@ static ADDRESS_MAP_START( memmap_vid, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3FFF, 0x3FFF) AM_READ(coin_input_r) AM_RANGE(0x4000, 0x5fff) AM_ROM // 8k fixed ROM AM_RANGE(0x4000, 0xFFFF) AM_WRITE(unknown_w) // contains unknown I/O registers - AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) // 8k paged ROM (4 pages) + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK("bank1") // 8k paged ROM (4 pages) AM_RANGE(0x8000, 0xFFFF) AM_ROM // 32k ROM ADDRESS_MAP_END @@ -2790,7 +2790,7 @@ static ADDRESS_MAP_START( sc2_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3FFF, 0x3FFF) AM_READ( coin_input_r) AM_RANGE(0x4000, 0x5FFF) AM_ROM /* 8k fixed ROM */ - AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) /* 8k paged ROM (4 pages) */ + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK("bank1") /* 8k paged ROM (4 pages) */ AM_RANGE(0x8000, 0xFFFF) AM_ROM /* 32k ROM */ ADDRESS_MAP_END @@ -2839,7 +2839,7 @@ static ADDRESS_MAP_START( sc3_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3FFF, 0x3FFF) AM_READ( coin_input_r) AM_RANGE(0x4000, 0x5FFF) AM_ROM // AM_RANGE(0x4000, 0xFFFF) AM_WRITE(unknown_w) - AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xFFFF) AM_ROM ADDRESS_MAP_END @@ -2889,7 +2889,7 @@ static ADDRESS_MAP_START( memmap_sc2_dm01, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3FFF, 0x3FFF) AM_READ( coin_input_r) AM_RANGE(0x4000, 0x5FFF) AM_ROM // AM_RANGE(0x4000, 0xFFFF) AM_WRITE(unknown_w) - AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xFFFF) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index 5e3de8b08db..18b46351075 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -72,7 +72,7 @@ static WRITE8_HANDLER( beg_banking_w ) /* d0-d3 connect to A11-A14 of the ROMs (via ls273 latch) d4-d7 select one of ROMs (via ls273(above) and then ls154) */ - memory_set_bank(space->machine, 1, state->beg_bank & 0xff); /* empty sockets for IC37-IC44 ROMS */ + memory_set_bank(space->machine, "bank1", state->beg_bank & 0xff); /* empty sockets for IC37-IC44 ROMS */ } static TIMER_CALLBACK( from_sound_latch_callback ) @@ -310,7 +310,7 @@ INPUT_PORTS_END static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xcfff) AM_RAM - AM_RANGE(0xd000, 0xd7ff) AM_ROMBANK(1) + AM_RANGE(0xd000, 0xd7ff) AM_ROMBANK("bank1") AM_RANGE(0xd800, 0xdbff) AM_RAM AM_SHARE(1) /* only half of the RAM is accessible, line a10 of IC73 (6116) is GNDed */ AM_RANGE(0xe000, 0xe7ff) AM_WRITE(bigevglf_palette_w) AM_BASE_MEMBER(bigevglf_state, paletteram) AM_RANGE(0xe800, 0xefff) AM_WRITEONLY AM_BASE_MEMBER(bigevglf_state, spriteram1) /* sprite 'templates' */ @@ -637,7 +637,7 @@ ROM_END static DRIVER_INIT( bigevglf ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 0xff, &ROM[0x10000], 0x800); + memory_configure_bank(machine, "bank1", 0, 0xff, &ROM[0x10000], 0x800); } GAME( 1986, bigevglf, 0, bigevglf, bigevglf, bigevglf, ROT270, "Taito America Corporation", "Big Event Golf (US)", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index 11159cd3b42..0fbf922afc2 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -80,7 +80,7 @@ static WRITE8_HANDLER( bladestl_bankswitch_w ) /* bits 5-6 = bank number */ bankaddress = 0x10000 + ((data & 0x60) >> 5) * 0x2000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); /* bit 7 = select sprite bank */ bladestl_spritebank = (data & 0x80) << 3; @@ -126,7 +126,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2f80, 0x2f9f) AM_READWRITE(K051733_r, K051733_w) /* Protection: 051733 */ AM_RANGE(0x2fc0, 0x2fc0) AM_WRITENOP /* ??? */ AM_RANGE(0x4000, 0x5fff) AM_RAM /* Work RAM */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c index b629ce6fce5..dd761006a9c 100644 --- a/src/mame/drivers/blktiger.c +++ b/src/mame/drivers/blktiger.c @@ -58,7 +58,7 @@ static WRITE8_HANDLER( blktiger_to_main_w ) static WRITE8_HANDLER( blktiger_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); } static WRITE8_HANDLER( blktiger_coinlockout_w ) @@ -73,7 +73,7 @@ static WRITE8_HANDLER( blktiger_coinlockout_w ) static ADDRESS_MAP_START( blktiger_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_READWRITE(blktiger_bgvideoram_r, blktiger_bgvideoram_w) AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(blktiger_txvideoram_w) AM_BASE_MEMBER(blktiger_state, txvideoram) AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE_GENERIC(paletteram) @@ -287,7 +287,7 @@ static MACHINE_START( blktiger ) state->mcu = devtag_get_device(machine, "mcu"); /* configure bankswitching */ - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); state_save_register_global(machine, state->scroll_bank); state_save_register_global(machine, state->screen_layout); @@ -305,7 +305,7 @@ static MACHINE_RESET( blktiger ) blktiger_state *state = (blktiger_state *)machine->driver_data; /* configure bankswitching */ - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); state->scroll_x[0] = 0; state->scroll_x[1] = 0; diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index d95b99954b4..e00387682d7 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -79,7 +79,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_READWRITE(K052109_051960_r, K052109_051960_w) AM_RANGE(0x4000, 0x57ff) AM_RAM AM_RANGE(0x5800, 0x5fff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE(&ram) - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -251,7 +251,7 @@ static KONAMI_SETLINES_CALLBACK( blockhl_banking ) /* bits 0-1 = ROM bank */ rombank = lines & 0x03; offs = 0x10000 + (lines & 0x03) * 0x2000; - memory_set_bankptr(device->machine, 1,&RAM[offs]); + memory_set_bankptr(device->machine, "bank1",&RAM[offs]); /* bits 3/4 = coin counters */ coin_counter_w(device->machine, 0,lines & 0x08); diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index d1a0f4adef3..b66cc659738 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -1265,7 +1265,7 @@ static ADDRESS_MAP_START( bnstars_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xfec08000, 0xfec0ffff) AM_RAM_WRITE(ms32_bg0_ram_w) AM_BASE(&ms32_bg0_ram) AM_RANGE(0xfee00000, 0xfee1ffff) AM_RAM - AM_RANGE(0xffe00000, 0xffffffff) AM_ROMBANK(1) + AM_RANGE(0xffe00000, 0xffffffff) AM_ROMBANK("bank1") ADDRESS_MAP_END #if 0 @@ -1438,7 +1438,7 @@ static DRIVER_INIT (bnstars) decrypt_ms32_tx(machine, 0x00020,0x7e, "gfx7"); decrypt_ms32_bg(machine, 0x00001,0x9b, "gfx6"); - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu")); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu")); } GAME( 1997, bnstars1, 0, bnstars, bnstars, bnstars, ROT0, "Jaleco", "Vs. Janshi Brandnew Stars", GAME_NO_SOUND ) diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index e5049a7be64..c292aacb7d1 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -137,7 +137,7 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index f7051946c7e..bf36caa48b8 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -78,7 +78,7 @@ if ((data & 1) == 0) popmessage("bankswitch RAM bank 0"); /* bit 1-4 = ROM bank */ if (data & 0x10) offs = 0x20000 + (data & 0x06) * 0x1000; else offs = 0x10000 + (data & 0x0e) * 0x1000; - memory_set_bankptr(space->machine, 1,&RAM[offs]); + memory_set_bankptr(space->machine, "bank1",&RAM[offs]); } static WRITE8_HANDLER( bottom9_1f90_w ) @@ -147,7 +147,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x27ff) AM_READWRITE(bottom9_bankedram2_r, bottom9_bankedram2_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0x0000, 0x3fff) AM_READWRITE(K052109_051960_r, K052109_051960_w) AM_RANGE(0x4000, 0x5fff) AM_RAM - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c index 132faf5933f..8691c65f565 100644 --- a/src/mame/drivers/brkthru.c +++ b/src/mame/drivers/brkthru.c @@ -117,7 +117,7 @@ static ADDRESS_MAP_START( brkthru_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x1801) AM_WRITE(brkthru_1800_w) /* bg scroll and color, ROM bank selection, flip screen */ AM_RANGE(0x1802, 0x1802) AM_WRITE(brkthru_soundlatch_w) AM_RANGE(0x1803, 0x1803) AM_WRITE(brkthru_1803_w) /* NMI enable, + ? */ - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -135,7 +135,7 @@ static ADDRESS_MAP_START( darwin_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0801) AM_WRITE(brkthru_1800_w) /* bg scroll and color, ROM bank selection, flip screen */ AM_RANGE(0x0802, 0x0802) AM_WRITE(brkthru_soundlatch_w) AM_RANGE(0x0803, 0x0803) AM_WRITE(darwin_0803_w) /* NMI enable, + ? */ - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -661,7 +661,7 @@ ROM_END static DRIVER_INIT( brkthru ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 8, &ROM[0x10000], 0x2000); + memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x2000); } /************************************* diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index 8e59bb7c78b..3ee661454e8 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -2165,8 +2165,8 @@ static DRIVER_INIT( cookrace ) btime_state *state = (btime_state *)machine->driver_data; decrypt_C10707_cpu(machine, "maincpu"); - memory_install_read8_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, (read8_space_func)SMH_BANK(10)); - memory_set_bankptr(machine, 10, memory_region(machine, "audiocpu") + 0xe200); + memory_install_read_bank_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10"); + memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + 0xe200); state->audio_nmi_enable_type = AUDIO_ENABLE_DIRECT; } @@ -2184,8 +2184,8 @@ static DRIVER_INIT( wtennis ) memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc15f, 0xc15f, 0, 0, wtennis_reset_hack_r); - memory_install_read8_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, (read8_space_func)SMH_BANK(10)); - memory_set_bankptr(machine, 10, memory_region(machine, "audiocpu") + 0xe200); + memory_install_read_bank_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10"); + memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + 0xe200); state->audio_nmi_enable_type = AUDIO_ENABLE_AY8910; } diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c index b796e9c446c..22ae8e0791c 100644 --- a/src/mame/drivers/bublbobl.c +++ b/src/mame/drivers/bublbobl.c @@ -287,7 +287,7 @@ TODO: static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, videoram, videoram_size) AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, objectram, objectram_size) AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE(1) @@ -343,7 +343,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bootleg_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, videoram, videoram_size) AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, objectram, objectram_size) AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE(1) @@ -367,7 +367,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tokio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, videoram, videoram_size) AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, objectram, objectram_size) AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE(1) @@ -1496,7 +1496,7 @@ ROM_END static void configure_banks( running_machine* machine ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 8, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); } static DRIVER_INIT( bublbobl ) diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index 6967c695d08..0b27dc41809 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -92,7 +92,7 @@ Dip locations and factory settings verified from dip listing static WRITE8_HANDLER( bankswitch_w ) { - memory_set_bankptr(space->machine, 1,&memory_region(space->machine, "maincpu")[0x10000 + (data & 7) * 0x2000]); + memory_set_bankptr(space->machine, "bank1",&memory_region(space->machine, "maincpu")[0x10000 + (data & 7) * 0x2000]); } static TIMER_CALLBACK( nmi_callback ) @@ -141,7 +141,7 @@ static ADDRESS_MAP_START( buggychl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM /* 6116 SRAM (36) */ AM_RANGE(0x8800, 0x8fff) AM_RAM /* 6116 SRAM (35) */ AM_RANGE(0x9000, 0x9fff) AM_WRITE(buggychl_sprite_lookup_w) - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) AM_WRITE(buggychl_chargen_w) AM_BASE_MEMBER(buggychl_state, charram) + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_WRITE(buggychl_chargen_w) AM_BASE_MEMBER(buggychl_state, charram) AM_RANGE(0xc800, 0xcfff) AM_RAM AM_BASE_SIZE_MEMBER(buggychl_state, videoram, videoram_size) AM_RANGE(0xd100, 0xd100) AM_WRITE(buggychl_ctrl_w) AM_RANGE(0xd200, 0xd200) AM_WRITE(bankswitch_w) diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c index 0f66453b912..bc6a02c4659 100644 --- a/src/mame/drivers/bzone.c +++ b/src/mame/drivers/bzone.c @@ -800,8 +800,8 @@ static WRITE8_HANDLER( analog_select_w ) static DRIVER_INIT( bradley ) { - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400, 0x7ff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x400)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400, 0x7ff, 0, 0, "bank1"); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x400)); memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1808, 0x1808, 0, 0, "1808"); memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1809, 0x1809, 0, 0, "1809"); diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index 6f7e5a8eea2..662da46cbe4 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -850,7 +850,7 @@ static void seibu_sound_bootleg(running_machine *machine,const char *cpu,int len memcpy(decrypt, rom+length, length); if (length > 0x10000) - memory_configure_bank_decrypted(machine, 1, 0, (length - 0x10000) / 0x8000, decrypt + 0x10000, 0x8000); + memory_configure_bank_decrypted(machine, "bank1", 0, (length - 0x10000) / 0x8000, decrypt + 0x10000, 0x8000); } diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c index f8e760366db..92f6617cf72 100644 --- a/src/mame/drivers/calchase.c +++ b/src/mame/drivers/calchase.c @@ -324,11 +324,11 @@ static void mxtc_config_w(const device_config *busdevice, const device_config *d { if (data & 0x10) // enable RAM access to region 0xf0000 - 0xfffff { - memory_set_bankptr(busdevice->machine, 1, bios_ram); + memory_set_bankptr(busdevice->machine, "bank1", bios_ram); } else // disable RAM access (reads go to BIOS ROM) { - memory_set_bankptr(busdevice->machine, 1, memory_region(busdevice->machine, "bios") + 0x10000); + memory_set_bankptr(busdevice->machine, "bank1", memory_region(busdevice->machine, "bios") + 0x10000); } break; } @@ -459,7 +459,7 @@ static ADDRESS_MAP_START( calchase_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000a0000, 0x000bffff) AM_RAM AM_BASE(&vga_vram) AM_RANGE(0x000c0000, 0x000c7fff) AM_RAM AM_REGION("video_bios", 0) AM_RANGE(0x000e0000, 0x000effff) AM_RAM - AM_RANGE(0x000f0000, 0x000fffff) AM_ROMBANK(1) + AM_RANGE(0x000f0000, 0x000fffff) AM_ROMBANK("bank1") AM_RANGE(0x000f0000, 0x000fffff) AM_WRITE(bios_ram_w) AM_RANGE(0x00100000, 0x01ffffff) AM_RAM AM_RANGE(0x04000000, 0x040001ff) AM_RAM @@ -622,7 +622,7 @@ static const struct pit8253_config calchase_pit8254_config = static MACHINE_RESET(calchase) { - memory_set_bankptr(machine, 1, memory_region(machine, "bios") + 0x10000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "bios") + 0x10000); } static void set_gate_a20(running_machine *machine, int a20) diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index b0e01f2a31f..46c905b0e14 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -139,7 +139,7 @@ static TIMER_CALLBACK( capbowl_update ) static WRITE8_HANDLER( capbowl_rom_select_w ) { // 2009-11 FP: shall we add a check to be sure that bank < 6? - memory_set_bank(space->machine, 1, ((data & 0x0c) >> 1) + (data & 0x01)); + memory_set_bank(space->machine, "bank1", ((data & 0x0c) >> 1) + (data & 0x01)); } @@ -237,7 +237,7 @@ static NVRAM_HANDLER( capbowl ) *************************************/ static ADDRESS_MAP_START( capbowl_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x4000) AM_WRITEONLY AM_BASE_MEMBER(capbowl_state, rowaddress) AM_RANGE(0x4800, 0x4800) AM_WRITE(capbowl_rom_select_w) AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) @@ -523,7 +523,7 @@ static DRIVER_INIT( capbowl ) UINT8 *ROM = memory_region(machine, "maincpu"); /* configure ROM banks in 0x0000-0x3fff */ - memory_configure_bank(machine, 1, 0, 6, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL(bowlrama); } diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 78fc1d3fdf3..41377f3fdb5 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -779,7 +779,7 @@ static ADDRESS_MAP_START( mazinger_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800002, 0x800003) AM_READ_PORT("IN1") // Inputs + EEPROM AM_RANGE(0x900000, 0x900001) AM_WRITE(cave_eeprom_msb_w) // EEPROM /**/AM_RANGE(0xc08000, 0xc0ffff) AM_RAM AM_BASE_GENERIC(paletteram) AM_SIZE(&cave_paletteram_size) // Palette - AM_RANGE(0xd00000, 0xd7ffff) AM_ROMBANK(1) // ROM + AM_RANGE(0xd00000, 0xd7ffff) AM_ROMBANK("bank1") // ROM ADDRESS_MAP_END @@ -964,7 +964,7 @@ static WRITE8_HANDLER( hotdogst_rombank_w ) int bank = data & 0x0f; if ( data & ~0x0f ) logerror("CPU #1 - PC %04X: Bank %02X\n",cpu_get_pc(space->cpu),data); if (bank > 1) bank+=2; - memory_set_bankptr(space->machine, 2, &RAM[ 0x4000 * bank ]); + memory_set_bankptr(space->machine, "bank2", &RAM[ 0x4000 * bank ]); } static WRITE8_HANDLER( hotdogst_okibank_w ) @@ -978,7 +978,7 @@ static WRITE8_HANDLER( hotdogst_okibank_w ) static ADDRESS_MAP_START( hotdogst_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) // ROM (Banked) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2") // ROM (Banked) AM_RANGE(0xe000, 0xffff) AM_RAM // RAM ADDRESS_MAP_END @@ -1003,12 +1003,12 @@ static WRITE8_HANDLER( mazinger_rombank_w ) int bank = data & 0x07; if ( data & ~0x07 ) logerror("CPU #1 - PC %04X: Bank %02X\n",cpu_get_pc(space->cpu),data); if (bank > 1) bank+=2; - memory_set_bankptr(space->machine, 2, &RAM[ 0x4000 * bank ]); + memory_set_bankptr(space->machine, "bank2", &RAM[ 0x4000 * bank ]); } static ADDRESS_MAP_START( mazinger_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) // ROM (Banked) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2") // ROM (Banked) AM_RANGE(0xc000, 0xc7ff) AM_RAM // RAM AM_RANGE(0xf800, 0xffff) AM_RAM // RAM ADDRESS_MAP_END @@ -1035,7 +1035,7 @@ static WRITE8_HANDLER( metmqstr_rombank_w ) int bank = data & 0xf; if ( bank != data ) logerror("CPU #1 - PC %04X: Bank %02X\n",cpu_get_pc(space->cpu),data); if (bank >= 2) bank += 2; - memory_set_bankptr(space->machine, 1, &ROM[ 0x4000 * bank ]); + memory_set_bankptr(space->machine, "bank1", &ROM[ 0x4000 * bank ]); } static WRITE8_HANDLER( metmqstr_okibank0_w ) @@ -1058,7 +1058,7 @@ static WRITE8_HANDLER( metmqstr_okibank1_w ) static ADDRESS_MAP_START( metmqstr_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) // ROM (Banked) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") // ROM (Banked) AM_RANGE(0xe000, 0xffff) AM_RAM // RAM ADDRESS_MAP_END @@ -1086,12 +1086,12 @@ static WRITE8_HANDLER( pwrinst2_rombank_w ) int bank = data & 0x07; if ( data & ~0x07 ) logerror("CPU #1 - PC %04X: Bank %02X\n",cpu_get_pc(space->cpu),data); if (bank > 2) bank+=1; - memory_set_bankptr(space->machine, 1, &ROM[ 0x4000 * bank ]); + memory_set_bankptr(space->machine, "bank1", &ROM[ 0x4000 * bank ]); } static ADDRESS_MAP_START( pwrinst2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // ROM (Banked) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // ROM (Banked) AM_RANGE(0xe000, 0xffff) AM_RAM // RAM ADDRESS_MAP_END @@ -1129,7 +1129,7 @@ static WRITE8_HANDLER( sailormn_rombank_w ) int bank = data & 0x1f; if ( data & ~0x1f ) logerror("CPU #1 - PC %04X: Bank %02X\n",cpu_get_pc(space->cpu),data); if (bank > 1) bank+=2; - memory_set_bankptr(space->machine, 1, &RAM[ 0x4000 * bank ]); + memory_set_bankptr(space->machine, "bank1", &RAM[ 0x4000 * bank ]); } static WRITE8_HANDLER( sailormn_okibank0_w ) @@ -1152,7 +1152,7 @@ static WRITE8_HANDLER( sailormn_okibank1_w ) static ADDRESS_MAP_START( sailormn_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) // ROM (Banked) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") // ROM (Banked) AM_RANGE(0xc000, 0xdfff) AM_READWRITE(mirror_ram_r, mirror_ram_w) AM_BASE(&mirror_ram) // RAM AM_RANGE(0xe000, 0xffff) AM_READWRITE(mirror_ram_r, mirror_ram_w) // Mirrored RAM (agallet) ADDRESS_MAP_END @@ -3966,7 +3966,7 @@ static DRIVER_INIT( mazinger ) time_vblank_irq = 2100; /* setup extra ROM */ - memory_set_bankptr(machine, 1,memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank1",memory_region(machine, "user1")); } diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index 4fa25189f2b..f628498bbb3 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -37,7 +37,7 @@ static WRITE8_HANDLER( cbasebal_bankswitch_w ) { /* bits 0-4 select ROM bank */ //logerror("%04x: bankswitch %02x\n",cpu_get_pc(space->cpu),data); - memory_set_bank(space->machine, 1, data & 0x1f); + memory_set_bank(space->machine, "bank1", data & 0x1f); /* bit 5 used but unknown */ @@ -133,7 +133,7 @@ static WRITE8_HANDLER( eeprom_serial_w ) static ADDRESS_MAP_START( cbasebal_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE_GENERIC(paletteram) /* palette + vram + scrollram */ AM_RANGE(0xe000, 0xfdff) AM_RAM /* work RAM */ AM_RANGE(0xfe00, 0xffff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) @@ -306,7 +306,7 @@ ROM_END static DRIVER_INIT( cbasebal ) { - memory_configure_bank(machine, 1, 0, 32, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 32, memory_region(machine, "maincpu") + 0x10000, 0x4000); pang_decode(machine); } diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index cc29d3fe77e..cf42c9240ee 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -142,7 +142,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c index 32738a49ac9..38aebfd5015 100644 --- a/src/mame/drivers/ccastles.c +++ b/src/mame/drivers/ccastles.c @@ -227,7 +227,7 @@ static MACHINE_START( ccastles ) video_screen_configure(machine->primary_screen, 320, 256, &visarea, HZ_TO_ATTOSECONDS(PIXEL_CLOCK) * VTOTAL * HTOTAL); /* configure the ROM banking */ - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0xa000, 0x6000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0xa000, 0x6000); /* create a timer for IRQs and set up the first callback */ state->irq_timer = timer_alloc(machine, clock_irq, NULL); @@ -284,7 +284,7 @@ static WRITE8_HANDLER( ccounter_w ) static WRITE8_HANDLER( bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); } @@ -364,7 +364,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9e87, 0x9e87) AM_MIRROR(0x0078) AM_WRITE(bankswitch_w) AM_RANGE(0x9f00, 0x9f07) AM_MIRROR(0x0078) AM_WRITE(ccastles_video_control_w) AM_RANGE(0x9f80, 0x9fbf) AM_MIRROR(0x0040) AM_WRITE(ccastles_paletteram_w) - AM_RANGE(0xa000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index d1c9e4ee00b..18baa3ee4d1 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -250,7 +250,7 @@ static WRITE8_HANDLER(toprollr_rombank_w) toprollr_rombank |= (data & 1) << offset; if (toprollr_rombank < 3) - memory_set_bank(space->machine, 1, toprollr_rombank); + memory_set_bank(space->machine, "bank1", toprollr_rombank); } @@ -366,7 +366,7 @@ static ADDRESS_MAP_START( yamato_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( toprollr_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0x5fff) AM_ROMBANK("bank1") AM_RANGE(0x6000, 0x6bff) AM_RAM AM_RANGE(0x8800, 0x88ff) AM_RAM AM_BASE(&cclimber_bigsprite_videoram) AM_RANGE(0x8c00, 0x8fff) AM_RAM AM_BASE(&toprollr_bg_videoram) diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c index ccc74e96de6..000597ceb50 100644 --- a/src/mame/drivers/chaknpop.c +++ b/src/mame/drivers/chaknpop.c @@ -57,7 +57,7 @@ static ADDRESS_MAP_START( chaknpop_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9800, 0x983f) AM_RAM_WRITE(chaknpop_attrram_w) AM_BASE_MEMBER(chaknpop_state, attr_ram) // Color attribute AM_RANGE(0x9840, 0x98ff) AM_RAM AM_BASE_SIZE_MEMBER(chaknpop_state, spr_ram, spr_ram_size) // sprite AM_RANGE(0xa000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xffff) AM_RAMBANK(1) // bitmap plane 1-4 + AM_RANGE(0xc000, 0xffff) AM_RAMBANK("bank1") // bitmap plane 1-4 ADDRESS_MAP_END static const ay8910_interface ay8910_interface_1 = @@ -247,7 +247,7 @@ static MACHINE_START( chaknpop ) chaknpop_state *state = (chaknpop_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 2, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); state_save_register_global(machine, state->gfxmode); state_save_register_global(machine, state->flip_x); diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c index 7a5baca78ce..eb7078d951e 100644 --- a/src/mame/drivers/cham24.c +++ b/src/mame/drivers/cham24.c @@ -176,7 +176,7 @@ static WRITE8_HANDLER( cham24_mapper_w ) UINT8* src = memory_region(space->machine, "user1"); // switch PPU VROM bank - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "gfx1") + (0x2000 * gfx_bank)); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "gfx1") + (0x2000 * gfx_bank)); // set gfx mirroring cham24_set_mirroring(gfx_mirroring != 0 ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); @@ -287,8 +287,8 @@ static MACHINE_START( cham24 ) memcpy(&dst[0xc000], &src[0x0f8000], 0x4000); /* uses 8K swapping, all ROM!*/ - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(1), 0); - memory_set_bankptr(machine, 1, memory_region(machine, "gfx1")); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1"); + memory_set_bankptr(machine, "bank1", memory_region(machine, "gfx1")); /* need nametable ram, though. I doubt this uses more than 2k, but it starts up configured for 4 */ nt_ram = auto_alloc_array(machine, UINT8, 0x1000); diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index 35f7ad75d44..0b194ec74b8 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -179,7 +179,7 @@ static WRITE8_HANDLER( champbwl_misc_w ) coin_lockout_w(space->machine, 0, ~data & 8); coin_lockout_w(space->machine, 1, ~data & 4); - memory_set_bank(space->machine, 1, (data & 0x30) >> 4); + memory_set_bank(space->machine, "bank1", (data & 0x30) >> 4); } static WRITE8_HANDLER( champbwl_objctrl_w ) @@ -193,7 +193,7 @@ static WRITE8_HANDLER( champbwl_objctrl_w ) static ADDRESS_MAP_START( champbwl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_REGION("maincpu", 0x10000) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE_MEMBER(tnzs_state, objram) AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE("x1snd", seta_sound_r, seta_sound_w) @@ -337,7 +337,7 @@ static MACHINE_START( champbwl ) state->mcu = NULL; - memory_configure_bank(machine, 1, 0, 4, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); state_save_register_global(machine, state->screenflip); state_save_register_global_array(machine, state->last_trackball_val); diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index 769bb988e5c..ae62a701a20 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -209,7 +209,7 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2001, 0x2001) AM_READ_PORT("SYSTEM") AM_RANGE(0x2003, 0x2003) AM_READ_PORT("JOY") AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -335,7 +335,7 @@ static WRITE8_DEVICE_HANDLER( chanbara_ay_out_1_w ) state->scrollhi = data & 0x03; - memory_set_bank(device->machine, 1, (data & 0x04) >> 2); + memory_set_bank(device->machine, "bank1", (data & 0x04) >> 2); //if (data & 0xf8) printf("chanbara_ay_out_1_w unused bits set %02x\n", data & 0xf8); } @@ -466,7 +466,7 @@ static DRIVER_INIT(chanbara ) dst[i + 0x2000] = (src[i + 0x1000] & 0x0f) << 4; } - memory_configure_bank(machine, 1, 0, 2, &bg[0x0000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, &bg[0x0000], 0x4000); } GAME( 1985, chanbara, 0, chanbara, chanbara, chanbara, ROT270, "Data East", "Chanbara", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index da25b6cf268..92444ea6979 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -180,12 +180,12 @@ static WRITE8_HANDLER( chinagat_video_ctrl_w ) static WRITE8_HANDLER( chinagat_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x07); // shall we check (data & 7) < 6 (# of banks)? + memory_set_bank(space->machine, "bank1", data & 0x07); // shall we check (data & 7) < 6 (# of banks)? } static WRITE8_HANDLER( chinagat_sub_bankswitch_w ) { - memory_set_bank(space->machine, 4, data & 0x07); // shall we check (data & 7) < 6 (# of banks)? + memory_set_bank(space->machine, "bank4", data & 0x07); // shall we check (data & 7) < 6 (# of banks)? } static READ8_HANDLER( saiyugb1_mcu_command_r ) @@ -311,7 +311,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE_MEMBER(ddragon_state, bgvideoram) AM_RANGE(0x3000, 0x317f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0x3400, 0x357f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE_GENERIC(paletteram2) - AM_RANGE(0x3800, 0x397f) AM_WRITE(SMH_BANK(3)) AM_BASE_SIZE_MEMBER(ddragon_state, spriteram, spriteram_size) + AM_RANGE(0x3800, 0x397f) AM_WRITE_BANK("bank3") AM_BASE_SIZE_MEMBER(ddragon_state, spriteram, spriteram_size) AM_RANGE(0x3e00, 0x3e04) AM_WRITE(chinagat_interrupt_w) AM_RANGE(0x3e06, 0x3e06) AM_WRITEONLY AM_BASE_MEMBER(ddragon_state, scrolly_lo) AM_RANGE(0x3e07, 0x3e07) AM_WRITEONLY AM_BASE_MEMBER(ddragon_state, scrollx_lo) @@ -322,7 +322,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3f02, 0x3f02) AM_READ_PORT("DSW2") AM_RANGE(0x3f03, 0x3f03) AM_READ_PORT("P1") AM_RANGE(0x3f04, 0x3f04) AM_READ_PORT("P2") - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -332,7 +332,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2800) AM_WRITEONLY /* Called on CPU start and after return from jump table */ // AM_RANGE(0x2a2b, 0x2a2b) AM_READNOP /* What lives here? */ // AM_RANGE(0x2a30, 0x2a30) AM_READNOP /* What lives here? */ - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(4) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank4") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -531,7 +531,7 @@ static MACHINE_START( chinagat ) state->snd_cpu = devtag_get_device(machine, "audiocpu"); /* configure banks */ - memory_configure_bank(machine, 1, 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); /* register for save states */ state_save_register_global(machine, state->scrollx_hi); @@ -932,8 +932,8 @@ static DRIVER_INIT( chinagat ) state->sprite_irq = M6809_IRQ_LINE; state->sound_irq = INPUT_LINE_NMI; - memory_configure_bank(machine, 1, 0, 6, &MAIN[0x10000], 0x4000); - memory_configure_bank(machine, 4, 0, 6, &SUB[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 6, &MAIN[0x10000], 0x4000); + memory_configure_bank(machine, "bank4", 0, 6, &SUB[0x10000], 0x4000); } diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index b299fc12e4d..d943456c4f6 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -80,7 +80,7 @@ static VIDEO_UPDATE(chinsan) static MACHINE_RESET( chinsan ) { - memory_configure_bank(machine, 1, 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x4000); adpcm_idle = 1; } @@ -88,7 +88,7 @@ static MACHINE_RESET( chinsan ) static WRITE8_HANDLER(ctrl_w) { - memory_set_bank(space->machine, 1, data >> 6); + memory_set_bank(space->machine, "bank1", data >> 6); } static WRITE8_DEVICE_HANDLER( ym_port_w1 ) @@ -202,7 +202,7 @@ static WRITE8_DEVICE_HANDLER( chin_adpcm_w ) static ADDRESS_MAP_START( chinsan_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_BASE(&chinsan_video) ADDRESS_MAP_END @@ -585,7 +585,7 @@ ROM_END static DRIVER_INIT( chinsan ) { - mc8123_decrypt_rom(machine, "maincpu", "user1", 1, 4); + mc8123_decrypt_rom(machine, "maincpu", "user1", "bank1", 4); } diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 892886dee85..89677f09398 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -51,13 +51,14 @@ static WRITE8_HANDLER( chqflag_bankswitch_w ) /* bits 0-4 = ROM bank # (0x00-0x11) */ bankaddress = 0x10000 + (data & 0x1f)*0x4000; - memory_set_bankptr(space->machine, 4,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank4",&RAM[bankaddress]); /* bit 5 = memory bank select */ if (data & 0x20) { - memory_install_readwrite8_handler(space, 0x1800, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(5), paletteram_xBBBBBGGGGGRRRRR_be_w); - memory_set_bankptr(space->machine, 5, space->machine->generic.paletteram.v); + memory_install_read_bank_handler(space, 0x1800, 0x1fff, 0, 0, "bank5"); + memory_install_write8_handler(space, 0x1800, 0x1fff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w); + memory_set_bankptr(space->machine, "bank5", space->machine->generic.paletteram.v); if (K051316_readroms) memory_install_readwrite8_handler(space, 0x1000, 0x17ff, 0, 0, K051316_rom_0_r, K051316_0_w); /* 051316 #1 (ROM test) */ @@ -66,8 +67,8 @@ static WRITE8_HANDLER( chqflag_bankswitch_w ) } else { - memory_install_readwrite8_handler(space, 0x1000, 0x17ff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); /* RAM */ - memory_install_readwrite8_handler(space, 0x1800, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(2), (write8_space_func)SMH_BANK(2)); /* RAM */ + memory_install_readwrite_bank_handler(space, 0x1000, 0x17ff, 0, 0, "bank1"); /* RAM */ + memory_install_readwrite_bank_handler(space, 0x1800, 0x1fff, 0, 0, "bank2"); /* RAM */ } /* other bits unknown/unused */ @@ -149,11 +150,11 @@ static WRITE8_HANDLER( chqflag_sh_irqtrigger_w ) static ADDRESS_MAP_START( chqflag_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM /* RAM */ - AM_RANGE(0x1000, 0x17ff) AM_RAMBANK(1) /* banked RAM (RAM/051316 (chip 1)) */ - AM_RANGE(0x1800, 0x1fff) AM_RAMBANK(2) /* palette + RAM */ + AM_RANGE(0x1000, 0x17ff) AM_RAMBANK("bank1") /* banked RAM (RAM/051316 (chip 1)) */ + AM_RANGE(0x1800, 0x1fff) AM_RAMBANK("bank2") /* palette + RAM */ AM_RANGE(0x2000, 0x2007) AM_READWRITE(K051937_r, K051937_w) /* Sprite control registers */ AM_RANGE(0x2400, 0x27ff) AM_READWRITE(K051960_r, K051960_w) /* Sprite RAM */ - AM_RANGE(0x2800, 0x2fff) AM_READWRITE(SMH_BANK(3), K051316_1_w) /* 051316 zoom/rotation (chip 2) */ + AM_RANGE(0x2800, 0x2fff) AM_READ_BANK("bank3") AM_WRITE(K051316_1_w) /* 051316 zoom/rotation (chip 2) */ AM_RANGE(0x3000, 0x3000) AM_WRITE(soundlatch_w) /* sound code # */ AM_RANGE(0x3001, 0x3001) AM_WRITE(chqflag_sh_irqtrigger_w) /* cause interrupt on audio CPU */ AM_RANGE(0x3002, 0x3002) AM_WRITE(chqflag_bankswitch_w) /* bankswitch control */ @@ -169,7 +170,7 @@ static ADDRESS_MAP_START( chqflag_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3700, 0x3700) AM_WRITE(select_analog_ctrl_w) /* select accelerator/wheel */ AM_RANGE(0x3701, 0x3701) AM_READ_PORT("IN2") /* Brake + Shift + ? */ AM_RANGE(0x3702, 0x3702) AM_READWRITE(analog_read_r, select_analog_ctrl_w) /* accelerator/wheel */ - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(4) /* banked ROM */ + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank4") /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c index 8282603b83e..5e0407e475e 100644 --- a/src/mame/drivers/cidelsa.c +++ b/src/mame/drivers/cidelsa.c @@ -61,7 +61,7 @@ static WRITE8_HANDLER( draco_sound_bankswitch_w ) int bank = BIT(data, 3); - memory_set_bank(space->machine, 1, bank); + memory_set_bank(space->machine, "bank1", bank); } static WRITE8_DEVICE_HANDLER( draco_sound_g_w ) @@ -292,7 +292,7 @@ static ADDRESS_MAP_START( draco_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( draco_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000, 0x3ff) AM_ROMBANK(1) + AM_RANGE(0x000, 0x3ff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( draco_sound_io_map, ADDRESS_SPACE_IO, 8 ) @@ -492,8 +492,8 @@ static MACHINE_START( draco ) MACHINE_START_CALL( cidelsa ); /* setup COP402 memory banking */ - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "audiocpu"), 0x400); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "audiocpu"), 0x400); + memory_set_bank(machine, "bank1", 0); /* register for state saving */ state_save_register_global(machine, state->draco_sound); diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c index cff97ea84af..3823c6b635b 100644 --- a/src/mame/drivers/cinemat.c +++ b/src/mame/drivers/cinemat.c @@ -280,7 +280,7 @@ static READ8_HANDLER( qb3_frame_r ) static WRITE8_HANDLER( qb3_ram_bank_w ) { - memory_set_bank(space->machine, 1, cpu_get_reg(cputag_get_cpu(space->machine, "maincpu"), CCPU_P) & 3); + memory_set_bank(space->machine, "bank1", cpu_get_reg(cputag_get_cpu(space->machine, "maincpu"), CCPU_P) & 3); } @@ -318,7 +318,7 @@ static ADDRESS_MAP_START( data_map, ADDRESS_SPACE_DATA, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( data_map_qb3, ADDRESS_SPACE_DATA, 16 ) - AM_RANGE(0x0000, 0x03ff) AM_RAMBANK(1) AM_BASE(&rambase) + AM_RANGE(0x0000, 0x03ff) AM_RAMBANK("bank1") AM_BASE(&rambase) ADDRESS_MAP_END @@ -1467,7 +1467,7 @@ static DRIVER_INIT( qb3 ) memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, qb3_frame_r); memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x00, 0x00, 0, 0, qb3_ram_bank_w); - memory_configure_bank(machine, 1, 0, 4, rambase, 0x100*2); + memory_configure_bank(machine, "bank1", 0, 4, rambase, 0x100*2); } diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c index 0a41b219d2e..8452a8e6cff 100644 --- a/src/mame/drivers/cloud9.c +++ b/src/mame/drivers/cloud9.c @@ -304,7 +304,7 @@ static READ8_HANDLER( nvram_r ) static ADDRESS_MAP_START( cloud9_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0001) AM_WRITE(cloud9_bitmode_addr_w) AM_RANGE(0x0002, 0x0002) AM_READWRITE(cloud9_bitmode_r, cloud9_bitmode_w) - AM_RANGE(0x0000, 0x4fff) AM_ROMBANK(1) AM_WRITE(cloud9_videoram_w) + AM_RANGE(0x0000, 0x4fff) AM_ROMBANK("bank1") AM_WRITE(cloud9_videoram_w) AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE_MEMBER(cloud9_state, spriteram) AM_RANGE(0x5400, 0x547f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5480, 0x54ff) AM_WRITE(irq_ack_w) diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c index 9724144c8ff..9428da94251 100644 --- a/src/mame/drivers/cmmb.c +++ b/src/mame/drivers/cmmb.c @@ -107,7 +107,7 @@ static UINT8 irq_mask; UINT32 bankaddress; bankaddress = 0x10000 + (0x10000 * (data & 0x03)); - memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &ROM[bankaddress]); } */ @@ -122,7 +122,7 @@ static WRITE8_HANDLER( cmmb_output_w ) UINT32 bankaddress; bankaddress = 0x1c000 + (0x10000 * (data & 0x03)); - memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &ROM[bankaddress]); } break; case 0x03: @@ -146,7 +146,7 @@ static ADDRESS_MAP_START( cmmb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2480, 0x249f) AM_RAM_WRITE(cmmb_paletteram_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0x4000, 0x400f) AM_READWRITE(cmmb_input_r,cmmb_output_w) //i/o AM_RANGE(0x4900, 0x4900) AM_READ(kludge_r) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xafff) AM_RAM AM_RANGE(0xb000, 0xbfff) AM_READWRITE(cmmb_charram_r,cmmb_charram_w) AM_RANGE(0xc000, 0xc00f) AM_READWRITE(cmmb_input_r,cmmb_output_w) //i/o diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 3d5eacc5def..c72d706fd03 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -270,7 +270,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END @@ -282,7 +282,7 @@ static ADDRESS_MAP_START( sound_map_mutantf, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index 1aae3f0b99c..f12beb1c069 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -351,17 +351,17 @@ static MACHINE_RESET( cojag ) /* graphics banks */ if (cojag_is_r3000) { - memory_configure_bank(machine, 1, 0, 2, rom + 0x800000, 0x400000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 2, rom + 0x800000, 0x400000); + memory_set_bank(machine, "bank1", 0); } - memory_configure_bank(machine, 8, 0, 2, rom + 0x800000, 0x400000); - memory_set_bank(machine, 8, 0); + memory_configure_bank(machine, "bank8", 0, 2, rom + 0x800000, 0x400000); + memory_set_bank(machine, "bank8", 0); /* sound banks */ - memory_configure_bank(machine, 2, 0, 8, rom + 0x000000, 0x200000); - memory_configure_bank(machine, 9, 0, 8, rom + 0x000000, 0x200000); - memory_set_bank(machine, 2, 0); - memory_set_bank(machine, 9, 0); + memory_configure_bank(machine, "bank2", 0, 8, rom + 0x000000, 0x200000); + memory_configure_bank(machine, "bank9", 0, 8, rom + 0x000000, 0x200000); + memory_set_bank(machine, "bank2", 0); + memory_set_bank(machine, "bank9", 0); } /* clear any spinuntil stuff */ @@ -426,8 +426,8 @@ static WRITE32_HANDLER( misc_control_w ) /* adjust banking */ if (memory_region(space->machine, "user2")) { - memory_set_bank(space->machine, 2, (data >> 1) & 7); - memory_set_bank(space->machine, 9, (data >> 1) & 7); + memory_set_bank(space->machine, "bank2", (data >> 1) & 7); + memory_set_bank(space->machine, "bank9", (data >> 1) & 7); } COMBINE_DATA(&misc_control_data); @@ -493,8 +493,8 @@ static WRITE32_HANDLER( latch_w ) if (memory_region(space->machine, "user2")) { if (cojag_is_r3000) - memory_set_bank(space->machine, 1, data & 1); - memory_set_bank(space->machine, 8, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); + memory_set_bank(space->machine, "bank8", data & 1); } } @@ -783,8 +783,8 @@ static WRITE32_HANDLER( area51mx_main_speedup_w ) static ADDRESS_MAP_START( r3000_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x04000000, 0x047fffff) AM_RAM AM_BASE(&jaguar_shared_ram) AM_SHARE(1) - AM_RANGE(0x04800000, 0x04bfffff) AM_ROMBANK(1) - AM_RANGE(0x04c00000, 0x04dfffff) AM_ROMBANK(2) + AM_RANGE(0x04800000, 0x04bfffff) AM_ROMBANK("bank1") + AM_RANGE(0x04c00000, 0x04dfffff) AM_ROMBANK("bank2") AM_RANGE(0x04e00000, 0x04e003ff) AM_DEVREADWRITE("ide", ide_controller32_r, ide_controller32_w) AM_RANGE(0x04f00000, 0x04f003ff) AM_READWRITE(jaguar_tom_regs32_r, jaguar_tom_regs32_w) AM_RANGE(0x04f00400, 0x04f007ff) AM_RAM AM_BASE(&jaguar_gpu_clut) AM_SHARE(2) @@ -818,7 +818,7 @@ static ADDRESS_MAP_START( m68020_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xa30000, 0xa30003) AM_WRITE(watchdog_reset32_w) AM_RANGE(0xa40000, 0xa40003) AM_WRITE(eeprom_enable_w) AM_RANGE(0xb70000, 0xb70003) AM_READWRITE(misc_control_r, misc_control_w) - AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK(2) + AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK("bank2") AM_RANGE(0xe00000, 0xe003ff) AM_DEVREADWRITE("ide", ide_controller32_r, ide_controller32_w) AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE(jaguar_tom_regs32_r, jaguar_tom_regs32_w) AM_RANGE(0xf00400, 0xf007ff) AM_RAM AM_BASE(&jaguar_gpu_clut) AM_SHARE(2) @@ -845,8 +845,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gpu_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x7fffff) AM_RAM AM_SHARE(1) - AM_RANGE(0x800000, 0xbfffff) AM_ROMBANK(8) - AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK(9) + AM_RANGE(0x800000, 0xbfffff) AM_ROMBANK("bank8") + AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK("bank9") AM_RANGE(0xe00000, 0xe003ff) AM_DEVREADWRITE("ide", ide_controller32_r, ide_controller32_w) AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE(jaguar_tom_regs32_r, jaguar_tom_regs32_w) AM_RANGE(0xf00400, 0xf007ff) AM_RAM AM_SHARE(2) @@ -866,8 +866,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dsp_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x7fffff) AM_RAM AM_SHARE(1) - AM_RANGE(0x800000, 0xbfffff) AM_ROMBANK(8) - AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK(9) + AM_RANGE(0x800000, 0xbfffff) AM_ROMBANK("bank8") + AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK("bank9") AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE(jaguar_jerry_regs32_r, jaguar_jerry_regs32_w) AM_RANGE(0xf1a100, 0xf1a13f) AM_READWRITE(dspctrl_r, dspctrl_w) AM_RANGE(0xf1a140, 0xf1a17f) AM_READWRITE(jaguar_serial_r, jaguar_serial_w) diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index 8027318b505..f3b47b5a9f7 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -289,7 +289,7 @@ static ADDRESS_MAP_START( combasc_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0600, 0x06ff) AM_RAM AM_BASE_GENERIC(paletteram) /* palette */ AM_RANGE(0x0800, 0x1fff) AM_RAM /* RAM */ AM_RANGE(0x2000, 0x3fff) AM_READWRITE(combasc_video_r, combasc_video_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) /* banked ROM area */ + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM area */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END @@ -299,7 +299,7 @@ static ADDRESS_MAP_START( combascb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0600, 0x06ff) AM_RAM AM_BASE_GENERIC(paletteram) /* palette */ AM_RANGE(0x0800, 0x1fff) AM_RAM AM_RANGE(0x2000, 0x3fff) AM_READWRITE(combasc_video_r, combasc_video_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) /* banked ROM/RAM area */ + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM/RAM area */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c index c0f2ea01989..27d5560294c 100644 --- a/src/mame/drivers/compgolf.c +++ b/src/mame/drivers/compgolf.c @@ -45,7 +45,7 @@ static WRITE8_HANDLER( compgolf_ctrl_w ) if (state->bank != new_bank) { state->bank = new_bank; - memory_set_bank(space->machine, 1, state->bank); + memory_set_bank(space->machine, "bank1", state->bank); } state->scrollx_hi = (data & 1) << 8; @@ -70,7 +70,7 @@ static ADDRESS_MAP_START( compgolf_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW1") AM_RANGE(0x3003, 0x3003) AM_READ_PORT("DSW2") AM_RANGE(0x3800, 0x3801) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -365,7 +365,7 @@ static void compgolf_expand_bg(running_machine *machine) static DRIVER_INIT( compgolf ) { - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "user1"), 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "user1"), 0x4000); compgolf_expand_bg(machine); } diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c index b259114dc98..b89320079ef 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -48,7 +48,7 @@ static WRITE8_HANDLER( contra_bankswitch_w ) bankaddress = 0x10000 + (data & 0x0f) * 0x2000; if (bankaddress < 0x28000) /* for safety */ - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } static WRITE8_HANDLER( contra_sh_irqtrigger_w ) @@ -100,7 +100,7 @@ static ADDRESS_MAP_START( contra_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4400, 0x47ff) AM_WRITE(contra_bg_vram_w) AM_BASE(&contra_bg_vram) AM_RANGE(0x4800, 0x5fff) AM_WRITEONLY - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x7000, 0x7000) AM_WRITE(contra_bankswitch_w) AM_RANGE(0x8000, 0xffff) AM_ROM diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 870a29af855..1ae0677a56d 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -285,7 +285,7 @@ static WRITE8_HANDLER( cps1_snd_bankswitch_w ) int bankaddr; bankaddr = ((data & 1) * 0x4000); - memory_set_bankptr(space->machine, 1,&RAM[0x10000 + bankaddr]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x10000 + bankaddr]); } static WRITE8_DEVICE_HANDLER( cps1_oki_pin7_w ) @@ -398,7 +398,7 @@ static WRITE8_HANDLER( qsound_banksw_w ) logerror("WARNING: Q sound bank overflow (%02x)\n", data); bankaddress=0x10000; } - memory_set_bankptr(space->machine, 1, &RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &RAM[bankaddress]); } @@ -604,7 +604,7 @@ SOUNDA15 = pin13 = ( I1 ) static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("2151", ym2151_r, ym2151_w) AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) @@ -635,7 +635,7 @@ ADDRESS_MAP_END ADDRESS_MAP_START( qsound_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) // used by cps2.c too AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) /* banked (contains music data) */ + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* banked (contains music data) */ AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE(&qsound_sharedram1) AM_RANGE(0xd000, 0xd002) AM_DEVWRITE("qsound", qsound_w) AM_RANGE(0xd003, 0xd003) AM_WRITE(qsound_banksw_w) diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c index cf1937b4d16..810997f30e9 100644 --- a/src/mame/drivers/crgolf.c +++ b/src/mame/drivers/crgolf.c @@ -44,7 +44,7 @@ static WRITE8_HANDLER( rom_bank_select_w ) { - memory_set_bank(space->machine, 1, data & 15); + memory_set_bank(space->machine, "bank1", data & 15); } @@ -56,8 +56,8 @@ static MACHINE_START( crgolf ) state->audiocpu = devtag_get_device(machine, "audiocpu"); /* configure the banking */ - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x2000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_set_bank(machine, "bank1", 0); /* register for save states */ state_save_register_global(machine, state->port_select); @@ -255,7 +255,7 @@ static WRITE8_DEVICE_HANDLER( crgolfhi_sample_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x5fff) AM_RAM - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8003, 0x8003) AM_WRITEONLY AM_BASE_MEMBER(crgolf_state, color_select) AM_RANGE(0x8004, 0x8004) AM_WRITEONLY AM_BASE_MEMBER(crgolf_state, screen_flip) AM_RANGE(0x8005, 0x8005) AM_WRITEONLY AM_BASE_MEMBER(crgolf_state, screen_select) diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index aef6344aebd..775f4840e4c 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -53,7 +53,7 @@ static WRITE8_DEVICE_HANDLER( crimfght_snd_bankswitch_w ) /********************************************/ static ADDRESS_MAP_START( crimfght_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_RAMBANK(1) /* banked RAM */ + AM_RANGE(0x0000, 0x03ff) AM_RAMBANK("bank1") /* banked RAM */ AM_RANGE(0x0400, 0x1fff) AM_RAM /* RAM */ AM_RANGE(0x3f80, 0x3f80) AM_READ_PORT("SYSTEM") AM_RANGE(0x3f81, 0x3f81) AM_READ_PORT("P1") @@ -66,7 +66,7 @@ static ADDRESS_MAP_START( crimfght_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3f88, 0x3f88) AM_READWRITE(watchdog_reset_r, crimfght_coin_w) /* watchdog reset */ AM_RANGE(0x3f8c, 0x3f8c) AM_WRITE(crimfght_sh_irqtrigger_w) /* cause interrupt on audio CPU? */ AM_RANGE(0x2000, 0x5fff) AM_READWRITE(K052109_051960_r, K052109_051960_w) /* video RAM + sprite RAM */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(2) /* banked ROM */ + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank2") /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END @@ -344,17 +344,18 @@ static KONAMI_SETLINES_CALLBACK( crimfght_banking ) /* bit 5 = select work RAM or palette */ if (lines & 0x20) { - memory_install_readwrite8_handler(cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, (read8_space_func)SMH_BANK(3), paletteram_xBBBBBGGGGGRRRRR_be_w); - memory_set_bankptr(device->machine, 3, device->machine->generic.paletteram.v); + memory_install_read_bank_handler(cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank3"); + memory_install_write8_handler(cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w); + memory_set_bankptr(device->machine, "bank3", device->machine->generic.paletteram.v); } else - memory_install_readwrite8_handler(cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); /* RAM */ + memory_install_readwrite_bank_handler(cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank1"); /* RAM */ /* bit 6 = enable char ROM reading through the video RAM */ K052109_set_RMRD_line((lines & 0x40) ? ASSERT_LINE : CLEAR_LINE); offs = 0x10000 + ((lines & 0x0f) * 0x2000); - memory_set_bankptr(device->machine, 2, &RAM[offs]); + memory_set_bankptr(device->machine, "bank2", &RAM[offs]); } static MACHINE_RESET( crimfght ) @@ -364,7 +365,7 @@ static MACHINE_RESET( crimfght ) konami_configure_set_lines(cputag_get_cpu(machine, "maincpu"), crimfght_banking); /* init the default bank */ - memory_set_bankptr(machine, 2, &RAM[0x10000] ); + memory_set_bankptr(machine, "bank2", &RAM[0x10000] ); } static DRIVER_INIT( crimfght ) diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index 44db4682f08..c9827b7a05a 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -159,7 +159,7 @@ static WRITE8_HANDLER( crshrace_sh_bankswitch_w ) { UINT8 *rom = memory_region(space->machine, "audiocpu") + 0x10000; - memory_set_bankptr(space->machine, 1,rom + (data & 0x03) * 0x8000); + memory_set_bankptr(space->machine, "bank1",rom + (data & 0x03) * 0x8000); } @@ -213,7 +213,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index e65179a6247..d47825f9921 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -232,9 +232,9 @@ static WRITE32_HANDLER(Banksw_w) { Bank=(data>>1)&7; if(Bank<=2) - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "user1")+Bank*0x1000000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "user1")+Bank*0x1000000); else - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "user2")); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "user2")); } static TIMER_CALLBACK( Timercb ) @@ -446,7 +446,7 @@ static ADDRESS_MAP_START( crystal_mem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x04800000, 0x04800fff) AM_DEVREADWRITE("vrender", vr0_snd_read, vr0_snd_write) AM_RANGE(0x05000000, 0x05000003) AM_READ(FlashCmd_r) AM_WRITE(FlashCmd_w) - AM_RANGE(0x05000000, 0x05ffffff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x05000000, 0x05ffffff) AM_ROMBANK("bank1") AM_RANGE(0x44414F4C, 0x44414F7F) AM_RAM AM_BASE(&ResetPatch) @@ -521,7 +521,7 @@ static MACHINE_RESET(crystal) IntHigh = 0; cpu_set_irq_callback(cputag_get_cpu(machine, "maincpu"), icallback); Bank = 0; - memory_set_bankptr(machine, 1, memory_region(machine, "user1") + 0); + memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + 0); FlashCmd = 0xff; OldPort4 = 0; diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index e98382e09ed..1f5fbab5960 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -232,7 +232,7 @@ static WRITE8_HANDLER ( cshooter_c700_w ) static WRITE8_HANDLER ( bank_w ) { - memory_set_bankptr(space->machine, 1,&memory_region(space->machine, "user1")[0x4000*((data>>4)&3)]); + memory_set_bankptr(space->machine, "bank1",&memory_region(space->machine, "user1")[0x4000*((data>>4)&3)]); } @@ -257,7 +257,7 @@ static READ8_HANDLER(pal_r) static ADDRESS_MAP_START( cshooter_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xafff) AM_READWRITE(SMH_BANK(1), SMH_RAM) + AM_RANGE(0x8000, 0xafff) AM_READ_BANK("bank1") AM_WRITE(SMH_RAM) AM_RANGE(0xb000, 0xb0ff) AM_READ(SMH_RAM) // sound related ? AM_RANGE(0xc000, 0xc1ff) AM_WRITE(pal_w) AM_READ(pal_r) AM_BASE_GENERIC(paletteram) AM_RANGE(0xc200, 0xc200) AM_READ_PORT("IN0") @@ -277,9 +277,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( airraid_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xb000, 0xb0ff) AM_RAM // sound related ? - AM_RANGE(0xb100, 0xb1ff) AM_RAM//READ(SMH_BANK(1)) // sound related ? + AM_RANGE(0xb100, 0xb1ff) AM_RAM//ROMBANK("bank1") // sound related ? AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2") @@ -655,7 +655,7 @@ static DRIVER_INIT( cshooter ) rom[0xa2] = 0x00; rom[0xa3] = 0x00; rom[0xa4] = 0x00; - memory_set_bankptr(machine, 1,&memory_region(machine, "user1")[0]); + memory_set_bankptr(machine, "bank1",&memory_region(machine, "user1")[0]); } static DRIVER_INIT( cshootre ) @@ -692,7 +692,7 @@ static DRIVER_INIT( cshootre ) rom[A] = BITSWAP8(rom[A],7,6,1,4,3,2,5,0); } - memory_set_bankptr(machine, 1,&memory_region(machine, "user1")[0]); + memory_set_bankptr(machine, "bank1",&memory_region(machine, "user1")[0]); seibu_sound_decrypt(machine,"audiocpu",0x2000); } diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c index 3f8d78cc1c5..7eff7d79a3f 100644 --- a/src/mame/drivers/cubocd32.c +++ b/src/mame/drivers/cubocd32.c @@ -346,12 +346,12 @@ static WRITE32_HANDLER( aga_overlay_w ) data = (data >> 16) & 1; /* switch banks as appropriate */ - memory_set_bank(space->machine, 1, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); /* swap the write handlers between ROM and bank 1 based on the bit */ if ((data & 1) == 0) /* overlay disabled, map RAM on 0x000000 */ - memory_install_write32_handler(space, 0x000000, 0x1fffff, 0, 0, (write32_space_func)SMH_BANK(1)); + memory_install_write_bank_handler(space, 0x000000, 0x1fffff, 0, 0, "bank1"); else /* overlay enabled, map Amiga system ROM on 0x000000 */ memory_install_write32_handler(space, 0x000000, 0x1fffff, 0, 0, (write32_space_func)SMH_UNMAP); @@ -414,7 +414,7 @@ static WRITE8_DEVICE_HANDLER( cd32_cia_0_portb_w ) static ADDRESS_MAP_START( cd32_map, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x1fffff) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram32) AM_SIZE(&amiga_chip_ram_size) + AM_RANGE(0x000000, 0x1fffff) AM_RAMBANK("bank1") AM_BASE(&amiga_chip_ram32) AM_SIZE(&amiga_chip_ram_size) AM_RANGE(0x800000, 0x800003) AM_READ_PORT("DIPSW1") AM_RANGE(0x800010, 0x800013) AM_READ_PORT("DIPSW2") AM_RANGE(0xb80000, 0xb8003f) AM_READWRITE(amiga_akiko32_r, amiga_akiko32_w) @@ -1157,8 +1157,8 @@ static DRIVER_INIT( cd32 ) amiga_machine_config(machine, &cubocd32_intf); /* set up memory */ - memory_configure_bank(machine, 1, 0, 1, amiga_chip_ram32, 0); - memory_configure_bank(machine, 1, 1, 1, memory_region(machine, "user1"), 0); + memory_configure_bank(machine, "bank1", 0, 1, amiga_chip_ram32, 0); + memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user1"), 0); /* intialize akiko */ amiga_akiko_init(machine); diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 551a6948f39..706c193579b 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -112,7 +112,7 @@ static VIDEO_UPDATE( cultures ) static WRITE8_HANDLER( cpu_bankswitch_w ) { cultures_state *state = (cultures_state *)space->machine->driver_data; - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); state->video_bank = ~data & 0x20; } @@ -176,7 +176,7 @@ static WRITE8_HANDLER( bg_bank_w ) static ADDRESS_MAP_START( cultures_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xbfff) AM_RAM_WRITE(bg0_videoram_w) AM_BASE_MEMBER(cultures_state, bg0_videoram) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xf000, 0xffff) AM_RAM @@ -359,7 +359,7 @@ static MACHINE_START( cultures ) cultures_state *state = (cultures_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 16, &ROM[0x0000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, &ROM[0x0000], 0x4000); state->paletteram = auto_alloc_array(machine, UINT8, 0x4000); state_save_register_global_pointer(machine, state->paletteram, 0x4000); diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index aa0cbd30c03..637a717b1ed 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -196,7 +196,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2c02, 0x2c03) AM_READ(cyberbal_special_port3_r) AM_RANGE(0x2c04, 0x2c05) AM_READ(cyberbal_sound_68k_6502_r) AM_RANGE(0x2c06, 0x2c07) AM_READ(cyberbal_sound_6502_stat_r) - AM_RANGE(0x3000, 0x3fff) AM_ROMBANK(8) + AM_RANGE(0x3000, 0x3fff) AM_ROMBANK("bank8") AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c index 8d73f7667b7..d633bc4e267 100644 --- a/src/mame/drivers/d9final.c +++ b/src/mame/drivers/d9final.c @@ -73,7 +73,7 @@ static WRITE8_HANDLER( d9final_bank_w ) UINT32 bankaddress; bankaddress = 0x10000+(0x4000 * (data & 0x7)); - memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &ROM[bankaddress]); } /* game checks this after three attract cycles, otherwise coin inputs stop to work. */ @@ -87,7 +87,7 @@ static READ8_HANDLER( prot_latch_r ) static ADDRESS_MAP_START( d9final_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_BASE_GENERIC(paletteram2) @@ -252,7 +252,7 @@ static MACHINE_RESET( d9final ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1, &ROM[0x10000]); + memory_set_bankptr(machine, "bank1", &ROM[0x10000]); } static MACHINE_DRIVER_START( d9final ) diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index 980280989fd..e790854e815 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -285,8 +285,7 @@ static UINT8 nmi_enable = 0; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, STATIC_BANK1, memory_region(machine, "audiocpu") + (banknum * 0x8000) + 0x10000 ); -// memory_set_bankptr(machine, 1, memory_region(machine, "audiocpu") + (banknum * 0x8000) + 0x10000 ); + memory_set_bankptr(machine, "bank1", memory_region(machine, "audiocpu") + (banknum * 0x8000) + 0x10000 ); } @@ -473,7 +472,7 @@ static WRITE8_DEVICE_HANDLER( darius_write_portB1 ) *****************************************************/ static ADDRESS_MAP_START( darius_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) @@ -1201,7 +1200,7 @@ static MACHINE_RESET( darius ) memcpy( RAM + 0x8000*i + 0x10000, RAM, 0x4000 ); memcpy( RAM + 0x8000*i + 0x14000, RAM + 0x4000*i, 0x4000 ); } - memory_set_bankptr(machine, 1, RAM); + memory_set_bankptr(machine, "bank1", RAM); sound_global_enable( machine, 1 ); /* mixer enabled */ diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 357859222a3..2d0d123fa61 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -713,7 +713,7 @@ MACHINE_DRIVER_END static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("stsnd", st0016_snd_r, st0016_snd_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xffff) AM_RAM diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c index 6750acdfab7..46563ce087b 100644 --- a/src/mame/drivers/darkmist.c +++ b/src/mame/drivers/darkmist.c @@ -44,7 +44,7 @@ int darkmist_hw; static WRITE8_HANDLER(darkmist_hw_w) { darkmist_hw=data; - memory_set_bankptr(space->machine, 1,&memory_region(space->machine, "maincpu")[0x010000+((data&0x80)?0x4000:0)]); + memory_set_bankptr(space->machine, "bank1",&memory_region(space->machine, "maincpu")[0x010000+((data&0x80)?0x4000:0)]); } static READ8_HANDLER(t5182shared_r) @@ -60,7 +60,7 @@ static WRITE8_HANDLER(t5182shared_w) static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc801, 0xc801) AM_READ_PORT("P1") AM_RANGE(0xc802, 0xc802) AM_READ_PORT("P2") AM_RANGE(0xc803, 0xc803) AM_READ_PORT("START") @@ -458,7 +458,7 @@ static DRIVER_INIT(darkmist) } memory_set_decrypted_region(space, 0x0000, 0x7fff, decrypt); - memory_set_bankptr(space->machine, 1,&ROM[0x010000]); + memory_set_bankptr(space->machine, "bank1",&ROM[0x010000]); /* adr line swaps */ ROM = memory_region(machine, "user1"); diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c index cfbd04208f6..e9b4767a364 100644 --- a/src/mame/drivers/darkseal.c +++ b/src/mame/drivers/darkseal.c @@ -97,7 +97,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 5540b6fe53c..6e60628e579 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -261,7 +261,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 14d47f07a08..c1a62a2812e 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -193,7 +193,7 @@ static WRITE8_HANDLER( bg2_w ) if (state->bgadr > 2) state->bgadr = 0; - memory_set_bank(space->machine, 1, state->bgadr); + memory_set_bank(space->machine, "bank1", state->bgadr); } static WRITE8_HANDLER( sound_w ) @@ -243,7 +243,7 @@ static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x93ff) AM_RAM AM_BASE_MEMBER(ddayjlc_state, spriteram) AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(ddayjlc_videoram_w) AM_BASE_MEMBER(ddayjlc_state, videoram) AM_RANGE(0x9800, 0x9fff) AM_RAM_WRITE(ddayjlc_bgram_w) AM_BASE_MEMBER(ddayjlc_state, bgram) /* 9800-981f - videoregs */ - AM_RANGE(0xa000, 0xdfff) AM_ROMBANK(1) AM_WRITENOP + AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank1") AM_WRITENOP AM_RANGE(0xe000, 0xe003) AM_WRITE(i8257_CH0_w) AM_RANGE(0xe008, 0xe008) AM_WRITENOP AM_RANGE(0xf000, 0xf000) AM_WRITE(sound_w) @@ -655,8 +655,8 @@ static DRIVER_INIT( ddayjlc ) free(temp); } - memory_configure_bank(machine, 1, 0, 3, memory_region(machine, "user1"), 0x4000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 3, memory_region(machine, "user1"), 0x4000); + memory_set_bank(machine, "bank1", 0); } GAME( 1984, ddayjlc, 0, ddayjlc, ddayjlc, ddayjlc, ROT90, "Jaleco", "D-Day (Jaleco set 1)", GAME_IMPERFECT_GRAPHICS | GAME_WRONG_COLORS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 119604bda00..b7a9bc68751 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -1883,19 +1883,19 @@ static WRITE8_HANDLER( rongrong_select_w ) //logerror("%04x: rongrong_select_w %02x\n",cpu_get_pc(space->cpu),data); /* bits 0-4 = **both** ROM bank **AND** input select */ - memory_set_bankptr(space->machine, 1, &rom[0x10000 + 0x8000 * (data & 0x1f)]); + memory_set_bankptr(space->machine, "bank1", &rom[0x10000 + 0x8000 * (data & 0x1f)]); ddenlovr_select = data; /* bits 5-7 = RAM bank */ - memory_set_bankptr(space->machine, 2, &rom[0x110000 + 0x1000 * ((data & 0xe0) >> 5)]); + memory_set_bankptr(space->machine, "bank2", &rom[0x110000 + 0x1000 * ((data & 0xe0) >> 5)]); } static ADDRESS_MAP_START( quizchq_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK(2) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) AM_WRITE(rongrong_palette_w) // ROM (Banked) + AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(rongrong_palette_w) // ROM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( quizchq_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) @@ -1930,8 +1930,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rongrong_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK(2) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) AM_WRITE(rongrong_palette_w) // ROM (Banked) + AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(rongrong_palette_w) // ROM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( rongrong_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) @@ -1980,7 +1980,7 @@ static READ8_HANDLER( magic_r ) static WRITE8_HANDLER( mmpanic_rombank_w ) { UINT8 *rom = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1, &rom[0x10000 + 0x8000 * (data & 0x7)]); + memory_set_bankptr(space->machine, "bank1", &rom[0x10000 + 0x8000 * (data & 0x7)]); /* Bit 4? */ } @@ -2039,8 +2039,8 @@ static ADDRESS_MAP_START( mmpanic_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0051, 0x0051) AM_READ(magic_r) // ? AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK(2) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) AM_WRITE(rongrong_palette_w) // ROM (Banked) + AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(rongrong_palette_w) // ROM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( mmpanic_portmap, ADDRESS_SPACE_IO, 8 ) @@ -2116,9 +2116,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( funkyfig_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6fff) AM_RAM - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK(2) // RAM (Banked) + AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x81ff) AM_WRITE(rongrong_palette_w) AM_RANGE(0x8400, 0x87ff) AM_WRITENOP ADDRESS_MAP_END @@ -2141,9 +2141,9 @@ static WRITE8_HANDLER( funkyfig_rombank_w ) ddenlovr_select = data; - memory_set_bankptr(space->machine, 1, &rom[0x10000 + 0x8000 * (data & 0x0f)]); + memory_set_bankptr(space->machine, "bank1", &rom[0x10000 + 0x8000 * (data & 0x0f)]); // bit 4 selects palette ram at 8000? - memory_set_bankptr(space->machine, 2, &rom[0x90000 + 0x1000 * ((data & 0xe0) >> 5)]); + memory_set_bankptr(space->machine, "bank2", &rom[0x90000 + 0x1000 * ((data & 0xe0) >> 5)]); } static READ8_HANDLER( funkyfig_dsw_r ) @@ -2247,16 +2247,16 @@ static WRITE8_HANDLER( hanakanz_rombank_w ) { UINT8 *rom = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1, &rom[0x10000 + 0x8000 * (data & 0x0f)]); + memory_set_bankptr(space->machine, "bank1", &rom[0x10000 + 0x8000 * (data & 0x0f)]); - memory_set_bankptr(space->machine, 2, &rom[0x90000 + 0x1000 * ((data & 0xf0) >> 4)]); + memory_set_bankptr(space->machine, "bank2", &rom[0x90000 + 0x1000 * ((data & 0xf0) >> 4)]); } static ADDRESS_MAP_START( hanakanz_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK(2) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) // ROM (Banked) + AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // ROM (Banked) ADDRESS_MAP_END @@ -2583,8 +2583,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjmyster_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK(2) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) // ROM/RAM (Banked) + AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // ROM/RAM (Banked) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(rongrong_palette_w) // RAM enabled by bit 4 of rombank AM_RANGE(0xf200, 0xffff) AM_WRITENOP // "" ADDRESS_MAP_END @@ -2592,7 +2592,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( mjmyster_rambank_w ) { UINT8 *rom = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 2, &rom[0x90000 + 0x1000 * (data & 0x07)]); + memory_set_bankptr(space->machine, "bank2", &rom[0x90000 + 0x1000 * (data & 0x07)]); // logerror("%04x: rambank = %02x\n", cpu_get_pc(space->cpu), data); } @@ -2703,7 +2703,7 @@ static UINT8 hginga_rombank; static WRITE8_HANDLER( hginga_rombank_w ) { UINT8 *rom = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1, &rom[0x10000 + 0x8000 * (data & 0x7)]); + memory_set_bankptr(space->machine, "bank1", &rom[0x10000 + 0x8000 * (data & 0x7)]); hginga_rombank = data; } @@ -2719,9 +2719,9 @@ static READ8_HANDLER( hginga_protection_r ) static ADDRESS_MAP_START( hginga_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK(2) // RAM (Banked) + AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked) AM_RANGE(0xf601, 0xf601) AM_READ(hginga_protection_r) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) // ROM/RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // ROM/RAM (Banked) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(rongrong_palette_w) // RAM enabled by bit 4 of rombank AM_RANGE(0xf700, 0xf706) AM_WRITENOP ADDRESS_MAP_END @@ -2933,9 +2933,9 @@ static READ8_HANDLER( hgokou_protection_r ) static ADDRESS_MAP_START( hgokou_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK(2) // RAM (Banked) + AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked) AM_RANGE(0xe601, 0xe601) AM_READ(hgokou_protection_r) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) // ROM (Banked) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // ROM (Banked) AM_RANGE(0xe000, 0xe1ff) AM_WRITE(rongrong_palette_w) AM_RANGE(0xe700, 0xe706) AM_WRITENOP ADDRESS_MAP_END @@ -2978,8 +2978,8 @@ static WRITE8_HANDLER( hparadis_select_w ) ddenlovr_select = data; hginga_ip = 0; - memory_set_bankptr(space->machine, 1, &rom[0x10000 + 0x8000 * (data & 0x07)]); - memory_set_bankptr(space->machine, 2, &rom[0x50000 + 0x1000 * ((data & 0xe0) >> 5)]); + memory_set_bankptr(space->machine, "bank1", &rom[0x10000 + 0x8000 * (data & 0x07)]); + memory_set_bankptr(space->machine, "bank2", &rom[0x50000 + 0x1000 * ((data & 0xe0) >> 5)]); } @@ -3025,8 +3025,8 @@ static WRITE8_HANDLER( hparadis_coin_w ) static ADDRESS_MAP_START( hparadis_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK(2) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) // ROM (Banked) + AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // ROM (Banked) AM_RANGE(0xc000, 0xc1ff) AM_WRITE(rongrong_palette_w) ADDRESS_MAP_END @@ -3200,7 +3200,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( mjflove_rombank_w ) { UINT8 *rom = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1, &rom[0x10000 + 0x8000 * (data & 0xf)]); + memory_set_bankptr(space->machine, "bank1", &rom[0x10000 + 0x8000 * (data & 0xf)]); } static WRITE8_DEVICE_HANDLER( mjflove_okibank_w ) @@ -3330,8 +3330,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sryudens_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM - AM_RANGE(0x7000, 0x7fff) AM_RAMBANK(2) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) // ROM (Banked) + AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // ROM (Banked) AM_RANGE(0xe000, 0xe1ff) AM_WRITE(rongrong_palette_w) ADDRESS_MAP_END @@ -3371,7 +3371,7 @@ static WRITE8_HANDLER( sryudens_coincounter_w ) static WRITE8_HANDLER( sryudens_rambank_w ) { UINT8 *rom = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 2, &rom[0x90000 + 0x1000 * (data & 0x0f)]); + memory_set_bankptr(space->machine, "bank2", &rom[0x90000 + 0x1000 * (data & 0x0f)]); // logerror("%04x: rambank = %02x\n", cpu_get_pc(space->cpu), data); } diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c index a44be9b511e..c08c6a0d989 100644 --- a/src/mame/drivers/ddragon.c +++ b/src/mame/drivers/ddragon.c @@ -150,7 +150,7 @@ static MACHINE_START( ddragon ) ddragon_state *state = (ddragon_state *)machine->driver_data; /* configure banks */ - memory_configure_bank(machine, 1, 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); state->maincpu = devtag_get_device(machine, "maincpu"); state->sub_cpu = devtag_get_device(machine, "sub"); @@ -204,7 +204,7 @@ static WRITE8_HANDLER( ddragon_bankswitch_w ) else if (state->dd_sub_cpu_busy == 0) cpu_set_input_line(state->sub_cpu, state->sprite_irq, (state->sprite_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE); - memory_set_bank(space->machine, 1, (data & 0xe0) >> 5); + memory_set_bank(space->machine, "bank1", (data & 0xe0) >> 5); } @@ -219,7 +219,7 @@ static WRITE8_HANDLER( toffy_bankswitch_w ) /* bit 3 unknown */ /* I don't know ... */ - memory_set_bank(space->machine, 1, (data & 0x20) >> 5); + memory_set_bank(space->machine, "bank1", (data & 0x20) >> 5); } @@ -268,7 +268,7 @@ static WRITE8_HANDLER( darktowr_mcu_bank_w ) static WRITE8_HANDLER( darktowr_bankswitch_w ) { ddragon_state *state = (ddragon_state *)space->machine->driver_data; - int oldbank = memory_get_bank(space->machine, 1); + int oldbank = memory_get_bank(space->machine, "bank1"); int newbank = (data & 0xe0) >> 5; state->scrollx_hi = (data & 0x01); @@ -283,11 +283,11 @@ static WRITE8_HANDLER( darktowr_bankswitch_w ) else if (state->dd_sub_cpu_busy == 0) cpu_set_input_line(state->sub_cpu, state->sprite_irq, (state->sprite_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE); - memory_set_bank(space->machine, 1, newbank); + memory_set_bank(space->machine, "bank1", newbank); if (newbank == 4 && oldbank != 4) memory_install_readwrite8_handler(space, 0x4000, 0x7fff, 0, 0, darktowr_mcu_bank_r, darktowr_mcu_bank_w); else if (newbank != 4 && oldbank == 4) - memory_install_readwrite8_handler(space, 0x4000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); + memory_install_readwrite_bank_handler(space, 0x4000, 0x7fff, 0, 0, "bank1"); } @@ -518,7 +518,7 @@ static ADDRESS_MAP_START( ddragon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3809, 0x3809) AM_WRITEONLY AM_BASE_MEMBER(ddragon_state, scrollx_lo) AM_RANGE(0x380a, 0x380a) AM_WRITEONLY AM_BASE_MEMBER(ddragon_state, scrolly_lo) AM_RANGE(0x380b, 0x380f) AM_WRITE(ddragon_interrupt_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -539,7 +539,7 @@ static ADDRESS_MAP_START( dd2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x380b, 0x380f) AM_WRITE(ddragon_interrupt_w) AM_RANGE(0x3c00, 0x3dff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0x3e00, 0x3fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE_GENERIC(paletteram2) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c index d313577d47e..1ec4bc16ae8 100644 --- a/src/mame/drivers/ddrible.c +++ b/src/mame/drivers/ddrible.c @@ -35,7 +35,7 @@ static INTERRUPT_GEN( ddrible_interrupt_1 ) static WRITE8_HANDLER( ddrible_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); } @@ -123,7 +123,7 @@ static ADDRESS_MAP_START( cpu0_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(ddrible_bg_videoram_w) AM_BASE_MEMBER(ddrible_state, bg_videoram) /* Video RAM 2 */ AM_RANGE(0x7000, 0x7fff) AM_RAM AM_BASE_MEMBER(ddrible_state, spriteram_2) /* Object RAM 2 */ AM_RANGE(0x8000, 0x8000) AM_WRITE(ddrible_bankswitch_w) /* bankswitch control */ - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END @@ -253,7 +253,7 @@ static MACHINE_START( ddrible ) { ddrible_state *state = (ddrible_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 5, &ROM[0x10000], 0x2000); + memory_configure_bank(machine, "bank1", 0, 5, &ROM[0x10000], 0x2000); state->filter1 = devtag_get_device(machine, "filter1"); state->filter2 = devtag_get_device(machine, "filter2"); diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index d35a777cc06..b9c5b14382e 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -209,7 +209,7 @@ static ADDRESS_MAP_START( hippodrm_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(dec0_pf3_control_8bit_w) AM_RANGE(0x1a1000, 0x1a17ff) AM_READWRITE(dec0_pf3_data_8bit_r, dec0_pf3_data_8bit_w) AM_RANGE(0x1d0000, 0x1d00ff) AM_READWRITE(hippodrm_prot_r, hippodrm_prot_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) /* Main ram */ + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") /* Main ram */ AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) AM_RANGE(0x1ff402, 0x1ff403) AM_READ_PORT("VBLANK") ADDRESS_MAP_END @@ -302,7 +302,7 @@ static ADDRESS_MAP_START( slyspy_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0b0000, 0x0b0001) AM_DEVWRITE("ym1", ym2203_w) AM_RANGE(0x0e0000, 0x0e0001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x0f0000, 0x0f0001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END @@ -312,7 +312,7 @@ static ADDRESS_MAP_START( midres_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x118000, 0x118001) AM_DEVWRITE("ym1", ym2203_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x138000, 0x138001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index 607d03873d7..69eac77d7b6 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -389,7 +389,7 @@ static WRITE8_HANDLER( garyoret_i8751_w ) static WRITE8_HANDLER( dec8_bank_w ) { - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); } /* Used by Ghostbusters, Meikyuu Hunter G & Gondomania */ @@ -404,7 +404,7 @@ static WRITE8_HANDLER( ghostb_bank_w ) Bits 4-7: Bank switch */ - memory_set_bank(space->machine, 1, data >> 4); + memory_set_bank(space->machine, "bank1", data >> 4); if (data & 1) state->int_enable =1; else state->int_enable = 0; if (data & 2) state->nmi_enable =1; else state->nmi_enable = 0; @@ -420,7 +420,7 @@ static WRITE8_HANDLER( csilver_control_w ) Bit 0x40 - Unused. Bit 0x80 - Hold subcpu reset line high if clear, else low? (Not needed anyway) */ - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); } static WRITE8_HANDLER( dec8_sound_w ) @@ -455,7 +455,7 @@ static WRITE8_HANDLER( csilver_adpcm_data_w ) static WRITE8_HANDLER( csilver_sound_bank_w ) { - memory_set_bank(space->machine, 3, (data & 0x08) >> 3); + memory_set_bank(space->machine, "bank3", (data & 0x08) >> 3); } /******************************************************************************/ @@ -552,7 +552,7 @@ static ADDRESS_MAP_START( cobra_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3c00, 0x3c00) AM_WRITE(dec8_bank_w) AM_RANGE(0x3c02, 0x3c02) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x3e00, 0x3e00) AM_WRITE(dec8_sound_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -576,7 +576,7 @@ static ADDRESS_MAP_START( ghostb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3840, 0x3840) AM_WRITE(ghostb_bank_w) AM_RANGE(0x3860, 0x3860) AM_READ(i8751_l_r) AM_RANGE(0x3860, 0x3861) AM_WRITE(ghostb_i8751_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -600,7 +600,7 @@ static ADDRESS_MAP_START( meikyuh_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3840, 0x3840) AM_WRITE(ghostb_bank_w) AM_RANGE(0x3860, 0x3860) AM_READ(i8751_l_r) AM_RANGE(0x3860, 0x3861) AM_WRITE(meikyuh_i8751_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -623,7 +623,7 @@ static ADDRESS_MAP_START( srdarwin_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3801, 0x3801) AM_READ_PORT("IN0") /* Player 1 */ AM_RANGE(0x3802, 0x3802) AM_READ_PORT("IN1") /* Player 2 (cocktail) + VBL */ AM_RANGE(0x3803, 0x3803) AM_READ_PORT("DSW1") /* Dip 2 */ - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -646,7 +646,7 @@ static ADDRESS_MAP_START( gondo_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3838, 0x3838) AM_READ(i8751_h_r) AM_RANGE(0x3839, 0x3839) AM_READ(i8751_l_r) AM_RANGE(0x383a, 0x383b) AM_WRITE(gondo_i8751_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -669,7 +669,7 @@ static ADDRESS_MAP_START( oscar_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3d80, 0x3d80) AM_WRITE(dec8_sound_w) /* SOUN */ AM_RANGE(0x3e00, 0x3e00) AM_WRITENOP /* COINCL */ AM_RANGE(0x3e80, 0x3e83) AM_WRITE(oscar_int_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -703,7 +703,7 @@ static ADDRESS_MAP_START( lastmiss_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_READWRITE(dec8_pf0_data_r, dec8_pf0_data_w) AM_BASE_MEMBER(dec8_state, pf0_data) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -747,7 +747,7 @@ static ADDRESS_MAP_START( shackled_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2fff) AM_READWRITE(shackled_sprite_r, shackled_sprite_w) AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_READWRITE(dec8_pf0_data_r, dec8_pf0_data_w) AM_BASE_MEMBER(dec8_state, pf0_data) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -797,7 +797,7 @@ static ADDRESS_MAP_START( csilver_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2fff) AM_READWRITE(shackled_sprite_r, shackled_sprite_w) AM_RANGE(0x3000, 0x37ff) AM_RAM AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_READWRITE(dec8_pf0_data_r, dec8_pf0_data_w) AM_BASE_MEMBER(dec8_state, pf0_data) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -835,7 +835,7 @@ static ADDRESS_MAP_START( garyoret_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3838, 0x3839) AM_WRITE(garyoret_i8751_w) AM_RANGE(0x383a, 0x383a) AM_READ(i8751_h_r) AM_RANGE(0x383b, 0x383b) AM_READ(i8751_l_r) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -877,7 +877,7 @@ static ADDRESS_MAP_START( csilver_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_WRITE(csilver_sound_bank_w) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) AM_RANGE(0x3400, 0x3400) AM_DEVREAD("msm", csilver_adpcm_reset_r) /* ? not sure */ - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(3) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank3") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -3542,7 +3542,7 @@ static DRIVER_INIT( ghostb ) /* Blank out unused garbage in colour prom to avoid colour overflow */ memset(RAM + 0x20, 0, 0xe0); - memory_configure_bank(machine, 1, 0, 16, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL(deco222); } @@ -3554,35 +3554,35 @@ static DRIVER_INIT( meikyuh ) /* Blank out unused garbage in colour prom to avoid colour overflow */ memset(RAM + 0x20, 0, 0xe0); - memory_configure_bank(machine, 1, 0, 12, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( cobracom ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 8, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( oscar ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 4, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( deco222 ); } static DRIVER_INIT( gondo ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 12, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( garyoret ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 16, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } @@ -3591,29 +3591,29 @@ static DRIVER_INIT( csilver ) UINT8 *ROM = memory_region(machine, "maincpu"); UINT8 *RAM = memory_region(machine, "audiocpu"); - memory_configure_bank(machine, 1, 0, 14, &ROM[0x10000], 0x4000); - memory_configure_bank(machine, 3, 0, 2, &RAM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 14, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank3", 0, 2, &RAM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( shackled ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 14, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 14, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( lastmiss ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 4, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( srdarwin ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 6, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( deco222 ); } diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index f48a8a4b3de..57415151dec 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -961,7 +961,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c index 148d3975c76..fc9e3de50f3 100644 --- a/src/mame/drivers/decocass.c +++ b/src/mame/drivers/decocass.c @@ -1366,12 +1366,13 @@ static DRIVER_INIT( decocrom ) state->decrypted2[i] = swap_bits_5_6(rom[i]); /* convert charram to a banked ROM */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0xafff, 0, 0, (read8_space_func)SMH_BANK(1), decocass_de0091_w); - memory_configure_bank(machine, 1, 0, 1, state->charram, 0); - memory_configure_bank(machine, 1, 1, 1, memory_region(machine, "user3"), 0); - memory_configure_bank_decrypted(machine, 1, 0, 1, &state->decrypted[0x6000], 0); - memory_configure_bank_decrypted(machine, 1, 1, 1, state->decrypted2, 0); - memory_set_bank(machine, 1, 0); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0xafff, 0, 0, "bank1"); + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0xafff, 0, 0, decocass_de0091_w); + memory_configure_bank(machine, "bank1", 0, 1, state->charram, 0); + memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user3"), 0); + memory_configure_bank_decrypted(machine, "bank1", 0, 1, &state->decrypted[0x6000], 0); + memory_configure_bank_decrypted(machine, "bank1", 1, 1, state->decrypted2, 0); + memory_set_bank(machine, "bank1", 0); /* install the bank selector */ memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xe900, 0xe900, 0, 0, decocass_e900_w); diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c index 4541e1ec827..305cc1143c4 100644 --- a/src/mame/drivers/deshoros.c +++ b/src/mame/drivers/deshoros.c @@ -55,7 +55,7 @@ static void answer_bankswitch(running_machine *machine,UINT8 new_bank) bank = new_bank; bankaddress = 0 + 0x6000 * bank; - memory_set_bankptr(machine, 1, &ROM[bankaddress]); + memory_set_bankptr(machine, "bank1", &ROM[bankaddress]); } } @@ -92,7 +92,7 @@ static WRITE8_HANDLER( io_w ) } static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x0000, 0x5fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x9000, 0x900f) AM_READWRITE(io_r,io_w) AM_BASE(&io_ram) //i/o area AM_RANGE(0xc000, 0xffff) AM_ROM diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index 770ee9c3e2d..3e44a5f23a1 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -39,7 +39,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_NOP /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 1a87fb266df..78b1318bcda 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -181,7 +181,7 @@ void discoboy_setrombank( running_machine *machine, UINT8 data ) { UINT8 *ROM = memory_region(machine, "maincpu"); data &= 0x2f; - memory_set_bankptr(space->machine, 1, &ROM[0x6000 + (data * 0x1000)] ); + memory_set_bankptr(space->machine, "bank1", &ROM[0x6000 + (data * 0x1000)] ); } #endif @@ -208,7 +208,7 @@ static WRITE8_HANDLER( discoboy_port_01_w ) // discoboy gfxbank state->gfxbank = data & 0xf0; - memory_set_bank(space->machine, 1, data & 0x07); + memory_set_bank(space->machine, "bank1", data & 0x07); } static WRITE8_HANDLER( discoboy_port_03_w ) // sfx? (to sound cpu) @@ -287,7 +287,7 @@ static WRITE8_HANDLER( discoboy_ram_att_w ) static ADDRESS_MAP_START( discoboy_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(rambank_r, rambank_w) AM_RANGE(0xc800, 0xcfff) AM_READWRITE(discoboy_ram_att_r, discoboy_ram_att_w) AM_RANGE(0xd000, 0xdfff) AM_READWRITE(rambank2_r, rambank2_w) @@ -557,8 +557,8 @@ static DRIVER_INIT( discoboy ) state_save_register_global_pointer(machine, state->ram_3, 0x1000); state_save_register_global_pointer(machine, state->ram_4, 0x1000); - memory_configure_bank(machine, 1, 0, 8, &ROM[0x10000], 0x4000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); + memory_set_bank(machine, "bank1", 0); } diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index ca1b9f64b8a..9898fa7fbf9 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -668,7 +668,7 @@ static WRITE8_HANDLER( cpu0_bankswitch_w ) { unsigned char *RAM = memory_region(space->machine, "maincpu"); data ^= bankxor; - memory_set_bankptr(space->machine, 4,&RAM[0x10000]); /* unsure if/how this area is banked */ + memory_set_bankptr(space->machine, "bank4",&RAM[0x10000]); /* unsure if/how this area is banked */ if( data < 4 ) { RAM = &RAM[0x2000 * data]; @@ -677,7 +677,7 @@ static WRITE8_HANDLER( cpu0_bankswitch_w ) { RAM = &RAM[0x10000 + 0x2000 * (data-4)]; } - memory_set_bankptr(space->machine, 1,RAM); + memory_set_bankptr(space->machine, "bank1",RAM); } /******************************************************************************/ @@ -695,20 +695,20 @@ static WRITE8_HANDLER( cpu1_bankswitch_w ) switch( data&0xf ) { /* bs65.5y */ - case 0x00: memory_set_bankptr(space->machine, 2,&RAM[0x00000]); break; - case 0x01: memory_set_bankptr(space->machine, 2,&RAM[0x04000]); break; - case 0x02: memory_set_bankptr(space->machine, 2,&RAM[0x10000]); break; - case 0x03: memory_set_bankptr(space->machine, 2,&RAM[0x14000]); break; + case 0x00: memory_set_bankptr(space->machine, "bank2",&RAM[0x00000]); break; + case 0x01: memory_set_bankptr(space->machine, "bank2",&RAM[0x04000]); break; + case 0x02: memory_set_bankptr(space->machine, "bank2",&RAM[0x10000]); break; + case 0x03: memory_set_bankptr(space->machine, "bank2",&RAM[0x14000]); break; /* bs101.6w */ - case 0x08: memory_set_bankptr(space->machine, 2,&RAM[0x18000]); break; - case 0x09: memory_set_bankptr(space->machine, 2,&RAM[0x1c000]); break; - case 0x0a: memory_set_bankptr(space->machine, 2,&RAM[0x20000]); break; - case 0x0b: memory_set_bankptr(space->machine, 2,&RAM[0x24000]); break; - case 0x0c: memory_set_bankptr(space->machine, 2,&RAM[0x28000]); break; - case 0x0d: memory_set_bankptr(space->machine, 2,&RAM[0x2c000]); break; - case 0x0e: memory_set_bankptr(space->machine, 2,&RAM[0x30000]); break; - case 0x0f: memory_set_bankptr(space->machine, 2,&RAM[0x34000]); break; + case 0x08: memory_set_bankptr(space->machine, "bank2",&RAM[0x18000]); break; + case 0x09: memory_set_bankptr(space->machine, "bank2",&RAM[0x1c000]); break; + case 0x0a: memory_set_bankptr(space->machine, "bank2",&RAM[0x20000]); break; + case 0x0b: memory_set_bankptr(space->machine, "bank2",&RAM[0x24000]); break; + case 0x0c: memory_set_bankptr(space->machine, "bank2",&RAM[0x28000]); break; + case 0x0d: memory_set_bankptr(space->machine, "bank2",&RAM[0x2c000]); break; + case 0x0e: memory_set_bankptr(space->machine, "bank2",&RAM[0x30000]); break; + case 0x0f: memory_set_bankptr(space->machine, "bank2",&RAM[0x34000]); break; default: break; @@ -735,16 +735,16 @@ static WRITE8_HANDLER( cpu2_bankswitch_w ) { RAM = &RAM[0x10000 + 0x4000 * (data - 3)]; } - memory_set_bankptr(space->machine, 3, RAM); + memory_set_bankptr(space->machine, "bank3", RAM); } /******************************************************************************/ static ADDRESS_MAP_START( cpu0_am, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xafff) AM_ROMBANK(4) + AM_RANGE(0x8000, 0xafff) AM_ROMBANK("bank4") AM_RANGE(0xb000, 0xbfff) AM_READWRITE( pandora_spriteram_r, pandora_spriteram_w ) - AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE(1) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xffff) AM_RAM @@ -759,7 +759,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu1_am, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(djboy_videoram_w) AM_BASE_GENERIC(videoram) AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(djboy_paletteram_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xd400, 0xd8ff) AM_RAM @@ -782,7 +782,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_am, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(3) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3") AM_RANGE(0xc000, 0xdfff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index 97822cf2849..b0da5f55119 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -477,9 +477,9 @@ static MACHINE_RESET( strtheat ) MACHINE_RESET_CALL(dkong); /* The initial state of the counter is 0x08 */ - memory_configure_bank(machine, 1, 0, 4, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); state->decrypt_counter = 0x08; - memory_set_bank(machine, 1, 0); + memory_set_bank(machine, "bank1", 0); } static MACHINE_RESET( drakton ) @@ -490,9 +490,9 @@ static MACHINE_RESET( drakton ) MACHINE_RESET_CALL(dkong); /* The initial state of the counter is 0x09 */ - memory_configure_bank(machine, 1, 0, 4, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); state->decrypt_counter = 0x09; - memory_set_bank(machine, 1, 1); + memory_set_bank(machine, "bank1", 1); } @@ -616,10 +616,10 @@ static READ8_HANDLER( epos_decrypt_rom ) switch(state->decrypt_counter) { - case 0x08: memory_set_bank(space->machine, 1, 0); break; - case 0x09: memory_set_bank(space->machine, 1, 1); break; - case 0x0A: memory_set_bank(space->machine, 1, 2); break; - case 0x0B: memory_set_bank(space->machine, 1, 3); break; + case 0x08: memory_set_bank(space->machine, "bank1", 0); break; + case 0x09: memory_set_bank(space->machine, "bank1", 1); break; + case 0x0A: memory_set_bank(space->machine, "bank1", 2); break; + case 0x0B: memory_set_bank(space->machine, "bank1", 3); break; default: logerror("Invalid counter = %02X\n",state->decrypt_counter); break; @@ -2904,7 +2904,7 @@ static DRIVER_INIT( drakton ) {7,1,4,0,3,6,2,5}, }; - memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, (read8_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" ); /* While the PAL supports up to 16 decryption methods, only four are actually used in the PAL. Therefore, we'll take a little @@ -2926,7 +2926,7 @@ static DRIVER_INIT( strtheat ) {6,3,4,1,0,7,2,5}, }; - memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, (read8_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" ); /* While the PAL supports up to 16 decryption methods, only four are actually used in the PAL. Therefore, we'll take a little diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c index 53c7eaf2936..0573a115d69 100644 --- a/src/mame/drivers/dooyong.c +++ b/src/mame/drivers/dooyong.c @@ -61,14 +61,14 @@ Flying Tiger static WRITE8_HANDLER( lastday_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x07); + memory_set_bank(space->machine, "bank1", data & 0x07); if (data & 0xf8) popmessage("bankswitch %02x",data); } static MACHINE_START( lastday ) { - memory_configure_bank(machine, 1, 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); } static WRITE8_HANDLER( flip_screen_w ) @@ -84,7 +84,7 @@ static WRITE8_HANDLER( flip_screen_w ) static ADDRESS_MAP_START( lastday_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc007) AM_WRITE(dooyong_bgscroll8_w) AM_RANGE(0xc008, 0xc00f) AM_WRITE(dooyong_fgscroll8_w) AM_RANGE(0xc010, 0xc010) AM_READ_PORT("SYSTEM") @@ -103,7 +103,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pollux_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xd000, 0xdfff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(&dooyong_txvideoram) @@ -121,7 +121,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gulfstrm_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xd000, 0xdfff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(&dooyong_txvideoram) @@ -140,7 +140,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bluehawk_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSWA") AM_RANGE(0xc000, 0xc000) AM_WRITE(flip_screen_w) AM_RANGE(0xc001, 0xc001) AM_READ_PORT("DSWB") @@ -160,7 +160,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( flytiger_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe000) AM_READ_PORT("P1") @@ -179,7 +179,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( primella_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xd000, 0xd3ff) AM_RAM /* what is this? looks like a palette? scratchpad RAM maybe? */ AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE(&dooyong_txvideoram) diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index 7446a586d02..87fc7a42aa4 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -104,7 +104,7 @@ static WRITE8_HANDLER( prog_w ) { active_bank = active_bank ^ 0x01; - memory_set_bank(space->machine, 1, active_bank); + memory_set_bank(space->machine, "bank1", active_bank); } } @@ -389,7 +389,7 @@ GFXDECODE_END static DRIVER_INIT( drw80pkr ) { - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu"), 0x1000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu"), 0x1000); } @@ -398,7 +398,7 @@ static DRIVER_INIT( drw80pkr ) *************************/ static ADDRESS_MAP_START( drw80pkr_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( drw80pkr_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index 14d06157a38..43b4f69e254 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -412,7 +412,7 @@ static WRITE8_HANDLER( dunhuang_layers_w ) static ADDRESS_MAP_START( dunhuang_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x5fff ) AM_ROM AM_RANGE( 0x6000, 0x7fff ) AM_RAM - AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK(1) ) + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK( "bank1" ) ADDRESS_MAP_END // Inputs @@ -462,7 +462,7 @@ static WRITE8_HANDLER( dunhuang_rombank_w ) // ? data & 0x01 // ? data & 0x02 - memory_set_bank(space->machine, 1, ((data >> 2) & 0x7)); + memory_set_bank(space->machine, "bank1", ((data >> 2) & 0x7)); // COIN OUT: data & 0x20 coin_counter_w(space->machine, 0, data & 0x40); @@ -764,7 +764,7 @@ static MACHINE_START( dunhuang ) dunhuang_state *state = (dunhuang_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 8, &ROM[0x10000], 0x8000); + memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x8000); state_save_register_global(machine, state->written); state_save_register_global(machine, state->written2); diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index 85d1b515afb..1cc05bc14d2 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -271,13 +271,13 @@ static WRITE8_HANDLER( hanamai_keyboard_w ) static WRITE8_HANDLER( dynax_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1,&ROM[0x08000+0x8000*(data & 0x0f)]); + memory_set_bankptr(space->machine, "bank1",&ROM[0x08000+0x8000*(data & 0x0f)]); } static WRITE8_HANDLER( jantouki_sound_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "soundcpu"); - memory_set_bankptr(space->machine, 2,&ROM[0x08000+0x8000*data]); + memory_set_bankptr(space->machine, "bank2",&ROM[0x08000+0x8000*data]); } @@ -287,7 +287,7 @@ static WRITE8_HANDLER( hnoridur_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "maincpu") + 0x10000 + 0x8000*data; //logerror("%04x: rom bank = %02x\n",cpu_get_pc(space->cpu),data); - memory_set_bankptr(space->machine, 1,ROM); + memory_set_bankptr(space->machine, "bank1",ROM); hnoridur_bank = data; } @@ -458,20 +458,20 @@ static WRITE8_HANDLER( yarunara_layer_half2_w ) static ADDRESS_MAP_START( sprtmtch_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x6fff ) AM_ROM AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) - AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(1) + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( hnoridur_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x6fff ) AM_ROM AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) - AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(SMH_BANK(1), hnoridur_palette_w) + AM_RANGE( 0x8000, 0xffff ) AM_READ_BANK("bank1") AM_WRITE(hnoridur_palette_w) ADDRESS_MAP_END static ADDRESS_MAP_START( mcnpshnt_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x5fff ) AM_ROM AM_RANGE( 0x6000, 0x6fff ) AM_RAM AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) - AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(SMH_BANK(1), hnoridur_palette_w) + AM_RANGE( 0x8000, 0xffff ) AM_READ_BANK("bank1") AM_WRITE(hnoridur_palette_w) ADDRESS_MAP_END static ADDRESS_MAP_START( nanajign_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -479,21 +479,21 @@ static ADDRESS_MAP_START( nanajign_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x6000, 0x6fff ) AM_RAM AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE( 0x8000, 0x80ff ) AM_WRITE(nanajign_palette_w ) - AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(1) + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( mjdialq2_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0800, 0x0fff ) AM_RAM AM_RANGE( 0x1000, 0x1fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE( 0x0000, 0x7fff ) AM_ROM - AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(1) + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( yarunara_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x5fff ) AM_ROM AM_RANGE( 0x6000, 0x6fff ) AM_RAM AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) - AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(1) + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank1") AM_RANGE( 0x8000, 0x81ff ) AM_WRITE(yarunara_palette_w ) // Palette or RTC ADDRESS_MAP_END @@ -501,13 +501,13 @@ static ADDRESS_MAP_START( jantouki_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x5fff ) AM_ROM AM_RANGE( 0x6000, 0x6fff ) AM_RAM AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) - AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(1) + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( jantouki_sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x6fff ) AM_ROM AM_RANGE( 0x7000, 0x7fff ) AM_RAM - AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK(2) + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank2") ADDRESS_MAP_END @@ -626,7 +626,7 @@ static ADDRESS_MAP_START( hjingi_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x01ff ) AM_ROM AM_RANGE( 0x0200, 0x1fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE( 0x2000, 0x7fff ) AM_ROM - AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(SMH_BANK(1), hnoridur_palette_w) + AM_RANGE( 0x8000, 0xffff ) AM_READ_BANK("bank1") AM_WRITE(hnoridur_palette_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hjingi_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) @@ -747,7 +747,7 @@ static READ8_HANDLER( yarunara_input_r ) static WRITE8_HANDLER( yarunara_rombank_w ) { UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000 + 0x8000 * data; - memory_set_bankptr(space->machine, 1, rom); + memory_set_bankptr(space->machine, "bank1", rom); hnoridur_bank = data; } @@ -968,7 +968,7 @@ static READ8_HANDLER( jantouki_blitter_busy_r ) static WRITE8_HANDLER( jantouki_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1,&ROM[0x8000 + 0x8000*(data&0x0f)]); + memory_set_bankptr(space->machine, "bank1",&ROM[0x8000 + 0x8000*(data&0x0f)]); set_led_status(space->machine, 0,data & 0x10); // maybe } @@ -1185,7 +1185,7 @@ static READ8_HANDLER( htengoku_coin_r ) static WRITE8_HANDLER( htengoku_rombank_w ) { UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000 + 0x8000 * (data & 0x7); - memory_set_bankptr(space->machine, 1, rom); + memory_set_bankptr(space->machine, "bank1", rom); hnoridur_bank = data; } diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c index 981e323be72..0067e7ea33b 100644 --- a/src/mame/drivers/epos.c +++ b/src/mame/drivers/epos.c @@ -45,7 +45,7 @@ static WRITE8_HANDLER( dealer_decrypt_rom ) // logerror("PC %08x: ctr=%04x\n",cpu_get_pc(space->cpu), state->counter); - memory_set_bank(space->machine, 1, state->counter); + memory_set_bank(space->machine, "bank1", state->counter); // is the 2nd bank changed by the counter or it always uses the 1st key? } @@ -65,8 +65,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dealer_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_ROMBANK(1) - AM_RANGE(0x6000, 0x6fff) AM_ROMBANK(2) + AM_RANGE(0x0000, 0x5fff) AM_ROMBANK("bank1") + AM_RANGE(0x6000, 0x6fff) AM_ROMBANK("bank2") AM_RANGE(0x7000, 0x7fff) AM_RAM AM_RANGE(0x8000, 0xffff) AM_RAM AM_BASE_SIZE_MEMBER(epos_state, videoram, videoram_size) ADDRESS_MAP_END @@ -102,7 +102,7 @@ ADDRESS_MAP_END */ static WRITE8_DEVICE_HANDLER( write_prtc ) { - memory_set_bank(device->machine, 2, data & 0x01); + memory_set_bank(device->machine, "bank2", data & 0x01); } static const ppi8255_interface ppi8255_intf = @@ -383,11 +383,11 @@ static MACHINE_RESET( epos ) static MACHINE_START( dealer ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 4, &ROM[0x0000], 0x10000); - memory_configure_bank(machine, 2, 0, 2, &ROM[0x6000], 0x1000); + memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x0000], 0x10000); + memory_configure_bank(machine, "bank2", 0, 2, &ROM[0x6000], 0x1000); - memory_set_bank(machine, 1, 0); - memory_set_bank(machine, 2, 0); + memory_set_bank(machine, "bank1", 0); + memory_set_bank(machine, "bank2", 0); MACHINE_START_CALL(epos); } diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 250eb2c9fe4..66afcfad217 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -229,12 +229,12 @@ static WRITE8_HANDLER( esd16_sound_rombank_w ) int bank = data & 0xf; if (data != bank) logerror("CPU #1 - PC %04X: unknown bank bits: %02X\n", cpu_get_pc(space->cpu), data); if (bank >= 3) bank += 1; - memory_set_bank(space->machine, 1, bank); + memory_set_bank(space->machine, "bank1", bank); } static ADDRESS_MAP_START( multchmp_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xf800, 0xffff) AM_RAM // RAM ADDRESS_MAP_END @@ -521,7 +521,7 @@ static MACHINE_START( esd16 ) esd16_state *state = (esd16_state *)machine->driver_data; UINT8 *AUDIO = memory_region(machine, "audiocpu"); - memory_configure_bank(machine, 1, 0, 9, &AUDIO[0x0000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 9, &AUDIO[0x0000], 0x4000); state->audio_cpu = devtag_get_device(machine, "audiocpu"); state->eeprom = devtag_get_device(machine, "eeprom"); diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c index 2052b496ffe..a8be7f17128 100644 --- a/src/mame/drivers/esripsys.c +++ b/src/mame/drivers/esripsys.c @@ -144,7 +144,7 @@ static WRITE8_HANDLER( g_status_w ) g_status = data; bankaddress = 0x10000 + (data & 0x03) * 0x10000; - memory_set_bankptr(space->machine, 1, &rom[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &rom[bankaddress]); cputag_set_input_line(space->machine, "frame_cpu", M6809_FIRQ_LINE, data & 0x10 ? CLEAR_LINE : ASSERT_LINE); cputag_set_input_line(space->machine, "frame_cpu", INPUT_LINE_NMI, data & 0x80 ? CLEAR_LINE : ASSERT_LINE); @@ -537,9 +537,9 @@ static WRITE8_HANDLER( s_200f_w ) u56b = 1; /* Speech data resides in the upper 8kB of the ROMs */ - memory_set_bankptr(space->machine, 2, &rom[0x0000 + rombank]); - memory_set_bankptr(space->machine, 3, &rom[0x4000 + rombank]); - memory_set_bankptr(space->machine, 4, &rom[0x8000 + rombank]); + memory_set_bankptr(space->machine, "bank2", &rom[0x0000 + rombank]); + memory_set_bankptr(space->machine, "bank3", &rom[0x4000 + rombank]); + memory_set_bankptr(space->machine, "bank4", &rom[0x8000 + rombank]); s_to_g_latch2 = data; } @@ -630,7 +630,7 @@ static ADDRESS_MAP_START( game_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x53ff) AM_WRITE(g_ioadd_w) AM_RANGE(0x5400, 0x57ff) AM_NOP AM_RANGE(0x5c00, 0x5fff) AM_READWRITE(uart_r, uart_w) - AM_RANGE(0x6000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -654,9 +654,9 @@ static ADDRESS_MAP_START( sound_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x200e, 0x200e) AM_READWRITE(s_200e_r, s_200e_w) AM_RANGE(0x200f, 0x200f) AM_READWRITE(s_200f_r, s_200f_w) AM_RANGE(0x2020, 0x2027) AM_DEVREADWRITE("6840ptm", ptm6840_read, ptm6840_write) - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(2) - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(3) - AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(4) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2") + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank3") + AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank4") AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -680,9 +680,9 @@ static DRIVER_INIT( esripsys ) fdt_b = auto_alloc_array(machine, UINT8, FDT_RAM_SIZE); cmos_ram = auto_alloc_array(machine, UINT8, CMOS_RAM_SIZE); - memory_set_bankptr(machine, 2, &rom[0x0000]); - memory_set_bankptr(machine, 3, &rom[0x4000]); - memory_set_bankptr(machine, 4, &rom[0x8000]); + memory_set_bankptr(machine, "bank2", &rom[0x0000]); + memory_set_bankptr(machine, "bank3", &rom[0x4000]); + memory_set_bankptr(machine, "bank4", &rom[0x8000]); /* Register stuff for state saving */ state_save_register_global_pointer(machine, fdt_a, FDT_RAM_SIZE); diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c index 1901ad9ff3d..e29495c779c 100644 --- a/src/mame/drivers/exidy.c +++ b/src/mame/drivers/exidy.c @@ -175,7 +175,7 @@ static WRITE8_HANDLER( fax_bank_select_w ) { UINT8 *RAM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1, &RAM[0x10000 + (0x2000 * (data & 0x1f))]); + memory_set_bankptr(space->machine, "bank1", &RAM[0x10000 + (0x2000 * (data & 0x1f))]); if ((data & 0x1f) > 0x17) logerror("Banking to unpopulated ROM bank %02X!\n",data & 0x1f); } @@ -279,7 +279,7 @@ static ADDRESS_MAP_START( fax_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1a00, 0x1a00) AM_READ_PORT("IN4") AM_RANGE(0x1c00, 0x1c00) AM_READ_PORT("IN3") AM_RANGE(0x2000, 0x2000) AM_WRITE(fax_bank_select_w) - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x5200, 0x520f) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w) AM_RANGE(0x5213, 0x5217) AM_WRITENOP /* empty control lines on color/sound board */ AM_RANGE(0x6000, 0x6fff) AM_RAM AM_BASE(&exidy_characterram) @@ -1392,8 +1392,8 @@ static DRIVER_INIT( phantoma ) exidy_color_latch[0] = 0x09; /* the ROM is actually mapped high */ - memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf800, 0xffff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0xf800); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf800, 0xffff, 0, 0, "bank1"); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0xf800); } diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c index 1aed1a117f8..38de43cc66f 100644 --- a/src/mame/drivers/exidy440.c +++ b/src/mame/drivers/exidy440.c @@ -312,12 +312,12 @@ void exidy440_bank_select(running_machine *machine, UINT8 bank) if (bank == 0 && exidy440_bank != 0) memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, showdown_bank0_r); else if (bank != 0 && exidy440_bank == 0) - memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1)); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank1"); } /* select the bank and update the bank pointer */ exidy440_bank = bank; - memory_set_bankptr(machine, 1, &memory_region(machine, "maincpu")[0x10000 + exidy440_bank * 0x4000]); + memory_set_bankptr(machine, "bank1", &memory_region(machine, "maincpu")[0x10000 + exidy440_bank * 0x4000]); } @@ -485,7 +485,7 @@ static ADDRESS_MAP_START( exidy440_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2ea0, 0x2ebf) AM_READWRITE(sound_command_ack_r, SMH_NOP) AM_RANGE(0x2ec0, 0x2eff) AM_NOP AM_RANGE(0x3000, 0x3fff) AM_RAM - AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK(1), bankram_w) + AM_RANGE(0x4000, 0x7fff) AM_READ_BANK("bank1") AM_WRITE(bankram_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c index 7986a3d7753..91dae48aac5 100644 --- a/src/mame/drivers/exzisus.c +++ b/src/mame/drivers/exzisus.c @@ -83,7 +83,7 @@ static WRITE8_HANDLER( exzisus_cpua_bankswitch_w ) exzisus_cpua_bank = data & 0x0f; if (exzisus_cpua_bank >= 2) { - memory_set_bankptr(space->machine, 2, &RAM[ 0x10000 + ( (exzisus_cpua_bank - 2) * 0x4000 ) ] ); + memory_set_bankptr(space->machine, "bank2", &RAM[ 0x10000 + ( (exzisus_cpua_bank - 2) * 0x4000 ) ] ); } } @@ -100,7 +100,7 @@ static WRITE8_HANDLER( exzisus_cpub_bankswitch_w ) exzisus_cpub_bank = data & 0x0f; if (exzisus_cpub_bank >= 2) { - memory_set_bankptr(space->machine, 1, &RAM[ 0x10000 + ( (exzisus_cpub_bank - 2) * 0x4000 ) ] ); + memory_set_bankptr(space->machine, "bank1", &RAM[ 0x10000 + ( (exzisus_cpub_bank - 2) * 0x4000 ) ] ); } } @@ -165,7 +165,7 @@ static DRIVER_INIT( exzisus ) static ADDRESS_MAP_START( cpua_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0xc000, 0xc5ff) AM_READWRITE(exzisus_objectram_1_r, exzisus_objectram_1_w) AM_BASE(&exzisus_objectram1) AM_SIZE(&exzisus_objectram_size1) AM_RANGE(0xc600, 0xdfff) AM_READWRITE(exzisus_videoram_1_r, exzisus_videoram_1_w) AM_BASE(&exzisus_videoram1) AM_RANGE(0xe000, 0xefff) AM_READWRITE(exzisus_sharedram_ac_r, exzisus_sharedram_ac_w) AM_BASE(&exzisus_sharedram_ac) @@ -176,7 +176,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc5ff) AM_READWRITE(exzisus_objectram_0_r, exzisus_objectram_0_w) AM_BASE(&exzisus_objectram0) AM_SIZE(&exzisus_objectram_size0) AM_RANGE(0xc600, 0xdfff) AM_READWRITE(exzisus_videoram_0_r, exzisus_videoram_0_w) AM_BASE(&exzisus_videoram0) AM_RANGE(0xe000, 0xefff) AM_RAM diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index 58bae1e2aa5..91f2ddf81b9 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -62,7 +62,7 @@ static WRITE8_HANDLER( f1gp_sh_bankswitch_w ) { UINT8 *rom = memory_region(space->machine, "audiocpu") + 0x10000; - memory_set_bankptr(space->machine, 1,rom + (data & 0x01) * 0x8000); + memory_set_bankptr(space->machine, "bank1",rom + (data & 0x01) * 0x8000); } @@ -148,7 +148,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c index a7289a51a70..90f973a074d 100644 --- a/src/mame/drivers/fastlane.c +++ b/src/mame/drivers/fastlane.c @@ -58,7 +58,7 @@ static WRITE8_HANDLER( fastlane_bankswitch_w ) /* bits 2 & 3 = bank number */ bankaddress = 0x10000 + ((data & 0x0c) >> 2) * 0x4000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); /* bit 4: bank # for the 007232 (chip 2) */ k007232_set_bank(devtag_get_device(space->machine, "konami2"),0 + ((data & 0x10) >> 4),2 + ((data & 0x10) >> 4)); @@ -98,7 +98,7 @@ static ADDRESS_MAP_START( fastlane_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(fastlane_vram1_w) AM_BASE(&fastlane_videoram1) /* Video RAM (chip 1) */ AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(fastlane_vram2_w) AM_BASE(&fastlane_videoram2) /* Video RAM (chip 2) */ AM_RANGE(0x3000, 0x3fff) AM_RAM AM_BASE_GENERIC(spriteram) /* Sprite RAM */ - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index 7739dce0cd3..467ca5a42bd 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -61,7 +61,7 @@ static WRITE8_HANDLER( fcrash_snd_bankswitch_w ) sound_set_output_gain(devtag_get_device(space->machine, "msm2"), 0, (data & 0x10) ? 0.0 : 1.0); bankaddr = ((data & 7) * 0x4000); - memory_set_bankptr(space->machine, 1,&RAM[0x10000 + bankaddr]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x10000 + bankaddr]); } static void m5205_int1(const device_config *device) @@ -362,7 +362,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_RANGE(0xd800, 0xd801) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) AM_RANGE(0xdc00, 0xdc01) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index ace3d1cc8d7..e8f47c58951 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -383,7 +383,7 @@ static WRITE8_HANDLER( novram_store_w ) static WRITE8_HANDLER( rom_bank_w ) { - memory_set_bank(space->machine, 1, data & 0x1f); + memory_set_bank(space->machine, "bank1", data & 0x1f); } static WRITE8_HANDLER( main_irq_clear_w ) @@ -430,7 +430,7 @@ static void firq_gen(const device_config *device, int state) static MACHINE_START( firefox ) { - memory_configure_bank(machine, 1, 0, 32, memory_region(machine, "maincpu") + 0x10000, 0x1000); + memory_configure_bank(machine, "bank1", 0, 32, memory_region(machine, "maincpu") + 0x10000, 0x1000); nvram_1c = devtag_get_device(machine, "nvram_1c"); nvram_1d = devtag_get_device(machine, "nvram_1d"); @@ -455,7 +455,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8) AM_RANGE(0x2800, 0x2aff) AM_READWRITE(SMH_RAM, sprite_palette_w) AM_BASE(&sprite_palette) AM_RANGE(0x2b00, 0x2b00) AM_MIRROR(0x04ff) AM_WRITE(firefox_objram_bank_w) AM_RANGE(0x2c00, 0x2eff) AM_READWRITE(SMH_RAM, tile_palette_w) AM_BASE(&tile_palette) - AM_RANGE(0x3000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x3000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x40ff) AM_READWRITE(nvram_r, nvram_w) /* NOVRAM */ AM_RANGE(0x4100, 0x4100) AM_MIRROR(0x00f8) AM_READ_PORT("rdin0") /* RDIN0 */ AM_RANGE(0x4101, 0x4101) AM_MIRROR(0x00f8) AM_READ_PORT("rdin1") /* RDIN1 */ diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index 9069997394c..dd7680b1878 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -73,7 +73,7 @@ static WRITE8_HANDLER( firetrap_nmi_disable_w ) static WRITE8_HANDLER( firetrap_bankselect_w ) { - memory_set_bank(space->machine, 1, data & 0x03); + memory_set_bank(space->machine, "bank1", data & 0x03); } static READ8_HANDLER( firetrap_8751_bootleg_r ) @@ -194,7 +194,7 @@ static WRITE8_HANDLER( firetrap_sound_2400_w ) static WRITE8_HANDLER( firetrap_sound_bankselect_w ) { - memory_set_bank(space->machine, 2, data & 0x01); + memory_set_bank(space->machine, "bank2", data & 0x01); } static void firetrap_adpcm_int( const device_config *device ) @@ -223,7 +223,7 @@ static WRITE8_HANDLER( flip_screen_w ) static ADDRESS_MAP_START( firetrap_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(firetrap_bg1videoram_w) AM_BASE_MEMBER(firetrap_state, bg1videoram) AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(firetrap_bg2videoram_w) AM_BASE_MEMBER(firetrap_state, bg2videoram) @@ -249,7 +249,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( firetrap_bootleg_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(firetrap_bg1videoram_w) AM_BASE_MEMBER(firetrap_state, bg1videoram) AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(firetrap_bg2videoram_w) AM_BASE_MEMBER(firetrap_state, bg2videoram) @@ -281,7 +281,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2400, 0x2400) AM_WRITE(firetrap_sound_2400_w) AM_RANGE(0x2800, 0x2800) AM_WRITE(firetrap_sound_bankselect_w) AM_RANGE(0x3400, 0x3400) AM_READ(soundlatch_r) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -547,8 +547,8 @@ static MACHINE_START( firetrap ) state->audiocpu = devtag_get_device(machine, "audiocpu"); state->msm = devtag_get_device(machine, "msm"); - memory_configure_bank(machine, 1, 0, 4, &MAIN[0x10000], 0x4000); - memory_configure_bank(machine, 2, 0, 2, &SOUND[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, &MAIN[0x10000], 0x4000); + memory_configure_bank(machine, "bank2", 0, 2, &SOUND[0x10000], 0x4000); state_save_register_global(machine, state->i8751_current_command); state_save_register_global(machine, state->irq_enable); diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c index aadbd958549..be787b2c960 100644 --- a/src/mame/drivers/fitfight.c +++ b/src/mame/drivers/fitfight.c @@ -211,7 +211,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( snd_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) /* ??? External ROM */ + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* ??? External ROM */ AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xff00, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index dbab9b3256f..6ea12406107 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -53,7 +53,7 @@ static WRITE8_HANDLER( flkatck_bankswitch_w ) /* bits 0-1: bank # */ bankaddress += 0x10000 + (data & 0x03)*0x2000; if ((data & 0x03) != 0x03) /* for safety */ - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } static READ8_HANDLER( flkatck_ls138_r ) @@ -113,7 +113,7 @@ static ADDRESS_MAP_START( flkatck_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_le_w) AM_BASE_GENERIC(paletteram) /* palette */ AM_RANGE(0x1000, 0x1fff) AM_RAM /* RAM */ AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(flkatck_k007121_w) AM_BASE(&k007121_ram) /* Video RAM (007121) */ - AM_RANGE(0x4000, 0x5fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x6000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index 99ea2069ece..4fc086bef72 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -70,7 +70,7 @@ static READ8_HANDLER( spinner_r ) static WRITE8_HANDLER( pbillrd_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); } static WRITE8_HANDLER( nmi_enable_w ) @@ -164,7 +164,7 @@ static WRITE8_HANDLER( freekick_ff_w ) static ADDRESS_MAP_START( pbillrd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(freek_videoram_w) AM_BASE_MEMBER(freekick_state, videoram) AM_RANGE(0xd800, 0xd8ff) AM_RAM AM_BASE_SIZE_MEMBER(freekick_state, spriteram, spriteram_size) @@ -616,7 +616,7 @@ static MACHINE_RESET( freekick ) static MACHINE_START( pbillrd ) { - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); MACHINE_START_CALL(freekick); } @@ -1118,12 +1118,12 @@ static DRIVER_INIT(gigasb) static DRIVER_INIT( pbillrds ) { - mc8123_decrypt_rom(machine, "maincpu", "user1", 1, 2); + mc8123_decrypt_rom(machine, "maincpu", "user1", "bank1", 2); } static DRIVER_INIT( gigas ) { - mc8123_decrypt_rom(machine, "maincpu", "user1", 0, 1); + mc8123_decrypt_rom(machine, "maincpu", "user1", NULL, 1); } diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index 8644f11beaf..4f2b3adff3f 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -247,11 +247,11 @@ static WRITE8_HANDLER( fromanc2_subcpu_rombank_w ) int rambank = (data & 0x0c) >> 2; // Change ROM BANK - memory_set_bankptr(space->machine, 1, &RAM[rombank * 0x4000]); + memory_set_bankptr(space->machine, "bank1", &RAM[rombank * 0x4000]); // Change RAM BANK - if (rambank != 0) memory_set_bankptr(space->machine, 2, &RAM[0x10000 + (rambank * 0x4000)]); - else memory_set_bankptr(space->machine, 2, &RAM[0x8000]); + if (rambank != 0) memory_set_bankptr(space->machine, "bank2", &RAM[0x10000 + (rambank * 0x4000)]); + else memory_set_bankptr(space->machine, "bank2", &RAM[0x8000]); } @@ -362,9 +362,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fromanc2_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM - AM_RANGE(0x4000, 0x7fff) AM_RAMBANK(1) // ROM(BANK) (is this comment correct? It was in the split address maps in a RAM configuration... + AM_RANGE(0x4000, 0x7fff) AM_RAMBANK("bank1") // ROM(BANK) (is this comment correct? It was in the split address maps in a RAM configuration... AM_RANGE(0x8000, 0xbfff) AM_RAM // RAM(WORK) - AM_RANGE(0xc000, 0xffff) AM_RAMBANK(2) // RAM(BANK) + AM_RANGE(0xc000, 0xffff) AM_RAMBANK("bank2") // RAM(BANK) ADDRESS_MAP_END static ADDRESS_MAP_START( fromanc2_sub_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index 6642563bb04..de8528991a5 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -137,7 +137,7 @@ static WRITE8_HANDLER( fromance_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "sub"); - memory_set_bankptr(space->machine, 1, &ROM[0x010000 + (0x4000 * data)]); + memory_set_bankptr(space->machine, "bank1", &ROM[0x010000 + (0x4000 * data)]); } @@ -269,7 +269,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( nekkyoku_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xefff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xffff) AM_READWRITE(fromance_paletteram_r, fromance_paletteram_w) @@ -277,7 +277,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fromance_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xcfff) AM_READWRITE(fromance_paletteram_r, fromance_paletteram_w) AM_RANGE(0xd000, 0xffff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w) diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index 78c7074201c..d7e858692be 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -127,7 +127,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_NOP /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c index 9367146e95b..1a2a5471311 100644 --- a/src/mame/drivers/funybubl.c +++ b/src/mame/drivers/funybubl.c @@ -56,12 +56,12 @@ Note: SW2, SW3 & SW4 not populated static WRITE8_HANDLER ( funybubl_vidram_bank_w ) { - memory_set_bank(space->machine, 1, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); } static WRITE8_HANDLER ( funybubl_cpurombank_w ) { - memory_set_bank(space->machine, 2, data & 0x3f); // should we add a check that (data&0x3f) < #banks? + memory_set_bank(space->machine, "bank2", data & 0x3f); // should we add a check that (data&0x3f) < #banks? } @@ -80,9 +80,9 @@ static WRITE8_DEVICE_HANDLER( funybubl_oki_bank_sw ) static ADDRESS_MAP_START( funybubl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) // banked port 1? + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") // banked port 1? AM_RANGE(0xc400, 0xcfff) AM_RAM_WRITE(funybubl_paldatawrite) AM_BASE_MEMBER(funybubl_state, paletteram) // palette - AM_RANGE(0xd000, 0xdfff) AM_RAMBANK(1) // banked port 0? + AM_RANGE(0xd000, 0xdfff) AM_RAMBANK("bank1") // banked port 0? AM_RANGE(0xe000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -209,10 +209,10 @@ static MACHINE_START( funybubl ) state->banked_vram = auto_alloc_array(machine, UINT8, 0x2000); state_save_register_global_pointer(machine, state->banked_vram, 0x2000); - memory_configure_bank(machine, 1, 0, 2, &state->banked_vram[0x0000], 0x1000); - memory_configure_bank(machine, 2, 0, 0x10, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, &state->banked_vram[0x0000], 0x1000); + memory_configure_bank(machine, "bank2", 0, 0x10, &ROM[0x10000], 0x4000); - memory_set_bank(machine, 1, 0); + memory_set_bank(machine, "bank1", 0); } diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c index 721fb2cea4a..764554ec4da 100644 --- a/src/mame/drivers/fuukifg2.c +++ b/src/mame/drivers/fuukifg2.c @@ -106,7 +106,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( fuuki16_sound_rombank_w ) { if (data <= 2) - memory_set_bank(space->machine, 1, data); + memory_set_bank(space->machine, "bank1", data); else logerror("CPU #1 - PC %04X: unknown bank bits: %02X\n", cpu_get_pc(space->cpu), data); } @@ -124,7 +124,7 @@ static WRITE8_DEVICE_HANDLER( fuuki16_oki_banking_w ) static ADDRESS_MAP_START( fuuki16_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x7fff) AM_RAM // RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( fuuki16_sound_io_map, ADDRESS_SPACE_IO, 8 ) @@ -426,7 +426,7 @@ static MACHINE_START( fuuki16 ) fuuki16_state *state = (fuuki16_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "audiocpu"); - memory_configure_bank(machine, 1, 0, 3, &ROM[0x10000], 0x8000); + memory_configure_bank(machine, "bank1", 0, 3, &ROM[0x10000], 0x8000); state->maincpu = devtag_get_device(machine, "maincpu"); state->audiocpu = devtag_get_device(machine, "audiocpu"); diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index 82709c0f195..6f425168abc 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -269,7 +269,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER ( fuuki32_sound_bw_w ) { - memory_set_bank(space->machine, 1, data); + memory_set_bank(space->machine, "bank1", data); } static READ8_HANDLER( snd_z80_r ) @@ -289,7 +289,7 @@ static ADDRESS_MAP_START( fuuki32_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM AM_RANGE(0x7ff0, 0x7fff) AM_READWRITE(snd_z80_r, snd_z80_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) // ROM + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( fuuki32_sound_io_map, ADDRESS_SPACE_IO, 8 ) @@ -513,7 +513,7 @@ static MACHINE_START( fuuki32 ) fuuki32_state *state = (fuuki32_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "soundcpu"); - memory_configure_bank(machine, 1, 0, 0x3e, &ROM[0x10000], 0x8000); + memory_configure_bank(machine, "bank1", 0, 0x3e, &ROM[0x10000], 0x8000); state->maincpu = devtag_get_device(machine, "maincpu"); state->audiocpu = devtag_get_device(machine, "soundcpu"); diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index 55610a2e0e7..6d9e5247c13 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -199,8 +199,8 @@ static MACHINE_RESET( common ) /* allocate a timer for feeding the autobuffer */ adsp_autobuffer_timer = timer_alloc(machine, adsp_autobuffer_irq, NULL); - memory_configure_bank(machine, 1, 0, 256, memory_region(machine, "user1"), 0x4000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 256, memory_region(machine, "user1"), 0x4000); + memory_set_bank(machine, "bank1", 0); /* keep the TMS32031 halted until the code is ready to go */ cputag_set_input_line(machine, "tms", INPUT_LINE_RESET, ASSERT_LINE); @@ -557,7 +557,7 @@ static WRITE16_HANDLER( adsp_rombank_w ) { if (LOG) logerror("adsp_rombank_w(%d) = %04X\n", offset, data); - memory_set_bank(space->machine, 1, (offset & 1) * 0x80 + (data & 0x7f)); + memory_set_bank(space->machine, "bank1", (offset & 1) * 0x80 + (data & 0x7f)); } @@ -802,7 +802,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( adsp_data_map, ADDRESS_SPACE_DATA, 16 ) AM_RANGE(0x0000, 0x0001) AM_WRITE(adsp_rombank_w) - AM_RANGE(0x0000, 0x1fff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1") AM_RANGE(0x2000, 0x2000) AM_READWRITE(sound_data_r, sound_status_w) AM_RANGE(0x3800, 0x39ff) AM_RAM AM_BASE(&adsp_fastram_base) /* 512 words internal RAM */ AM_RANGE(0x3fe0, 0x3fff) AM_WRITE(adsp_control_w) AM_BASE(&adsp_control_regs) diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 642123bd6b8..fb2c1147fe6 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -841,7 +841,7 @@ static INPUT_CHANGED( gmgalax_game_changed ) gmgalax_selected_game = newval; /* select the bank and graphics bank based on it */ - memory_set_bank(field->port->machine, 1, gmgalax_selected_game); + memory_set_bank(field->port->machine, "bank1", gmgalax_selected_game); galaxian_gfxbank_w(space, 0, gmgalax_selected_game); /* reset the stars */ @@ -870,8 +870,8 @@ static CUSTOM_INPUT( gmgalax_port_r ) static WRITE8_HANDLER( zigzag_bankswap_w ) { - memory_set_bank(space->machine, 1, data & 1); - memory_set_bank(space->machine, 2, ~data & 1); + memory_set_bank(space->machine, "bank1", data & 1); + memory_set_bank(space->machine, "bank2", ~data & 1); } @@ -2481,8 +2481,8 @@ static DRIVER_INIT( gmgalax ) common_init(machine, galaxian_draw_bullet, galaxian_draw_background, gmgalax_extend_tile_info, gmgalax_extend_sprite_info); /* ROM is banked */ - memory_install_read8_handler(space, 0x0000, 0x3fff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_install_read_bank_handler(space, 0x0000, 0x3fff, 0, 0, "bank1"); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); /* callback when the game select is toggled */ gmgalax_game_changed(machine->portlist.head->fieldlist, NULL, 0, 0); @@ -2522,9 +2522,9 @@ static DRIVER_INIT( frogg ) common_init(machine, galaxian_draw_bullet, frogger_draw_background, frogger_extend_tile_info, frogger_extend_sprite_info); /* ...but needs a full 2k of RAM */ - memory_install_readwrite8_handler(space, 0x4000, 0x47ff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); + memory_install_readwrite_bank_handler(space, 0x4000, 0x47ff, 0, 0, "bank1"); frogg_ram = auto_alloc_array(machine, UINT8, 0x800); - memory_set_bankptr(machine, 1, frogg_ram); + memory_set_bankptr(machine, "bank1", frogg_ram); state_save_register_global_pointer(machine, frogg_ram, 0x800); } @@ -2695,15 +2695,15 @@ static DRIVER_INIT( zigzag ) common_init(machine, NULL, galaxian_draw_background, NULL, NULL); /* make ROMs 2 & 3 swappable */ - memory_install_read8_handler(space, 0x2000, 0x2fff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_install_read8_handler(space, 0x3000, 0x3fff, 0, 0, (read8_space_func)SMH_BANK(2)); - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x1000); - memory_configure_bank(machine, 2, 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x1000); + memory_install_read_bank_handler(space, 0x2000, 0x2fff, 0, 0, "bank1"); + memory_install_read_bank_handler(space, 0x3000, 0x3fff, 0, 0, "bank2"); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x1000); + memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x1000); /* also re-install the fixed ROM area as a bank in order to inform the memory system that the fixed area only extends to 0x1fff */ - memory_install_read8_handler(space, 0x0000, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(3)); - memory_set_bankptr(machine, 3, memory_region(machine, "maincpu") + 0x0000); + memory_install_read_bank_handler(space, 0x0000, 0x1fff, 0, 0, "bank3"); + memory_set_bankptr(machine, "bank3", memory_region(machine, "maincpu") + 0x0000); /* handler for doing the swaps */ memory_install_write8_handler(space, 0x7002, 0x7002, 0, 0x07f8, zigzag_bankswap_w); @@ -2810,12 +2810,12 @@ static DRIVER_INIT( skybase ) memory_install_write8_handler(space, 0xa002, 0xa002, 0, 0x7f8, galaxian_gfxbank_w); /* needs a full 2k of RAM */ - memory_install_readwrite8_handler(space, 0x8000, 0x87ff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x800)); + memory_install_readwrite_bank_handler(space, 0x8000, 0x87ff, 0, 0, "bank1"); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x800)); /* extend ROM */ - memory_install_read8_handler(space, 0x0000, 0x5fff, 0, 0, (read8_space_func)SMH_BANK(2)); - memory_set_bankptr(machine, 2, memory_region(machine, "maincpu")); + memory_install_read_bank_handler(space, 0x0000, 0x5fff, 0, 0, "bank2"); + memory_set_bankptr(machine, "bank2", memory_region(machine, "maincpu")); } @@ -2874,12 +2874,12 @@ static DRIVER_INIT( scorpnmc ) memory_install_write8_handler(space, 0xb001, 0xb001, 0, 0x7f8, irq_enable_w); /* extra ROM */ - memory_install_read8_handler(space, 0x5000, 0x67ff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x5000); + memory_install_read_bank_handler(space, 0x5000, 0x67ff, 0, 0, "bank1"); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x5000); /* install RAM at $4000-$4800 */ - memory_install_readwrite8_handler(space, 0x4000, 0x47ff, 0, 0, (read8_space_func)SMH_BANK(2), (write8_space_func)SMH_BANK(2)); - memory_set_bankptr(machine, 2, auto_alloc_array(machine, UINT8, 0x800)); + memory_install_readwrite_bank_handler(space, 0x4000, 0x47ff, 0, 0, "bank2"); + memory_set_bankptr(machine, "bank2", auto_alloc_array(machine, UINT8, 0x800)); /* doesn't appear to use original RAM */ memory_install_readwrite8_handler(space, 0x8000, 0x87ff, 0, 0, (read8_space_func)SMH_UNMAP, (write8_space_func)SMH_UNMAP); @@ -2940,8 +2940,8 @@ static DRIVER_INIT( sfx ) galaxian_sfx_tilemap = TRUE; /* sound board has space for extra ROM */ - memory_install_read8_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_set_bankptr(machine, 1, memory_region(machine, "audiocpu")); + memory_install_read_bank_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1"); + memory_set_bankptr(machine, "bank1", memory_region(machine, "audiocpu")); } @@ -2998,9 +2998,9 @@ static DRIVER_INIT( froggrmc ) memory_install_write8_handler(space, 0xb001, 0xb001, 0, 0x7f8, froggrmc_sound_control_w); /* actually needs 2k of RAM */ - memory_install_readwrite8_handler(space, 0x8000, 0x87ff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); + memory_install_readwrite_bank_handler(space, 0x8000, 0x87ff, 0, 0, "bank1"); frogg_ram = auto_alloc_array(machine, UINT8, 0x800); - memory_set_bankptr(machine, 1, frogg_ram); + memory_set_bankptr(machine, "bank1", frogg_ram); state_save_register_global_pointer(machine, frogg_ram, 0x800); @@ -3046,8 +3046,8 @@ static DRIVER_INIT( scorpion ) memory_install_readwrite8_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_IO), 0x00, 0xff, 0, 0, scorpion_ay8910_r, scorpion_ay8910_w); /* extra ROM */ - memory_install_read8_handler(space, 0x5800, 0x67ff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x5800); + memory_install_read_bank_handler(space, 0x5800, 0x67ff, 0, 0, "bank1"); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x5800); /* no background related */ // memory_install_write8_handler(space, 0x6803, 0x6803, 0, 0, (write8_space_func)SMH_NOP); diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c index f3cfd549c65..8f724dc2ef1 100644 --- a/src/mame/drivers/galaxold.c +++ b/src/mame/drivers/galaxold.c @@ -541,7 +541,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( _4in1_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(1) /* banked game code */ + AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1") /* banked game code */ AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram) AM_RANGE(0x5400, 0x57ff) AM_READ(galaxold_videoram_r) diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index 5a7ba9510f2..47aa10f59fe 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -80,7 +80,7 @@ static ADDRESS_MAP_START( galivan_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM // The next three entires need to be looked at. It's ugly. - AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xd800, 0xdbff) AM_WRITE(galivan_videoram_w) AM_BASE_SIZE_MEMBER(galivan_state, videoram, videoram_size) AM_RANGE(0xdc00, 0xdfff) AM_WRITE(galivan_colorram_w) AM_BASE_MEMBER(galivan_state, colorram) @@ -92,7 +92,7 @@ static ADDRESS_MAP_START( ninjemak_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM // The next three entires need to be looked at. It's ugly. - AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xd800, 0xd81f) AM_WRITE(ninjemak_videoreg_w) AM_RANGE(0xd800, 0xdbff) AM_WRITE(galivan_videoram_w) AM_BASE_SIZE_MEMBER(galivan_state, videoram, videoram_size) AM_RANGE(0xdc00, 0xdfff) AM_WRITE(galivan_colorram_w) AM_BASE_MEMBER(galivan_state, colorram) @@ -414,8 +414,8 @@ static MACHINE_START( galivan ) /* configure ROM banking */ UINT8 *rombase = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 2, &rombase[0x10000], 0x2000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 2, &rombase[0x10000], 0x2000); + memory_set_bank(machine, "bank1", 0); /* register for saving */ state_save_register_global_array(machine, state->scrollx); @@ -431,8 +431,8 @@ static MACHINE_START( ninjemak ) /* configure ROM banking */ UINT8 *rombase = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 4, &rombase[0x10000], 0x2000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 4, &rombase[0x10000], 0x2000); + memory_set_bank(machine, "bank1", 0); /* register for saving */ state_save_register_global_array(machine, state->scrollx); @@ -995,9 +995,9 @@ ROM_END static WRITE8_HANDLER( youmab_extra_bank_w ) { if (data == 0xff) - memory_set_bank(space->machine, 2, 1); + memory_set_bank(space->machine, "bank2", 1); else if (data == 0x00) - memory_set_bank(space->machine, 2, 0); + memory_set_bank(space->machine, "bank2", 0); else printf("data %03x\n", data); } @@ -1020,12 +1020,12 @@ static WRITE8_HANDLER( youmab_84_w ) static DRIVER_INIT( youmab ) { memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x82, 0x82, 0, 0, youmab_extra_bank_w); // banks rom at 0x8000? writes 0xff and 0x00 before executing code there - memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(3)); - memory_set_bankptr(machine, 3, memory_region(machine, "maincpu")); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x7fff, 0, 0, "bank3"); + memory_set_bankptr(machine, "bank3", memory_region(machine, "maincpu")); - memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, (read8_space_func)SMH_BANK(2)); - memory_configure_bank(machine, 2, 0, 2, memory_region(machine, "user2"), 0x4000); - memory_set_bank(machine, 2, 0); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank2"); + memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "user2"), 0x4000); + memory_set_bank(machine, "bank2", 0); memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x81, 0x81, 0, 0, youmab_81_w); // ?? often, alternating values memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x84, 0x84, 0, 0, youmab_84_w); // ?? often, sequence.. diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index 8e93aeff060..d7ccc796031 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -192,11 +192,11 @@ static void mxtc_config_w(const device_config *busdevice, const device_config *d { if (data & 0x10) // enable RAM access to region 0xf0000 - 0xfffff { - memory_set_bankptr(busdevice->machine, 1, bios_ram); + memory_set_bankptr(busdevice->machine, "bank1", bios_ram); } else // disable RAM access (reads go to BIOS ROM) { - memory_set_bankptr(busdevice->machine, 1, memory_region(busdevice->machine, "user1") + 0x30000); + memory_set_bankptr(busdevice->machine, "bank1", memory_region(busdevice->machine, "user1") + 0x30000); } break; } @@ -498,7 +498,7 @@ static ADDRESS_MAP_START( gamecstl_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000a0000, 0x000affff) AM_RAM AM_RANGE(0x000b0000, 0x000b7fff) AM_RAM AM_BASE(&cga_ram) AM_RANGE(0x000e0000, 0x000effff) AM_RAM - AM_RANGE(0x000f0000, 0x000fffff) AM_ROMBANK(1) + AM_RANGE(0x000f0000, 0x000fffff) AM_ROMBANK("bank1") AM_RANGE(0x000f0000, 0x000fffff) AM_WRITE(bios_ram_w) AM_RANGE(0x00100000, 0x01ffffff) AM_RAM AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("user1", 0) /* System BIOS */ @@ -603,7 +603,7 @@ static MACHINE_START(gamecstl) static MACHINE_RESET(gamecstl) { - memory_set_bankptr(machine, 1, memory_region(machine, "user1") + 0x30000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + 0x30000); cpu_set_irq_callback(cputag_get_cpu(machine, "maincpu"), irq_callback); } diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index 773a87ca4dc..0a851937251 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -125,7 +125,7 @@ static WRITE8_HANDLER( mrgoemon_coin_counter_w ) coin_counter_w(space->machine, 1, data & 0x02); /* bits 5-7 = ROM bank select */ - memory_set_bank(space->machine, 1, ((data & 0xe0) >> 5)); + memory_set_bank(space->machine, "bank1", ((data & 0xe0) >> 5)); } static WRITE8_HANDLER( mrgoemon_flipscreen_w ) @@ -203,7 +203,7 @@ static ADDRESS_MAP_START( mrgoemon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf601, 0xf601) AM_READ_PORT("P2") AM_RANGE(0xf602, 0xf602) AM_READ_PORT("P1") AM_RANGE(0xf603, 0xf603) AM_READ_PORT("SYSTEM") - AM_RANGE(0xf800, 0xffff) AM_ROMBANK(1) + AM_RANGE(0xf800, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END /************************************* @@ -544,7 +544,7 @@ ROM_END static DRIVER_INIT( mrgoemon ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 8, &ROM[0x10000], 0x800); + memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x800); } /************************************* diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index 469ebf86d1b..d5124b44576 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -138,7 +138,7 @@ static ADDRESS_MAP_START( gbusters_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_READWRITE(K052109_051960_r, K052109_051960_w) /* tiles + sprites (RAM H21, G21 & H6) */ AM_RANGE(0x4000, 0x57ff) AM_RAM /* RAM I12 */ AM_RANGE(0x5800, 0x5fff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE(&ram) /* palette + work RAM (RAM D16 & C16) */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM 878n02.rom */ ADDRESS_MAP_END @@ -350,7 +350,7 @@ static KONAMI_SETLINES_CALLBACK( gbusters_banking ) /* bits 0-3 ROM bank */ offs += (lines & 0x0f)*0x2000; - memory_set_bankptr(device->machine, 1, &RAM[offs] ); + memory_set_bankptr(device->machine, "bank1", &RAM[offs] ); if (lines & 0xf0){ //logerror("%04x: (lines) write %02x\n",cpu_get_pc(device), lines); diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c index 681699cce3f..40c14cf5e02 100644 --- a/src/mame/drivers/gei.c +++ b/src/mame/drivers/gei.c @@ -200,68 +200,68 @@ static READ8_DEVICE_HANDLER( portC_r ) static WRITE8_HANDLER( banksel_main_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x8000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x8000); } static WRITE8_HANDLER( banksel_1_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x10000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x10000); } static WRITE8_HANDLER( banksel_2_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x18000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x18000); } static WRITE8_HANDLER( banksel_3_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x20000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x20000); } static WRITE8_HANDLER( banksel_4_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x28000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x28000); } static WRITE8_HANDLER( banksel_5_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x30000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x30000); } static WRITE8_HANDLER( banksel_1_1_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x10000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x10000); } static WRITE8_HANDLER( banksel_2_1_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x14000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x14000); } static WRITE8_HANDLER( banksel_3_1_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x18000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x18000); } static WRITE8_HANDLER( banksel_4_1_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x1c000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x1c000); } static WRITE8_HANDLER( banksel_5_1_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x20000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x20000); } static WRITE8_HANDLER( banksel_1_2_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x12000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x12000); } static WRITE8_HANDLER( banksel_2_2_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x16000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x16000); } static WRITE8_HANDLER( banksel_3_2_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x1a000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x1a000); } static WRITE8_HANDLER( banksel_4_2_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x1e000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x1e000); } static WRITE8_HANDLER( banksel_5_2_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "cpu") + 0x22000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "cpu") + 0x22000); } static WRITE8_HANDLER(geimulti_bank_w) @@ -289,7 +289,7 @@ static WRITE8_HANDLER(geimulti_bank_w) } if (bank != -1) - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "bank") + bank*0x8000); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "bank") + bank*0x8000); } /* This signature is used to validate the ROMs in sportauth. Simple protection check? */ @@ -328,7 +328,7 @@ static WRITE8_HANDLER( signature2_w ) static ADDRESS_MAP_START( getrivia_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) @@ -350,7 +350,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gselect_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x40ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0x4400, 0x4400) AM_WRITE(banksel_1_1_w) AM_RANGE(0x4401, 0x4401) AM_WRITE(banksel_1_2_w) @@ -365,7 +365,7 @@ ADDRESS_MAP_END // TODO: where are mapped the lower 0x2000 bytes of the banks? static ADDRESS_MAP_START( amuse_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) @@ -381,7 +381,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gepoker_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) @@ -398,7 +398,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( amuse1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0x4400, 0x4400) AM_WRITE(banksel_1_1_w) AM_RANGE(0x4401, 0x4401) AM_WRITE(banksel_2_1_w) @@ -428,7 +428,7 @@ static ADDRESS_MAP_START( findout_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6200, 0x6200) AM_WRITE(signature_w) AM_RANGE(0x6400, 0x6400) AM_READ(signature_r) AM_RANGE(0x7800, 0x7fff) AM_ROM /*space for diagnostic ROM?*/ - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8002) AM_WRITE(gei_drawctrl_w) AM_RANGE(0xc000, 0xffff) AM_WRITE(gei_bitmap_w) AM_BASE_GENERIC(videoram) AM_RANGE(0x0000, 0xffff) AM_READ(catchall) @@ -457,7 +457,7 @@ static ADDRESS_MAP_START( geimulti_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5a00, 0x5cff) AM_WRITE(geimulti_bank_w) AM_RANGE(0x6000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8002) AM_WRITE(gei_drawctrl_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xffff) AM_RAM_WRITE(gei_bitmap_w) AM_BASE_GENERIC(videoram) ADDRESS_MAP_END @@ -471,7 +471,7 @@ static ADDRESS_MAP_START( sprtauth_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5a00, 0x5cff) AM_WRITE(geimulti_bank_w) AM_RANGE(0x6000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8002) AM_WRITE(gei_drawctrl_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xffff) AM_RAM_WRITE(gei_bitmap_w) AM_BASE_GENERIC(videoram) ADDRESS_MAP_END @@ -1730,12 +1730,12 @@ ROM_END static DRIVER_INIT( setbank ) { - memory_set_bankptr(machine, 1,memory_region(machine, "cpu") + 0x2000); + memory_set_bankptr(machine, "bank1",memory_region(machine, "cpu") + 0x2000); } static DRIVER_INIT( geimulti ) { - memory_set_bankptr(machine, 1,memory_region(machine, "bank") + 0x0000); + memory_set_bankptr(machine, "bank1",memory_region(machine, "bank") + 0x0000); } GAME( 1982, jokpoker, 0, gselect, gselect, setbank, ROT0, "Greyhound Electronics", "Joker Poker (Version 16.03B)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index 2b63eea1687..5cf0fcba2cf 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -210,7 +210,7 @@ static WRITE8_HANDLER( gladiatr_bankswitch_w ) { UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000; - memory_set_bankptr(space->machine, 1, rom + 0x6000 * (data & 0x01)); + memory_set_bankptr(space->machine, "bank1", rom + 0x6000 * (data & 0x01)); } @@ -271,7 +271,7 @@ static MACHINE_RESET( gladiator ) /* 6809 bank memory set */ { UINT8 *rom = memory_region(machine, "audiocpu") + 0x10000; - memory_set_bankptr(machine, 2,rom); + memory_set_bankptr(machine, "bank2",rom); device_reset(cputag_get_cpu(machine, "audiocpu")); } } @@ -296,7 +296,7 @@ static WRITE8_DEVICE_HANDLER( glad_adpcm_w ) UINT8 *rom = memory_region(device->machine, "audiocpu") + 0x10000; /* bit6 = bank offset */ - memory_set_bankptr(device->machine, 2,rom + ((data & 0x40) ? 0xc000 : 0)); + memory_set_bankptr(device->machine, "bank2",rom + ((data & 0x40) ? 0xc000 : 0)); msm5205_data_w(device,data); /* bit0..3 */ msm5205_reset_w(device,(data>>5)&1); /* bit 5 */ @@ -423,7 +423,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gladiatr_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM - AM_RANGE(0x6000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcbff) AM_RAM AM_BASE_GENERIC(spriteram) AM_RANGE(0xcc00, 0xcfff) AM_WRITE(gladiatr_video_registers_w) AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(gladiatr_paletteram_w) AM_BASE_GENERIC(paletteram) @@ -441,7 +441,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gladiatr_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1fff) AM_DEVWRITE("msm", glad_adpcm_w) AM_RANGE(0x2000, 0x2fff) AM_READ(glad_cpu_sound_command_r) - AM_RANGE(0x4000, 0xffff) AM_ROMBANK(2) + AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank2") ADDRESS_MAP_END @@ -1004,7 +1004,7 @@ static DRIVER_INIT( gladiatr ) /* make sure bank is valid in cpu-reset */ rom = memory_region(machine, "audiocpu") + 0x10000; - memory_set_bankptr(machine, 2,rom); + memory_set_bankptr(machine, "bank2",rom); } diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c index 3187118ceea..79235a710a0 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -31,9 +31,9 @@ Notes: static WRITE8_HANDLER( gng_bankswitch_w ) { if (data == 4) - memory_set_bank(space->machine, 1, 4); + memory_set_bank(space->machine, "bank1", 4); else - memory_set_bank(space->machine, 1, (data & 0x03)); + memory_set_bank(space->machine, "bank1", (data & 0x03)); } static WRITE8_HANDLER( gng_coin_counter_w ) @@ -61,7 +61,7 @@ static ADDRESS_MAP_START( gng_map, ADDRESS_SPACE_PROGRAM, 8 ) // { 0x3d01, 0x3d01, reset sound cpu? AM_RANGE(0x3d02, 0x3d03) AM_WRITE(gng_coin_counter_w) AM_RANGE(0x3e00, 0x3e00) AM_WRITE(gng_bankswitch_w) - AM_RANGE(0x4000, 0x5fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") AM_RANGE(0x6000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -306,8 +306,8 @@ static MACHINE_START( gng ) gng_state *state = (gng_state *)machine->driver_data; UINT8 *rombase = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 4, &rombase[0x10000], 0x2000); - memory_configure_bank(machine, 1, 4, 1, &rombase[0x4000], 0x2000); + memory_configure_bank(machine, "bank1", 0, 4, &rombase[0x10000], 0x2000); + memory_configure_bank(machine, "bank1", 4, 1, &rombase[0x4000], 0x2000); state_save_register_global_array(machine, state->scrollx); state_save_register_global_array(machine, state->scrolly); diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 913a01dad6f..0495b552480 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -70,12 +70,12 @@ ADDRESS_MAP_END static WRITE8_HANDLER( go2000_pcm_1_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x07); + memory_set_bank(space->machine, "bank1", data & 0x07); } static ADDRESS_MAP_START( go2000_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_ROM - AM_RANGE(0x0400, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x0400, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( go2000_sound_io, ADDRESS_SPACE_IO, 8 ) @@ -308,9 +308,9 @@ static MACHINE_START( go2000 ) int i; for (i = 0; i < 8; i++) - memory_configure_bank(machine, 1, i, 1, &SOUND[0x00400 + i * 0x10000], 0x10000 - 0x400); + memory_configure_bank(machine, "bank1", i, 1, &SOUND[0x00400 + i * 0x10000], 0x10000 - 0x400); - memory_set_bank(machine, 1, 0); + memory_set_bank(machine, "bank1", 0); state->soundcpu = devtag_get_device(machine, "soundcpu"); } diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c index 43cd8766965..0ac27c2ee34 100644 --- a/src/mame/drivers/goal92.c +++ b/src/mame/drivers/goal92.c @@ -70,7 +70,7 @@ ADDRESS_MAP_END static WRITE8_DEVICE_HANDLER( adpcm_control_w ) { - memory_set_bank(device->machine, 1, data & 0x01); + memory_set_bank(device->machine, "bank1", data & 0x01); msm5205_reset_w(device, data & 0x08); } @@ -83,7 +83,7 @@ static WRITE8_HANDLER( adpcm_data_w ) static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", adpcm_control_w) AM_RANGE(0xe400, 0xe400) AM_WRITE(adpcm_data_w) AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) @@ -295,7 +295,7 @@ static MACHINE_START( goal92 ) goal92_state *state = (goal92_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "audiocpu"); - memory_configure_bank(machine, 1, 0, 2, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); state->audiocpu = devtag_get_device(machine, "audiocpu"); diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index 3ad3780d008..25123e5417e 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -28,7 +28,7 @@ static WRITE8_HANDLER( goindol_bankswitch_w ) { goindol_state *state = (goindol_state *)space->machine->driver_data; - memory_set_bank(space->machine, 1, data & 0x03); + memory_set_bank(space->machine, "bank1", data & 0x03); if (state->char_bank != ((data & 0x10) >> 4)) { @@ -90,7 +90,7 @@ static WRITE8_HANDLER( prot_fcb0_w ) static ADDRESS_MAP_START( goindol_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE_MEMBER(goindol_state, ram) AM_RANGE(0xc800, 0xc800) AM_READNOP AM_WRITE(soundlatch_w) // watchdog? AM_RANGE(0xc810, 0xc810) AM_WRITE(goindol_bankswitch_w) @@ -229,7 +229,7 @@ static MACHINE_START( goindol ) goindol_state *state = (goindol_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 4, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); state_save_register_global(machine, state->char_bank); state_save_register_global(machine, state->prot_toggle); diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index 9907010005c..0ff234d22ee 100644 --- a/src/mame/drivers/gstriker.c +++ b/src/mame/drivers/gstriker.c @@ -225,7 +225,7 @@ static WRITE8_HANDLER( gs_sh_bankswitch_w ) int bankaddress; bankaddress = 0x10000 + (data & 0x03) * 0x8000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } /*** GFX DECODE **************************************************************/ @@ -310,7 +310,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 5025a75a4d9..7c12a2ba520 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -673,7 +673,7 @@ static ADDRESS_MAP_START( hangplt_sharc0_map, ADDRESS_SPACE_DATA, 32 ) AM_RANGE(0x3400000, 0x34000ff) AM_READWRITE(cgboard_0_comm_sharc_r, cgboard_0_comm_sharc_w) AM_RANGE(0x3401000, 0x34fffff) AM_DEVWRITE("voodoo0", nwk_fifo_0_w) AM_RANGE(0x3500000, 0x3507fff) AM_READWRITE(K033906_0_r, K033906_0_w) - AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK(5) + AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK("bank5") ADDRESS_MAP_END static ADDRESS_MAP_START( hangplt_sharc1_map, ADDRESS_SPACE_DATA, 32 ) @@ -684,7 +684,7 @@ static ADDRESS_MAP_START( hangplt_sharc1_map, ADDRESS_SPACE_DATA, 32 ) AM_RANGE(0x3400000, 0x34000ff) AM_READWRITE(cgboard_1_comm_sharc_r, cgboard_1_comm_sharc_w) AM_RANGE(0x3401000, 0x34fffff) AM_DEVWRITE("voodoo1", nwk_fifo_1_w) AM_RANGE(0x3500000, 0x3507fff) AM_READWRITE(K033906_1_r, K033906_1_w) - AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK(6) + AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK("bank6") ADDRESS_MAP_END /*****************************************************************************/ @@ -1230,8 +1230,8 @@ static DRIVER_INIT(gticlub) static DRIVER_INIT(hangplt) { init_konami_cgboard(machine, 2, CGBOARD_TYPE_HANGPLT); - set_cgboard_texture_bank(machine, 0, 5, memory_region(machine, "user5")); - set_cgboard_texture_bank(machine, 1, 6, memory_region(machine, "user5")); + set_cgboard_texture_bank(machine, 0, "bank5", memory_region(machine, "user5")); + set_cgboard_texture_bank(machine, 1, "bank6", memory_region(machine, "user5")); sharc_dataram_0 = auto_alloc_array(machine, UINT32, 0x100000/4); sharc_dataram_1 = auto_alloc_array(machine, UINT32, 0x100000/4); diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index 3f3f9a3631e..d235de3a492 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -73,7 +73,7 @@ static INTERRUPT_GEN( yamyam_interrupt ) static WRITE8_HANDLER( yamyam_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x07); + memory_set_bank(space->machine, "bank1", data & 0x07); } static WRITE8_HANDLER( yamyam_protection_w ) @@ -143,7 +143,7 @@ static WRITE8_HANDLER( yamyam_protection_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSW0") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("DSW1") AM_RANGE(0xc004, 0xc004) AM_READ_PORT("IN0") @@ -449,7 +449,7 @@ static MACHINE_START( gundealr ) gundealr_state *state = (gundealr_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 8, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); state_save_register_global(machine, state->flipscreen); state_save_register_global_array(machine, state->scroll); diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c index eb5771b786e..06ce7bcb068 100644 --- a/src/mame/drivers/gunsmoke.c +++ b/src/mame/drivers/gunsmoke.c @@ -100,7 +100,7 @@ static READ8_HANDLER( gunsmoke_protection_r ) static ADDRESS_MAP_START( gunsmoke_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P2") @@ -277,7 +277,7 @@ static MACHINE_START( gunsmoke ) gunsmoke_state *state = (gunsmoke_state *)machine->driver_data; UINT8 *rombase = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 4, &rombase[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, &rombase[0x10000], 0x4000); state_save_register_global(machine, state->chon); state_save_register_global(machine, state->objon); diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index 8c0a0c17460..c133ad195a3 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -33,7 +33,7 @@ static WRITE8_HANDLER( hcastle_bankswitch_w ) int bankaddress; bankaddress = 0x10000 + (data & 0x1f) * 0x2000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } static WRITE8_HANDLER( hcastle_soundirq_w ) @@ -71,7 +71,7 @@ static ADDRESS_MAP_START( hcastle_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE(hcastle_pf2_video_w) AM_BASE(&hcastle_pf2_videoram) AM_RANGE(0x5000, 0x5fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram2) - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c index 84a9c058d99..e4df117aac4 100644 --- a/src/mame/drivers/hexa.c +++ b/src/mame/drivers/hexa.c @@ -54,7 +54,7 @@ static ADDRESS_MAP_START( hexa_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xd001, 0xd001) AM_DEVREAD("aysnd", ay8910_r) AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("aysnd", ay8910_address_data_w) @@ -224,7 +224,7 @@ static DRIVER_INIT( hexa ) RAM[0x0126] = 0x00; #endif - memory_configure_bank(machine, 1, 0, 2, &RAM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, &RAM[0x10000], 0x4000); } diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c index af6dd7afe89..31293b42a60 100644 --- a/src/mame/drivers/hexion.c +++ b/src/mame/drivers/hexion.c @@ -115,7 +115,7 @@ if ((data & 0xdc) != 0x10) popmessage("coincntr %02x",data); static ADDRESS_MAP_START( hexion_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xbfff) AM_RAM AM_RANGE(0xc000, 0xdffe) AM_READWRITE(hexion_bankedram_r, hexion_bankedram_w) AM_RANGE(0xdfff, 0xdfff) AM_WRITE(hexion_bankctrl_w) diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c index 4194041d102..fca4fffa323 100644 --- a/src/mame/drivers/highvdeo.c +++ b/src/mame/drivers/highvdeo.c @@ -216,7 +216,7 @@ static WRITE16_HANDLER( tv_vcf_bankselect_w ) /* bits 0, 1 select the ROM bank */ bankaddress = (data & 0x03) * 0x40000; - memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &ROM[bankaddress]); } @@ -257,7 +257,7 @@ static ADDRESS_MAP_START( tv_vcf_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/ AM_RANGE(0x00400, 0x03fff) AM_RAM AM_BASE_SIZE_GENERIC( nvram ) AM_RANGE(0x40000, 0x4ffff) AM_RAM AM_BASE(&blit_ram) /*blitter ram*/ - AM_RANGE(0x80000, 0xbffff) AM_ROMBANK(1) + AM_RANGE(0x80000, 0xbffff) AM_ROMBANK("bank1") AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0) ADDRESS_MAP_END @@ -332,7 +332,7 @@ static WRITE16_HANDLER( tv_tcf_bankselect_w ) /* bits 0, 1, 2 select the ROM bank */ bankaddress = (data & 0x07) * 0x40000; - memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &ROM[bankaddress]); } static ADDRESS_MAP_START( tv_tcf_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -340,7 +340,7 @@ static ADDRESS_MAP_START( tv_tcf_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00400, 0x03fff) AM_RAM AM_BASE_SIZE_GENERIC( nvram ) AM_RANGE(0x40000, 0x5d4bf) AM_RAM AM_BASE(&blit_ram) /*blitter ram*/ AM_RANGE(0x7fe00, 0x7ffff) AM_RAM_WRITE( tv_tcf_paletteram_w ) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x80000, 0xbffff) AM_ROMBANK(1) + AM_RANGE(0x80000, 0xbffff) AM_ROMBANK("bank1") AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0) ADDRESS_MAP_END @@ -397,7 +397,7 @@ static ADDRESS_MAP_START( newmcard_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/ AM_RANGE(0x00400, 0x0ffff) AM_RAM AM_BASE_SIZE_GENERIC( nvram ) AM_RANGE(0x40000, 0x7ffff) AM_RAM AM_BASE(&blit_ram) /*blitter ram*/ - AM_RANGE(0x80000, 0xbffff) AM_ROMBANK(1) + AM_RANGE(0x80000, 0xbffff) AM_ROMBANK("bank1") AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0) ADDRESS_MAP_END @@ -456,7 +456,7 @@ static WRITE16_HANDLER( brasil_status_w ) bankaddress = (data & 0x07) * 0x40000; - memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &ROM[bankaddress]); // popmessage("%04x",data); } @@ -465,7 +465,7 @@ static ADDRESS_MAP_START( brasil_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/ AM_RANGE(0x00400, 0x0ffff) AM_RAM AM_BASE_SIZE_GENERIC( nvram ) AM_RANGE(0x40000, 0x7ffff) AM_RAM AM_BASE(&blit_ram) /*blitter ram*/ - AM_RANGE(0x80000, 0xbffff) AM_ROMBANK(1) + AM_RANGE(0x80000, 0xbffff) AM_ROMBANK("bank1") AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0) ADDRESS_MAP_END diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c index c989900cc12..d3118b10d38 100644 --- a/src/mame/drivers/himesiki.c +++ b/src/mame/drivers/himesiki.c @@ -92,7 +92,7 @@ A 12.000MHz static WRITE8_HANDLER( himesiki_rombank_w ) { - memory_set_bank(space->machine, 1, ((data & 0x08) >> 3)); + memory_set_bank(space->machine, "bank1", ((data & 0x08) >> 3)); if (data & 0xf7) logerror("p06_w %02x\n", data); @@ -113,7 +113,7 @@ static ADDRESS_MAP_START( himesiki_prm0, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE_MEMBER(himesiki_state, spriteram) AM_RANGE(0xa800, 0xafff) AM_RAM AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xb000, 0xbfff) AM_RAM AM_WRITE(himesiki_bg_ram_w) AM_BASE_MEMBER(himesiki_state, bg_ram) - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( himesiki_iom0, ADDRESS_SPACE_IO, 8 ) @@ -273,7 +273,7 @@ static MACHINE_START( himesiki ) himesiki_state *state = (himesiki_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 2, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); state->subcpu = devtag_get_device(machine, "sub"); diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index 5745ad7296c..645b9f075f8 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -1386,8 +1386,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hng_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_READ(SMH_BANK(2)) - AM_RANGE(0xe0000, 0xfffff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("bank2") + AM_RANGE(0xe0000, 0xfffff) AM_ROMBANK("bank1") ADDRESS_MAP_END @@ -1794,8 +1794,8 @@ static MACHINE_RESET(hyperneo) /* Sound CPU */ UINT8 *RAM = (UINT8*)hng64_soundram; - memory_set_bankptr(machine, 1,&RAM[0x1e0000]); - memory_set_bankptr(machine, 2,&RAM[0x001000]); // where.. + memory_set_bankptr(machine, "bank1",&RAM[0x1e0000]); + memory_set_bankptr(machine, "bank2",&RAM[0x001000]); // where.. cputag_set_input_line(machine, "audiocpu", INPUT_LINE_HALT, ASSERT_LINE); cputag_set_input_line(machine, "audiocpu", INPUT_LINE_RESET, ASSERT_LINE); diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index a6eea54112f..834227d28fe 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -366,7 +366,7 @@ static WRITE8_HANDLER( reikaids_upd7807_portc_w ) // logerror("%04x: port C wr %02x (STATUS %d DATA %d)\n",cpu_get_pc(space->cpu),data,BIT(data,2),BIT(data,6)); - memory_set_bankptr(space->machine, 2,memory_region(space->machine, "audiocpu") + 0x10000 * (data & 0x03)); + memory_set_bankptr(space->machine, "bank2",memory_region(space->machine, "audiocpu") + 0x10000 * (data & 0x03)); coin_counter_w(space->machine, 0,~data & 0x80); @@ -522,7 +522,7 @@ static WRITE8_HANDLER( pteacher_upd7807_portc_w ) // logerror("%04x: port C wr %02x\n",cpu_get_pc(space->cpu),data); - memory_set_bankptr(space->machine, 2,memory_region(space->machine, "audiocpu") + 0x10000 * ((data & 0x0c) >> 2)); + memory_set_bankptr(space->machine, "bank2",memory_region(space->machine, "audiocpu") + 0x10000 * ((data & 0x0c) >> 2)); coin_counter_w(space->machine, 0,~data & 0x80); @@ -552,11 +552,11 @@ static WRITE8_HANDLER( bankswitch_w ) /* last bank is fixed */ if (offs < len - 0x4000) { - memory_set_bankptr(space->machine, 1, &rom[offs + 0x10000]); + memory_set_bankptr(space->machine, "bank1", &rom[offs + 0x10000]); } else { - memory_set_bankptr(space->machine, 1, &rom[0xc000]); + memory_set_bankptr(space->machine, "bank1", &rom[0xc000]); } } @@ -613,12 +613,12 @@ static ADDRESS_MAP_START( reikaids_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8002, 0x8002) AM_WRITE(reikaids_snd_command_w) AM_RANGE(0x8005, 0x8005) AM_WRITE(reikaids_gfx_bank_w) AM_RANGE(0x8006, 0x8006) AM_WRITE(homedata_blitter_param_w) - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( reikaids_upd7807_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xfeff) AM_ROMBANK(2) /* External ROM (Banked) */ + AM_RANGE(0x0000, 0xfeff) AM_ROMBANK("bank2") /* External ROM (Banked) */ AM_RANGE(0xff00, 0xffff) AM_RAM /* Internal RAM */ ADDRESS_MAP_END @@ -647,13 +647,13 @@ static ADDRESS_MAP_START( pteacher_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8005, 0x8005) AM_WRITE(pteacher_blitter_bank_w) AM_RANGE(0x8006, 0x8006) AM_WRITE(homedata_blitter_param_w) AM_RANGE(0x8007, 0x8007) AM_WRITE(pteacher_gfx_bank_w) - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( pteacher_upd7807_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITE(pteacher_snd_answer_w) - AM_RANGE(0x0000, 0xfeff) AM_ROMBANK(2) /* External ROM (Banked) */ + AM_RANGE(0x0000, 0xfeff) AM_ROMBANK("bank2") /* External ROM (Banked) */ AM_RANGE(0xff00, 0xffff) AM_RAM /* Internal RAM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c index 65c7d2f935f..7037d0e5a73 100644 --- a/src/mame/drivers/homerun.c +++ b/src/mame/drivers/homerun.c @@ -55,7 +55,7 @@ static const ppi8255_interface ppi8255_intf = static ADDRESS_MAP_START( homerun_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x9fff) AM_RAM_WRITE(homerun_videoram_w) AM_BASE_MEMBER(homerun_state, videoram) AM_RANGE(0xa000, 0xa0ff) AM_RAM AM_BASE_SIZE_MEMBER(homerun_state, spriteram, spriteram_size) AM_RANGE(0xb000, 0xb0ff) AM_WRITE(homerun_color_w) @@ -195,8 +195,8 @@ static MACHINE_START( homerun ) homerun_state *state = (homerun_state *)machine->driver_data; UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 1, &ROM[0x00000], 0x4000); - memory_configure_bank(machine, 1, 1, 7, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 1, &ROM[0x00000], 0x4000); + memory_configure_bank(machine, "bank1", 1, 7, &ROM[0x10000], 0x4000); state_save_register_global(machine, state->gfx_ctrl); state_save_register_global(machine, state->gc_up); diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 423bce6bc87..eebe0f41ea0 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -769,7 +769,7 @@ static WRITE32_HANDLER( comm_rombank_w ) int bank = data >> 24; UINT8 *usr3 = memory_region(space->machine, "user3"); if (usr3 != NULL) - memory_set_bank(space->machine, 1, bank & 0x7f); + memory_set_bank(space->machine, "bank1", bank & 0x7f); } static READ32_HANDLER( comm0_unk_r ) @@ -812,7 +812,7 @@ static ADDRESS_MAP_START( hornet_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x7d044000, 0x7d044007) AM_READ(comm0_unk_r) AM_RANGE(0x7d048000, 0x7d048003) AM_WRITE(comm1_w) AM_RANGE(0x7d04a000, 0x7d04a003) AM_WRITE(comm_rombank_w) - AM_RANGE(0x7d050000, 0x7d05ffff) AM_ROMBANK(1) /* COMM BOARD 1 */ + AM_RANGE(0x7d050000, 0x7d05ffff) AM_ROMBANK("bank1") /* COMM BOARD 1 */ AM_RANGE(0x7e000000, 0x7e7fffff) AM_ROM AM_REGION("user2", 0) /* Data ROM */ AM_RANGE(0x7f000000, 0x7f3fffff) AM_ROM AM_SHARE(2) AM_RANGE(0x7fc00000, 0x7fffffff) AM_ROM AM_REGION("user1", 0) AM_SHARE(2) /* Program ROM */ @@ -899,7 +899,7 @@ static ADDRESS_MAP_START( sharc0_map, ADDRESS_SPACE_DATA, 32 ) AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE("voodoo0", voodoo_r, voodoo_w) AM_RANGE(0x3400000, 0x34000ff) AM_READWRITE(cgboard_0_comm_sharc_r, cgboard_0_comm_sharc_w) AM_RANGE(0x3500000, 0x35000ff) AM_READWRITE(K033906_0_r, K033906_0_w) - AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK(5) + AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK("bank5") ADDRESS_MAP_END static ADDRESS_MAP_START( sharc1_map, ADDRESS_SPACE_DATA, 32 ) @@ -909,7 +909,7 @@ static ADDRESS_MAP_START( sharc1_map, ADDRESS_SPACE_DATA, 32 ) AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE("voodoo1", voodoo_r, voodoo_w) AM_RANGE(0x3400000, 0x34000ff) AM_READWRITE(cgboard_1_comm_sharc_r, cgboard_1_comm_sharc_w) AM_RANGE(0x3500000, 0x35000ff) AM_READWRITE(K033906_1_r, K033906_1_w) - AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK(6) + AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK("bank6") ADDRESS_MAP_END /*****************************************************************************/ @@ -1054,14 +1054,14 @@ static MACHINE_RESET( hornet ) UINT8 *usr5 = memory_region(machine, "user5"); if (usr3 != NULL) { - memory_configure_bank(machine, 1, 0, memory_region_length(machine, "user3") / 0x40000, usr3, 0x40000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, memory_region_length(machine, "user3") / 0x40000, usr3, 0x40000); + memory_set_bank(machine, "bank1", 0); } cputag_set_input_line(machine, "dsp", INPUT_LINE_RESET, ASSERT_LINE); if (usr5) - memory_set_bankptr(machine, 5, usr5); + memory_set_bankptr(machine, "bank5", usr5); } static NVRAM_HANDLER( hornet ) @@ -1133,14 +1133,14 @@ static MACHINE_RESET( hornet_2board ) if (usr3 != NULL) { - memory_configure_bank(machine, 1, 0, memory_region_length(machine, "user3") / 0x40000, usr3, 0x40000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, memory_region_length(machine, "user3") / 0x40000, usr3, 0x40000); + memory_set_bank(machine, "bank1", 0); } cputag_set_input_line(machine, "dsp", INPUT_LINE_RESET, ASSERT_LINE); cputag_set_input_line(machine, "dsp2", INPUT_LINE_RESET, ASSERT_LINE); if (usr5) - memory_set_bankptr(machine, 5, usr5); + memory_set_bankptr(machine, "bank5", usr5); } static MACHINE_DRIVER_START( hornet_2board ) @@ -1367,7 +1367,7 @@ static void sound_irq_callback(running_machine *machine, int irq) static DRIVER_INIT(hornet) { init_konami_cgboard(machine, 1, CGBOARD_TYPE_HORNET); - set_cgboard_texture_bank(machine, 0, 5, memory_region(machine, "user5")); + set_cgboard_texture_bank(machine, 0, "bank5", memory_region(machine, "user5")); K056800_init(machine, sound_irq_callback); K033906_init(machine); @@ -1380,8 +1380,8 @@ static DRIVER_INIT(hornet) static DRIVER_INIT(hornet_2board) { init_konami_cgboard(machine, 2, CGBOARD_TYPE_HORNET); - set_cgboard_texture_bank(machine, 0, 5, memory_region(machine, "user5")); - set_cgboard_texture_bank(machine, 1, 6, memory_region(machine, "user5")); + set_cgboard_texture_bank(machine, 0, "bank5", memory_region(machine, "user5")); + set_cgboard_texture_bank(machine, 1, "bank6", memory_region(machine, "user5")); K056800_init(machine, sound_irq_callback); K033906_init(machine); diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index 3c273852b5e..922ba7ec3c5 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -330,7 +330,7 @@ static WRITE8_HANDLER( master_bankswitch_w ) ROM = &ROM[0x4000 * bank]; - memory_set_bankptr(space->machine, 1,ROM); + memory_set_bankptr(space->machine, "bank1",ROM); } @@ -348,7 +348,7 @@ static WRITE8_HANDLER( hu_colorram_w ) static ADDRESS_MAP_START( master_memory, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_READWRITE( pandora_spriteram_r, pandora_spriteram_w ) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE(1) @@ -369,7 +369,7 @@ static WRITE8_HANDLER( slave_bankswitch_w ) port0_data=data; ROM = &ROM[0x4000 * bank]; - memory_set_bankptr(space->machine, 2,ROM); + memory_set_bankptr(space->machine, "bank2",ROM); } static WRITE8_HANDLER( hu_scrollx_w) @@ -384,7 +384,7 @@ static WRITE8_HANDLER( hu_scrolly_w) static ADDRESS_MAP_START( slave_memory, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(hu_videoram_w) AM_BASE_GENERIC(videoram) AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(hu_colorram_w) AM_BASE_GENERIC(colorram) AM_RANGE(0xd000, 0xd1ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_split2_w) AM_BASE_GENERIC(paletteram2) @@ -416,12 +416,12 @@ static WRITE8_HANDLER( sound_bankswitch_w ) ROM = &ROM[0x4000 * bank]; - memory_set_bankptr(space->machine, 3,ROM); + memory_set_bankptr(space->machine, "bank3",ROM); } static ADDRESS_MAP_START( sound_memory, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(3) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3") AM_RANGE(0xc000, 0xc7ff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 7265affd0f7..ed08eaccc8b 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -112,7 +112,7 @@ static WRITE8_HANDLER( inufuku_soundrombank_w ) { UINT8 *ROM = memory_region(space->machine, "audiocpu") + 0x10000; - memory_set_bankptr(space->machine, 1, ROM + (data & 0x03) * 0x8000); + memory_set_bankptr(space->machine, "bank1", ROM + (data & 0x03) * 0x8000); } @@ -207,7 +207,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( inufuku_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( inufuku_sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c index 5131164c3cd..fbc142f545e 100644 --- a/src/mame/drivers/irobot.c +++ b/src/mame/drivers/irobot.c @@ -121,7 +121,7 @@ static WRITE8_HANDLER( irobot_clearfirq_w ) static ADDRESS_MAP_START( irobot_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x0fff) AM_RAMBANK(2) + AM_RANGE(0x0800, 0x0fff) AM_RAMBANK("bank2") AM_RANGE(0x1000, 0x103f) AM_READ_PORT("IN0") AM_RANGE(0x1040, 0x1040) AM_READ_PORT("IN1") AM_RANGE(0x1080, 0x1080) AM_READ(irobot_status_r) @@ -139,7 +139,7 @@ static ADDRESS_MAP_START( irobot_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1b00, 0x1bff) AM_WRITE(irobot_control_w) AM_RANGE(0x1c00, 0x1fff) AM_RAM AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) AM_RANGE(0x2000, 0x3fff) AM_READWRITE(irobot_sharedmem_r, irobot_sharedmem_w) - AM_RANGE(0x4000, 0x5fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") AM_RANGE(0x6000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index 6d08268cc88..dbed5d24cc2 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -655,7 +655,7 @@ static READ32_HANDLER( gtclass_prot_result_r ) static WRITE8_HANDLER( sound_bank_w ) { - memory_set_bankptr(space->machine, 1, &memory_region(space->machine, "soundcpu")[0x10000 + data * 0x4000]); + memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "soundcpu")[0x10000 + data * 0x4000]); } @@ -1108,7 +1108,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1000) AM_WRITENOP /* noisy */ AM_RANGE(0x1400, 0x140f) AM_DEVREADWRITE("via6522_0", via_r, via_w) AM_RANGE(0x2000, 0x3fff) AM_RAM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -1121,7 +1121,7 @@ static ADDRESS_MAP_START( sound_020_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1400, 0x1400) AM_WRITE(firq_clear_w) AM_RANGE(0x1800, 0x1800) AM_READWRITE(sound_data_buffer_r, SMH_NOP) AM_RANGE(0x2000, 0x3fff) AM_RAM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index 526824fe880..c925f05cfb0 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -676,7 +676,7 @@ static MACHINE_RESET( itech8 ) /* make sure bank 0 is selected */ if (main_cpu_type == CPU_M6809 || main_cpu_type == CPU_HD6309) { - memory_set_bankptr(machine, 1, &memory_region(machine, "maincpu")[0x4000]); + memory_set_bankptr(machine, "bank1", &memory_region(machine, "maincpu")[0x4000]); device_reset(cputag_get_cpu(machine, "maincpu")); } @@ -730,7 +730,7 @@ static WRITE8_HANDLER( blitter_w ) { /* bit 0x20 on address 7 controls CPU banking */ if (offset / 2 == 7) - memory_set_bankptr(space->machine, 1, &memory_region(space->machine, "maincpu")[0x4000 + 0xc000 * ((data >> 5) & 1)]); + memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "maincpu")[0x4000 + 0xc000 * ((data >> 5) & 1)]); /* the rest is handled by the video hardware */ itech8_blitter_w(space, offset, data); @@ -740,7 +740,7 @@ static WRITE8_HANDLER( blitter_w ) static WRITE8_HANDLER( rimrockn_bank_w ) { /* banking is controlled here instead of by the blitter output */ - memory_set_bankptr(space->machine, 1, &memory_region(space->machine, "maincpu")[0x4000 + 0xc000 * (data & 3)]); + memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "maincpu")[0x4000 + 0xc000 * (data & 3)]); } @@ -904,7 +904,7 @@ static ADDRESS_MAP_START( tmslo_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x11c0, 0x11df) AM_READWRITE(itech8_blitter_r, blitter_w) AM_RANGE(0x11e0, 0x11ff) AM_WRITE(itech8_palette_w) AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE(&main_ram) AM_SIZE(&main_ram_size) - AM_RANGE(0x4000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END @@ -920,7 +920,7 @@ static ADDRESS_MAP_START( tmshi_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x01c0, 0x01df) AM_READWRITE(itech8_blitter_r, blitter_w) AM_RANGE(0x01e0, 0x01ff) AM_WRITE(itech8_palette_w) AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE(&main_ram) AM_SIZE(&main_ram_size) - AM_RANGE(0x4000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END @@ -936,7 +936,7 @@ static ADDRESS_MAP_START( gtg2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x01e0, 0x01e0) AM_WRITE(tms34061_latch_w) AM_RANGE(0x1000, 0x1fff) AM_READWRITE(itech8_tms34061_r, itech8_tms34061_w) AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE(&main_ram) AM_SIZE(&main_ram_size) - AM_RANGE(0x4000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index 4bb19fea494..838f07247f1 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -112,7 +112,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0060, 0x1fff) AM_RAM AM_SHARE(1) // M COMMON RAM,S COMMON RAM AM_RANGE(0x2000, 0x2fff) AM_READWRITE(jackal_voram_r, jackal_voram_w) // MAIN V O RAM,SUB V O RAM AM_RANGE(0x3000, 0x3fff) AM_READWRITE(jackal_spriteram_r, jackal_spriteram_w) // MAIN V O RAM,SUB V O RAM - AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c index 6e0cbeba4b0..ae7bc699415 100644 --- a/src/mame/drivers/jedi.c +++ b/src/mame/drivers/jedi.c @@ -161,7 +161,7 @@ static MACHINE_START( jedi ) timer_adjust_oneshot(state->interrupt_timer, video_screen_get_time_until_pos(machine->primary_screen, 32, 0), 32); /* configure the banks */ - memory_configure_bank(machine, 1, 0, 3, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 3, memory_region(machine, "maincpu") + 0x10000, 0x4000); /* set up save state */ state_save_register_global(machine, state->nvram_enabled); @@ -194,9 +194,9 @@ static MACHINE_RESET( jedi ) static WRITE8_HANDLER( rom_banksel_w ) { - if (data & 0x01) memory_set_bank(space->machine, 1, 0); - if (data & 0x02) memory_set_bank(space->machine, 1, 1); - if (data & 0x04) memory_set_bank(space->machine, 1, 2); + if (data & 0x01) memory_set_bank(space->machine, "bank1", 0); + if (data & 0x02) memory_set_bank(space->machine, "bank1", 1); + if (data & 0x04) memory_set_bank(space->machine, "bank1", 2); } @@ -296,7 +296,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3c00, 0x3c01) AM_MIRROR(0x00fe) AM_READWRITE(SMH_NOP, jedi_vscroll_w) AM_RANGE(0x3d00, 0x3d01) AM_MIRROR(0x00fe) AM_READWRITE(SMH_NOP, jedi_hscroll_w) AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x01ff) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(jedi_state, smoothing_table) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index 186614df64d..178dcdce0ee 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -99,7 +99,7 @@ static WRITE8_HANDLER( bank_select_w ) if (offset & 1) rom_bank |= mask; - memory_set_bank(space->machine, 1, rom_bank); + memory_set_bank(space->machine, "bank1", rom_bank); } static UINT8 mux_data; @@ -195,7 +195,7 @@ static WRITE8_HANDLER( unknown_w ) static ADDRESS_MAP_START( jongkyo_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_WRITE(videoram2_w) // wrong, this doesn't seem to be video ram on write.. AM_RANGE(0x4000, 0x6bff) AM_READ(SMH_ROM) // fixed rom - AM_RANGE(0x6c00, 0x6fff) AM_READ(SMH_BANK(1)) // banked (8 banks) + AM_RANGE(0x6c00, 0x6fff) AM_ROMBANK("bank1") // banked (8 banks) AM_RANGE(0x7000, 0x77ff) AM_RAM AM_RANGE(0x8000, 0xffff) AM_RAM AM_BASE_GENERIC(videoram) ADDRESS_MAP_END diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c index 119fbdf4e8d..2ff9673d794 100644 --- a/src/mame/drivers/jpmsys5.c +++ b/src/mame/drivers/jpmsys5.c @@ -213,7 +213,7 @@ static WRITE16_HANDLER( rombank_w ) { UINT8 *rom = memory_region(space->machine, "maincpu"); data &= 0x1f; - memory_set_bankptr(space->machine, 1, &rom[0x20000 + 0x20000 * data]); + memory_set_bankptr(space->machine, "bank1", &rom[0x20000 + 0x20000 * data]); } static READ16_HANDLER( coins_r ) @@ -281,7 +281,7 @@ static READ16_DEVICE_HANDLER( jpm_upd7759_r ) static ADDRESS_MAP_START( 68000_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x01fffe, 0x01ffff) AM_WRITE(rombank_w) - AM_RANGE(0x020000, 0x03ffff) AM_ROMBANK(1) + AM_RANGE(0x020000, 0x03ffff) AM_ROMBANK("bank1") AM_RANGE(0x040000, 0x043fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0x046000, 0x046001) AM_WRITENOP AM_RANGE(0x046020, 0x046021) AM_DEVREADWRITE8("acia6850_0", acia6850_stat_r, acia6850_ctrl_w, 0xff) @@ -575,7 +575,7 @@ static ACIA6850_INTERFACE( acia2_if ) static MACHINE_START( jpmsys5v ) { - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu")); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu")); touch_timer = timer_alloc(machine, touch_cb, NULL); } diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index e7c3d0f379c..2719abca7f9 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -92,7 +92,7 @@ static int i8039_status; static WRITE8_HANDLER( junofrst_bankselect_w ) { - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); } @@ -194,7 +194,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8060, 0x8060) AM_WRITE(junofrst_bankselect_w) AM_RANGE(0x8070, 0x8073) AM_WRITE(junofrst_blitter_w) AM_RANGE(0x8100, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9fff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -378,8 +378,8 @@ static DRIVER_INIT( junofrst ) { UINT8 *decrypted = konami1_decode(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x1000); - memory_configure_bank_decrypted(machine, 1, 0, 16, decrypted + 0x10000, 0x1000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x1000); + memory_configure_bank_decrypted(machine, "bank1", 0, 16, decrypted + 0x10000, 0x1000); } diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index a35d99c85e0..f19cd9be0eb 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -789,7 +789,7 @@ ADDRESS_MAP_END Shogun Warriors ***************************************************************************/ -static void kaneko16_common_oki_bank_w( running_machine* machine, int bankindex, const char* tag, int bank, size_t fixedsize, size_t bankedsize ) +static void kaneko16_common_oki_bank_w( running_machine* machine, const char *bankname, const char* tag, int bank, size_t fixedsize, size_t bankedsize ) { UINT32 bankaddr; UINT8* samples = memory_region(machine,tag); @@ -799,7 +799,7 @@ static void kaneko16_common_oki_bank_w( running_machine* machine, int bankindex, if (bankaddr <= (length-bankedsize)) { - memory_set_bankptr(machine, bankindex, samples + bankaddr); + memory_set_bankptr(machine, bankname, samples + bankaddr); } } @@ -807,8 +807,8 @@ static WRITE16_HANDLER( shogwarr_oki_bank_w ) { if (ACCESSING_BITS_0_7) { - kaneko16_common_oki_bank_w(space->machine, 10, "oki1", (data >> 4) & 0xf, 0x30000, 0x10000); - kaneko16_common_oki_bank_w(space->machine, 11, "oki2", (data & 0xf) , 0x00000, 0x40000); + kaneko16_common_oki_bank_w(space->machine, "bank10", "oki1", (data >> 4) & 0xf, 0x30000, 0x10000); + kaneko16_common_oki_bank_w(space->machine, "bank11", "oki2", (data & 0xf) , 0x00000, 0x40000); } } @@ -816,8 +816,8 @@ static WRITE16_HANDLER( brapboys_oki_bank_w ) { if (ACCESSING_BITS_0_7) { - kaneko16_common_oki_bank_w(space->machine, 10, "oki1", (data >> 4) & 0xf, 0x30000, 0x10000); - kaneko16_common_oki_bank_w(space->machine, 11, "oki2", (data & 0xf) , 0x20000, 0x20000); + kaneko16_common_oki_bank_w(space->machine, "bank10", "oki1", (data >> 4) & 0xf, 0x30000, 0x10000); + kaneko16_common_oki_bank_w(space->machine, "bank11", "oki2", (data & 0xf) , 0x20000, 0x20000); } } @@ -2152,11 +2152,11 @@ static const UINT8 shogwarr_default_eeprom[128] = { static ADDRESS_MAP_START( shogwarr_oki1_map, 0, 8 ) AM_RANGE(0x00000, 0x2ffff) AM_ROM - AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK(10) + AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("bank10") ADDRESS_MAP_END static ADDRESS_MAP_START( shogwarr_oki2_map, 0, 8 ) - AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK(11) + AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("bank11") ADDRESS_MAP_END static MACHINE_DRIVER_START( shogwarr ) @@ -2211,7 +2211,7 @@ static const UINT8 brapboys_default_eeprom[128] = { static ADDRESS_MAP_START( brapboys_oki2_map, 0, 8 ) AM_RANGE(0x00000, 0x1ffff) AM_ROM - AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK(11) + AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank11") ADDRESS_MAP_END static MACHINE_DRIVER_START( brapboys ) @@ -3821,8 +3821,8 @@ static DRIVER_INIT( calc3 ) static DRIVER_INIT( shogwarr ) { // default sample banks - kaneko16_common_oki_bank_w(machine, 10, "oki1", 0, 0x30000, 0x10000); - kaneko16_common_oki_bank_w(machine, 11, "oki2", 0, 0x00000, 0x40000); + kaneko16_common_oki_bank_w(machine, "bank10", "oki1", 0, 0x30000, 0x10000); + kaneko16_common_oki_bank_w(machine, "bank11", "oki2", 0, 0x00000, 0x40000); DRIVER_INIT_CALL(calc3); } @@ -3834,8 +3834,8 @@ static DRIVER_INIT( brapboys ) memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xe00000, 0xe00001, 0, 0, brapboys_oki_bank_w); // default sample banks - kaneko16_common_oki_bank_w(machine, 10, "oki1", 0, 0x30000, 0x10000); - kaneko16_common_oki_bank_w(machine, 11, "oki2", 0, 0x20000, 0x20000); + kaneko16_common_oki_bank_w(machine, "bank10", "oki1", 0, 0x30000, 0x10000); + kaneko16_common_oki_bank_w(machine, "bank11", "oki2", 0, 0x20000, 0x20000); DRIVER_INIT_CALL(calc3); } diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c index 4fe603db31e..6cabbf94c99 100644 --- a/src/mame/drivers/kangaroo.c +++ b/src/mame/drivers/kangaroo.c @@ -179,7 +179,7 @@ static UINT8 kangaroo_clock; static MACHINE_START( kangaroo ) { - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "gfx1"), 0x2000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "gfx1"), 0x2000); state_save_register_global(machine, kangaroo_clock); } @@ -254,7 +254,7 @@ static WRITE8_HANDLER( kangaroo_coin_counter_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_WRITE(kangaroo_videoram_w) - AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_RANGE(0xe400, 0xe400) AM_MIRROR(0x03ff) AM_READ_PORT("DSW0") AM_RANGE(0xe800, 0xe80a) AM_MIRROR(0x03f0) AM_WRITE(kangaroo_video_control_w) AM_BASE(&kangaroo_video_control) diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c index 83149711631..93e436978e9 100644 --- a/src/mame/drivers/ksayakyu.c +++ b/src/mame/drivers/ksayakyu.c @@ -87,7 +87,7 @@ static WRITE8_HANDLER( bank_select_w ) xxxxxxx - unused ? */ - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "maincpu") + ((data&1) * 0x4000) + 0x10000 ); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + ((data&1) * 0x4000) + 0x10000 ); } static WRITE8_HANDLER( latch_w ) @@ -109,7 +109,7 @@ static WRITE8_HANDLER(tomaincpu_w) static ADDRESS_MAP_START( maincpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x9fff) AM_ROM AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_RANGE(0xa800, 0xa800) AM_READ_PORT("P1") diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index 9cc877532d3..11de6aa0db3 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -1212,12 +1212,12 @@ static DRIVER_INIT( gyrodine ) static DRIVER_INIT( srdmissn ) { /* shared RAM is mapped at 0xe000 as well */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xe000, 0xe7ff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); - memory_set_bankptr(machine, 1, shared_ram); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xe000, 0xe7ff, 0, 0, "bank1"); + memory_set_bankptr(machine, "bank1", shared_ram); /* extra RAM on sub CPU */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x8800, 0x8fff, 0, 0, (read8_space_func)SMH_BANK(2), (write8_space_func)SMH_BANK(2)); - memory_set_bankptr(machine, 2, auto_alloc_array(machine, UINT8, 0x800)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x8800, 0x8fff, 0, 0, "bank2"); + memory_set_bankptr(machine, "bank2", auto_alloc_array(machine, UINT8, 0x800)); } diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c index 184c6c0d500..b0818b53aee 100644 --- a/src/mame/drivers/labyrunr.c +++ b/src/mame/drivers/labyrunr.c @@ -46,7 +46,7 @@ if (data & 0xe0) popmessage("bankswitch %02x",data); /* bits 0-2 = bank number */ bankaddress = 0x10000 + (data & 0x07) * 0x4000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); /* bits 3 and 4 are coin counters */ coin_counter_w(space->machine, 0,data & 0x08); @@ -71,7 +71,7 @@ static ADDRESS_MAP_START( labyrunr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2fff) AM_RAM AM_BASE_GENERIC(spriteram) AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(labyrunr_vram1_w) AM_BASE(&labyrunr_videoram1) AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(labyrunr_vram2_w) AM_BASE(&labyrunr_videoram2) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c index cd2a9001e95..9820ed00135 100644 --- a/src/mame/drivers/lastduel.c +++ b/src/mame/drivers/lastduel.c @@ -194,12 +194,12 @@ static WRITE8_HANDLER( mg_bankswitch_w ) UINT8 *RAM = memory_region(space->machine, "audiocpu"); bankaddress = 0x10000 + (data & 0x01) * 0x4000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } static ADDRESS_MAP_START( madgear_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xcfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xcfff) AM_ROMBANK("bank1") AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym1", ym2203_r,ym2203_w) AM_RANGE(0xf002, 0xf003) AM_DEVREADWRITE("ym2", ym2203_r,ym2203_w) diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c index 685fc5924b0..5990d723982 100644 --- a/src/mame/drivers/leland.c +++ b/src/mame/drivers/leland.c @@ -63,8 +63,8 @@ static ADDRESS_MAP_START( master_map_program, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x9fff) AM_ROMBANK(1) - AM_RANGE(0xa000, 0xdfff) AM_ROMBANK(2) + AM_RANGE(0x2000, 0x9fff) AM_ROMBANK("bank1") + AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank2") AM_RANGE(0xa000, 0xdfff) AM_WRITE(leland_battery_ram_w) AM_RANGE(0xe000, 0xefff) AM_RAM AM_RANGE(0xf000, 0xf3ff) AM_READWRITE(leland_gated_paletteram_r, leland_gated_paletteram_w) AM_BASE_GENERIC(paletteram) @@ -90,7 +90,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_small_map_program, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0xdfff) AM_ROMBANK(3) + AM_RANGE(0x2000, 0xdfff) AM_ROMBANK("bank3") AM_RANGE(0xe000, 0xefff) AM_RAM AM_RANGE(0xf800, 0xf801) AM_WRITE(leland_slave_video_addr_w) AM_RANGE(0xf802, 0xf802) AM_READ(leland_raster_r) @@ -100,7 +100,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_large_map_program, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(3) + AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank3") AM_RANGE(0xc000, 0xc000) AM_WRITE(leland_slave_large_banksw_w) AM_RANGE(0xe000, 0xefff) AM_RAM AM_RANGE(0xf800, 0xf801) AM_WRITE(leland_slave_video_addr_w) @@ -1922,9 +1922,9 @@ static DRIVER_INIT( cerberus ) /* master CPU bankswitching */ leland_update_master_bank = cerberus_bankswitch; - memory_set_bankptr(machine, 1, memory_region(machine, "master") + 0x2000); - memory_set_bankptr(machine, 2, memory_region(machine, "master") + 0xa000); - memory_set_bankptr(machine, 3, memory_region(machine, "slave") + 0x2000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "master") + 0x2000); + memory_set_bankptr(machine, "bank2", memory_region(machine, "master") + 0xa000); + memory_set_bankptr(machine, "bank3", memory_region(machine, "slave") + 0x2000); /* set up the master CPU I/O ports */ init_master_ports(machine, 0x40, 0x80); diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index f75897aed7e..683d25840ef 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -276,7 +276,7 @@ static WRITE8_HANDLER( le_bankswitch_w ) { UINT8 *prgrom = (UINT8 *)memory_region(space->machine, "maincpu")+0x10000; - memory_set_bankptr(space->machine, 1, &prgrom[data * 0x2000]); + memory_set_bankptr(space->machine, "bank1", &prgrom[data * 0x2000]); } static READ8_HANDLER( le_4800_r ) @@ -481,7 +481,7 @@ static READ8_HANDLER(gunsaux_r) } static ADDRESS_MAP_START( le_main, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_BANK(1)) AM_WRITE(SMH_ROM) + AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1") AM_RANGE(0x2000, 0x3fff) AM_RAM // work RAM AM_RANGE(0x4000, 0x403f) AM_WRITE(K056832_w) AM_RANGE(0x4040, 0x404f) AM_WRITE(K056832_b_w) @@ -497,7 +497,7 @@ static ADDRESS_MAP_START( le_main, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x40dc, 0x40dc) AM_WRITE(le_bankswitch_w) AM_RANGE(0x47fe, 0x47ff) AM_WRITE(le_bgcolor_w) // BG color AM_RANGE(0x4800, 0x7fff) AM_READWRITE(le_4800_r, le_4800_w) AM_BASE_GENERIC(paletteram) // bankswitched: RAM and registers - AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK(2)) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank2") ADDRESS_MAP_END static ADDRESS_MAP_START( le_sound, ADDRESS_SPACE_PROGRAM, 8 ) @@ -585,8 +585,8 @@ static MACHINE_RESET( lethalen ) { UINT8 *prgrom = (UINT8 *)memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1, &prgrom[0x10000]); - memory_set_bankptr(machine, 2, &prgrom[0x48000]); + memory_set_bankptr(machine, "bank1", &prgrom[0x10000]); + memory_set_bankptr(machine, "bank2", &prgrom[0x48000]); /* force reset again to read proper reset vector */ device_reset(cputag_get_cpu(machine, "maincpu")); } diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index 286acd00c9e..2089a2a3ad5 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -85,7 +85,7 @@ static WRITE8_HANDLER( deco16_bank_w ) if (deco16_bank) memory_install_read8_handler(cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0x800f, 0, 0, deco16_io_r); else - memory_install_read8_handler(cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0x800f, 0, 0, (read8_space_func)SMH_BANK(1)); + memory_install_read_bank_handler(cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0x800f, 0, 0, "bank1"); } static UINT8 gfx_rom_readback; @@ -250,7 +250,7 @@ static ADDRESS_MAP_START( prosport_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3400, 0x37ff) AM_RAM_WRITE(liberate_videoram_w) AM_BASE_GENERIC(videoram) AM_RANGE(0x3800, 0x3fff) AM_RAM AM_BASE_GENERIC(spriteram) AM_RANGE(0x8000, 0x800f) AM_WRITE(prosport_io_w) - AM_RANGE(0x8000, 0x800f) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x800f) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -263,7 +263,7 @@ static ADDRESS_MAP_START( liberate_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4800, 0x4fff) AM_WRITEONLY AM_BASE_GENERIC(spriteram) AM_RANGE(0x6200, 0x67ff) AM_RAM AM_BASE(&scratchram) AM_RANGE(0x8000, 0x800f) AM_WRITE(deco16_io_w) - AM_RANGE(0x8000, 0x800f) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x800f) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -1373,7 +1373,7 @@ static DRIVER_INIT( liberate ) decrypted[A] = (decrypted[A] & 0x7d) | ((decrypted[A] & 0x02) << 6) | ((decrypted[A] & 0x80) >> 6); } - memory_configure_bank_decrypted(machine, 1, 0, 1, decrypted + 0x8000, 0x10); + memory_configure_bank_decrypted(machine, "bank1", 0, 1, decrypted + 0x8000, 0x10); sound_cpu_decrypt(machine); } diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index a854a067266..9372d67a3e7 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -158,7 +158,7 @@ static WRITE8_HANDLER( lsasquad_bankswitch_w ) UINT8 *ROM = memory_region(space->machine, "maincpu"); /* bits 0-2 select ROM bank */ - memory_set_bankptr(space->machine, 1,&ROM[0x10000 + 0x2000 * (data & 7)]); + memory_set_bankptr(space->machine, "bank1",&ROM[0x10000 + 0x2000 * (data & 7)]); /* bit 3 is zeroed on startup, maybe reset sound CPU */ @@ -170,7 +170,7 @@ static WRITE8_HANDLER( lsasquad_bankswitch_w ) static ADDRESS_MAP_START( lsasquad_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xbfff) AM_RAM /* SRAM */ AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) /* SCREEN RAM */ AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_BASE(&lsasquad_scrollram) /* SCROLL RAM */ @@ -340,7 +340,7 @@ INPUT_PORTS_END static ADDRESS_MAP_START( daikaiju_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xbfff) AM_RAM /* SRAM */ AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) /* SCREEN RAM */ AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_BASE(&lsasquad_scrollram) /* SCROLL RAM */ diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c index f7166c9a46a..d82c7559244 100644 --- a/src/mame/drivers/luckgrln.c +++ b/src/mame/drivers/luckgrln.c @@ -79,7 +79,7 @@ static ADDRESS_MAP_START( mainmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00000, 0x03fff) AM_ROM - AM_RANGE(0x10000, 0x1ffff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x10000, 0x1ffff) AM_ROMBANK("bank1") AM_RANGE(0x0d800, 0x0dfff) AM_RAM AM_RANGE(0x0f000, 0x0ffff) AM_RAM AM_RANGE(0xf0000, 0xfffff) AM_RAM @@ -171,7 +171,7 @@ static DRIVER_INIT( luckgrln ) #endif // ?? - memory_set_bankptr(machine, 1,&rom[0x010000]); + memory_set_bankptr(machine, "bank1",&rom[0x010000]); } ROM_START( luckgrln ) diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c index de30f78e80e..d515fd2ac1d 100644 --- a/src/mame/drivers/lwings.c +++ b/src/mame/drivers/lwings.c @@ -85,7 +85,7 @@ static WRITE8_HANDLER( lwings_bankswitch_w ) /* bits 1 and 2 select ROM bank */ RAM = memory_region(space->machine, "maincpu"); bank = (data & 0x06) >> 1; - memory_set_bankptr(space->machine, 1,&RAM[0x10000 + bank*0x4000]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x10000 + bank*0x4000]); /* bit 3 enables NMI */ interrupt_enable_w(space,0,data & 0x08); @@ -269,7 +269,7 @@ static WRITE8_DEVICE_HANDLER( msm5205_w ) static ADDRESS_MAP_START( avengers_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xddff) AM_RAM AM_RANGE(0xde00, 0xdf7f) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xdf80, 0xdfff) AM_RAM @@ -293,7 +293,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lwings_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xddff) AM_RAM AM_RANGE(0xde00, 0xdfff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(lwings_fgvideoram_w) AM_BASE(&lwings_fgvideoram) @@ -314,7 +314,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( trojan_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xddff) AM_RAM AM_RANGE(0xde00, 0xdf7f) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xdf80, 0xdfff) AM_RAM diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c index 641de554726..fa35d9a2155 100644 --- a/src/mame/drivers/m107.c +++ b/src/mame/drivers/m107.c @@ -51,7 +51,7 @@ static WRITE16_HANDLER( bankswitch_w ) if (ACCESSING_BITS_0_7) { UINT8 *RAM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1,&RAM[0x100000 + ((data&0x7)*0x10000)]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x100000 + ((data&0x7)*0x10000)]); } } @@ -163,7 +163,7 @@ static WRITE16_HANDLER( m107_sound_status_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x9ffff) AM_ROM - AM_RANGE(0xa0000, 0xbffff) AM_ROMBANK(1) + AM_RANGE(0xa0000, 0xbffff) AM_ROMBANK("bank1") AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m107_vram_w) AM_BASE(&m107_vram_data) AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */ AM_RANGE(0xf8000, 0xf8fff) AM_RAM AM_BASE_GENERIC(spriteram) @@ -630,7 +630,7 @@ static DRIVER_INIT( firebarr ) UINT8 *RAM = memory_region(machine, "maincpu"); memcpy(RAM + 0xffff0, RAM + 0x7fff0, 0x10); /* Start vector */ - memory_set_bankptr(machine, 1, &RAM[0xa0000]); /* Initial bank */ + memory_set_bankptr(machine, "bank1", &RAM[0xa0000]); /* Initial bank */ RAM = memory_region(machine, "soundcpu"); memcpy(RAM + 0xffff0,RAM + 0x1fff0, 0x10); /* Sound cpu Start vector */ @@ -644,7 +644,7 @@ static DRIVER_INIT( dsoccr94 ) UINT8 *RAM = memory_region(machine, "maincpu"); memcpy(RAM + 0xffff0, RAM + 0x7fff0, 0x10); /* Start vector */ - memory_set_bankptr(machine, 1, &RAM[0xa0000]); /* Initial bank */ + memory_set_bankptr(machine, "bank1", &RAM[0xa0000]); /* Initial bank */ RAM = memory_region(machine, "soundcpu"); memcpy(RAM + 0xffff0, RAM + 0x1fff0, 0x10); /* Sound cpu Start vector */ @@ -658,7 +658,7 @@ static DRIVER_INIT( wpksoc ) UINT8 *RAM = memory_region(machine, "maincpu"); memcpy(RAM + 0xffff0, RAM + 0x7fff0, 0x10); /* Start vector */ - memory_set_bankptr(machine, 1, &RAM[0xa0000]); /* Initial bank */ + memory_set_bankptr(machine, "bank1", &RAM[0xa0000]); /* Initial bank */ RAM = memory_region(machine, "soundcpu"); memcpy(RAM + 0xffff0, RAM + 0x1fff0, 0x10); /* Sound cpu Start vector */ diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c index f61fb2d1b0c..021280890b5 100644 --- a/src/mame/drivers/m62.c +++ b/src/mame/drivers/m62.c @@ -90,7 +90,7 @@ static READ8_HANDLER( ldrun2_bankswitch_r ) /* swap to bank #1 on second read */ if (state->ldrun2_bankswap == 0) - memory_set_bank(space->machine, 1, 1); + memory_set_bank(space->machine, "bank1", 1); } return 0; } @@ -115,7 +115,7 @@ static WRITE8_HANDLER( ldrun2_bankswitch_w ) logerror("unknown bank select %02x\n",data); return; } - memory_set_bank(space->machine, 1, banks[data - 1]); + memory_set_bank(space->machine, "bank1", banks[data - 1]); } else { @@ -144,30 +144,30 @@ static READ8_HANDLER( ldrun3_prot_7_r ) static WRITE8_HANDLER( ldrun4_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x01); + memory_set_bank(space->machine, "bank1", data & 0x01); } static WRITE8_HANDLER( kidniki_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); } #define battroad_bankswitch_w kidniki_bankswitch_w static WRITE8_HANDLER( spelunkr_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x03); + memory_set_bank(space->machine, "bank1", data & 0x03); } static WRITE8_HANDLER( spelunk2_bankswitch_w ) { - memory_set_bank(space->machine, 1, (data & 0xc0) >> 6); - memory_set_bank(space->machine, 2, (data & 0x3c) >> 2); + memory_set_bank(space->machine, "bank1", (data & 0xc0) >> 6); + memory_set_bank(space->machine, "bank2", (data & 0x3c) >> 2); } static WRITE8_HANDLER( youjyudn_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x01); + memory_set_bank(space->machine, "bank1", data & 0x01); } @@ -193,7 +193,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( battroad_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(irem_z80_state, spriteram, spriteram_size) AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(m62_textram_w) AM_BASE_MEMBER(irem_z80_state, m62_textram) AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE_MEMBER(irem_z80_state, m62_tileram) @@ -222,7 +222,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(irem_z80_state, spriteram, spriteram_size) AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE_MEMBER(irem_z80_state, m62_tileram) AM_RANGE(0xe000, 0xefff) AM_RAM @@ -262,7 +262,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun4_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(irem_z80_state, spriteram, spriteram_size) AM_RANGE(0xc800, 0xc800) AM_WRITE(ldrun4_bankswitch_w) AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE_MEMBER(irem_z80_state, m62_tileram) @@ -290,7 +290,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kidniki_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(m62_tileram_w) AM_BASE_MEMBER(irem_z80_state, m62_tileram) AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(irem_z80_state, spriteram, spriteram_size) AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_textram_w) AM_BASE_MEMBER(irem_z80_state, m62_textram) @@ -314,7 +314,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spelunkr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE_MEMBER(irem_z80_state, m62_tileram) AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(irem_z80_state, spriteram, spriteram_size) AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(m62_textram_w) AM_BASE_MEMBER(irem_z80_state, m62_textram) @@ -329,8 +329,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spelunk2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8fff) AM_ROMBANK(1) - AM_RANGE(0x9000, 0x9fff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0x8fff) AM_ROMBANK("bank1") + AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("bank2") AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE_MEMBER(irem_z80_state, m62_tileram) AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(irem_z80_state, spriteram, spriteram_size) AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(m62_textram_w) AM_BASE_MEMBER(irem_z80_state, m62_textram) @@ -343,7 +343,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( youjyudn_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(irem_z80_state, spriteram, spriteram_size) AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(m62_textram_w) AM_BASE_MEMBER(irem_z80_state, m62_textram) AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(m62_tileram_w) AM_BASE_MEMBER(irem_z80_state, m62_tileram) @@ -2164,19 +2164,19 @@ ROM_END static DRIVER_INIT( battroad ) { /* configure memory banks */ - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x2000); } static DRIVER_INIT( ldrun2 ) { /* configure memory banks */ - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x2000); } static DRIVER_INIT( ldrun4 ) { /* configure memory banks */ - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); } static DRIVER_INIT( kidniki ) @@ -2188,26 +2188,26 @@ static DRIVER_INIT( kidniki ) memcpy(ROM + 0x08000, ROM + 0x10000, 0x2000); /* configure memory banks */ - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x2000); } static DRIVER_INIT( spelunkr ) { /* configure memory banks */ - memory_configure_bank(machine, 1, 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x2000); } static DRIVER_INIT( spelunk2 ) { /* configure memory banks */ - memory_configure_bank(machine, 1, 0, 4, memory_region(machine, "maincpu") + 0x20000, 0x1000); - memory_configure_bank(machine, 2, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x1000); + memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x20000, 0x1000); + memory_configure_bank(machine, "bank2", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x1000); } static DRIVER_INIT( youjyudn ) { /* configure memory banks */ - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); } GAME( 1984, kungfum, 0, kungfum, kungfum, 0, ROT0, "Irem", "Kung-Fu Master", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index 510fbaf9741..9c3486accfd 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -328,9 +328,9 @@ INLINE DRIVER_INIT( m72_8751 ) const device_config *dac = devtag_get_device(machine, "dac"); protection_ram = auto_alloc_array(machine, UINT16, 0x10000/2); - memory_install_read16_handler(program, 0xb0000, 0xbffff, 0, 0, (read16_space_func)SMH_BANK(1)); + memory_install_read_bank_handler(program, 0xb0000, 0xbffff, 0, 0, "bank1"); memory_install_write16_handler(program, 0xb0000, 0xb0fff, 0, 0, m72_main_mcu_w); - memory_set_bankptr(machine, 1, protection_ram); + memory_set_bankptr(machine, "bank1", protection_ram); //memory_install_write16_handler(io, 0xc0, 0xc1, 0, 0, loht_sample_trigger_w); memory_install_write16_handler(io, 0xc0, 0xc1, 0, 0, m72_main_mcu_sound_w); @@ -701,10 +701,10 @@ static void install_protection_handler(running_machine *machine, const UINT8 *co protection_ram = auto_alloc_array(machine, UINT16, 0x1000/2); protection_code = code; protection_crc = crc; - memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xb0000, 0xb0fff, 0, 0, (read16_space_func)SMH_BANK(1)); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xb0000, 0xb0fff, 0, 0, "bank1"); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xb0ffa, 0xb0ffb, 0, 0, protection_r); memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xb0000, 0xb0fff, 0, 0, protection_w); - memory_set_bankptr(machine, 1, protection_ram); + memory_set_bankptr(machine, "bank1", protection_ram); } static DRIVER_INIT( bchopper ) diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c index bc1e5ac0884..712b2558531 100644 --- a/src/mame/drivers/m90.c +++ b/src/mame/drivers/m90.c @@ -56,7 +56,7 @@ static void set_m90_bank(running_machine *machine) if (!rom) popmessage("bankswitch with no banked ROM!"); else - memory_set_bankptr(machine, 1,rom + bankaddress); + memory_set_bankptr(machine, "bank1",rom + bankaddress); } /***************************************************************************/ @@ -92,7 +92,7 @@ static WRITE16_HANDLER( unknown_w ) static ADDRESS_MAP_START( m90_main_cpu_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x7ffff) AM_ROM - AM_RANGE(0x80000, 0x8ffff) AM_ROMBANK(1) /* Quiz F1 only */ + AM_RANGE(0x80000, 0x8ffff) AM_ROMBANK("bank1") /* Quiz F1 only */ AM_RANGE(0xa0000, 0xa3fff) AM_RAM AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m90_video_w) AM_BASE(&m90_video_data) AM_RANGE(0xe0000, 0xe03ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram) diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index e7c52a84adf..07874e9995c 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -222,7 +222,7 @@ static TIMER_CALLBACK( m92_scanline_interrupt ); static void set_m92_bank(running_machine *machine) { UINT8 *RAM = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1,&RAM[bankaddress]); + memory_set_bankptr(machine, "bank1",&RAM[bankaddress]); } static STATE_POSTLOAD( m92_postload ) @@ -387,8 +387,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( m92_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x9ffff) AM_ROM - AM_RANGE(0xa0000, 0xbffff) AM_ROMBANK(1) - AM_RANGE(0xc0000, 0xcffff) AM_ROMBANK(2) /* Mirror of rom: Used by In The Hunt as protection */ + AM_RANGE(0xa0000, 0xbffff) AM_ROMBANK("bank1") + AM_RANGE(0xc0000, 0xcffff) AM_ROMBANK("bank2") /* Mirror of rom: Used by In The Hunt as protection */ AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m92_vram_w) AM_BASE(&m92_vram_data) AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */ AM_RANGE(0xf8000, 0xf87ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) @@ -2066,7 +2066,7 @@ static void init_m92(running_machine *machine, int hasbanks) /* Mirror used by In The Hunt for protection */ memcpy(RAM + 0xc0000, RAM + 0x00000, 0x10000); - memory_set_bankptr(machine, 2, &RAM[0xc0000]); + memory_set_bankptr(machine, "bank2", &RAM[0xc0000]); } RAM = memory_region(machine, "soundcpu"); diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index 4f01fb59318..6a74e4159ba 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -69,7 +69,7 @@ static MACHINE_RESET(macs); static ADDRESS_MAP_START( macs_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w) AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w) AM_RANGE(0xe000, 0xe7ff) AM_RAM /* work ram ? */ @@ -77,13 +77,13 @@ static ADDRESS_MAP_START( macs_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("stsnd", st0016_snd_r, st0016_snd_w) AM_RANGE(0xea00, 0xebff) AM_READ(st0016_palette_ram_r) AM_WRITE(st0016_palette_ram_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) - AM_RANGE(0xf000, 0xf7ff) AM_RAMBANK(3) /* common /backup ram ?*/ - AM_RANGE(0xf800, 0xffff) AM_RAMBANK(2) /* common /backup ram ?*/ + AM_RANGE(0xf000, 0xf7ff) AM_RAMBANK("bank3") /* common /backup ram ?*/ + AM_RANGE(0xf800, 0xffff) AM_RAMBANK("bank2") /* common /backup ram ?*/ ADDRESS_MAP_END static WRITE8_HANDLER(rambank_w) { - memory_set_bankptr(space->machine, 3, &macs_ram1[0x10000+(data&1)*0x800] ); + memory_set_bankptr(space->machine, "bank3", &macs_ram1[0x10000+(data&1)*0x800] ); } static READ8_HANDLER( macs_input_r ) @@ -122,7 +122,7 @@ static WRITE8_HANDLER( macs_output_w ) { switch(offset) { - case 0: memory_set_bankptr(space->machine, 2, &macs_ram1[((data&0x20)>>5)*0x1000+0x800] );break; + case 0: memory_set_bankptr(space->machine, "bank2", &macs_ram1[((data&0x20)>>5)*0x1000+0x800] );break; case 2: macs_mux_data = data; break; } @@ -636,9 +636,9 @@ static MACHINE_RESET(macs) macs_ram1[0x0ff9]=0x07; macs_ram1[0x1ff9]=0x07; - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x10000 ); - memory_set_bankptr(machine, 2, macs_ram1+0x800); - memory_set_bankptr(machine, 3, macs_ram1+0x10000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x10000 ); + memory_set_bankptr(machine, "bank2", macs_ram1+0x800); + memory_set_bankptr(machine, "bank3", macs_ram1+0x10000); } static DRIVER_INIT(macs) diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index 295cdbbdd3b..52d49193ce4 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -73,7 +73,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r,okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r,okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index 7d7bc5ff7a2..a4de976c1c9 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -65,7 +65,7 @@ static WRITE8_HANDLER( mainevt_bankswitch_w ) /* bit 0-1 ROM bank select */ bankaddress = 0x10000 + (data & 0x03) * 0x2000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); /* TODO: bit 5 = select work RAM or palette? */ // palette_selected = data & 0x20; @@ -160,7 +160,7 @@ static ADDRESS_MAP_START( mainevt_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x5dff) AM_RAM AM_RANGE(0x5e00, 0x5fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -184,7 +184,7 @@ static ADDRESS_MAP_START( devstors_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x5dff) AM_RAM AM_RANGE(0x5e00, 0x5fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index eac18faaa22..48f0ac72047 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -32,7 +32,7 @@ static WRITE8_HANDLER( bank_sel_w ) { UINT8 *BANKROM = memory_region(space->machine, "maincpu"); int bank = ((data & 0x80)) >> 7 | ((data & 0x40) >> 5); - memory_set_bankptr(space->machine, 1, &BANKROM[0x10000+bank*0x4000]); + memory_set_bankptr(space->machine, "bank1", &BANKROM[0x10000+bank*0x4000]); int_enable = data & 1; @@ -76,7 +76,7 @@ static READ8_HANDLER( key_matrix_r ) static ADDRESS_MAP_START( mayumi_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0xe000, 0xf7ff) AM_RAM_WRITE(mayumi_videoram_w) AM_BASE(&mayumi_videoram) ADDRESS_MAP_END diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index 5a8b19ec2d3..ad98ed63ea9 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -312,14 +312,14 @@ static WRITE8_HANDLER(cfb_rom_bank_sel_w) /* mazer blazer */ { gfx_rom_bank = data; - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "sub2") + (gfx_rom_bank * 0x2000) + 0x10000 ); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "sub2") + (gfx_rom_bank * 0x2000) + 0x10000 ); } static WRITE8_HANDLER(cfb_rom_bank_sel_w_gg) /* great guns */ { gfx_rom_bank = data>>1; - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "sub2") + (gfx_rom_bank * 0x2000) + 0x10000 ); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "sub2") + (gfx_rom_bank * 0x2000) + 0x10000 ); } @@ -969,7 +969,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mazerbla_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x37ff) AM_ROM AM_RANGE(0x3800, 0x3fff) AM_RAM AM_SHARE(1) - AM_RANGE(0x4000, 0x5fff) AM_ROMBANK(1) /* GFX roms */ + AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") /* GFX roms */ AM_RANGE(0x4000, 0x4003) AM_WRITE(VCU_video_reg_w) AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE(&cfb_ram) /* Color Frame Buffer PCB, a.k.a. RAM for VCU commands and parameters */ AM_RANGE(0xa000, 0xa7ff) AM_READ(VCU_set_cmd_param_r) /* VCU command and parameters LOAD */ diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index 3d3353fbcff..afd3d9e00cc 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -211,13 +211,13 @@ static WRITE8_HANDLER ( mcatadv_sound_bw_w ) { UINT8 *rom = memory_region(space->machine, "soundcpu") + 0x10000; - memory_set_bankptr(space->machine, 1,rom + data * 0x4000); + memory_set_bankptr(space->machine, "bank1",rom + data * 0x4000); } static ADDRESS_MAP_START( mcatadv_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM - AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(1) // ROM + AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank1") // ROM AM_RANGE(0xc000, 0xdfff) AM_RAM // RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r,ym2610_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(mcatadv_sound_bw_w) @@ -231,7 +231,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( nost_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // ROM AM_RANGE(0xc000, 0xdfff) AM_RAM // RAM ADDRESS_MAP_END @@ -480,7 +480,7 @@ static DRIVER_INIT( mcatadv ) { UINT8 *z80rom = memory_region(machine, "soundcpu") + 0x10000; - memory_set_bankptr(machine, 1, z80rom + 0x4000); + memory_set_bankptr(machine, "bank1", z80rom + 0x4000); } diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index 4e99118e18c..a69bbe848d4 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -2302,7 +2302,7 @@ static READ8_HANDLER( megadriv_z80_unmapped_read ) } static ADDRESS_MAP_START( megadriv_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_RAMBANK(1) AM_MIRROR(0x2000) // RAM can be accessed by the 68k + AM_RANGE(0x0000, 0x1fff) AM_RAMBANK("bank1") AM_MIRROR(0x2000) // RAM can be accessed by the 68k AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("ymsnd", ym2612_r,ym2612_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(megadriv_z80_z80_bank_w) @@ -2533,14 +2533,14 @@ static WRITE16_HANDLER( _32x_68k_a15100_w ) if (data & 0x01) { _32x_adapter_enabled = 1; - memory_install_readwrite16_handler(space, 0x0880000, 0x08fffff, 0, 0, (read16_space_func)SMH_BANK(11), (write16_space_func)SMH_BANK(11)); // 'fixed' 512kb rom bank - memory_set_bankptr(space->machine, 11, memory_region(space->machine, "gamecart") ); + memory_install_readwrite_bank_handler(space, 0x0880000, 0x08fffff, 0, 0, "bank11"); // 'fixed' 512kb rom bank + memory_set_bankptr(space->machine, "bank11", memory_region(space->machine, "gamecart") ); - memory_install_readwrite16_handler(space, 0x0900000, 0x09fffff, 0, 0, (read16_space_func)SMH_BANK(12), (write16_space_func)SMH_BANK(12)); // 'bankable' 1024kb rom bank - memory_set_bankptr(space->machine, 12, memory_region(space->machine, "gamecart") ); + memory_install_readwrite_bank_handler(space, 0x0900000, 0x09fffff, 0, 0, "bank12"); // 'bankable' 1024kb rom bank + memory_set_bankptr(space->machine, "bank12", memory_region(space->machine, "gamecart") ); - memory_install_readwrite16_handler(space, 0x0000000, 0x03fffff, 0, 0, (read16_space_func)SMH_BANK(10), (write16_space_func)SMH_BANK(10)); - memory_set_bankptr(space->machine, 10, memory_region(space->machine, "32x_68k_bios") ); + memory_install_readwrite_bank_handler(space, 0x0000000, 0x03fffff, 0, 0, "bank10"); + memory_set_bankptr(space->machine, "bank10", memory_region(space->machine, "32x_68k_bios") ); memory_install_readwrite16_handler(space, 0x0a15180, 0x0a15181, 0, 0, _32x_68k_a15180_r, _32x_68k_a15180_w); // mode control regs memory_install_readwrite16_handler(space, 0x0a15182, 0x0a15183, 0, 0, _32x_68k_a15182_r, _32x_68k_a15182_w); // screen shift @@ -2562,8 +2562,8 @@ static WRITE16_HANDLER( _32x_68k_a15100_w ) { _32x_adapter_enabled = 0; - memory_install_readwrite16_handler(space, 0x0000000, 0x03fffff, 0, 0, (read16_space_func)SMH_BANK(10), (write16_space_func)SMH_BANK(10)); - memory_set_bankptr(space->machine, 10, memory_region(space->machine, "gamecart") ); + memory_install_readwrite_bank_handler(space, 0x0000000, 0x03fffff, 0, 0, "bank10"); + memory_set_bankptr(space->machine, "bank10", memory_region(space->machine, "gamecart") ); } @@ -2630,7 +2630,7 @@ static WRITE16_HANDLER( _32x_68k_a15104_w ) _32x_68k_a15104_reg = (_32x_68k_a15104_reg & 0x00ff) | (data & 0xff00); } - memory_set_bankptr(space->machine, 12, memory_region(space->machine, "gamecart")+((_32x_68k_a15104_reg&0x3)*0x100000) ); + memory_set_bankptr(space->machine, "bank12", memory_region(space->machine, "gamecart")+((_32x_68k_a15104_reg&0x3)*0x100000) ); } /**********************************************************************************************/ @@ -3659,8 +3659,8 @@ static READ16_HANDLER( svp_68k_cell2_r ) } static ADDRESS_MAP_START( svp_ssp_map, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x0000, 0x03ff) AM_ROMBANK(3) - AM_RANGE(0x0400, 0xffff) AM_ROMBANK(4) + AM_RANGE(0x0000, 0x03ff) AM_ROMBANK("bank3") + AM_RANGE(0x0400, 0xffff) AM_ROMBANK("bank4") ADDRESS_MAP_END static ADDRESS_MAP_START( svp_ext_map, ADDRESS_SPACE_IO, 16 ) @@ -3728,8 +3728,8 @@ static void svp_init(running_machine *machine) /* SVP stuff */ svp.dram = auto_alloc_array(machine, UINT8, 0x20000); - memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x300000, 0x31ffff, 0, 0, (read16_space_func)SMH_BANK(2), (write16_space_func)SMH_BANK(2)); - memory_set_bankptr(machine, 2, svp.dram ); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x300000, 0x31ffff, 0, 0, "bank2"); + memory_set_bankptr(machine, "bank2", svp.dram ); memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa15000, 0xa150ff, 0, 0, svp_68k_io_r, svp_68k_io_w); // "cell arrange" 1 and 2 memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x390000, 0x39ffff, 0, 0, svp_68k_cell1_r); @@ -3738,10 +3738,10 @@ static void svp_init(running_machine *machine) memory_install_read16_handler(cputag_get_address_space(machine, "svp", ADDRESS_SPACE_PROGRAM), 0x438, 0x438, 0, 0, svp_speedup_r); svp.iram = auto_alloc_array(machine, UINT8, 0x800); - memory_set_bankptr(machine, 3, svp.iram ); + memory_set_bankptr(machine, "bank3", svp.iram ); /* SVP ROM just shares m68k region.. */ ROM = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 4, ROM + 0x800 ); + memory_set_bankptr(machine, "bank4", ROM + 0x800 ); vdp_get_word_from_68k_mem = vdp_get_word_from_68k_mem_svp; megadrive_io_read_data_port_ptr = megadrive_io_read_data_port_svp; @@ -6230,7 +6230,7 @@ static void megadriv_init_common(running_machine *machine) printf("GENESIS Sound Z80 cpu found %d\n", cpu_get_index(_genesis_snd_z80_cpu) ); genz80.z80_prgram = auto_alloc_array(machine, UINT8, 0x2000); - memory_set_bankptr(machine, 1, genz80.z80_prgram ); + memory_set_bankptr(machine, "bank1", genz80.z80_prgram ); } /* Look to see if this system has the 32x Master SH2 */ @@ -6411,15 +6411,15 @@ void megatech_set_megadrive_z80_as_megadrive_z80(running_machine *machine, const memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xffff, 0, 0, z80_unmapped_r, z80_unmapped_w); - memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); - memory_set_bankptr(machine, 1, genz80.z80_prgram ); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1"); + memory_set_bankptr(machine, "bank1", genz80.z80_prgram ); - memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(6), (write8_space_func)SMH_BANK(6)); - memory_set_bankptr(machine, 6, genz80.z80_prgram ); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank6"); + memory_set_bankptr(machine, "bank6", genz80.z80_prgram ); // not allowed?? -// memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x2000, 0x3fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); +// memory_install_readwrite_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x2000, 0x3fff, 0, 0, "bank1"); memory_install_readwrite8_device_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), ym, 0x4000, 0x4003, 0, 0, ym2612_r, ym2612_w); memory_install_write8_handler (cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x6000, 0x6000, 0, 0, megadriv_z80_z80_bank_w); @@ -6458,8 +6458,8 @@ DRIVER_INIT( _32x ) if (_32x_adapter_enabled == 0) { - memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000000, 0x03fffff, 0, 0, (read16_space_func)SMH_BANK(10), (write16_space_func)SMH_BANK(10)); - memory_set_bankptr(machine, 10, memory_region(machine, "gamecart") ); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000000, 0x03fffff, 0, 0, "bank10"); + memory_set_bankptr(machine, "bank10", memory_region(machine, "gamecart") ); }; diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index 04b96b56180..9b389de1f05 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -892,8 +892,8 @@ static DRIVER_INIT (megaplay) memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa10000, 0xa1001f, 0, 0, megaplay_io_read, megaplay_io_write); /* megaplay has ram shared with the bios cpu here */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "genesis_snd_z80", ADDRESS_SPACE_PROGRAM), 0x2000, 0x3fff, 0, 0, (read8_space_func)SMH_BANK(7), (write8_space_func)SMH_BANK(7)); - memory_set_bankptr(machine, 7, &ic36_ram[0]); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "genesis_snd_z80", ADDRESS_SPACE_PROGRAM), 0x2000, 0x3fff, 0, 0, "bank7"); + memory_set_bankptr(machine, "bank7", &ic36_ram[0]); /* instead of a RAM mirror the 68k sees the extra ram of the 2nd z80 too */ memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa02000, 0xa03fff, 0, 0, megadriv_68k_read_z80_extra_ram, megadriv_68k_write_z80_extra_ram); diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index a6e68721cf7..b3c3177c947 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -313,13 +313,13 @@ static WRITE8_HANDLER(casino5_bank_w) { if ( data == 0 ) { - memory_set_bank(space->machine, 1, 1); - memory_set_bank(space->machine, 2, 1); + memory_set_bank(space->machine, "bank1", 1); + memory_set_bank(space->machine, "bank2", 1); } else if ( data == 0xff ) { - memory_set_bank(space->machine, 1, 0); - memory_set_bank(space->machine, 2, 0); + memory_set_bank(space->machine, "bank1", 0); + memory_set_bank(space->machine, "bank2", 0); } else { @@ -346,8 +346,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( casino5_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) - AM_RANGE(0x4000, 0x5fff) AM_ROMBANK(2) + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") + AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank2") AM_RANGE(0x6000, 0x6fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0x7000, 0x7000) AM_WRITE(casino5_bank_w) AM_RANGE(0x7001, 0x7fff) AM_RAM @@ -469,7 +469,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( couple_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE(&backup_ram) AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0xc008, 0xc00b) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) @@ -1169,10 +1169,10 @@ static NVRAM_HANDLER(dodge) static MACHINE_START(casino5) { MACHINE_START_CALL(merit); - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x2000); - memory_configure_bank(machine, 2, 0, 2, memory_region(machine, "maincpu") + 0x6000, 0x2000); - memory_set_bank(machine, 1, 0); - memory_set_bank(machine, 2, 0); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x2000); + memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "maincpu") + 0x6000, 0x2000); + memory_set_bank(machine, "bank1", 0); + memory_set_bank(machine, "bank2", 0); } static MACHINE_DRIVER_START( pitboss ) @@ -1881,7 +1881,7 @@ static DRIVER_INIT( couple ) dumpers it's just the way it is,a.k.a. it's an "hardware" banking. update 20060118 by f205v: now we have 3 dumps from 3 different boards and they all behave the same...*/ - memory_set_bankptr(machine, 1,ROM + 0x10000 + (0x2000 * 2)); + memory_set_bankptr(machine, "bank1",ROM + 0x10000 + (0x2000 * 2)); } GAME( 1983, pitboss, 0, pitboss, pitboss, 0, ROT0, "Merit", "The Pit Boss (Set 1)", GAME_SUPPORTS_SAVE | GAME_IMPERFECT_GRAPHICS ) diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 24ab83d3f38..7a2f30bf6ef 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -408,7 +408,7 @@ static void meritm_crt250_switch_banks( running_machine *machine ) int rombank = (meritm_bank & 0x07) ^ 0x07; //logerror( "CRT250: Switching banks: rom = %0x (bank = %x)\n", rombank, meritm_bank ); - memory_set_bank(machine, 1, rombank ); + memory_set_bank(machine, "bank1", rombank ); }; static WRITE8_HANDLER(meritm_crt250_bank_w) @@ -425,9 +425,9 @@ static void meritm_switch_banks( running_machine *machine ) (meritm_psd_a15 & 0x1); //logerror( "Switching banks: rom = %0x (bank = %x), ram = %0x\n", rombank, meritm_bank, rambank); - memory_set_bank(machine, 1, rombank ); - memory_set_bank(machine, 2, rombank | 0x01); - memory_set_bank(machine, 3, rambank); + memory_set_bank(machine, "bank1", rombank ); + memory_set_bank(machine, "bank2", rombank | 0x01); + memory_set_bank(machine, "bank3", rambank); }; static WRITE8_HANDLER(meritm_psd_a15_w) @@ -564,12 +564,12 @@ static READ8_HANDLER(meritm_ds1644_r) *************************************/ static ADDRESS_MAP_START( meritm_crt250_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) ADDRESS_MAP_END static ADDRESS_MAP_START( meritm_crt250_questions_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0x0000, 0x0000) AM_WRITE(meritm_crt250_questions_lo_w) AM_RANGE(0x0001, 0x0001) AM_WRITE(meritm_crt250_questions_hi_w) AM_RANGE(0x0002, 0x0002) AM_WRITE(meritm_crt250_questions_bank_w) @@ -614,9 +614,9 @@ static ADDRESS_MAP_START( meritm_crt250_crt258_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( meritm_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_ROMBANK(1) - AM_RANGE(0x8000, 0xdfff) AM_ROMBANK(2) - AM_RANGE(0xe000, 0xffff) AM_RAMBANK(3) + AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("bank1") + AM_RANGE(0x8000, 0xdfff) AM_ROMBANK("bank2") + AM_RANGE(0xe000, 0xffff) AM_RAMBANK("bank3") ADDRESS_MAP_END static ADDRESS_MAP_START( meritm_io_map, ADDRESS_SPACE_IO, 8 ) @@ -913,7 +913,7 @@ static MACHINE_START(merit_common) static MACHINE_START(meritm_crt250) { - memory_configure_bank(machine, 1, 0, 8, memory_region(machine, "maincpu"), 0x10000); + memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu"), 0x10000); meritm_bank = 0xff; meritm_crt250_switch_banks(machine); MACHINE_START_CALL(merit_common); @@ -938,9 +938,9 @@ static MACHINE_START(meritm_crt260) { meritm_ram = auto_alloc_array(machine, UINT8, 0x8000 ); memset(meritm_ram, 0x00, 0x8000); - memory_configure_bank(machine, 1, 0, 128, memory_region(machine, "maincpu"), 0x8000); - memory_configure_bank(machine, 2, 0, 128, memory_region(machine, "maincpu"), 0x8000); - memory_configure_bank(machine, 3, 0, 4, meritm_ram, 0x2000); + memory_configure_bank(machine, "bank1", 0, 128, memory_region(machine, "maincpu"), 0x8000); + memory_configure_bank(machine, "bank2", 0, 128, memory_region(machine, "maincpu"), 0x8000); + memory_configure_bank(machine, "bank3", 0, 4, meritm_ram, 0x2000); meritm_bank = 0xff; meritm_psd_a15 = 0; meritm_switch_banks(machine); diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index 4084b58844b..7724aa830d9 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -123,7 +123,7 @@ static ADDRESS_MAP_START( metlclsh_slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW") AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(metlclsh_cause_nmi2) // cause nmi on cpu #1 AM_RANGE(0xc0c1, 0xc0c1) AM_WRITE(metlclsh_ack_irq2) // irq ack - AM_RANGE(0xd000, 0xd7ff) AM_ROMBANK(1) AM_WRITE(metlclsh_bgram_w) AM_BASE(&metlclsh_bgram) // this is banked + AM_RANGE(0xd000, 0xd7ff) AM_ROMBANK("bank1") AM_WRITE(metlclsh_bgram_w) AM_BASE(&metlclsh_bgram) // this is banked AM_RANGE(0xe301, 0xe301) AM_WRITE(metlclsh_flipscreen_w) // 0/1 AM_RANGE(0xe401, 0xe401) AM_WRITE(metlclsh_rambank_w) AM_RANGE(0xe402, 0xe403) AM_WRITEONLY AM_BASE(&metlclsh_scrollx) diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index a014b5ead90..5924cbd93f0 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -392,7 +392,7 @@ static WRITE8_HANDLER( metro_sound_rombank_w ) bankaddress = 0x10000-0x4000 + ((data >> 4) & 0x03) * 0x4000; if (bankaddress < 0x10000) bankaddress = 0x0000; - memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &ROM[bankaddress]); } static WRITE8_HANDLER( daitorid_sound_rombank_w ) @@ -403,7 +403,7 @@ static WRITE8_HANDLER( daitorid_sound_rombank_w ) bankaddress = 0x10000-0x4000 + ((data >> 4) & 0x07) * 0x4000; if (bankaddress < 0x10000) bankaddress = 0x10000; - memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &ROM[bankaddress]); } @@ -810,7 +810,7 @@ static WRITE16_HANDLER( metro_blitter_w ) static ADDRESS_MAP_START( metro_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM /* External ROM */ - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) /* External ROM (Banked) */ + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* External ROM (Banked) */ AM_RANGE(0x8000, 0x87ff) AM_RAM /* External RAM */ AM_RANGE(0xff00, 0xffff) AM_RAM /* Internal RAM */ ADDRESS_MAP_END @@ -1657,7 +1657,7 @@ static WRITE8_HANDLER( blzntrnd_sh_bankswitch_w ) int bankaddress; bankaddress = 0x10000 + (data & 0x03) * 0x4000; - memory_set_bankptr(space->machine, 1, &RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &RAM[bankaddress]); } static void blzntrnd_irqhandler(const device_config *device, int irq) @@ -1672,7 +1672,7 @@ static const ym2610_interface blzntrnd_ym2610_interface = static ADDRESS_MAP_START( blzntrnd_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c index 36dfe57bbfd..6527781b41e 100644 --- a/src/mame/drivers/mexico86.c +++ b/src/mame/drivers/mexico86.c @@ -69,7 +69,7 @@ static READ8_DEVICE_HANDLER( kiki_ym2203_r ) static ADDRESS_MAP_START( mexico86_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) /* banked roms */ + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* banked roms */ AM_RANGE(0xc000, 0xe7ff) AM_RAM AM_SHARE(1) /* shared with sound cpu */ AM_RANGE(0xd500, 0xd7ff) AM_RAM AM_BASE(&mexico86_objectram) AM_SIZE(&mexico86_objectram_size) AM_RANGE(0xe800, 0xe8ff) AM_RAM AM_BASE(&mexico86_protection_ram) /* shared with mcu */ diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c index ce802ad8f24..fea57ab15b8 100644 --- a/src/mame/drivers/mhavoc.c +++ b/src/mame/drivers/mhavoc.c @@ -232,9 +232,9 @@ static WRITE8_HANDLER( dual_pokey_w ) static ADDRESS_MAP_START( alpha_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x0200, 0x07ff) AM_RAMBANK(1) AM_BASE(&mhavoc_zram0) + AM_RANGE(0x0200, 0x07ff) AM_RAMBANK("bank1") AM_BASE(&mhavoc_zram0) AM_RANGE(0x0800, 0x09ff) AM_RAM - AM_RANGE(0x0a00, 0x0fff) AM_RAMBANK(1) AM_BASE(&mhavoc_zram1) + AM_RANGE(0x0a00, 0x0fff) AM_RAMBANK("bank1") AM_BASE(&mhavoc_zram1) AM_RANGE(0x1000, 0x1000) AM_READ(mhavoc_gamma_r) /* Gamma Read Port */ AM_RANGE(0x1200, 0x1200) AM_READ_PORT("IN0") AM_WRITENOP /* Alpha Input Port 0 */ AM_RANGE(0x1400, 0x141f) AM_RAM AM_BASE(&mhavoc_colorram) /* ColorRAM */ @@ -247,7 +247,7 @@ static ADDRESS_MAP_START( alpha_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1780, 0x1780) AM_WRITE(mhavoc_ram_banksel_w) /* Program RAM Page Select */ AM_RANGE(0x17c0, 0x17c0) AM_WRITE(mhavoc_gamma_w) /* Gamma Communication Write Port */ AM_RANGE(0x1800, 0x1fff) AM_RAM /* Shared Beta Ram */ - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(2) /* Paged Program ROM (32K) */ + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank2") /* Paged Program ROM (32K) */ AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("alpha", 0x4000) /* Vector Generator RAM */ AM_RANGE(0x5000, 0x7fff) AM_ROM /* Vector ROM */ AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* Program ROM (32K) */ @@ -286,9 +286,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( alphaone_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x0200, 0x07ff) AM_RAMBANK(1) AM_BASE(&mhavoc_zram0) + AM_RANGE(0x0200, 0x07ff) AM_RAMBANK("bank1") AM_BASE(&mhavoc_zram0) AM_RANGE(0x0800, 0x09ff) AM_RAM - AM_RANGE(0x0a00, 0x0fff) AM_RAMBANK(1) AM_BASE(&mhavoc_zram1) + AM_RANGE(0x0a00, 0x0fff) AM_RAMBANK("bank1") AM_BASE(&mhavoc_zram1) AM_RANGE(0x1020, 0x103f) AM_READWRITE(dual_pokey_r, dual_pokey_w) AM_RANGE(0x1040, 0x1040) AM_READ_PORT("IN0") AM_WRITENOP /* Alpha Input Port 0 */ AM_RANGE(0x1060, 0x1060) AM_READ_PORT("IN1") /* Gamma Input Port */ @@ -302,7 +302,7 @@ static ADDRESS_MAP_START( alphaone_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x10b8, 0x10b8) AM_WRITE(mhavoc_ram_banksel_w) AM_RANGE(0x10e0, 0x10ff) AM_WRITE(SMH_RAM) AM_BASE(&mhavoc_colorram) /* ColorRAM */ AM_RANGE(0x1800, 0x18ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* EEROM */ - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(2) /* Paged Program ROM (32K) */ + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank2") /* Paged Program ROM (32K) */ AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION("alpha", 0x4000) /* Vector Generator RAM */ AM_RANGE(0x5000, 0x7fff) AM_ROM /* Vector ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM /* Program ROM (32K) */ diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c index e77d79083d4..45743e3fac6 100644 --- a/src/mame/drivers/midzeus.c +++ b/src/mame/drivers/midzeus.c @@ -286,7 +286,7 @@ static WRITE32_HANDLER( bitlatches_w ) /* ROM bank selection on Zeus 2 */ case 5: - memory_set_bank(space->machine, 1, bitlatch[offset] & 3); + memory_set_bank(space->machine, "bank1", bitlatch[offset] & 3); break; /* unknown purpose; crusnexo/thegrid write 1 at startup */ @@ -608,7 +608,7 @@ static ADDRESS_MAP_START( zeus2_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x9f0000, 0x9f7fff) AM_DEVREADWRITE("m48t35", zeus2_timekeeper_r, zeus2_timekeeper_w) AM_RANGE(0x9f8000, 0x9f8000) AM_WRITE(cmos_protect_w) AM_RANGE(0xa00000, 0xbfffff) AM_ROM AM_REGION("user1", 0) - AM_RANGE(0xc00000, 0xffffff) AM_ROMBANK(1) AM_REGION("user2", 0) + AM_RANGE(0xc00000, 0xffffff) AM_ROMBANK("bank1") AM_REGION("user2", 0) ADDRESS_MAP_END /* @@ -1394,7 +1394,7 @@ static DRIVER_INIT( crusnexo ) { dcs2_init(machine, 0, 0); midway_ioasic_init(machine, MIDWAY_IOASIC_STANDARD, 472/* or 476,477,478,110 */, 99, NULL); - memory_configure_bank(machine, 1, 0, 3, memory_region(machine, "user2"), 0x400000*4); + memory_configure_bank(machine, "bank1", 0, 3, memory_region(machine, "user2"), 0x400000*4); memory_install_readwrite32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x9b0004, 0x9b0007, 0, 0, crusnexo_leds_r, crusnexo_leds_w); memory_install_write32_handler (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8d0009, 0x8d000a, 0, 0, keypad_select_w); @@ -1405,7 +1405,7 @@ static DRIVER_INIT( thegrid ) { dcs2_init(machine, 0, 0); midway_ioasic_init(machine, MIDWAY_IOASIC_STANDARD, 474/* or 491 */, 99, NULL); - memory_configure_bank(machine, 1, 0, 3, memory_region(machine, "user2"), 0x400000*4); + memory_configure_bank(machine, "bank1", 0, 3, memory_region(machine, "user2"), 0x400000*4); } diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index cc439abca55..b3b13646a4f 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -137,15 +137,15 @@ static WRITE8_HANDLER( missb2_bg_bank_w ) // I don't know how this is really connected, bit 1 is always high afaik... bank = ((data & 2) ? 1 : 0) | ((data & 1) ? 4 : 0); - memory_set_bank(space->machine, 2, bank); - memory_set_bank(space->machine, 3, bank); + memory_set_bank(space->machine, "bank2", bank); + memory_set_bank(space->machine, "bank3", bank); } /* Memory Maps */ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, videoram, videoram_size) AM_RANGE(0xdd00, 0xdfff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, objectram, objectram_size) AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE(1) @@ -168,8 +168,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x9000, 0x9fff) AM_ROMBANK(2) // ROM data for the background palette ram - AM_RANGE(0xa000, 0xafff) AM_ROMBANK(3) // ROM data for the background palette ram + AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("bank2") // ROM data for the background palette ram + AM_RANGE(0xa000, 0xafff) AM_ROMBANK("bank3") // ROM data for the background palette ram AM_RANGE(0xb000, 0xb1ff) AM_ROM // banked ??? AM_RANGE(0xc000, 0xc1ff) AM_RAM_WRITE(bg_paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE_MEMBER(bublbobl_state, bg_paletteram) AM_RANGE(0xc800, 0xcfff) AM_RAM // main ??? @@ -468,11 +468,11 @@ static void configure_banks( running_machine* machine ) UINT8 *ROM = memory_region(machine, "maincpu"); UINT8 *SLAVE = memory_region(machine, "slave"); - memory_configure_bank(machine, 1, 0, 8, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); /* 2009-11 FP: isn't there a way to configure both at once? */ - memory_configure_bank(machine, 2, 0, 7, &SLAVE[0x8000], 0x1000); - memory_configure_bank(machine, 3, 0, 7, &SLAVE[0x9000], 0x1000); + memory_configure_bank(machine, "bank2", 0, 7, &SLAVE[0x8000], 0x1000); + memory_configure_bank(machine, "bank3", 0, 7, &SLAVE[0x9000], 0x1000); } static DRIVER_INIT( missb2 ) diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 2734588cc1c..84f8dcf6a16 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -116,7 +116,7 @@ static UINT8 pang_port5_kludge = 0; static WRITE8_HANDLER( pang_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); } @@ -349,7 +349,7 @@ logerror("PC %04x: write %02x to port 01\n",cpu_get_pc(space->cpu),data); static ADDRESS_MAP_START( mgakuen_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(mgakuen_paletteram_r,mgakuen_paletteram_w) /* palette RAM */ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(pang_colorram_r,pang_colorram_w) AM_BASE(&pang_colorram) /* Attribute RAM */ AM_RANGE(0xd000, 0xdfff) AM_READWRITE(mgakuen_videoram_r,mgakuen_videoram_w) AM_BASE(&pang_videoram) AM_SIZE(&pang_videoram_size) /* char RAM */ @@ -359,7 +359,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mitchell_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(pang_paletteram_r,pang_paletteram_w) /* Banked palette RAM */ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(pang_colorram_r,pang_colorram_w) AM_BASE(&pang_colorram) /* Attribute RAM */ AM_RANGE(0xd000, 0xdfff) AM_READWRITE(pang_videoram_r,pang_videoram_w) AM_BASE(&pang_videoram) AM_SIZE(&pang_videoram_size)/* Banked char / OBJ RAM */ @@ -387,7 +387,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spangbl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) AM_WRITENOP + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_WRITENOP AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(pang_paletteram_r, pang_paletteram_w) /* Banked palette RAM */ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(pang_colorram_r, pang_colorram_w) AM_BASE(&pang_colorram)/* Attribute RAM */ AM_RANGE(0xd000, 0xdfff) AM_READWRITE(pang_videoram_r, pang_videoram_w) AM_BASE(&pang_videoram) AM_SIZE(&pang_videoram_size) /* Banked char / OBJ RAM */ @@ -1971,13 +1971,13 @@ static void bootleg_decode(running_machine *machine) { const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x50000); - memory_configure_bank_decrypted(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x60000, 0x4000); + memory_configure_bank_decrypted(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x60000, 0x4000); } static void configure_banks(running_machine *machine) { - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); pang_port5_kludge = 0; } diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index c2a3228903f..e3eec7723b1 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -171,7 +171,7 @@ static NVRAM_HANDLER( mjkjidai ) static ADDRESS_MAP_START( mjkjidai_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xd000, 0xdfff) AM_RAM AM_BASE_SIZE_MEMBER(mjkjidai_state,nvram,nvram_size) // cleared and initialized on startup if bit 6 if port 00 is 0 AM_RANGE(0xe000, 0xe01f) AM_RAM AM_BASE_MEMBER(mjkjidai_state,spriteram1) // shared with tilemap ram diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 8883d591b73..d18b04fec28 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -100,7 +100,7 @@ static WRITE8_HANDLER( mjsister_banksel1_w ) if (tmp != mjsister_colorbank) mjsister_screen_redraw = 1; - memory_set_bankptr(space->machine, 1,&BANKROM[rombank0*0x10000+rombank1*0x8000]+0x10000); + memory_set_bankptr(space->machine, "bank1",&BANKROM[rombank0*0x10000+rombank1*0x8000]+0x10000); } static WRITE8_HANDLER( mjsister_banksel2_w ) @@ -119,7 +119,7 @@ static WRITE8_HANDLER( mjsister_banksel2_w ) logerror("%04x p31_w:%02x\n",cpu_get_pc(space->cpu),data); } - memory_set_bankptr(space->machine, 1,&BANKROM[rombank0*0x10000+rombank1*0x8000]+0x10000); + memory_set_bankptr(space->machine, "bank1",&BANKROM[rombank0*0x10000+rombank1*0x8000]+0x10000); } static WRITE8_HANDLER( mjsister_input_sel1_w ) @@ -154,7 +154,7 @@ static READ8_HANDLER( mjsister_keys_r ) static ADDRESS_MAP_START( mjsister_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) AM_WRITE(mjsister_videoram_w) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(mjsister_videoram_w) ADDRESS_MAP_END static ADDRESS_MAP_START( mjsister_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index 181090283ad..39d780c0eac 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -232,7 +232,7 @@ static WRITE16_HANDLER(ml_output_w) static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { data=0; - memory_set_bankptr(device->machine, 1, memory_region(device->machine, "audiocpu") + ((data) & 0x03) * 0x4000 + 0x10000 ); + memory_set_bankptr(device->machine, "bank1", memory_region(device->machine, "audiocpu") + ((data) & 0x03) * 0x4000 + 0x10000 ); } static void ml_msm5205_vck(const device_config *device) @@ -490,7 +490,7 @@ static WRITE8_HANDLER( ml_msm_start_msb_w ) static ADDRESS_MAP_START( mlanding_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_MIRROR(0x00fe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa001) AM_WRITE(ml_sound_to_main_w) diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index a36d2c97116..1b40a87c78a 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -671,7 +671,7 @@ static WRITE16_HANDLER( bank_w ) if(ACCESSING_BITS_0_7) { switch(data & 0xf) { case 0x1: // 100000-1fffff data roms banking - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "maincpu") + 0x1000000 + 0x100000*((data >> 4) & 0xf)); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x1000000 + 0x100000*((data >> 4) & 0xf)); logerror("BANK %x\n", 0x1000000 + 0x100000*((data >> 4) & 0xf)); break; case 0x2: // 200000-2fffff data roms banking (unused, all known games have only one bank) @@ -737,7 +737,7 @@ static INTERRUPT_GEN(model1_interrupt) static MACHINE_RESET(model1) { - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x1000000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x1000000); irq_init(machine); model1_tgp_reset(machine, !strcmp(machine->gamedrv->name, "swa") || !strcmp(machine->gamedrv->name, "wingwar") || !strcmp(machine->gamedrv->name, "wingwara")); if (!strcmp(machine->gamedrv->name, "swa")) @@ -756,7 +756,7 @@ static MACHINE_RESET(model1) static MACHINE_RESET(model1_vr) { - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x1000000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x1000000); irq_init(machine); model1_vr_tgp_reset(machine); model1_sound_irq = 3; @@ -864,7 +864,7 @@ static WRITE16_HANDLER( snd_latch_to_68k_w ) static ADDRESS_MAP_START( model1_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM - AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK(1) + AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK("bank1") AM_RANGE(0x200000, 0x2fffff) AM_ROM AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(mr2_w) AM_BASE(&mr2) @@ -912,7 +912,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( model1_vr_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM - AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK(1) + AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK("bank1") AM_RANGE(0x200000, 0x2fffff) AM_ROM AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(mr2_w) AM_BASE(&mr2) diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index c3e2a3ce322..e7bd6c395e1 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -349,8 +349,8 @@ static MACHINE_RESET(model2o) static MACHINE_RESET(model2_scsp) { - memory_set_bankptr(machine, 4, memory_region(machine, "scsp") + 0x200000); - memory_set_bankptr(machine, 5, memory_region(machine, "scsp") + 0x600000); + memory_set_bankptr(machine, "bank4", memory_region(machine, "scsp") + 0x200000); + memory_set_bankptr(machine, "bank5", memory_region(machine, "scsp") + 0x600000); // copy the 68k vector table into RAM memcpy(model2_soundram, memory_region(machine, "audiocpu") + 0x80000, 16); @@ -1714,13 +1714,13 @@ static WRITE16_HANDLER( model2snd_ctrl ) UINT8 *snd = memory_region(space->machine, "scsp"); if (data & 0x20) { - memory_set_bankptr(space->machine, 4, snd + 0x200000); - memory_set_bankptr(space->machine, 5, snd + 0x600000); + memory_set_bankptr(space->machine, "bank4", snd + 0x200000); + memory_set_bankptr(space->machine, "bank5", snd + 0x600000); } else { - memory_set_bankptr(space->machine, 4, snd + 0x800000); - memory_set_bankptr(space->machine, 5, snd + 0xa00000); + memory_set_bankptr(space->machine, "bank4", snd + 0x800000); + memory_set_bankptr(space->machine, "bank5", snd + 0xa00000); } } } @@ -1731,8 +1731,8 @@ static ADDRESS_MAP_START( model2_snd, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400001) AM_WRITE(model2snd_ctrl) AM_RANGE(0x600000, 0x67ffff) AM_ROM AM_REGION("audiocpu", 0x80000) AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION("scsp", 0) - AM_RANGE(0xa00000, 0xdfffff) AM_READ(SMH_BANK(4)) - AM_RANGE(0xe00000, 0xffffff) AM_READ(SMH_BANK(5)) + AM_RANGE(0xa00000, 0xdfffff) AM_ROMBANK("bank4") + AM_RANGE(0xe00000, 0xffffff) AM_ROMBANK("bank5") ADDRESS_MAP_END static int scsp_last_line = 0; diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 2c752d44dc2..0ef8eb313c4 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -1258,10 +1258,10 @@ static MACHINE_START(model3_21) static void model3_init(running_machine *machine, int step) { model3_step = step; - memory_set_bankptr(machine, 1, memory_region( machine, "user1" ) + 0x800000 ); /* banked CROM */ + memory_set_bankptr(machine, "bank1", memory_region( machine, "user1" ) + 0x800000 ); /* banked CROM */ - memory_set_bankptr(machine, 4, memory_region(machine, "samples") + 0x200000); - memory_set_bankptr(machine, 5, memory_region(machine, "samples") + 0x600000); + memory_set_bankptr(machine, "bank4", memory_region(machine, "samples") + 0x200000); + memory_set_bankptr(machine, "bank5", memory_region(machine, "samples") + 0x600000); // copy the 68k vector table into RAM memcpy(model3_soundram, memory_region(machine, "audiocpu")+0x80000, 16); @@ -1575,7 +1575,7 @@ static WRITE64_HANDLER( model3_sys_w ) data >>= 56; data = (~data) & 0x7; - memory_set_bankptr(space->machine, 1, memory_region( space->machine, "user1" ) + 0x800000 + (data * 0x800000)); /* banked CROM */ + memory_set_bankptr(space->machine, "bank1", memory_region( space->machine, "user1" ) + 0x800000 + (data * 0x800000)); /* banked CROM */ } if (ACCESSING_BITS_24_31) { @@ -1804,7 +1804,7 @@ static WRITE64_HANDLER(daytona2_rombank_w) { data >>= 56; data = (~data) & 0xf; - memory_set_bankptr(space->machine, 1, memory_region( space->machine, "user1" ) + 0x800000 + (data * 0x800000)); /* banked CROM */ + memory_set_bankptr(space->machine, "bank1", memory_region( space->machine, "user1" ) + 0x800000 + (data * 0x800000)); /* banked CROM */ } } @@ -4641,13 +4641,13 @@ static WRITE16_HANDLER( model3snd_ctrl ) UINT8 *snd = memory_region(space->machine, "scsp2"); if (data & 0x20) { - memory_set_bankptr(space->machine, 4, snd + 0x200000); - memory_set_bankptr(space->machine, 5, snd + 0x600000); + memory_set_bankptr(space->machine, "bank4", snd + 0x200000); + memory_set_bankptr(space->machine, "bank5", snd + 0x600000); } else { - memory_set_bankptr(space->machine, 4, snd + 0x800000); - memory_set_bankptr(space->machine, 5, snd + 0xa00000); + memory_set_bankptr(space->machine, "bank4", snd + 0x800000); + memory_set_bankptr(space->machine, "bank5", snd + 0xa00000); } } } @@ -4660,8 +4660,8 @@ static ADDRESS_MAP_START( model3_snd, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400001) AM_WRITE(model3snd_ctrl) AM_RANGE(0x600000, 0x67ffff) AM_ROM AM_REGION("audiocpu", 0x80000) AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION("samples", 0) - AM_RANGE(0xa00000, 0xdfffff) AM_READ(SMH_BANK(4)) - AM_RANGE(0xe00000, 0xffffff) AM_READ(SMH_BANK(5)) + AM_RANGE(0xa00000, 0xdfffff) AM_ROMBANK("bank4") + AM_RANGE(0xe00000, 0xffffff) AM_ROMBANK("bank5") ADDRESS_MAP_END static int scsp_last_line = 0; @@ -4922,7 +4922,7 @@ static DRIVER_INIT( model3_10 ) memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc0000000, 0xc00000ff, 0, 0, scsi_r, scsi_w ); - memory_install_read64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, (read64_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" ); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r, mpc105_addr_w ); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc105_data_r, mpc105_data_w ); @@ -4932,7 +4932,7 @@ static DRIVER_INIT( model3_10 ) static DRIVER_INIT( model3_15 ) { interleave_vroms(machine); - memory_install_read64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, (read64_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" ); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r, mpc105_addr_w ); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc105_data_r, mpc105_data_w ); @@ -4942,7 +4942,7 @@ static DRIVER_INIT( model3_15 ) static DRIVER_INIT( model3_20 ) { interleave_vroms(machine); - memory_install_read64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, (read64_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" ); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc2000000, 0xc20000ff, 0, 0, real3d_dma_r, real3d_dma_w ); @@ -5027,7 +5027,7 @@ static DRIVER_INIT( vs215 ) rom[(0x70e710^4)/4] = 0x60000000; interleave_vroms(machine); - memory_install_read64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, (read64_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" ); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w ); @@ -5046,7 +5046,7 @@ static DRIVER_INIT( vs29815 ) rom[(0x60290c^4)/4] = 0x60000000; interleave_vroms(machine); - memory_install_read64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, (read64_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" ); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w ); @@ -5065,7 +5065,7 @@ static DRIVER_INIT( bass ) rom[(0x7999c8^4)/4] = 0x60000000; interleave_vroms(machine); - memory_install_read64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, (read64_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" ); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w ); @@ -5079,7 +5079,7 @@ static DRIVER_INIT( bass ) static DRIVER_INIT( getbass ) { interleave_vroms(machine); - memory_install_read64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, (read64_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" ); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w ); diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c index 59c03b6c4c3..0c117115144 100644 --- a/src/mame/drivers/momoko.c +++ b/src/mame/drivers/momoko.c @@ -65,7 +65,7 @@ static WRITE8_HANDLER( momoko_bg_read_bank_w ) { UINT8 *BG_MAP = memory_region(space->machine, "user1"); int bank_address = (data & 0x1f) * 0x1000; - memory_set_bankptr(space->machine, 1, &BG_MAP[bank_address]); + memory_set_bankptr(space->machine, "bank1", &BG_MAP[bank_address]); } /****************************************************************************/ @@ -86,7 +86,7 @@ static ADDRESS_MAP_START( momoko_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) AM_RANGE(0xe800, 0xe800) AM_WRITE(momoko_text_scrolly_w) AM_RANGE(0xe801, 0xe801) AM_WRITE(momoko_text_mode_w) - AM_RANGE(0xf000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0xf000, 0xffff) AM_ROMBANK("bank1") AM_RANGE(0xf000, 0xf001) AM_WRITE(momoko_bg_scrolly_w) AM_BASE(&momoko_bg_scrolly) AM_RANGE(0xf002, 0xf003) AM_WRITE(momoko_bg_scrollx_w) AM_BASE(&momoko_bg_scrollx) AM_RANGE(0xf004, 0xf004) AM_WRITE(momoko_bg_read_bank_w) diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index a0592820f25..ff164b3cfa1 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -224,7 +224,7 @@ static READ16_HANDLER( sound_status_r ) static WRITE8_HANDLER( sound_bankswitch_w ) { - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "soundcpu") + 0x10000 + (data&0xf)*0x4000); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "soundcpu") + 0x10000 + (data&0xf)*0x4000); } @@ -401,7 +401,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami", k054539_r,k054539_w) AM_RANGE(0xec00, 0xec01) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index d3e2c7bbd8a..bef3903ef1b 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -443,9 +443,9 @@ static MACHINE_RESET( mpu4 ) { UINT8 *rom = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 8, &rom[0x01000], 0x10000); + memory_configure_bank(machine, "bank1", 0, 8, &rom[0x01000], 0x10000); - memory_set_bank(machine, 1,0); + memory_set_bank(machine, "bank1",0); device_reset(cputag_get_cpu(machine, "maincpu")); } @@ -493,13 +493,13 @@ static WRITE_LINE_DEVICE_HANDLER( cpu0_irq_m6840 ) /* Bankswitching */ static WRITE8_HANDLER( bankswitch_w ) { - memory_set_bank(space->machine, 1,data & 0x07); + memory_set_bank(space->machine, "bank1",data & 0x07); } static READ8_HANDLER( bankswitch_r ) { - return memory_get_bank(space->machine, 1); + return memory_get_bank(space->machine, "bank1"); } @@ -1764,7 +1764,7 @@ static ADDRESS_MAP_START( mod2_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0e00, 0x0e03) AM_DEVREADWRITE("pia_ic7", pia6821_r, pia6821_w) /* PIA6821 IC7 */ AM_RANGE(0x0f00, 0x0f03) AM_DEVREADWRITE("pia_ic8", pia6821_r, pia6821_w) /* PIA6821 IC8 */ - AM_RANGE(0x1000, 0xffff) AM_READ(SMH_BANK(1)) /* 64k paged ROM (4 pages) */ + AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") /* 64k paged ROM (4 pages) */ ADDRESS_MAP_END static ADDRESS_MAP_START( mod4_yam_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -1787,7 +1787,7 @@ static ADDRESS_MAP_START( mod4_yam_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0e00, 0x0e03) AM_DEVREADWRITE("pia_ic7", pia6821_r, pia6821_w) /* PIA6821 IC7 */ AM_RANGE(0x0f00, 0x0f03) AM_DEVREADWRITE("pia_ic8", pia6821_r, pia6821_w) /* PIA6821 IC8 */ - AM_RANGE(0x1000, 0xffff) AM_READ(SMH_BANK(1)) // 64k paged ROM (4 pages) + AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") // 64k paged ROM (4 pages) ADDRESS_MAP_END static ADDRESS_MAP_START( mod4_oki_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -1812,7 +1812,7 @@ static ADDRESS_MAP_START( mod4_oki_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0e00, 0x0e03) AM_DEVREADWRITE("pia_ic7", pia6821_r, pia6821_w) /* PIA6821 IC7 */ AM_RANGE(0x0f00, 0x0f03) AM_DEVREADWRITE("pia_ic8", pia6821_r, pia6821_w) /* PIA6821 IC8 */ - AM_RANGE(0x1000, 0xffff) AM_READ(SMH_BANK(1)) // 64k paged ROM (4 pages) + AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") // 64k paged ROM (4 pages) ADDRESS_MAP_END // memory map for barcrest mpu4 board ///////////////////////////////////// @@ -1839,7 +1839,7 @@ static ADDRESS_MAP_START( dutch_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0e00, 0x0e03) AM_DEVREADWRITE("pia_ic7", pia6821_r, pia6821_w) /* PIA6821 IC7 */ AM_RANGE(0x0f00, 0x0f03) AM_DEVREADWRITE("pia_ic8", pia6821_r, pia6821_w) /* PIA6821 IC8 */ - AM_RANGE(0x1000, 0xffff) AM_READ(SMH_BANK(1)) // 64k paged ROM (4 pages) + AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") // 64k paged ROM (4 pages) ADDRESS_MAP_END static const ay8910_interface ay8910_config = diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c index 12c5fc24648..5bc65102df5 100644 --- a/src/mame/drivers/mquake.c +++ b/src/mame/drivers/mquake.c @@ -33,12 +33,12 @@ static WRITE8_DEVICE_HANDLER( mquake_cia_0_porta_w ) { /* switch banks as appropriate */ - memory_set_bank(device->machine, 1, data & 1); + memory_set_bank(device->machine, "bank1", data & 1); /* swap the write handlers between ROM and bank 1 based on the bit */ if ((data & 1) == 0) /* overlay disabled, map RAM on 0x000000 */ - memory_install_write16_handler(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, (write16_space_func)SMH_BANK(1)); + memory_install_write_bank_handler(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1"); else /* overlay enabled, map Amiga system ROM on 0x000000 */ @@ -139,7 +139,7 @@ static WRITE16_HANDLER( coin_chip_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_BASE(&amiga_custom_regs) AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w) @@ -454,8 +454,8 @@ static DRIVER_INIT(mquake) amiga_machine_config(machine, &mquake_intf); /* set up memory */ - memory_configure_bank(machine, 1, 0, 1, amiga_chip_ram, 0); - memory_configure_bank(machine, 1, 1, 1, memory_region(machine, "user1"), 0); + memory_configure_bank(machine, "bank1", 0, 1, amiga_chip_ram, 0); + memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user1"), 0); } diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c index d93533fcb75..939477cce6e 100644 --- a/src/mame/drivers/ms32.c +++ b/src/mame/drivers/ms32.c @@ -298,7 +298,7 @@ static ADDRESS_MAP_START( ms32_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xc2c08000, 0xc2c0ffff) AM_READWRITE16(ms32_bgram_r16, ms32_bgram_w16, 0x0000ffff) AM_MIRROR(0x3c1f0000) /* bgram is 16-bit wide, 0x4000 in size */ /* AM_RANGE(0xc2c10000, 0xc2dfffff) // mirrors of txram / bg, handled above */ AM_RANGE(0xc2e00000, 0xc2e1ffff) AM_RAM AM_BASE(&ms32_mainram) AM_MIRROR(0x3c0e0000) /* mainram is 32-bit wide, 0x20000 in size */ - AM_RANGE(0xc3e00000, 0xc3ffffff) AM_ROMBANK(1) AM_MIRROR(0x3c000000) // ROM is 32-bit wide, 0x200000 in size */ + AM_RANGE(0xc3e00000, 0xc3ffffff) AM_ROMBANK("bank1") AM_MIRROR(0x3c000000) // ROM is 32-bit wide, 0x200000 in size */ /* todo: clean up the mapping of these */ AM_RANGE(0xfc800000, 0xfc800003) AM_READNOP /* sound? */ @@ -1288,8 +1288,8 @@ static READ8_HANDLER( latch_r ) static WRITE8_HANDLER( ms32_snd_bank_w ) { - memory_set_bank(space->machine, 4, (data >> 0) & 0x0F); - memory_set_bank(space->machine, 5, (data >> 4) & 0x0F); + memory_set_bank(space->machine, "bank4", (data >> 0) & 0x0F); + memory_set_bank(space->machine, "bank5", (data >> 4) & 0x0F); } static WRITE8_HANDLER( to_main_w ) @@ -1308,8 +1308,8 @@ static ADDRESS_MAP_START( ms32_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3f70, 0x3f70) AM_WRITENOP // watchdog? banking? very noisy AM_RANGE(0x3f80, 0x3f80) AM_WRITE(ms32_snd_bank_w) AM_RANGE(0x4000, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(4) - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(5) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank4") + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank5") ADDRESS_MAP_END @@ -1317,9 +1317,9 @@ ADDRESS_MAP_END static MACHINE_RESET( ms32 ) { - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu")); - memory_set_bank(machine, 4, 0); - memory_set_bank(machine, 5, 1); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu")); + memory_set_bank(machine, "bank4", 0); + memory_set_bank(machine, "bank5", 1); irq_init(machine); } @@ -2288,8 +2288,8 @@ void decrypt_ms32_bg(running_machine *machine, int addr_xor,int data_xor, const static void configure_banks(running_machine *machine) { state_save_register_global(machine, to_main); - memory_configure_bank(machine, 4, 0, 16, memory_region(machine, "audiocpu") + 0x14000, 0x4000); - memory_configure_bank(machine, 5, 0, 16, memory_region(machine, "audiocpu") + 0x14000, 0x4000); + memory_configure_bank(machine, "bank4", 0, 16, memory_region(machine, "audiocpu") + 0x14000, 0x4000); + memory_configure_bank(machine, "bank5", 0, 16, memory_region(machine, "audiocpu") + 0x14000, 0x4000); } static DRIVER_INIT( ms32_common ) diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index c624df1f2a1..f05123f31fc 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -248,7 +248,7 @@ static WRITE8_HANDLER( multfish_vid_w ) static WRITE8_HANDLER( multfish_bank_w ) { - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); } static UINT8 rambk = 0; @@ -354,7 +354,7 @@ static WRITE8_HANDLER(multfish_rtc_w) static ADDRESS_MAP_START( multfish_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READWRITE(SMH_ROM, multfish_vid_w) - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK(1), SMH_ROM ) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdff7) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0xdff8, 0xdfff) AM_READWRITE(multfish_rtc_r, multfish_rtc_w) AM_RANGE(0xe000, 0xffff) AM_READWRITE(bankedram_r, bankedram_w) @@ -591,8 +591,8 @@ GFXDECODE_END static MACHINE_RESET( multfish ) { - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu"), 0x4000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu"), 0x4000); + memory_set_bank(machine, "bank1", 0); } static const ay8910_interface ay8910_config = diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c index 561ab212c1b..bbbf2a86fd1 100644 --- a/src/mame/drivers/multigam.c +++ b/src/mame/drivers/multigam.c @@ -99,16 +99,17 @@ static READ8_HANDLER (multigam_nt_r) return nt_page[page][offset & 0x3ff]; } +static const char * const banknames[] = { "bank2", "bank3", "bank4", "bank5", "bank6", "bank7", "bank8", "bank9" }; + static void set_videorom_bank(running_machine* machine, int start, int count, int bank, int bank_size_in_kb) { - int i, j; + int i; int offset = bank * (bank_size_in_kb * 0x400); /* bank_size_in_kb is used to determine how large the "bank" parameter is */ /* count determines the size of the area mapped in KB */ for (i = 0; i < count; i++, offset += 0x400) { - j = i + start + 2; - memory_set_bankptr(machine, j, memory_region(machine, "gfx1") + offset); + memory_set_bankptr(machine, banknames[i + start], memory_region(machine, "gfx1") + offset); } } @@ -218,7 +219,7 @@ static WRITE8_HANDLER(multigam_switch_prg_rom) static WRITE8_HANDLER(multigam_switch_gfx_rom) { - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "gfx1") + (0x2000 * (data & 0x3f))); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "gfx1") + (0x2000 * (data & 0x3f))); set_mirroring(data & 0x40 ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); multigam_game_gfx_bank = data; }; @@ -228,7 +229,7 @@ static WRITE8_HANDLER(multigam_mapper2_w) { if (multigam_game_gfx_bank & 0x80) { - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "gfx1") + (0x2000 * ((data & 0xf) + multigam_game_gfx_bank))); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "gfx1") + (0x2000 * ((data & 0xf) + multigam_game_gfx_bank))); } else { @@ -435,7 +436,7 @@ static void multigam_init_smb3(running_machine *machine) memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, multigam3_mmc3_rom_switch_w ); - memory_set_bankptr(machine, 10, multigmc_mmc3_6000_ram); + memory_set_bankptr(machine, "bank10", multigmc_mmc3_6000_ram); multigam3_mmc3_banks[0] = 0x1e; multigam3_mmc3_banks[1] = 0x1f; @@ -479,7 +480,7 @@ static WRITE8_HANDLER(multigm3_switch_prg_rom) else { memory_install_write8_handler(space, 0x8000, 0xffff, 0, 0, multigm3_mapper2_w ); - memory_set_bankptr(space->machine, 10, memory_region(space->machine, "maincpu") + 0x6000); + memory_set_bankptr(space->machine, "bank10", memory_region(space->machine, "maincpu") + 0x6000); } if (data & 0x80) @@ -517,7 +518,7 @@ static ADDRESS_MAP_START( multigm3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5003, 0x5003) AM_WRITE(multigm3_switch_gfx_rom) AM_RANGE(0x5000, 0x5ffe) AM_ROM AM_RANGE(0x5fff, 0x5fff) AM_READ_PORT("IN0") - AM_RANGE(0x6000, 0x7fff) AM_RAMBANK(10) + AM_RANGE(0x6000, 0x7fff) AM_RAMBANK("bank10") AM_RANGE(0x6fff, 0x6fff) AM_WRITENOP /* 0x00 in attract mode, 0xff during play */ AM_RANGE(0x8000, 0xffff) AM_ROM AM_WRITE(multigm3_mapper2_w) ADDRESS_MAP_END @@ -659,8 +660,8 @@ static MACHINE_START( multigam ) nt_page[3] = nt_ram + 0xc00; memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(1), 0); - memory_set_bankptr(machine, 1, memory_region(machine, "gfx1")); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1"); + memory_set_bankptr(machine, "bank1", memory_region(machine, "gfx1")); } static MACHINE_START( multigm3 ) @@ -673,14 +674,14 @@ static MACHINE_START( multigm3 ) memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, (read8_space_func)SMH_BANK(2), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0400, 0x07ff, 0, 0, (read8_space_func)SMH_BANK(3), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0800, 0x0bff, 0, 0, (read8_space_func)SMH_BANK(4), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0c00, 0x0fff, 0, 0, (read8_space_func)SMH_BANK(5), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1000, 0x13ff, 0, 0, (read8_space_func)SMH_BANK(6), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1400, 0x17ff, 0, 0, (read8_space_func)SMH_BANK(7), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1800, 0x1bff, 0, 0, (read8_space_func)SMH_BANK(8), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1c00, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(9), 0); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank2"); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0400, 0x07ff, 0, 0, "bank3"); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0800, 0x0bff, 0, 0, "bank4"); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x0c00, 0x0fff, 0, 0, "bank5"); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1000, 0x13ff, 0, 0, "bank6"); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1400, 0x17ff, 0, 0, "bank7"); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1800, 0x1bff, 0, 0, "bank8"); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu"), ADDRESS_SPACE_PROGRAM), 0x1c00, 0x1fff, 0, 0, "bank9"); set_videorom_bank(machine, 0, 8, 0, 8); }; diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index b78d4387da2..353ea0a568c 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -685,7 +685,7 @@ static int cur_sound_region; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 2, memory_region(machine, "soundcpu") + 0x10000 + cur_sound_region*0x4000); + memory_set_bankptr(machine, "bank2", memory_region(machine, "soundcpu") + 0x10000 + cur_sound_region*0x4000); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -704,7 +704,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static ADDRESS_MAP_START( mystwarr_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0x0000, 0xbfff) AM_WRITENOP AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami1", k054539_r,k054539_w) diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c index d4fa9a53e58..2592ec0f0dc 100644 --- a/src/mame/drivers/namcofl.c +++ b/src/mame/drivers/namcofl.c @@ -199,13 +199,13 @@ static WRITE32_HANDLER( namcofl_sysreg_w ) { if (data == 0) // RAM at 00000000, ROM at 10000000 { - memory_set_bankptr(space->machine, 1, namcofl_workram ); - memory_set_bankptr(space->machine, 2, memory_region(space->machine, "maincpu") ); + memory_set_bankptr(space->machine, "bank1", namcofl_workram ); + memory_set_bankptr(space->machine, "bank2", memory_region(space->machine, "maincpu") ); } else // ROM at 00000000, RAM at 10000000 { - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "maincpu") ); - memory_set_bankptr(space->machine, 2, namcofl_workram ); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") ); + memory_set_bankptr(space->machine, "bank2", namcofl_workram ); } } } @@ -237,8 +237,8 @@ static WRITE32_HANDLER( namcofl_share_w ) } static ADDRESS_MAP_START( namcofl_mem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x000fffff) AM_READWRITE(SMH_BANK(1), SMH_BANK(1)) - AM_RANGE(0x10000000, 0x100fffff) AM_READWRITE(SMH_BANK(2), SMH_BANK(2)) + AM_RANGE(0x00000000, 0x000fffff) AM_RAMBANK("bank1") + AM_RANGE(0x10000000, 0x100fffff) AM_RAMBANK("bank2") AM_RANGE(0x20000000, 0x201fffff) AM_ROM AM_REGION("user1", 0) /* data */ AM_RANGE(0x30000000, 0x30001fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* nvram */ AM_RANGE(0x30100000, 0x30100003) AM_WRITE(namcofl_spritebank_w) @@ -725,8 +725,8 @@ static void namcofl_common_init(running_machine *machine) { namcofl_workram = auto_alloc_array(machine, UINT32, 0x100000/4); - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") ); - memory_set_bankptr(machine, 2, namcofl_workram ); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") ); + memory_set_bankptr(machine, "bank2", namcofl_workram ); } static DRIVER_INIT(speedrcr) diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index d5a3c20f08f..fa715af9953 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -425,13 +425,13 @@ static WRITE8_HANDLER( namcos1_dac1_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_RAMBANK(1) - AM_RANGE(0x2000, 0x3fff) AM_RAMBANK(2) - AM_RANGE(0x4000, 0x5fff) AM_RAMBANK(3) - AM_RANGE(0x6000, 0x7fff) AM_RAMBANK(4) - AM_RANGE(0x8000, 0x9fff) AM_RAMBANK(5) - AM_RANGE(0xa000, 0xbfff) AM_RAMBANK(6) - AM_RANGE(0xc000, 0xdfff) AM_RAMBANK(7) + AM_RANGE(0x0000, 0x1fff) AM_RAMBANK("bank1") + AM_RANGE(0x2000, 0x3fff) AM_RAMBANK("bank2") + AM_RANGE(0x4000, 0x5fff) AM_RAMBANK("bank3") + AM_RANGE(0x6000, 0x7fff) AM_RAMBANK("bank4") + AM_RANGE(0x8000, 0x9fff) AM_RAMBANK("bank5") + AM_RANGE(0xa000, 0xbfff) AM_RAMBANK("bank6") + AM_RANGE(0xc000, 0xdfff) AM_RAMBANK("bank7") AM_RANGE(0xe000, 0xefff) AM_WRITE(namcos1_bankswitch_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(namcos1_cpu_control_w) AM_RANGE(0xf200, 0xf200) AM_WRITE(namcos1_watchdog_w) @@ -440,34 +440,34 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf800, 0xf800) AM_WRITE(firq_ack_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(namcos1_sub_firq_w) // asserts FIRQ on CPU1 AM_RANGE(0xfc00, 0xfc01) AM_WRITE(namcos1_subcpu_bank_w) - AM_RANGE(0xe000, 0xffff) AM_ROMBANK(8) + AM_RANGE(0xe000, 0xffff) AM_ROMBANK("bank8") ADDRESS_MAP_END static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_RAMBANK(9) - AM_RANGE(0x2000, 0x3fff) AM_RAMBANK(10) - AM_RANGE(0x4000, 0x5fff) AM_RAMBANK(11) - AM_RANGE(0x6000, 0x7fff) AM_RAMBANK(12) - AM_RANGE(0x8000, 0x9fff) AM_RAMBANK(13) - AM_RANGE(0xa000, 0xbfff) AM_RAMBANK(14) - AM_RANGE(0xc000, 0xdfff) AM_RAMBANK(15) + AM_RANGE(0x0000, 0x1fff) AM_RAMBANK("bank9") + AM_RANGE(0x2000, 0x3fff) AM_RAMBANK("bank10") + AM_RANGE(0x4000, 0x5fff) AM_RAMBANK("bank11") + AM_RANGE(0x6000, 0x7fff) AM_RAMBANK("bank12") + AM_RANGE(0x8000, 0x9fff) AM_RAMBANK("bank13") + AM_RANGE(0xa000, 0xbfff) AM_RAMBANK("bank14") + AM_RANGE(0xc000, 0xdfff) AM_RAMBANK("bank15") AM_RANGE(0xe000, 0xefff) AM_WRITE(namcos1_bankswitch_w) // AM_RANGE(0xf000, 0xf000) AM_WRITENOP // IO Chip AM_RANGE(0xf200, 0xf200) AM_WRITE(namcos1_watchdog_w) // AM_RANGE(0xf400, 0xf400) AM_WRITENOP // ? AM_RANGE(0xf600, 0xf600) AM_WRITE(irq_ack_w) AM_RANGE(0xf800, 0xf800) AM_WRITE(firq_ack_w) - AM_RANGE(0xe000, 0xffff) AM_ROMBANK(16) + AM_RANGE(0xe000, 0xffff) AM_ROMBANK("bank16") ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(17) /* Banked ROMs */ + AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank17") /* Banked ROMs */ AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ymsnd", ym2151_status_port_r) AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0x5000, 0x53ff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w) AM_MIRROR(0x400) AM_BASE(&namco_wavedata) /* PSG ( Shared ) */ - AM_RANGE(0x7000, 0x77ff) AM_RAMBANK(18) /* TRIRAM (shared) */ + AM_RANGE(0x7000, 0x77ff) AM_RAMBANK("bank18") /* TRIRAM (shared) */ AM_RANGE(0x8000, 0x9fff) AM_RAM /* Sound RAM 3 */ AM_RANGE(0xc000, 0xc001) AM_WRITE(namcos1_sound_bankswitch_w) /* ROM bank selector */ AM_RANGE(0xd001, 0xd001) AM_WRITE(namcos1_watchdog_w) @@ -482,9 +482,9 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1003) AM_READ(dsw_r) AM_RANGE(0x1400, 0x1400) AM_READ_PORT("CONTROL0") AM_RANGE(0x1401, 0x1401) AM_READ_PORT("CONTROL1") - AM_RANGE(0x4000, 0xbfff) AM_ROMBANK(20) /* banked ROM */ + AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank20") /* banked ROM */ AM_RANGE(0xc000, 0xc000) AM_WRITE(namcos1_mcu_patch_w) /* kludge! see notes */ - AM_RANGE(0xc000, 0xc7ff) AM_RAMBANK(19) /* TRIRAM (shared) */ + AM_RANGE(0xc000, 0xc7ff) AM_RAMBANK("bank19") /* TRIRAM (shared) */ AM_RANGE(0xc800, 0xcfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* EEPROM */ AM_RANGE(0xd000, 0xd000) AM_WRITE(namcos1_dac0_w) AM_RANGE(0xd400, 0xd400) AM_WRITE(namcos1_dac1_w) diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index 3e9c1af97e4..ae35db56fa4 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -638,22 +638,24 @@ static TIMER_CALLBACK( mcu_timer ) static UINT32 m_n_bankoffset; -INLINE void bankswitch_rom8( const address_space *space, int n_bank, int n_data ) +INLINE void bankswitch_rom8( const address_space *space, const char *bank, int n_data ) { - memory_set_bank( space->machine, n_bank + 1, ( ( n_data & 0xc0 ) >> 4 ) + ( n_data & 0x03 ) ); + memory_set_bank( space->machine, bank, ( ( n_data & 0xc0 ) >> 4 ) + ( n_data & 0x03 ) ); } +static const char * const bankname[] = { "bank1", "bank2", "bank3", "bank4", "bank5", "bank6", "bank7", "bank8" }; + static WRITE32_HANDLER( bankswitch_rom32_w ) { verboselog( space->machine, 2, "bankswitch_rom32_w( %08x, %08x, %08x )\n", offset, data, mem_mask ); if( ACCESSING_BITS_0_15 ) { - bankswitch_rom8( space, ( offset * 2 ), data & 0xffff ); + bankswitch_rom8( space, bankname[offset * 2], data & 0xffff ); } if( ACCESSING_BITS_16_31 ) { - bankswitch_rom8( space, ( offset * 2 ) + 1, data >> 16 ); + bankswitch_rom8( space, bankname[offset * 2 + 1], data >> 16 ); } } @@ -671,10 +673,10 @@ static WRITE32_HANDLER( bankswitch_rom64_upper_w ) } } -INLINE void bankswitch_rom64( const address_space *space, int n_bank, int n_data ) +INLINE void bankswitch_rom64( const address_space *space, const char *bank, int n_data ) { /* todo: verify behaviour */ - memory_set_bank( space->machine, n_bank + 1, ( ( ( ( n_data & 0xc0 ) >> 3 ) + ( n_data & 0x07 ) ) ^ m_n_bankoffset ) ); + memory_set_bank( space->machine, bank, ( ( ( ( n_data & 0xc0 ) >> 3 ) + ( n_data & 0x07 ) ) ^ m_n_bankoffset ) ); } static WRITE32_HANDLER( bankswitch_rom64_w ) @@ -683,11 +685,11 @@ static WRITE32_HANDLER( bankswitch_rom64_w ) if( ACCESSING_BITS_0_15 ) { - bankswitch_rom64( space, ( offset * 2 ), data & 0xffff ); + bankswitch_rom64( space, bankname[offset * 2], data & 0xffff ); } if( ACCESSING_BITS_16_31 ) { - bankswitch_rom64( space, ( offset * 2 ) + 1, data >> 16 ); + bankswitch_rom64( space, bankname[offset * 2 + 1], data >> 16 ); } } @@ -818,19 +820,19 @@ static DRIVER_INIT( namcos11 ) UINT32 len = memory_region_length( machine, "user2" ); UINT8 *rgn = memory_region( machine, "user2" ); - memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f0fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); - memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f100000, 0x1f1fffff, 0, 0, (read32_space_func)SMH_BANK(2) ); - memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f200000, 0x1f2fffff, 0, 0, (read32_space_func)SMH_BANK(3) ); - memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f300000, 0x1f3fffff, 0, 0, (read32_space_func)SMH_BANK(4) ); - memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f4fffff, 0, 0, (read32_space_func)SMH_BANK(5) ); - memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f500000, 0x1f5fffff, 0, 0, (read32_space_func)SMH_BANK(6) ); - memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f600000, 0x1f6fffff, 0, 0, (read32_space_func)SMH_BANK(7) ); - memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f700000, 0x1f7fffff, 0, 0, (read32_space_func)SMH_BANK(8) ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f0fffff, 0, 0, "bank1" ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f100000, 0x1f1fffff, 0, 0, "bank2" ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f200000, 0x1f2fffff, 0, 0, "bank3" ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f300000, 0x1f3fffff, 0, 0, "bank4" ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f4fffff, 0, 0, "bank5" ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f500000, 0x1f5fffff, 0, 0, "bank6" ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f600000, 0x1f6fffff, 0, 0, "bank7" ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f700000, 0x1f7fffff, 0, 0, "bank8" ); for( bank = 0; bank < 8; bank++ ) { - memory_configure_bank(machine, bank + 1, 0, len / ( 1024 * 1024 ), rgn, 1024 * 1024 ); - memory_set_bank(machine, bank + 1, 0 ); + memory_configure_bank(machine, bankname[bank], 0, len / ( 1024 * 1024 ), rgn, 1024 * 1024 ); + memory_set_bank(machine, bankname[bank], 0 ); } if( namcos11_config_table[ n_game ].n_daughterboard == 32 ) diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index a6aedc2af7f..0d459935ba8 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -992,7 +992,7 @@ static WRITE32_HANDLER( bankoffset_w ) m_n_bankoffset = data; } - memory_set_bank(space->machine, 1, m_n_bankoffset ); + memory_set_bank(space->machine, "bank1", m_n_bankoffset ); verboselog( space->machine, 1, "bankoffset_w( %08x, %08x, %08x ) %08x\n", offset, data, mem_mask, m_n_bankoffset ); } @@ -1103,7 +1103,7 @@ static ADDRESS_MAP_START( namcos12_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1f801c00, 0x1f801dff) AM_NOP AM_RANGE(0x1f802020, 0x1f802033) AM_RAM /* ?? */ AM_RANGE(0x1f802040, 0x1f802043) AM_WRITENOP - AM_RANGE(0x1fa00000, 0x1fbfffff) AM_ROMBANK(1) /* banked roms */ + AM_RANGE(0x1fa00000, 0x1fbfffff) AM_ROMBANK("bank1") /* banked roms */ AM_RANGE(0x1fc00000, 0x1fffffff) AM_ROM AM_SHARE(2) AM_REGION("user1", 0) /* bios */ AM_RANGE(0x80000000, 0x803fffff) AM_RAM AM_SHARE(1) /* ram mirror */ AM_RANGE(0x9fc00000, 0x9fffffff) AM_ROM AM_SHARE(2) /* bios mirror */ @@ -1164,12 +1164,12 @@ static UINT8 kcram[ 12 ]; static WRITE32_HANDLER( kcoff_w ) { - memory_set_bankptr(space->machine, 2, memory_region( space->machine, "user1" ) + 0x20280 ); + memory_set_bankptr(space->machine, "bank2", memory_region( space->machine, "user1" ) + 0x20280 ); } static WRITE32_HANDLER( kcon_w ) { - memory_set_bankptr(space->machine, 2, kcram ); + memory_set_bankptr(space->machine, "bank2", kcram ); } static int ttt_cnt; @@ -1260,12 +1260,12 @@ static MACHINE_RESET( namcos12 ) strcmp( machine->gamedrv->name, "ghlpanic" ) == 0 ) { /* this is based on guesswork, it might not even be keycus. */ - memory_install_read32_handler (space, 0x1fc20280, 0x1fc2028b, 0, 0, (read32_space_func)SMH_BANK(2) ); + memory_install_read_bank_handler (space, 0x1fc20280, 0x1fc2028b, 0, 0, "bank2" ); memory_install_write32_handler(space, 0x1f008000, 0x1f008003, 0, 0, kcon_w ); memory_install_write32_handler(space, 0x1f018000, 0x1f018003, 0, 0, kcoff_w ); memset( kcram, 0, sizeof( kcram ) ); - memory_set_bankptr(space->machine, 2, kcram ); + memory_set_bankptr(space->machine, "bank2", kcram ); } } @@ -1461,7 +1461,7 @@ static DRIVER_INIT( namcos12 ) psx_dma_install_read_handler( 5, namcos12_rom_read ); - memory_configure_bank(machine, 1, 0, memory_region_length( machine, "user2" ) / 0x200000, memory_region( machine, "user2" ), 0x200000 ); + memory_configure_bank(machine, "bank1", 0, memory_region_length( machine, "user2" ) / 0x200000, memory_region( machine, "user2" ), 0x200000 ); s12_porta = 0; s12_rtcstate = 0; @@ -1474,7 +1474,7 @@ static DRIVER_INIT( namcos12 ) m_n_dmaoffset = 0; m_n_dmabias = 0; m_n_bankoffset = 0; - memory_set_bank(machine, 1, 0 ); + memory_set_bank(machine, "bank1", 0 ); state_save_register_global(machine, m_n_dmaoffset ); state_save_register_global(machine, m_n_dmabias ); diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 132c0521c08..f197f38e959 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -604,7 +604,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_default_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x10ffff) AM_READWRITE(NAMCOS2_68K_MASTER_RAM_R,NAMCOS2_68K_MASTER_RAM_W) + AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM) AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_IMPORT_FROM( common_default_am ) @@ -612,7 +612,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_default_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x13ffff) AM_READWRITE(NAMCOS2_68K_SLAVE_RAM_R,NAMCOS2_68K_SLAVE_RAM_W) + AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM) AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_IMPORT_FROM( common_default_am ) ADDRESS_MAP_END @@ -631,7 +631,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_finallap_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x10ffff) AM_READWRITE(NAMCOS2_68K_MASTER_RAM_R,NAMCOS2_68K_MASTER_RAM_W) + AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM) AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_IMPORT_FROM( common_finallap_am ) @@ -639,7 +639,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_finallap_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x13ffff) AM_READWRITE(NAMCOS2_68K_SLAVE_RAM_R,NAMCOS2_68K_SLAVE_RAM_W) + AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM) AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_IMPORT_FROM( common_finallap_am ) ADDRESS_MAP_END @@ -655,7 +655,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_sgunner_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x10ffff) AM_READWRITE(NAMCOS2_68K_MASTER_RAM_R,NAMCOS2_68K_MASTER_RAM_W) + AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM) AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_IMPORT_FROM( common_sgunner_am ) @@ -663,7 +663,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_sgunner_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x13ffff) AM_READWRITE(NAMCOS2_68K_SLAVE_RAM_R,NAMCOS2_68K_SLAVE_RAM_W) + AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM) AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_IMPORT_FROM( common_sgunner_am ) ADDRESS_MAP_END @@ -680,7 +680,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x10ffff) AM_READWRITE(NAMCOS2_68K_MASTER_RAM_R,NAMCOS2_68K_MASTER_RAM_W) + AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM) AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_IMPORT_FROM( common_metlhawk_am ) @@ -688,7 +688,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x13ffff) AM_READWRITE(NAMCOS2_68K_SLAVE_RAM_R,NAMCOS2_68K_SLAVE_RAM_W) + AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM) AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_IMPORT_FROM( common_metlhawk_am ) ADDRESS_MAP_END @@ -710,7 +710,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x10ffff) AM_READWRITE(NAMCOS2_68K_MASTER_RAM_R,NAMCOS2_68K_MASTER_RAM_W) + AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM) AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_IMPORT_FROM( common_luckywld_am ) @@ -718,7 +718,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x13ffff) AM_READWRITE(NAMCOS2_68K_SLAVE_RAM_R,NAMCOS2_68K_SLAVE_RAM_W) + AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM) AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_IMPORT_FROM( common_luckywld_am ) ADDRESS_MAP_END @@ -728,7 +728,7 @@ ADDRESS_MAP_END /*************************************************************/ static ADDRESS_MAP_START( sound_default_am, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(6) /* banked */ + AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank6") /* banked */ AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x5000, 0x6fff) AM_DEVREADWRITE("c140", c140_r,c140_w) AM_RANGE(0x7000, 0x77ff) AM_READWRITE(namcos2_dpram_byte_r,namcos2_dpram_byte_w) AM_BASE(&namcos2_dpram) diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index f536b882556..182729f2abb 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1406,7 +1406,7 @@ ADDRESS_MAP_END /*************************************************************/ static ADDRESS_MAP_START( am_sound_winrun, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(6) /* banked */ + AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank6") /* banked */ AM_RANGE(0x3000, 0x3003) AM_WRITENOP /* ? */ AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x5000, 0x6fff) AM_DEVREADWRITE("c140", c140_r,c140_w) diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c index 0764689ca4c..6c4f74cb0b3 100644 --- a/src/mame/drivers/namcos86.c +++ b/src/mame/drivers/namcos86.c @@ -209,7 +209,7 @@ static WRITE8_HANDLER( bankswitch1_w ) /* with bankswitch1_ext_w() in wndrmomo */ if (memory_region(space->machine, "user1")) return; - memory_set_bankptr(space->machine, 1,base + ((data & 0x03) * 0x2000)); + memory_set_bankptr(space->machine, "bank1",base + ((data & 0x03) * 0x2000)); } static WRITE8_HANDLER( bankswitch1_ext_w ) @@ -218,14 +218,14 @@ static WRITE8_HANDLER( bankswitch1_ext_w ) if (base == 0) return; - memory_set_bankptr(space->machine, 1,base + ((data & 0x1f) * 0x2000)); + memory_set_bankptr(space->machine, "bank1",base + ((data & 0x1f) * 0x2000)); } static WRITE8_HANDLER( bankswitch2_w ) { UINT8 *base = memory_region(space->machine, "cpu2") + 0x10000; - memory_set_bankptr(space->machine, 2,base + ((data & 0x03) * 0x2000)); + memory_set_bankptr(space->machine, "bank2",base + ((data & 0x03) * 0x2000)); } /* Stubs to pass the correct Dip Switch setup to the MCU */ @@ -347,7 +347,7 @@ static MACHINE_RESET( namco86 ) { UINT8 *base = memory_region(machine, "cpu1") + 0x10000; - memory_set_bankptr(machine, 1,base); + memory_set_bankptr(machine, "bank1",base); } @@ -360,7 +360,7 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x5fff) AM_READWRITE(rthunder_spriteram_r,rthunder_spriteram_w) - AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM & Voice expansion board - only some games have it */ @@ -387,7 +387,7 @@ static ADDRESS_MAP_START( NAME##_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) \ AM_RANGE(ADDR_SPRITE+0x0000, ADDR_SPRITE+0x1fff) AM_READWRITE(rthunder_spriteram_r,rthunder_spriteram_w) AM_BASE(&rthunder_spriteram) \ AM_RANGE(ADDR_VIDEO1+0x0000, ADDR_VIDEO1+0x1fff) AM_READWRITE(rthunder_videoram1_r,rthunder_videoram1_w) \ AM_RANGE(ADDR_VIDEO2+0x0000, ADDR_VIDEO2+0x1fff) AM_READWRITE(rthunder_videoram2_r,rthunder_videoram2_w) \ - AM_RANGE(ADDR_ROM+0x0000, ADDR_ROM+0x1fff) AM_READ(SMH_BANK(2)) \ + AM_RANGE(ADDR_ROM+0x0000, ADDR_ROM+0x1fff) AM_ROMBANK("bank2") \ AM_RANGE(0x8000, 0xffff) AM_ROM \ /* { ADDR_BANK+0x00, ADDR_BANK+0x02 } layer 2 scroll registers would be here */ \ AM_RANGE(ADDR_BANK+0x03, ADDR_BANK+0x03) AM_WRITE(bankswitch2_w) \ diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c index 4778362a0f7..fa22d0fe678 100644 --- a/src/mame/drivers/nbmj8991.c +++ b/src/mame/drivers/nbmj8991.c @@ -48,7 +48,7 @@ Notes: static WRITE8_HANDLER( nbmj8991_soundbank_w ) { if (!(data & 0x80)) soundlatch_clear_w(space, 0, 0); - memory_set_bank(space->machine, 1, data & 0x03); + memory_set_bank(space->machine, "bank1", data & 0x03); } static WRITE8_HANDLER( nbmj8991_sound_w ) @@ -68,8 +68,8 @@ static MACHINE_RESET( nbmj8991 ) { if (cputag_get_cpu(machine, "audiocpu") != NULL && cpu_get_type(cputag_get_cpu(machine, "audiocpu")) == CPU_Z80) { - memory_configure_bank(machine, 1, 0, 4, memory_region(machine, "audiocpu") + 0x8000, 0x8000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x8000, 0x8000); + memory_set_bank(machine, "bank1", 0); } MACHINE_RESET_CALL(nb1413m3); } @@ -311,7 +311,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( nbmj8991_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( nbmj8991_sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c index 0324298ae36..7f766ec0846 100644 --- a/src/mame/drivers/nbmj9195.c +++ b/src/mame/drivers/nbmj9195.c @@ -63,7 +63,7 @@ static WRITE8_HANDLER( nbmj9195_soundbank_w ) { UINT8 *SNDROM = memory_region(space->machine, "audiocpu"); - memory_set_bankptr(space->machine, 1, &SNDROM[0x08000 + (0x8000 * (data & 0x03))]); + memory_set_bankptr(space->machine, "bank1", &SNDROM[0x08000 + (0x8000 * (data & 0x03))]); } static READ8_HANDLER( nbmj9195_sound_r ) @@ -994,7 +994,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sailorws_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( sailorws_sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c index f98ef2b95da..37a9d0ee060 100644 --- a/src/mame/drivers/neodrvr.c +++ b/src/mame/drivers/neodrvr.c @@ -7684,7 +7684,7 @@ static DRIVER_INIT( kf2k3pcb ) neogeo_fixed_layer_bank_type = 2; DRIVER_INIT_CALL(neogeo); install_pvc_protection(machine); - memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc7ffff, 0, 0, (read16_space_func)SMH_BANK(6) ); // 512k bios + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc7ffff, 0, 0, "bank6" ); // 512k bios } static DRIVER_INIT( kof2003 ) @@ -7760,7 +7760,7 @@ static DRIVER_INIT( jockeygp ) extra_ram = auto_alloc_array(machine, UINT16, 0x2000/2); state_save_register_global_pointer(machine, extra_ram, 0x2000 / 2); - memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200000, 0x201fff, 0, 0, (read16_space_func)SMH_BANK(8), (write16_space_func)SMH_BANK(8)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200000, 0x201fff, 0, 0, "bank8"); memory_set_bankptr(machine, NEOGEO_BANK_EXTRA_RAM, extra_ram); // memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x280000, 0x280001, 0, 0, "IN5"); @@ -7777,7 +7777,7 @@ static DRIVER_INIT( vliner ) extra_ram = auto_alloc_array(machine, UINT16, 0x2000/2); state_save_register_global_pointer(machine, extra_ram, 0x2000 / 2); - memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200000, 0x201fff, 0, 0, (read16_space_func)SMH_BANK(8), (write16_space_func)SMH_BANK(8)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x200000, 0x201fff, 0, 0, "bank8"); memory_set_bankptr(machine, NEOGEO_BANK_EXTRA_RAM, extra_ram); memory_install_read_port_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x280000, 0x280001, 0, 0, "IN5"); diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c index 224d9941a98..6a6082a67d0 100644 --- a/src/mame/drivers/ninjakd2.c +++ b/src/mame/drivers/ninjakd2.c @@ -160,16 +160,16 @@ static INTERRUPT_GEN( ninjakd2_interrupt ) static MACHINE_RESET( ninjakd2 ) { /* initialize main Z80 bank */ - memory_configure_bank(machine, 1, 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_set_bank(machine, "bank1", 0); } static void robokid_init_banks(running_machine *machine) { /* initialize main Z80 bank */ - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu"), 0x4000); - memory_configure_bank(machine, 1, 2, 14, memory_region(machine, "maincpu") + 0x10000, 0x4000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu"), 0x4000); + memory_configure_bank(machine, "bank1", 2, 14, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_set_bank(machine, "bank1", 0); } static MACHINE_RESET( robokid ) @@ -187,12 +187,12 @@ static MACHINE_RESET( omegaf ) static WRITE8_HANDLER( ninjakd2_bankselect_w ) { - memory_set_bank(space->machine, 1, data & 0x7); + memory_set_bank(space->machine, "bank1", data & 0x7); } static WRITE8_HANDLER( robokid_bankselect_w ) { - memory_set_bank(space->machine, 1, data & 0xf); + memory_set_bank(space->machine, "bank1", data & 0xf); } @@ -374,7 +374,7 @@ static WRITE8_HANDLER( omegaf_io_protection_w ) static ADDRESS_MAP_START( ninjakd2_main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("KEYCOIN") AM_RANGE(0xc001, 0xc001) AM_READ_PORT("PAD1") AM_RANGE(0xc002, 0xc002) AM_READ_PORT("PAD2") @@ -395,7 +395,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mnight_main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xd9ff) AM_RAM AM_RANGE(0xda00, 0xdfff) AM_RAM AM_BASE_GENERIC(spriteram) AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(ninjakd2_bgvideoram_w) AM_BASE(&ninjakd2_bg_videoram) @@ -416,7 +416,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( robokid_main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(ninjakd2_fgvideoram_w) AM_BASE(&ninjakd2_fg_videoram) AM_RANGE(0xd000, 0xd3ff) AM_READWRITE(robokid_bg2_videoram_r, robokid_bg2_videoram_w) // banked @@ -444,7 +444,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( omegaf_main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("KEYCOIN") AM_RANGE(0xc001, 0xc003) AM_READ(omegaf_io_protection_r) AM_RANGE(0xc000, 0xc000) AM_WRITE(soundlatch_w) @@ -1439,7 +1439,7 @@ static void gfx_unscramble(running_machine *machine) static DRIVER_INIT( ninjakd2 ) { - mc8123_decrypt_rom(machine, "soundcpu", "user1", 0, 0); + mc8123_decrypt_rom(machine, "soundcpu", "user1", NULL, 0); gfx_unscramble(machine); } diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index 258dc864021..f25b96c5c72 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -358,7 +358,7 @@ static INT32 banknum; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 10, memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); + memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -475,7 +475,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ninjaw_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r,ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c index 372d8813110..4fa20535d18 100644 --- a/src/mame/drivers/niyanpai.c +++ b/src/mame/drivers/niyanpai.c @@ -61,7 +61,7 @@ static void niyanpai_soundbank_w(running_machine *machine, int data) { UINT8 *SNDROM = memory_region(machine, "audiocpu"); - memory_set_bankptr(machine, 1, &SNDROM[0x08000 + (0x8000 * (data & 0x03))]); + memory_set_bankptr(machine, "bank1", &SNDROM[0x08000 + (0x8000 * (data & 0x03))]); } static READ8_HANDLER( niyanpai_sound_r ) @@ -388,7 +388,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( niyanpai_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( niyanpai_sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 80066321b69..7e2d626cb6a 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -285,7 +285,7 @@ static WRITE8_HANDLER( macross2_sound_bank_w ) { UINT8 *rom = memory_region(space->machine, "audiocpu") + 0x10000; - memory_set_bankptr(space->machine, 1,rom + (data & 0x07) * 0x4000); + memory_set_bankptr(space->machine, "bank1",rom + (data & 0x07) * 0x4000); } static WRITE8_HANDLER( tharrier_oki6295_bankswitch_0_w ) @@ -1078,12 +1078,12 @@ static WRITE8_HANDLER( okibank_w ) static WRITE8_HANDLER( raphero_sound_rombank_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "audiocpu") + 0x10000 + (data & 0x07) * 0x4000); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "audiocpu") + 0x10000 + (data & 0x07) * 0x4000); } static ADDRESS_MAP_START( raphero_sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x7fff ) AM_ROM - AM_RANGE( 0x8000, 0xbfff ) AM_READ( SMH_BANK(1) ) + AM_RANGE( 0x8000, 0xbfff ) AM_ROMBANK( "bank1" ) AM_RANGE( 0xc000, 0xc001 ) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w ) AM_RANGE( 0xc800, 0xc800 ) AM_DEVREADWRITE( "oki1", okim6295_r, okim6295_w ) AM_RANGE( 0xc808, 0xc808 ) AM_DEVREADWRITE( "oki2", okim6295_r, okim6295_w ) @@ -1096,7 +1096,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( macross2_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0xa000, 0xa000) AM_READNOP /* IRQ ack? watchdog? */ AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe001, 0xe001) AM_WRITE(macross2_sound_bank_w) diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 27a51c88e0c..99700cfb0cd 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -935,7 +935,7 @@ static ADDRESS_MAP_START( sharc_map, ADDRESS_SPACE_DATA, 32 ) AM_RANGE(0x2400000, 0x27fffff) AM_DEVREADWRITE("voodoo", nwk_voodoo_0_r, nwk_voodoo_0_w) AM_RANGE(0x3400000, 0x34000ff) AM_READWRITE(cgboard_0_comm_sharc_r, cgboard_0_comm_sharc_w) AM_RANGE(0x3500000, 0x35000ff) AM_READWRITE(K033906_0_r, K033906_0_w) - AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK(5) + AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK("bank5") ADDRESS_MAP_END /*****************************************************************************/ @@ -1095,7 +1095,7 @@ static void sound_irq_callback(running_machine *machine, int irq) static DRIVER_INIT(nwktr) { init_konami_cgboard(machine, 1, CGBOARD_TYPE_NWKTR); - set_cgboard_texture_bank(machine, 0, 5, memory_region(machine, "user5")); + set_cgboard_texture_bank(machine, 0, "bank5", memory_region(machine, "user5")); sharc_dataram = auto_alloc_array(machine, UINT32, 0x100000/4); led_reg0 = led_reg1 = 0x7f; diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index ddaf8d12c6f..c43b4bb8df8 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -286,12 +286,12 @@ static READ8_HANDLER ( nycaptor_generic_control_r ) static WRITE8_HANDLER( nycaptor_generic_control_w ) { generic_control_reg = data; - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "maincpu") + 0x10000 + ((data&0x08)>>3)*0x4000 ); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x10000 + ((data&0x08)>>3)*0x4000 ); } static ADDRESS_MAP_START( nycaptor_master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_READ(nycaptor_videoram_r) AM_WRITE(nycaptor_videoram_w) AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) AM_RANGE(0xd000, 0xd000) AM_READ(nycaptor_mcu_r) AM_WRITE(nycaptor_mcu_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(sub_cpu_halt_w) @@ -390,13 +390,13 @@ static WRITE8_HANDLER( cyclshtg_generic_control_w ) { int bank=(data>>2)&3; generic_control_reg = data; - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "maincpu") + 0x10000 + bank*0x4000 ); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x10000 + bank*0x4000 ); } static ADDRESS_MAP_START( cyclshtg_master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_READ(nycaptor_videoram_r) AM_WRITE(nycaptor_videoram_w) AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) AM_RANGE(0xd000, 0xd000) AM_READ(cyclshtg_mcu_r) AM_WRITE(cyclshtg_mcu_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(sub_cpu_halt_w) @@ -445,7 +445,7 @@ static READ8_HANDLER(unk_r) static ADDRESS_MAP_START( bronx_master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_READ(nycaptor_videoram_r) AM_WRITE(nycaptor_videoram_w) AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) AM_RANGE(0xd000, 0xd000) AM_READ(cyclshtg_mcu_r) AM_WRITENOP AM_RANGE(0xd001, 0xd001) AM_WRITE(sub_cpu_halt_w) diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index 23e8f8ef688..e4c8b70131d 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -73,14 +73,14 @@ static WRITE8_HANDLER( ojankohs_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1, &ROM[0x10000 + (0x4000 * (data & 0x3f))]); + memory_set_bankptr(space->machine, "bank1", &ROM[0x10000 + (0x4000 * (data & 0x3f))]); } static WRITE8_HANDLER( ojankoy_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1, &ROM[0x10000 + (0x4000 * (data & 0x1f))]); + memory_set_bankptr(space->machine, "bank1", &ROM[0x10000 + (0x4000 * (data & 0x1f))]); ojankohs_adpcm_reset = ((data & 0x20) >> 5); if (!ojankohs_adpcm_reset) ojankohs_vclk_left = 0; @@ -125,7 +125,7 @@ static WRITE8_HANDLER( ojankoc_ctrl_w ) UINT8 *BANKROM = memory_region(space->machine, "user1"); UINT32 bank_address = (data & 0x0f) * 0x8000; - memory_set_bankptr(space->machine, 1, &BANKROM[bank_address]); + memory_set_bankptr(space->machine, "bank1", &BANKROM[bank_address]); ojankohs_adpcm_reset = ((data & 0x10) >> 4); msm5205_reset_w(devtag_get_device(space->machine, "msm"), (!(data & 0x10) >> 4)); @@ -226,7 +226,7 @@ static ADDRESS_MAP_START( ojankohs_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x9fff) AM_RAM_WRITE(ojankohs_colorram_w) AM_RANGE(0xa000, 0xb7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0xb800, 0xbfff) AM_RAM_WRITE(ojankohs_palette_w) - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END @@ -235,14 +235,14 @@ static ADDRESS_MAP_START( ojankoy_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x9fff) AM_RAM_WRITE(ojankohs_videoram_w) AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(ojankohs_colorram_w) AM_RANGE(0xb000, 0xbfff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( ojankoc_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) AM_WRITE(ojankoc_videoram_w) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(ojankoc_videoram_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 5ba34248d4d..086471e2c02 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -69,7 +69,7 @@ static WRITE8_HANDLER( onetwo_cpubank_w ) { UINT8 *RAM = memory_region(space->machine, "maincpu") + 0x10000; - memory_set_bankptr(space->machine, 1, &RAM[data * 0x4000]); + memory_set_bankptr(space->machine, "bank1", &RAM[data * 0x4000]); } static WRITE8_HANDLER( onetwo_coin_counters_w ) @@ -110,7 +110,7 @@ static WRITE8_HANDLER(palette2_w) static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION("maincpu", 0x10000) - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc800, 0xc87f) AM_RAM_WRITE(palette1_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xc900, 0xc97f) AM_RAM_WRITE(palette2_w) AM_BASE_GENERIC(paletteram2) AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(onetwo_fgram_w) AM_BASE(&fgram) diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index 5854d26b559..aee35d11ab6 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -360,7 +360,7 @@ static READ8_HANDLER( z80_input2_r ) static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { - memory_set_bank(device->machine, 10, (data-1) & 0x03); + memory_set_bank(device->machine, "bank10", (data-1) & 0x03); } /*********************************************************** @@ -534,7 +534,7 @@ static WRITE8_HANDLER( opwolf_adpcm_e_w ) static ADDRESS_MAP_START( opwolf_sound_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x9002, 0x9100) AM_READNOP @@ -961,7 +961,7 @@ static DRIVER_INIT( opwolf ) opwolf_gun_xoffs = 0xec - (rom[0x03ffb0 / 2] & 0xff); opwolf_gun_yoffs = 0x1c - (rom[0x03ffae / 2] & 0xff); - memory_configure_bank(machine, 10, 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x4000); } @@ -975,7 +975,7 @@ static DRIVER_INIT( opwolfb ) opwolf_gun_xoffs = -2; opwolf_gun_yoffs = 17; - memory_configure_bank(machine, 10, 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x4000); } diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index 926e9c88400..2fd162d4c27 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -425,7 +425,7 @@ static INT32 banknum; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 10, memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); + memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); } static STATE_POSTLOAD( othunder_postload ) @@ -516,7 +516,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w) diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c index 40569da5c3b..6f283d44ee1 100644 --- a/src/mame/drivers/pacland.c +++ b/src/mame/drivers/pacland.c @@ -255,7 +255,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3800, 0x3801) AM_WRITE(pacland_scroll0_w) AM_RANGE(0x3a00, 0x3a01) AM_WRITE(pacland_scroll1_w) AM_RANGE(0x3c00, 0x3c00) AM_WRITE(pacland_bankswitch_w) - AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") AM_RANGE(0x6800, 0x6bff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w) /* PSG device, shared RAM */ AM_RANGE(0x7000, 0x7fff) AM_WRITE(pacland_irq_1_ctrl_w) AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r) diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index df902259014..d8098336271 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -380,11 +380,11 @@ static MACHINE_RESET( mschamp ) UINT8 *rom = memory_region(machine, "maincpu") + 0x10000; int whichbank = input_port_read(machine, "GAME") & 1; - memory_configure_bank(machine, 1, 0, 2, &rom[0x0000], 0x8000); - memory_configure_bank(machine, 2, 0, 2, &rom[0x4000], 0x8000); + memory_configure_bank(machine, "bank1", 0, 2, &rom[0x0000], 0x8000); + memory_configure_bank(machine, "bank2", 0, 2, &rom[0x4000], 0x8000); - memory_set_bank(machine, 1, whichbank); - memory_set_bank(machine, 2, whichbank); + memory_set_bank(machine, "bank1", whichbank); + memory_set_bank(machine, "bank2", whichbank); } @@ -695,9 +695,10 @@ static INTERRUPT_GEN( s2650_interrupt ) static WRITE8_HANDLER( porky_banking_w ) { - int i; - for(i = 0; i < 4; i++) - memory_set_bank(space->machine, i + 1, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); + memory_set_bank(space->machine, "bank2", data & 1); + memory_set_bank(space->machine, "bank3", data & 1); + memory_set_bank(space->machine, "bank4", data & 1); } static READ8_HANDLER( drivfrcp_port1_r ) @@ -863,8 +864,8 @@ static READ8_HANDLER( pacman_read_nop ) vias required to lay out the aux PCB. */ -#define mspacman_enable_decode_latch(m) memory_set_bank(m, 1, 1) -#define mspacman_disable_decode_latch(m) memory_set_bank(m, 1, 0) +#define mspacman_enable_decode_latch(m) memory_set_bank(m, "bank1", 1) +#define mspacman_disable_decode_latch(m) memory_set_bank(m, "bank1", 0) // any access to these ROM addresses disables the decoder, and all you see is the original Pac-Man code static READ8_HANDLER( mspacman_disable_decode_r_0x0038 ) { mspacman_disable_decode_latch(space->machine); return memory_region(space->machine, "maincpu")[offset+0x0038]; } @@ -952,7 +953,7 @@ static ADDRESS_MAP_START( mspacman_map, ADDRESS_SPACE_PROGRAM, 8 ) /* start with 0000-3fff and 8000-bfff mapped to the ROMs */ AM_RANGE(0x4000, 0x7fff) AM_MIRROR(0x8000) AM_UNMAP - AM_RANGE(0x0000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END @@ -1042,7 +1043,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( epos_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROMBANK(1) + AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE_GENERIC(colorram) AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,SMH_NOP) @@ -1097,7 +1098,7 @@ static ADDRESS_MAP_START( vanvan_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( s2650games_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x8000) AM_ROMBANK(1) + AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x8000) AM_ROMBANK("bank1") AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0xe000) AM_WRITE(s2650games_colorram_w) AM_BASE_GENERIC(colorram) AM_RANGE(0x1400, 0x141f) AM_MIRROR(0xe000) AM_WRITE(s2650games_scroll_w) AM_RANGE(0x1420, 0x148f) AM_MIRROR(0xe000) AM_WRITE(SMH_RAM) @@ -1120,9 +1121,9 @@ static ADDRESS_MAP_START( s2650games_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0xe000) AM_WRITE(s2650games_videoram_w) AM_BASE_GENERIC(videoram) AM_RANGE(0x1c00, 0x1fef) AM_MIRROR(0xe000) AM_RAM AM_RANGE(0x1ff0, 0x1fff) AM_MIRROR(0xe000) AM_WRITE(SMH_RAM) AM_BASE_SIZE_GENERIC(spriteram) - AM_RANGE(0x2000, 0x2fff) AM_MIRROR(0x8000) AM_ROMBANK(2) - AM_RANGE(0x4000, 0x4fff) AM_MIRROR(0x8000) AM_ROMBANK(3) - AM_RANGE(0x6000, 0x6fff) AM_MIRROR(0x8000) AM_ROMBANK(4) + AM_RANGE(0x2000, 0x2fff) AM_MIRROR(0x8000) AM_ROMBANK("bank2") + AM_RANGE(0x4000, 0x4fff) AM_MIRROR(0x8000) AM_ROMBANK("bank3") + AM_RANGE(0x6000, 0x6fff) AM_MIRROR(0x8000) AM_ROMBANK("bank4") ADDRESS_MAP_END @@ -1175,7 +1176,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mschamp_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE_GENERIC(colorram) AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,SMH_NOP) @@ -1197,7 +1198,7 @@ static ADDRESS_MAP_START( mschamp_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1") /* IN1 */ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW1") /* DSW1 */ AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW2") /* DSW2 */ - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") ADDRESS_MAP_END static ADDRESS_MAP_START( crushs_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -5569,8 +5570,8 @@ static DRIVER_INIT( mspacman ) } /* initialize the banks */ - memory_configure_bank(machine, 1, 0, 2, &ROM[0x00000], 0x10000); - memory_set_bank(machine, 1, 1); + memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x00000], 0x10000); + memory_set_bank(machine, "bank1", 1); } static DRIVER_INIT( woodpek ) @@ -5600,10 +5601,10 @@ static DRIVER_INIT( jumpshot ) static DRIVER_INIT( drivfrcp ) { UINT8 *ROM = memory_region(machine, "maincpu"); - int i; - - for( i = 0; i < 4; i++) - memory_set_bankptr(machine, i + 1, &ROM[i * 0x2000]); + memory_set_bankptr(machine, "bank1", &ROM[0 * 0x2000]); + memory_set_bankptr(machine, "bank2", &ROM[1 * 0x2000]); + memory_set_bankptr(machine, "bank3", &ROM[2 * 0x2000]); + memory_set_bankptr(machine, "bank4", &ROM[3 * 0x2000]); } static DRIVER_INIT( 8bpm ) @@ -5617,8 +5618,10 @@ static DRIVER_INIT( 8bpm ) ROM[i] = BITSWAP8(ROM[i],7,0,5,4,3,2,1,6); } - for( i = 0; i < 4; i++) - memory_set_bankptr(machine, i + 1, &ROM[i * 0x2000]); + memory_set_bankptr(machine, "bank1", &ROM[0 * 0x2000]); + memory_set_bankptr(machine, "bank2", &ROM[1 * 0x2000]); + memory_set_bankptr(machine, "bank3", &ROM[2 * 0x2000]); + memory_set_bankptr(machine, "bank4", &ROM[3 * 0x2000]); } static DRIVER_INIT( porky ) @@ -5632,11 +5635,15 @@ static DRIVER_INIT( porky ) ROM[i] = BITSWAP8(ROM[i],7,6,5,0,3,2,1,4); } - for( i = 0; i < 4; i++) - memory_configure_bank(machine, i + 1, 0, 2, &ROM[i * 0x2000], 0x8000); + memory_configure_bank(machine, "bank1", 0, 2, &ROM[0 * 0x2000], 0x8000); + memory_configure_bank(machine, "bank2", 0, 2, &ROM[1 * 0x2000], 0x8000); + memory_configure_bank(machine, "bank3", 0, 2, &ROM[2 * 0x2000], 0x8000); + memory_configure_bank(machine, "bank4", 0, 2, &ROM[3 * 0x2000], 0x8000); - for( i = 0; i < 4; i++) - memory_set_bankptr(machine, i + 1, &ROM[i * 0x2000]); + memory_set_bank(machine, "bank1", 0); + memory_set_bank(machine, "bank2", 0); + memory_set_bank(machine, "bank3", 0); + memory_set_bank(machine, "bank4", 0); } static DRIVER_INIT( rocktrv2 ) @@ -5717,8 +5724,8 @@ static READ8_HANDLER( cannonbp_protection_r ) static DRIVER_INIT( cannonbp ) { /* extra memory */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4800, 0x4bff, 0, 0, (read8_space_func)SMH_BANK(5), (write8_space_func)SMH_BANK(5)); - memory_set_bankptr(machine, 5, auto_alloc_array(machine, UINT8, 0x400)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4800, 0x4bff, 0, 0, "bank5"); + memory_set_bankptr(machine, "bank5", auto_alloc_array(machine, UINT8, 0x400)); /* protection? */ memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x3000, 0x3fff, 0, 0, cannonbp_protection_r); diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index 18598bacbd3..403865d70fe 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -52,7 +52,7 @@ static WRITE8_HANDLER( paradise_rombank_w ) } if (bank >= 3) bank+=1; - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "maincpu") + bank * 0x4000); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + bank * 0x4000); } static WRITE8_DEVICE_HANDLER( paradise_okibank_w ) @@ -69,7 +69,7 @@ static WRITE8_HANDLER( torus_coin_counter_w ) #define STANDARD_MAP \ AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */ \ - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) /* ROM (banked) */ \ + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* ROM (banked) */ \ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paradise_vram_2_w) AM_BASE(¶dise_vram_2 ) /* Background */ \ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(paradise_vram_1_w) AM_BASE(¶dise_vram_1 ) /* Midground */ \ AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(paradise_vram_0_w) AM_BASE(¶dise_vram_0 ) /* Foreground */ \ diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index dcd29fd7eb5..9f34c207b1d 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -145,7 +145,7 @@ static ADDRESS_MAP_START( parodius_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3fcc, 0x3fcd) AM_DEVREADWRITE("konami", parodius_sound_r,k053260_w) /* K053260 */ AM_RANGE(0x2000, 0x27ff) AM_READWRITE(parodius_052109_053245_r,parodius_052109_053245_w) AM_RANGE(0x2000, 0x5fff) AM_READWRITE(K052109_r,K052109_w) - AM_RANGE(0x6000, 0x9fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x6000, 0x9fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END @@ -326,7 +326,7 @@ static KONAMI_SETLINES_CALLBACK( parodius_banking ) offs = 0x10000 + (((lines & 0x0f)^0x0f) * 0x4000); if (offs >= 0x48000) offs -= 0x40000; - memory_set_bankptr(device->machine, 1, &RAM[offs] ); + memory_set_bankptr(device->machine, "bank1", &RAM[offs] ); } static MACHINE_RESET( parodius ) @@ -340,7 +340,7 @@ static MACHINE_RESET( parodius ) videobank = 0; /* init the default bank */ - memory_set_bankptr(machine, 1,&RAM[0x10000]); + memory_set_bankptr(machine, "bank1",&RAM[0x10000]); } diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index 835f42fa23a..679763161a3 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -100,7 +100,7 @@ static WRITE16_HANDLER( pasha2_misc_w ) case 0xb000: case 0xc000: case 0xd000: - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "user2") + 0x400 * (bank - 0x8000)); break; + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "user2") + 0x400 * (bank - 0x8000)); break; } } } @@ -206,7 +206,7 @@ static ADDRESS_MAP_START( pasha2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x40070000, 0x40070001) AM_WRITE(vbuffer_clear_w) AM_RANGE(0x40074000, 0x40074001) AM_WRITE(vbuffer_set_w) AM_RANGE(0x40078000, 0x40078001) AM_WRITENOP //once at startup -> to disable the eeprom? - AM_RANGE(0x80000000, 0x803fffff) AM_ROMBANK(1) + AM_RANGE(0x80000000, 0x803fffff) AM_ROMBANK("bank1") AM_RANGE(0xe0000000, 0xe00003ff) AM_RAM_WRITE(pasha2_palette_w) AM_BASE_GENERIC(paletteram) //tilemap? palette? AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION("user1",0) ADDRESS_MAP_END @@ -447,7 +447,7 @@ static DRIVER_INIT( pasha2 ) { memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x95744, 0x95747, 0, 0, pasha2_speedup_r ); - memory_set_bankptr(machine, 1, memory_region(machine, "user2")); + memory_set_bankptr(machine, "bank1", memory_region(machine, "user2")); } GAME( 1998, pasha2, 0, pasha2, pasha2, pasha2, ROT0, "Dong Sung", "Pasha Pasha 2", GAME_IMPERFECT_SOUND ) diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c index fad671b0c9c..9fdf309d863 100644 --- a/src/mame/drivers/pcktgal.c +++ b/src/mame/drivers/pcktgal.c @@ -31,16 +31,16 @@ static WRITE8_HANDLER( pcktgal_bank_w ) { UINT8 *RAM = memory_region(space->machine, "maincpu"); - if (data & 1) { memory_set_bankptr(space->machine, 1, &RAM[0x4000]); } - else { memory_set_bankptr(space->machine, 1, &RAM[0x10000]); } + if (data & 1) { memory_set_bankptr(space->machine, "bank1", &RAM[0x4000]); } + else { memory_set_bankptr(space->machine, "bank1", &RAM[0x10000]); } - if (data & 2) { memory_set_bankptr(space->machine, 2, &RAM[0x6000]); } - else { memory_set_bankptr(space->machine, 2, &RAM[0x12000]); } + if (data & 2) { memory_set_bankptr(space->machine, "bank2", &RAM[0x6000]); } + else { memory_set_bankptr(space->machine, "bank2", &RAM[0x12000]); } } static WRITE8_HANDLER( pcktgal_sound_bank_w ) { - memory_set_bank(space->machine, 3, (data >> 2) & 1); + memory_set_bank(space->machine, "bank3", (data >> 2) & 1); } static WRITE8_HANDLER( pcktgal_sound_w ) @@ -85,8 +85,8 @@ static ADDRESS_MAP_START( pcktgal_map, ADDRESS_SPACE_PROGRAM, 8 ) /* 1800 - 0x181f are unused BAC-06 registers, see video/dec0.c */ AM_RANGE(0x1a00, 0x1a00) AM_READ_PORT("P2") AM_WRITE(pcktgal_sound_w) AM_RANGE(0x1c00, 0x1c00) AM_READ_PORT("DSW") AM_WRITE(pcktgal_bank_w) - AM_RANGE(0x4000, 0x5fff) AM_ROMBANK(1) - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(2) + AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank2") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -101,7 +101,7 @@ static ADDRESS_MAP_START( pcktgal_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_WRITE(pcktgal_sound_bank_w) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) AM_RANGE(0x3400, 0x3400) AM_DEVREAD("msm", pcktgal_adpcm_reset_r) /* ? not sure */ - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(3) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank3") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -424,8 +424,8 @@ static DRIVER_INIT( deco222 ) for (A = 0x8000;A < 0x18000;A++) decrypted[A-0x8000] = (rom[A] & 0x9f) | ((rom[A] & 0x20) << 1) | ((rom[A] & 0x40) >> 1); - memory_configure_bank(machine, 3, 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0x4000); - memory_configure_bank_decrypted(machine, 3, 0, 2, &decrypted[0x8000], 0x4000); + memory_configure_bank(machine, "bank3", 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank_decrypted(machine, "bank3", 0, 2, &decrypted[0x8000], 0x4000); } static DRIVER_INIT( graphics ) @@ -434,7 +434,7 @@ static DRIVER_INIT( graphics ) int len = memory_region_length(machine, "gfx1"); int i,j,temp[16]; - memory_configure_bank(machine, 3, 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank3", 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0x4000); /* Tile graphics roms have some swapped lines, original version only */ for (i = 0x00000;i < len;i += 32) diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index 430bf075a02..37e31c08622 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -383,7 +383,7 @@ static WRITE8_HANDLER( disk_iobank_w ) if (newbank != bank) { bank = newbank; - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "user1") + 0x10000 * bank ); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "user1") + 0x10000 * bank ); } lastvalue = data; @@ -677,7 +677,7 @@ static ADDRESS_MAP_START( filetto_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00400, 0x007ff) AM_RAM AM_BASE(&work_ram) AM_RANGE(0x00800, 0x9ffff) AM_RAM //work RAM 640KB AM_RANGE(0xa0000, 0xbffff) AM_RAM_WRITE(vga_vram_w) AM_BASE(&vga_vram)//VGA RAM - AM_RANGE(0xc0000, 0xcffff) AM_READ(SMH_BANK(1)) + AM_RANGE(0xc0000, 0xcffff) AM_ROMBANK("bank1") AM_RANGE(0xf0000, 0xfffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index 8965c107ace..3b27bb509a6 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -536,7 +536,7 @@ static NVRAM_HANDLER( pgm ) static ADDRESS_MAP_START( pgm_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x000000, 0x01ffff) AM_ROM /* BIOS ROM */ - AM_RANGE(0x100000, 0x5fffff) AM_ROMBANK(1) /* Game ROM */ + AM_RANGE(0x100000, 0x5fffff) AM_ROMBANK("bank1") /* Game ROM */ AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog? @@ -568,7 +568,7 @@ static UINT16 *killbld_sharedprotram; static ADDRESS_MAP_START( killbld_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x000000, 0x01ffff) AM_ROM /* BIOS ROM */ - AM_RANGE(0x100000, 0x2fffff) AM_ROMBANK(1) /* Game ROM */ + AM_RANGE(0x100000, 0x2fffff) AM_ROMBANK("bank1") /* Game ROM */ AM_RANGE(0x300000, 0x303fff) AM_RAM AM_BASE(&killbld_sharedprotram) // Shared with protection device AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog? @@ -601,7 +601,7 @@ static UINT16 *olds_sharedprotram; static ADDRESS_MAP_START( olds_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x000000, 0x01ffff) AM_ROM /* BIOS ROM */ - AM_RANGE(0x100000, 0x3fffff) AM_ROMBANK(1) /* Game ROM */ + AM_RANGE(0x100000, 0x3fffff) AM_ROMBANK("bank1") /* Game ROM */ AM_RANGE(0x400000, 0x403fff) AM_RAM AM_BASE(&olds_sharedprotram) // Shared with protection device AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog? @@ -632,7 +632,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kov2_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x000000, 0x01ffff) AM_ROM /* BIOS ROM */ - AM_RANGE(0x100000, 0x5fffff) AM_ROMBANK(1) /* Game ROM */ + AM_RANGE(0x100000, 0x5fffff) AM_ROMBANK("bank1") /* Game ROM */ AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog? @@ -665,7 +665,7 @@ ADDRESS_MAP_END #if 0 static ADDRESS_MAP_START( cavepgm_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x000000, 0x07ffff) AM_ROM /* larger BIOS ROM */ - AM_RANGE(0xfffffe, 0xffffff) AM_ROMBANK(1) /* Game ROM (unmapped for now, might not even have it) */ + AM_RANGE(0xfffffe, 0xffffff) AM_ROMBANK("bank1") /* Game ROM (unmapped for now, might not even have it) */ AM_RANGE(0x400000, 0x4fffff) AM_RAM AM_BASE(&olds_sharedprotram) // Shared with protection device AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog? @@ -793,7 +793,7 @@ static WRITE16_HANDLER( kovsh_arm7_ram_w ) static ADDRESS_MAP_START( kovsh_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x000000, 0x01ffff) AM_ROM /* BIOS ROM */ - AM_RANGE(0x100000, 0x4effff) AM_ROMBANK(1) /* Game ROM */ + AM_RANGE(0x100000, 0x4effff) AM_ROMBANK("bank1") /* Game ROM */ AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog? @@ -902,7 +902,7 @@ static WRITE16_HANDLER( svg_latch_68k_w ) static ADDRESS_MAP_START( svg_68k_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x000000, 0x07ffff) AM_ROM /* BIOS ROM */ - AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK(1) /* Game ROM */ + AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK("bank1") /* Game ROM */ AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog? @@ -1449,7 +1449,7 @@ static void expand_colourdata(running_machine *machine) static void pgm_basic_init(running_machine *machine) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1,&ROM[0x100000]); + memory_set_bankptr(machine, "bank1",&ROM[0x100000]); expand_32x32x5bpp(machine); expand_colourdata(machine); diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c index 5b69ec03e98..f044cb76dd9 100644 --- a/src/mame/drivers/phoenix.c +++ b/src/mame/drivers/phoenix.c @@ -39,7 +39,7 @@ Pleiads: static ADDRESS_MAP_START( phoenix_memory_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x4fff) AM_READWRITE(SMH_BANK(1), phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */ + AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */ AM_RANGE(0x5000, 0x53ff) AM_WRITE(phoenix_videoreg_w) AM_RANGE(0x5800, 0x5bff) AM_WRITE(phoenix_scroll_w) AM_RANGE(0x6000, 0x63ff) AM_DEVWRITE("discrete", phoenix_sound_control_a_w) @@ -50,7 +50,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pleiads_memory_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x4fff) AM_READWRITE(SMH_BANK(1), phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */ + AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */ AM_RANGE(0x5000, 0x53ff) AM_WRITE(pleiads_videoreg_w) AM_RANGE(0x5800, 0x5bff) AM_WRITE(phoenix_scroll_w) AM_RANGE(0x6000, 0x63ff) AM_WRITE(pleiads_sound_control_a_w) @@ -61,7 +61,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( survival_memory_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x4fff) AM_READWRITE(SMH_BANK(1), phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */ + AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */ AM_RANGE(0x5000, 0x53ff) AM_WRITE(phoenix_videoreg_w) AM_RANGE(0x5800, 0x5bff) AM_WRITE(phoenix_scroll_w) AM_RANGE(0x6800, 0x68ff) AM_DEVWRITE("aysnd", ay8910_address_w) @@ -445,7 +445,7 @@ static const ay8910_interface survival_ay8910_interface = static MACHINE_RESET( phoenix ) { - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x4000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x4000); } diff --git a/src/mame/drivers/photon.c b/src/mame/drivers/photon.c index 08b1de9ec69..e03b256cd57 100644 --- a/src/mame/drivers/photon.c +++ b/src/mame/drivers/photon.c @@ -30,51 +30,51 @@ static void pk8000_set_bank(running_machine *machine,UINT8 data) switch(block1) { case 0: - memory_set_bankptr(machine, 1, rom + 0x10000); - memory_set_bankptr(machine, 5, ram); + memory_set_bankptr(machine, "bank1", rom + 0x10000); + memory_set_bankptr(machine, "bank5", ram); break; case 1: break; case 2: break; case 3: - memory_set_bankptr(machine, 1, ram); - memory_set_bankptr(machine, 5, ram); + memory_set_bankptr(machine, "bank1", ram); + memory_set_bankptr(machine, "bank5", ram); break; } switch(block2) { case 0: - memory_set_bankptr(machine, 2, rom + 0x14000); - memory_set_bankptr(machine, 6, ram + 0x4000); + memory_set_bankptr(machine, "bank2", rom + 0x14000); + memory_set_bankptr(machine, "bank6", ram + 0x4000); break; case 1: break; case 2: break; case 3: - memory_set_bankptr(machine, 2, ram + 0x4000); - memory_set_bankptr(machine, 6, ram + 0x4000); + memory_set_bankptr(machine, "bank2", ram + 0x4000); + memory_set_bankptr(machine, "bank6", ram + 0x4000); break; } switch(block3) { case 0: - memory_set_bankptr(machine, 3, rom + 0x18000); - memory_set_bankptr(machine, 7, ram + 0x8000); + memory_set_bankptr(machine, "bank3", rom + 0x18000); + memory_set_bankptr(machine, "bank7", ram + 0x8000); break; case 1: break; case 2: break; case 3: - memory_set_bankptr(machine, 3, ram + 0x8000); - memory_set_bankptr(machine, 7, ram + 0x8000); + memory_set_bankptr(machine, "bank3", ram + 0x8000); + memory_set_bankptr(machine, "bank7", ram + 0x8000); break; } switch(block4) { case 0: - memory_set_bankptr(machine, 4, rom + 0x1c000); - memory_set_bankptr(machine, 8, ram + 0xc000); + memory_set_bankptr(machine, "bank4", rom + 0x1c000); + memory_set_bankptr(machine, "bank8", ram + 0xc000); break; case 1: break; case 2: break; case 3: - memory_set_bankptr(machine, 4, ram + 0xc000); - memory_set_bankptr(machine, 8, ram + 0xc000); + memory_set_bankptr(machine, "bank4", ram + 0xc000); + memory_set_bankptr(machine, "bank8", ram + 0xc000); break; } } @@ -129,10 +129,10 @@ static I8255A_INTERFACE( pk8000_ppi8255_interface_2 ) static ADDRESS_MAP_START(pk8000_mem, ADDRESS_SPACE_PROGRAM, 8) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE( 0x0000, 0x3fff ) AM_READWRITE(SMH_BANK(1), SMH_BANK(5)) - AM_RANGE( 0x4000, 0x7fff ) AM_READWRITE(SMH_BANK(2), SMH_BANK(6)) - AM_RANGE( 0x8000, 0xbfff ) AM_READWRITE(SMH_BANK(3), SMH_BANK(7)) - AM_RANGE( 0xc000, 0xffff ) AM_READWRITE(SMH_BANK(4), SMH_BANK(8)) + AM_RANGE( 0x0000, 0x3fff ) AM_READ_BANK("bank1") AM_WRITE_BANK("bank5") + AM_RANGE( 0x4000, 0x7fff ) AM_READ_BANK("bank2") AM_WRITE_BANK("bank6") + AM_RANGE( 0x8000, 0xbfff ) AM_READ_BANK("bank3") AM_WRITE_BANK("bank7") + AM_RANGE( 0xc000, 0xffff ) AM_READ_BANK("bank4") AM_WRITE_BANK("bank8") ADDRESS_MAP_END static ADDRESS_MAP_START( pk8000_io , ADDRESS_SPACE_IO, 8) diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c index da0e04b89ad..831d7f85684 100644 --- a/src/mame/drivers/photon2.c +++ b/src/mame/drivers/photon2.c @@ -182,7 +182,7 @@ static WRITE8_HANDLER(photon2_membank_w) logerror( "Unknown banking write: %02X\n", data); } - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "maincpu") + 0x4000*bank ); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x4000*bank ); } static READ8_HANDLER(photon2_fe_r) @@ -210,7 +210,7 @@ static WRITE8_HANDLER(photon2_misc_w) *************************************/ static ADDRESS_MAP_START (spectrum_mem, ADDRESS_SPACE_PROGRAM, 8) - AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x5aff) AM_RAM AM_BASE(&spectrum_video_ram ) AM_RANGE(0x5b00, 0xffff) AM_RAM ADDRESS_MAP_END @@ -293,7 +293,7 @@ static INTERRUPT_GEN( spec_interrupt_hack ) static MACHINE_RESET( photon2 ) { - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu")); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu")); } static MACHINE_DRIVER_START( photon2 ) diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c index ce8c680db6d..664a12403be 100644 --- a/src/mame/drivers/pingpong.c +++ b/src/mame/drivers/pingpong.c @@ -58,10 +58,11 @@ static WRITE8_HANDLER( cashquiz_question_bank_low_w ) { if(data >= 0x60 && data <= 0xdf) { - int bank = data & 7; + static const char * const bankname[] = { "bank1", "bank2", "bank3", "bank4", "bank5", "bank6", "bank7", "bank8" }; + const char *bank = bankname[data & 7]; int bankaddr = question_addr_high | ((data - 0x60) * 0x100); UINT8 *questions = memory_region(space->machine, "user1") + bankaddr; - memory_set_bankptr(space->machine, bank + 1,questions); + memory_set_bankptr(space->machine, bank,questions); } } @@ -598,18 +599,24 @@ static DRIVER_INIT( cashquiz ) memory_install_write8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x4001, 0x4001, 0, 0, cashquiz_question_bank_low_w); // 8 independents banks for questions - memory_install_read8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x50ff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_install_read8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5100, 0x51ff, 0, 0, (read8_space_func)SMH_BANK(2)); - memory_install_read8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5200, 0x52ff, 0, 0, (read8_space_func)SMH_BANK(3)); - memory_install_read8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5300, 0x53ff, 0, 0, (read8_space_func)SMH_BANK(4)); - memory_install_read8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5400, 0x54ff, 0, 0, (read8_space_func)SMH_BANK(5)); - memory_install_read8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5500, 0x55ff, 0, 0, (read8_space_func)SMH_BANK(6)); - memory_install_read8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5600, 0x56ff, 0, 0, (read8_space_func)SMH_BANK(7)); - memory_install_read8_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5700, 0x57ff, 0, 0, (read8_space_func)SMH_BANK(8)); + memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x50ff, 0, 0, "bank1"); + memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5100, 0x51ff, 0, 0, "bank2"); + memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5200, 0x52ff, 0, 0, "bank3"); + memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5300, 0x53ff, 0, 0, "bank4"); + memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5400, 0x54ff, 0, 0, "bank5"); + memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5500, 0x55ff, 0, 0, "bank6"); + memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5600, 0x56ff, 0, 0, "bank7"); + memory_install_read_bank_handler(cputag_get_address_space(machine, "cpu", ADDRESS_SPACE_PROGRAM), 0x5700, 0x57ff, 0, 0, "bank8"); // setup default banks - for(i = 0; i < 8; i++) - memory_set_bankptr(machine, i+1, memory_region(machine, "user1") + 0x100*i ); + memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + 0x100*0 ); + memory_set_bankptr(machine, "bank2", memory_region(machine, "user1") + 0x100*1 ); + memory_set_bankptr(machine, "bank3", memory_region(machine, "user1") + 0x100*2 ); + memory_set_bankptr(machine, "bank4", memory_region(machine, "user1") + 0x100*3 ); + memory_set_bankptr(machine, "bank5", memory_region(machine, "user1") + 0x100*4 ); + memory_set_bankptr(machine, "bank6", memory_region(machine, "user1") + 0x100*5 ); + memory_set_bankptr(machine, "bank7", memory_region(machine, "user1") + 0x100*6 ); + memory_set_bankptr(machine, "bank8", memory_region(machine, "user1") + 0x100*7 ); } diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 823e8976bd6..cc85299e819 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -181,12 +181,12 @@ static UINT8 sound_command; static MACHINE_RESET( pipedrm ) { /* initialize main Z80 bank */ - memory_configure_bank(machine, 1, 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x2000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_set_bank(machine, "bank1", 0); /* initialize sound bank */ - memory_configure_bank(machine, 2, 0, 2, memory_region(machine, "sub") + 0x10000, 0x8000); - memory_set_bank(machine, 2, 0); + memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "sub") + 0x10000, 0x8000); + memory_set_bank(machine, "bank2", 0); /* state save */ state_save_register_global(machine, pending_command); state_save_register_global(machine, sound_command); @@ -208,7 +208,7 @@ static WRITE8_HANDLER( pipedrm_bankswitch_w ) */ /* set the memory bank on the Z80 using the low 3 bits */ - memory_set_bank(space->machine, 1, data & 0x7); + memory_set_bank(space->machine, "bank1", data & 0x7); /* map to the fromance gfx register */ fromance_gfxreg_w(space, offset, ((data >> 6) & 0x01) | /* flipscreen */ @@ -218,7 +218,7 @@ static WRITE8_HANDLER( pipedrm_bankswitch_w ) static WRITE8_HANDLER( sound_bankswitch_w ) { - memory_set_bank(space->machine, 2, data & 0x01); + memory_set_bank(space->machine, "bank2", data & 0x01); } @@ -283,7 +283,7 @@ static READ8_HANDLER( sound_command_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_RAM - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xd000, 0xffff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w) AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) ADDRESS_MAP_END @@ -313,7 +313,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank2") ADDRESS_MAP_END @@ -848,8 +848,8 @@ static DRIVER_INIT( pipedrm ) /* sprite RAM lives at the end of palette RAM */ machine->generic.spriteram.u8 = &machine->generic.paletteram.u8[0xc00]; machine->generic.spriteram_size = 0x400; - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xcc00, 0xcfff, 0, 0, (read8_space_func)SMH_BANK(3), (write8_space_func)SMH_BANK(3)); - memory_set_bankptr(machine, 3, machine->generic.spriteram.v); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xcc00, 0xcfff, 0, 0, "bank3"); + memory_set_bankptr(machine, "bank3", machine->generic.spriteram.v); } diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index 927810a7c05..f6590aaaab7 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -585,7 +585,7 @@ static int cur_sound_region; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 2, memory_region(machine, "soundcpu") + 0x10000 + cur_sound_region*0x4000); + memory_set_bankptr(machine, "bank2", memory_region(machine, "soundcpu") + 0x10000 + cur_sound_region*0x4000); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -601,7 +601,7 @@ static INTERRUPT_GEN(audio_interrupt) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK(2)) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0x0000, 0xbfff) AM_WRITENOP AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami1", k054539_r, k054539_w) diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c index 194fd81d2e9..6612da5d7cb 100644 --- a/src/mame/drivers/pokechmp.c +++ b/src/mame/drivers/pokechmp.c @@ -63,31 +63,31 @@ static WRITE8_HANDLER( pokechmp_bank_w ) if (data == 0x00) { - memory_set_bankptr(space->machine, 1,&RAM[0x10000]); - memory_set_bankptr(space->machine, 2,&RAM[0x12000]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x10000]); + memory_set_bankptr(space->machine, "bank2",&RAM[0x12000]); } if (data == 0x01) { - memory_set_bankptr(space->machine, 1,&RAM[0x14000]); - memory_set_bankptr(space->machine, 2,&RAM[0x16000]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x14000]); + memory_set_bankptr(space->machine, "bank2",&RAM[0x16000]); } if (data == 0x02) { - memory_set_bankptr(space->machine, 1,&RAM[0x20000]); - memory_set_bankptr(space->machine, 2,&RAM[0x22000]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x20000]); + memory_set_bankptr(space->machine, "bank2",&RAM[0x22000]); } if (data == 0x03) { - memory_set_bankptr(space->machine, 1,&RAM[0x04000]); - memory_set_bankptr(space->machine, 2,&RAM[0x06000]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x04000]); + memory_set_bankptr(space->machine, "bank2",&RAM[0x06000]); } } #ifdef UNUSED_FUNCTION static WRITE8_HANDLER( pokechmp_sound_bank_w ) { - memory_set_bank(space->machine, 3, (data >> 2) & 1); + memory_set_bank(space->machine, "bank3", (data >> 2) & 1); } #endif @@ -127,8 +127,8 @@ static ADDRESS_MAP_START( pokechmp_map, ADDRESS_SPACE_PROGRAM, 8 ) /* Extra on Poke Champ (not on Pocket Gal) */ AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(pokechmp_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x4000, 0x5fff) AM_ROMBANK(1) - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(2) + AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank2") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -144,7 +144,7 @@ static ADDRESS_MAP_START( pokechmp_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2800) AM_DEVREADWRITE("oki", okim6295_r,okim6295_w) // extra AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) // AM_RANGE(0x3400, 0x3400) AM_READ(pokechmp_adpcm_reset_r) /* ? not sure */ - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(3) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank3") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -270,7 +270,7 @@ MACHINE_DRIVER_END static DRIVER_INIT( pokechmp ) { - memory_configure_bank(machine, 3, 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank3", 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0x4000); } diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index a5fae2680e2..670f8e6da69 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -160,12 +160,12 @@ static WRITE8_HANDLER( ppmast93_port4_w ) coin_counter_w(space->machine, 1, data & 0x10); bank = data & 0x07; - memory_set_bankptr(space->machine, 1,&rom[0x10000+(bank*0x4000)]); + memory_set_bankptr(space->machine, "bank1",&rom[0x10000+(bank*0x4000)]); } static ADDRESS_MAP_START( ppmast93_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_WRITENOP AM_REGION("maincpu", 0x10000) - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(ppmast93_bgram_w) AM_BASE(&ppmast93_bgram) AM_SHARE(1) AM_RANGE(0xd800, 0xdfff) AM_WRITENOP AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(ppmast93_fgram_w) AM_BASE(&ppmast93_fgram) AM_SHARE(2) diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index d4b74043547..8f406835cca 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -390,13 +390,13 @@ static WRITE8_HANDLER( sngkace_sound_bankswitch_w ) { UINT8 *RAM = memory_region(space->machine, "audiocpu"); int bank = data & 3; - memory_set_bankptr(space->machine, 1, &RAM[bank * 0x8000 + 0x10000]); + memory_set_bankptr(space->machine, "bank1", &RAM[bank * 0x8000 + 0x10000]); } static ADDRESS_MAP_START( sngkace_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM // ROM AM_RANGE(0x7800, 0x7fff) AM_RAM // RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( sngkace_sound_io_map, ADDRESS_SPACE_IO, 8 ) @@ -420,13 +420,13 @@ static WRITE8_HANDLER( gunbird_sound_bankswitch_w ) /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - memory_set_bankptr(space->machine, 1, &RAM[bank * 0x8000 + 0x10000 + 0x200]); + memory_set_bankptr(space->machine, "bank1", &RAM[bank * 0x8000 + 0x10000 + 0x200]); } static ADDRESS_MAP_START( gunbird_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM AM_RANGE(0x8000, 0x81ff) AM_RAM // RAM - AM_RANGE(0x8200, 0xffff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8200, 0xffff) AM_ROMBANK("bank1") // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( gunbird_sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index b488f4f6974..9ce45b9381e 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -347,7 +347,7 @@ static WRITE32_HANDLER( ps4_vidregs_w ) if (ACCESSING_BITS_0_15) // Bank { UINT8 *ROM = memory_region(space->machine, "gfx1"); - memory_set_bankptr(space->machine, 2,&ROM[0x2000 * (psikyo4_vidregs[offset]&0x1fff)]); /* Bank comes from vidregs */ + memory_set_bankptr(space->machine, "bank2",&ROM[0x2000 * (psikyo4_vidregs[offset]&0x1fff)]); /* Bank comes from vidregs */ } } #endif @@ -393,7 +393,7 @@ static WRITE32_HANDLER( hotgmck_pcm_bank_w ) static ADDRESS_MAP_START( ps4_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x000fffff) AM_ROM // program ROM (1 meg) - AM_RANGE(0x02000000, 0x021fffff) AM_ROMBANK(1) // data ROM + AM_RANGE(0x02000000, 0x021fffff) AM_ROMBANK("bank1") // data ROM AM_RANGE(0x03000000, 0x030037ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0x03003fe0, 0x03003fe3) AM_READWRITE(ps4_eeprom_r,ps4_eeprom_w) AM_RANGE(0x03003fe4, 0x03003fe7) AM_READNOP // also writes to this address - might be vblank? @@ -414,7 +414,7 @@ static ADDRESS_MAP_START( ps4_map, ADDRESS_SPACE_PROGRAM, 32 ) #if ROMTEST AM_RANGE(0x05000004, 0x05000007) AM_READ(ps4_sample_r) // data for rom tests (Used to verify Sample rom) - AM_RANGE(0x03006000, 0x03007fff) AM_ROMBANK(2) // data for rom tests (gfx), data is controlled by vidreg + AM_RANGE(0x03006000, 0x03007fff) AM_ROMBANK("bank2") // data for rom tests (gfx), data is controlled by vidreg #endif ADDRESS_MAP_END @@ -1053,7 +1053,7 @@ static void install_hotgmck_pcm_bank(running_machine *machine) static DRIVER_INIT( hotgmck ) { UINT8 *RAM = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1, &RAM[0x100000]); + memory_set_bankptr(machine, "bank1", &RAM[0x100000]); install_hotgmck_pcm_bank(machine); // Banked PCM ROM } diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index dc8770366ce..ae8d4b46341 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -461,7 +461,7 @@ static WRITE32_HANDLER( psikyosh_vidregs_w ) if (ACCESSING_BITS_0_15) // Bank { UINT8 *ROM = memory_region(space->machine, "gfx1"); - memory_set_bankptr(space->machine, 2,&ROM[0x20000 * (psikyosh_vidregs[offset]&0xfff)]); /* Bank comes from vidregs */ + memory_set_bankptr(space->machine, "bank2",&ROM[0x20000 * (psikyosh_vidregs[offset]&0xfff)]); /* Bank comes from vidregs */ } } #endif @@ -481,7 +481,7 @@ static READ32_HANDLER( psh_sample_r ) /* Send sample data for test */ static ADDRESS_MAP_START( ps3v1_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x000fffff) AM_ROM // program ROM (1 meg) - AM_RANGE(0x02000000, 0x021fffff) AM_ROMBANK(1) // data ROM + AM_RANGE(0x02000000, 0x021fffff) AM_ROMBANK("bank1") // data ROM AM_RANGE(0x03000000, 0x03003fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) // sprites (might be a bit longer) AM_RANGE(0x03004000, 0x0300ffff) AM_RAM AM_BASE(&psikyosh_bgram) // backgrounds AM_RANGE(0x03040000, 0x03044fff) AM_RAM_WRITE(paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w) AM_BASE_GENERIC(paletteram) // palette.. @@ -496,8 +496,8 @@ static ADDRESS_MAP_START( ps3v1_map, ADDRESS_SPACE_PROGRAM, 32 ) #if ROMTEST AM_RANGE(0x05000004, 0x05000007) AM_READ(psh_sample_r) // data for rom tests (Used to verify Sample rom) - AM_RANGE(0x03060000, 0x0307ffff) AM_ROMBANK(2) // data for rom tests (gfx), data is controlled by vidreg - AM_RANGE(0x04060000, 0x0407ffff) AM_ROMBANK(2) // data for rom tests (gfx) (Mirrored?) + AM_RANGE(0x03060000, 0x0307ffff) AM_ROMBANK("bank2") // data for rom tests (gfx), data is controlled by vidreg + AM_RANGE(0x04060000, 0x0407ffff) AM_ROMBANK("bank2") // data for rom tests (gfx) (Mirrored?) #endif ADDRESS_MAP_END @@ -513,12 +513,12 @@ static ADDRESS_MAP_START( ps5_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x04050000, 0x040501ff) AM_RAM AM_BASE(&psikyosh_zoomram) AM_RANGE(0x0405ffdc, 0x0405ffdf) AM_READNOP AM_WRITE(psikyosh_irqctrl_w) // also writes to this address - might be vblank reads? AM_RANGE(0x0405ffe0, 0x0405ffff) AM_RAM_WRITE(psikyosh_vidregs_w) AM_BASE(&psikyosh_vidregs) // video registers - AM_RANGE(0x05000000, 0x0507ffff) AM_ROMBANK(1) // data ROM + AM_RANGE(0x05000000, 0x0507ffff) AM_ROMBANK("bank1") // data ROM AM_RANGE(0x06000000, 0x060fffff) AM_RAM AM_BASE(&psh_ram) #if ROMTEST AM_RANGE(0x03100004, 0x03100007) AM_READ(psh_sample_r) // data for rom tests (Used to verify Sample rom) - AM_RANGE(0x04060000, 0x0407ffff) AM_ROMBANK(2) // data for rom tests (gfx), data is controlled by vidreg + AM_RANGE(0x04060000, 0x0407ffff) AM_ROMBANK("bank2") // data for rom tests (gfx), data is controlled by vidreg #endif ADDRESS_MAP_END @@ -1080,7 +1080,7 @@ static DRIVER_INIT( s1945ii ) static DRIVER_INIT( daraku ) { UINT8 *RAM = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1, &RAM[0x100000]); + memory_set_bankptr(machine, "bank1", &RAM[0x100000]); sh2drc_set_options(cputag_get_cpu(machine, "maincpu"), SH2DRC_FASTEST_OPTIONS); use_factory_eeprom = eeprom_DARAKU; } @@ -1094,7 +1094,7 @@ static DRIVER_INIT( sbomberb ) static DRIVER_INIT( gunbird2 ) { UINT8 *RAM = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1, &RAM[0x100000]); + memory_set_bankptr(machine, "bank1", &RAM[0x100000]); sh2drc_set_options(cputag_get_cpu(machine, "maincpu"), SH2DRC_FASTEST_OPTIONS); use_factory_eeprom = eeprom_DEFAULT; } @@ -1102,7 +1102,7 @@ static DRIVER_INIT( gunbird2 ) static DRIVER_INIT( s1945iii ) { UINT8 *RAM = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1, &RAM[0x100000]); + memory_set_bankptr(machine, "bank1", &RAM[0x100000]); sh2drc_set_options(cputag_get_cpu(machine, "maincpu"), SH2DRC_FASTEST_OPTIONS); use_factory_eeprom = eeprom_S1945III; } diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c index 23c659a9254..145bf040309 100644 --- a/src/mame/drivers/psychic5.c +++ b/src/mame/drivers/psychic5.c @@ -379,7 +379,7 @@ static WRITE8_HANDLER( psychic5_bankselect_w ) { psychic5_bank_latch = data; bankaddress = 0x10000 + ((data & 3) * 0x4000); - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); /* Select 4 banks of 16k */ + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); /* Select 4 banks of 16k */ } } @@ -392,7 +392,7 @@ static WRITE8_HANDLER( bombsa_bankselect_w ) { psychic5_bank_latch = data; bankaddress = 0x10000 + ((data & 7) * 0x4000); - memory_set_bankptr(space->machine, 1, &RAM[bankaddress]); /* Select 8 banks of 16k */ + memory_set_bankptr(space->machine, "bank1", &RAM[bankaddress]); /* Select 8 banks of 16k */ } } @@ -426,7 +426,7 @@ static WRITE8_HANDLER( bombsa_flipscreen_w ) static ADDRESS_MAP_START( psychic5_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_RAMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_READWRITE(psychic5_paged_ram_r, psychic5_paged_ram_w) AM_RANGE(0xe000, 0xefff) AM_RAM AM_RANGE(0xf000, 0xf000) AM_RAM_WRITE(soundlatch_w) @@ -455,7 +455,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bombsa_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_RAMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM /* ports look like the other games */ diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c index 3b22ffa8871..13c368fc2b3 100644 --- a/src/mame/drivers/qix.c +++ b/src/mame/drivers/qix.c @@ -1314,9 +1314,9 @@ static DRIVER_INIT( kram3 ) static DRIVER_INIT( zookeep ) { /* configure the banking */ - memory_configure_bank(machine, 1, 0, 1, memory_region(machine, "videocpu") + 0xa000, 0); - memory_configure_bank(machine, 1, 1, 1, memory_region(machine, "videocpu") + 0x10000, 0); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "videocpu") + 0xa000, 0); + memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "videocpu") + 0x10000, 0); + memory_set_bank(machine, "bank1", 0); } diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c index f307ca3e1e4..9c4a3343834 100644 --- a/src/mame/drivers/quizdna.c +++ b/src/mame/drivers/quizdna.c @@ -30,20 +30,20 @@ WRITE8_HANDLER( paletteram_xBGR_RRRR_GGGG_BBBB_w ); static WRITE8_HANDLER( quizdna_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1,&ROM[0x10000+0x4000*(data & 0x3f)]); + memory_set_bankptr(space->machine, "bank1",&ROM[0x10000+0x4000*(data & 0x3f)]); } static WRITE8_HANDLER( gekiretu_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1,&ROM[0x10000+0x4000*((data & 0x3f) ^ 0x0a)]); + memory_set_bankptr(space->machine, "bank1",&ROM[0x10000+0x4000*((data & 0x3f) ^ 0x0a)]); } /****************************************************************************/ static ADDRESS_MAP_START( quizdna_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x9fff) AM_WRITE(quizdna_fg_ram_w) AM_RANGE(0xa000, 0xbfff) AM_WRITE(quizdna_bg_ram_w) AM_RANGE(0xc000, 0xdfff) AM_RAM @@ -54,7 +54,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gekiretu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x9fff) AM_WRITE(quizdna_fg_ram_w) AM_RANGE(0xa000, 0xbfff) AM_WRITE(quizdna_bg_ram_w) AM_RANGE(0xc000, 0xdfff) AM_RAM diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c index 7c6c8bd2fb4..c2658a9ffa4 100644 --- a/src/mame/drivers/quizo.c +++ b/src/mame/drivers/quizo.c @@ -112,13 +112,13 @@ static WRITE8_HANDLER(port60_w) data=0; } port60=data; - memory_set_bankptr(space->machine, 1, &memory_region(space->machine, "user1")[rombankLookup[data]*0x4000] ); + memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "user1")[rombankLookup[data]*0x4000] ); } static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xffff) AM_WRITE(vram_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index 3be1c1c196a..17ca8655fce 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -276,7 +276,7 @@ static WRITE8_HANDLER( quizpun2_protection_w ) static WRITE8_HANDLER( quizpun2_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1, &ROM[ 0x10000 + 0x2000 * (data & 0x1f) ] ); + memory_set_bankptr(space->machine, "bank1", &ROM[ 0x10000 + 0x2000 * (data & 0x1f) ] ); } static WRITE8_HANDLER( quizpun2_irq_ack ) @@ -292,7 +292,7 @@ static WRITE8_HANDLER( quizpun2_soundlatch_w ) static ADDRESS_MAP_START( quizpun2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x7fff ) AM_ROM - AM_RANGE( 0x8000, 0x9fff ) AM_ROMBANK(1) + AM_RANGE( 0x8000, 0x9fff ) AM_ROMBANK("bank1") AM_RANGE( 0xa000, 0xbfff ) AM_RAM_WRITE( fg_ram_w ) AM_BASE( &fg_ram ) // 4 * 800 AM_RANGE( 0xc000, 0xc7ff ) AM_RAM_WRITE( bg_ram_w ) AM_BASE( &bg_ram ) // 4 * 400 diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 78cad7194c2..2b8cf76f113 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -492,9 +492,9 @@ static WRITE32_HANDLER ( rabbit_rombank_w ) printf("rabbit rombank %08x\n",data); bank = data & 0x3ff; - memory_set_bankptr(space->machine, 1,&dataroms[0x40000*(bank&0x3ff)]); + memory_set_bankptr(space->machine, "bank1",&dataroms[0x40000*(bank&0x3ff)]); #else - memory_set_bankptr(space->machine, 1,&dataroms[0]); + memory_set_bankptr(space->machine, "bank1",&dataroms[0]); #endif } @@ -731,7 +731,7 @@ static ADDRESS_MAP_START( rabbit_map, ADDRESS_SPACE_PROGRAM, 32 ) /* hmm */ AM_RANGE(0x479700, 0x479713) AM_WRITEONLY AM_BASE( &rabbit_viewregs10 ) - AM_RANGE(0x440000, 0x47ffff) AM_ROMBANK(1) // data (gfx / sound) rom readback for ROM testing + AM_RANGE(0x440000, 0x47ffff) AM_ROMBANK("bank1") // data (gfx / sound) rom readback for ROM testing /* tilemaps */ AM_RANGE(0x480000, 0x483fff) AM_READWRITE(rabbit_tilemap0_r,rabbit_tilemap0_w) AM_RANGE(0x484000, 0x487fff) AM_READWRITE(rabbit_tilemap1_r,rabbit_tilemap1_w) diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 1aaefb9af80..a7d928fdbaa 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -851,8 +851,8 @@ static ADDRESS_MAP_START( raiden2_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x10000, 0x1efff) AM_RAM_WRITE(w1x) AM_BASE(&w1ram) AM_RANGE(0x1f000, 0x1ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK(1) - AM_RANGE(0x40000, 0xfffff) AM_ROMBANK(2) + AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank1") + AM_RANGE(0x40000, 0xfffff) AM_ROMBANK("bank2") ADDRESS_MAP_END /* new zero team uses the copd3 protection... and uploads a 0x400 byte table, probably the mcu code, encrypted */ @@ -959,8 +959,8 @@ static ADDRESS_MAP_START( nzerotea_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x10000, 0x1efff) AM_RAM_WRITE(w1x) AM_BASE(&w1ram) AM_RANGE(0x1f000, 0x1ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK(1) - AM_RANGE(0x40000, 0xfffff) AM_ROMBANK(2) + AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank1") + AM_RANGE(0x40000, 0xfffff) AM_ROMBANK("bank2") ADDRESS_MAP_END @@ -2052,8 +2052,8 @@ static DRIVER_INIT (raiden2) /* wrong , there must be some banking this just stops it crashing */ UINT8 *RAM = memory_region(machine, "user1"); - memory_set_bankptr(machine, 1,&RAM[0x100000]); - memory_set_bankptr(machine, 2,&RAM[0x040000]); + memory_set_bankptr(machine, "bank1",&RAM[0x100000]); + memory_set_bankptr(machine, "bank2",&RAM[0x040000]); raiden2_decrypt_sprites(machine); } @@ -2062,8 +2062,8 @@ static DRIVER_INIT (xsedae) { /* wrong , there must be some banking this just stops it crashing */ UINT8 *RAM = memory_region(machine, "user1"); - memory_set_bankptr(machine, 1,&RAM[0x100000]); - memory_set_bankptr(machine, 2,&RAM[0x040000]); + memory_set_bankptr(machine, "bank1",&RAM[0x100000]); + memory_set_bankptr(machine, "bank2",&RAM[0x040000]); } @@ -2154,20 +2154,20 @@ static ADDRESS_MAP_START( rdx_v33_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1f000, 0x1ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram) /* not sure of bank sizes etc. */ - AM_RANGE(0x20000, 0x2ffff) AM_ROMBANK(1) - AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK(2) - AM_RANGE(0x40000, 0x4ffff) AM_ROMBANK(3) - AM_RANGE(0x50000, 0x5ffff) AM_ROMBANK(4) - AM_RANGE(0x60000, 0x6ffff) AM_ROMBANK(5) - AM_RANGE(0x70000, 0x7ffff) AM_ROMBANK(6) - AM_RANGE(0x80000, 0x8ffff) AM_ROMBANK(7) - AM_RANGE(0x90000, 0x9ffff) AM_ROMBANK(8) - AM_RANGE(0xa0000, 0xaffff) AM_ROMBANK(9) - AM_RANGE(0xb0000, 0xbffff) AM_ROMBANK(10) - AM_RANGE(0xc0000, 0xcffff) AM_ROMBANK(11) - AM_RANGE(0xd0000, 0xdffff) AM_ROMBANK(12) - AM_RANGE(0xe0000, 0xeffff) AM_ROMBANK(13) - AM_RANGE(0xf0000, 0xfffff) AM_ROMBANK(14) + AM_RANGE(0x20000, 0x2ffff) AM_ROMBANK("bank1") + AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("bank2") + AM_RANGE(0x40000, 0x4ffff) AM_ROMBANK("bank3") + AM_RANGE(0x50000, 0x5ffff) AM_ROMBANK("bank4") + AM_RANGE(0x60000, 0x6ffff) AM_ROMBANK("bank5") + AM_RANGE(0x70000, 0x7ffff) AM_ROMBANK("bank6") + AM_RANGE(0x80000, 0x8ffff) AM_ROMBANK("bank7") + AM_RANGE(0x90000, 0x9ffff) AM_ROMBANK("bank8") + AM_RANGE(0xa0000, 0xaffff) AM_ROMBANK("bank9") + AM_RANGE(0xb0000, 0xbffff) AM_ROMBANK("bank10") + AM_RANGE(0xc0000, 0xcffff) AM_ROMBANK("bank11") + AM_RANGE(0xd0000, 0xdffff) AM_ROMBANK("bank12") + AM_RANGE(0xe0000, 0xeffff) AM_ROMBANK("bank13") + AM_RANGE(0xf0000, 0xfffff) AM_ROMBANK("bank14") ADDRESS_MAP_END @@ -2296,20 +2296,20 @@ MACHINE_DRIVER_END static DRIVER_INIT(rdx_v33) { UINT8 *prg = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1,&prg[0x020000]); - memory_set_bankptr(machine, 2,&prg[0x030000]); - memory_set_bankptr(machine, 3,&prg[0x040000]); - memory_set_bankptr(machine, 4,&prg[0x050000]); - memory_set_bankptr(machine, 5,&prg[0x060000]); - memory_set_bankptr(machine, 6,&prg[0x070000]); - memory_set_bankptr(machine, 7,&prg[0x080000]); - memory_set_bankptr(machine, 8,&prg[0x090000]); - memory_set_bankptr(machine, 9,&prg[0x0a0000]); - memory_set_bankptr(machine, 10,&prg[0x0b0000]); - memory_set_bankptr(machine, 11,&prg[0x0c0000]); - memory_set_bankptr(machine, 12,&prg[0x0d0000]); - memory_set_bankptr(machine, 13,&prg[0x0e0000]); - memory_set_bankptr(machine, 14,&prg[0x0f0000]); + memory_set_bankptr(machine, "bank1",&prg[0x020000]); + memory_set_bankptr(machine, "bank2",&prg[0x030000]); + memory_set_bankptr(machine, "bank3",&prg[0x040000]); + memory_set_bankptr(machine, "bank4",&prg[0x050000]); + memory_set_bankptr(machine, "bank5",&prg[0x060000]); + memory_set_bankptr(machine, "bank6",&prg[0x070000]); + memory_set_bankptr(machine, "bank7",&prg[0x080000]); + memory_set_bankptr(machine, "bank8",&prg[0x090000]); + memory_set_bankptr(machine, "bank9",&prg[0x0a0000]); + memory_set_bankptr(machine, "bank10",&prg[0x0b0000]); + memory_set_bankptr(machine, "bank11",&prg[0x0c0000]); + memory_set_bankptr(machine, "bank12",&prg[0x0d0000]); + memory_set_bankptr(machine, "bank13",&prg[0x0e0000]); + memory_set_bankptr(machine, "bank14",&prg[0x0f0000]); raiden2_decrypt_sprites(machine); } diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index fe455236a50..c7646416773 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -406,7 +406,7 @@ ADDRESS_MAP_END static WRITE8_DEVICE_HANDLER( bankswitch_w ) { - memory_set_bankptr(device->machine, 1, memory_region(device->machine, "audiocpu") + ((data - 1) & 3) * 0x4000 + 0x10000); + memory_set_bankptr(device->machine, "bank1", memory_region(device->machine, "audiocpu") + ((data - 1) & 3) * 0x4000 + 0x10000); } static READ8_HANDLER( jumping_latch_r ) @@ -417,7 +417,7 @@ static READ8_HANDLER( jumping_latch_r ) static ADDRESS_MAP_START( rainbow_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w) AM_RANGE(0x9002, 0x9100) AM_READNOP diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index ecd17c03bf6..3e9597f51eb 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -184,7 +184,7 @@ static WRITE8_DEVICE_HANDLER( rastan_bankswitch_w ) if (data == 0) offs = 0x0000; else offs = (data-1) * 0x4000 + 0x10000; - memory_set_bankptr(device->machine, 1, memory_region(device->machine, "audiocpu") + offs ); + memory_set_bankptr(device->machine, "bank1", memory_region(device->machine, "audiocpu") + offs ); } @@ -246,7 +246,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rastan_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c index cac216678f0..04f3f173aff 100644 --- a/src/mame/drivers/renegade.c +++ b/src/mame/drivers/renegade.c @@ -255,7 +255,7 @@ static const UINT8 kuniokun_xor_table[0x2a] = static void setbank(running_machine *machine) { UINT8 *RAM = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1, &RAM[bank ? 0x10000 : 0x4000]); + memory_set_bankptr(machine, "bank1", &RAM[bank ? 0x10000 : 0x4000]); } static STATE_POSTLOAD( renegade_postload ) @@ -550,7 +550,7 @@ static ADDRESS_MAP_START( renegade_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3805, 0x3805) AM_READWRITE(mcu_reset_r,bankswitch_w) AM_RANGE(0x3806, 0x3806) AM_WRITENOP // ?? watchdog AM_RANGE(0x3807, 0x3807) AM_WRITE(renegade_coin_counter_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index eb8cea09a39..aafadb8e760 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -160,8 +160,8 @@ static WRITE8_HANDLER( themj_rombank_w ) UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000; int bank = data & 0x03; logerror("banksw %d\n",bank); - memory_set_bankptr(space->machine, 1, rom + bank*0x4000); - memory_set_bankptr(space->machine, 2, rom + bank*0x4000 + 0x2000); + memory_set_bankptr(space->machine, "bank1", rom + bank*0x4000); + memory_set_bankptr(space->machine, "bank2", rom + bank*0x4000 + 0x2000); } static MACHINE_RESET( themj ) @@ -197,11 +197,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( themj_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(rmhaihai_colorram_w) AM_BASE_GENERIC(colorram) AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE(rmhaihai_videoram_w) AM_BASE_GENERIC(videoram) - AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(2) + AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank2") AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index 8e39636fb9d..48eae3726bd 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -73,7 +73,7 @@ static WRITE8_HANDLER( rockrage_bankswitch_w ) /* bits 4-6 = bank number */ bankaddress = 0x10000 + ((data & 0x70) >> 4) * 0x2000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); /* bits 0 & 1 = coin counters */ coin_counter_w(space->machine, 0,data & 0x01); @@ -116,7 +116,7 @@ static ADDRESS_MAP_START( rockrage_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2f00, 0x2f00) AM_WRITE(rockrage_vreg_w) /* ??? */ AM_RANGE(0x2f40, 0x2f40) AM_WRITE(rockrage_bankswitch_w) /* bankswitch control */ AM_RANGE(0x4000, 0x5fff) AM_RAM /* RAM */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index adb3a9f9eca..4277ad9ed92 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -273,7 +273,7 @@ static ADDRESS_MAP_START( rohga_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r,okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r,okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index cd11de74d85..118230d8458 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -98,7 +98,7 @@ static ADDRESS_MAP_START( rollerg_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x17ff) AM_READWRITE(K053245_r,K053245_w) AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0x2000, 0x3aff) AM_RAM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -318,7 +318,7 @@ static KONAMI_SETLINES_CALLBACK( rollerg_banking ) offs = 0x10000 + ((lines & 0x07) * 0x4000); if (offs >= 0x28000) offs -= 0x20000; - memory_set_bankptr(device->machine, 1,&RAM[offs]); + memory_set_bankptr(device->machine, "bank1",&RAM[offs]); } static MACHINE_RESET( rollerg ) diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index c1209f00e79..8af50788503 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -301,7 +301,7 @@ logerror("%04x: bank %02x\n",cpu_get_pc(space->cpu),data); /* bits 6, 4 and 3 used for something input related? */ address = 0x10000 + (data & 0x07) * 0x8000; - memory_set_bankptr(space->machine, 1,&rom[address]); + memory_set_bankptr(space->machine, "bank1",&rom[address]); } @@ -309,7 +309,7 @@ static WRITE8_HANDLER ( mjapinky_bank_w ) { UINT8 *ROM = memory_region(space->machine, "maincpu"); rombank = data; - memory_set_bankptr(space->machine, 1,ROM + 0x10000 + 0x8000 * data); + memory_set_bankptr(space->machine, "bank1",ROM + 0x10000 + 0x8000 * data); } static WRITE8_HANDLER( mjapinky_palbank_w ) @@ -339,7 +339,7 @@ logerror("%04x: bank %02x\n",cpu_get_pc(space->cpu),data); address = 0x10000 + data * 0x8000; - memory_set_bankptr(space->machine, 1,&rom[address]); + memory_set_bankptr(space->machine, "bank1",&rom[address]); } @@ -357,7 +357,7 @@ static WRITE8_HANDLER ( dynax_bank_w ) address = 0x10000 + data * 0x8000; - memory_set_bankptr(space->machine, 1,&rom[address]); + memory_set_bankptr(space->machine, "bank1",&rom[address]); } static READ8_HANDLER ( daisyari_dsw_r ) @@ -383,7 +383,7 @@ static WRITE8_HANDLER ( daisyari_bank_w ) address = 0x10000 + ((data & 0x30)>>4) * 0x10000 + (data & 0x1) * 0x8000; // printf("%08x %02x\n",address,data); - memory_set_bankptr(space->machine, 1,&rom[address]); + memory_set_bankptr(space->machine, "bank1",&rom[address]); /* bit 1 used too but unknown purpose. */ } @@ -413,7 +413,7 @@ static WRITE8_HANDLER ( mjclub_bank_w ) address = 0x10000 + data * 0x8000; // printf("%08x\n",address); - memory_set_bankptr(space->machine, 1,&rom[address]); + memory_set_bankptr(space->machine, "bank1",&rom[address]); /* bit 5 used too but unknown purpose. */ } @@ -422,7 +422,7 @@ static WRITE8_HANDLER ( mjclub_bank_w ) static ADDRESS_MAP_START( royalmah_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x6fff ) AM_READWRITE( SMH_ROM, royalmah_rom_w ) AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) - AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK(1) ) // banked ROMs not present in royalmah + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK( "bank1" ) // banked ROMs not present in royalmah AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE_GENERIC(videoram) ADDRESS_MAP_END @@ -432,7 +432,7 @@ static ADDRESS_MAP_START( mjapinky_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x7000, 0x77ff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) AM_RANGE( 0x7800, 0x7fff ) AM_RAM AM_RANGE( 0x8000, 0x8000 ) AM_READ( mjapinky_dsw_r ) - AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK(1) ) + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK( "bank1" ) AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE_GENERIC(videoram) ADDRESS_MAP_END @@ -707,9 +707,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( janptr96_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x5fff) AM_ROM - AM_RANGE( 0x6000, 0x6fff ) AM_RAMBANK(3) // nvram - AM_RANGE( 0x7000, 0x7fff ) AM_RAMBANK(2) // banked nvram - AM_RANGE( 0x8000, 0xffff ) AM_READ(SMH_BANK(1)) + AM_RANGE( 0x6000, 0x6fff ) AM_RAMBANK("bank3") // nvram + AM_RANGE( 0x7000, 0x7fff ) AM_RAMBANK("bank2") // banked nvram + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank1") AM_RANGE( 0x8000, 0xffff ) AM_WRITE(SMH_RAM) AM_BASE_GENERIC(videoram) ADDRESS_MAP_END @@ -738,12 +738,12 @@ static READ8_HANDLER( janptr96_dsw_r ) static WRITE8_HANDLER( janptr96_rombank_w ) { UINT8 *ROM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1,ROM + 0x10000 + 0x8000 * data); + memory_set_bankptr(space->machine, "bank1",ROM + 0x10000 + 0x8000 * data); } static WRITE8_HANDLER( janptr96_rambank_w ) { - memory_set_bankptr(space->machine, 2,space->machine->generic.nvram.u8 + 0x1000 + 0x1000 * data); + memory_set_bankptr(space->machine, "bank2",space->machine->generic.nvram.u8 + 0x1000 + 0x1000 * data); } static READ8_HANDLER( janptr96_unknown_r ) @@ -956,7 +956,7 @@ static READ8_HANDLER( mjtensin_p3_r ) static void mjtensin_update_rombank(running_machine *machine) { - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x10000 + rombank * 0x8000 ); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x10000 + rombank * 0x8000 ); } static WRITE8_HANDLER( mjtensin_p4_w ) { @@ -981,7 +981,7 @@ static ADDRESS_MAP_START( mjtensin_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x6ff1, 0x6ff1 ) AM_WRITE( mjderngr_palbank_w ) AM_RANGE( 0x6ff3, 0x6ff3 ) AM_WRITE( mjtensin_6ff3_w ) AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE_SIZE_GENERIC(nvram) - AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK(1) ) + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK( "bank1" ) AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE_GENERIC(videoram) ADDRESS_MAP_END @@ -997,7 +997,7 @@ ADDRESS_MAP_END static void cafetime_update_rombank(running_machine *machine) { - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x10000 + rombank * 0x8000 ); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x10000 + rombank * 0x8000 ); } static WRITE8_HANDLER( cafetime_p4_w ) { @@ -1051,7 +1051,7 @@ static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x7fe3, 0x7fe3 ) AM_WRITE( cafetime_7fe3_w ) AM_RANGE( 0x7fe4, 0x7fe4 ) AM_READ( cafetime_7fe4_r ) AM_RANGE( 0x7ff0, 0x7fff ) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) - AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK(1) ) + AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK( "bank1" ) AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE_GENERIC(videoram) ADDRESS_MAP_END @@ -4609,14 +4609,14 @@ ROM_START( jansoua ) ROM_END -static DRIVER_INIT( ippatsu ) { memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x8000 ); } +static DRIVER_INIT( ippatsu ) { memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x8000 ); } static DRIVER_INIT( janptr96 ) { machine->generic.nvram_size = 0x1000 * 9; machine->generic.nvram.u8 = auto_alloc_array(machine, UINT8, machine->generic.nvram_size ); - memory_set_bankptr(machine, 3,machine->generic.nvram.u8); + memory_set_bankptr(machine, "bank3",machine->generic.nvram.u8); } GAME( 1981, royalmj, 0, royalmah, royalmah, 0, ROT0, "Nichibutsu", "Royal Mahjong (Japan, v1.13)", 0 ) diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index cf005d6e42a..662bb044f10 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -246,7 +246,7 @@ static WRITE8_HANDLER( z80ctrl_w ) { rng_z80_control = data; - memory_set_bankptr(space->machine, 2, memory_region(space->machine, "soundcpu") + 0x10000 + (data & 0x07) * 0x4000); + memory_set_bankptr(space->machine, "bank2", memory_region(space->machine, "soundcpu") + 0x10000 + (data & 0x07) * 0x4000); if (data & 0x10) cputag_set_input_line(space->machine, "soundcpu", INPUT_LINE_NMI, CLEAR_LINE); @@ -263,7 +263,7 @@ static INTERRUPT_GEN(audio_interrupt) static ADDRESS_MAP_START( rungun_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami1", k054539_r,k054539_w) AM_RANGE(0xe230, 0xe3ff) AM_RAM diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index 7634e32d0e2..ef2b5d79096 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -242,7 +242,7 @@ static WRITE8_HANDLER( sandscrp_bankswitch_w ) if (bank < 3) RAM = &RAM[0x4000 * bank]; else RAM = &RAM[0x4000 * (bank-3) + 0x10000]; - memory_set_bankptr(space->machine, 1, RAM); + memory_set_bankptr(space->machine, "bank1", RAM); } static READ8_HANDLER( sandscrp_latchstatus_r ) @@ -265,7 +265,7 @@ static WRITE8_HANDLER( sandscrp_soundlatch_w ) static ADDRESS_MAP_START( sandscrp_soundmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK(1), SMH_ROM) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xdfff) AM_RAM // RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c index 94cb86d4184..95e910b3457 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -61,17 +61,17 @@ static WRITE8_HANDLER(sangho_ram_w) static ADDRESS_MAP_START( pzlestar_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xffff) AM_WRITE(sangho_ram_w) - AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(1) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(3) - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(4) + AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1") + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2") + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3") + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank4") ADDRESS_MAP_END /* Wrong ! */ static WRITE8_HANDLER(pzlestar_bank_w) { - memory_set_bankptr(space->machine, 2,&memory_region(space->machine, "user1")[0x20000+ ( ((0x8000*data)^0x10000)) ]); - memory_set_bankptr(space->machine, 3,&memory_region(space->machine, "user1")[ 0x18000 ]); + memory_set_bankptr(space->machine, "bank2",&memory_region(space->machine, "user1")[0x20000+ ( ((0x8000*data)^0x10000)) ]); + memory_set_bankptr(space->machine, "bank3",&memory_region(space->machine, "user1")[ 0x18000 ]); } /* Puzzle Star Ports */ @@ -166,10 +166,10 @@ INPUT_PORTS_END static void sangho_common_machine_reset(running_machine *machine) { - memory_set_bankptr(machine, 1,&sangho_ram[0]); - memory_set_bankptr(machine, 2,&sangho_ram[0x4000]); - memory_set_bankptr(machine, 3,&sangho_ram[0x8000]); - memory_set_bankptr(machine, 4,&sangho_ram[0xc000]); + memory_set_bankptr(machine, "bank1",&sangho_ram[0]); + memory_set_bankptr(machine, "bank2",&sangho_ram[0x4000]); + memory_set_bankptr(machine, "bank3",&sangho_ram[0x8000]); + memory_set_bankptr(machine, "bank4",&sangho_ram[0xc000]); v9938_reset(0); } diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index 46b4675c043..3d40fb02a1a 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -85,7 +85,7 @@ static TIMER_CALLBACK( pot_trigger_callback ); static MACHINE_START( sbrkout ) { - memory_set_bankptr(machine, 1, &machine->generic.videoram.u8[0x380]); + memory_set_bankptr(machine, "bank1", &machine->generic.videoram.u8[0x380]); scanline_timer = timer_alloc(machine, scanline_callback, NULL); pot_timer = timer_alloc(machine, pot_trigger_callback, NULL); @@ -332,7 +332,7 @@ static VIDEO_UPDATE( sbrkout ) /* full memory map derived from schematics */ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) - AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x380) AM_RAMBANK(1) + AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x380) AM_RAMBANK("bank1") AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(sbrkout_videoram_w) AM_BASE_GENERIC(videoram) AM_RANGE(0x0800, 0x083f) AM_READ(switches_r) AM_RANGE(0x0840, 0x0840) AM_MIRROR(0x003f) AM_READ_PORT("COIN") diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index 4ad1c05b2f5..c51237bd282 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -313,7 +313,7 @@ static UINT8 f7_bank_value; /* we have to fill in the ROM addresses for systeme due to the encrypted games */ static ADDRESS_MAP_START( systeme_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM /* Fixed ROM */ - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) /* Banked ROM */ + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* Banked ROM */ ADDRESS_MAP_END @@ -354,7 +354,7 @@ static WRITE8_HANDLER( systeme_bank_w ) segae_set_vram_banks(data); //memcpy(sms_rom+0x8000, memory_region(space->machine, "user1")+0x10000+rombank*0x4000, 0x4000); - memory_set_bank(space->machine, 1, rombank); + memory_set_bank(space->machine, "bank1", rombank); } @@ -390,15 +390,15 @@ static void init_ports_systeme(running_machine *machine) static void init_systeme_map(running_machine *machine) { - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); /* alternate way of accessing video ram */ memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, segasyse_videoram_w); /* main ram area */ sms_mainram = auto_alloc_array(machine, UINT8, 0x4000); - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0, (read8_space_func)SMH_BANK(2), (write8_space_func)SMH_BANK(2)); - memory_set_bankptr(machine, 2, sms_mainram ); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0, "bank2"); + memory_set_bankptr(machine, "bank2", sms_mainram ); memset(sms_mainram,0x00,0x4000); init_ports_systeme(machine); @@ -984,14 +984,14 @@ static DRIVER_INIT( opaopa ) { DRIVER_INIT_CALL(segasyse); - mc8123_decrypt_rom(machine, "maincpu", "user1", 1, 8); + mc8123_decrypt_rom(machine, "maincpu", "user1", "bank1", 8); } static DRIVER_INIT( fantzn2 ) { DRIVER_INIT_CALL(segasyse); - mc8123_decrypt_rom(machine, "maincpu", "user1", 0, 0); + mc8123_decrypt_rom(machine, "maincpu", "user1", NULL, 0); } static DRIVER_INIT( astrofl ) diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index 7c00c1e10d8..9a9190a774a 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -207,7 +207,7 @@ static WRITE8_HANDLER( astron_FIX_write ) static WRITE8_HANDLER( astron_io_bankswitch_w ) { logerror("Banking 0x%x\n", data); - memory_set_bank(space->machine, 1, data & 0xff); + memory_set_bank(space->machine, "bank1", data & 0xff); } @@ -216,7 +216,7 @@ static WRITE8_HANDLER( astron_io_bankswitch_w ) /* PROGRAM MAP */ static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(astron_OBJ_read,astron_OBJ_write) AM_BASE(&obj_RAM) /* OBJ according to the schematics (sprite) */ AM_RANGE(0xc800, 0xcfff) AM_READWRITE(astron_DISC_read,astron_DISC_write) /* DISC interface according to schematics */ @@ -568,7 +568,7 @@ ROM_END static DRIVER_INIT( astron ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 2, &ROM[0x8000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x8000], 0x4000); } diff --git a/src/mame/drivers/segamsys.c b/src/mame/drivers/segamsys.c index a11e3aedda5..898af7e370f 100644 --- a/src/mame/drivers/segamsys.c +++ b/src/mame/drivers/segamsys.c @@ -1601,7 +1601,8 @@ static WRITE8_HANDLER( mt_sms_standard_rom_bank_w ) } else { - memory_install_readwrite8_handler(space, 0x0000, 0xbfff, 0, 0, (read8_space_func)SMH_BANK(5), (write8_space_func)SMH_UNMAP); + memory_install_read_bank_handler(space, 0x0000, 0xbfff, 0, 0, "bank5"); + memory_install_write8_handler(space, 0x0000, 0xbfff, 0, 0, (write8_space_func)SMH_UNMAP); } //printf("bank ram??\n"); @@ -1669,10 +1670,10 @@ void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const cha /* main ram area */ sms_mainram = auto_alloc_array(machine, UINT8, 0x2000); // 8kb of main ram - memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0xc000, 0xdfff, 0, 0, (read8_space_func)SMH_BANK(6), (write8_space_func)SMH_BANK(6)); - memory_set_bankptr(machine, 6, sms_mainram ); - memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0xe000, 0xffff, 0, 0, (read8_space_func)SMH_BANK(7), (write8_space_func)SMH_BANK(7)); - memory_set_bankptr(machine, 7, sms_mainram ); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0xc000, 0xdfff, 0, 0, "bank6"); + memory_set_bankptr(machine, "bank6", sms_mainram ); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0xe000, 0xffff, 0, 0, "bank7"); + memory_set_bankptr(machine, "bank7", sms_mainram ); memset(sms_mainram,0x00,0x2000); megatech_set_genz80_as_sms_standard_ports(machine, tag); @@ -1681,8 +1682,9 @@ void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const cha { /* fixed rom bank area */ sms_rom = auto_alloc_array(machine, UINT8, 0x400000); - memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, (read8_space_func)SMH_BANK(5), (write8_space_func)SMH_UNMAP); - memory_set_bankptr(machine, 5, sms_rom ); + memory_install_read_bank_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, "bank5"); + memory_install_write8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, (write8_space_func)SMH_UNMAP); + memory_set_bankptr(machine, "bank5", sms_rom ); memcpy(sms_rom, memory_region(machine, "maincpu"), 0x400000); @@ -1694,8 +1696,9 @@ void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const cha { /* fixed rom bank area */ sms_rom = auto_alloc_array(machine, UINT8, 0xc000); - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, (read8_space_func)SMH_BANK(5), (write8_space_func)SMH_UNMAP); - memory_set_bankptr(machine, 5, sms_rom ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, "bank5"); + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, (write8_space_func)SMH_UNMAP); + memory_set_bankptr(machine, "bank5", sms_rom ); memcpy(sms_rom, memory_region(machine, "maincpu"), 0xc000); diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index 8c65dd549d3..82364e0360b 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -97,17 +97,17 @@ static const ppi8255_interface single_ppi_intf = static const segaic16_memory_map_entry outrun_info[] = { - { 0x35/2, 0x90000, 0x10000, 0xf00000, ~0, segaic16_road_control_0_r, segaic16_road_control_0_w, NULL, "road control" }, - { 0x35/2, 0x80000, 0x01000, 0xf0f000, ~0, (read16_space_func)SMH_BANK(10), (write16_space_func)SMH_BANK(10), &segaic16_roadram_0, "road RAM" }, - { 0x35/2, 0x60000, 0x08000, 0xf18000, ~0, (read16_space_func)SMH_BANK(11), (write16_space_func)SMH_BANK(11), &cpu1ram, "CPU 1 RAM" }, - { 0x35/2, 0x00000, 0x60000, 0xf00000, ~0, (read16_space_func)SMH_BANK(12), (write16_space_func)SMH_UNMAP, &cpu1rom, "CPU 1 ROM" }, - { 0x31/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, misc_io_w, NULL, "I/O space" }, - { 0x2d/2, 0x00000, 0x01000, 0xfff000, ~0, (read16_space_func)SMH_BANK(13), (write16_space_func)SMH_BANK(13), &segaic16_spriteram_0, "object RAM" }, - { 0x29/2, 0x00000, 0x02000, 0xffe000, ~0, (read16_space_func)SMH_BANK(14), segaic16_paletteram_w, &segaic16_paletteram, "color RAM" }, - { 0x25/2, 0x00000, 0x10000, 0xfe0000, ~0, (read16_space_func)SMH_BANK(15), segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x25/2, 0x10000, 0x01000, 0xfef000, ~0, (read16_space_func)SMH_BANK(16), segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x21/2, 0x60000, 0x08000, 0xf98000, ~0, (read16_space_func)SMH_BANK(17), (write16_space_func)SMH_BANK(17), &workram, "CPU 0 RAM" }, - { 0x21/2, 0x00000, 0x60000, 0xf80000, 0x00000, (read16_space_func)SMH_BANK(18), (write16_space_func)SMH_UNMAP, NULL, "CPU 0 ROM" }, + { 0x35/2, 0x90000, 0x10000, 0xf00000, ~0, segaic16_road_control_0_r, NULL, segaic16_road_control_0_w, NULL, NULL, "road control" }, + { 0x35/2, 0x80000, 0x01000, 0xf0f000, ~0, NULL, "bank10", NULL, "bank10", &segaic16_roadram_0, "road RAM" }, + { 0x35/2, 0x60000, 0x08000, 0xf18000, ~0, NULL, "bank11", NULL, "bank11", &cpu1ram, "CPU 1 RAM" }, + { 0x35/2, 0x00000, 0x60000, 0xf00000, ~0, NULL, "bank12", (write16_space_func)SMH_UNMAP, NULL, &cpu1rom, "CPU 1 ROM" }, + { 0x31/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, NULL, misc_io_w, NULL, NULL, "I/O space" }, + { 0x2d/2, 0x00000, 0x01000, 0xfff000, ~0, NULL, "bank13", NULL, "bank13", &segaic16_spriteram_0, "object RAM" }, + { 0x29/2, 0x00000, 0x02000, 0xffe000, ~0, NULL, "bank14", segaic16_paletteram_w, NULL, &segaic16_paletteram, "color RAM" }, + { 0x25/2, 0x00000, 0x10000, 0xfe0000, ~0, NULL, "bank15", segaic16_tileram_0_w, NULL, &segaic16_tileram_0, "tile RAM" }, + { 0x25/2, 0x10000, 0x01000, 0xfef000, ~0, NULL, "bank16", segaic16_textram_0_w, NULL, &segaic16_textram_0, "text RAM" }, + { 0x21/2, 0x60000, 0x08000, 0xf98000, ~0, NULL, "bank17", NULL, "bank17", &workram, "CPU 0 RAM" }, + { 0x21/2, 0x00000, 0x60000, 0xf80000, 0x00000, NULL, "bank18", (write16_space_func)SMH_UNMAP, NULL, NULL, "CPU 0 ROM" }, { 0 } }; diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index a10bd3f9fa2..5c7f4087208 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -950,71 +950,71 @@ static WRITE16_HANDLER( atomicp_sound_w ); static const segaic16_memory_map_entry rom_171_5358_info_small[] = { - { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, misc_io_w, NULL, "I/O space" }, - { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, (read16_space_func)SMH_BANK(10), segaic16_paletteram_w, &segaic16_paletteram, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, (read16_space_func)SMH_BANK(11), segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, (read16_space_func)SMH_BANK(12), segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, (read16_space_func)SMH_BANK(13), (write16_space_func)SMH_BANK(13), &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, (read16_space_func)SMH_BANK(14), (write16_space_func)SMH_BANK(14), &workram, "work RAM" }, - { 0x29/2, 0x00000, 0x20000, 0xfe0000, 0x20000, (read16_space_func)SMH_BANK(15), (write16_space_func)SMH_UNMAP, NULL, "ROM 2" }, - { 0x25/2, 0x00000, 0x20000, 0xfe0000, 0x10000, (read16_space_func)SMH_BANK(16), (write16_space_func)SMH_UNMAP, NULL, "ROM 1" }, - { 0x21/2, 0x00000, 0x20000, 0xfe0000, 0x00000, (read16_space_func)SMH_BANK(17), (write16_space_func)SMH_UNMAP, NULL, "ROM 0" }, + { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, NULL, misc_io_w, NULL, NULL, "I/O space" }, + { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, NULL, "bank10", segaic16_paletteram_w, NULL, &segaic16_paletteram, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, NULL, "bank11", segaic16_tileram_0_w, NULL, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, NULL, "bank12", segaic16_textram_0_w, NULL, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, NULL, "bank13", NULL, "bank13", &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, NULL, "bank14", NULL, "bank14", &workram, "work RAM" }, + { 0x29/2, 0x00000, 0x20000, 0xfe0000, 0x20000, NULL, "bank15", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 2" }, + { 0x25/2, 0x00000, 0x20000, 0xfe0000, 0x10000, NULL, "bank16", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 1" }, + { 0x21/2, 0x00000, 0x20000, 0xfe0000, 0x00000, NULL, "bank17", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 0" }, { 0 } }; static const segaic16_memory_map_entry rom_171_5358_info[] = { - { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, misc_io_w, NULL, "I/O space" }, - { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, (read16_space_func)SMH_BANK(10), segaic16_paletteram_w, &segaic16_paletteram, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, (read16_space_func)SMH_BANK(11), segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, (read16_space_func)SMH_BANK(12), segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, (read16_space_func)SMH_BANK(13), (write16_space_func)SMH_BANK(13), &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, (read16_space_func)SMH_BANK(14), (write16_space_func)SMH_BANK(14), &workram, "work RAM" }, - { 0x29/2, 0x00000, 0x20000, 0xfe0000, 0x40000, (read16_space_func)SMH_BANK(15), (write16_space_func)SMH_UNMAP, NULL, "ROM 2" }, - { 0x25/2, 0x00000, 0x20000, 0xfe0000, 0x20000, (read16_space_func)SMH_BANK(16), (write16_space_func)SMH_UNMAP, NULL, "ROM 1" }, - { 0x21/2, 0x00000, 0x20000, 0xfe0000, 0x00000, (read16_space_func)SMH_BANK(17), (write16_space_func)SMH_UNMAP, NULL, "ROM 0" }, + { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, NULL, misc_io_w, NULL, NULL, "I/O space" }, + { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, NULL, "bank10", segaic16_paletteram_w, NULL, &segaic16_paletteram, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, NULL, "bank11", segaic16_tileram_0_w, NULL, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, NULL, "bank12", segaic16_textram_0_w, NULL, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, NULL, "bank13", NULL, "bank13", &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, NULL, "bank14", NULL, "bank14", &workram, "work RAM" }, + { 0x29/2, 0x00000, 0x20000, 0xfe0000, 0x40000, NULL, "bank15", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 2" }, + { 0x25/2, 0x00000, 0x20000, 0xfe0000, 0x20000, NULL, "bank16", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 1" }, + { 0x21/2, 0x00000, 0x20000, 0xfe0000, 0x00000, NULL, "bank17", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 0" }, { 0 } }; static const segaic16_memory_map_entry rom_171_5704_info[] = { - { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, misc_io_w, NULL, "I/O space" }, - { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, (read16_space_func)SMH_BANK(10), segaic16_paletteram_w, &segaic16_paletteram, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, (read16_space_func)SMH_BANK(11), segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, (read16_space_func)SMH_BANK(12), segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, (read16_space_func)SMH_BANK(13), (write16_space_func)SMH_BANK(13), &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, (read16_space_func)SMH_BANK(14), (write16_space_func)SMH_BANK(14), &workram, "work RAM" }, - { 0x29/2, 0x00000, 0x10000, 0xff0000, ~0, NULL, rom_5704_bank_w, NULL, "tile bank" }, - { 0x25/2, 0x00000, 0x80000, 0xfc0000, 0x80000, (read16_space_func)SMH_BANK(16), (write16_space_func)SMH_UNMAP, NULL, "ROM 1" }, - { 0x21/2, 0x00000, 0x80000, 0xfc0000, 0x00000, (read16_space_func)SMH_BANK(17), (write16_space_func)SMH_UNMAP, NULL, "ROM 0" }, + { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, NULL, misc_io_w, NULL, NULL, "I/O space" }, + { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, NULL, "bank10", segaic16_paletteram_w, NULL, &segaic16_paletteram, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, NULL, "bank11", segaic16_tileram_0_w, NULL, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, NULL, "bank12", segaic16_textram_0_w, NULL, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, NULL, "bank13", NULL, "bank13", &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, NULL, "bank14", NULL, "bank14", &workram, "work RAM" }, + { 0x29/2, 0x00000, 0x10000, 0xff0000, ~0, NULL, NULL, rom_5704_bank_w, NULL, NULL, "tile bank" }, + { 0x25/2, 0x00000, 0x80000, 0xfc0000, 0x80000, NULL, "bank16", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 1" }, + { 0x21/2, 0x00000, 0x80000, 0xfc0000, 0x00000, NULL, "bank17", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 0" }, { 0 } }; static const segaic16_memory_map_entry rom_atomicp_info[] = { - { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, misc_io_w, NULL, "I/O space" }, - { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, (read16_space_func)SMH_BANK(10), segaic16_paletteram_w, &segaic16_paletteram, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, (read16_space_func)SMH_BANK(11), segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, (read16_space_func)SMH_BANK(12), segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, (read16_space_func)SMH_BANK(13), (write16_space_func)SMH_BANK(13), &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, (read16_space_func)SMH_BANK(14), (write16_space_func)SMH_BANK(14), &workram, "work RAM" }, - { 0x29/2, 0x00000, 0x10000, 0xff0000, ~0, NULL, rom_5704_bank_w, NULL, "tile bank" }, - { 0x25/2, 0x00000, 0x10000, 0xff0000, ~0, NULL, atomicp_sound_w, NULL, "sound" }, - { 0x21/2, 0x00000, 0x80000, 0xfc0000, 0x00000, (read16_space_func)SMH_BANK(17), (write16_space_func)SMH_UNMAP, NULL, "ROM 0" }, + { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, NULL, misc_io_w, NULL, NULL, "I/O space" }, + { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, NULL, "bank10", segaic16_paletteram_w, NULL, &segaic16_paletteram, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, NULL, "bank11", segaic16_tileram_0_w, NULL, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, NULL, "bank12", segaic16_textram_0_w, NULL, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, NULL, "bank13", NULL, "bank13", &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, NULL, "bank14", NULL, "bank14", &workram, "work RAM" }, + { 0x29/2, 0x00000, 0x10000, 0xff0000, ~0, NULL, NULL, rom_5704_bank_w, NULL, NULL, "tile bank" }, + { 0x25/2, 0x00000, 0x10000, 0xff0000, ~0, NULL, NULL, atomicp_sound_w, NULL, NULL, "sound" }, + { 0x21/2, 0x00000, 0x80000, 0xfc0000, 0x00000, NULL, "bank17", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 0" }, { 0 } }; static const segaic16_memory_map_entry rom_171_5797_info[] = { - { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, misc_io_w, NULL, "I/O space" }, - { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, (read16_space_func)SMH_BANK(10), segaic16_paletteram_w, &segaic16_paletteram, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, (read16_space_func)SMH_BANK(11), segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, (read16_space_func)SMH_BANK(12), segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, (read16_space_func)SMH_BANK(13), (write16_space_func)SMH_BANK(13), &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, (read16_space_func)SMH_BANK(14), (write16_space_func)SMH_BANK(14), &workram, "work RAM" }, - { 0x29/2, 0x00000, 0x10000, 0xff0000, ~0, unknown_rgn2_r, unknown_rgn2_w, NULL, "???" }, - { 0x25/2, 0x00000, 0x04000, 0xffc000, ~0, rom_5797_bank_math_r, rom_5797_bank_math_w, NULL, "tile bank/math" }, - { 0x21/2, 0x00000, 0x80000, 0xf80000, 0x00000, (read16_space_func)SMH_BANK(17), (write16_space_func)SMH_UNMAP, NULL, "ROM 0" }, + { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, NULL, misc_io_w, NULL, NULL, "I/O space" }, + { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, NULL, "bank10", segaic16_paletteram_w, NULL, &segaic16_paletteram, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, NULL, "bank11", segaic16_tileram_0_w, NULL, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, NULL, "bank12", segaic16_textram_0_w, NULL, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, NULL, "bank13", NULL, "bank13", &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, NULL, "bank14", NULL, "bank14", &workram, "work RAM" }, + { 0x29/2, 0x00000, 0x10000, 0xff0000, ~0, unknown_rgn2_r, NULL, unknown_rgn2_w, NULL, NULL, "???" }, + { 0x25/2, 0x00000, 0x04000, 0xffc000, ~0, rom_5797_bank_math_r, NULL, rom_5797_bank_math_w, NULL, NULL, "tile bank/math" }, + { 0x21/2, 0x00000, 0x80000, 0xf80000, 0x00000, NULL, "bank17", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 0" }, { 0 } }; @@ -1333,7 +1333,7 @@ static WRITE8_DEVICE_HANDLER( upd7759_control_w ) bankoffs += (data & 0x07) * 0x04000; break; } - memory_set_bankptr(device->machine, 1, memory_region(device->machine, "soundcpu") + 0x10000 + (bankoffs % size)); + memory_set_bankptr(device->machine, "bank1", memory_region(device->machine, "soundcpu") + 0x10000 + (bankoffs % size)); } } @@ -1777,7 +1777,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r) AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -6216,7 +6216,7 @@ static DRIVER_INIT( altbeas5_5521 ) static DRIVER_INIT( altbeas4_5521 ) { DRIVER_INIT_CALL(generic_5521); - mc8123_decrypt_rom(machine, "soundcpu", "user2", 0, 0); + mc8123_decrypt_rom(machine, "soundcpu", "user2", NULL, 0); } @@ -6297,14 +6297,14 @@ static DRIVER_INIT( defense_5358 ) static DRIVER_INIT( shinobi4_5521 ) { DRIVER_INIT_CALL(generic_5521); - mc8123_decrypt_rom(machine, "soundcpu", "user2", 0, 0); + mc8123_decrypt_rom(machine, "soundcpu", "user2", NULL, 0); } static DRIVER_INIT( shinobi3_5358 ) { DRIVER_INIT_CALL(generic_5358); - mc8123_decrypt_rom(machine, "soundcpu", "user2", 0, 0); + mc8123_decrypt_rom(machine, "soundcpu", "user2", NULL, 0); } diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index 372dadf6958..6f6cb248c21 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -92,43 +92,43 @@ static WRITE16_HANDLER( rom_5987_bank_w ); static const segaic16_memory_map_entry rom_171_shad_info[] = { - { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, misc_io_w, NULL, "I/O space" }, - { 0x39/2, 0x00000, 0x02000, 0xffe000, ~0, (read16_space_func)SMH_BANK(10), segaic16_paletteram_w, &segaic16_paletteram, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, (read16_space_func)SMH_BANK(11), segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, (read16_space_func)SMH_BANK(12), segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, (read16_space_func)SMH_BANK(13), (write16_space_func)SMH_BANK(13), &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, (read16_space_func)SMH_BANK(14), (write16_space_func)SMH_BANK(14), &workram, "work RAM" }, - { 0x29/2, 0x00000, 0x10000, 0xff0000, ~0, NULL, NULL, NULL, "????" }, - { 0x25/2, 0x00000, 0x00010, 0xfffff0, ~0, genesis_vdp_r, genesis_vdp_w, NULL, "VDP" }, - { 0x21/2, 0x00000, 0x80000, 0xf80000, 0x00000, (read16_space_func)SMH_BANK(17), (write16_space_func)SMH_UNMAP, NULL, "ROM 0" }, + { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, NULL, misc_io_w, NULL, NULL, "I/O space" }, + { 0x39/2, 0x00000, 0x02000, 0xffe000, ~0, NULL, "bank10", segaic16_paletteram_w, NULL, &segaic16_paletteram, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, NULL, "bank11", segaic16_tileram_0_w, NULL, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, NULL, "bank12", segaic16_textram_0_w, NULL, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, NULL, "bank13", NULL, "bank13", &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, NULL, "bank14", NULL, "bank14", &workram, "work RAM" }, + { 0x29/2, 0x00000, 0x10000, 0xff0000, ~0, NULL, NULL, NULL, NULL, NULL, "????" }, + { 0x25/2, 0x00000, 0x00010, 0xfffff0, ~0, genesis_vdp_r, NULL, genesis_vdp_w, NULL, NULL, "VDP" }, + { 0x21/2, 0x00000, 0x80000, 0xf80000, 0x00000, NULL, "bank17", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 0" }, { 0 } }; static const segaic16_memory_map_entry rom_171_5874_info[] = { - { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, misc_io_w, NULL, "I/O space" }, - { 0x39/2, 0x00000, 0x02000, 0xffe000, ~0, (read16_space_func)SMH_BANK(10), segaic16_paletteram_w, &segaic16_paletteram, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, (read16_space_func)SMH_BANK(11), segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, (read16_space_func)SMH_BANK(12), segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, (read16_space_func)SMH_BANK(13), (write16_space_func)SMH_BANK(13), &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, (read16_space_func)SMH_BANK(14), (write16_space_func)SMH_BANK(14), &workram, "work RAM" }, - { 0x29/2, 0x00000, 0x00010, 0xfffff0, ~0, genesis_vdp_r, genesis_vdp_w, NULL, "VDP" }, - { 0x25/2, 0x00000, 0x80000, 0xf80000, 0x80000, (read16_space_func)SMH_BANK(16), (write16_space_func)SMH_UNMAP, NULL, "ROM 1" }, - { 0x21/2, 0x00000, 0x80000, 0xf80000, 0x00000, (read16_space_func)SMH_BANK(17), (write16_space_func)SMH_UNMAP, NULL, "ROM 0" }, + { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, NULL, misc_io_w, NULL, NULL, "I/O space" }, + { 0x39/2, 0x00000, 0x02000, 0xffe000, ~0, NULL, "bank10", segaic16_paletteram_w, NULL, &segaic16_paletteram, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, NULL, "bank11", segaic16_tileram_0_w, NULL, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, NULL, "bank12", segaic16_textram_0_w, NULL, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, NULL, "bank13", NULL, "bank13", &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, NULL, "bank14", NULL, "bank14", &workram, "work RAM" }, + { 0x29/2, 0x00000, 0x00010, 0xfffff0, ~0, genesis_vdp_r, NULL, genesis_vdp_w, NULL, NULL, "VDP" }, + { 0x25/2, 0x00000, 0x80000, 0xf80000, 0x80000, NULL, "bank16", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 1" }, + { 0x21/2, 0x00000, 0x80000, 0xf80000, 0x00000, NULL, "bank17", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 0" }, { 0 } }; static const segaic16_memory_map_entry rom_171_5987_info[] = { - { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, misc_io_w, NULL, "I/O space" }, - { 0x39/2, 0x00000, 0x02000, 0xffe000, ~0, (read16_space_func)SMH_BANK(10), segaic16_paletteram_w, &segaic16_paletteram, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, (read16_space_func)SMH_BANK(11), segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, (read16_space_func)SMH_BANK(12), segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, (read16_space_func)SMH_BANK(13), (write16_space_func)SMH_BANK(13), &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, (read16_space_func)SMH_BANK(14), (write16_space_func)SMH_BANK(14), &workram, "work RAM" }, - { 0x29/2, 0x00000, 0x00010, 0xfffff0, ~0, genesis_vdp_r, genesis_vdp_w, NULL, "VDP" }, - { 0x25/2, 0x00000, 0x80000, 0xf80000, 0x80000, (read16_space_func)SMH_BANK(16), rom_5987_bank_w, NULL, "ROM 1/banking" }, - { 0x21/2, 0x00000, 0x100000,0xf00000, 0x00000, (read16_space_func)SMH_BANK(17), (write16_space_func)SMH_UNMAP, NULL, "ROM 0" }, + { 0x3d/2, 0x00000, 0x04000, 0xffc000, ~0, misc_io_r, NULL, misc_io_w, NULL, NULL, "I/O space" }, + { 0x39/2, 0x00000, 0x02000, 0xffe000, ~0, NULL, "bank10", segaic16_paletteram_w, NULL, &segaic16_paletteram, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, NULL, "bank11", segaic16_tileram_0_w, NULL, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, NULL, "bank12", segaic16_textram_0_w, NULL, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, NULL, "bank13", NULL, "bank13", &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, NULL, "bank14", NULL, "bank14", &workram, "work RAM" }, + { 0x29/2, 0x00000, 0x00010, 0xfffff0, ~0, genesis_vdp_r, NULL, genesis_vdp_w, NULL, NULL, "VDP" }, + { 0x25/2, 0x00000, 0x80000, 0xf80000, 0x80000, NULL, "bank16", rom_5987_bank_w, NULL, NULL, "ROM 1/banking" }, + { 0x21/2, 0x00000, 0x100000,0xf00000, 0x00000, NULL, "bank17", (write16_space_func)SMH_UNMAP, NULL, NULL, "ROM 0" }, { 0 } }; @@ -554,7 +554,7 @@ static WRITE16_HANDLER( wwally_custom_io_w ) static WRITE8_HANDLER( soundbank_w ) { - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "soundcpu") + 0x10000 + 0x2000 * data); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "soundcpu") + 0x10000 + 0x2000 * data); } @@ -604,7 +604,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x10000) - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE("rfsnd", rf5c68_w) AM_RANGE(0xd000, 0xdfff) AM_DEVREADWRITE("rfsnd", rf5c68_mem_r, rf5c68_mem_w) AM_RANGE(0xe000, 0xffff) AM_RAM diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index 5ab1d4a79c2..8023817f086 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -713,8 +713,8 @@ static void reset_bank(running_machine *machine) { if (memory_region(machine, "romboard")) { - memory_set_bank(machine, 1, curbank & 15); - memory_set_bank(machine, 2, curbank & 15); + memory_set_bank(machine, "bank1", curbank & 15); + memory_set_bank(machine, "bank2", curbank & 15); } } @@ -1011,11 +1011,11 @@ static ADDRESS_MAP_START( system24_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa00007) AM_MIRROR(0x0ffff8) AM_READWRITE(irq_r, irq_w) AM_RANGE(0xb00000, 0xb00007) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0xb00008, 0xb0000f) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_status_r, fdc_ctrl_w) - AM_RANGE(0xb80000, 0xbbffff) AM_ROMBANK(1) + AM_RANGE(0xb80000, 0xbbffff) AM_ROMBANK("bank1") AM_RANGE(0xbc0000, 0xbc0001) AM_MIRROR(0x03fff8) AM_READWRITE(curbank_r, curbank_w) AM_RANGE(0xbc0006, 0xbc0007) AM_MIRROR(0x03fff8) AM_READWRITE(mlatch_r, mlatch_w) AM_RANGE(0xc00000, 0xc00011) AM_MIRROR(0x07ffe0) AM_READWRITE(hotrod3_ctrl_r, hotrod3_ctrl_w) - AM_RANGE(0xc80000, 0xcbffff) AM_ROMBANK(2) + AM_RANGE(0xc80000, 0xcbffff) AM_ROMBANK("bank2") AM_RANGE(0xcc0000, 0xcc0001) AM_MIRROR(0x03fff8) AM_READWRITE(curbank_r, curbank_w) AM_RANGE(0xcc0006, 0xcc0007) AM_MIRROR(0x03fff8) AM_READWRITE(mlatch_r, mlatch_w) AM_RANGE(0xf00000, 0xf3ffff) AM_MIRROR(0x040000) AM_RAM AM_SHARE(2) @@ -1048,11 +1048,11 @@ static ADDRESS_MAP_START( system24_cpu2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa00007) AM_MIRROR(0x0ffff8) AM_READWRITE(irq_r, irq_w) AM_RANGE(0xb00000, 0xb00007) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_r, fdc_w) AM_RANGE(0xb00008, 0xb0000f) AM_MIRROR(0x07fff0) AM_READWRITE(fdc_status_r, fdc_ctrl_w) - AM_RANGE(0xb80000, 0xbbffff) AM_ROMBANK(1) + AM_RANGE(0xb80000, 0xbbffff) AM_ROMBANK("bank1") AM_RANGE(0xbc0000, 0xbc0001) AM_MIRROR(0x03fff8) AM_READWRITE(curbank_r, curbank_w) AM_RANGE(0xbc0006, 0xbc0007) AM_MIRROR(0x03fff8) AM_READWRITE(mlatch_r, mlatch_w) AM_RANGE(0xc00000, 0xc00011) AM_MIRROR(0x07ffe0) AM_READWRITE(hotrod3_ctrl_r, hotrod3_ctrl_w) - AM_RANGE(0xc80000, 0xcbffff) AM_ROMBANK(2) + AM_RANGE(0xc80000, 0xcbffff) AM_ROMBANK("bank2") AM_RANGE(0xcc0000, 0xcc0001) AM_MIRROR(0x03fff8) AM_READWRITE(curbank_r, curbank_w) AM_RANGE(0xcc0006, 0xcc0007) AM_MIRROR(0x03fff8) AM_READWRITE(mlatch_r, mlatch_w) AM_RANGE(0xf00000, 0xf3ffff) AM_MIRROR(0x040000) AM_RAM AM_SHARE(2) @@ -1082,8 +1082,8 @@ static MACHINE_START( system24 ) UINT8 *usr1 = memory_region(machine, "romboard"); if (usr1) { - memory_configure_bank(machine, 1, 0, 16, usr1, 0x40000); - memory_configure_bank(machine, 2, 0, 16, usr1, 0x40000); + memory_configure_bank(machine, "bank1", 0, 16, usr1, 0x40000); + memory_configure_bank(machine, "bank2", 0, 16, usr1, 0x40000); } } diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index 621eae2c8c3..ae91f66cf54 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -1136,14 +1136,14 @@ static void ym3438_irq_handler(const device_config *device, int state) static WRITE8_HANDLER( sound_bank_lo_w ) { sound_bank = (sound_bank & ~0x3f) | (data & 0x3f); - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "soundcpu") + 0x100000 + 0x2000 * sound_bank); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "soundcpu") + 0x100000 + 0x2000 * sound_bank); } static WRITE8_HANDLER( sound_bank_hi_w ) { sound_bank = (sound_bank & 0x3f) | ((data & 0x04) << 4) | ((data & 0x03) << 7); - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "soundcpu") + 0x100000 + 0x2000 * sound_bank); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "soundcpu") + 0x100000 + 0x2000 * sound_bank); } @@ -1258,7 +1258,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( system32_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x100000) - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE("rfsnd", rf5c68_w) AM_RANGE(0xd000, 0xdfff) AM_DEVREADWRITE("rfsnd", rf5c68_mem_r, rf5c68_mem_w) AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE(&z80_shared_ram) @@ -1279,7 +1279,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( multi32_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x100000) - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE("sega", multipcm_r, multipcm_w) AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE(&z80_shared_ram) ADDRESS_MAP_END diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index f069839eea5..e7105647a9d 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -1026,7 +1026,7 @@ static WRITE8_HANDLER( z80_bank_w ) if ((data & 7) != z80_lastbank) { z80_lastbank = (data & 7); - memory_set_bankptr(space->machine, 4, z80_rom + (0x8000 * z80_lastbank)); + memory_set_bankptr(space->machine, "bank4", z80_rom + (0x8000 * z80_lastbank)); } } @@ -1101,7 +1101,7 @@ static ADDRESS_MAP_START( spi_map, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_END static ADDRESS_MAP_START( spisound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_RAMBANK(5) + AM_RANGE(0x0000, 0x3fff) AM_RAMBANK("bank5") AM_RANGE(0x4002, 0x4002) AM_WRITENOP /* ack RST 10 */ AM_RANGE(0x4003, 0x4003) AM_WRITENOP /* Unknown */ AM_RANGE(0x4004, 0x4004) AM_WRITE(sb_coin_w) /* single board systems */ @@ -1112,7 +1112,7 @@ static ADDRESS_MAP_START( spisound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4013, 0x4013) AM_READ(z80_coin_r) AM_RANGE(0x401b, 0x401b) AM_WRITE(z80_bank_w) /* control register: bits 0-2 = bank @ 8000, bit 3 = watchdog? */ AM_RANGE(0x6000, 0x600f) AM_DEVREADWRITE("ymf", ymf271_r, ymf271_w) - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(4) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank4") ADDRESS_MAP_END static READ8_DEVICE_HANDLER( flashrom_read ) @@ -1890,8 +1890,8 @@ static MACHINE_RESET( spi ) memory_install_write32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000068c, 0x0000068f, 0, 0, z80_enable_w); z80_rom = auto_alloc_array(machine, UINT8, 0x40000); - memory_set_bankptr(machine, 4, z80_rom); - memory_set_bankptr(machine, 5, z80_rom); + memory_set_bankptr(machine, "bank4", z80_rom); + memory_set_bankptr(machine, "bank5", z80_rom); /* If the first value doesn't match, the game shows a checksum error */ /* If any of the other values are wrong, the game goes to update mode */ @@ -1953,8 +1953,8 @@ static MACHINE_RESET( sxx2f ) UINT8 *rom = memory_region(machine, "soundcpu"); z80_rom = auto_alloc_array(machine, UINT8, 0x40000); - memory_set_bankptr(machine, 4, z80_rom); - memory_set_bankptr(machine, 5, z80_rom); + memory_set_bankptr(machine, "bank4", z80_rom); + memory_set_bankptr(machine, "bank5", z80_rom); memcpy(z80_rom, rom, 0x40000); diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index ab2c9b93415..4f3d6416a07 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -2889,7 +2889,7 @@ static WRITE8_HANDLER( sub_bankswitch_w ) UINT8 *rom = memory_region(space->machine, "sub"); int bank = data >> 4; - memory_set_bankptr(space->machine, 1, &rom[bank * 0x4000 + 0xc000]); + memory_set_bankptr(space->machine, "bank1", &rom[bank * 0x4000 + 0xc000]); } static WRITE8_HANDLER( sub_bankswitch_lockout_w ) @@ -2918,7 +2918,7 @@ static ADDRESS_MAP_START( tndrcade_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3001) AM_DEVWRITE("ym2", ym3812_w) AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE(&sharedram) // Shared RAM AM_RANGE(0x6000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xffff) AM_ROM // ROM ADDRESS_MAP_END @@ -2937,7 +2937,7 @@ static ADDRESS_MAP_START( twineagl_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1002, 0x1002) AM_READ_PORT("COINS") // Coins AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE(&sharedram) // Shared RAM AM_RANGE(0x7000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xffff) AM_ROM // ROM ADDRESS_MAP_END @@ -2977,7 +2977,7 @@ static ADDRESS_MAP_START( downtown_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1000) AM_WRITE(sub_bankswitch_lockout_w) // ROM Bank + Coin Lockout AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE(&sharedram) // Shared RAM AM_RANGE(0x7000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xffff) AM_ROM // ROM ADDRESS_MAP_END @@ -3002,7 +3002,7 @@ static ADDRESS_MAP_START( calibr50_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_DEVREADWRITE("x1snd", seta_sound_r,seta_sound_w) // Sound AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r) // From Main CPU AM_RANGE(0x4000, 0x4000) AM_WRITE(sub_bankswitch_w) // Bankswitching - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xffff) AM_ROM // ROM AM_RANGE(0xc000, 0xc000) AM_WRITE(calibr50_soundlatch2_w) // To Main CPU ADDRESS_MAP_END @@ -3023,7 +3023,7 @@ static ADDRESS_MAP_START( metafox_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1006, 0x1006) AM_READ_PORT("P2") // P2 AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE(&sharedram) // Shared RAM AM_RANGE(0x7000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xffff) AM_ROM // ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index cea1a88a2b3..ab065fc27ea 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -173,7 +173,7 @@ static READ16_HANDLER( button2_r ) static WRITE8_HANDLER( sound2_bank_w ) { - memory_set_bankptr(space->machine, 1,memory_region(space->machine, "audio2")+0x8000*(data+1)); + memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "audio2")+0x8000*(data+1)); } @@ -264,7 +264,7 @@ ADDRESS_MAP_END /* Yes, _no_ ram */ static ADDRESS_MAP_START( sound2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_RANGE(0x0000, 0xffff) AM_WRITENOP /* avoid cluttering up error.log */ ADDRESS_MAP_END diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index 83b46f97df5..b06b02d2c6f 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -860,7 +860,7 @@ static WRITE8_HANDLER( paletteram_io_w ) static ADDRESS_MAP_START( sfbonus_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_ROMBANK(1) AM_WRITE(sfbonus_videoram_w) + AM_RANGE(0x0000, 0xefff) AM_ROMBANK("bank1") AM_WRITE(sfbonus_videoram_w) AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE(&nvram) AM_SIZE(&nvram_size) ADDRESS_MAP_END @@ -871,7 +871,7 @@ static WRITE8_HANDLER( sfbonus_bank_w ) bank = data & 7; - memory_set_bankptr(space->machine, 1, &ROM[bank * 0x10000]); + memory_set_bankptr(space->machine, "bank1", &ROM[bank * 0x10000]); } @@ -1000,7 +1000,7 @@ static MACHINE_RESET( sfbonus ) { UINT8 *ROM = memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1, &ROM[0]); + memory_set_bankptr(machine, "bank1", &ROM[0]); } static NVRAM_HANDLER( sfbonus ) diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index de8210f0cc3..7c8f514f7a9 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -92,32 +92,32 @@ static void sfkick_remap_banks(running_machine *machine) case 0: /* bios */ { UINT8 *mem = memory_region(machine, "bios"); - memory_set_bankptr(machine,1, mem); - memory_set_bankptr(machine,2, mem+0x2000); + memory_set_bankptr(machine,"bank1", mem); + memory_set_bankptr(machine,"bank2", mem+0x2000); } break; case 1: /* ext rom */ { UINT8 *mem = memory_region(machine, "extrom"); - memory_set_bankptr(machine,1, mem+0x4000); - memory_set_bankptr(machine,2, mem+0x6000); + memory_set_bankptr(machine,"bank1", mem+0x4000); + memory_set_bankptr(machine,"bank2", mem+0x6000); } break; case 2: /* banked */ { UINT8 *mem = memory_region(machine, "banked"); - memory_set_bankptr(machine,1, mem+0x2000*sfkick_bank[0]); - memory_set_bankptr(machine,2, mem+0x2000*sfkick_bank[1]); + memory_set_bankptr(machine,"bank1", mem+0x2000*sfkick_bank[0]); + memory_set_bankptr(machine,"bank2", mem+0x2000*sfkick_bank[1]); } break; case 3: /* unknown */ { UINT8 *mem = memory_region(machine, "banked"); - memory_set_bankptr(machine,1, mem+0x18000); - memory_set_bankptr(machine,2, mem+0x18000); + memory_set_bankptr(machine,"bank1", mem+0x18000); + memory_set_bankptr(machine,"bank2", mem+0x18000); } break; } @@ -128,8 +128,8 @@ static void sfkick_remap_banks(running_machine *machine) case 0: /* bios - upper part */ { UINT8 *mem = memory_region(machine, "bios"); - memory_set_bankptr(machine,3, mem+0x4000); - memory_set_bankptr(machine,4, mem+0x6000); + memory_set_bankptr(machine,"bank3", mem+0x4000); + memory_set_bankptr(machine,"bank4", mem+0x6000); } break; @@ -137,16 +137,16 @@ static void sfkick_remap_banks(running_machine *machine) case 3: { UINT8 *mem = memory_region(machine, "banked"); - memory_set_bankptr(machine,3, mem+0x18000); - memory_set_bankptr(machine,4, mem+0x18000); + memory_set_bankptr(machine,"bank3", mem+0x18000); + memory_set_bankptr(machine,"bank4", mem+0x18000); } break; case 2: /* banked */ { UINT8 *mem = memory_region(machine, "banked"); - memory_set_bankptr(machine,3, mem+0x2000*sfkick_bank[2]); - memory_set_bankptr(machine,4, mem+0x2000*sfkick_bank[3]); + memory_set_bankptr(machine,"bank3", mem+0x2000*sfkick_bank[2]); + memory_set_bankptr(machine,"bank4", mem+0x2000*sfkick_bank[3]); } break; } @@ -157,8 +157,8 @@ static void sfkick_remap_banks(running_machine *machine) case 0: /* cartridge */ { UINT8 *mem = memory_region(machine, "cartridge"); - memory_set_bankptr(machine,5, mem+0x4000); - memory_set_bankptr(machine,6, mem+0x6000); + memory_set_bankptr(machine,"bank5", mem+0x4000); + memory_set_bankptr(machine,"bank6", mem+0x6000); } break; @@ -166,16 +166,16 @@ static void sfkick_remap_banks(running_machine *machine) case 3: { UINT8 *mem = memory_region(machine, "banked"); - memory_set_bankptr(machine,5, mem+0x18000); - memory_set_bankptr(machine,6, mem+0x18000); + memory_set_bankptr(machine,"bank5", mem+0x18000); + memory_set_bankptr(machine,"bank6", mem+0x18000); } break; case 2: /* banked */ { UINT8 *mem = memory_region(machine, "banked"); - memory_set_bankptr(machine,5, mem+0x2000*sfkick_bank[4]); - memory_set_bankptr(machine,6, mem+0x2000*sfkick_bank[5]); + memory_set_bankptr(machine,"bank5", mem+0x2000*sfkick_bank[4]); + memory_set_bankptr(machine,"bank6", mem+0x2000*sfkick_bank[5]); } break; } @@ -187,23 +187,23 @@ static void sfkick_remap_banks(running_machine *machine) case 1: { UINT8 *mem = memory_region(machine, "banked"); - memory_set_bankptr(machine,7, mem+0x18000); - memory_set_bankptr(machine,8, mem+0x18000); + memory_set_bankptr(machine,"bank7", mem+0x18000); + memory_set_bankptr(machine,"bank8", mem+0x18000); } break; case 2: /* banked */ { UINT8 *mem = memory_region(machine, "banked"); - memory_set_bankptr(machine,7, mem+0x2000*sfkick_bank[6]); - memory_set_bankptr(machine,8, mem+0x2000*sfkick_bank[7]); + memory_set_bankptr(machine,"bank7", mem+0x2000*sfkick_bank[6]); + memory_set_bankptr(machine,"bank8", mem+0x2000*sfkick_bank[7]); } break; case 3: /* RAM */ { - memory_set_bankptr(machine,7, main_mem); - memory_set_bankptr(machine,8, main_mem+0x2000); + memory_set_bankptr(machine,"bank7", main_mem); + memory_set_bankptr(machine,"bank8", main_mem+0x2000); } break; } @@ -296,14 +296,14 @@ static WRITE8_HANDLER(page3_w) static ADDRESS_MAP_START( sfkick_map, ADDRESS_SPACE_PROGRAM, 8) - AM_RANGE( 0x0000, 0x1fff) AM_ROMBANK(1) - AM_RANGE( 0x2000, 0x3fff) AM_ROMBANK(2) - AM_RANGE( 0x4000, 0x5fff) AM_ROMBANK(3) - AM_RANGE( 0x6000, 0x7fff) AM_ROMBANK(4) - AM_RANGE( 0x8000, 0x9fff) AM_ROMBANK(5) - AM_RANGE( 0xa000, 0xbfff) AM_ROMBANK(6) - AM_RANGE( 0xc000, 0xdfff) AM_ROMBANK(7) - AM_RANGE( 0xe000, 0xffff) AM_ROMBANK(8) + AM_RANGE( 0x0000, 0x1fff) AM_ROMBANK("bank1") + AM_RANGE( 0x2000, 0x3fff) AM_ROMBANK("bank2") + AM_RANGE( 0x4000, 0x5fff) AM_ROMBANK("bank3") + AM_RANGE( 0x6000, 0x7fff) AM_ROMBANK("bank4") + AM_RANGE( 0x8000, 0x9fff) AM_ROMBANK("bank5") + AM_RANGE( 0xa000, 0xbfff) AM_ROMBANK("bank6") + AM_RANGE( 0xc000, 0xdfff) AM_ROMBANK("bank7") + AM_RANGE( 0xe000, 0xffff) AM_ROMBANK("bank8") AM_RANGE( 0x0000, 0x3fff) AM_WRITE( page0_w ) AM_RANGE( 0x4000, 0x7fff) AM_WRITE( page1_w ) AM_RANGE( 0x8000, 0xbfff) AM_WRITE( page2_w ) diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c index b7caaba8ae2..a61443b9c81 100644 --- a/src/mame/drivers/shangkid.c +++ b/src/mame/drivers/shangkid.c @@ -73,7 +73,7 @@ static UINT8 sound_latch; static WRITE8_HANDLER( shangkid_maincpu_bank_w ) { - memory_set_bank(space->machine, 1, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); } static WRITE8_HANDLER( shangkid_bbx_enable_w ) @@ -117,7 +117,7 @@ static WRITE8_DEVICE_HANDLER( shangkid_ay8910_porta_w ) cputag_set_input_line(device->machine, "audiocpu", 0, HOLD_LINE ); } else - memory_set_bank(device->machine, 2, data ? 0 : 1); + memory_set_bank(device->machine, "bank2", data ? 0 : 1); } static WRITE8_DEVICE_HANDLER( ay8910_portb_w ) @@ -144,8 +144,8 @@ static DRIVER_INIT( shangkid ) shangkid_gfx_type = 1; /* set up banking */ - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x8000, 0x8000); - memory_configure_bank(machine, 2, 0, 2, memory_region(machine, "audiocpu") + 0x0000, 0x10000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x8000, 0x8000); + memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "audiocpu") + 0x0000, 0x10000); } /***************************************************************************************/ @@ -159,8 +159,8 @@ static MACHINE_RESET( shangkid ) { cputag_set_input_line(machine, "bbx", INPUT_LINE_HALT, 1 ); - memory_set_bank(machine, 1, 0); - memory_set_bank(machine, 2, 0); + memory_set_bank(machine, "bank1", 0); + memory_set_bank(machine, "bank2", 0); } /***************************************************************************************/ @@ -264,7 +264,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( shangkid_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xa000) AM_WRITENOP /* ? */ AM_RANGE(0xb000, 0xb000) AM_WRITE(shangkid_bbx_enable_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(shangkid_sound_enable_w) @@ -340,7 +340,7 @@ static ADDRESS_MAP_START( chinhero_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( shangkid_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_ROMBANK(2) /* sample player writes to ROM area */ + AM_RANGE(0x0000, 0xdfff) AM_ROMBANK("bank2") /* sample player writes to ROM area */ AM_RANGE(0xe000, 0xefff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index 84b0df9748e..84fef1a6311 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -50,7 +50,7 @@ static WRITE8_HANDLER( sichuan2_coin_w ) static ADDRESS_MAP_START( shisen_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc800, 0xcaff) AM_RAM_WRITE(sichuan2_paletteram_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(sichuan2_videoram_w) AM_BASE_GENERIC(videoram) AM_RANGE(0xe000, 0xffff) AM_RAM diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c index 5989761fdb9..96dacdb7c10 100644 --- a/src/mame/drivers/shootout.c +++ b/src/mame/drivers/shootout.c @@ -52,7 +52,7 @@ extern VIDEO_UPDATE( shootouj ); static WRITE8_HANDLER( shootout_bankswitch_w ) { - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); } static WRITE8_HANDLER( sound_cpu_command_w ) @@ -83,7 +83,7 @@ static ADDRESS_MAP_START( shootout_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x19ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(shootout_textram_w) AM_BASE(&shootout_textram) AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(shootout_videoram_w) AM_BASE_GENERIC(videoram) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -98,7 +98,7 @@ static ADDRESS_MAP_START( shootouj_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2801) AM_DEVREADWRITE("ymsnd", ym2203_r,ym2203_w) AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(shootout_textram_w) AM_BASE(&shootout_textram) AM_RANGE(0x3800, 0x3fff) AM_RAM_WRITE(shootout_videoram_w) AM_BASE_GENERIC(videoram) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -429,13 +429,13 @@ static DRIVER_INIT( shootout ) for (A = 0x8000;A < length;A++) decrypt[A-0x8000] = (rom[A] & 0x9f) | ((rom[A] & 0x40) >> 1) | ((rom[A] & 0x20) << 1); - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); - memory_configure_bank_decrypted(machine, 1, 0, 16, decrypt + 0x8000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank_decrypted(machine, "bank1", 0, 16, decrypt + 0x8000, 0x4000); } static DRIVER_INIT( shootouj ) { - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); } diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index f5fd29f1ffa..bd71cef3ac5 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -64,7 +64,7 @@ static WRITE8_HANDLER( sidearms_bankswitch_w ) /* bits 0 and 1 select the ROM bank */ bankaddress = 0x10000 + (data & 0x0f) * 0x4000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } @@ -86,7 +86,7 @@ static READ8_HANDLER( turtship_ports_r ) static ADDRESS_MAP_START( sidearms_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_BASE_GENERIC(paletteram2) AM_RANGE(0xc800, 0xc800) AM_READ_PORT("SYSTEM") AM_WRITE(soundlatch_w) @@ -107,7 +107,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( turtship_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xd000, 0xdfff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE_GENERIC(paletteram) @@ -151,12 +151,12 @@ static WRITE8_HANDLER( whizz_bankswitch_w ) } bankaddress = 0x10000 + bank * 0x4000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } static ADDRESS_MAP_START( whizz_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_BASE_GENERIC(paletteram2) AM_RANGE(0xc800, 0xc800) AM_READ_PORT("DSW0") AM_WRITE(soundlatch_w) diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index 2b052a7edb1..c92359030a5 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -98,16 +98,16 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1fc6, 0x1fc7) AM_DEVREADWRITE("konami", simpsons_sound_r, k053260_w) AM_RANGE(0x1fc8, 0x1fc9) AM_READ(K053246_r) AM_RANGE(0x1fca, 0x1fca) AM_READ(watchdog_reset_r) - AM_RANGE(0x2000, 0x3fff) AM_RAMBANK(4) + AM_RANGE(0x2000, 0x3fff) AM_RAMBANK("bank4") AM_RANGE(0x0000, 0x3fff) AM_READWRITE(K052109_r, K052109_w) AM_RANGE(0x4000, 0x5fff) AM_RAM - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END static WRITE8_HANDLER( z80_bankswitch_w ) { - memory_set_bank(space->machine, 2, data & 7); + memory_set_bank(space->machine, "bank2", data & 7); } #if 0 @@ -135,7 +135,7 @@ static WRITE8_HANDLER( z80_arm_nmi_w ) static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(z80_arm_nmi_w) diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c index 13429538caf..2ecc3b95330 100644 --- a/src/mame/drivers/skimaxx.c +++ b/src/mame/drivers/skimaxx.c @@ -130,8 +130,8 @@ static VIDEO_START( skimaxx ) bg_buffer = auto_alloc_array(machine, UINT32, 0x400 * 0x100 * sizeof(UINT16) / sizeof(UINT32) * 2); // 2 buffers skimaxx_bg_buffer_back = bg_buffer + 0x400 * 0x100 * sizeof(UINT16) / sizeof(UINT32) * 0; skimaxx_bg_buffer_front = bg_buffer + 0x400 * 0x100 * sizeof(UINT16) / sizeof(UINT32) * 1; - memory_configure_bank(machine, 1, 0, 1, skimaxx_bg_buffer_back, 0); - memory_configure_bank(machine, 1, 1, 1, skimaxx_bg_buffer_front, 0); + memory_configure_bank(machine, "bank1", 0, 1, skimaxx_bg_buffer_back, 0); + memory_configure_bank(machine, "bank1", 1, 1, skimaxx_bg_buffer_front, 0); } static VIDEO_UPDATE( skimaxx ) @@ -249,7 +249,7 @@ static WRITE32_HANDLER( skimaxx_fpga_ctrl_w ) skimaxx_bg_buffer_back = bg_buffer + 0x400 * 0x100 * sizeof(UINT16) / sizeof(UINT32) * bank_bg_buffer; skimaxx_bg_buffer_front = bg_buffer + 0x400 * 0x100 * sizeof(UINT16) / sizeof(UINT32) * (1 - bank_bg_buffer); - memory_set_bank(space->machine, 1, bank_bg_buffer); + memory_set_bank(space->machine, "bank1", bank_bg_buffer); } } @@ -342,7 +342,7 @@ static ADDRESS_MAP_START( 68030_2_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x40000000, 0x40000003) AM_WRITE( skimaxx_fpga_ctrl_w ) AM_BASE( &skimaxx_fpga_ctrl ) - AM_RANGE(0x50000000, 0x5007ffff) AM_RAMBANK(1) // background ram allocated here at video_start (skimaxx_bg_buffer_back/front) + AM_RANGE(0x50000000, 0x5007ffff) AM_RAMBANK("bank1") // background ram allocated here at video_start (skimaxx_bg_buffer_back/front) // AM_RANGE(0xfffc0000, 0xfffc7fff) AM_RAM AM_SHARE(1) AM_RANGE(0xfffc0000, 0xfffcffff) AM_RAM AM_SHARE(1) // AM_RANGE(0xfffe0000, 0xffffffff) AM_RAM // I think this is banked with the shared RAM? (see CPU sync routines) diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c index 8dd6e73a88d..9b6a4d96690 100644 --- a/src/mame/drivers/skykid.c +++ b/src/mame/drivers/skykid.c @@ -84,7 +84,7 @@ static WRITE8_HANDLER( skykid_subreset_w ) static WRITE8_HANDLER( skykid_bankswitch_w ) { - memory_set_bank(space->machine, 1, !BIT(offset,11)); + memory_set_bank(space->machine, "bank1", !BIT(offset,11)); } static WRITE8_HANDLER( skykid_irq_1_ctrl_w ) @@ -106,7 +106,7 @@ static WRITE8_HANDLER( skykid_irq_2_ctrl_w ) static MACHINE_START( skykid ) { /* configure the banks */ - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x2000); state_save_register_global(machine, inputport_selected); } @@ -114,7 +114,7 @@ static MACHINE_START( skykid ) static ADDRESS_MAP_START( skykid_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_BANK(1)) /* banked ROM */ + AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x2000, 0x2fff) AM_READWRITE(skykid_videoram_r,skykid_videoram_w) AM_BASE(&skykid_videoram)/* Video RAM (background) */ AM_RANGE(0x4000, 0x47ff) AM_READWRITE(skykid_textram_r,skykid_textram_w) AM_BASE(&skykid_textram) /* video RAM (text layer) */ AM_RANGE(0x4800, 0x5fff) AM_RAM AM_BASE(&skykid_spriteram) /* RAM + Sprite RAM */ diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index 864c9bd1d7d..f6cad367d4d 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -412,7 +412,7 @@ static ADDRESS_MAP_START( perfrman_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x880f) AM_RAM AM_SHARE(1) - AM_RANGE(0x8810, 0x8fff) AM_RAMBANK(1) /* Shared RAM with sound CPU */ + AM_RANGE(0x8810, 0x8fff) AM_RAMBANK("bank1") /* Shared RAM with sound CPU */ AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(slapfight_videoram_w) AM_BASE_GENERIC(videoram) AM_SIZE_GENERIC(videoram) AM_RANGE(0x9800, 0x9fff) AM_RAM_WRITE(slapfight_colorram_w) AM_BASE_GENERIC(colorram) AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) @@ -435,7 +435,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slapfght_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xc80f) AM_RAM AM_SHARE(1) AM_RANGE(0xc810, 0xcfff) AM_RAM @@ -452,7 +452,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slapbtuk_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xc80f) AM_RAM AM_SHARE(1) AM_RANGE(0xc810, 0xcfff) AM_RAM @@ -519,7 +519,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( perfrman_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x8800, 0x880f) AM_RAM AM_SHARE(1) - AM_RANGE(0x8810, 0x8fff) AM_RAMBANK(1) /* Shared RAM with main CPU */ + AM_RANGE(0x8810, 0x8fff) AM_RAMBANK("bank1") /* Shared RAM with main CPU */ AM_RANGE(0xa080, 0xa080) AM_DEVWRITE("ay1", ay8910_address_w) AM_RANGE(0xa081, 0xa081) AM_DEVREAD("ay1", ay8910_r) AM_RANGE(0xa082, 0xa082) AM_DEVWRITE("ay1", ay8910_data_w) diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 77a3e4229c9..2b8744d9f75 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -230,7 +230,7 @@ static INT32 banknum; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 10, memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); + memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); } static STATE_POSTLOAD( slapshot_postload ) @@ -313,7 +313,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( opwolf3_z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r,ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c index 94746078f55..0b106594fec 100644 --- a/src/mame/drivers/sms.c +++ b/src/mame/drivers/sms.c @@ -226,7 +226,7 @@ U145 1Brown PAL14H4CN static WRITE8_HANDLER(bankswitch_w) { - memory_set_bank(space->machine, 1, data); + memory_set_bank(space->machine, "bank1", data); } /************************************* @@ -483,7 +483,7 @@ static ADDRESS_MAP_START( sms_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00800, 0x00803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) AM_RANGE(0x01000, 0x01007) AM_WRITE(video_w) AM_RANGE(0x01800, 0x01803) AM_READWRITE(link_r, link_w) - AM_RANGE(0x04000, 0x07fff) AM_ROMBANK(1) + AM_RANGE(0x04000, 0x07fff) AM_ROMBANK("bank1") AM_RANGE(0x04000, 0x04000) AM_WRITE(bankswitch_w) AM_RANGE(0x08000, 0x0ffff) AM_ROM AM_RANGE(0xf8000, 0xfffff) AM_ROM // mirror for vectors @@ -515,7 +515,7 @@ ADDRESS_MAP_END static MACHINE_START( sms ) { - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "questions"), 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "questions"), 0x4000); } static MACHINE_START( sureshot ) diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index 3d87bd2a98c..a628c7bcd72 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -161,7 +161,7 @@ static ADDRESS_MAP_START( searchar_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0f8000, 0x0f8001) AM_READ(sound_status_r) AM_RANGE(0x100000, 0x107fff) AM_READWRITE(pow_spriteram_r, pow_spriteram_w) AM_BASE_GENERIC(spriteram) // only partially populated AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(searchar_fg_videoram_w) AM_MIRROR(0x1000) AM_BASE(&pow_fg_videoram) /* Mirror is used by Ikari 3 */ - AM_RANGE(0x300000, 0x33ffff) AM_ROMBANK(1) /* Extra code bank */ + AM_RANGE(0x300000, 0x33ffff) AM_ROMBANK("bank1") /* Extra code bank */ AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(pow_paletteram16_word_w) AM_BASE_GENERIC(paletteram) ADDRESS_MAP_END @@ -1010,7 +1010,7 @@ ROM_END static DRIVER_INIT( searchar ) { - memory_set_bankptr(machine, 1, memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank1", memory_region(machine, "user1")); } /******************************************************************************/ diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c index 37be8def0c2..b6d249275cb 100644 --- a/src/mame/drivers/sothello.c +++ b/src/mame/drivers/sothello.c @@ -68,7 +68,7 @@ static WRITE8_HANDLER(bank_w) case 4: bank=2; break; case 8: bank=3; break; } - memory_set_bankptr(space->machine,1,&RAM[bank*0x4000+0x10000]); + memory_set_bankptr(space->machine,"bank1",&RAM[bank*0x4000+0x10000]); } static TIMER_CALLBACK( subcpu_suspend ) @@ -109,7 +109,7 @@ static READ8_HANDLER( soundcpu_status_r ) static ADDRESS_MAP_START( maincpu_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_MIRROR(0x1800) AM_SHARE(1) AM_RANGE(0xe000, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index 9e8e759b3c7..f0883d34e2d 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -280,7 +280,7 @@ static ADDRESS_MAP_START( spdodgeb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3006, 0x3006) AM_WRITE(spdodgeb_ctrl_w) /* scroll hi, flip screen, bank switch, palette select */ AM_RANGE(0x3800, 0x3800) AM_WRITE(mcu63701_w) AM_RANGE(0x3801, 0x3805) AM_READ(mcu63701_r) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c index 5d8ba1432c6..deadcdbf366 100644 --- a/src/mame/drivers/speedspn.c +++ b/src/mame/drivers/speedspn.c @@ -96,7 +96,7 @@ static WRITE8_HANDLER(speedspn_banked_rom_change) break; } - memory_set_bankptr(space->machine, 1,&rom[addr + 0x8000]); + memory_set_bankptr(space->machine, "bank1",&rom[addr + 0x8000]); } /*** SOUND RELATED ***********************************************************/ @@ -124,7 +124,7 @@ static ADDRESS_MAP_START( speedspn_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_RANGE(0xa800, 0xafff) AM_RAM AM_RANGE(0xb000, 0xbfff) AM_RAM /* RAM PROGRAM */ - AM_RANGE(0xc000, 0xffff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1") /* banked ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( speedspn_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c index 95dd7a99830..87beafa870c 100644 --- a/src/mame/drivers/speglsht.c +++ b/src/mame/drivers/speglsht.c @@ -117,7 +117,7 @@ UINT32 speglsht_videoreg; static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w) AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w) AM_RANGE(0xe000, 0xe7ff) AM_RAM diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index 8e4f292ddc6..6ebc2f239be 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -89,7 +89,7 @@ static WRITE8_HANDLER( sprcros2_m_port7_w ) //-------x nmi enable if((sprcros2_m_port7^data)&0x40) - memory_set_bankptr(space->machine, 1,&RAM[0x10000+((data&0x40)<<7)]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x10000+((data&0x40)<<7)]); tilemap_set_flip_all( space->machine,data&0x02?(TILEMAP_FLIPX|TILEMAP_FLIPY):0 ); @@ -107,14 +107,14 @@ static WRITE8_HANDLER( sprcros2_s_port3_w ) //-------x nmi enable if((sprcros2_s_port3^data)&0x08) - memory_set_bankptr(space->machine, 2,&RAM[0x10000+((data&0x08)<<10)]); + memory_set_bankptr(space->machine, "bank2",&RAM[0x10000+((data&0x08)<<10)]); sprcros2_s_port3 = data; } static ADDRESS_MAP_START( sprcros2_master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(sprcros2_fgvideoram_w) AM_BASE(&sprcros2_fgvideoram) AM_RANGE(0xe800, 0xe817) AM_RAM //always zero AM_RANGE(0xe818, 0xe83f) AM_RAM AM_BASE(&sprcros2_spriteram) AM_SIZE(&sprcros2_spriteram_size) @@ -135,7 +135,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sprcros2_slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(2) + AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank2") AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(sprcros2_bgvideoram_w) AM_BASE(&sprcros2_bgvideoram) AM_RANGE(0xe800, 0xefff) AM_RAM //always zero AM_RANGE(0xf000, 0xf7ff) AM_RAM diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index a3681903d85..544569282a5 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -163,7 +163,7 @@ if ((data & 1) == 0) popmessage("bankswitch RAM bank 0"); /* bit 1-4 = ROM bank */ if (data & 0x10) offs = 0x20000 + (data & 0x06) * 0x1000; else offs = 0x10000 + (data & 0x0e) * 0x1000; - memory_set_bankptr(space->machine, 1,&rom[offs]); + memory_set_bankptr(space->machine, "bank1",&rom[offs]); } //AT @@ -365,7 +365,7 @@ static ADDRESS_MAP_START( spy_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3fd3, 0x3fd3) AM_READ_PORT("DSW1") AM_RANGE(0x3fe0, 0x3fe0) AM_READ_PORT("DSW2") AM_RANGE(0x2000, 0x5fff) AM_READWRITE(K052109_051960_r,K052109_051960_w) - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index 34043469388..348bd55aa09 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -353,7 +353,7 @@ static WRITE8_HANDLER( srmp3_rombank_w ) if (data & 0x1f) addr = ((0x10000 + (0x2000 * (data & 0x0f))) - 0x8000); else addr = 0x10000; - memory_set_bankptr(space->machine, 1, &ROM[addr]); + memory_set_bankptr(space->machine, "bank1", &ROM[addr]); } /************************************************************************** @@ -525,7 +525,7 @@ static WRITE8_HANDLER( srmp3_flags_w ) static ADDRESS_MAP_START( srmp3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) /* rom bank */ + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* rom bank */ AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE_SIZE_GENERIC(nvram) /* work ram */ AM_RANGE(0xa800, 0xa800) AM_WRITENOP /* flag ? */ AM_RANGE(0xb000, 0xb303) AM_RAM AM_BASE_MEMBER(srmp2_state,spriteram1.u8) /* Sprites Y */ diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 24e3d19d424..76a0b805086 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -329,7 +329,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("stsnd", st0016_snd_r, st0016_snd_w) AM_RANGE(0xec00, 0xec1f) AM_READ(st0016_character_ram_r) AM_WRITE(st0016_character_ram_w) AM_RANGE(0xf000, 0xffff) AM_RAM diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 4340022d218..b379518dbf2 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -308,7 +308,7 @@ static WRITE16_HANDLER( video_regs_w ) case 0x5e/2: // bank switch, used by ROM check LOG(("%x\n",data)); - memory_set_bankptr(space->machine, 1,(UINT16 *)(memory_region(space->machine, "nile") + (data & 0x0f)*0x200000)); + memory_set_bankptr(space->machine, "bank1",(UINT16 *)(memory_region(space->machine, "nile") + (data & 0x0f)*0x200000)); break; // set by IT4 @@ -513,7 +513,7 @@ static WRITE16_HANDLER(paletteram_w) static ADDRESS_MAP_START( srmp6, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x200000, 0x23ffff) AM_RAM // work RAM - AM_RANGE(0x600000, 0x7fffff) AM_READ(SMH_BANK(1)) // banked ROM (used by ROM check) + AM_RANGE(0x600000, 0x7fffff) AM_ROMBANK("bank1") // banked ROM (used by ROM check) AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION("user1", 0) AM_RANGE(0x300000, 0x300005) AM_READWRITE(srmp6_inputs_r, srmp6_input_select_w) // inputs diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c index a5953afff6f..0da895bee90 100644 --- a/src/mame/drivers/srumbler.c +++ b/src/mame/drivers/srumbler.c @@ -47,9 +47,11 @@ static WRITE8_HANDLER( srumbler_bankswitch_w ) for (i = 0x05;i < 0x10;i++) { int bank = ((prom1[i] & 0x03) << 4) | (prom2[i] & 0x0f); + char bankname[10]; /* bit 2 of prom1 selects ROM or RAM - not supported */ - memory_set_bankptr(space->machine, i+1,&ROM[bank*0x1000]); + sprintf(bankname, "%04X", i*0x1000); + memory_set_bankptr(space->machine, bankname,&ROM[bank*0x1000]); } } @@ -89,19 +91,19 @@ static ADDRESS_MAP_START( srumbler_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x400c, 0x400c) AM_READ_PORT("DSW2") AM_RANGE(0x400a, 0x400d) AM_WRITE(srumbler_scroll_w) AM_RANGE(0x400e, 0x400e) AM_WRITE(soundlatch_w) - AM_RANGE(0x5000, 0x5fff) AM_ROMBANK(6) AM_WRITE(srumbler_foreground_w) AM_BASE(&srumbler_foregroundram) /* Banked ROM */ - AM_RANGE(0x6000, 0x6fff) AM_ROMBANK(7) /* Banked ROM */ + AM_RANGE(0x5000, 0x5fff) AM_ROMBANK("5000") AM_WRITE(srumbler_foreground_w) AM_BASE(&srumbler_foregroundram) /* Banked ROM */ + AM_RANGE(0x6000, 0x6fff) AM_ROMBANK("6000") /* Banked ROM */ AM_RANGE(0x6000, 0x6fff) AM_WRITENOP /* Video RAM 2 ??? (not used) */ - AM_RANGE(0x7000, 0x7fff) AM_ROMBANK(8) /* Banked ROM */ + AM_RANGE(0x7000, 0x7fff) AM_ROMBANK("7000") /* Banked ROM */ AM_RANGE(0x7000, 0x73ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x8000, 0x8fff) AM_ROMBANK(9) /* Banked ROM */ - AM_RANGE(0x9000, 0x9fff) AM_ROMBANK(10) /* Banked ROM */ - AM_RANGE(0xa000, 0xafff) AM_ROMBANK(11) /* Banked ROM */ - AM_RANGE(0xb000, 0xbfff) AM_ROMBANK(12) /* Banked ROM */ - AM_RANGE(0xc000, 0xcfff) AM_ROMBANK(13) /* Banked ROM */ - AM_RANGE(0xd000, 0xdfff) AM_ROMBANK(14) /* Banked ROM */ - AM_RANGE(0xe000, 0xefff) AM_ROMBANK(15) /* Banked ROM */ - AM_RANGE(0xf000, 0xffff) AM_ROMBANK(16) /* Banked ROM */ + AM_RANGE(0x8000, 0x8fff) AM_ROMBANK("8000") /* Banked ROM */ + AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("9000") /* Banked ROM */ + AM_RANGE(0xa000, 0xafff) AM_ROMBANK("A000") /* Banked ROM */ + AM_RANGE(0xb000, 0xbfff) AM_ROMBANK("B000") /* Banked ROM */ + AM_RANGE(0xc000, 0xcfff) AM_ROMBANK("C000") /* Banked ROM */ + AM_RANGE(0xd000, 0xdfff) AM_ROMBANK("D000") /* Banked ROM */ + AM_RANGE(0xe000, 0xefff) AM_ROMBANK("E000") /* Banked ROM */ + AM_RANGE(0xf000, 0xffff) AM_ROMBANK("F000") /* Banked ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( srumbler_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/ssf2md.c b/src/mame/drivers/ssf2md.c index 8cdccc0af1e..53a53755135 100644 --- a/src/mame/drivers/ssf2md.c +++ b/src/mame/drivers/ssf2md.c @@ -19,9 +19,10 @@ static READ16_HANDLER( ssf2ghw_dsw_r ) static DRIVER_INIT( ssf2ghw ) { memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xA130F0, 0xA130FF, 0, 0, (write16_space_func)SMH_NOP); // custom banking is disabled (!) - memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400000, 0x5fffff, 0, 0, (read16_space_func)SMH_BANK(5), (write16_space_func)SMH_UNMAP); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400000, 0x5fffff, 0, 0, "bank5"); + memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400000, 0x5fffff, 0, 0, (write16_space_func)SMH_UNMAP); - memory_set_bankptr(machine, 5, memory_region( machine, "maincpu" ) + 0x400000 ); + memory_set_bankptr(machine, "bank5", memory_region( machine, "maincpu" ) + 0x400000 ); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x770070, 0x770075, 0, 0, ssf2ghw_dsw_r ); diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index de7f5f04057..195659170d0 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -340,7 +340,7 @@ static MACHINE_RESET( ssv ) { requested_int = 0; cpu_set_irq_callback(cputag_get_cpu(machine, "maincpu"), ssv_irq_callback); - memory_set_bankptr(machine, 1, memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank1", memory_region(machine, "user1")); } @@ -442,7 +442,7 @@ static READ16_HANDLER( fake_r ) { return ssv_scroll[offset]; } AM_RANGE(0x260000, 0x260001) AM_WRITE(ssv_irq_enable_w) /* IRQ En */ \ AM_RANGE(0x300000, 0x30007f) AM_DEVREADWRITE8("ensoniq", es5506_r, es5506_w, 0x00ff) /* Sound */ \ AM_RANGE(0x482000, 0x482fff) AM_RAM_WRITE(dsp_w) AM_BASE(&dsp_ram) \ - AM_RANGE(_ROM, 0xffffff) AM_ROMBANK(1) /* ROM */ \ + AM_RANGE(_ROM, 0xffffff) AM_ROMBANK("bank1") /* ROM */ \ //AM_RANGE(0x990000, 0x99007f) AM_READ(fake_r) diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index a44a402dc30..5ff09751a68 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -29,7 +29,7 @@ UINT32 st0016_rom_bank; static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w) AM_RANGE(0xd000, 0xdfff) AM_READ(st0016_sprite2_ram_r) AM_WRITE(st0016_sprite2_ram_w) AM_RANGE(0xe000, 0xe7ff) AM_RAM @@ -69,7 +69,7 @@ static WRITE8_HANDLER(mux_select_w) WRITE8_HANDLER(st0016_rom_bank_w) { - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "maincpu") + (data* 0x4000) + 0x10000 ); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + (data* 0x4000) + 0x10000 ); st0016_rom_bank=data; } @@ -136,7 +136,7 @@ static ADDRESS_MAP_START( v810_mem,ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x80000000, 0x8001ffff) AM_RAM AM_RANGE(0xc0000000, 0xc001ffff) AM_RAM AM_RANGE(0x40000000, 0x4000000f) AM_READ(latch32_r) AM_WRITE(latch32_w) - AM_RANGE(0xfff80000, 0xffffffff) AM_READ(SMH_BANK(2)) + AM_RANGE(0xfff80000, 0xffffffff) AM_ROMBANK("bank2") ADDRESS_MAP_END static ADDRESS_MAP_START( st0016_m2_io, ADDRESS_SPACE_IO, 8 ) @@ -661,13 +661,13 @@ static DRIVER_INIT(nratechu) static DRIVER_INIT(mayjinsn) { st0016_game=4|0x80; - memory_set_bankptr(machine, 2, memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank2", memory_region(machine, "user1")); } static DRIVER_INIT(mayjisn2) { st0016_game=4; - memory_set_bankptr(machine, 2, memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank2", memory_region(machine, "user1")); } /************************************* diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c index 091e5ccddd3..63c88b96a37 100644 --- a/src/mame/drivers/starwars.c +++ b/src/mame/drivers/starwars.c @@ -182,7 +182,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4703, 0x4703) AM_READ(starwars_prng_r) /* pseudo random number generator */ AM_RANGE(0x4800, 0x4fff) AM_RAM /* CPU and Math RAM */ AM_RANGE(0x5000, 0x5fff) AM_RAM AM_BASE(&starwars_mathram) /* CPU and Math RAM */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM /* rest of main_rom */ ADDRESS_MAP_END @@ -512,8 +512,8 @@ static DRIVER_INIT( starwars ) starwars_mproc_init(machine); /* initialize banking */ - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x6000, 0x10000 - 0x6000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x6000, 0x10000 - 0x6000); + memory_set_bank(machine, "bank1", 0); } @@ -536,17 +536,17 @@ static DRIVER_INIT( esb ) memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0x9fff, 0, 0, esb_slapstic_r, esb_slapstic_w); /* install additional banking */ - memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa000, 0xffff, 0, 0, (read8_space_func)SMH_BANK(2)); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa000, 0xffff, 0, 0, "bank2"); /* prepare the matrix processor */ starwars_is_esb = 1; starwars_mproc_init(machine); /* initialize banking */ - memory_configure_bank(machine, 1, 0, 2, rom + 0x6000, 0x10000 - 0x6000); - memory_set_bank(machine, 1, 0); - memory_configure_bank(machine, 2, 0, 2, rom + 0xa000, 0x1c000 - 0xa000); - memory_set_bank(machine, 2, 0); + memory_configure_bank(machine, "bank1", 0, 2, rom + 0x6000, 0x10000 - 0x6000); + memory_set_bank(machine, "bank1", 0); + memory_configure_bank(machine, "bank2", 0, 2, rom + 0xa000, 0x1c000 - 0xa000); + memory_set_bank(machine, "bank2", 0); /* additional globals for state saving */ state_save_register_global(machine, slapstic_current_bank); diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c index ffcacdfee47..31fe524332f 100644 --- a/src/mame/drivers/stfight.c +++ b/src/mame/drivers/stfight.c @@ -236,7 +236,7 @@ DONE? (check on real board) static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) /* sf02.bin */ + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* sf02.bin */ AM_RANGE(0xc000, 0xc0ff) AM_RAM AM_BASE_GENERIC(paletteram) AM_RANGE(0xc100, 0xc1ff) AM_RAM AM_BASE_GENERIC(paletteram2) AM_RANGE(0xc200, 0xc200) AM_READ_PORT("P1") /* IN1 */ diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index 571fb4f1075..b6db3d07d6a 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -276,7 +276,7 @@ static WRITE8_HANDLER( bssoccer_pcm_1_bankswitch_w ) UINT8 *RAM = memory_region(space->machine, "pcm1"); int bank = data & 7; if (bank & ~7) logerror("CPU#2 PC %06X - ROM bank unknown bits: %02X\n", cpu_get_pc(space->cpu), data); - memory_set_bankptr(space->machine, 1, &RAM[bank * 0x10000 + 0x1000]); + memory_set_bankptr(space->machine, "bank1", &RAM[bank * 0x10000 + 0x1000]); } static WRITE8_HANDLER( bssoccer_pcm_2_bankswitch_w ) @@ -284,7 +284,7 @@ static WRITE8_HANDLER( bssoccer_pcm_2_bankswitch_w ) UINT8 *RAM = memory_region(space->machine, "pcm2"); int bank = data & 7; if (bank & ~7) logerror("CPU#3 PC %06X - ROM bank unknown bits: %02X\n", cpu_get_pc(space->cpu), data); - memory_set_bankptr(space->machine, 2, &RAM[bank * 0x10000 + 0x1000]); + memory_set_bankptr(space->machine, "bank2", &RAM[bank * 0x10000 + 0x1000]); } @@ -293,12 +293,12 @@ static WRITE8_HANDLER( bssoccer_pcm_2_bankswitch_w ) static ADDRESS_MAP_START( bssoccer_pcm_1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM // ROM - AM_RANGE(0x1000, 0xffff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( bssoccer_pcm_2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM // ROM - AM_RANGE(0x1000, 0xffff) AM_ROMBANK(2) // Banked ROM + AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank2") // Banked ROM ADDRESS_MAP_END @@ -338,14 +338,14 @@ static WRITE8_HANDLER( uballoon_pcm_1_bankswitch_w ) UINT8 *RAM = memory_region(space->machine, "pcm1"); int bank = data & 1; if (bank & ~1) logerror("CPU#2 PC %06X - ROM bank unknown bits: %02X\n", cpu_get_pc(space->cpu), data); - memory_set_bankptr(space->machine, 1, &RAM[bank * 0x10000 + 0x400]); + memory_set_bankptr(space->machine, "bank1", &RAM[bank * 0x10000 + 0x400]); } /* Memory maps: Yes, *no* RAM */ static ADDRESS_MAP_START( uballoon_pcm_1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_ROM // ROM - AM_RANGE(0x0400, 0xffff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x0400, 0xffff) AM_ROMBANK("bank1") // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( uballoon_pcm_1_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index c82ad8b130e..bd1a1519abd 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -76,7 +76,7 @@ static DRIVER_INIT( hardhead ) rom[i] = BITSWAP8(rom[i], 7,6,5,3,4,2,1,0) ^ 0x58; } - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); } /* Non encrypted bootleg */ @@ -84,7 +84,7 @@ static DRIVER_INIT( hardhedb ) { const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x48000); - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); } /*************************************************************************** @@ -163,8 +163,8 @@ static DRIVER_INIT( brickzn ) decrypt[0x24b5] = 0x00; // HALT -> NOP decrypt[0x2583] = 0x00; // HALT -> NOP - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); - memory_configure_bank_decrypted(machine, 1, 0, 16, decrypt + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank_decrypted(machine, "bank1", 0, 16, decrypt + 0x10000, 0x4000); } static DRIVER_INIT( brickzn3 ) @@ -194,8 +194,8 @@ static DRIVER_INIT( brickzn3 ) decrypt[0x2487] = 0x00; // HALT -> NOP decrypt[0x256c] = 0x00; // HALT -> NOP - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); - memory_configure_bank_decrypted(machine, 1, 0, 16, decrypt + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank_decrypted(machine, "bank1", 0, 16, decrypt + 0x10000, 0x4000); } @@ -281,8 +281,8 @@ rom13: 0?, 1y, 2n, 3n ?,?,?,? (palettes) RAM[i] = BITSWAP8(RAM[i], 5,6,7,4,3,2,1,0) ^ 0x41; } - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); - memory_configure_bank(machine, 2, 0, 2, auto_alloc_array(machine, UINT8, 0x2000 * 2), 0x2000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank2", 0, 2, auto_alloc_array(machine, UINT8, 0x2000 * 2), 0x2000); } @@ -350,7 +350,7 @@ static DRIVER_INIT( starfigh ) RAM[i] = BITSWAP8(RAM[i], 5,6,7,4,3,2,1,0) ^ 0x45; } - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); } @@ -418,7 +418,7 @@ static DRIVER_INIT( sparkman ) RAM[i] = BITSWAP8(RAM[i], 5,6,7,4,3,2,1,0) ^ 0x44; } - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); } /*************************************************************************** @@ -491,7 +491,7 @@ static WRITE8_HANDLER( hardhead_bankswitch_w ) int bank = data & 0x0f; if (data & ~0xef) logerror("CPU #0 - PC %04X: unknown bank bits: %02X\n",cpu_get_pc(space->cpu),data); - memory_set_bank(space->machine, 1, bank); + memory_set_bank(space->machine, "bank1", bank); } @@ -510,7 +510,7 @@ static WRITE8_HANDLER( hardhead_flipscreen_w ) static ADDRESS_MAP_START( hardhead_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xd7ff) AM_RAM // RAM AM_RANGE(0xd800, 0xd9ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE_GENERIC(paletteram) // Palette AM_RANGE(0xda00, 0xda00) AM_READWRITE(hardhead_ip_r, SMH_RAM) AM_BASE(&hardhead_ip) // Input Port Select @@ -548,7 +548,7 @@ static WRITE8_HANDLER( rranger_bankswitch_w ) if (data & ~0xf7) logerror("CPU #0 - PC %04X: unknown bank bits: %02X\n",cpu_get_pc(space->cpu),data); - memory_set_bank(space->machine, 1, bank); + memory_set_bank(space->machine, "bank1", bank); flip_screen_set(space->machine, data & 0x20); coin_lockout_w ( space->machine, 0, data & 0x40); @@ -571,7 +571,7 @@ static READ8_HANDLER( rranger_soundstatus_r ) static ADDRESS_MAP_START( rranger_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xc000) AM_READWRITE(watchdog_reset_r, soundlatch_w) // To Sound CPU AM_RANGE(0xc002, 0xc002) AM_WRITE(rranger_bankswitch_w ) // ROM Banking AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P1") // P1 (Inputs) @@ -642,13 +642,13 @@ static WRITE8_HANDLER( brickzn_rombank_w ) if (data & ~0x0f) logerror("CPU #0 - PC %04X: unknown rom bank bits: %02X\n",cpu_get_pc(space->cpu),data); - memory_set_bank(space->machine, 1, bank); + memory_set_bank(space->machine, "bank1", bank); suna8_rombank = data; } static ADDRESS_MAP_START( brickzn_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc040, 0xc040) AM_WRITE(brickzn_rombank_w ) // ROM Bank AM_RANGE(0xc060, 0xc060) AM_WRITE(brickzn_spritebank_w ) // Sprite RAM Bank + Flip Screen AM_RANGE(0xc0a0, 0xc0a0) AM_WRITE(brickzn_palettebank_w ) // Palette RAM Bank + ? @@ -718,7 +718,7 @@ static WRITE8_HANDLER( hardhea2_rombank_w ) if (data & ~0x0f) logerror("CPU #0 - PC %04X: unknown rom bank bits: %02X\n",cpu_get_pc(space->cpu),data); - memory_set_bank(space->machine, 1, bank); + memory_set_bank(space->machine, "bank1", bank); suna8_rombank = data; } @@ -733,17 +733,17 @@ static WRITE8_HANDLER( hardhea2_spritebank_1_w ) static WRITE8_HANDLER( hardhea2_rambank_0_w ) { - memory_set_bank(space->machine, 2, 0); + memory_set_bank(space->machine, "bank2", 0); } static WRITE8_HANDLER( hardhea2_rambank_1_w ) { - memory_set_bank(space->machine, 2, 1); + memory_set_bank(space->machine, "bank2", 1); } static ADDRESS_MAP_START( hardhea2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") // P1 (Inputs) AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P2") // P2 AM_RANGE(0xc002, 0xc002) AM_READ_PORT("DSW1") // DSW 1 @@ -777,7 +777,7 @@ static ADDRESS_MAP_START( hardhea2_map, ADDRESS_SPACE_PROGRAM, 8 ) // Protection *** AM_RANGE(0xc600, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE_GENERIC(paletteram ) // Palette (Banked??) - AM_RANGE(0xc800, 0xdfff) AM_RAMBANK(2) // RAM (Banked?) + AM_RANGE(0xc800, 0xdfff) AM_RAMBANK("bank2") // RAM (Banked?) AM_RANGE(0xe000, 0xffff) AM_READWRITE(suna8_banked_spriteram_r, suna8_banked_spriteram_w) // Sprites (Banked) ADDRESS_MAP_END @@ -800,7 +800,7 @@ static WRITE8_HANDLER( starfigh_spritebank_w ) static ADDRESS_MAP_START( starfigh_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") // P1 (Inputs) AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P2") // P2 AM_RANGE(0xc002, 0xc002) AM_READ_PORT("DSW1") // DSW 1 @@ -867,7 +867,7 @@ static WRITE8_HANDLER( sparkman_rombank_w ) if (data & ~0x0f) logerror("CPU #0 - PC %04X: unknown rom bank bits: %02X\n",cpu_get_pc(space->cpu),data); - memory_set_bank(space->machine, 1, bank); + memory_set_bank(space->machine, "bank1", bank); suna8_rombank = data; } @@ -878,7 +878,7 @@ static READ8_HANDLER( sparkman_c0a3_r ) static ADDRESS_MAP_START( sparkman_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") // P1 (Inputs) AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P2") // P2 AM_RANGE(0xc002, 0xc002) AM_READ_PORT("DSW1") // DSW 1 @@ -2267,7 +2267,7 @@ ROM_END static DRIVER_INIT( suna8 ) { - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); } /* Working Games */ diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index 41c27ee0ee5..d041075804f 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -102,7 +102,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_NOP /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index d0a05253b2c..35ec74cdcec 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -559,7 +559,7 @@ static void machine_init_common(running_machine *machine) static MACHINE_START( superqix ) { /* configure the banks */ - memory_configure_bank(machine, 1, 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x4000); machine_init_common(machine); } @@ -567,7 +567,7 @@ static MACHINE_START( superqix ) static MACHINE_START( pbillian ) { /* configure the banks */ - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); machine_init_common(machine); } @@ -575,7 +575,7 @@ static MACHINE_START( pbillian ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xe0ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xe100, 0xe7ff) AM_RAM AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(superqix_videoram_w) AM_BASE(&superqix_videoram) diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index 3ca35d3264e..345709bd475 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -127,7 +127,7 @@ static WRITE8_HANDLER( supertnk_bankswitch_0_w ) bank_address = 0x10000 + (supertnk_rom_bank * 0x1000); - memory_set_bankptr(space->machine, 1, &memory_region(space->machine, "maincpu")[bank_address]); + memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "maincpu")[bank_address]); } @@ -139,7 +139,7 @@ static WRITE8_HANDLER( supertnk_bankswitch_1_w ) bank_address = 0x10000 + (supertnk_rom_bank * 0x1000); - memory_set_bankptr(space->machine, 1, &memory_region(space->machine, "maincpu")[bank_address]); + memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "maincpu")[bank_address]); } @@ -292,7 +292,7 @@ static MACHINE_RESET( supertnk ) static ADDRESS_MAP_START( supertnk_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_ROM - AM_RANGE(0x0800, 0x17ff) AM_ROMBANK(1) + AM_RANGE(0x0800, 0x17ff) AM_ROMBANK("bank1") AM_RANGE(0x1800, 0x1bff) AM_RAM AM_RANGE(0x1efc, 0x1efc) AM_READ_PORT("JOYS") AM_RANGE(0x1efd, 0x1efd) AM_READ_PORT("INPUTS") diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index af6aad8cb1e..0204ea49c6e 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -226,7 +226,7 @@ static WRITE8_HANDLER( rom_bank_select_w ) //popmessage("%08x %02x",((data & 0x3f) * 0x4000),data); mame_printf_debug("ROM_BANK 0x8000 - %X @%X\n",data,cpu_get_previouspc(space->cpu)); - memory_set_bankptr(space->machine, 2, region_base + (data&0x3f ) * 0x4000); + memory_set_bankptr(space->machine, "bank2", region_base + (data&0x3f ) * 0x4000); msm_nmi_mask = data & 0x40; flip_screen_set(space->machine, data & 0x80); @@ -237,7 +237,7 @@ static WRITE8_HANDLER( rom2_bank_select_w ) UINT8 *region_base = memory_region(space->machine, "user2"); mame_printf_debug("ROM_BANK 0x4000 - %X @%X\n",data,cpu_get_previouspc(space->cpu)); - memory_set_bankptr(space->machine, 1, region_base + (data&0x0f ) * 0x4000); + memory_set_bankptr(space->machine, "bank1", region_base + (data&0x0f ) * 0x4000); if(data & 0xf0) printf("Rom bank select 2 with data %02x activated\n",data); @@ -265,9 +265,9 @@ static READ8_HANDLER( p2_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0x4000) AM_WRITE( rom2_bank_select_w ) - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0xc000, 0xdfff) AM_READWRITE( suprgolf_bg_vram_r, suprgolf_bg_vram_w ) // banked background vram AM_RANGE(0xe000, 0xefff) AM_READWRITE( suprgolf_videoram_r, suprgolf_videoram_w ) AM_BASE_GENERIC(videoram) //foreground vram + paletteram AM_RANGE(0xf000, 0xf000) AM_WRITE( suprgolf_pen_w ) diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c index 759c65fcdb7..1848008e386 100644 --- a/src/mame/drivers/suprnova.c +++ b/src/mame/drivers/suprnova.c @@ -460,7 +460,7 @@ static MACHINE_RESET(skns) timer_pulse(machine, ATTOTIME_IN_MSEC(8), NULL, 11, interrupt_callback); timer_pulse(machine, cputag_clocks_to_attotime(machine, "maincpu", 1824), NULL, 9, interrupt_callback); - memory_set_bankptr(machine, 1,memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank1",memory_region(machine, "user1")); } @@ -785,7 +785,7 @@ static ADDRESS_MAP_START( skns_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x02a00000, 0x02a0001f) AM_RAM_WRITE(skns_pal_regs_w) AM_BASE(&skns_pal_regs) AM_RANGE(0x02a40000, 0x02a5ffff) AM_RAM_WRITE(skns_palette_ram_w) AM_BASE(&skns_palette_ram) AM_RANGE(0x02f00000, 0x02f000ff) AM_READWRITE(skns_hit_r, skns_hit_w) - AM_RANGE(0x04000000, 0x041fffff) AM_ROMBANK(1) /* GAME ROM */ + AM_RANGE(0x04000000, 0x041fffff) AM_ROMBANK("bank1") /* GAME ROM */ AM_RANGE(0x04800000, 0x0483ffff) AM_RAM_WRITE(skns_v3t_w) AM_BASE(&skns_v3t_ram) /* tilemap b ram based tiles */ AM_RANGE(0x06000000, 0x060fffff) AM_RAM AM_BASE(&skns_main_ram) AM_RANGE(0xc0000000, 0xc0000fff) AM_RAM AM_BASE(&skns_cache_ram) /* 'cache' RAM */ diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index c6782a5f478..4b9696110b0 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -130,7 +130,7 @@ static WRITE8_HANDLER( suprslam_sh_bankswitch_w ) int bankaddress; bankaddress = 0x10000 + (data & 0x03) * 0x8000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } /*** MEMORY MAPS *************************************************************/ @@ -158,7 +158,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index 3dcd07db72e..717e5084ddc 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -88,7 +88,7 @@ static WRITE8_HANDLER( surpratk_5fc0_w ) static ADDRESS_MAP_START( surpratk_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE(&ram) AM_RANGE(0x0800, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) /* banked ROM */ + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") /* banked ROM */ AM_RANGE(0x5f8c, 0x5f8c) AM_READ_PORT("P1") AM_RANGE(0x5f8d, 0x5f8d) AM_READ_PORT("P2") AM_RANGE(0x5f8e, 0x5f8e) AM_READ_PORT("DSW3") @@ -275,7 +275,7 @@ logerror("%04x: setlines %02x\n",cpu_get_pc(device),lines); offs = 0x10000 + ((lines & 0x1f) * 0x2000); if (offs >= 0x48000) offs -= 0x40000; - memory_set_bankptr(device->machine, 1,&RAM[offs]); + memory_set_bankptr(device->machine, "bank1",&RAM[offs]); } static MACHINE_RESET( surpratk ) diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index 01555d0cf73..e856c6997b0 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -351,10 +351,10 @@ static MACHINE_START( system1 ) UINT32 numbanks = (memory_region_length(machine, "maincpu") - 0x10000) / 0x4000; if (numbanks > 0) - memory_configure_bank(machine, 1, 0, numbanks, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, numbanks, memory_region(machine, "maincpu") + 0x10000, 0x4000); else - memory_configure_bank(machine, 1, 0, 1, memory_region(machine, "maincpu") + 0x8000, 0); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "maincpu") + 0x8000, 0); + memory_set_bank(machine, "bank1", 0); z80_set_cycle_tables(cputag_get_cpu(machine, "maincpu"), cc_op, cc_cb, cc_ed, cc_xy, cc_xycb, cc_ex); @@ -390,14 +390,14 @@ static MACHINE_RESET( system1 ) static void bank44_custom_w(running_machine *machine, UINT8 data, UINT8 prevdata) { /* bank bits are bits 6 and 2 */ - memory_set_bank(machine, 1, ((data & 0x40) >> 5) | ((data & 0x04) >> 2)); + memory_set_bank(machine, "bank1", ((data & 0x40) >> 5) | ((data & 0x04) >> 2)); } static void bank0c_custom_w(running_machine *machine, UINT8 data, UINT8 prevdata) { /* bank bits are bits 3 and 2 */ - memory_set_bank(machine, 1, (data & 0x0c) >> 2); + memory_set_bank(machine, "bank1", (data & 0x0c) >> 2); } @@ -704,7 +704,7 @@ static WRITE8_HANDLER( nobb_outport24_w ) /* main memory map */ static ADDRESS_MAP_START( system1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE(&system1_ram) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE_GENERIC(spriteram) AM_RANGE(0xd800, 0xdfff) AM_RAM_WRITE(system1_paletteram_w) AM_BASE_GENERIC(paletteram) @@ -718,7 +718,7 @@ ADDRESS_MAP_END /* same as normal System 1 except address map is shuffled (RAM/collision are swapped) */ static ADDRESS_MAP_START( nobo_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc3ff) AM_READWRITE(system1_mixer_collision_r, system1_mixer_collision_w) AM_RANGE(0xc400, 0xc7ff) AM_WRITE(system1_mixer_collision_reset_w) AM_RANGE(0xc800, 0xcbff) AM_READWRITE(system1_sprite_collision_r, system1_sprite_collision_w) @@ -4514,14 +4514,14 @@ static DRIVER_INIT( 4dwarrio ) { DRIVER_INIT_CALL(bank00); fdwarrio_decode(machi static DRIVER_INIT( wboy ) { DRIVER_INIT_CALL(bank00); astrofl_decode(machine, "maincpu"); } static DRIVER_INIT( wboy2 ) { DRIVER_INIT_CALL(bank00); wboy2_decode(machine, "maincpu"); } static DRIVER_INIT( wboyo ) { DRIVER_INIT_CALL(bank00); hvymetal_decode(machine, "maincpu"); } -static DRIVER_INIT( blockgal ) { DRIVER_INIT_CALL(bank00); mc8123_decrypt_rom(machine, "maincpu", "key", 0, 0); } +static DRIVER_INIT( blockgal ) { DRIVER_INIT_CALL(bank00); mc8123_decrypt_rom(machine, "maincpu", "key", NULL, 0); } static DRIVER_INIT( hvymetal ) { DRIVER_INIT_CALL(bank44); hvymetal_decode(machine, "maincpu"); } static DRIVER_INIT( gardia ) { DRIVER_INIT_CALL(bank44); gardia_decode(machine, "maincpu"); } static DRIVER_INIT( gardiab ) { DRIVER_INIT_CALL(bank44); gardiab_decode(machine, "maincpu"); } -static DRIVER_INIT( wbml ) { DRIVER_INIT_CALL(bank0c); mc8123_decrypt_rom(machine, "maincpu", "key", 1, 4); } -static DRIVER_INIT( ufosensi ) { DRIVER_INIT_CALL(bank0c); mc8123_decrypt_rom(machine, "maincpu", "key", 1, 4); } +static DRIVER_INIT( wbml ) { DRIVER_INIT_CALL(bank0c); mc8123_decrypt_rom(machine, "maincpu", "key", "bank1", 4); } +static DRIVER_INIT( ufosensi ) { DRIVER_INIT_CALL(bank0c); mc8123_decrypt_rom(machine, "maincpu", "key", "bank1", 4); } static DRIVER_INIT( wboysys2 ) { DRIVER_INIT_CALL(bank0c); astrofl_decode(machine, "maincpu"); } @@ -4530,7 +4530,7 @@ static DRIVER_INIT( dakkochn ) DRIVER_INIT_CALL(bank0c); videomode_custom = dakkochn_custom_w; - mc8123_decrypt_rom(machine, "maincpu", "key", 1, 4); + mc8123_decrypt_rom(machine, "maincpu", "key", "bank1", 4); // memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x00, 0x00, 0, 0, dakkochn_port_00_r); // memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, dakkochn_port_03_r); @@ -4652,7 +4652,7 @@ static DRIVER_INIT( bootsys2 ) { const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x20000); - memory_configure_bank_decrypted(machine, 1, 0, 4, memory_region(machine, "maincpu") + 0x30000, 0x4000); + memory_configure_bank_decrypted(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x30000, 0x4000); DRIVER_INIT_CALL(bank0c); } diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index 5f2d34086eb..bafc41da469 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -246,7 +246,7 @@ ADDRESS_MAP_END // 7759 static ADDRESS_MAP_START( sound_7759_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r) AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -258,7 +258,7 @@ static WRITE8_DEVICE_HANDLER( upd7759_bank_w ) //* upd7759_reset_w(device, data & 0x40); offs = 0x10000 + (data * 0x4000) % size; - memory_set_bankptr(device->machine, 1, memory_region(device->machine, "soundcpu") + offs); + memory_set_bankptr(device->machine, "bank1", memory_region(device->machine, "soundcpu") + offs); } diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index 5772c1e0e89..1c2548a56f9 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -29,11 +29,11 @@ VIDEO_UPDATE( tail2nos ); static MACHINE_RESET( tail2nos ) { /* point to the extra ROMs */ - memory_set_bankptr(machine, 1,memory_region(machine, "user1")); - memory_set_bankptr(machine, 2,memory_region(machine, "user2")); + memory_set_bankptr(machine, "bank1",memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank2",memory_region(machine, "user2")); /* initialize sound bank */ - memory_set_bankptr(machine, 3,memory_region(machine, "audiocpu") + 0x10000); + memory_set_bankptr(machine, "bank3",memory_region(machine, "audiocpu") + 0x10000); } @@ -65,13 +65,13 @@ static WRITE16_HANDLER( tail2nos_K051316_ctrl_0_w ) static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { - memory_set_bankptr(device->machine, 3,memory_region(device->machine, "audiocpu") + 0x10000 + (data & 0x01) * 0x8000); + memory_set_bankptr(device->machine, "bank3",memory_region(device->machine, "audiocpu") + 0x10000 + (data & 0x01) * 0x8000); } static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x200000, 0x27ffff) AM_READWRITE(SMH_BANK(1), SMH_ROM) /* extra ROM */ - AM_RANGE(0x2c0000, 0x2dffff) AM_READWRITE(SMH_BANK(2), SMH_ROM) + AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK("bank1") /* extra ROM */ + AM_RANGE(0x2c0000, 0x2dffff) AM_ROMBANK("bank2") AM_RANGE(0x400000, 0x41ffff) AM_READWRITE(tail2nos_zoomdata_r, tail2nos_zoomdata_w) AM_RANGE(0x500000, 0x500fff) AM_READWRITE(tail2nos_K051316_0_r, tail2nos_K051316_0_w) AM_RANGE(0x510000, 0x51001f) AM_WRITE(tail2nos_K051316_ctrl_0_w) @@ -88,7 +88,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_READWRITE(SMH_BANK(3), SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank3") ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 47e0e2284b4..e3725d1e227 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -182,7 +182,7 @@ Notes: static WRITE8_HANDLER( bankswitch_w ) { - memory_set_bank(space->machine, 1, (data - 1) & 3); + memory_set_bank(space->machine, "bank1", (data - 1) & 3); } static TIMER_CALLBACK( rsaga2_interrupt2 ) @@ -657,7 +657,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( masterw_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) @@ -666,7 +666,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) @@ -681,7 +681,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( viofight_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) /* yes, both addresses for the same chip */ @@ -3570,7 +3570,7 @@ ROM_END static DRIVER_INIT( taito_b ) { - memory_configure_bank(machine, 1, 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x4000); } GAME( 1989, masterw, 0, masterw, masterw, taito_b, ROT270, "Taito Corporation Japan", "Master of Weapon (World)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index 9d2271e8144..24a2c6caeab 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -625,7 +625,7 @@ static INTERRUPT_GEN( taitof2_interrupt ) static WRITE8_HANDLER( sound_bankswitch_w ) { - memory_set_bank(space->machine, 2, (data - 1) & 7); + memory_set_bank(space->machine, "bank2", (data - 1) & 7); #ifdef MAME_DEBUG if (((data - 1) & 7)>2) logerror("CPU #1 switch to ROM bank %06x: should only happen if Z80 prg rom is 128K!\n",(data - 1) & 7); @@ -1164,7 +1164,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) @@ -3163,7 +3163,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( f2 ) { - memory_configure_bank(machine, 2, 0, 8, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank2", 0, 8, memory_region(machine, "audiocpu") + 0x10000, 0x4000); } diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index 974b7124498..dfd0f297bc7 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -142,7 +142,7 @@ static WRITE32_HANDLER( f3_sound_bankswitch_w ) /* Banks are 0x20000 bytes each, divide by two to get data16 pointer rather than byte pointer */ - memory_set_bankptr(space->machine, 2, &rom[(idx*0x20000)/2 + 0x80000]); + memory_set_bankptr(space->machine, "bank2", &rom[(idx*0x20000)/2 + 0x80000]); } else { logerror("Sound bankswitch in unsupported game\n"); diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index 039e8045f35..8d97b1fe8e9 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -249,7 +249,7 @@ static INT32 banknum; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 1, memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -301,7 +301,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index 6635166d3eb..4306ac8e89c 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -152,10 +152,10 @@ static void machine_init(running_machine *machine) cur_rambank[i] = 0x80; current_base[i] = palette_ram; current_notifier[i] = palette_notifier; - memory_set_bankptr(machine, 2+i, current_base[i]); + memory_set_bankptr(machine, "bank2"+i, current_base[i]); } cur_rombank = cur_rombank2 = 0; - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x10000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x10000); gfx_element_set_source(machine->gfx[2], taitol_rambanks); @@ -336,7 +336,7 @@ static WRITE8_HANDLER( rombankswitch_w ) // logerror("robs %d, %02x (%04x)\n", offset, data, cpu_get_pc(space->cpu)); cur_rombank = data; - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "maincpu")+0x10000+0x2000*cur_rombank); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu")+0x10000+0x2000*cur_rombank); } } @@ -355,7 +355,7 @@ static WRITE8_HANDLER( rombank2switch_w ) // logerror("robs2 %02x (%04x)\n", data, cpu_get_pc(space->cpu)); cur_rombank2 = data; - memory_set_bankptr(space->machine, 6, memory_region(space->machine, "slave")+0x10000+0x4000*cur_rombank2); + memory_set_bankptr(space->machine, "bank6", memory_region(space->machine, "slave")+0x10000+0x4000*cur_rombank2); } } @@ -392,7 +392,7 @@ logerror("unknown rambankswitch %d, %02x (%04x)\n", offset, data, cpu_get_pc(spa current_notifier[offset] = 0; current_base[offset] = empty_ram; } - memory_set_bankptr(space->machine, 2+offset, current_base[offset]); + memory_set_bankptr(space->machine, "bank2"+offset, current_base[offset]); } } @@ -640,11 +640,11 @@ static READ8_HANDLER( horshoes_trackx_hi_r ) #define COMMON_BANKS_MAP \ AM_RANGE(0x0000, 0x5fff) AM_ROM \ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) \ - AM_RANGE(0xc000, 0xcfff) AM_ROMBANK(2) AM_WRITE(bank0_w) \ - AM_RANGE(0xd000, 0xdfff) AM_ROMBANK(3) AM_WRITE(bank1_w) \ - AM_RANGE(0xe000, 0xefff) AM_ROMBANK(4) AM_WRITE(bank2_w) \ - AM_RANGE(0xf000, 0xfdff) AM_ROMBANK(5) AM_WRITE(bank3_w) \ + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") \ + AM_RANGE(0xc000, 0xcfff) AM_ROMBANK("bank2") AM_WRITE(bank0_w) \ + AM_RANGE(0xd000, 0xdfff) AM_ROMBANK("bank3") AM_WRITE(bank1_w) \ + AM_RANGE(0xe000, 0xefff) AM_ROMBANK("bank4") AM_WRITE(bank2_w) \ + AM_RANGE(0xf000, 0xfdff) AM_ROMBANK("bank5") AM_WRITE(bank3_w) \ AM_RANGE(0xfe00, 0xfe03) AM_READWRITE(taitol_bankc_r, taitol_bankc_w) \ AM_RANGE(0xfe04, 0xfe04) AM_READWRITE(taitol_control_r, taitol_control_w) \ AM_RANGE(0xff00, 0xff02) AM_READWRITE(irq_adr_r, irq_adr_w) \ @@ -666,7 +666,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fhawk_2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(6) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank6") AM_RANGE(0xc000, 0xc000) AM_WRITE(rombank2switch_w) AM_RANGE(0xc800, 0xc800) AM_READNOP AM_WRITE(taitosound_port_w) AM_RANGE(0xc801, 0xc801) AM_READWRITE(taitosound_comm_r, taitosound_comm_w) @@ -682,7 +682,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fhawk_3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(7) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank7") AM_RANGE(0x8000, 0x9fff) AM_RAM AM_RANGE(0xe000, 0xe000) AM_READNOP AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe001, 0xe001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) @@ -712,12 +712,12 @@ static WRITE8_HANDLER( sound_bankswitch_w ) UINT8 *RAM = memory_region(space->machine, "audiocpu"); int banknum = (data - 1) & 3; - memory_set_bankptr (space->machine, 7, &RAM [0x10000 + (banknum * 0x4000)]); + memory_set_bankptr (space->machine, "bank7", &RAM [0x10000 + (banknum * 0x4000)]); } static ADDRESS_MAP_START( raimais_3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(7) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank7") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) @@ -738,7 +738,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( champwr_2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(6) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank6") AM_RANGE(0xc000, 0xdfff) AM_READWRITE(shared_r, shared_w) AM_RANGE(0xe000, 0xe000) AM_READ_PORT("DSWA") AM_WRITENOP // Watchdog AM_RANGE(0xe001, 0xe001) AM_READ_PORT("DSWB") @@ -754,7 +754,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( champwr_3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(7) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank7") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa000) AM_READNOP AM_WRITE(taitosound_slave_port_w) @@ -888,7 +888,7 @@ static ADDRESS_MAP_START( evilston_2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(shared_r, shared_w) AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) - AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(7) + AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank7") ADDRESS_MAP_END @@ -1890,7 +1890,7 @@ static WRITE8_DEVICE_HANDLER( portA_w ) cur_bank = data & 0x03; bankaddress = 0x10000 + (cur_bank-1) * 0x4000; - memory_set_bankptr(device->machine, 7, &RAM[bankaddress]); + memory_set_bankptr(device->machine, "bank7", &RAM[bankaddress]); //logerror ("YM2203 bank change val=%02x pc=%04x\n", cur_bank, cpu_get_pc(space->cpu) ); } } diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index 9fa2b9d4498..dfdb6c76056 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -399,7 +399,7 @@ static INT32 banknum; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 2, memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); + memory_set_bankptr(machine, "bank2", memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -475,7 +475,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) @@ -489,7 +489,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( daisenpu_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index d33da744543..a6fae999943 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -1381,7 +1381,7 @@ static INT32 banknum; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 10, memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); + memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -1744,7 +1744,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READNOP AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index 6ab76063b2b..613b7259bc0 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -347,7 +347,7 @@ static INT32 banknum; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 1, memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -397,7 +397,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w) diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c index 66863666f7f..2d2aa029ea2 100644 --- a/src/mame/drivers/taitosj.c +++ b/src/mame/drivers/taitosj.c @@ -199,7 +199,7 @@ static CUSTOM_INPUT( input_port_4_f0_r ) static ADDRESS_MAP_START( taitosj_main_nomcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM - AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x07fe) AM_READWRITE(taitosj_fake_data_r, taitosj_fake_data_w) AM_RANGE(0x8801, 0x8801) AM_MIRROR(0x07fe) AM_READ(taitosj_fake_status_r) @@ -239,7 +239,7 @@ ADDRESS_MAP_END /* only difference is taitosj_fake_ replaced with taitosj_mcu_ */ static ADDRESS_MAP_START( taitosj_main_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM - AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x07fe) AM_READWRITE(taitosj_mcu_data_r, taitosj_mcu_data_w) AM_RANGE(0x8801, 0x8801) AM_MIRROR(0x07fe) AM_READ(taitosj_mcu_status_r) @@ -302,7 +302,7 @@ static CUSTOM_INPUT( kikstart_gear_r ) static ADDRESS_MAP_START( kikstart_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM - AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x8800) AM_READWRITE(taitosj_mcu_data_r, taitosj_mcu_data_w) AM_RANGE(0x8801, 0x8801) AM_READ(taitosj_mcu_status_r) diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index 5b152338be5..e4f7ae6a537 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -137,11 +137,11 @@ static void mxtc_config_w(const device_config *busdevice, const device_config *d { if (data & 0x10) // enable RAM access to region 0xf0000 - 0xfffff { - memory_set_bankptr(busdevice->machine, 1, bios_ram); + memory_set_bankptr(busdevice->machine, "bank1", bios_ram); } else // disable RAM access (reads go to BIOS ROM) { - memory_set_bankptr(busdevice->machine, 1, memory_region(busdevice->machine, "user1") + 0x30000); + memory_set_bankptr(busdevice->machine, "bank1", memory_region(busdevice->machine, "user1") + 0x30000); } break; } @@ -439,7 +439,7 @@ static ADDRESS_MAP_START( taitowlf_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000a0000, 0x000affff) AM_RAM AM_RANGE(0x000b0000, 0x000b7fff) AM_RAM AM_BASE(&cga_ram) AM_RANGE(0x000e0000, 0x000effff) AM_RAM - AM_RANGE(0x000f0000, 0x000fffff) AM_ROMBANK(1) + AM_RANGE(0x000f0000, 0x000fffff) AM_ROMBANK("bank1") AM_RANGE(0x000f0000, 0x000fffff) AM_WRITE(bios_ram_w) AM_RANGE(0x00100000, 0x01ffffff) AM_RAM AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("user1", 0) /* System BIOS */ @@ -546,7 +546,7 @@ static MACHINE_START(taitowlf) static MACHINE_RESET(taitowlf) { - memory_set_bankptr(machine, 1, memory_region(machine, "user1") + 0x30000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + 0x30000); } diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c index 4f6f08777f2..40cb0d9b02d 100644 --- a/src/mame/drivers/tankbust.c +++ b/src/mame/drivers/tankbust.c @@ -114,8 +114,8 @@ static WRITE8_HANDLER( tankbust_e0xx_w ) case 7: /* 0xe007 bankswitch */ /* bank 1 at 0x6000-9fff = from 0x10000 when bit0=0 else from 0x14000 */ /* bank 2 at 0xa000-bfff = from 0x18000 when bit0=0 else from 0x1a000 */ - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "maincpu") + 0x10000 + ((data&1) * 0x4000) ); - memory_set_bankptr(space->machine, 2, memory_region(space->machine, "maincpu") + 0x18000 + ((data&1) * 0x2000) ); /* verified (the game will reset after the "game over" otherwise) */ + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x10000 + ((data&1) * 0x4000) ); + memory_set_bankptr(space->machine, "bank2", memory_region(space->machine, "maincpu") + 0x18000 + ((data&1) * 0x2000) ); /* verified (the game will reset after the "game over" otherwise) */ break; } } @@ -194,8 +194,8 @@ static READ8_HANDLER( some_changing_input ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM - AM_RANGE(0x6000, 0x9fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) - AM_RANGE(0xa000, 0xbfff) AM_READWRITE(SMH_BANK(2), SMH_ROM) + AM_RANGE(0x6000, 0x9fff) AM_ROMBANK("bank1") + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(tankbust_background_videoram_r, tankbust_background_videoram_w) AM_BASE_GENERIC(videoram) AM_RANGE(0xc800, 0xcfff) AM_READWRITE(tankbust_background_colorram_r, tankbust_background_colorram_w) AM_BASE_GENERIC(colorram) AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(tankbust_txtram_r, tankbust_txtram_w) AM_BASE(&tankbust_txtram) diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index 959661d6ef7..a26285690c4 100644 --- a/src/mame/drivers/taotaido.c +++ b/src/mame/drivers/taotaido.c @@ -126,13 +126,13 @@ static WRITE8_HANDLER( taotaido_sh_bankswitch_w ) { UINT8 *rom = memory_region(space->machine, "audiocpu") + 0x10000; - memory_set_bankptr(space->machine, 1,rom + (data & 0x03) * 0x8000); + memory_set_bankptr(space->machine, "bank1",rom + (data & 0x03) * 0x8000); } static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index d8d84243708..586e9479c2d 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -295,8 +295,8 @@ static ADDRESS_MAP_START( cyclwarr_68000a_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w) AM_BASE_GENERIC(spriteram) AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w) AM_BASE(&tatsumi_sprite_control_ram) AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x140000, 0x1bffff) AM_ROMBANK(2) /* CPU B ROM */ - AM_RANGE(0x2c0000, 0x33ffff) AM_ROMBANK(1) /* CPU A ROM */ + AM_RANGE(0x140000, 0x1bffff) AM_ROMBANK("bank2") /* CPU B ROM */ + AM_RANGE(0x2c0000, 0x33ffff) AM_ROMBANK("bank1") /* CPU A ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( cyclwarr_68000b_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -316,8 +316,8 @@ static ADDRESS_MAP_START( cyclwarr_68000b_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w) AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w) AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w) - AM_RANGE(0x140000, 0x1bffff) AM_ROMBANK(2) /* CPU B ROM */ - AM_RANGE(0x2c0000, 0x33ffff) AM_ROMBANK(1) /* CPU A ROM */ + AM_RANGE(0x140000, 0x1bffff) AM_ROMBANK("bank2") /* CPU B ROM */ + AM_RANGE(0x2c0000, 0x33ffff) AM_ROMBANK("bank1") /* CPU A ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( cyclwarr_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -351,8 +351,8 @@ static ADDRESS_MAP_START( bigfight_68000a_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w) AM_BASE_GENERIC(spriteram) AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w) AM_BASE(&tatsumi_sprite_control_ram) AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x100000, 0x17ffff) AM_ROMBANK(2) /* CPU A ROM */ - AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK(1) /* CPU B ROM */ + AM_RANGE(0x100000, 0x17ffff) AM_ROMBANK("bank2") /* CPU A ROM */ + AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK("bank1") /* CPU B ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( bigfight_68000b_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -370,8 +370,8 @@ static ADDRESS_MAP_START( bigfight_68000b_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(cyclwarr_sprite_r, cyclwarr_sprite_w) AM_RANGE(0x0ca000, 0x0ca1ff) AM_WRITE(tatsumi_sprite_control_w) AM_RANGE(0x0d0000, 0x0d3fff) AM_READWRITE(cyclwarr_palette_r, paletteram16_xRRRRRGGGGGBBBBB_word_w) - AM_RANGE(0x100000, 0x17ffff) AM_ROMBANK(2) /* CPU A ROM */ - AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK(1) /* CPU B ROM */ + AM_RANGE(0x100000, 0x17ffff) AM_ROMBANK("bank2") /* CPU A ROM */ + AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK("bank1") /* CPU B ROM */ ADDRESS_MAP_END /******************************************************************************/ @@ -1347,11 +1347,11 @@ static DRIVER_INIT( cyclwarr ) dst = memory_region(machine, "maincpu"); memcpy(cyclwarr_cpua_ram,dst,8); - memory_set_bankptr(machine, 1, dst); + memory_set_bankptr(machine, "bank1", dst); dst = memory_region(machine, "sub"); memcpy(cyclwarr_cpub_ram,dst,8); - memory_set_bankptr(machine, 2, dst); + memory_set_bankptr(machine, "bank2", dst); // Copy sprite & palette data out of GFX rom area tatsumi_rom_sprite_lookup1 = memory_region(machine, "gfx2"); diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index e361a204e5c..d718858673b 100644 --- a/src/mame/drivers/tbowl.c +++ b/src/mame/drivers/tbowl.c @@ -56,7 +56,7 @@ static WRITE8_HANDLER( tbowlb_bankswitch_w ) bankaddress = 0x10000 + ((data & 0xf8) << 8); - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } static WRITE8_HANDLER( tbowlc_bankswitch_w ) @@ -68,7 +68,7 @@ static WRITE8_HANDLER( tbowlc_bankswitch_w ) bankaddress = 0x10000 + ((data & 0xf8) << 8); - memory_set_bankptr(space->machine, 2, &RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank2", &RAM[bankaddress]); } /*** Shared Ram Handlers @@ -110,7 +110,7 @@ static ADDRESS_MAP_START( 6206B_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xdfff) AM_RAM_WRITE(tbowl_bgvideoram_w) AM_BASE(&tbowl_bgvideoram) AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(tbowl_txvideoram_w) AM_BASE(&tbowl_txvideoram) // AM_RANGE(0xf000, 0xf000) AM_WRITE(unknown_write) * written during start-up, not again */ - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1") AM_RANGE(0xf800, 0xfbff) AM_READWRITE(shared_r, shared_w) AM_BASE(&shared_ram) /* check */ AM_RANGE(0xfc00, 0xfc00) AM_READ_PORT("P1") AM_WRITE(tbowlb_bankswitch_w) AM_RANGE(0xfc01, 0xfc01) AM_READ_PORT("P2") @@ -150,7 +150,7 @@ static ADDRESS_MAP_START( 6206C_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xd7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xd800, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&tbowl_spriteram) AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_BASE_GENERIC(paletteram) // 2x palettes, one for each monitor? - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_BANK(2), SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank2") AM_RANGE(0xf800, 0xfbff) AM_READWRITE(shared_r, shared_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(tbowlc_bankswitch_w) AM_RANGE(0xfc01, 0xfc01) AM_WRITENOP /* ? */ diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 36482cf4da1..87ad23a2eaa 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -75,7 +75,7 @@ static WRITE8_HANDLER( tecmo_bankswitch_w ) bankaddress = 0x10000 + ((data & 0xf8) << 8); - memory_set_bankptr(space->machine, 1, &RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &RAM[bankaddress]); } static WRITE8_HANDLER( tecmo_sound_command_w ) @@ -154,7 +154,7 @@ static ADDRESS_MAP_START( rygar_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(tecmo_bgvideoram_w) AM_BASE(&tecmo_bgvideoram) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(1) + AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1") AM_RANGE(0xf800, 0xf800) AM_READ_PORT("JOY1") AM_RANGE(0xf801, 0xf801) AM_READ_PORT("BUTTONS1") AM_RANGE(0xf802, 0xf802) AM_READ_PORT("JOY2") @@ -182,7 +182,7 @@ static ADDRESS_MAP_START( gemini_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xdc00, 0xdfff) AM_RAM_WRITE(tecmo_bgvideoram_w) AM_BASE(&tecmo_bgvideoram) AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) - AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(1) + AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1") AM_RANGE(0xf800, 0xf800) AM_READ_PORT("JOY1") AM_RANGE(0xf801, 0xf801) AM_READ_PORT("BUTTONS1") AM_RANGE(0xf802, 0xf802) AM_READ_PORT("JOY2") @@ -210,7 +210,7 @@ static ADDRESS_MAP_START( silkworm_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(1) + AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1") AM_RANGE(0xf800, 0xf800) AM_READ_PORT("JOY1") AM_RANGE(0xf801, 0xf801) AM_READ_PORT("BUTTONS1") AM_RANGE(0xf802, 0xf802) AM_READ_PORT("JOY2") diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index d0705639877..f3100fd9250 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -524,7 +524,7 @@ GFXDECODE_END static WRITE8_HANDLER( deroon_bankswitch_w ) { - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "audiocpu") + ((data-2) & 0x0f) * 0x4000 + 0x10000 ); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "audiocpu") + ((data-2) & 0x0f) * 0x4000 + 0x10000 ); } static WRITE8_HANDLER( tecmosys_oki_bank_w ) @@ -539,7 +539,7 @@ static WRITE8_HANDLER( tecmosys_oki_bank_w ) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xf7ff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index 60d616f45e0..58c2507b4e8 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -56,7 +56,7 @@ static int rombank; static MACHINE_RESET( thedeep ) { - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x10000 + 0 * 0x4000); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x10000 + 0 * 0x4000); thedeep_scroll[0] = 0; thedeep_scroll[1] = 0; thedeep_scroll[2] = 0; @@ -90,7 +90,7 @@ static WRITE8_HANDLER( thedeep_protection_w ) if (rombank == new_rombank) break; rombank = new_rombank; rom = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1, rom + 0x10000 + rombank * 0x4000); + memory_set_bankptr(space->machine, "bank1", rom + 0x10000 + rombank * 0x4000); /* there's code which falls through from the fixed ROM to bank #1, I have to */ /* copy it there otherwise the CPU bank switching support will not catch it. */ memcpy(rom + 0x08000, rom + 0x10000 + rombank * 0x4000, 0x4000); @@ -151,7 +151,7 @@ static WRITE8_HANDLER( thedeep_e100_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK(1), SMH_ROM) // ROM (banked) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // ROM (banked) AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xd000, 0xdfff) AM_RAM // RAM (MCU data copied here) AM_RANGE(0xe000, 0xe000) AM_READWRITE(thedeep_protection_r, thedeep_protection_w ) // To MCU diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index 86be22d5013..fd509a37301 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -325,7 +325,7 @@ static WRITE8_HANDLER( scontra_bankswitch_w ) /* bits 0-3 ROM bank */ offs = 0x10000 + (data & 0x0f)*0x2000; - memory_set_bankptr(space->machine, 1, &RAM[offs] ); + memory_set_bankptr(space->machine, "bank1", &RAM[offs] ); /* bit 4 select work RAM or palette RAM at 5800-5fff */ palette_selected = ~data & 0x10; @@ -387,7 +387,7 @@ static ADDRESS_MAP_START( scontra_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x57ff) AM_RAM AM_RANGE(0x5800, 0x5fff) AM_READWRITE(scontra_bankedram_r, scontra_bankedram_w) AM_BASE(&ram) /* palette + work RAM */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -407,7 +407,7 @@ static ADDRESS_MAP_START( thunderx_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x57ff) AM_RAM AM_RANGE(0x5800, 0x5fff) AM_READWRITE(thunderx_bankedram_r, thunderx_bankedram_w) AM_BASE(&ram) /* palette + work RAM + unknown RAM */ - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -910,7 +910,7 @@ static KONAMI_SETLINES_CALLBACK( thunderx_banking ) offs = 0x10000 + (((lines & 0x0f) ^ 0x08) * 0x2000); if (offs >= 0x28000) offs -= 0x20000; - memory_set_bankptr(device->machine, 1, &RAM[offs] ); + memory_set_bankptr(device->machine, "bank1", &RAM[offs] ); } static MACHINE_RESET( scontra ) @@ -925,7 +925,7 @@ static MACHINE_RESET( thunderx ) UINT8 *RAM = memory_region(machine, "maincpu"); konami_configure_set_lines(cputag_get_cpu(machine, "maincpu"), thunderx_banking); - memory_set_bankptr(machine, 1, &RAM[0x10000] ); /* init the default bank */ + memory_set_bankptr(machine, "bank1", &RAM[0x10000] ); /* init the default bank */ machine->generic.paletteram.u8 = &RAM[0x28000]; pmcram = &RAM[0x28800]; diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 43945ec781e..2861271fdcf 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -505,11 +505,11 @@ ADDRESS_MAP_END // ROM/RAM Banking -#define GALGAMES_BANK_000000_R 1 -#define GALGAMES_BANK_000000_W 2 -#define GALGAMES_BANK_200000_R 3 -#define GALGAMES_BANK_200000_W 4 -#define GALGAMES_BANK_240000_R 5 +#define GALGAMES_BANK_000000_R "000000_r" +#define GALGAMES_BANK_000000_W "000000_w" +#define GALGAMES_BANK_200000_R "200000_r" +#define GALGAMES_BANK_200000_W "200000_w" +#define GALGAMES_BANK_240000_R "240000_r" #define GALGAMES_RAM 0 #define GALGAMES_ROM0 1 @@ -697,10 +697,10 @@ static READ16_HANDLER( dummy_read_01 ) static ADDRESS_MAP_START( galgames_map, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE( 0x000000, 0x03ffff ) AM_READWRITE(SMH_BANK(GALGAMES_BANK_000000_R), SMH_BANK(GALGAMES_BANK_000000_W)) AM_BASE( &galgames_ram ) + AM_RANGE( 0x000000, 0x03ffff ) AM_READ_BANK(GALGAMES_BANK_000000_R) AM_WRITE_BANK(GALGAMES_BANK_000000_W) AM_BASE( &galgames_ram ) AM_RANGE( 0x040000, 0x1fffff ) AM_ROM AM_REGION( "maincpu", 0x40000 ) - AM_RANGE( 0x200000, 0x23ffff ) AM_READWRITE(SMH_BANK(GALGAMES_BANK_200000_R), SMH_BANK(GALGAMES_BANK_200000_W)) - AM_RANGE( 0x240000, 0x3fffff ) AM_READ(SMH_BANK(GALGAMES_BANK_240000_R)) + AM_RANGE( 0x200000, 0x23ffff ) AM_READ_BANK(GALGAMES_BANK_200000_R) AM_WRITE_BANK(GALGAMES_BANK_200000_W) + AM_RANGE( 0x240000, 0x3fffff ) AM_READ_BANK(GALGAMES_BANK_240000_R) AM_RANGE( 0x400000, 0x400011 ) AM_WRITE( tmaster_blitter_w ) AM_BASE( &tmaster_regs ) AM_RANGE( 0x400012, 0x400013 ) AM_WRITE( tmaster_addr_w ) diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 890591e657e..556cb731a18 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -237,7 +237,7 @@ static WRITE8_HANDLER( prmrsocr_audio_bankswitch_w ) { UINT8 *rom = memory_region(space->machine, "audiocpu") + 0x10000; - memory_set_bankptr(space->machine, 1,rom + (data & 7) * 0x4000); + memory_set_bankptr(space->machine, "bank1",rom + (data & 7) * 0x4000); } @@ -1229,7 +1229,7 @@ static WRITE8_DEVICE_HANDLER( k054539_ctrl_w ) static ADDRESS_MAP_START( prmrsocr_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe0ff) AM_DEVREADWRITE("konami", k054539_r, k054539_w) AM_RANGE(0xe100, 0xe12f) AM_DEVREADWRITE("konami", k054539_ctrl_r, k054539_ctrl_w) diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index 59f5e1c7418..6581cb8160c 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -736,7 +736,7 @@ static WRITE8_DEVICE_HANDLER( kabukiz_sound_bank_w ) { // to avoid the write when the sound chip is initialized if (data != 0xff) - memory_set_bank(device->machine, 3, data & 0x07); + memory_set_bank(device->machine, "bank3", data & 0x07); } static WRITE8_DEVICE_HANDLER( kabukiz_sample_w ) @@ -748,7 +748,7 @@ static WRITE8_DEVICE_HANDLER( kabukiz_sample_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_RAMBANK(1) /* ROM + RAM */ + AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1") /* ROM + RAM */ AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_MEMBER(tnzs_state, objram) AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE(1) AM_RANGE(0xf000, 0xf1ff) AM_RAM AM_BASE_MEMBER(tnzs_state, vdcram) @@ -764,7 +764,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu0_type2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_RAMBANK(1) /* ROM + RAM */ + AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1") /* ROM + RAM */ AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_MEMBER(tnzs_state, objram) AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE(1) AM_RANGE(0xf000, 0xf1ff) AM_RAM AM_BASE_MEMBER(tnzs_state, vdcram) @@ -778,7 +778,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2") AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xc000, 0xc001) AM_READWRITE(tnzs_mcu_r, tnzs_mcu_w) /* not present in insectx */ @@ -791,7 +791,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kageki_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2") AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") @@ -812,7 +812,7 @@ static WRITE8_HANDLER( tnzsb_sound_command_w ) static ADDRESS_MAP_START( tnzsb_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2") AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) AM_RANGE(0xb002, 0xb002) AM_READ_PORT("DSWA") AM_RANGE(0xb003, 0xb003) AM_READ_PORT("DSWB") @@ -828,7 +828,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kabukiz_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(2) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2") AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) AM_RANGE(0xb002, 0xb002) AM_READ_PORT("DSWA") AM_RANGE(0xb003, 0xb003) AM_READ_PORT("DSWB") @@ -848,7 +848,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kabukiz_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(3) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3") AM_RANGE(0xe000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -886,7 +886,7 @@ static WRITE8_HANDLER( jpopnics_palette_w ) static ADDRESS_MAP_START( jpopnics_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_MEMBER(tnzs_state, objram) AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE(1) /* WORK RAM (shared by the 2 z80's) */ AM_RANGE(0xf000, 0xf1ff) AM_RAM AM_BASE_MEMBER(tnzs_state, vdcram) /* VDC RAM */ @@ -900,12 +900,12 @@ ADDRESS_MAP_END static WRITE8_HANDLER( jpopnics_subbankswitch_w ) { /* bits 0-1 select ROM bank */ - memory_set_bank(space->machine, 2, data & 0x03); + memory_set_bank(space->machine, "bank2", data & 0x03); } static ADDRESS_MAP_START( jpopnics_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_READWRITE(SMH_BANK(2), SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2") AM_RANGE(0xa000, 0xa000) AM_WRITE(jpopnics_subbankswitch_w) AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index e25e911798e..fe614d5e228 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -350,8 +350,8 @@ static MACHINE_RESET( bgaregga ) // Set Z80 bank switch - default bank is 2 current_bank = 4; - memory_configure_bank(machine, 1, 0, 16, Z80, 0x4000); - memory_set_bank(machine, 1, 4); + memory_configure_bank(machine, "bank1", 0, 16, Z80, 0x4000); + memory_set_bank(machine, "bank1", 4); if (memory_region(machine, "oki1") != NULL) NMK112_init(0, "oki1", "oki2"); @@ -406,8 +406,8 @@ static DRIVER_INIT( fixeight ) if (fixeight_sec_cpu_mem) { - memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x28f002, 0x28fbff, 0, 0, (read16_space_func)SMH_BANK(2), (write16_space_func)SMH_BANK(2) ); - memory_set_bankptr(machine, 2, fixeight_sec_cpu_mem); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x28f002, 0x28fbff, 0, 0, "bank2" ); + memory_set_bankptr(machine, "bank2", fixeight_sec_cpu_mem); } toaplan2_sub_cpu = CPU_2_V25; @@ -417,7 +417,7 @@ static DRIVER_INIT( fixeight ) static DRIVER_INIT( fixeighb ) { UINT16 *bgdata = (UINT16 *)memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1, &bgdata[0x40000]); /* $80000 - $fffff */ + memory_set_bankptr(machine, "bank1", &bgdata[0x40000]); /* $80000 - $fffff */ toaplan2_sub_cpu = CPU_2_NONE; register_state_save(machine); @@ -936,8 +936,8 @@ static WRITE16_HANDLER( fixeight_sec_cpu_w ) /* game keeping service mode. It writes/reads the settings to/from */ /* these shared RAM locations. The secondary CPU reads/writes them */ /* from/to nvram to store the settings (a 93C45 EEPROM) */ - //memory_install_readwrite16_handler(space, 0x28f002, 0x28fbff, 0, 0, (read16_space_func)SMH_BANK(2), (write16_space_func)SMH_BANK(2)); - //memory_set_bankptr(space->machine, 2, fixeight_sec_cpu_mem); + //memory_install_readwrite_bank_handler(space, 0x28f002, 0x28fbff, 0, 0, "bank2"); + //memory_set_bankptr(space->machine, "bank2", fixeight_sec_cpu_mem); memory_install_read_port_handler(space, 0x28f004, 0x28f005, 0, 0, "DSWA"); /* Dip Switch A - Wrong !!! */ memory_install_read_port_handler(space, 0x28f006, 0x28f007, 0, 0, "DSWB"); /* Dip Switch B - Wrong !!! */ memory_install_read_port_handler(space, 0x28f008, 0x28f009, 0, 0, "JMPR"); /* Territory Jumper block - Wrong !!! */ @@ -1081,7 +1081,7 @@ static WRITE8_HANDLER( bgaregga_bankswitch_w ) if (bank != current_bank) { current_bank = bank; - memory_set_bank(space->machine, 1, bank); + memory_set_bank(space->machine, "bank1", bank); } } @@ -1124,7 +1124,7 @@ static WRITE8_HANDLER( batrider_bankswitch_w ) if (bank != current_bank) { current_bank = bank; - memory_set_bank(space->machine, 1, bank); + memory_set_bank(space->machine, "bank1", bank); } } @@ -1567,7 +1567,7 @@ static ADDRESS_MAP_START( fixeighb_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x502000, 0x5021ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) AM_RANGE(0x503000, 0x5031ff) AM_READWRITE(toaplan2_txscrollram16_r, toaplan2_txscrollram16_w) AM_BASE(&toaplan2_txscrollram16) AM_SIZE(&toaplan2_tx_scroll_vram_size) AM_RANGE(0x700000, 0x700001) AM_READ(video_count_r) - AM_RANGE(0x800000, 0x87ffff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x800000, 0x87ffff) AM_ROMBANK("bank1") ADDRESS_MAP_END @@ -1865,7 +1865,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bgaregga_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&raizing_shared_ram) AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xe004, 0xe004) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) @@ -1880,7 +1880,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( batrider_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xdfff) AM_RAM ADDRESS_MAP_END @@ -1906,7 +1906,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bbakraid_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM /* Only 2FFFh valid code */ - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c index 9c38eefc723..551532e9f67 100644 --- a/src/mame/drivers/toki.c +++ b/src/mame/drivers/toki.c @@ -91,7 +91,7 @@ static WRITE8_DEVICE_HANDLER( toki_adpcm_control_w ) /* the code writes either 2 or 3 in the bottom two bits */ bankaddress = 0x10000 + (data & 0x01) * 0x4000; - memory_set_bankptr(device->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(device->machine, "bank1",&RAM[bankaddress]); msm5205_reset_w(device,data & 0x08); } @@ -146,7 +146,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tokib_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", toki_adpcm_control_w) /* MSM5205 + ROM bank */ AM_RANGE(0xe400, 0xe400) AM_WRITE(toki_adpcm_data_w) diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index 3b2a748f1a2..3d0549bbbf3 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -408,7 +408,7 @@ logerror("CPU #0 PC %06x: warning - write %04x to motor cpu %03x\n",cpu_get_pc(s static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 10, memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); + memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); } static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) /* assumes Z80 sandwiched between 68Ks */ @@ -484,7 +484,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index 3df7ec9637b..5b10ac79302 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -42,21 +42,21 @@ static WRITE8_HANDLER( coin_w ) static WRITE8_HANDLER( questions_bank_w ) { if (!(data & 0x01)) - memory_set_bank(space->machine, 1, 0); + memory_set_bank(space->machine, "bank1", 0); else if (!(data & 0x02)) - memory_set_bank(space->machine, 1, 1); + memory_set_bank(space->machine, "bank1", 1); else if (!(data & 0x04)) - memory_set_bank(space->machine, 1, 2); + memory_set_bank(space->machine, "bank1", 2); else if (!(data & 0x08)) - memory_set_bank(space->machine, 1, 3); + memory_set_bank(space->machine, "bank1", 3); else if (!(data & 0x10)) - memory_set_bank(space->machine, 1, 4); + memory_set_bank(space->machine, "bank1", 4); else if (!(data & 0x20)) - memory_set_bank(space->machine, 1, 5); + memory_set_bank(space->machine, "bank1", 5); else if (!(data & 0x40)) - memory_set_bank(space->machine, 1, 6); + memory_set_bank(space->machine, "bank1", 6); else if (!(data & 0x80)) - memory_set_bank(space->machine, 1, 7); + memory_set_bank(space->machine, "bank1", 7); } WRITE8_HANDLER( hyprolyb_adpcm_w ) @@ -213,7 +213,7 @@ static ADDRESS_MAP_START( wizzquiz_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_WRITE(trackfld_videoram_w) AM_BASE_MEMBER(trackfld_state, videoram) AM_RANGE(0x3800, 0x3fff) AM_READ(SMH_RAM) AM_WRITE(trackfld_colorram_w) AM_BASE_MEMBER(trackfld_state, colorram) AM_RANGE(0xc000, 0xc000) AM_WRITE(questions_bank_w) - AM_RANGE(0x6000, 0xdfff) AM_ROMBANK(1) + AM_RANGE(0x6000, 0xdfff) AM_ROMBANK("bank1") AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -1193,14 +1193,14 @@ static DRIVER_INIT( atlantol ) memory_install_write8_handler(space, 0x1000, 0x1000, 0, 0, (write8_space_func)SMH_NOP); /* unmapped areas read as ROM */ - memory_install_read8_handler(space, 0x0000, 0x11ff, 0, 0, (read8_space_func)SMH_BANK(10)); - memory_install_read8_handler(space, 0x1380, 0x17ff, 0, 0, (read8_space_func)SMH_BANK(11)); - memory_install_read8_handler(space, 0x2000, 0x27ff, 0, 0, (read8_space_func)SMH_BANK(12)); - memory_install_read8_handler(space, 0x4000, 0x5fff, 0, 0, (read8_space_func)SMH_BANK(13)); - memory_set_bankptr(machine, 10, &rom[0x0000]); - memory_set_bankptr(machine, 11, &rom[0x1380]); - memory_set_bankptr(machine, 12, &rom[0x2000]); - memory_set_bankptr(machine, 13, &rom[0x4000]); + memory_install_read_bank_handler(space, 0x0000, 0x11ff, 0, 0, "bank10"); + memory_install_read_bank_handler(space, 0x1380, 0x17ff, 0, 0, "bank11"); + memory_install_read_bank_handler(space, 0x2000, 0x27ff, 0, 0, "bank12"); + memory_install_read_bank_handler(space, 0x4000, 0x5fff, 0, 0, "bank13"); + memory_set_bankptr(machine, "bank10", &rom[0x0000]); + memory_set_bankptr(machine, "bank11", &rom[0x1380]); + memory_set_bankptr(machine, "bank12", &rom[0x2000]); + memory_set_bankptr(machine, "bank13", &rom[0x4000]); } static DRIVER_INIT( mastkin ) @@ -1239,7 +1239,7 @@ static DRIVER_INIT( wizzquiz ) for (i = 0; i < 0x40000; i++) ROM[i] = BITSWAP8(ROM[i],0,1,2,3,4,5,6,7); - memory_configure_bank(machine, 1, 0, 8, ROM, 0x8000); + memory_configure_bank(machine, "bank1", 0, 8, ROM, 0x8000); } diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index e519fc3ab4a..c905e673a0b 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -96,8 +96,8 @@ static WRITE8_HANDLER( trvmadns_banking_w ) address |= (data & 0x10) ? 0x10000 : 0; - memory_set_bankptr(space->machine, 1, &rom[address]); - memory_set_bankptr(space->machine, 2, &rom[address + 0x1000]); + memory_set_bankptr(space->machine, "bank1", &rom[address]); + memory_set_bankptr(space->machine, "bank2", &rom[address + 0x1000]); } else { @@ -136,7 +136,7 @@ static WRITE8_HANDLER( trvmadns_banking_w ) // logerror("add = %X\n",address); - memory_set_bankptr(space->machine, 1, &rom[address]); + memory_set_bankptr(space->machine, "bank1", &rom[address]); } } @@ -198,8 +198,8 @@ static WRITE8_HANDLER( trvmadns_tileram_w ) static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM - AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_BANK(1)) - AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_BANK(2)) + AM_RANGE(0x6000, 0x6fff) AM_ROMBANK("bank1") + AM_RANGE(0x7000, 0x7fff) AM_ROMBANK("bank2") AM_RANGE(0x6000, 0x7fff) AM_WRITE(trvmadns_gfxram_w) AM_BASE(&trvmadns_gfxram) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xc000, 0xc01f) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_le_w) AM_BASE_GENERIC(paletteram) diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c index 34b37e0b3b4..a0da309efaa 100644 --- a/src/mame/drivers/tryout.c +++ b/src/mame/drivers/tryout.c @@ -60,13 +60,13 @@ static WRITE8_HANDLER( tryout_bankswitch_w ) int bankaddress; bankaddress = 0x10000 + (data & 0x01) * 0x2000; - memory_set_bankptr(space->machine, 1, &RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &RAM[bankaddress]); } static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(tryout_videoram_w) AM_BASE_GENERIC(videoram) - AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) + AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0xbfff) AM_ROM AM_RANGE(0xc800, 0xc87f) AM_RAM AM_BASE_GENERIC(spriteram) AM_RANGE(0xcc00, 0xcc7f) AM_RAM AM_BASE_GENERIC(spriteram2) diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c index 941b0969e07..e73eb0d99bb 100644 --- a/src/mame/drivers/ttchamp.c +++ b/src/mame/drivers/ttchamp.c @@ -98,7 +98,7 @@ static WRITE16_HANDLER( pcup_prgbank_w ) if (ACCESSING_BITS_0_7) { bank = (data>>4) &0x07; - memory_set_bankptr(space->machine, 2,&ROM1[0x80000*(bank)]); + memory_set_bankptr(space->machine, "bank2",&ROM1[0x80000*(bank)]); } } #endif @@ -123,8 +123,8 @@ static READ16_HANDLER( peno_rand2 ) static ADDRESS_MAP_START( ttchamp_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x0ffff) AM_RAM AM_RANGE(0x10000, 0x1ffff) AM_RAM AM_BASE(&peno_vram) - AM_RANGE(0x20000, 0x7ffff) AM_READ(SMH_BANK(1)) // ? - AM_RANGE(0x80000, 0xfffff) AM_READ(SMH_BANK(2)) // ? + AM_RANGE(0x20000, 0x7ffff) AM_ROMBANK("bank1") // ? + AM_RANGE(0x80000, 0xfffff) AM_ROMBANK("bank2") // ? ADDRESS_MAP_END static ADDRESS_MAP_START( ttchamp_io, ADDRESS_SPACE_IO, 16 ) @@ -323,8 +323,8 @@ ROM_END static DRIVER_INIT (ttchamp) { UINT8 *ROM1 = memory_region(machine, "user1"); - memory_set_bankptr(machine, 1,&ROM1[0x120000]); - memory_set_bankptr(machine, 2,&ROM1[0x180000]); + memory_set_bankptr(machine, "bank1",&ROM1[0x120000]); + memory_set_bankptr(machine, "bank2",&ROM1[0x180000]); } GAME( 199?, ttchamp, 0, ttchamp, ttchamp, ttchamp, ROT0, "Gamart?", "Table Tennis Champions (set 1)", GAME_NOT_WORKING|GAME_NO_SOUND ) diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index ae9cf33eb12..8f93b42c07e 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -824,12 +824,12 @@ ADDRESS_MAP_END static WRITE8_HANDLER(jumppop_z80_bank_w) { - memory_set_bankptr(space->machine, 1, memory_region(space->machine, "audiocpu") + 0x10000 + (0x4000 * data)); + memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "audiocpu") + 0x10000 + (0x4000 * data)); } static ADDRESS_MAP_START( jumppop_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x2fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index ff2833faa67..a67ad869488 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -134,7 +134,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_NOP /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READWRITE(SMH_BANK(8), SMH_BANK(8)) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c index e34c3139958..8387977f3ff 100644 --- a/src/mame/drivers/tutankhm.c +++ b/src/mame/drivers/tutankhm.c @@ -62,7 +62,7 @@ static WRITE8_HANDLER( irq_enable_w ) static MACHINE_START( tutankhm ) { - memory_configure_bank(machine, 1, 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x1000); + memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x1000); state_save_register_global(machine, irq_toggle); state_save_register_global(machine, irq_enable); } @@ -70,7 +70,7 @@ static MACHINE_START( tutankhm ) static WRITE8_HANDLER( tutankhm_bankselect_w ) { - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); } @@ -119,7 +119,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8600, 0x8600) AM_MIRROR(0x00ff) AM_WRITE(timeplt_sh_irqtrigger_w) AM_RANGE(0x8700, 0x8700) AM_MIRROR(0x00ff) AM_WRITE(soundlatch_w) AM_RANGE(0x8800, 0x8fff) AM_RAM - AM_RANGE(0x9000, 0x9fff) AM_ROMBANK(1) + AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index debb5402a2f..0b7ca397882 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -76,8 +76,8 @@ int twin16_spriteram_process_enable( void ) /******************************************************************************************/ -#define COMRAM_r SMH_BANK(1) -#define COMRAM_w SMH_BANK(1) +#define COMRAM_r "COMRAM" +#define COMRAM_w "COMRAM" /* Read/Write Handlers */ @@ -239,7 +239,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x040000, 0x043fff) AM_READWRITE(COMRAM_r, COMRAM_w) + AM_RANGE(0x040000, 0x043fff) AM_READ_BANK(COMRAM_r) AM_WRITE_BANK(COMRAM_w) // AM_RANGE(0x044000, 0x04ffff) AM_NOP // miaj AM_RANGE(0x060000, 0x063fff) AM_RAM AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(twin16_paletteram_word_w) AM_BASE_GENERIC(paletteram) @@ -260,7 +260,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x040000, 0x043fff) AM_READWRITE(COMRAM_r, COMRAM_w) + AM_RANGE(0x040000, 0x043fff) AM_READ_BANK(COMRAM_r) AM_WRITE_BANK(COMRAM_w) // AM_RANGE(0x044000, 0x04ffff) AM_NOP // miaj AM_RANGE(0x060000, 0x063fff) AM_RAM AM_RANGE(0x080000, 0x09ffff) AM_READ(extra_rom_r) @@ -275,7 +275,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fround_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x040000, 0x043fff) AM_READWRITE(COMRAM_r, COMRAM_w) + AM_RANGE(0x040000, 0x043fff) AM_READ_BANK(COMRAM_r) AM_WRITE_BANK(COMRAM_w) AM_RANGE(0x060000, 0x063fff) AM_RAM AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(twin16_paletteram_word_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0x0a0000, 0x0a001b) AM_READ(twin16_input_r) diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c index de19db72dfb..70e3915ffd0 100644 --- a/src/mame/drivers/upscope.c +++ b/src/mame/drivers/upscope.c @@ -84,12 +84,12 @@ static void upscope_reset(running_machine *machine) static WRITE8_DEVICE_HANDLER( upscope_cia_0_porta_w ) { /* switch banks as appropriate */ - memory_set_bank(device->machine, 1, data & 1); + memory_set_bank(device->machine, "bank1", data & 1); /* swap the write handlers between ROM and bank 1 based on the bit */ if ((data & 1) == 0) /* overlay disabled, map RAM on 0x000000 */ - memory_install_write16_handler(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, (write16_space_func)SMH_BANK(1)); + memory_install_write_bank_handler(cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1"); else /* overlay enabled, map Amiga system ROM on 0x000000 */ @@ -236,7 +236,7 @@ static WRITE8_DEVICE_HANDLER( upscope_cia_1_porta_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) + AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size) AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_BASE(&amiga_custom_regs) AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w) @@ -391,8 +391,8 @@ static DRIVER_INIT( upscope ) machine->generic.nvram.u8 = auto_alloc_array(machine, UINT8, machine->generic.nvram_size); /* set up memory */ - memory_configure_bank(machine, 1, 0, 1, amiga_chip_ram, 0); - memory_configure_bank(machine, 1, 1, 1, memory_region(machine, "user1"), 0); + memory_configure_bank(machine, "bank1", 0, 1, amiga_chip_ram, 0); + memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user1"), 0); } diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c index d8f856b3e28..59332efee95 100644 --- a/src/mame/drivers/usgames.c +++ b/src/mame/drivers/usgames.c @@ -46,7 +46,7 @@ static WRITE8_HANDLER( usgames_rombank_w ) // logerror ("BANK WRITE? -%02x-\n",data); //popmessage("%02x",data); - memory_set_bankptr(space->machine, 1,&RAM[ 0x10000 + 0x4000 * data] ); + memory_set_bankptr(space->machine, "bank1",&RAM[ 0x10000 + 0x4000 * data] ); } static WRITE8_HANDLER( lamps1_w ) @@ -82,7 +82,7 @@ static ADDRESS_MAP_START( usgames_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2400, 0x2401) AM_DEVWRITE("aysnd", ay8910_address_data_w) AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(usgames_charram_w) AM_BASE(&usgames_charram) AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE(usgames_videoram_w) AM_BASE(&usgames_videoram) - AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -101,7 +101,7 @@ static ADDRESS_MAP_START( usg185_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2470, 0x2470) AM_READ_PORT("UNK2") AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(usgames_charram_w) AM_BASE(&usgames_charram) AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE(usgames_videoram_w) AM_BASE(&usgames_videoram) - AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index 493b77972fb..32b0fd188e9 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -86,7 +86,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(vaportra_soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READWRITE(SMH_BANK(8),SMH_BANK(8)) /* ??? LOOKUP ??? */ + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK("bank8") /* ??? LOOKUP ??? */ AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index 5c9b4fe0bc5..417d5d05439 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -163,7 +163,7 @@ static WRITE8_HANDLER( vball_irq_ack_w ) static WRITE8_HANDLER( vb_bankswitch_w ) { UINT8 *RAM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1, &RAM[0x10000 + (0x4000 * (data & 1))]); + memory_set_bankptr(space->machine, "bank1", &RAM[0x10000 + (0x4000 * (data & 1))]); if (vball_gfxset != ((data & 0x20) ^ 0x20)) { @@ -225,7 +225,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x100e, 0x100e) AM_WRITE(SMH_RAM) AM_BASE(&vb_scrolly_lo) AM_RANGE(0x2000, 0x2fff) AM_WRITE(vb_videoram_w) AM_BASE(&vb_videoram) AM_RANGE(0x3000, 0x3fff) AM_WRITE(vb_attrib_w) AM_BASE(&vb_attribram) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index 26c21b0e070..bb26c2c9d9a 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -209,9 +209,10 @@ static void vendetta_video_banking( running_machine *machine, int select ) { if ( select & 1 ) { - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, (read8_space_func)SMH_BANK(4), paletteram_xBBBBBGGGGGRRRRR_be_w ); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, "bank4" ); + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w ); memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), video_banking_base + 0x0000, video_banking_base + 0x0fff, 0, 0, K053247_r, K053247_w ); - memory_set_bankptr(machine, 4, machine->generic.paletteram.v); + memory_set_bankptr(machine, "bank4", machine->generic.paletteram.v); } else { @@ -268,7 +269,7 @@ static READ8_DEVICE_HANDLER( vendetta_sound_r ) /********************************************/ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_ROMBANK(1) + AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1") AM_RANGE(0x2000, 0x3fff) AM_RAM AM_RANGE(0x5f80, 0x5f9f) AM_READWRITE(K054000_r, K054000_w) AM_RANGE(0x5fa0, 0x5faf) AM_WRITE(K053251_w) @@ -286,8 +287,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5fe8, 0x5fe9) AM_READ(K053246_r) AM_RANGE(0x5fea, 0x5fea) AM_READ(watchdog_reset_r) /* what is the desired effect of overlapping these memory regions anyway? */ - AM_RANGE(0x4000, 0x4fff) AM_RAMBANK(3) - AM_RANGE(0x6000, 0x6fff) AM_RAMBANK(2) + AM_RANGE(0x4000, 0x4fff) AM_RAMBANK("bank3") + AM_RANGE(0x6000, 0x6fff) AM_RAMBANK("bank2") AM_RANGE(0x4000, 0x7fff) AM_READWRITE(K052109_r, K052109_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -310,10 +311,10 @@ static ADDRESS_MAP_START( esckids_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3fd8, 0x3fd9) AM_READ(K053246_r) // 053246 (Sprite) AM_RANGE(0x3fda, 0x3fda) AM_WRITENOP // Not Emulated (Watchdog ???) /* what is the desired effect of overlapping these memory regions anyway? */ - AM_RANGE(0x2000, 0x2fff) AM_RAMBANK(3) // 052109 (Tilemap) 0x0000-0x0fff - AM_RANGE(0x4000, 0x4fff) AM_RAMBANK(2) // 052109 (Tilemap) 0x2000-0x3fff, Tilemap MASK-ROM bank selector (MASK-ROM Test) + AM_RANGE(0x2000, 0x2fff) AM_RAMBANK("bank3") // 052109 (Tilemap) 0x0000-0x0fff + AM_RANGE(0x4000, 0x4fff) AM_RAMBANK("bank2") // 052109 (Tilemap) 0x2000-0x3fff, Tilemap MASK-ROM bank selector (MASK-ROM Test) AM_RANGE(0x2000, 0x5fff) AM_READWRITE(K052109_r, K052109_w) // 052109 (Tilemap) - AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) // 053248 '975r01' 1M ROM (Banked) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1") // 053248 '975r01' 1M ROM (Banked) AM_RANGE(0x8000, 0xffff) AM_ROM // 053248 '975r01' 1M ROM (0x18000-0x1ffff) ADDRESS_MAP_END @@ -696,7 +697,7 @@ static KONAMI_SETLINES_CALLBACK( vendetta_banking ) logerror("PC = %04x : Unknown bank selected %02x\n", cpu_get_pc(device), lines ); } else - memory_set_bankptr(device->machine, 1, &RAM[ 0x10000 + ( lines * 0x2000 ) ] ); + memory_set_bankptr(device->machine, "bank1", &RAM[ 0x10000 + ( lines * 0x2000 ) ] ); } static MACHINE_RESET( vendetta ) @@ -707,7 +708,7 @@ static MACHINE_RESET( vendetta ) irq_enabled = 0; /* init banks */ - memory_set_bankptr(machine, 1, &memory_region(machine, "maincpu")[0x10000] ); + memory_set_bankptr(machine, "bank1", &memory_region(machine, "maincpu")[0x10000] ); vendetta_video_banking( machine, 0 ); } diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c index 0217ed7885d..a69c32c6f52 100644 --- a/src/mame/drivers/vigilant.c +++ b/src/mame/drivers/vigilant.c @@ -39,7 +39,7 @@ static WRITE8_HANDLER( vigilant_bank_select_w ) UINT8 *RAM = memory_region(space->machine, "maincpu"); bankaddress = 0x10000 + (data & 0x07) * 0x4000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } /*************************************************************************** @@ -72,7 +72,7 @@ static WRITE8_HANDLER( kikcubic_coin_w ) static ADDRESS_MAP_START( vigilant_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK(1)) /* Fallthrough */ + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* Fallthrough */ AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc020, 0xc0df) AM_RAM_WRITE(SMH_RAM) AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(vigilant_paletteram_w) AM_BASE_GENERIC(paletteram) @@ -93,7 +93,7 @@ static ADDRESS_MAP_START( vigilant_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( kikcubic_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK(1)) /* Fallthrough */ + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* Fallthrough */ AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc0ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xc800, 0xcaff) AM_RAM_WRITE(vigilant_paletteram_w) AM_BASE_GENERIC(paletteram) diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index 63ae91aceb3..59f0c3add37 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -146,7 +146,7 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw ) if (data) { - memory_install_read8_handler(mainspace, 0x8000, 0xffff, 0, 0, (read8_space_func)SMH_BANK(1)); + memory_install_read_bank_handler(mainspace, 0x8000, 0xffff, 0, 0, "bank1"); switch (data) { case 2: bankaddress = 0x10000; break; @@ -158,18 +158,18 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw ) case 6: bankaddress = 0x30000; break; /* not used */ default: bankaddress = 0x00000; break; /* not used */ } - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } else { memory_install_read8_handler(mainspace, 0x8000, 0x8fff, 0, 0, wardner_sprite_r); - memory_install_read8_handler(mainspace, 0xa000, 0xadff, 0, 0, (read8_space_func)SMH_BANK(4)); - memory_install_read8_handler(mainspace, 0xae00, 0xafff, 0, 0, (read8_space_func)SMH_BANK(2)); - memory_install_read8_handler(mainspace, 0xc000, 0xc7ff, 0, 0, (read8_space_func)SMH_BANK(3)); - memory_set_bankptr(space->machine, 1, &RAM[0x0000]); - memory_set_bankptr(space->machine, 2, rambase_ae00); - memory_set_bankptr(space->machine, 3, rambase_c000); - memory_set_bankptr(space->machine, 4, space->machine->generic.paletteram.v); + memory_install_read_bank_handler(mainspace, 0xa000, 0xadff, 0, 0, "bank4"); + memory_install_read_bank_handler(mainspace, 0xae00, 0xafff, 0, 0, "bank2"); + memory_install_read_bank_handler(mainspace, 0xc000, 0xc7ff, 0, 0, "bank3"); + memory_set_bankptr(space->machine, "bank1", &RAM[0x0000]); + memory_set_bankptr(space->machine, "bank2", rambase_ae00); + memory_set_bankptr(space->machine, "bank3", rambase_c000); + memory_set_bankptr(space->machine, "bank4", space->machine->generic.paletteram.v); } } } @@ -189,7 +189,7 @@ static ADDRESS_MAP_START( main_program_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x6fff) AM_ROM AM_RANGE(0x7000, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK(1)) /* Overlapped RAM/Banked ROM - See below */ + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") /* Overlapped RAM/Banked ROM - See below */ AM_RANGE(0x8000, 0x8fff) AM_WRITE(wardner_sprite_w) AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0x9000, 0x9fff) AM_ROM diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index 70beff1b0c2..74349f494dc 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -169,7 +169,7 @@ static INT32 banknum; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 10, memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); + memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -249,7 +249,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK(10), SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w) diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c index 7ad949fabaf..f6591f33c74 100644 --- a/src/mame/drivers/wc90.c +++ b/src/mame/drivers/wc90.c @@ -87,7 +87,7 @@ static WRITE8_HANDLER( wc90_bankswitch_w ) bankaddress = 0x10000 + ( ( data & 0xf8 ) << 8 ); - memory_set_bankptr(space->machine, 1, &RAM[bankaddress] ); + memory_set_bankptr(space->machine, "bank1", &RAM[bankaddress] ); } static WRITE8_HANDLER( wc90_bankswitch1_w ) @@ -97,7 +97,7 @@ static WRITE8_HANDLER( wc90_bankswitch1_w ) bankaddress = 0x10000 + ( ( data & 0xf8 ) << 8 ); - memory_set_bankptr(space->machine, 2, &RAM[bankaddress] ); + memory_set_bankptr(space->machine, "bank2", &RAM[bankaddress] ); } static WRITE8_HANDLER( wc90_sound_command_w ) @@ -116,7 +116,7 @@ static ADDRESS_MAP_START( wc90_map_1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(wc90_bgvideoram_w) AM_BASE(&wc90_bgvideoram) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(wc90_txvideoram_w) AM_BASE(&wc90_txvideoram) /* tx video ram */ - AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(1) + AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1") AM_RANGE(0xf800, 0xfbff) AM_RAM AM_SHARE(1) AM_RANGE(0xfc00, 0xfc00) AM_READ_PORT("P1") AM_RANGE(0xfc02, 0xfc02) AM_READ_PORT("P2") @@ -146,7 +146,7 @@ static ADDRESS_MAP_START( wc90_map_2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) AM_RANGE(0xd800, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(2) + AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank2") AM_RANGE(0xf800, 0xfbff) AM_RAM AM_SHARE(1) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(wc90_bankswitch1_w) AM_RANGE(0xfc01, 0xfc01) AM_WRITE(watchdog_reset_w) diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c index 23c768aefb7..2a093fd2db9 100644 --- a/src/mame/drivers/wc90b.c +++ b/src/mame/drivers/wc90b.c @@ -119,7 +119,7 @@ static WRITE8_HANDLER( wc90b_bankswitch_w ) UINT8 *ROM = memory_region(space->machine, "maincpu"); bankaddress = 0x10000 + ((data & 0xf8) << 8); - memory_set_bankptr(space->machine, 1,&ROM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&ROM[bankaddress]); } static WRITE8_HANDLER( wc90b_bankswitch1_w ) @@ -128,7 +128,7 @@ static WRITE8_HANDLER( wc90b_bankswitch1_w ) UINT8 *ROM = memory_region(space->machine, "sub"); bankaddress = 0x10000 + ((data & 0xf8) << 8); - memory_set_bankptr(space->machine, 2,&ROM[bankaddress]); + memory_set_bankptr(space->machine, "bank2",&ROM[bankaddress]); } static WRITE8_HANDLER( wc90b_sound_command_w ) @@ -144,7 +144,7 @@ static WRITE8_DEVICE_HANDLER( adpcm_control_w ) /* the code writes either 2 or 3 in the bottom two bits */ bankaddress = 0x10000 + (data & 0x01) * 0x4000; - memory_set_bankptr(device->machine, 3,&ROM[bankaddress]); + memory_set_bankptr(device->machine, "bank3",&ROM[bankaddress]); msm5205_reset_w(device,data & 0x08); } @@ -161,7 +161,7 @@ static ADDRESS_MAP_START( wc90b_map1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(wc90b_fgvideoram_w) AM_BASE(&wc90b_fgvideoram) AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(wc90b_bgvideoram_w) AM_BASE(&wc90b_bgvideoram) AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(wc90b_txvideoram_w) AM_BASE(&wc90b_txvideoram) - AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(1) + AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank1") AM_RANGE(0xf800, 0xfbff) AM_RAM AM_SHARE(1) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(wc90b_bankswitch_w) AM_RANGE(0xfd00, 0xfd00) AM_WRITE(wc90b_sound_command_w) @@ -183,14 +183,14 @@ static ADDRESS_MAP_START( wc90b_map2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd800, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xe800, 0xefff) AM_ROM - AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(2) + AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK("bank2") AM_RANGE(0xf800, 0xfbff) AM_RAM AM_SHARE(1) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(wc90b_bankswitch1_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(3) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3") AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", adpcm_control_w) AM_RANGE(0xe400, 0xe400) AM_WRITE(adpcm_data_w) AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index 21c837c7522..76652a22e04 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -337,7 +337,7 @@ static WRITE8_HANDLER( welltris_sh_bankswitch_w ) { UINT8 *rom = memory_region(space->machine, "audiocpu") + 0x10000; - memory_set_bankptr(space->machine, 1,rom + (data & 0x03) * 0x8000); + memory_set_bankptr(space->machine, "bank1",rom + (data & 0x03) * 0x8000); } @@ -391,7 +391,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK(1)) + AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") ADDRESS_MAP_END static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 736e32f8e87..74e7d298c58 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -624,7 +624,7 @@ static INT32 banknum; static void reset_sound_region(running_machine *machine) /* assumes Z80 sandwiched between the 68Ks */ { - memory_set_bankptr(machine, 10, memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); + memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + (banknum * 0x4000) + 0x10000 ); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -688,7 +688,7 @@ ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK(10)) /* Fallthrough */ + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") /* Fallthrough */ AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c index 5d516ce2441..0801ae55d79 100644 --- a/src/mame/drivers/williams.c +++ b/src/mame/drivers/williams.c @@ -515,7 +515,7 @@ static ADDRESS_MAP_START( defender_map, ADDRESS_SPACE_PROGRAM, 8 ) /* range from 0xc000-0xcfff is mapped programmatically below */ AM_RANGE(0xc000, 0xc00f) AM_BASE_GENERIC(paletteram) AM_RANGE(0xc400, 0xc4ff) AM_BASE_SIZE_GENERIC(nvram) - AM_RANGE(0xc000, 0xcfff) AM_ROMBANK(1) + AM_RANGE(0xc000, 0xcfff) AM_ROMBANK("bank1") AM_RANGE(0xd000, 0xdfff) AM_WRITE(defender_bank_select_w) AM_RANGE(0xd000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -527,15 +527,16 @@ void defender_install_io_space(const address_space *space) const device_config *pia_1 = devtag_get_device(space->machine, "pia_1"); /* this routine dynamically installs the memory mapped above from c000-cfff */ - memory_install_write8_handler (space, 0xc000, 0xc00f, 0, 0x03e0, (write8_space_func)SMH_BANK(4)); + memory_install_write_bank_handler (space, 0xc000, 0xc00f, 0, 0x03e0, "bank4"); memory_install_write8_handler (space, 0xc010, 0xc01f, 0, 0x03e0, defender_video_control_w); memory_install_write8_handler (space, 0xc3ff, 0xc3ff, 0, 0, williams_watchdog_reset_w); - memory_install_readwrite8_handler(space, 0xc400, 0xc4ff, 0, 0x0300, (read8_space_func)SMH_BANK(3), williams_cmos_w); + memory_install_read_bank_handler(space, 0xc400, 0xc4ff, 0, 0x0300, "bank3"); + memory_install_write8_handler(space, 0xc400, 0xc4ff, 0, 0x0300, williams_cmos_w); memory_install_read8_handler (space, 0xc800, 0xcbff, 0, 0x03e0, williams_video_counter_r); memory_install_readwrite8_device_handler(space, pia_1, 0xcc00, 0xcc03, 0, 0x03e0, pia6821_r, pia6821_w); memory_install_readwrite8_device_handler(space, pia_0, 0xcc04, 0xcc07, 0, 0x03e0, pia6821_r, pia6821_w); - memory_set_bankptr(space->machine, 3, space->machine->generic.nvram.v); - memory_set_bankptr(space->machine, 4, space->machine->generic.paletteram.v); + memory_set_bankptr(space->machine, "bank3", space->machine->generic.nvram.v); + memory_set_bankptr(space->machine, "bank4", space->machine->generic.paletteram.v); } @@ -547,7 +548,7 @@ void defender_install_io_space(const address_space *space) *************************************/ static ADDRESS_MAP_START( williams_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x8fff) AM_READWRITE(SMH_BANK(1), SMH_RAM) AM_BASE(&williams_videoram) + AM_RANGE(0x0000, 0x8fff) AM_READ_BANK("bank1") AM_WRITE(SMH_RAM) AM_BASE(&williams_videoram) AM_RANGE(0x9000, 0xbfff) AM_RAM AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITE(SMH_RAM) AM_BASE_GENERIC(paletteram) AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_0", pia6821_r, pia6821_w) @@ -562,7 +563,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( williams_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x8fff) AM_READWRITE(SMH_BANK(1), SMH_RAM) AM_BASE(&williams_videoram) + AM_RANGE(0x0000, 0x8fff) AM_READ_BANK("bank1") AM_WRITE(SMH_RAM) AM_BASE(&williams_videoram) AM_RANGE(0x9000, 0xbfff) AM_RAM AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITE(SMH_RAM) AM_BASE_GENERIC(paletteram) AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_DEVREADWRITE("pia_0", pia6821_r, pia6821_w) @@ -585,8 +586,8 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( blaster_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READWRITE(SMH_BANK(1), SMH_RAM) AM_BASE(&williams_videoram) - AM_RANGE(0x4000, 0x8fff) AM_READWRITE(SMH_BANK(2), SMH_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ_BANK("bank1") AM_WRITE(SMH_RAM) AM_BASE(&williams_videoram) + AM_RANGE(0x4000, 0x8fff) AM_READ_BANK("bank2") AM_WRITE(SMH_RAM) AM_RANGE(0xbb00, 0xbbff) AM_WRITE(SMH_RAM) AM_BASE(&blaster_palette_0) AM_RANGE(0xbc00, 0xbcff) AM_WRITE(SMH_RAM) AM_BASE(&blaster_scanline_control) AM_RANGE(0x9000, 0xbfff) AM_RAM @@ -613,7 +614,7 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( williams2_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_RAM) AM_BASE(&williams_videoram) + AM_RANGE(0x0000, 0x7fff) AM_READ_BANK("bank1") AM_WRITE(SMH_RAM) AM_BASE(&williams_videoram) AM_RANGE(0x8000, 0xbfff) AM_RAM AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(williams2_tileram_w) AM_BASE(&williams2_tileram) AM_RANGE(0xc800, 0xc87f) AM_WRITE(williams2_bank_select_w) @@ -635,7 +636,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( williams2_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_RAM) AM_BASE(&williams_videoram) + AM_RANGE(0x0000, 0x7fff) AM_READ_BANK("bank1") AM_WRITE(SMH_RAM) AM_BASE(&williams_videoram) AM_RANGE(0x8000, 0xbfff) AM_RAM AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(williams2_tileram_w) AM_BASE(&williams2_tileram) AM_RANGE(0xc800, 0xc87f) AM_WRITE(williams2_bank_select_w) diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 86b6c246d16..aadb0c35db1 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -357,7 +357,7 @@ static WRITE8_HANDLER(write_a00x) UINT8 *ROM = memory_region(space->machine, "maincpu"); bank = newbank; ROM = &ROM[0x10000+0x8000 * newbank + UNBANKED_SIZE]; - memory_set_bankptr(space->machine, 1,ROM); + memory_set_bankptr(space->machine, "bank1",ROM); } } break; @@ -439,7 +439,7 @@ static const ym2203_interface ym2203_interface_1 = static ADDRESS_MAP_START( map_main, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, UNBANKED_SIZE-1) AM_ROM - AM_RANGE(UNBANKED_SIZE, 0x7fff) AM_READ(SMH_BANK(1)) + AM_RANGE(UNBANKED_SIZE, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) AM_RANGE(0x8008, 0x8009) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) AM_RANGE(0xa000, 0xa00f) AM_READWRITE(read_a00x, write_a00x) @@ -840,7 +840,7 @@ ROM_END static DRIVER_INIT(witch) { UINT8 *ROM = (UINT8 *)memory_region(machine, "maincpu"); - memory_set_bankptr(machine, 1, &ROM[0x10000+UNBANKED_SIZE]); + memory_set_bankptr(machine, "bank1", &ROM[0x10000+UNBANKED_SIZE]); memory_install_read8_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x7000, 0x700f, 0, 0, prot_read_700x); bank = -1; diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c index ec20295d1b3..14c4e7ca231 100644 --- a/src/mame/drivers/xain.c +++ b/src/mame/drivers/xain.c @@ -231,12 +231,12 @@ static TIMER_DEVICE_CALLBACK( xain_scanline ) static WRITE8_HANDLER( xainCPUA_bankswitch_w ) { xain_pri = data & 0x7; - memory_set_bank(space->machine, 1, (data >> 3) & 1); + memory_set_bank(space->machine, "bank1", (data >> 3) & 1); } static WRITE8_HANDLER( xainCPUB_bankswitch_w ) { - memory_set_bank(space->machine, 2, data & 1); + memory_set_bank(space->machine, "bank2", data & 1); } static WRITE8_HANDLER( xain_sound_command_w ) @@ -315,7 +315,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3a0f, 0x3a0f) AM_WRITE(xainCPUA_bankswitch_w) AM_RANGE(0x3c00, 0x3dff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0x3e00, 0x3fff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE_GENERIC(paletteram2) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -324,7 +324,7 @@ static ADDRESS_MAP_START( cpu_map_B, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_WRITE(xain_irqA_assert_w) AM_RANGE(0x2800, 0x2800) AM_WRITE(xain_irqB_clear_w) AM_RANGE(0x3000, 0x3000) AM_WRITE(xainCPUB_bankswitch_w) - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(2) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2") AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -469,10 +469,10 @@ static const ym2203_interface ym2203_config = static MACHINE_START( xsleena ) { - memory_configure_bank(machine, 1, 0, 2, memory_region(machine, "maincpu") + 0x4000, 0xc000); - memory_configure_bank(machine, 2, 0, 2, memory_region(machine, "sub") + 0x4000, 0xc000); - memory_set_bank(machine, 1, 0); - memory_set_bank(machine, 2, 0); + memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x4000, 0xc000); + memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "sub") + 0x4000, 0xc000); + memory_set_bank(machine, "bank1", 0); + memory_set_bank(machine, "bank2", 0); } static MACHINE_DRIVER_START( xsleena ) diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 4304bb5922c..305127ec823 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -283,7 +283,7 @@ static READ16_HANDLER( sound_status_r ) static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, 2, memory_region(machine, "audiocpu") + 0x10000 + cur_sound_region*0x4000); + memory_set_bankptr(machine, "bank2", memory_region(machine, "audiocpu") + 0x10000 + cur_sound_region*0x4000); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -393,7 +393,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK(2)) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami", k054539_r, k054539_w) diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 19d02c043bb..43f81826515 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -148,7 +148,7 @@ static UINT8 sound_curbank; static void sound_reset_bank(running_machine *machine) { - memory_set_bankptr(machine, 4, memory_region(machine, "audiocpu") + 0x10000 + (sound_curbank & 0x07) * 0x4000); + memory_set_bankptr(machine, "bank4", memory_region(machine, "audiocpu") + 0x10000 + (sound_curbank & 0x07) * 0x4000); } static WRITE8_HANDLER( sound_bankswitch_w ) @@ -181,7 +181,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK(4)) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank4") AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_DEVREADWRITE("konami", k054539_r, k054539_w) diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c index b93f2d4e63f..a3631d8a34c 100644 --- a/src/mame/drivers/xxmissio.c +++ b/src/mame/drivers/xxmissio.c @@ -34,7 +34,7 @@ WRITE8_HANDLER( xxmissio_paletteram_w ); static WRITE8_HANDLER( xxmissio_bank_sel_w ) { - memory_set_bank(space->machine, 1, data & 7); + memory_set_bank(space->machine, "bank1", data & 7); } static CUSTOM_INPUT( xxmissio_status_r ) @@ -95,8 +95,8 @@ static INTERRUPT_GEN( xxmissio_interrupt_s ) static MACHINE_START( xxmissio ) { - memory_configure_bank(machine, 1, 0, 8, memory_region(machine, "user1"), 0x4000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "user1"), 0x4000); + memory_set_bank(machine, "bank1", 0); } /****************************************************************************/ @@ -126,7 +126,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( map2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w) AM_RANGE(0x8002, 0x8003) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w) diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index 85863e7b3a9..ca4e6be5dc7 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -85,7 +85,7 @@ static WRITE8_HANDLER( yunsung8_bankswitch_w ) if (bank < 3) RAM = &RAM[0x4000 * bank]; else RAM = &RAM[0x4000 * (bank-3) + 0x10000]; - memory_set_bankptr(space->machine, 1, RAM); + memory_set_bankptr(space->machine, "bank1", RAM); } /* @@ -99,7 +99,7 @@ static WRITE8_HANDLER( yunsung8_bankswitch_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0001, 0x0001) AM_WRITE(yunsung8_bankswitch_w ) // ROM Bank (again?) - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK(1) ) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1" ) // Banked ROM AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_READWRITE(yunsung8_videoram_r, yunsung8_videoram_w ) // Video RAM (Banked) AM_RANGE(0xe000, 0xffff) AM_RAM @@ -140,7 +140,7 @@ static WRITE8_DEVICE_HANDLER( yunsung8_sound_bankswitch_w ) if (bank < 3) RAM = &RAM[0x4000 * bank]; else RAM = &RAM[0x4000 * (bank-3) + 0x10000]; - memory_set_bankptr(device->machine, 2, RAM); + memory_set_bankptr(device->machine, "bank2", RAM); msm5205_reset_w(device,data & 0x20); } @@ -155,7 +155,7 @@ static WRITE8_HANDLER( yunsung8_adpcm_w ) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK(2),SMH_ROM ) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") // Banked ROM AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", yunsung8_sound_bankswitch_w ) // ROM Bank AM_RANGE(0xe400, 0xe400) AM_WRITE(yunsung8_adpcm_w ) AM_RANGE(0xec00, 0xec01) AM_DEVWRITE("ymsnd", ym3812_w ) diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 7411c7628cc..6d4d2f1c9b8 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -648,12 +648,12 @@ static READ32_HANDLER( capcom_kickharness_r ) static WRITE32_HANDLER( bank_coh1000c_w ) { - memory_set_bankptr(space->machine, 2, memory_region( space->machine, "user2" ) + 0x400000 + ( data * 0x400000 ) ); + memory_set_bankptr(space->machine, "bank2", memory_region( space->machine, "user2" ) + 0x400000 + ( data * 0x400000 ) ); } static WRITE8_HANDLER( qsound_bankswitch_w ) { - memory_set_bankptr(space->machine, 10, memory_region( space->machine, "audiocpu" ) + 0x10000 + ( ( data & 0x0f ) * 0x4000 ) ); + memory_set_bankptr(space->machine, "bank10", memory_region( space->machine, "audiocpu" ) + 0x10000 + ( ( data & 0x0f ) * 0x4000 ) ); } static INTERRUPT_GEN( qsound_interrupt ) @@ -669,12 +669,12 @@ static WRITE32_HANDLER( zn_qsound_w ) static DRIVER_INIT( coh1000c ) { - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); /* fixed game rom */ - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, (read32_space_func)SMH_BANK(2) ); /* banked game rom */ + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); /* fixed game rom */ + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); /* banked game rom */ memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, bank_coh1000c_w ); /* bankswitch */ memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40010, 0x1fb40013, 0, 0, capcom_kickharness_r ); memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40020, 0x1fb40023, 0, 0, capcom_kickharness_r ); - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, (read32_space_func)SMH_BANK(3) ); /* country rom */ + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, "bank3" ); /* country rom */ memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb60000, 0x1fb60003, 0, 0, zn_qsound_w ); zn_driver_init(machine); @@ -691,15 +691,15 @@ static DRIVER_INIT( coh1000c ) static MACHINE_RESET( coh1000c ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* fixed game rom */ - memory_set_bankptr(machine, 2, memory_region( machine, "user2" ) + 0x400000 ); /* banked game rom */ - memory_set_bankptr(machine, 3, memory_region( machine, "user3" ) ); /* country rom */ + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ + memory_set_bankptr(machine, "bank2", memory_region( machine, "user2" ) + 0x400000 ); /* banked game rom */ + memory_set_bankptr(machine, "bank3", memory_region( machine, "user3" ) ); /* country rom */ zn_machine_init(machine); } static ADDRESS_MAP_START( qsound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(10) /* banked (contains music data) */ + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank10") /* banked (contains music data) */ AM_RANGE(0xd000, 0xd002) AM_DEVWRITE("qsound", qsound_w) AM_RANGE(0xd003, 0xd003) AM_WRITE(qsound_bankswitch_w) AM_RANGE(0xd007, 0xd007) AM_DEVREAD("qsound", qsound_r) @@ -883,17 +883,17 @@ Notes: static WRITE32_HANDLER( bank_coh3002c_w ) { - memory_set_bankptr(space->machine, 2, memory_region( space->machine, "user2" ) + 0x400000 + ( data * 0x400000 ) ); + memory_set_bankptr(space->machine, "bank2", memory_region( space->machine, "user2" ) + 0x400000 + ( data * 0x400000 ) ); } static DRIVER_INIT( coh3002c ) { - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); /* fixed game rom */ - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, (read32_space_func)SMH_BANK(2) ); /* banked game rom */ + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); /* fixed game rom */ + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); /* banked game rom */ memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40010, 0x1fb40013, 0, 0, capcom_kickharness_r ); memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40020, 0x1fb40023, 0, 0, capcom_kickharness_r ); memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, bank_coh3002c_w ); /* bankswitch */ - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, (read32_space_func)SMH_BANK(3) ); /* country rom */ + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, "bank3" ); /* country rom */ memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb60000, 0x1fb60003, 0, 0, zn_qsound_w ); zn_driver_init(machine); @@ -901,9 +901,9 @@ static DRIVER_INIT( coh3002c ) static MACHINE_RESET( coh3002c ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* fixed game rom */ - memory_set_bankptr(machine, 2, memory_region( machine, "user2" ) + 0x400000 ); /* banked game rom */ - memory_set_bankptr(machine, 3, memory_region( machine, "user3" ) ); /* country rom */ + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ + memory_set_bankptr(machine, "bank2", memory_region( machine, "user2" ) + 0x400000 ); /* banked game rom */ + memory_set_bankptr(machine, "bank3", memory_region( machine, "user3" ) ); /* country rom */ zn_machine_init(machine); } @@ -1150,12 +1150,12 @@ static WRITE32_HANDLER( bank_coh1000t_w ) const device_config *mb3773 = devtag_get_device(space->machine, "mb3773"); mb3773_set_ck(mb3773, 0, (data & 0x20) >> 5); verboselog( space->machine, 1, "bank_coh1000t_w( %08x, %08x, %08x )\n", offset, data, mem_mask ); - memory_set_bankptr(space->machine, 1, memory_region( space->machine, "user2" ) + ( ( data & 3 ) * 0x800000 ) ); + memory_set_bankptr(space->machine, "bank1", memory_region( space->machine, "user2" ) + ( ( data & 3 ) * 0x800000 ) ); } static WRITE8_HANDLER( fx1a_sound_bankswitch_w ) { - memory_set_bankptr(space->machine, 10, memory_region( space->machine, "audiocpu" ) + 0x10000 + ( ( ( data - 1 ) & 0x07 ) * 0x4000 ) ); + memory_set_bankptr(space->machine, "bank10", memory_region( space->machine, "audiocpu" ) + 0x10000 + ( ( ( data - 1 ) & 0x07 ) * 0x4000 ) ); } static READ32_HANDLER( taitofx1a_ymsound_r ) @@ -1179,18 +1179,18 @@ static DRIVER_INIT( coh1000ta ) { taitofx1_eeprom_size1 = 0x200; taitofx1_eeprom1 = auto_alloc_array(machine, UINT8, taitofx1_eeprom_size1 ); - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); /* banked game rom */ + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked game rom */ memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40000, 0x1fb40003, 0, 0, bank_coh1000t_w ); /* bankswitch */ memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fb80003, 0, 0, taitofx1a_ymsound_r, taitofx1a_ymsound_w ); - memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, (read32_space_func)SMH_BANK(2), (write32_space_func)SMH_BANK(2) ); + memory_install_readwrite_bank_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, "bank2" ); zn_driver_init(machine); } static MACHINE_RESET( coh1000ta ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* banked game rom */ - memory_set_bankptr(machine, 2, taitofx1_eeprom1 ); + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); /* banked game rom */ + memory_set_bankptr(machine, "bank2", taitofx1_eeprom1 ); zn_machine_init(machine); } @@ -1211,7 +1211,7 @@ static NVRAM_HANDLER( coh1000ta ) } static ADDRESS_MAP_START( fx1a_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK(10)) /* Fallthrough */ + AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") /* Fallthrough */ AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w) @@ -1274,22 +1274,22 @@ static DRIVER_INIT( coh1000tb ) taitofx1_eeprom_size1 = 0x400; taitofx1_eeprom1 = auto_alloc_array(machine, UINT8, taitofx1_eeprom_size1 ); taitofx1_eeprom_size2 = 0x200; taitofx1_eeprom2 = auto_alloc_array(machine, UINT8, taitofx1_eeprom_size2 ); - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); /* banked game rom */ - memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, (read32_space_func)SMH_BANK(2), (write32_space_func)SMH_BANK(2) ); + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked game rom */ + memory_install_readwrite_bank_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, "bank2" ); memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb40000, 0x1fb40003, 0, 0, bank_coh1000t_w ); /* bankswitch */ memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fb80003, 0, 0, taitofx1b_volume_w ); memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fba0000, 0x1fba0003, 0, 0, taitofx1b_sound_w ); memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbc0000, 0x1fbc0003, 0, 0, taitofx1b_sound_r ); - memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size2 - 1 ), 0, 0, (read32_space_func)SMH_BANK(3), (write32_space_func)SMH_BANK(3) ); + memory_install_readwrite_bank_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size2 - 1 ), 0, 0, "bank3" ); zn_driver_init(machine); } static MACHINE_RESET( coh1000tb ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* banked game rom */ - memory_set_bankptr(machine, 2, taitofx1_eeprom1 ); - memory_set_bankptr(machine, 3, taitofx1_eeprom2 ); + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); /* banked game rom */ + memory_set_bankptr(machine, "bank2", taitofx1_eeprom1 ); + memory_set_bankptr(machine, "bank3", taitofx1_eeprom2 ); zn_machine_init(machine); } @@ -1477,7 +1477,7 @@ static DRIVER_INIT( coh1000w ) { const device_config *ide = devtag_get_device(machine, "ide"); - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, "bank1" ); memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f000003, 0, 0, (write32_space_func)SMH_NOP ); memory_install_readwrite32_device_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), ide, 0x1f7e4000, 0x1f7e4fff, 0, 0, ide_controller32_r, ide_controller32_w ); memory_install_readwrite32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f7e8000, 0x1f7e8003, 0, 0, (read32_space_func)SMH_NOP, (write32_space_func)SMH_NOP ); @@ -1488,7 +1488,7 @@ static DRIVER_INIT( coh1000w ) static MACHINE_RESET( coh1000w ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* fixed game rom */ + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ zn_machine_init(machine); devtag_reset(machine, "ide"); @@ -1655,7 +1655,7 @@ static WRITE32_HANDLER( coh1002e_bank_w ) { znsecsel_w( space, offset, data, mem_mask ); - memory_set_bankptr(space->machine, 1, memory_region( space->machine, "user2" ) + ( ( data & 3 ) * 0x800000 ) ); + memory_set_bankptr(space->machine, "bank1", memory_region( space->machine, "user2" ) + ( ( data & 3 ) * 0x800000 ) ); } static WRITE32_HANDLER( coh1002e_latch_w ) @@ -1668,7 +1668,7 @@ static WRITE32_HANDLER( coh1002e_latch_w ) static DRIVER_INIT( coh1002e ) { - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fa10300, 0x1fa10303, 0, 0, coh1002e_bank_w ); memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00007, 0, 0, coh1002e_latch_w ); @@ -1677,7 +1677,7 @@ static DRIVER_INIT( coh1002e ) static MACHINE_RESET( coh1002e ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* banked game rom */ + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); /* banked game rom */ zn_machine_init(machine); } @@ -1769,7 +1769,7 @@ static WRITE32_HANDLER( bam2_mcu_w ) { if (ACCESSING_BITS_0_15) { - memory_set_bankptr(space->machine, 2, memory_region( space->machine, "user2" ) + ( ( data & 0xf ) * 0x400000 ) ); + memory_set_bankptr(space->machine, "bank2", memory_region( space->machine, "user2" ) + ( ( data & 0xf ) * 0x400000 ) ); } else if (ACCESSING_BITS_16_31) { @@ -1810,8 +1810,8 @@ static READ32_HANDLER( bam2_unk_r ) static DRIVER_INIT( bam2 ) { - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, (read32_space_func)SMH_BANK(2) ); + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00007, 0, 0, bam2_mcu_r ); memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fa20000, 0x1fa20003, 0, 0, bam2_unk_r ); memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fa10300, 0x1fa10303, 0, 0, bam2_sec_w ); @@ -1822,8 +1822,8 @@ static DRIVER_INIT( bam2 ) static MACHINE_RESET( bam2 ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* fixed game rom */ - memory_set_bankptr(machine, 2, memory_region( machine, "user2" ) + 0x400000 ); /* banked game rom */ + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ + memory_set_bankptr(machine, "bank2", memory_region( machine, "user2" ) + 0x400000 ); /* banked game rom */ zn_machine_init(machine); } @@ -2130,7 +2130,7 @@ static READ32_HANDLER( nbajamex_80_r ) static DRIVER_INIT( coh1000a ) { - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, "bank1" ); memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbfff00, 0x1fbfff03, 0, 0, acpsx_00_w ); memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbfff10, 0x1fbfff13, 0, 0, acpsx_10_w ); @@ -2138,11 +2138,11 @@ static DRIVER_INIT( coh1000a ) { nbajamex_eeprom_size = 0x8000; nbajamex_eeprom = auto_alloc_array(machine, UINT8, nbajamex_eeprom_size ); - memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f200000, 0x1f200000 + ( nbajamex_eeprom_size - 1 ), 0, 0, (read32_space_func)SMH_BANK(2), (write32_space_func)SMH_BANK(2) ); + memory_install_readwrite_bank_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f200000, 0x1f200000 + ( nbajamex_eeprom_size - 1 ), 0, 0, "bank2" ); memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbfff08, 0x1fbfff0b, 0, 0, nbajamex_08_r ); memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fbfff80, 0x1fbfff83, 0, 0, nbajamex_80_r, nbajamex_80_w ); - memory_set_bankptr(machine, 2, nbajamex_eeprom ); /* ram/eeprom/?? */ + memory_set_bankptr(machine, "bank2", nbajamex_eeprom ); /* ram/eeprom/?? */ } if( ( !strcmp( machine->gamedrv->name, "jdredd" ) ) || @@ -2160,7 +2160,7 @@ static DRIVER_INIT( coh1000a ) static MACHINE_RESET( coh1000a ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* fixed game rom */ + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ zn_machine_init(machine); if( ( !strcmp( machine->gamedrv->name, "jdredd" ) ) || ( !strcmp( machine->gamedrv->name, "jdreddb" ) ) ) @@ -2304,12 +2304,12 @@ Notes: static WRITE32_HANDLER( coh1001l_bnk_w ) { - memory_set_bankptr(space->machine, 1, memory_region( space->machine, "user2" ) + ( ( ( data >> 16 ) & 3 ) * 0x800000 ) ); + memory_set_bankptr(space->machine, "bank1", memory_region( space->machine, "user2" ) + ( ( ( data >> 16 ) & 3 ) * 0x800000 ) ); } static DRIVER_INIT( coh1001l ) { - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); /* banked rom */ + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked rom */ memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, coh1001l_bnk_w ); zn_driver_init(machine); @@ -2317,7 +2317,7 @@ static DRIVER_INIT( coh1001l ) static MACHINE_RESET( coh1001l ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* banked rom */ + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); /* banked rom */ zn_machine_init(machine); } @@ -2347,13 +2347,13 @@ Key: Mother KN01 static WRITE32_HANDLER( coh1002v_bnk_w ) { - memory_set_bankptr(space->machine, 2, memory_region( space->machine, "user3" ) + ( data * 0x100000 ) ); + memory_set_bankptr(space->machine, "bank2", memory_region( space->machine, "user3" ) + ( data * 0x100000 ) ); } static DRIVER_INIT( coh1002v ) { - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f27ffff, 0, 0, (read32_space_func)SMH_BANK(1) ); - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fbfffff, 0, 0, (read32_space_func)SMH_BANK(2) ); + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f27ffff, 0, 0, "bank1" ); + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fbfffff, 0, 0, "bank2" ); memory_install_write32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, coh1002v_bnk_w ); zn_driver_init(machine); @@ -2361,8 +2361,8 @@ static DRIVER_INIT( coh1002v ) static MACHINE_RESET( coh1002v ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); /* fixed game rom */ - memory_set_bankptr(machine, 2, memory_region( machine, "user3" ) ); /* banked rom */ + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ + memory_set_bankptr(machine, "bank2", memory_region( machine, "user3" ) ); /* banked rom */ zn_machine_init(machine); } @@ -2532,7 +2532,7 @@ Notes: static WRITE32_HANDLER( coh1002m_bank_w ) { verboselog( space->machine, 1, "coh1002m_bank_w( %08x, %08x, %08x )\n", offset, data, mem_mask ); - memory_set_bankptr(space->machine, 1, memory_region( space->machine, "user2" ) + ((data>>16) * 0x800000)); + memory_set_bankptr(space->machine, "bank1", memory_region( space->machine, "user2" ) + ((data>>16) * 0x800000)); } static int cbaj_to_z80 = 0, cbaj_to_r3k = 0; @@ -2555,7 +2555,7 @@ static WRITE32_HANDLER( cbaj_z80_w ) static DRIVER_INIT( coh1002m ) { - memory_install_read32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, (read32_space_func)SMH_BANK(1) ); + memory_install_read_bank_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); memory_install_readwrite32_handler( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, cbaj_z80_r, cbaj_z80_w ); memory_install_write32_handler ( cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1fb00004, 0x1fb00007, 0, 0, coh1002m_bank_w ); @@ -2564,7 +2564,7 @@ static DRIVER_INIT( coh1002m ) static MACHINE_RESET( coh1002m ) { - memory_set_bankptr(machine, 1, memory_region( machine, "user2" ) ); + memory_set_bankptr(machine, "bank1", memory_region( machine, "user2" ) ); zn_machine_init(machine); } diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index 6d745592bc6..bb165af5597 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -40,7 +40,7 @@ struct _mario_state /* sound state */ UINT8 last; UINT8 portT; - UINT8 eabank; + const char *eabank; /* video state */ UINT8 gfx_bank; diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 67b416a5d3f..a4d3e9276ee 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -204,21 +204,18 @@ void namcos2_adjust_posirq_timer( running_machine *machine, int scanline ); /* MASTER CPU RAM MEMORY */ /**************************************************************/ -#define NAMCOS2_68K_MASTER_RAM_W SMH_BANK(3) -#define NAMCOS2_68K_MASTER_RAM_R SMH_BANK(3) +#define NAMCOS2_68K_MASTER_RAM "bank3" /**************************************************************/ /* SLAVE CPU RAM MEMORY */ /**************************************************************/ -#define NAMCOS2_68K_SLAVE_RAM_W SMH_BANK(4) -#define NAMCOS2_68K_SLAVE_RAM_R SMH_BANK(4) +#define NAMCOS2_68K_SLAVE_RAM "bank4" /**************************************************************/ /* */ /**************************************************************/ -#define BANKED_SOUND_ROM_R SMH_BANK(6) -#define CPU3_ROM1 6 /* Bank number */ +#define BANKED_SOUND_ROM "bank6" /**************************************************************/ /* Sound CPU support handlers - 6809 */ diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index db117115736..61607d3c270 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -19,13 +19,13 @@ #define NEOGEO_VSSTART (0x000) #define NEOGEO_VBLANK_RELOAD_HPOS (0x11f) -#define NEOGEO_BANK_AUDIO_CPU_CART_BANK (1) +#define NEOGEO_BANK_AUDIO_CPU_CART_BANK "audio_cart" /* do not use 2, 3 and 4 */ -#define NEOGEO_BANK_CARTRIDGE (5) -#define NEOGEO_BANK_BIOS (6) -#define NEOGEO_BANK_VECTORS (7) -#define NEOGEO_BANK_EXTRA_RAM (8) -#define NEOGEO_BANK_AUDIO_CPU_MAIN_BANK (9) +#define NEOGEO_BANK_CARTRIDGE "cartridge" +#define NEOGEO_BANK_BIOS "bios" +#define NEOGEO_BANK_VECTORS "vectors" +#define NEOGEO_BANK_EXTRA_RAM "extra_ram" +#define NEOGEO_BANK_AUDIO_CPU_MAIN_BANK "audio_main" /*----------- defined in drivers/neogeo.c -----------*/ diff --git a/src/mame/machine/acitya.c b/src/mame/machine/acitya.c index 52189d1df40..feac1b50239 100644 --- a/src/mame/machine/acitya.c +++ b/src/mame/machine/acitya.c @@ -171,10 +171,10 @@ READ8_HANDLER( acitya_decrypt_rom ) switch(counter) { - case 0x08: memory_set_bank (space->machine, 1, 0); break; - case 0x09: memory_set_bank (space->machine, 1, 1); break; - case 0x0A: memory_set_bank (space->machine, 1, 2); break; - case 0x0B: memory_set_bank (space->machine, 1, 3); break; + case 0x08: memory_set_bank (space->machine, "bank1", 0); break; + case 0x09: memory_set_bank (space->machine, "bank1", 1); break; + case 0x0A: memory_set_bank (space->machine, "bank1", 2); break; + case 0x0B: memory_set_bank (space->machine, "bank1", 3); break; default: logerror("Invalid counter = %02X\n",counter); break; @@ -198,8 +198,8 @@ MACHINE_RESET( acitya ) /* The initial state of the counter is 0x0B */ counter = 0x0B; - memory_configure_bank(machine, 1, 0, 4, &RAM[0x10000], 0x4000); - memory_set_bank(machine, 1, 3); + memory_configure_bank(machine, "bank1", 0, 4, &RAM[0x10000], 0x4000); + memory_set_bank(machine, "bank1", 3); state_save_register_global(machine, counter); } diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c index 2cf30287ad1..50e451b08ab 100644 --- a/src/mame/machine/ajax.c +++ b/src/mame/machine/ajax.c @@ -50,7 +50,7 @@ static WRITE8_HANDLER( ajax_bankswitch_w ) /* bank # (ROMS N11 and N12) */ bankaddress += 0x10000 + (data & 0x07)*0x2000; - memory_set_bankptr(space->machine, 2,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank2",&RAM[bankaddress]); } /* ajax_lamps_w: @@ -194,7 +194,7 @@ WRITE8_HANDLER( ajax_bankswitch_2_w ) /* bank # (ROMS G16 and I16) */ bankaddress = 0x10000 + (data & 0x0f)*0x2000; - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); } MACHINE_START( ajax ) diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c index c8fe482d8ab..5141502baff 100644 --- a/src/mame/machine/asteroid.c +++ b/src/mame/machine/asteroid.c @@ -97,13 +97,13 @@ WRITE8_HANDLER( asteroid_bank_switch_w ) { if (data & 4) { - memory_set_bankptr(space->machine, 1, asteroid_ram2); - memory_set_bankptr(space->machine, 2, asteroid_ram1); + memory_set_bankptr(space->machine, "bank1", asteroid_ram2); + memory_set_bankptr(space->machine, "bank2", asteroid_ram1); } else { - memory_set_bankptr(space->machine, 1, asteroid_ram1); - memory_set_bankptr(space->machine, 2, asteroid_ram2); + memory_set_bankptr(space->machine, "bank1", asteroid_ram1); + memory_set_bankptr(space->machine, "bank2", asteroid_ram2); } set_led_status (space->machine, 0, ~data & 0x02); @@ -115,13 +115,13 @@ WRITE8_HANDLER( astdelux_bank_switch_w ) { if (data & 0x80) { - memory_set_bankptr(space->machine, 1, asteroid_ram2); - memory_set_bankptr(space->machine, 2, asteroid_ram1); + memory_set_bankptr(space->machine, "bank1", asteroid_ram2); + memory_set_bankptr(space->machine, "bank2", asteroid_ram1); } else { - memory_set_bankptr(space->machine, 1, asteroid_ram1); - memory_set_bankptr(space->machine, 2, asteroid_ram2); + memory_set_bankptr(space->machine, "bank1", asteroid_ram1); + memory_set_bankptr(space->machine, "bank2", asteroid_ram2); } } diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c index 3d0c754817f..c6df7855467 100644 --- a/src/mame/machine/atari.c +++ b/src/mame/machine/atari.c @@ -101,25 +101,19 @@ const pia6821_interface atarixl_pia_interface = void a600xl_mmu(running_machine *machine, UINT8 new_mmu) { - read8_space_func rbank2; - write8_space_func wbank2; - /* check if self-test ROM changed */ if ( new_mmu & 0x80 ) { logerror("%s MMU SELFTEST RAM\n", machine->gamedrv->name); - rbank2 = (read8_space_func)SMH_NOP; - wbank2 = (write8_space_func)SMH_NOP; + memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0, (read8_space_func)SMH_NOP, (write8_space_func)SMH_NOP); } else { logerror("%s MMU SELFTEST ROM\n", machine->gamedrv->name); - rbank2 = (read8_space_func)SMH_BANK(2); - wbank2 = (write8_space_func)SMH_UNMAP; + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0, "bank2"); + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0, (write8_space_func)SMH_UNMAP); + memory_set_bankptr(machine, "bank2", memory_region(machine, "maincpu") + 0x5000); } - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0, rbank2, wbank2); - if (rbank2 == (read8_space_func)SMH_BANK(2)) - memory_set_bankptr(machine, 2, memory_region(machine, "maincpu") + 0x5000); } diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c index ef523a9fd3b..0ea3df10d94 100644 --- a/src/mame/machine/balsente.c +++ b/src/mame/machine/balsente.c @@ -195,10 +195,10 @@ MACHINE_RESET( balsente ) /* point the banks to bank 0 */ numbanks = (memory_region_length(machine, "maincpu") > 0x40000) ? 16 : 8; - memory_configure_bank(machine, 1, 0, numbanks, &memory_region(machine, "maincpu")[0x10000], 0x6000); - memory_configure_bank(machine, 2, 0, numbanks, &memory_region(machine, "maincpu")[0x12000], 0x6000); - memory_set_bank(space->machine, 1, 0); - memory_set_bank(space->machine, 2, 0); + memory_configure_bank(machine, "bank1", 0, numbanks, &memory_region(machine, "maincpu")[0x10000], 0x6000); + memory_configure_bank(machine, "bank2", 0, numbanks, &memory_region(machine, "maincpu")[0x12000], 0x6000); + memory_set_bank(space->machine, "bank1", 0); + memory_set_bank(space->machine, "bank2", 0); device_reset(cputag_get_cpu(machine, "maincpu")); /* start a timer to generate interrupts */ @@ -358,8 +358,8 @@ READ8_HANDLER( balsente_random_num_r ) WRITE8_HANDLER( balsente_rombank_select_w ) { /* the bank number comes from bits 4-6 */ - memory_set_bank(space->machine, 1, (data >> 4) & 7); - memory_set_bank(space->machine, 2, (data >> 4) & 7); + memory_set_bank(space->machine, "bank1", (data >> 4) & 7); + memory_set_bank(space->machine, "bank2", (data >> 4) & 7); } @@ -374,15 +374,15 @@ WRITE8_HANDLER( balsente_rombank2_select_w ) /* when they set the AB bank, it appears as though the CD bank is reset */ if (data & 0x20) { - memory_set_bank(space->machine, 1, bank); - memory_set_bank(space->machine, 2, 6); + memory_set_bank(space->machine, "bank1", bank); + memory_set_bank(space->machine, "bank2", 6); } /* set both banks */ else { - memory_set_bank(space->machine, 1, bank); - memory_set_bank(space->machine, 2, bank); + memory_set_bank(space->machine, "bank1", bank); + memory_set_bank(space->machine, "bank2", bank); } } diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c index b1be74eb545..547bb049e4e 100644 --- a/src/mame/machine/beezer.c +++ b/src/mame/machine/beezer.c @@ -117,7 +117,7 @@ WRITE8_HANDLER( beezer_bankswitch_w ) else { UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000; - memory_install_readwrite8_handler(space, 0xc000, 0xcfff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1)); - memory_set_bankptr(space->machine, 1, rom + (data & 0x07) * 0x2000 + ((data & 0x08) ? 0x1000: 0)); + memory_install_readwrite_bank_handler(space, 0xc000, 0xcfff, 0, 0, "bank1"); + memory_set_bankptr(space->machine, "bank1", rom + (data & 0x07) * 0x2000 + ((data & 0x08) ? 0x1000: 0)); } } diff --git a/src/mame/machine/bublbobl.c b/src/mame/machine/bublbobl.c index 3b4b2872e7a..0c5862ec3a4 100644 --- a/src/mame/machine/bublbobl.c +++ b/src/mame/machine/bublbobl.c @@ -18,7 +18,7 @@ WRITE8_HANDLER( bublbobl_bankswitch_w ) bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; /* bits 0-2 select ROM bank */ - memory_set_bank(space->machine, 1, (data ^ 4) & 7); + memory_set_bank(space->machine, "bank1", (data ^ 4) & 7); /* bit 3 n.c. */ @@ -39,7 +39,7 @@ WRITE8_HANDLER( bublbobl_bankswitch_w ) WRITE8_HANDLER( tokio_bankswitch_w ) { /* bits 0-2 select ROM bank */ - memory_set_bank(space->machine, 1, data & 7); + memory_set_bank(space->machine, "bank1", data & 7); /* bits 3-7 unknown */ } diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c index 0a15573ffbf..65100a0a245 100644 --- a/src/mame/machine/decocass.c +++ b/src/mame/machine/decocass.c @@ -1273,7 +1273,7 @@ WRITE8_HANDLER( decocass_e900_w ) { decocass_state *state = (decocass_state *)space->machine->driver_data; state->de0091_enable = data & 1; - memory_set_bank(space->machine, 1, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); /* Perhaps the second row of ROMs is enabled by another bit. * There is no way to verify this yet, so for now just look * at bit 0 to enable the daughter board at reads between diff --git a/src/mame/machine/galaxold.c b/src/mame/machine/galaxold.c index 9b8ad2e7b81..d85b848e1e5 100644 --- a/src/mame/machine/galaxold.c +++ b/src/mame/machine/galaxold.c @@ -147,23 +147,23 @@ WRITE8_HANDLER( zigzag_sillyprotection_w ) if (data) { /* swap ROM 2 and 3! */ - memory_set_bank(space->machine, 1, 1); - memory_set_bank(space->machine, 2, 0); + memory_set_bank(space->machine, "bank1", 1); + memory_set_bank(space->machine, "bank2", 0); } else { - memory_set_bank(space->machine, 1, 0); - memory_set_bank(space->machine, 2, 1); + memory_set_bank(space->machine, "bank1", 0); + memory_set_bank(space->machine, "bank2", 1); } } DRIVER_INIT( zigzag ) { UINT8 *RAM = memory_region(machine, "maincpu"); - memory_configure_bank(machine, 1, 0, 2, &RAM[0x2000], 0x1000); - memory_configure_bank(machine, 2, 0, 2, &RAM[0x2000], 0x1000); - memory_set_bank(machine, 1, 0); - memory_set_bank(machine, 2, 1); + memory_configure_bank(machine, "bank1", 0, 2, &RAM[0x2000], 0x1000); + memory_configure_bank(machine, "bank2", 0, 2, &RAM[0x2000], 0x1000); + memory_set_bank(machine, "bank1", 0); + memory_set_bank(machine, "bank2", 1); } @@ -244,7 +244,7 @@ WRITE8_HANDLER( _4in1_bank_w ) { _4in1_bank = data & 0x03; galaxold_gfxbank_w(space, 0, _4in1_bank); - memory_set_bank(space->machine, 1, _4in1_bank); + memory_set_bank(space->machine, "bank1", _4in1_bank); } CUSTOM_INPUT( _4in1_fake_port_r ) @@ -399,7 +399,7 @@ DRIVER_INIT( 4in1 ) RAM[i] = RAM[i] ^ (i & 0xff); /* games are banked at 0x0000 - 0x3fff */ - memory_configure_bank(machine, 1, 0, 4, &RAM[0x10000], 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, &RAM[0x10000], 0x4000); _4in1_bank_w(space, 0, 0); /* set the initial CPU bank */ diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c index 193f6e45465..a88544c5aca 100644 --- a/src/mame/machine/irobot.c +++ b/src/mame/machine/irobot.c @@ -129,13 +129,13 @@ WRITE8_HANDLER( irobot_out0_w ) switch (data & 0x60) { case 0: - memory_set_bankptr(space->machine, 2, &RAM[0x1C000]); + memory_set_bankptr(space->machine, "bank2", &RAM[0x1C000]); break; case 0x20: - memory_set_bankptr(space->machine, 2, &RAM[0x1C800]); + memory_set_bankptr(space->machine, "bank2", &RAM[0x1C800]); break; case 0x40: - memory_set_bankptr(space->machine, 2, &RAM[0x1D000]); + memory_set_bankptr(space->machine, "bank2", &RAM[0x1D000]); break; } irobot_outx = (data & 0x18) >> 3; @@ -150,22 +150,22 @@ WRITE8_HANDLER( irobot_rom_banksel_w ) switch ((data & 0x0E) >> 1) { case 0: - memory_set_bankptr(space->machine, 1, &RAM[0x10000]); + memory_set_bankptr(space->machine, "bank1", &RAM[0x10000]); break; case 1: - memory_set_bankptr(space->machine, 1, &RAM[0x12000]); + memory_set_bankptr(space->machine, "bank1", &RAM[0x12000]); break; case 2: - memory_set_bankptr(space->machine, 1, &RAM[0x14000]); + memory_set_bankptr(space->machine, "bank1", &RAM[0x14000]); break; case 3: - memory_set_bankptr(space->machine, 1, &RAM[0x16000]); + memory_set_bankptr(space->machine, "bank1", &RAM[0x16000]); break; case 4: - memory_set_bankptr(space->machine, 1, &RAM[0x18000]); + memory_set_bankptr(space->machine, "bank1", &RAM[0x18000]); break; case 5: - memory_set_bankptr(space->machine, 1, &RAM[0x1A000]); + memory_set_bankptr(space->machine, "bank1", &RAM[0x1A000]); break; } set_led_status(space->machine, 0,data & 0x10); diff --git a/src/mame/machine/jackal.c b/src/mame/machine/jackal.c index 328f9ed65ae..39ce7b3de53 100644 --- a/src/mame/machine/jackal.c +++ b/src/mame/machine/jackal.c @@ -25,7 +25,7 @@ MACHINE_RESET( jackal ) // at the beginning of the game. This fixes it. cpu_set_clockscale(cputag_get_cpu(machine, "slave"), 1.2f); - memory_set_bankptr(machine, 1,&rgn[0x4000]); + memory_set_bankptr(machine, "bank1",&rgn[0x4000]); jackal_rambank = rgn; jackal_spritebank = rgn; } @@ -59,7 +59,7 @@ WRITE8_HANDLER( jackal_rambank_w ) coin_counter_w(space->machine, 1,data & 0x02); jackal_spritebank = &rgn[((data & 0x08) << 13)]; jackal_rambank = &rgn[((data & 0x10) << 12)]; - memory_set_bankptr(space->machine, 1,&rgn[((data & 0x20) << 11) + 0x4000]); + memory_set_bankptr(space->machine, "bank1",&rgn[((data & 0x20) << 11) + 0x4000]); } diff --git a/src/mame/machine/kabuki.c b/src/mame/machine/kabuki.c index 071472cf996..bbc4a6ecc9a 100644 --- a/src/mame/machine/kabuki.c +++ b/src/mame/machine/kabuki.c @@ -175,7 +175,7 @@ static void mitchell_decode(running_machine *machine, int swap_key1,int swap_key for (i = 0; i < numbanks; i++) kabuki_decode(rom+i*0x4000,decrypt+i*0x4000,rom+i*0x4000,0x8000,0x4000, swap_key1,swap_key2,addr_key,xor_key); - memory_configure_bank_decrypted(machine, 1, 0, numbanks, decrypt, 0x4000); + memory_configure_bank_decrypted(machine, "bank1", 0, numbanks, decrypt, 0x4000); /* { FILE *f; diff --git a/src/mame/machine/konppc.c b/src/mame/machine/konppc.c index acd6c7e2fd5..eff0ed148ee 100644 --- a/src/mame/machine/konppc.c +++ b/src/mame/machine/konppc.c @@ -23,7 +23,7 @@ static UINT32 *dsp_shared_ram[MAX_CG_BOARDS]; static UINT32 dsp_state[MAX_CG_BOARDS]; static UINT32 pci_bridge_enable[MAX_CG_BOARDS]; static UINT32 nwk_device_sel[MAX_CG_BOARDS]; -static INT32 texture_bank[MAX_CG_BOARDS]; +static const char *texture_bank[MAX_CG_BOARDS]; static int nwk_fifo_half_full_r; static int nwk_fifo_half_full_w; @@ -51,7 +51,7 @@ void init_konami_cgboard(running_machine *machine, int num_boards, int type) dsp_shared_ram_bank[i] = 0; dsp_state[i] = 0x80; - texture_bank[i] = -1; + texture_bank[i] = NULL; pci_bridge_enable[i] = 0; nwk_device_sel[i] = 0; @@ -66,7 +66,6 @@ void init_konami_cgboard(running_machine *machine, int num_boards, int type) state_save_register_item(machine, "konppc", NULL, i, dsp_shared_ram_bank[i]); state_save_register_item_pointer(machine, "konppc", NULL, i, dsp_shared_ram[i], DSP_BANK_SIZE * 2 / sizeof(dsp_shared_ram[i][0])); state_save_register_item(machine, "konppc", NULL, i, dsp_state[i]); - state_save_register_item(machine, "konppc", NULL, i, texture_bank[i]); state_save_register_item(machine, "konppc", NULL, i, pci_bridge_enable[i]); state_save_register_item(machine, "konppc", NULL, i, nwk_device_sel[i]); state_save_register_item(machine, "konppc", NULL, i, nwk_fifo_read_ptr[i]); @@ -117,7 +116,7 @@ int get_cgboard_id(void) } } -void set_cgboard_texture_bank(running_machine *machine, int board, int bank, UINT8 *rom) +void set_cgboard_texture_bank(running_machine *machine, int board, const char *bank, UINT8 *rom) { texture_bank[board] = bank; @@ -249,7 +248,7 @@ static void dsp_comm_sharc_w(const address_space *space, int board, int offset, sharc_set_flag_input(device, 1, ASSERT_LINE); } - if (texture_bank[board] != -1) + if (texture_bank[board] != NULL) { int offset = (data & 0x08) ? 1 : 0; @@ -263,7 +262,7 @@ static void dsp_comm_sharc_w(const address_space *space, int board, int offset, { if (offset == 1) { - if (texture_bank[board] != -1) + if (texture_bank[board] != NULL) { int offset = (data & 0x08) ? 1 : 0; diff --git a/src/mame/machine/konppc.h b/src/mame/machine/konppc.h index e2486707fc4..9518658b33b 100644 --- a/src/mame/machine/konppc.h +++ b/src/mame/machine/konppc.h @@ -10,7 +10,7 @@ void init_konami_cgboard(running_machine *machine, int board_id, int type); void set_cgboard_id(int board_id); int get_cgboard_id(void); -void set_cgboard_texture_bank(running_machine *machine, int board, int bank, UINT8 *rom); +void set_cgboard_texture_bank(running_machine *machine, int board, const char *bank, UINT8 *rom); READ32_HANDLER( cgboard_dsp_comm_r_ppc ); WRITE32_HANDLER( cgboard_dsp_comm_w_ppc ); diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c index 54848fae311..09ed4391fab 100644 --- a/src/mame/machine/leland.c +++ b/src/mame/machine/leland.c @@ -406,7 +406,7 @@ MACHINE_RESET( leland ) slave_length = memory_region_length(machine, "slave"); slave_base = memory_region(machine, "slave"); if (slave_length > 0x10000) - memory_set_bankptr(machine, 3, &slave_base[0x10000]); + memory_set_bankptr(machine, "bank3", &slave_base[0x10000]); /* if we have an I80186 CPU, reset it */ if (cputag_get_cpu(machine, "audiocpu") != NULL && cpu_get_type(cputag_get_cpu(machine, "audiocpu")) == CPU_I80186) @@ -454,7 +454,7 @@ MACHINE_RESET( ataxx ) slave_length = memory_region_length(machine, "slave"); slave_base = memory_region(machine, "slave"); if (slave_length > 0x10000) - memory_set_bankptr(machine, 3, &slave_base[0x10000]); + memory_set_bankptr(machine, "bank3", &slave_base[0x10000]); /* reset the 80186 */ leland_80186_sound_init(); @@ -540,10 +540,10 @@ void mayhem_bankswitch(running_machine *machine) battery_ram_enable = ((sound_port_bank & 0x24) == 0); address = (!(sound_port_bank & 0x04)) ? &master_base[0x10000] : &master_base[0x1c000]; - memory_set_bankptr(machine, 1, address); + memory_set_bankptr(machine, "bank1", address); address = battery_ram_enable ? battery_ram : &address[0x8000]; - memory_set_bankptr(machine, 2, address); + memory_set_bankptr(machine, "bank2", address); } @@ -555,10 +555,10 @@ void dangerz_bankswitch(running_machine *machine) battery_ram_enable = ((top_board_bank & 0x80) != 0); address = (!(alternate_bank & 1)) ? &master_base[0x02000] : &master_base[0x12000]; - memory_set_bankptr(machine, 1, address); + memory_set_bankptr(machine, "bank1", address); address = battery_ram_enable ? battery_ram : &address[0x8000]; - memory_set_bankptr(machine, 2, address); + memory_set_bankptr(machine, "bank2", address); } @@ -573,10 +573,10 @@ void basebal2_bankswitch(running_machine *machine) address = (!(sound_port_bank & 0x04)) ? &master_base[0x10000] : &master_base[0x1c000]; else address = (!(top_board_bank & 0x40)) ? &master_base[0x28000] : &master_base[0x30000]; - memory_set_bankptr(machine, 1, address); + memory_set_bankptr(machine, "bank1", address); address = battery_ram_enable ? battery_ram : &address[0x8000]; - memory_set_bankptr(machine, 2, address); + memory_set_bankptr(machine, "bank2", address); } @@ -589,10 +589,10 @@ void redline_bankswitch(running_machine *machine) battery_ram_enable = ((alternate_bank & 3) == 1); address = &master_base[bank_list[alternate_bank & 3]]; - memory_set_bankptr(machine, 1, address); + memory_set_bankptr(machine, "bank1", address); address = battery_ram_enable ? battery_ram : &master_base[0xa000]; - memory_set_bankptr(machine, 2, address); + memory_set_bankptr(machine, "bank2", address); } @@ -610,10 +610,10 @@ void viper_bankswitch(running_machine *machine) logerror("%s:Master bank %02X out of range!\n", cpuexec_describe_context(machine), alternate_bank & 3); address = &master_base[bank_list[0]]; } - memory_set_bankptr(machine, 1, address); + memory_set_bankptr(machine, "bank1", address); address = battery_ram_enable ? battery_ram : &master_base[0xa000]; - memory_set_bankptr(machine, 2, address); + memory_set_bankptr(machine, "bank2", address); } @@ -631,10 +631,10 @@ void offroad_bankswitch(running_machine *machine) logerror("%s:Master bank %02X out of range!\n", cpuexec_describe_context(machine), alternate_bank & 7); address = &master_base[bank_list[0]]; } - memory_set_bankptr(machine, 1, address); + memory_set_bankptr(machine, "bank1", address); address = battery_ram_enable ? battery_ram : &master_base[0xa000]; - memory_set_bankptr(machine, 2, address); + memory_set_bankptr(machine, "bank2", address); } @@ -656,7 +656,7 @@ void ataxx_bankswitch(running_machine *machine) logerror("%s:Master bank %02X out of range!\n", cpuexec_describe_context(machine), master_bank & 15); address = &master_base[bank_list[0]]; } - memory_set_bankptr(machine, 1, address); + memory_set_bankptr(machine, "bank1", address); if (battery_ram_enable) address = battery_ram; @@ -664,7 +664,7 @@ void ataxx_bankswitch(running_machine *machine) address = &ataxx_qram[(master_bank & 0xc0) << 8]; else address = &master_base[0xa000]; - memory_set_bankptr(machine, 2, address); + memory_set_bankptr(machine, "bank2", address); wcol_enable = ((master_bank & 0x30) == 0x30); } @@ -1407,7 +1407,7 @@ WRITE8_HANDLER( leland_slave_small_banksw_w ) logerror("%04X:Slave bank %02X out of range!", cpu_get_pc(space->cpu), data & 1); bankaddress = 0x10000; } - memory_set_bankptr(space->machine, 3, &slave_base[bankaddress]); + memory_set_bankptr(space->machine, "bank3", &slave_base[bankaddress]); if (LOG_BANKSWITCHING_S) logerror("%04X:Slave bank = %02X (%05X)\n", cpu_get_pc(space->cpu), data & 1, bankaddress); } @@ -1422,7 +1422,7 @@ WRITE8_HANDLER( leland_slave_large_banksw_w ) logerror("%04X:Slave bank %02X out of range!", cpu_get_pc(space->cpu), data & 15); bankaddress = 0x10000; } - memory_set_bankptr(space->machine, 3, &slave_base[bankaddress]); + memory_set_bankptr(space->machine, "bank3", &slave_base[bankaddress]); if (LOG_BANKSWITCHING_S) logerror("%04X:Slave bank = %02X (%05X)\n", cpu_get_pc(space->cpu), data & 15, bankaddress); } @@ -1446,7 +1446,7 @@ WRITE8_HANDLER( ataxx_slave_banksw_w ) logerror("%04X:Slave bank %02X out of range!", cpu_get_pc(space->cpu), data & 0x3f); bankaddress = 0x2000; } - memory_set_bankptr(space->machine, 3, &slave_base[bankaddress]); + memory_set_bankptr(space->machine, "bank3", &slave_base[bankaddress]); if (LOG_BANKSWITCHING_S) logerror("%04X:Slave bank = %02X (%05X)\n", cpu_get_pc(space->cpu), data, bankaddress); } diff --git a/src/mame/machine/mc8123.c b/src/mame/machine/mc8123.c index 6651c89c5d9..64260862a3f 100644 --- a/src/mame/machine/mc8123.c +++ b/src/mame/machine/mc8123.c @@ -375,7 +375,7 @@ static UINT8 mc8123_decrypt(offs_t addr,UINT8 val,const UINT8 *key,int opcode) } -void mc8123_decrypt_rom(running_machine *machine, const char *cpu, const char *keyrgn, int banknum, int numbanks) +void mc8123_decrypt_rom(running_machine *machine, const char *cpu, const char *keyrgn, const char *bankname, int numbanks) { const address_space *space = cputag_get_address_space(machine, cpu, ADDRESS_SPACE_PROGRAM); int fixed_length = numbanks == 1 ? 0xc000 : 0x8000; @@ -398,9 +398,9 @@ void mc8123_decrypt_rom(running_machine *machine, const char *cpu, const char *k rom[A] = mc8123_decrypt(A,src,key,0); } - if (numbanks > 1) + if (bankname != NULL) { - memory_configure_bank_decrypted(machine, banknum, 0, numbanks, decrypted2, 0x4000); + memory_configure_bank_decrypted(machine, bankname, 0, numbanks, decrypted2, 0x4000); for (bank = 0; bank < numbanks; ++bank) { diff --git a/src/mame/machine/mc8123.h b/src/mame/machine/mc8123.h index 49beb5856e7..e8b27bd4577 100644 --- a/src/mame/machine/mc8123.h +++ b/src/mame/machine/mc8123.h @@ -2,4 +2,4 @@ // an arbitrary amount of banks at 8000-BFFF. // numbanks may be 0, meaning there is no ROM to decrypt at 8000-BFFF, // or 1, meaning 0000-BFFF will be decrypted as a single unit. -void mc8123_decrypt_rom(running_machine *machine, const char *cpu, const char *keyrgn, int banknum, int numbanks); +void mc8123_decrypt_rom(running_machine *machine, const char *cpu, const char *keyrgn, const char *bankname, int numbanks); diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c index 1decb0b2a59..651ef370f41 100644 --- a/src/mame/machine/mhavoc.c +++ b/src/mame/machine/mhavoc.c @@ -87,9 +87,9 @@ MACHINE_RESET( mhavoc ) const address_space *space = cputag_get_address_space(machine, "alpha", ADDRESS_SPACE_PROGRAM); has_gamma_cpu = (cputag_get_cpu(machine, "gamma") != NULL); - memory_configure_bank(machine, 1, 0, 1, mhavoc_zram0, 0); - memory_configure_bank(machine, 1, 1, 1, mhavoc_zram1, 0); - memory_configure_bank(machine, 2, 0, 4, memory_region(machine, "alpha") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 1, mhavoc_zram0, 0); + memory_configure_bank(machine, "bank1", 1, 1, mhavoc_zram1, 0); + memory_configure_bank(machine, "bank2", 0, 4, memory_region(machine, "alpha") + 0x10000, 0x2000); /* reset RAM/ROM banks to 0 */ mhavoc_ram_banksel_w(space, 0, 0); @@ -203,13 +203,13 @@ READ8_HANDLER( mhavoc_gamma_r ) WRITE8_HANDLER( mhavoc_ram_banksel_w ) { - memory_set_bank(space->machine, 1, data & 1); + memory_set_bank(space->machine, "bank1", data & 1); } WRITE8_HANDLER( mhavoc_rom_banksel_w ) { - memory_set_bank(space->machine, 2, data & 3); + memory_set_bank(space->machine, "bank2", data & 3); } diff --git a/src/mame/machine/midtunit.c b/src/mame/machine/midtunit.c index bd43c19ce6a..24504aec410 100644 --- a/src/mame/machine/midtunit.c +++ b/src/mame/machine/midtunit.c @@ -465,8 +465,8 @@ DRIVER_INIT( mktunit ) memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1b00000, 0x1b6ffff, 0, 0, mk_prot_r, mk_prot_w); /* sound chip protection (hidden RAM) */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfb9c, 0xfbc6, 0, 0, (read8_space_func)SMH_BANK(9), (write8_space_func)SMH_BANK(9)); - memory_set_bankptr(machine, 9, auto_alloc_array(machine, UINT8, 0x80)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfb9c, 0xfbc6, 0, 0, "bank9"); + memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80)); } DRIVER_INIT( mkturbo ) @@ -498,10 +498,10 @@ static void init_nbajam_common(running_machine *machine, int te_protection) /* sound chip protection (hidden RAM) */ if (!te_protection) - memory_install_readwrite8_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbaa, 0xfbd4, 0, 0, (read8_space_func)SMH_BANK(9), (write8_space_func)SMH_BANK(9)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbaa, 0xfbd4, 0, 0, "bank9"); else - memory_install_readwrite8_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbec, 0xfc16, 0, 0, (read8_space_func)SMH_BANK(9), (write8_space_func)SMH_BANK(9)); - memory_set_bankptr(machine, 9, auto_alloc_array(machine, UINT8, 0x80)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbec, 0xfc16, 0, 0, "bank9"); + memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80)); } DRIVER_INIT( nbajam ) @@ -526,8 +526,9 @@ DRIVER_INIT( jdreddp ) memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1b00000, 0x1bfffff, 0, 0, jdredd_prot_r, jdredd_prot_w); /* sound chip protection (hidden RAM) */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, (read8_space_func)SMH_BANK(7), (write8_space_func)SMH_BANK(9)); - memory_set_bankptr(machine, 9, auto_alloc_array(machine, UINT8, 0x80)); + memory_install_read_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, "bank7"); + memory_install_write_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, "bank9"); + memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80)); #if ENABLE_ALL_JDREDD_LEVELS /* how about the final levels? */ diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c index 3d2c6741cc8..c88d3cd9187 100644 --- a/src/mame/machine/midyunit.c +++ b/src/mame/machine/midyunit.c @@ -298,20 +298,20 @@ static void init_generic(running_machine *machine, int bpp, int sound, int prot_ case SOUND_CVSD: williams_cvsd_init(machine); - memory_install_readwrite8_handler(cputag_get_address_space(machine, "cvsdcpu", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, (read8_space_func)SMH_BANK(9), (write8_space_func)SMH_BANK(9)); - memory_set_bankptr(machine, 9, auto_alloc_array(machine, UINT8, 0x80)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cvsdcpu", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, "bank9"); + memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80)); break; case SOUND_ADPCM: williams_adpcm_init(machine); - memory_install_readwrite8_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, (read8_space_func)SMH_BANK(9), (write8_space_func)SMH_BANK(9)); - memory_set_bankptr(machine, 9, auto_alloc_array(machine, UINT8, 0x80)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "adpcm", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, "bank9"); + memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80)); break; case SOUND_NARC: williams_narc_init(machine); - memory_install_readwrite8_handler(cputag_get_address_space(machine, "narc1cpu", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, (read8_space_func)SMH_BANK(9), (write8_space_func)SMH_BANK(9)); - memory_set_bankptr(machine, 9, auto_alloc_array(machine, UINT8, 0x80)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "narc1cpu", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, "bank9"); + memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80)); break; case SOUND_YAWDIM: diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c index ae06122ec98..559871a4fb7 100644 --- a/src/mame/machine/namcos1.c +++ b/src/mame/machine/namcos1.c @@ -562,7 +562,7 @@ WRITE8_HANDLER( namcos1_sound_bankswitch_w ) UINT8 *rom = memory_region(space->machine, "audiocpu") + 0xc000; int bank = (data & 0x70) >> 4; - memory_set_bankptr(space->machine, 17,rom + 0x4000 * bank); + memory_set_bankptr(space->machine, "bank17",rom + 0x4000 * bank); } @@ -667,19 +667,21 @@ static WRITE8_HANDLER( unknown_w ) /* Main bankswitching routine */ static void set_bank(running_machine *machine, int banknum, const bankhandler *handler) { + static const char *const banktags[] ={ "bank1", "bank2", "bank3", "bank4", "bank5", "bank6", "bank7", "bank8", + "bank9", "bank10", "bank11", "bank12", "bank13", "bank14", "bank15", "bank16" }; static const char *const cputags[] = { "maincpu", "sub" }; const address_space *space = cputag_get_address_space(machine, cputags[(banknum >> 3) & 1], ADDRESS_SPACE_PROGRAM); int bankstart = (banknum & 7) * 0x2000; /* for BANK handlers , memory direct and OP-code base */ if (handler->bank_pointer) - memory_set_bankptr(machine, banknum + 1, handler->bank_pointer); + memory_set_bankptr(machine, banktags[banknum], handler->bank_pointer); /* read handlers */ if (!handler->bank_handler_r) { if (namcos1_active_bank[banknum].bank_handler_r) - memory_install_read8_handler(space, bankstart, bankstart + 0x1fff, 0, 0, (read8_space_func)SMH_BANK(banknum + 1)); + memory_install_read_bank_handler(space, bankstart, bankstart + 0x1fff, 0, 0, banktags[banknum]); } else { @@ -693,7 +695,7 @@ static void set_bank(running_machine *machine, int banknum, const bankhandler *h if (!handler->bank_handler_w) { if (namcos1_active_bank[banknum].bank_handler_w) - memory_install_write8_handler(space, bankstart, bankstart + 0x1fff, 0, 0, (write8_space_func)SMH_BANK(banknum + 1)); + memory_install_write_bank_handler(space, bankstart, bankstart + 0x1fff, 0, 0, banktags[banknum]); } else { @@ -909,7 +911,7 @@ WRITE8_HANDLER( namcos1_mcu_bankswitch_w ) /* bit 0-1 : address line A15-A16 */ addr += (data & 3) * 0x8000; - memory_set_bankptr(space->machine, 20, memory_region(space->machine, "mcu") + addr); + memory_set_bankptr(space->machine, "bank20", memory_region(space->machine, "mcu") + addr); } @@ -985,8 +987,8 @@ static void namcos1_driver_init( running_machine *machine, const struct namcos1_ state_save_register_global_pointer(machine, namcos1_paletteram, 0x8000); /* Point mcu & sound shared RAM to destination */ - memory_set_bankptr(machine, 18, namcos1_triram ); - memory_set_bankptr(machine, 19, namcos1_triram ); + memory_set_bankptr(machine, "bank18", namcos1_triram ); + memory_set_bankptr(machine, "bank19", namcos1_triram ); /* build bank elements */ namcos1_build_banks(machine,specific->key_r,specific->key_w); diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c index 69d7ff8a746..4dca207aa0a 100644 --- a/src/mame/machine/namcos2.c +++ b/src/mame/machine/namcos2.c @@ -726,7 +726,7 @@ WRITE8_HANDLER( namcos2_sound_bankselect_w ) UINT8 *RAM=memory_region(space->machine, "audiocpu"); UINT32 max = (memory_region_length(space->machine, "audiocpu") - 0x10000) / 0x4000; int bank = ( data >> 4 ) % max; /* 991104.CAB */ - memory_set_bankptr(space->machine, CPU3_ROM1, &RAM[ 0x10000 + ( 0x4000 * bank ) ] ); + memory_set_bankptr(space->machine, BANKED_SOUND_ROM, &RAM[ 0x10000 + ( 0x4000 * bank ) ] ); } /**************************************************************/ diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c index 5565421aea5..1316bce18dd 100644 --- a/src/mame/machine/playch10.c +++ b/src/mame/machine/playch10.c @@ -708,8 +708,8 @@ DRIVER_INIT( pcdboard ) DRIVER_INIT( pcdboard_2 ) { /* extra ram at $6000-$7fff */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x2000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" ); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000)); /* common init */ DRIVER_INIT_CALL(pcdboard); @@ -811,8 +811,8 @@ DRIVER_INIT( pceboard ) ppu_latch = mapper9_latch; /* nvram at $6000-$6fff */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x6fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x1000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x6fff, 0, 0, "bank1" ); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x1000)); /* common init */ DRIVER_INIT_CALL(playch10); @@ -846,8 +846,8 @@ DRIVER_INIT( pcfboard ) DRIVER_INIT( pcfboard_2 ) { /* extra ram at $6000-$6fff */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x6fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x1000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x6fff, 0, 0, "bank1" ); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x1000)); vram = NULL; @@ -1026,8 +1026,8 @@ DRIVER_INIT( pcgboard ) memory_install_write8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, gboard_rom_switch_w ); /* extra ram at $6000-$7fff */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x2000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" ); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000)); gboard_banks[0] = 0x1e; gboard_banks[1] = 0x1f; @@ -1144,8 +1144,8 @@ DRIVER_INIT( pchboard ) memory_install_write8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, hboard_rom_switch_w ); /* extra ram at $6000-$7fff */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x2000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" ); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000)); gboard_banks[0] = 0x1e; gboard_banks[1] = 0x1f; @@ -1172,8 +1172,8 @@ DRIVER_INIT( pckboard ) mmc1_rom_mask = 0x0f; /* extra ram at $6000-$7fff */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x2000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" ); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000)); /* Roms are banked at $8000 to $bfff */ memory_install_write8_handler(cputag_get_address_space(machine, "cart", ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w ); diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c index 488f36eb350..0668920be03 100644 --- a/src/mame/machine/qix.c +++ b/src/mame/machine/qix.c @@ -266,7 +266,7 @@ WRITE_LINE_DEVICE_HANDLER( qix_vsync_changed ) WRITE8_HANDLER( zookeep_bankswitch_w ) { - memory_set_bank(space->machine, 1, (data >> 2) & 1); + memory_set_bank(space->machine, "bank1", (data >> 2) & 1); /* not necessary, but technically correct */ qix_palettebank_w(space, offset, data); } diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c index af4ea907abb..08ac4ce4464 100644 --- a/src/mame/machine/scramble.c +++ b/src/mame/machine/scramble.c @@ -112,7 +112,7 @@ static void cavelon_banksw(running_machine *machine) to keep the CPU core happy at the boundaries */ cavelon_bank = !cavelon_bank; - memory_set_bank(machine, 1, cavelon_bank); + memory_set_bank(machine, "bank1", cavelon_bank); } static READ8_HANDLER( cavelon_banksw_r ) @@ -242,8 +242,9 @@ DRIVER_INIT( ckongs ) DRIVER_INIT( mariner ) { /* extra ROM */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5800, 0x67ff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_UNMAP); - memory_set_bankptr(machine, 1, memory_region(machine, "maincpu") + 0x5800); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5800, 0x67ff, 0, 0, "bank1"); + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5800, 0x67ff, 0, 0, (write8_space_func)SMH_UNMAP); + memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x5800); memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x9008, 0x9008, 0, 0, mariner_protection_2_r); memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xb401, 0xb401, 0, 0, mariner_protection_1_r); @@ -327,8 +328,8 @@ DRIVER_INIT( cavelon ) UINT8 *ROM = memory_region(machine, "maincpu"); /* banked ROM */ - memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_configure_bank(machine, 1, 0, 2, &ROM[0x00000], 0x10000); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1"); + memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x00000], 0x10000); cavelon_banksw(machine); /* A15 switches memory banks */ diff --git a/src/mame/machine/segacrpt.c b/src/mame/machine/segacrpt.c index 9143152eccf..3e16e038f3e 100644 --- a/src/mame/machine/segacrpt.c +++ b/src/mame/machine/segacrpt.c @@ -491,10 +491,10 @@ void toprollr_decode(running_machine *machine, const char *cputag, const char *r rom[A+bankstart] = (src & ~0xa8) | (convtable[2*row+1][col] ^ xorval); } - memory_configure_bank(machine, 1,0,3, memory_region(machine, regiontag),0x6000); - memory_configure_bank_decrypted(machine, 1,0,3,decrypted,0x6000); + memory_configure_bank(machine, "bank1",0,3, memory_region(machine, regiontag),0x6000); + memory_configure_bank_decrypted(machine, "bank1",0,3,decrypted,0x6000); memory_set_decrypted_region(space, 0x0000, 0x5fff, decrypted); - memory_set_bank(space->machine, 1, 0); + memory_set_bank(space->machine, "bank1", 0); } @@ -850,10 +850,10 @@ void jongkyo_decode(running_machine *machine, const char *cputag) rom[A] = (src & ~0xa8) | (convtable[2*row+1][col] ^ xorval); } - memory_configure_bank(machine, 1,0,8, memory_region(machine, cputag)+0x7000,0x0400); - memory_configure_bank_decrypted(machine, 1,0,8,decrypted+0x7000,0x0400); + memory_configure_bank(machine, "bank1",0,8, memory_region(machine, cputag)+0x7000,0x0400); + memory_configure_bank_decrypted(machine, "bank1",0,8,decrypted+0x7000,0x0400); memory_set_decrypted_region(space, 0x0000, 0x6bff, decrypted); - memory_set_bank(space->machine, 1, 0); + memory_set_bank(space->machine, "bank1", 0); } diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c index 39094931feb..0d967c87bde 100644 --- a/src/mame/machine/segaic16.c +++ b/src/mame/machine/segaic16.c @@ -174,23 +174,18 @@ void segaic16_memory_mapper_set_decrypted(running_machine *machine, UINT8 *decry offs_t region_size = region_size_map[chip->regs[rgn->regbase] & 3]; offs_t region_base = (chip->regs[rgn->regbase + 1] << 16) & ~region_size; offs_t region_start = region_base + (rgn->regoffs & region_size); - read16_space_func read = rgn->read; - int banknum = 0; + const char *readbank = rgn->readbank; /* skip non-ROM regions */ - if (read == NULL || rgn->romoffset == ~0) + if (readbank == NULL || rgn->romoffset == ~0) continue; - /* check for mapping to banks */ - if ((FPTR)read >= STATIC_BANK1 && (FPTR)read <= STATIC_BANKMAX) - banknum = ((FPTR)read - STATIC_BANK1) + 1; - /* skip any mappings beyond the ROM size */ if (region_start >= romsize) continue; - memory_configure_bank_decrypted(machine, banknum, 0, 1, decrypted + region_start, 0); - memory_set_bank(machine, banknum, 0); + memory_configure_bank_decrypted(machine, readbank, 0, 1, decrypted + region_start, 0); + memory_set_bank(machine, readbank, 0); } } @@ -343,15 +338,10 @@ static void update_memory_mapping(running_machine *machine, struct memory_mapper offs_t region_mirror = rgn->mirror & region_size; offs_t region_start = region_base + (rgn->regoffs & region_size); offs_t region_end = region_start + ((rgn->length - 1 < region_size) ? rgn->length - 1 : region_size); + const char *writebank = rgn->writebank; write16_space_func write = rgn->write; + const char *readbank = rgn->readbank; read16_space_func read = rgn->read; - int banknum = 0; - - /* check for mapping to banks */ - if ((FPTR)read >= STATIC_BANK1 && (FPTR)read <= STATIC_BANKMAX) - banknum = ((FPTR)read - STATIC_BANK1) + 1; - if ((FPTR)write >= STATIC_BANK1 && (FPTR)write <= STATIC_BANKMAX) - banknum = ((FPTR)write - STATIC_BANK1) + 1; /* ROM areas need extra clamping */ if (rgn->romoffset != ~0) @@ -364,18 +354,22 @@ static void update_memory_mapping(running_machine *machine, struct memory_mapper } /* map it */ - if (read) + if (read != NULL) memory_install_read16_handler(cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM), region_start, region_end, 0, region_mirror, read); - if (write) + else if (readbank != NULL) + memory_install_read_bank_handler(cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM), region_start, region_end, 0, region_mirror, readbank); + if (write != NULL) memory_install_write16_handler(cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM), region_start, region_end, 0, region_mirror, write); + else if (writebank != NULL) + memory_install_write_bank_handler(cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM), region_start, region_end, 0, region_mirror, writebank); /* set the bank pointer */ - if (banknum && read) + if (readbank != NULL) { - if (rgn->base) + if (rgn->base != NULL) { - memory_configure_bank(machine, banknum, 0, 1, *rgn->base, 0); - memory_set_bank(machine, banknum, 0); + memory_configure_bank(machine, readbank, 0, 1, *rgn->base, 0); + memory_set_bank(machine, readbank, 0); } else if (rgn->romoffset != ~0) { @@ -388,11 +382,11 @@ static void update_memory_mapping(running_machine *machine, struct memory_mapper decrypted = (UINT8 *)fd1089_get_decrypted_base(); } - memory_configure_bank(machine, banknum, 0, 1, (UINT8 *)chip->cpu->region + region_start, 0); + memory_configure_bank(machine, readbank, 0, 1, (UINT8 *)chip->cpu->region + region_start, 0); if (decrypted) - memory_configure_bank_decrypted(machine, banknum, 0, 1, decrypted + region_start, 0); + memory_configure_bank_decrypted(machine, readbank, 0, 1, decrypted + region_start, 0); - memory_set_bank(machine, banknum, 0); + memory_set_bank(machine, readbank, 0); } } diff --git a/src/mame/machine/segaic16.h b/src/mame/machine/segaic16.h index ff2a49ca340..8c60a77696e 100644 --- a/src/mame/machine/segaic16.h +++ b/src/mame/machine/segaic16.h @@ -17,7 +17,9 @@ struct _segaic16_memory_map_entry offs_t mirror; /* maximal mirror values (will be truncated) */ offs_t romoffset; /* offset within REGION_CPU0, or ~0 for independent entries */ read16_space_func read; /* read handler */ + const char * readbank; /* bank for reading */ write16_space_func write; /* write handler */ + const char * writebank; /* bank for writing */ UINT16 ** base; /* pointer to memory base */ const char * name; /* friendly name for debugging */ }; diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c index 16d2a085a18..213fbe8ebd2 100644 --- a/src/mame/machine/simpsons.c +++ b/src/mame/machine/simpsons.c @@ -116,7 +116,7 @@ READ8_DEVICE_HANDLER( simpsons_sound_r ) static KONAMI_SETLINES_CALLBACK( simpsons_banking ) { - memory_set_bank(device->machine, 1, lines & 0x3f); + memory_set_bank(device->machine, "bank1", lines & 0x3f); } MACHINE_RESET( simpsons ) @@ -132,12 +132,12 @@ MACHINE_RESET( simpsons ) simpsons_firq_enabled = 0; /* init the default banks */ - memory_configure_bank(machine, 1, 0, 64, memory_region(machine, "maincpu") + 0x10000, 0x2000); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 64, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_set_bank(machine, "bank1", 0); - memory_configure_bank(machine, 2, 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0); - memory_configure_bank(machine, 2, 2, 6, memory_region(machine, "audiocpu") + 0x10000, 0x4000); - memory_set_bank(machine, 2, 0); + memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0); + memory_configure_bank(machine, "bank2", 2, 6, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_set_bank(machine, "bank2", 0); simpsons_video_banking( machine, 0 ); } diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c index aea42196e1d..6da190443fc 100644 --- a/src/mame/machine/slapfght.c +++ b/src/mame/machine/slapfght.c @@ -82,14 +82,14 @@ WRITE8_HANDLER( slapfight_port_08_w ) { UINT8 *RAM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1,&RAM[0x10000]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x10000]); } WRITE8_HANDLER( slapfight_port_09_w ) { UINT8 *RAM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1,&RAM[0x14000]); + memory_set_bankptr(space->machine, "bank1",&RAM[0x14000]); } diff --git a/src/mame/machine/starwars.c b/src/mame/machine/starwars.c index 991bd19cbef..77670657f4a 100644 --- a/src/mame/machine/starwars.c +++ b/src/mame/machine/starwars.c @@ -101,9 +101,9 @@ WRITE8_HANDLER( starwars_out_w ) break; case 4: /* bank switch */ - memory_set_bank(space->machine, 1, (data >> 7) & 1); + memory_set_bank(space->machine, "bank1", (data >> 7) & 1); if (starwars_is_esb) - memory_set_bank(space->machine, 2, (data >> 7) & 1); + memory_set_bank(space->machine, "bank2", (data >> 7) & 1); break; case 5: /* reset PRNG */ break; diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c index df33b304db0..9d85639126b 100644 --- a/src/mame/machine/stfight.c +++ b/src/mame/machine/stfight.c @@ -113,7 +113,7 @@ static WRITE8_HANDLER( stfight_bank_w ) { UINT8 *ROM2 = memory_region(space->machine, "maincpu") + 0x10000; - memory_set_bankptr(space->machine, 1, &ROM2[data<<14] ); + memory_set_bankptr(space->machine, "bank1", &ROM2[data<<14] ); } /* diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c index 9fb26a642be..4af1c521b3d 100644 --- a/src/mame/machine/taitosj.c +++ b/src/mame/machine/taitosj.c @@ -26,8 +26,8 @@ static UINT32 address; MACHINE_START( taitosj ) { - memory_configure_bank(machine, 1, 0, 1, memory_region(machine, "maincpu") + 0x6000, 0); - memory_configure_bank(machine, 1, 1, 1, memory_region(machine, "maincpu") + 0x10000, 0); + memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "maincpu") + 0x6000, 0); + memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "maincpu") + 0x10000, 0); state_save_register_global(machine, fromz80); state_save_register_global(machine, toz80); @@ -64,8 +64,8 @@ WRITE8_HANDLER( taitosj_bankswitch_w ) { coin_lockout_global_w(space->machine, ~data & 1); - if(data & 0x80) memory_set_bank(space->machine, 1, 1); - else memory_set_bank(space->machine, 1, 0); + if(data & 0x80) memory_set_bank(space->machine, "bank1", 1); + else memory_set_bank(space->machine, "bank1", 0); } diff --git a/src/mame/machine/theglobp.c b/src/mame/machine/theglobp.c index 413ed1b39e0..0bf2d2a1c04 100644 --- a/src/mame/machine/theglobp.c +++ b/src/mame/machine/theglobp.c @@ -225,10 +225,10 @@ READ8_HANDLER( theglobp_decrypt_rom ) switch(counter) { - case 0x08: memory_set_bank (space->machine, 1, 0); break; - case 0x09: memory_set_bank (space->machine, 1, 1); break; - case 0x0A: memory_set_bank (space->machine, 1, 2); break; - case 0x0B: memory_set_bank (space->machine, 1, 3); break; + case 0x08: memory_set_bank (space->machine, "bank1", 0); break; + case 0x09: memory_set_bank (space->machine, "bank1", 1); break; + case 0x0A: memory_set_bank (space->machine, "bank1", 2); break; + case 0x0B: memory_set_bank (space->machine, "bank1", 3); break; default: logerror("Invalid counter = %02X\n",counter); break; @@ -252,8 +252,8 @@ MACHINE_RESET( theglobp ) /* The initial state of the counter is 0x0A */ counter = 0x0A; - memory_configure_bank(machine, 1, 0, 4, &RAM[0x10000], 0x4000); - memory_set_bank(machine, 1, 2); + memory_configure_bank(machine, "bank1", 0, 4, &RAM[0x10000], 0x4000); + memory_set_bank(machine, "bank1", 2); state_save_register_global(machine, counter); } diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c index 0ddefe86a15..12b8635928a 100644 --- a/src/mame/machine/tnzs.c +++ b/src/mame/machine/tnzs.c @@ -546,7 +546,7 @@ DRIVER_INIT( kabukiz ) UINT8 *SOUND = memory_region(machine, "audiocpu"); state->mcu_type = MCU_NONE_KABUKIZ; - memory_configure_bank(machine, 3, 0, 8, &SOUND[0x10000], 0x4000); + memory_configure_bank(machine, "bank3", 0, 8, &SOUND[0x10000], 0x4000); } DRIVER_INIT( insectx ) @@ -670,11 +670,11 @@ MACHINE_START( tnzs ) UINT8 *ROM = memory_region(machine, "maincpu"); UINT8 *SUB = memory_region(machine, "sub"); - memory_configure_bank(machine, 1, 0, 8, &ROM[0x10000], 0x4000); - memory_configure_bank(machine, 2, 0, 4, &SUB[0x10000], 0x2000); + memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank2", 0, 4, &SUB[0x10000], 0x2000); - memory_set_bank(machine, 1, 2); - memory_set_bank(machine, 2, 0); + memory_set_bank(machine, "bank1", 2); + memory_set_bank(machine, "bank2", 0); state->audiocpu = devtag_get_device(machine, "audiocpu"); state->mcu = devtag_get_device(machine, "mcu"); @@ -700,8 +700,8 @@ MACHINE_START( jpopnics ) UINT8 *ROM = memory_region(machine, "maincpu"); UINT8 *SUB = memory_region(machine, "sub"); - memory_configure_bank(machine, 1, 0, 8, &ROM[0x10000], 0x4000); - memory_configure_bank(machine, 2, 0, 4, &SUB[0x10000], 0x2000); + memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); + memory_configure_bank(machine, "bank2", 0, 4, &SUB[0x10000], 0x2000); state->mcu = NULL; @@ -720,7 +720,7 @@ WRITE8_HANDLER( tnzs_bankswitch_w ) cputag_set_input_line(space->machine, "sub", INPUT_LINE_RESET, ASSERT_LINE); /* bits 0-2 select RAM/ROM bank */ - memory_set_bank(space->machine, 1, data & 0x07); + memory_set_bank(space->machine, "bank1", data & 0x07); } WRITE8_HANDLER( tnzs_bankswitch1_w ) @@ -771,5 +771,5 @@ WRITE8_HANDLER( tnzs_bankswitch1_w ) } /* bits 0-1 select ROM bank */ - memory_set_bank(space->machine, 2, data & 0x03); + memory_set_bank(space->machine, "bank2", data & 0x03); } diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c index 34f5a0eccc7..701778265ef 100644 --- a/src/mame/machine/vsnes.c +++ b/src/mame/machine/vsnes.c @@ -281,6 +281,8 @@ MACHINE_RESET( vsdual ) MACHINE_START( vsnes ) { + const address_space *ppu1_space = cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM); + /* establish nametable ram */ nt_ram[0] = auto_alloc_array(machine, UINT8, 0x1000); /* set mirroring */ @@ -289,7 +291,7 @@ MACHINE_START( vsnes ) nt_page[0][2] = nt_ram[0] + 0x800; nt_page[0][3] = nt_ram[0] + 0xc00; - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, vsnes_nt0_r, vsnes_nt0_w); + memory_install_readwrite8_handler(ppu1_space, 0x2000, 0x3eff, 0, 0, vsnes_nt0_r, vsnes_nt0_w); vrom[0] = memory_region(machine, "gfx1"); @@ -298,20 +300,20 @@ MACHINE_START( vsnes ) /* DRIVER_INIT is called first - means we can handle this different for VRAM games! */ if (NULL != vrom[0]) { - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, (read8_space_func)SMH_BANK(2), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x0400, 0x07ff, 0, 0, (read8_space_func)SMH_BANK(3), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x0800, 0x0bff, 0, 0, (read8_space_func)SMH_BANK(4), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x0c00, 0x0fff, 0, 0, (read8_space_func)SMH_BANK(5), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x1000, 0x13ff, 0, 0, (read8_space_func)SMH_BANK(6), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x1400, 0x17ff, 0, 0, (read8_space_func)SMH_BANK(7), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x1800, 0x1bff, 0, 0, (read8_space_func)SMH_BANK(8), 0); - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x1c00, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(9), 0); + memory_install_read_bank_handler(ppu1_space, 0x0000, 0x03ff, 0, 0, "bank2"); + memory_install_read_bank_handler(ppu1_space, 0x0400, 0x07ff, 0, 0, "bank3"); + memory_install_read_bank_handler(ppu1_space, 0x0800, 0x0bff, 0, 0, "bank4"); + memory_install_read_bank_handler(ppu1_space, 0x0c00, 0x0fff, 0, 0, "bank5"); + memory_install_read_bank_handler(ppu1_space, 0x1000, 0x13ff, 0, 0, "bank6"); + memory_install_read_bank_handler(ppu1_space, 0x1400, 0x17ff, 0, 0, "bank7"); + memory_install_read_bank_handler(ppu1_space, 0x1800, 0x1bff, 0, 0, "bank8"); + memory_install_read_bank_handler(ppu1_space, 0x1c00, 0x1fff, 0, 0, "bank9"); v_set_videorom_bank(machine, 0, 8, 0, 8); } else { - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(2), (write8_space_func)SMH_BANK(2)); - memory_set_bankptr(machine, 2, vram); + memory_install_readwrite_bank_handler(ppu1_space, 0x0000, 0x1fff, 0, 0, "bank2"); + memory_set_bankptr(machine, "bank2", vram); } } @@ -342,11 +344,11 @@ MACHINE_START( vsdual ) memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, vsnes_nt0_r, vsnes_nt0_w); memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu2"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, vsnes_nt1_r, vsnes_nt1_w); // read only! - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(2), 0); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank2"); // read only! - memory_install_readwrite8_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu2"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, (read8_space_func)SMH_BANK(3), 0); - memory_set_bankptr(machine, 2, vrom[0]); - memory_set_bankptr(machine, 3, vrom[1]); + memory_install_read_bank_handler(cpu_get_address_space(cputag_get_cpu(machine, "ppu2"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank3"); + memory_set_bankptr(machine, "bank2", vrom[0]); + memory_set_bankptr(machine, "bank3", vrom[1]); } /************************************* @@ -412,17 +414,17 @@ static void v_set_mirroring( int ppu, int mirroring ) } +static const char * const banknames[] = { "bank2", "bank3", "bank4", "bank5", "bank6", "bank7", "bank8", "bank9" }; + static void v_set_videorom_bank( running_machine* machine, int start, int count, int bank, int bank_size_in_kb ) { - int i, j; + int i; int offset = bank * (bank_size_in_kb * 0x400); - /* automatically add 2 to all start values (because the PPU is bank 2) */ /* bank_size_in_kb is used to determine how large the "bank" parameter is */ /* count determines the size of the area mapped */ for (i = 0; i < count; i++, offset += 0x400) { - j = i + start + 2; - memory_set_bankptr(machine, j, vrom[0] + offset); + memory_set_bankptr(machine, banknames[i + start], vrom[0] + offset); } } @@ -493,8 +495,8 @@ DRIVER_INIT( suprmrio ) DRIVER_INIT_CALL(vsnormal); /* extra ram at $6000 is enabled with bit 1 of $4016 */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x2000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" ); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000)); /* now override the vidaccess callback */ /* we need to remap color tables */ @@ -1146,8 +1148,8 @@ DRIVER_INIT( MMC3 ) memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, mapper4_w ); /* extra ram at $6000-$7fff */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x2000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" ); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000)); /* common init */ init_vsnes(machine); @@ -1370,8 +1372,8 @@ DRIVER_INIT( bnglngby ) memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0231, 0x0231, 0, 0, set_bnglngby_irq_r, set_bnglngby_irq_w ); /* extra ram */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x2000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" ); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000)); ret = 0; @@ -1437,7 +1439,7 @@ static WRITE8_HANDLER( vstennis_vrom_banking ) const device_config *other_cpu = (space->cpu == cputag_get_cpu(space->machine, "maincpu")) ? cputag_get_cpu(space->machine, "sub") : cputag_get_cpu(space->machine, "maincpu"); /* switch vrom */ - (space->cpu == cputag_get_cpu(space->machine, "maincpu")) ? memory_set_bankptr(space->machine, 2, (data & 4) ? vrom[0] + 0x2000 : vrom[0]) : memory_set_bankptr(space->machine, 3, (data & 4) ? vrom[1] + 0x2000 : vrom[1]); + (space->cpu == cputag_get_cpu(space->machine, "maincpu")) ? memory_set_bankptr(space->machine, "bank2", (data & 4) ? vrom[0] + 0x2000 : vrom[0]) : memory_set_bankptr(space->machine, "bank3", (data & 4) ? vrom[1] + 0x2000 : vrom[1]); /* bit 1 ( data & 2 ) triggers irq on the other cpu */ cpu_set_input_line(other_cpu, 0, (data & 2) ? CLEAR_LINE : ASSERT_LINE); @@ -1458,10 +1460,10 @@ DRIVER_INIT( vstennis ) memory_install_write8_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x4016, 0x4016, 0, 0, vstennis_vrom_banking ); /* shared ram at $6000 */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_install_readwrite8_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" ); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" ); - memory_set_bankptr(machine, 1, &prg[0x6000]); + memory_set_bankptr(machine, "bank1", &prg[0x6000]); } /**********************************************************************/ @@ -1525,8 +1527,8 @@ DRIVER_INIT( btlecity ) DRIVER_INIT( vstetris ) { /* extra ram at $6000 is enabled with bit 1 of $4016 */ - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_BANK(1) ); - memory_set_bankptr(machine, 1, auto_alloc_array(machine, UINT8, 0x2000)); + memory_install_readwrite_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank1" ); + memory_set_bankptr(machine, "bank1", auto_alloc_array(machine, UINT8, 0x2000)); init_vsnes(machine); DRIVER_INIT_CALL(vsnormal); diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c index 7d90fcbe987..648a66c267b 100644 --- a/src/mame/machine/williams.c +++ b/src/mame/machine/williams.c @@ -391,8 +391,8 @@ MACHINE_RESET( williams ) MACHINE_RESET_CALL(williams_common); /* configure the memory bank */ - memory_configure_bank(machine, 1, 0, 1, williams_videoram, 0); - memory_configure_bank(machine, 1, 1, 1, memory_region(machine, "maincpu") + 0x10000, 0); + memory_configure_bank(machine, "bank1", 0, 1, williams_videoram, 0); + memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "maincpu") + 0x10000, 0); } @@ -463,8 +463,8 @@ MACHINE_RESET( williams2 ) const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); /* configure memory banks */ - memory_configure_bank(machine, 1, 0, 1, williams_videoram, 0); - memory_configure_bank(machine, 1, 1, 4, memory_region(machine, "maincpu") + 0x10000, 0x10000); + memory_configure_bank(machine, "bank1", 0, 1, williams_videoram, 0); + memory_configure_bank(machine, "bank1", 1, 4, memory_region(machine, "maincpu") + 0x10000, 0x10000); /* make sure our banking is reset */ williams2_bank_select_w(space, 0, 0); @@ -493,7 +493,7 @@ WRITE8_HANDLER( williams_vram_select_w ) { /* VRAM/ROM banking from bit 0 */ vram_bank = data & 0x01; - memory_set_bank(space->machine, 1, vram_bank); + memory_set_bank(space->machine, "bank1", vram_bank); /* cocktail flip from bit 1 */ williams_cocktail = data & 0x02; @@ -509,26 +509,27 @@ WRITE8_HANDLER( williams2_bank_select_w ) { /* page 0 is video ram */ case 0: - memory_install_read8_handler(space, 0x0000, 0x8fff, 0, 0, (read8_space_func)SMH_BANK(1)); - memory_install_write8_handler(space, 0x8000, 0x87ff, 0, 0, (write8_space_func)SMH_BANK(4)); - memory_set_bank(space->machine, 1, 0); - memory_set_bankptr(space->machine, 4, &williams_videoram[0x8000]); + memory_install_read_bank_handler(space, 0x0000, 0x8fff, 0, 0, "bank1"); + memory_install_write_bank_handler(space, 0x8000, 0x87ff, 0, 0, "bank4"); + memory_set_bank(space->machine, "bank1", 0); + memory_set_bankptr(space->machine, "bank4", &williams_videoram[0x8000]); break; /* pages 1 and 2 are ROM */ case 1: case 2: - memory_install_read8_handler(space, 0x0000, 0x8fff, 0, 0, (read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)(read8_space_func)SMH_BANK(1)); - memory_install_write8_handler(space, 0x8000, 0x87ff, 0, 0, (write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)(write8_space_func)SMH_BANK(4)); - memory_set_bank(space->machine, 1, 1 + ((vram_bank & 6) >> 1)); - memory_set_bankptr(space->machine, 4, &williams_videoram[0x8000]); + memory_install_read_bank_handler(space, 0x0000, 0x8fff, 0, 0, "bank1"); + memory_install_write_bank_handler(space, 0x8000, 0x87ff, 0, 0, "bank4"); + memory_set_bank(space->machine, "bank1", 1 + ((vram_bank & 6) >> 1)); + memory_set_bankptr(space->machine, "bank4", &williams_videoram[0x8000]); break; /* page 3 accesses palette RAM; the remaining areas are as if page 1 ROM was selected */ case 3: - memory_install_readwrite8_handler(space, 0x8000, 0x87ff, 0, 0, (read8_space_func)SMH_BANK(4), williams2_paletteram_w); - memory_set_bank(space->machine, 1, 1 + ((vram_bank & 4) >> 1)); - memory_set_bankptr(space->machine, 4, space->machine->generic.paletteram.v); + memory_install_read_bank_handler(space, 0x8000, 0x87ff, 0, 0, "bank4"); + memory_install_write8_handler(space, 0x8000, 0x87ff, 0, 0, williams2_paletteram_w); + memory_set_bank(space->machine, "bank1", 1 + ((vram_bank & 4) >> 1)); + memory_set_bankptr(space->machine, "bank4", space->machine->generic.paletteram.v); break; } } @@ -743,7 +744,7 @@ MACHINE_RESET( defender ) MACHINE_RESET_CALL(williams_common); /* configure the banking and make sure it is reset to 0 */ - memory_configure_bank(machine, 1, 0, 9, &memory_region(machine, "maincpu")[0x10000], 0x1000); + memory_configure_bank(machine, "bank1", 0, 9, &memory_region(machine, "maincpu")[0x10000], 0x1000); defender_bank_select_w(space, 0, 0); state_save_register_postload(machine, defender_postload, NULL); @@ -778,8 +779,9 @@ WRITE8_HANDLER( defender_bank_select_w ) case 7: case 8: case 9: - memory_install_readwrite8_handler(space, 0xc000, 0xcfff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_UNMAP); - memory_set_bank(space->machine, 1, vram_bank - 1); + memory_install_read_bank_handler(space, 0xc000, 0xcfff, 0, 0, "bank1"); + memory_install_write8_handler(space, 0xc000, 0xcfff, 0, 0, (write8_space_func)SMH_UNMAP); + memory_set_bank(space->machine, "bank1", vram_bank - 1); break; /* pages A-F are not connected */ @@ -837,11 +839,11 @@ MACHINE_RESET( blaster ) MACHINE_RESET_CALL(williams_common); /* banking is different for blaster */ - memory_configure_bank(machine, 1, 0, 1, williams_videoram, 0); - memory_configure_bank(machine, 1, 1, 16, memory_region(machine, "maincpu") + 0x18000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 1, williams_videoram, 0); + memory_configure_bank(machine, "bank1", 1, 16, memory_region(machine, "maincpu") + 0x18000, 0x4000); - memory_configure_bank(machine, 2, 0, 1, williams_videoram + 0x4000, 0); - memory_configure_bank(machine, 2, 1, 16, memory_region(machine, "maincpu") + 0x10000, 0x0000); + memory_configure_bank(machine, "bank2", 0, 1, williams_videoram + 0x4000, 0); + memory_configure_bank(machine, "bank2", 1, 16, memory_region(machine, "maincpu") + 0x10000, 0x0000); state_save_register_global(machine, blaster_bank); } @@ -849,8 +851,8 @@ MACHINE_RESET( blaster ) INLINE void update_blaster_banking(running_machine *machine) { - memory_set_bank(machine, 1, vram_bank * (blaster_bank + 1)); - memory_set_bank(machine, 2, vram_bank * (blaster_bank + 1)); + memory_set_bank(machine, "bank1", vram_bank * (blaster_bank + 1)); + memory_set_bank(machine, "bank2", vram_bank * (blaster_bank + 1)); } diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index b663f68b4fd..aeaab410015 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -137,7 +137,7 @@ WRITE8_HANDLER( c1943_colorram_w ) WRITE8_HANDLER( c1943_c804_w ) { _1943_state *state = (_1943_state *)space->machine->driver_data; - int bank, i; + int bank; /* bits 0 and 1 are coin counters */ coin_counter_w(space->machine, 0, data & 0x01); @@ -145,8 +145,10 @@ WRITE8_HANDLER( c1943_c804_w ) /* bits 2, 3 and 4 select the ROM bank */ bank = data & 0x1c; - for (i = 1; i < 5; i++) - memory_set_bank(space->machine, i, bank); + memory_set_bank(space->machine, "bank1", bank); + memory_set_bank(space->machine, "bank2", bank); + memory_set_bank(space->machine, "bank3", bank); + memory_set_bank(space->machine, "bank4", bank); /* bit 5 resets the sound CPU - we ignore it */ diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index 8f81232a275..b94ce96177d 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -201,7 +201,7 @@ WRITE8_HANDLER( appoooh_out_w ) { UINT8 *RAM = memory_region(space->machine, "maincpu"); - memory_set_bankptr(space->machine, 1,&RAM[data&0x40 ? 0x10000 : 0x0a000]); + memory_set_bankptr(space->machine, "bank1",&RAM[data&0x40 ? 0x10000 : 0x0a000]); } /* bit 7 unknown (used) */ diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c index 8723353d609..8d85fe247d2 100644 --- a/src/mame/video/bfm_adr2.c +++ b/src/mame/video/bfm_adr2.c @@ -188,9 +188,9 @@ VIDEO_RESET( adder2 ) { UINT8 *rom = memory_region(machine, "adder2"); - memory_configure_bank(machine, 2, 0, 4, &rom[0x00000], 0x08000); + memory_configure_bank(machine, "bank2", 0, 4, &rom[0x00000], 0x08000); - memory_set_bank(machine, 2,0&0x03); + memory_set_bank(machine, "bank2",0&0x03); } } @@ -323,7 +323,7 @@ static WRITE8_HANDLER( normal_ram_w ) static WRITE8_HANDLER( adder2_rom_page_w ) { - memory_set_bank(space->machine, 2,data&0x03); + memory_set_bank(space->machine, "bank2",data&0x03); } /////////////////////////////////////////////////////////////////////////// @@ -471,7 +471,7 @@ void adder2_decode_char_roms(running_machine *machine) ADDRESS_MAP_START( adder2_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITE(adder2_screen_page_w) // screen access/display select - AM_RANGE(0x0000, 0x7FFF) AM_READ(SMH_BANK(2)) // 8k paged ROM (4 pages) + AM_RANGE(0x0000, 0x7FFF) AM_ROMBANK("bank2") // 8k paged ROM (4 pages) AM_RANGE(0x8000, 0x917F) AM_READWRITE(screen_ram_r, screen_ram_w) AM_RANGE(0x9180, 0x9FFF) AM_READWRITE(normal_ram_r, normal_ram_w) diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index 9a0d8a5e1ae..b572c15f5aa 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -131,7 +131,7 @@ WRITE8_HANDLER( brkthru_1800_w ) else if (offset == 1) { /* bit 0-2 = ROM bank select */ - memory_set_bank(space->machine, 1, data & 0x07); + memory_set_bank(space->machine, "bank1", data & 0x07); /* bit 3-5 = background tiles color code */ if (((data & 0x38) >> 2) != state->bgbasecolor) diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index e722b9ef9b6..cb70bf6f7bf 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -82,7 +82,7 @@ WRITE8_HANDLER( chaknpop_gfxmode_w ) int all_dirty = 0; state->gfxmode = data; - memory_set_bank(space->machine, 1, (state->gfxmode & GFX_VRAM_BANK) ? 1 : 0); /* Select 2 banks of 16k */ + memory_set_bank(space->machine, "bank1", (state->gfxmode & GFX_VRAM_BANK) ? 1 : 0); /* Select 2 banks of 16k */ if (state->flip_x != (state->gfxmode & GFX_FLIP_X)) { @@ -178,7 +178,7 @@ VIDEO_START( chaknpop ) state_save_register_global_pointer(machine, state->vram3, 0x2000); state_save_register_global_pointer(machine, state->vram4, 0x2000); - memory_set_bank(machine, 1, 0); + memory_set_bank(machine, "bank1", 0); tx_tilemap_mark_all_dirty(machine); state_save_register_postload(machine, chaknpop_postload, NULL); diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c index 1c636356c49..12c69f90733 100644 --- a/src/mame/video/cloud9.c +++ b/src/mame/video/cloud9.c @@ -22,7 +22,7 @@ VIDEO_START( cloud9 ) /* allocate second bank of videoram */ state->videoram = auto_alloc_array(machine, UINT8, 0x8000); - memory_set_bankptr(machine, 1, state->videoram); + memory_set_bankptr(machine, "bank1", state->videoram); /* get pointers to our PROMs */ state->syncprom = memory_region(machine, "proms") + 0x000; diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index ef27d0b6c3e..e6ff7bad2a8 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -373,11 +373,11 @@ WRITE8_HANDLER( combasc_bankselect_w ) if (data & 0x10) { - memory_set_bankptr(space->machine, 1,page + 0x4000 * ((data & 0x0e) >> 1)); + memory_set_bankptr(space->machine, "bank1",page + 0x4000 * ((data & 0x0e) >> 1)); } else { - memory_set_bankptr(space->machine, 1,page + 0x20000 + 0x4000 * (data & 1)); + memory_set_bankptr(space->machine, "bank1",page + 0x20000 + 0x4000 * (data & 1)); } } @@ -402,16 +402,16 @@ WRITE8_HANDLER( combascb_bankselect_w ) if (data & 0x10) { - memory_set_bankptr(space->machine, 1,page + 0x4000 * ((data & 0x0e) >> 1)); + memory_set_bankptr(space->machine, "bank1",page + 0x4000 * ((data & 0x0e) >> 1)); } else { - memory_set_bankptr(space->machine, 1,page + 0x20000 + 0x4000 * (data & 1)); + memory_set_bankptr(space->machine, "bank1",page + 0x20000 + 0x4000 * (data & 1)); } if (data == 0x1f) { - memory_set_bankptr(space->machine, 1,page + 0x20000 + 0x4000 * (data & 1)); + memory_set_bankptr(space->machine, "bank1",page + 0x20000 + 0x4000 * (data & 1)); memory_install_read8_handler(space, 0x4400, 0x4403, 0, 0, combascb_io_r);/* IO RAM & Video Registers */ memory_install_write8_handler(space, 0x4400, 0x4400, 0, 0, combascb_priority_w); memory_install_write8_handler(space, 0x4800, 0x4800, 0, 0, combascb_sh_irqtrigger_w); @@ -419,7 +419,8 @@ WRITE8_HANDLER( combascb_bankselect_w ) } else { - memory_install_readwrite8_handler(space, 0x4000, 0x7fff, 0, 0, (read8_space_func)SMH_BANK(1), (write8_space_func)SMH_UNMAP); /* banked ROM */ + memory_install_read_bank_handler(space, 0x4000, 0x7fff, 0, 0, "bank1"); /* banked ROM */ + memory_install_write8_handler(space, 0x4000, 0x7fff, 0, 0, (write8_space_func)SMH_UNMAP); /* banked ROM */ } } } diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index fafbae48d5a..ea79ab8de5c 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -172,7 +172,7 @@ WRITE8_HANDLER( srdarwin_control_w ) switch (offset) { case 0: /* Top 3 bits - bank switch, bottom 4 - scroll MSB */ - memory_set_bank(space->machine, 1, (data >> 5)); + memory_set_bank(space->machine, "bank1", (data >> 5)); state->scroll2[0] = data & 0xf; return; @@ -193,7 +193,7 @@ WRITE8_HANDLER( lastmiss_control_w ) Bit 0x40 - Y scroll MSB Bit 0x80 - Hold subcpu reset line high if clear, else low */ - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); state->scroll2[0] = (data >> 5) & 1; state->scroll2[2] = (data >> 6) & 1; @@ -209,7 +209,7 @@ WRITE8_HANDLER( shackled_control_w ) dec8_state *state = (dec8_state *)space->machine->driver_data; /* Bottom 4 bits - bank switch, Bits 4 & 5 - Scroll MSBs */ - memory_set_bank(space->machine, 1, data & 0x0f); + memory_set_bank(space->machine, "bank1", data & 0x0f); state->scroll2[0] = (data >> 5) & 1; state->scroll2[2] = (data >> 6) & 1; diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index d42a1b6cc65..3de51db9e5f 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -163,7 +163,7 @@ WRITE8_HANDLER( pollux_ctrl_w ) WRITE8_HANDLER( primella_ctrl_w ) { /* bits 0-2 select ROM bank */ - memory_set_bank(space->machine, 1, data & 0x07); + memory_set_bank(space->machine, "bank1", data & 0x07); /* bit 3 disables tx layer */ tx_pri = data & 0x08; diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c index f5d7df1f6ee..ec930e11dd9 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -233,7 +233,7 @@ WRITE8_HANDLER( galivan_gfxbank_w ) tilemap_set_flip (state->tx_tilemap, state->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); /* bit 7 selects one of two ROM banks for c000-dfff */ - memory_set_bank(space->machine, 1, (data & 0x80) >> 7); + memory_set_bank(space->machine, "bank1", (data & 0x80) >> 7); /* logerror("Address: %04X - port 40 = %02x\n", cpu_get_pc(space->cpu), data); */ } @@ -275,7 +275,7 @@ WRITE8_HANDLER( ninjemak_gfxbank_w ) /* bit 5 sprite flag ??? */ /* bit 6, 7 ROM bank select */ - memory_set_bank(space->machine, 1, (data & 0xc0) >> 6); + memory_set_bank(space->machine, "bank1", (data & 0xc0) >> 6); #if 0 { diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index c46bf5407b8..249d5344cba 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -81,7 +81,7 @@ WRITE8_HANDLER( gunsmoke_c804_w ) coin_counter_w(space->machine, 0, data & 0x02); /* bits 2 and 3 select the ROM bank */ - memory_set_bank(space->machine, 1, (data & 0x0c) >> 2); + memory_set_bank(space->machine, "bank1", (data & 0x0c) >> 2); /* bit 5 resets the sound CPU? - we ignore it */ diff --git a/src/mame/video/hexa.c b/src/mame/video/hexa.c index f91054e9cab..f3b07361f6e 100644 --- a/src/mame/video/hexa.c +++ b/src/mame/video/hexa.c @@ -38,7 +38,7 @@ WRITE8_HANDLER( hexa_d008_w ) /* bit 2 - 3 unknown */ /* bit 4 could be the ROM bank selector for 8000-bfff (not sure) */ - memory_set_bank(space->machine, 1, ((data & 0x10) >> 4)); + memory_set_bank(space->machine, "bank1", ((data & 0x10) >> 4)); /* bit 5 = char bank */ if (state->charbank != ((data & 0x20) >> 5)) diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c index 468ee6c47fe..909746bc88d 100644 --- a/src/mame/video/hexion.c +++ b/src/mame/video/hexion.c @@ -68,7 +68,7 @@ WRITE8_HANDLER( hexion_bankswitch_w ) UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000; /* bits 0-3 select ROM bank */ - memory_set_bankptr(space->machine, 1,rom + 0x2000 * (data & 0x0f)); + memory_set_bankptr(space->machine, "bank1",rom + 0x2000 * (data & 0x0f)); /* does bit 6 trigger the 052591? */ if (data & 0x40) diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index fafe73271d9..21344946abe 100644 --- a/src/mame/video/homerun.c +++ b/src/mame/video/homerun.c @@ -15,7 +15,7 @@ WRITE8_DEVICE_HANDLER(homerun_banking_w) tilemap_mark_all_tiles_dirty(state->tilemap); data >>= 5; - memory_set_bank(device->machine, 1, data & 0x07); + memory_set_bank(device->machine, "bank1", data & 0x07); } WRITE8_HANDLER( homerun_videoram_w ) diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c index fc608d736d9..c361e750497 100644 --- a/src/mame/video/kangaroo.c +++ b/src/mame/video/kangaroo.c @@ -87,7 +87,7 @@ WRITE8_HANDLER( kangaroo_video_control_w ) break; case 8: /* bank select */ - memory_set_bank(space->machine, 1, (data & 0x05) ? 0 : 1); + memory_set_bank(space->machine, "bank1", (data & 0x05) ? 0 : 1); break; } } diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index 0257f7f1677..505bacd7a52 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -37,12 +37,12 @@ WRITE8_HANDLER( metlclsh_rambank_w ) if (data & 1) { metlclsh_write_mask = 0; - memory_set_bankptr(space->machine, 1, metlclsh_bgram); + memory_set_bankptr(space->machine, "bank1", metlclsh_bgram); } else { metlclsh_write_mask = 1 << (data >> 1); - memory_set_bankptr(space->machine, 1, metlclsh_otherram); + memory_set_bankptr(space->machine, "bank1", metlclsh_otherram); } } diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c index cd6586b5c68..2ed03c74568 100644 --- a/src/mame/video/mexico86.c +++ b/src/mame/video/mexico86.c @@ -14,7 +14,7 @@ WRITE8_HANDLER( mexico86_bankswitch_w ) if ((data & 7) > 5) popmessage( "Switching to invalid bank!" ); - memory_set_bankptr(space->machine, 1, &RAM[0x10000 + 0x4000 * (data & 0x07)]); + memory_set_bankptr(space->machine, "bank1", &RAM[0x10000 + 0x4000 * (data & 0x07)]); charbank = (data & 0x20) >> 5; } diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index 117ddf85abe..d60e5d1941b 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -72,12 +72,12 @@ WRITE8_HANDLER( mjkjidai_ctrl_w ) /* bits 6-7 select ROM bank */ if (data & 0xc0) { - memory_set_bankptr(space->machine, 1,rom + 0x10000-0x4000 + ((data & 0xc0) << 8)); + memory_set_bankptr(space->machine, "bank1",rom + 0x10000-0x4000 + ((data & 0xc0) << 8)); } else { /* there is code flowing from 7fff to this bank so they have to be contiguous in memory */ - memory_set_bankptr(space->machine, 1,rom + 0x08000); + memory_set_bankptr(space->machine, "bank1",rom + 0x08000); } } diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c index 844bf045f7f..6c6bfd55c27 100644 --- a/src/mame/video/pacland.c +++ b/src/mame/video/pacland.c @@ -261,7 +261,7 @@ WRITE8_HANDLER( pacland_bankswitch_w ) UINT8 *RAM = memory_region(space->machine, "maincpu"); bankaddress = 0x10000 + ((data & 0x07) << 13); - memory_set_bankptr(space->machine, 1,&RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); // pbc = data & 0x20; diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c index 70e298c057e..3d0d51e68ca 100644 --- a/src/mame/video/phoenix.c +++ b/src/mame/video/phoenix.c @@ -181,9 +181,9 @@ VIDEO_START( phoenix ) videoram_pg[0] = auto_alloc_array(machine, UINT8, 0x1000); videoram_pg[1] = auto_alloc_array(machine, UINT8, 0x1000); - memory_configure_bank(machine, 1, 0, 1, videoram_pg[0], 0); - memory_configure_bank(machine, 1, 1, 1, videoram_pg[1], 0); - memory_set_bank(machine, 1, 0); + memory_configure_bank(machine, "bank1", 0, 1, videoram_pg[0], 0); + memory_configure_bank(machine, "bank1", 1, 1, videoram_pg[1], 0); + memory_set_bank(machine, "bank1", 0); videoram_pg_index = 0; palette_bank = 0; @@ -252,7 +252,7 @@ WRITE8_HANDLER( phoenix_videoreg_w ) { /* set memory bank */ videoram_pg_index = data & 1; - memory_set_bank(space->machine, 1, videoram_pg_index); + memory_set_bank(space->machine, "bank1", videoram_pg_index); cocktail_mode = videoram_pg_index && (input_port_read(space->machine, "CAB") & 0x01); @@ -275,7 +275,7 @@ WRITE8_HANDLER( pleiads_videoreg_w ) { /* set memory bank */ videoram_pg_index = data & 1; - memory_set_bank(space->machine, 1, videoram_pg_index); + memory_set_bank(space->machine, "bank1", videoram_pg_index); cocktail_mode = videoram_pg_index && (input_port_read(space->machine, "CAB") & 0x01); diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c index ddac9968ac1..d12be1368b4 100644 --- a/src/mame/video/qix.c +++ b/src/mame/video/qix.c @@ -395,7 +395,7 @@ static ADDRESS_MAP_START( zookeep_video_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9800, 0x9800) AM_MIRROR(0x03ff) AM_READ(SMH_RAM) AM_BASE_MEMBER(qix_state, scanline_latch) AM_RANGE(0x9c00, 0x9c00) AM_MIRROR(0x03fe) AM_DEVWRITE("vid_u18", mc6845_address_w) AM_RANGE(0x9c01, 0x9c01) AM_MIRROR(0x03fe) AM_DEVREADWRITE("vid_u18", mc6845_register_r, mc6845_register_w) - AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index de20632a093..3d70a9e13e5 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -20,7 +20,7 @@ WRITE8_HANDLER( sichuan2_bankswitch_w ) /* bits 0-2 select ROM bank */ bankaddress = 0x10000 + (data & 0x07) * 0x4000; - memory_set_bankptr(space->machine, 1, &RAM[bankaddress]); + memory_set_bankptr(space->machine, "bank1", &RAM[bankaddress]); /* bits 3-5 select gfx bank */ bank = (data & 0x38) >> 3; diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c index c68d6b299d0..eb92519b91c 100644 --- a/src/mame/video/simpsons.c +++ b/src/mame/video/simpsons.c @@ -105,8 +105,9 @@ void simpsons_video_banking(running_machine *machine, int bank) { if (bank & 1) { - memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x0fff, 0, 0, (read8_space_func)SMH_BANK(5), paletteram_xBBBBBGGGGGRRRRR_be_w); - memory_set_bankptr(machine, 5, machine->generic.paletteram.v); + memory_install_read_bank_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x0fff, 0, 0, "bank5"); + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x0fff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w); + memory_set_bankptr(machine, "bank5", machine->generic.paletteram.v); } else memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x0fff, 0, 0, K052109_r, K052109_w); diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c index beee6dacc60..217f8c494bb 100644 --- a/src/mame/video/spdodgeb.c +++ b/src/mame/video/spdodgeb.c @@ -121,7 +121,7 @@ WRITE8_HANDLER( spdodgeb_ctrl_w ) flip_screen_set(space->machine, data & 0x01); /* bit 1 = ROM bank switch */ - memory_set_bankptr(space->machine, 1,rom + 0x10000 + 0x4000 * ((~data & 0x02) >> 1)); + memory_set_bankptr(space->machine, "bank1",rom + 0x10000 + 0x4000 * ((~data & 0x02) >> 1)); /* bit 2 = scroll high bit */ lastscroll = (lastscroll & 0x0ff) | ((data & 0x04) << 6); diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c index 6fd4868b779..85071f0d05b 100644 --- a/src/mame/video/superqix.c +++ b/src/mame/video/superqix.c @@ -135,7 +135,7 @@ WRITE8_HANDLER( pbillian_0410_w ) coin_counter_w(space->machine, 0,data & 0x02); coin_counter_w(space->machine, 1,data & 0x04); - memory_set_bank(space->machine, 1, (data & 0x08) >> 3); + memory_set_bank(space->machine, "bank1", (data & 0x08) >> 3); interrupt_enable_w(space,0,data & 0x10); flip_screen_set(space->machine, data & 0x20); @@ -157,7 +157,7 @@ WRITE8_HANDLER( superqix_0410_w ) interrupt_enable_w(space,offset,data & 0x08); /* bits 4-5 control ROM bank */ - memory_set_bank(space->machine, 1, (data & 0x30) >> 4); + memory_set_bank(space->machine, "bank1", (data & 0x30) >> 4); }