diff --git a/src/emu/cheat.c b/src/emu/cheat.c index e807f3cdeb7..f45d9ebcc89 100644 --- a/src/emu/cheat.c +++ b/src/emu/cheat.c @@ -8939,7 +8939,7 @@ static UINT8 DefaultEnableRegion(running_machine *machine, SearchRegion * region } #endif - if( (handler == MWA8_RAM) && (!region->writeHandler->baseptr)) + if( (handler == SMH_RAM) && (!region->writeHandler->baseptr)) return 1; #ifndef MESS @@ -8947,7 +8947,7 @@ static UINT8 DefaultEnableRegion(running_machine *machine, SearchRegion * region { /* ----- for neogeo, search bank one ----- */ if( (!strcmp(machine->gamedrv->parent, "neogeo")) && (info->targetType == kRegionType_CPU) && - (info->targetIdx == 0) && (handler == MWA8_BANK1)) + (info->targetIdx == 0) && (handler == SMH_BANK1)) return 1; } @@ -8957,28 +8957,28 @@ static UINT8 DefaultEnableRegion(running_machine *machine, SearchRegion * region /* ----- for exterminator, search bank one ----- */ if( (machine->config->cpu[1].type == CPU_TMS34010) && (info->targetType == kRegionType_CPU) && - (info->targetIdx == 1) && (handler == MWA8_BANK1)) + (info->targetIdx == 1) && (handler == SMH_BANK1)) return 1; /* ----- for smashtv, search bank two ----- */ if( (machine->config->cpu[0].type == CPU_TMS34010) && (info->targetType == kRegionType_CPU) && - (info->targetIdx == 0) && (handler == MWA8_BANK2)) + (info->targetIdx == 0) && (handler == SMH_BANK2)) return 1; #endif return 0; case kSearchSpeed_Medium: - if( (handlerAddress >= ((FPTR)MWA8_BANK1)) && (handlerAddress <= ((FPTR)MWA8_BANK24))) + if( (handlerAddress >= ((FPTR)SMH_BANK1)) && (handlerAddress <= ((FPTR)SMH_BANK24))) return 1; - if(handler == MWA8_RAM) + if(handler == SMH_RAM) return 1; return 0; case kSearchSpeed_Slow: - if( (handler == MWA8_NOP) || (handler == MWA8_ROM)) + if( (handler == SMH_NOP) || (handler == SMH_ROM)) return 0; if( (handlerAddress > STATIC_COUNT) && (!region->writeHandler->baseptr)) @@ -8987,7 +8987,7 @@ static UINT8 DefaultEnableRegion(running_machine *machine, SearchRegion * region return 1; case kSearchSpeed_VerySlow: - if( (handler == MWA8_NOP) || (handler == MWA8_ROM)) + if( (handler == SMH_NOP) || (handler == SMH_ROM)) return 0; return 1; @@ -9013,15 +9013,15 @@ static void SetSearchRegionDefaultName(SearchRegion * region) genf * handler = region->writeHandler->write.handler; FPTR handlerAddress = (FPTR)handler; - if( (handlerAddress >= ((FPTR)MWA8_BANK1)) && (handlerAddress <= ((FPTR)MWA8_BANK24))) - sprintf(desc, "BANK%.2d", (int)(handlerAddress - (FPTR)MWA8_BANK1) + 1); + if( (handlerAddress >= ((FPTR)SMH_BANK1)) && (handlerAddress <= ((FPTR)SMH_BANK24))) + sprintf(desc, "BANK%.2d", (int)(handlerAddress - (FPTR)SMH_BANK1) + 1); else { switch(handlerAddress) { - case (FPTR)MWA8_NOP: strcpy(desc, "NOP "); break; - case (FPTR)MWA8_RAM: strcpy(desc, "RAM "); break; - case (FPTR)MWA8_ROM: strcpy(desc, "ROM "); break; + case (FPTR)SMH_NOP: strcpy(desc, "NOP "); break; + case (FPTR)SMH_RAM: strcpy(desc, "RAM "); break; + case (FPTR)SMH_ROM: strcpy(desc, "ROM "); break; default: strcpy(desc, "CUSTOM"); break; } } diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c index d89cd68cf73..59881ba94d4 100644 --- a/src/emu/cpu/tms7000/tms7000.c +++ b/src/emu/cpu/tms7000/tms7000.c @@ -156,7 +156,7 @@ static WRITE8_HANDLER( tms70x0_pf_w ); static ADDRESS_MAP_START(tms7000_mem, ADDRESS_SPACE_PROGRAM, 8) AM_RANGE(0x0000, 0x007f) AM_READWRITE(tms7000_internal_r, tms7000_internal_w) /* tms7000 internal RAM */ - AM_RANGE(0x0080, 0x00ff) AM_READWRITE(MRA8_NOP, MWA8_NOP) /* reserved */ + AM_RANGE(0x0080, 0x00ff) AM_READWRITE(SMH_NOP, SMH_NOP) /* reserved */ AM_RANGE(0x0100, 0x01ff) AM_READWRITE(tms70x0_pf_r, tms70x0_pf_w) /* tms7000 internal I/O ports */ ADDRESS_MAP_END diff --git a/src/emu/inptport.c b/src/emu/inptport.c index 25f65786080..acf1f862fa7 100644 --- a/src/emu/inptport.c +++ b/src/emu/inptport.c @@ -2578,27 +2578,27 @@ int port_tag_to_index(const char *tag) read8_machine_func port_tag_to_handler8(const char *tag) { int port = port_tag_to_index(tag); - return (port == -1) ? MRA8_NOP : port_handler8[port]; + return (port == -1) ? SMH_NOP : port_handler8[port]; } read16_machine_func port_tag_to_handler16(const char *tag) { int port = port_tag_to_index(tag); - return (port == -1) ? MRA16_NOP : port_handler16[port]; + return (port == -1) ? SMH_NOP : port_handler16[port]; } read32_machine_func port_tag_to_handler32(const char *tag) { int port = port_tag_to_index(tag); - return (port == -1) ? MRA32_NOP : port_handler32[port]; + return (port == -1) ? SMH_NOP : port_handler32[port]; } read64_machine_func port_tag_to_handler64(const char *tag) { - return MRA64_NOP; + return SMH_NOP; } diff --git a/src/emu/memory.c b/src/emu/memory.c index 1ceddead63c..8e60898b85f 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -7,6 +7,30 @@ Copyright Nicola Salmoria and the MAME Team. Visit http://mamedev.org for licensing and usage restrictions. +**************************************************************************** + + Basic theory of memory handling: + + An address with up to 32 bits is passed to a memory handler. First, + an address mask is applied to the address, removing unused bits. + + Next, the address is broken into two halves, an upper half and a + lower half. The number of bits in each half can be controlled via + macros in memory.h, but they default to the upper 18 bits and the + lower 14 bits. The upper half is then used as an index into the + base_lookup table. + + If the value pulled from the table is within the range 192-255, then + the lower half of the address is needed to resolve the final handler. + The value from the table (192-255) is combined with the lower address + bits to form an index into a subtable. + + Table values in the range 0-63 are reserved for internal handling + (such as RAM, ROM, NOP, and banking). Table values between 64 and 192 + are assigned dynamically at startup. + +**************************************************************************** + Caveats: * If your driver executes an opcode which crosses a bank-switched @@ -98,30 +122,31 @@ #define VPRINTF(x) do { if (VERBOSE) mame_printf_debug x; } while (0) +/* ----- banking constants ----- */ -/*************************************************************************** +#define MAX_BANKS 66 /* maximum number of banks */ +#define MAX_BANK_ENTRIES 256 /* maximum number of possible bank values */ +#define MAX_EXPLICIT_BANKS 32 /* maximum number of explicitly-defined banks */ - Basic theory of memory handling: +/* ----- address map lookup table definitions ----- */ +#define SUBTABLE_COUNT 64 /* number of slots reserved for subtables */ +#define SUBTABLE_BASE (256-SUBTABLE_COUNT) /* first index of a subtable */ +#define ENTRY_COUNT (SUBTABLE_BASE) /* number of legitimate (non-subtable) entries */ +#define SUBTABLE_ALLOC 8 /* number of subtables to allocate at a time */ - An address with up to 32 bits is passed to a memory handler. First, - an address mask is applied to the address, removing unused bits. +/* ----- bit counts ----- */ +#define LEVEL1_BITS 18 /* number of address bits in the level 1 table */ +#define LEVEL2_BITS (32 - LEVEL1_BITS) /* number of address bits in the level 2 table */ - Next, the address is broken into two halves, an upper half and a - lower half. The number of bits in each half can be controlled via - macros in memory.h, but they default to the upper 18 bits and the - lower 14 bits. The upper half is then used as an index into the - base_lookup table. +/* ----- other address map constants ----- */ +#define MAX_MEMORY_BLOCKS 1024 /* maximum memory blocks we can track */ +#define MAX_SHARED_POINTERS 256 /* maximum number of shared pointers in memory maps */ +#define MEMORY_BLOCK_SIZE 65536 /* size of allocated memory blocks */ - If the value pulled from the table is within the range 192-255, then - the lower half of the address is needed to resolve the final handler. - The value from the table (192-255) is combined with the lower address - bits to form an index into a subtable. +/* ----- table lookup helpers ----- */ +#define LEVEL1_INDEX(a) ((a) >> LEVEL2_BITS) +#define LEVEL2_INDEX(e,a) ((1 << LEVEL1_BITS) + (((e) - SUBTABLE_BASE) << LEVEL2_BITS) + ((a) & ((1 << LEVEL2_BITS) - 1))) - Table values in the range 0-63 are reserved for internal handling - (such as RAM, ROM, NOP, and banking). Table values between 64 and 192 - are assigned dynamically at startup. - -***************************************************************************/ /* macros for the profiler */ #define MEMREADSTART() do { profiler_mark(PROFILER_MEMREAD); } while (0) @@ -1583,7 +1608,7 @@ static void install_mem_handler_private(addrspace_data *space, int iswrite, int { /* translate ROM to RAM/UNMAP here */ if (HANDLER_IS_ROM(handler)) - handler = iswrite ? (genf *)STATIC_UNMAP : (genf *)MRA8_RAM; + handler = iswrite ? (genf *)STATIC_UNMAP : (genf *)SMH_RAM; /* assign banks for RAM/ROM areas */ if (HANDLER_IS_RAM(handler)) diff --git a/src/emu/memory.h b/src/emu/memory.h index 957a14c470f..3a94e752a01 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -128,396 +128,63 @@ struct _data_accessors declared within each driver. ***************************************************************************/ -/* ----- definitions for the extended flags in the address maps ----- */ -#define AMEF_SPECIFIES_SPACE 0x00000001 /* set if the address space is specified */ -#define AMEF_SPECIFIES_ABITS 0x00000002 /* set if the number of address space bits is specified */ -#define AMEF_SPECIFIES_DBITS 0x00000004 /* set if the databus width is specified */ -#define AMEF_SPECIFIES_UNMAP 0x00000008 /* set if the unmap value is specified */ - -/* ----- definitions for specifying the address space in the extended flags ----- */ -#define AMEF_SPACE_SHIFT 8 /* shift to get at the address space */ -#define AMEF_SPACE_MASK (0x0f << AMEF_SPACE_SHIFT) /* mask to get at the address space */ -#define AMEF_SPACE(x) (((x) << AMEF_SPACE_SHIFT) | AMEF_SPECIFIES_SPACE) /* specifies a given address space */ - -/* ----- definitions for specifying the address bus width in the extended flags ----- */ -#define AMEF_ABITS_SHIFT 12 /* shift to get the address bits count */ -#define AMEF_ABITS_MASK (0x3f << AMEF_ABITS_SHIFT) /* mask to get at the address bits count */ -#define AMEF_ABITS(n) (((n) << AMEF_ABITS_SHIFT) | AMEF_SPECIFIES_ABITS) /* specifies a given number of address */ - -/* ----- definitions for specifying the data bus width in the extended flags ----- */ -#define AMEF_DBITS_SHIFT 18 /* shift to get the data bits count */ -#define AMEF_DBITS_MASK (0x07 << AMEF_DBITS_SHIFT) /* mask to get at the data bits count */ -#define AMEF_DBITS(n) ((((n)/8-1) << AMEF_DBITS_SHIFT) | AMEF_SPECIFIES_DBITS) /* specifies a given data bus width */ - -/* ----- definitions for specifying the unmap value in the extended flags ----- */ -#define AMEF_UNMAP_SHIFT 21 /* shift to get the unmap value */ -#define AMEF_UNMAP_MASK (1 << AMEF_UNMAP_SHIFT) /* mask to get at the unmap value */ -#define AMEF_UNMAP(x) (((x) << AMEF_UNMAP_SHIFT) | AMEF_SPECIFIES_UNMAP) /* specifies a given unmap value */ - /* ----- static data access handler constants ----- */ enum { STATIC_INVALID = 0, /* invalid - should never be used */ - STATIC_BANK1, /* banked memory */ - STATIC_BANK2, - STATIC_BANK3, - STATIC_BANK4, - STATIC_BANK5, - STATIC_BANK6, - STATIC_BANK7, - STATIC_BANK8, - STATIC_BANK9, - STATIC_BANK10, - STATIC_BANK11, - STATIC_BANK12, - STATIC_BANK13, - STATIC_BANK14, - STATIC_BANK15, - STATIC_BANK16, - STATIC_BANK17, - STATIC_BANK18, - STATIC_BANK19, - STATIC_BANK20, - STATIC_BANK21, - STATIC_BANK22, - STATIC_BANK23, - STATIC_BANK24, - STATIC_BANK25, - STATIC_BANK26, - STATIC_BANK27, - STATIC_BANK28, - STATIC_BANK29, - STATIC_BANK30, - STATIC_BANK31, - STATIC_BANK32, -/* entries 33-67 are reserved for dynamically allocated internal banks */ + STATIC_BANK1 = 1, /* banked memory */ + /* entries 1-32 are for fixed banks specified by the driver */ + /* entries 33-67 are for dynamically allocated internal banks */ STATIC_RAM = 68, /* RAM - standard reads/writes */ - STATIC_ROM, /* ROM - standard reads, no writes */ - STATIC_NOP, + STATIC_ROM, /* ROM - standard reads, no writes */ + STATIC_NOP, /* NOP - reads return unmapped value; writes do nothing */ STATIC_UNMAP, /* unmapped - all unmapped memory goes here */ STATIC_COUNT /* total number of static handlers */ }; /* ----- banking constants ----- */ -#define MAX_BANKS 66 /* maximum number of banks */ -#define MAX_BANK_ENTRIES 256 /* maximum number of possible bank values */ -#define MAX_EXPLICIT_BANKS 32 /* maximum number of explicitly-defined banks */ #define STATIC_BANKMAX (STATIC_RAM - 1) /* handler constant of last bank */ +/* SMH_* macros are Static Memory Handler definitions with + pre-cast versions of the STATIC_* functions */ +#define SMH_RAM ((void *)STATIC_RAM) +#define SMH_ROM ((void *)STATIC_ROM) +#define SMH_NOP ((void *)STATIC_NOP) +#define SMH_UNMAP ((void *)STATIC_UNMAP) +#define SMH_BANK(n) ((void *)(STATIC_BANK1 + (n) - 1)) - -/*************************************************************************** - STATIC ENTRY CONSTANTS -**************************************************************************** - The first 32 entries in the address lookup table are reserved for - "static" handlers. These are internal handlers for RAM, ROM, banks, - and unmapped areas in the address space. The following definitions - are the properly-casted versions of the STATIC_ constants above. -***************************************************************************/ - -/* 8-bit reads */ -#define MRA8_BANK1 ((read8_machine_func)STATIC_BANK1) -#define MRA8_BANK2 ((read8_machine_func)STATIC_BANK2) -#define MRA8_BANK3 ((read8_machine_func)STATIC_BANK3) -#define MRA8_BANK4 ((read8_machine_func)STATIC_BANK4) -#define MRA8_BANK5 ((read8_machine_func)STATIC_BANK5) -#define MRA8_BANK6 ((read8_machine_func)STATIC_BANK6) -#define MRA8_BANK7 ((read8_machine_func)STATIC_BANK7) -#define MRA8_BANK8 ((read8_machine_func)STATIC_BANK8) -#define MRA8_BANK9 ((read8_machine_func)STATIC_BANK9) -#define MRA8_BANK10 ((read8_machine_func)STATIC_BANK10) -#define MRA8_BANK11 ((read8_machine_func)STATIC_BANK11) -#define MRA8_BANK12 ((read8_machine_func)STATIC_BANK12) -#define MRA8_BANK13 ((read8_machine_func)STATIC_BANK13) -#define MRA8_BANK14 ((read8_machine_func)STATIC_BANK14) -#define MRA8_BANK15 ((read8_machine_func)STATIC_BANK15) -#define MRA8_BANK16 ((read8_machine_func)STATIC_BANK16) -#define MRA8_BANK17 ((read8_machine_func)STATIC_BANK17) -#define MRA8_BANK18 ((read8_machine_func)STATIC_BANK18) -#define MRA8_BANK19 ((read8_machine_func)STATIC_BANK19) -#define MRA8_BANK20 ((read8_machine_func)STATIC_BANK20) -#define MRA8_BANK21 ((read8_machine_func)STATIC_BANK21) -#define MRA8_BANK22 ((read8_machine_func)STATIC_BANK22) -#define MRA8_BANK23 ((read8_machine_func)STATIC_BANK23) -#define MRA8_BANK24 ((read8_machine_func)STATIC_BANK24) -#define MRA8_BANK25 ((read8_machine_func)STATIC_BANK25) -#define MRA8_BANK26 ((read8_machine_func)STATIC_BANK26) -#define MRA8_BANK27 ((read8_machine_func)STATIC_BANK27) -#define MRA8_BANK28 ((read8_machine_func)STATIC_BANK28) -#define MRA8_BANK29 ((read8_machine_func)STATIC_BANK29) -#define MRA8_BANK30 ((read8_machine_func)STATIC_BANK30) -#define MRA8_BANK31 ((read8_machine_func)STATIC_BANK31) -#define MRA8_BANK32 ((read8_machine_func)STATIC_BANK32) -#define MRA8_RAM ((read8_machine_func)STATIC_RAM) -#define MRA8_ROM ((read8_machine_func)STATIC_ROM) -#define MRA8_NOP ((read8_machine_func)STATIC_NOP) -#define MRA8_UNMAP ((read8_machine_func)STATIC_UNMAP) - -/* 8-bit writes */ -#define MWA8_BANK1 ((write8_machine_func)STATIC_BANK1) -#define MWA8_BANK2 ((write8_machine_func)STATIC_BANK2) -#define MWA8_BANK3 ((write8_machine_func)STATIC_BANK3) -#define MWA8_BANK4 ((write8_machine_func)STATIC_BANK4) -#define MWA8_BANK5 ((write8_machine_func)STATIC_BANK5) -#define MWA8_BANK6 ((write8_machine_func)STATIC_BANK6) -#define MWA8_BANK7 ((write8_machine_func)STATIC_BANK7) -#define MWA8_BANK8 ((write8_machine_func)STATIC_BANK8) -#define MWA8_BANK9 ((write8_machine_func)STATIC_BANK9) -#define MWA8_BANK10 ((write8_machine_func)STATIC_BANK10) -#define MWA8_BANK11 ((write8_machine_func)STATIC_BANK11) -#define MWA8_BANK12 ((write8_machine_func)STATIC_BANK12) -#define MWA8_BANK13 ((write8_machine_func)STATIC_BANK13) -#define MWA8_BANK14 ((write8_machine_func)STATIC_BANK14) -#define MWA8_BANK15 ((write8_machine_func)STATIC_BANK15) -#define MWA8_BANK16 ((write8_machine_func)STATIC_BANK16) -#define MWA8_BANK17 ((write8_machine_func)STATIC_BANK17) -#define MWA8_BANK18 ((write8_machine_func)STATIC_BANK18) -#define MWA8_BANK19 ((write8_machine_func)STATIC_BANK19) -#define MWA8_BANK20 ((write8_machine_func)STATIC_BANK20) -#define MWA8_BANK21 ((write8_machine_func)STATIC_BANK21) -#define MWA8_BANK22 ((write8_machine_func)STATIC_BANK22) -#define MWA8_BANK23 ((write8_machine_func)STATIC_BANK23) -#define MWA8_BANK24 ((write8_machine_func)STATIC_BANK24) -#define MWA8_BANK25 ((write8_machine_func)STATIC_BANK25) -#define MWA8_BANK26 ((write8_machine_func)STATIC_BANK26) -#define MWA8_BANK27 ((write8_machine_func)STATIC_BANK27) -#define MWA8_BANK28 ((write8_machine_func)STATIC_BANK28) -#define MWA8_BANK29 ((write8_machine_func)STATIC_BANK29) -#define MWA8_BANK30 ((write8_machine_func)STATIC_BANK30) -#define MWA8_BANK31 ((write8_machine_func)STATIC_BANK31) -#define MWA8_BANK32 ((write8_machine_func)STATIC_BANK32) -#define MWA8_RAM ((write8_machine_func)STATIC_RAM) -#define MWA8_ROM ((write8_machine_func)STATIC_ROM) -#define MWA8_NOP ((write8_machine_func)STATIC_NOP) -#define MWA8_UNMAP ((write8_machine_func)STATIC_UNMAP) - -/* 16-bit reads */ -#define MRA16_BANK1 ((read16_machine_func)STATIC_BANK1) -#define MRA16_BANK2 ((read16_machine_func)STATIC_BANK2) -#define MRA16_BANK3 ((read16_machine_func)STATIC_BANK3) -#define MRA16_BANK4 ((read16_machine_func)STATIC_BANK4) -#define MRA16_BANK5 ((read16_machine_func)STATIC_BANK5) -#define MRA16_BANK6 ((read16_machine_func)STATIC_BANK6) -#define MRA16_BANK7 ((read16_machine_func)STATIC_BANK7) -#define MRA16_BANK8 ((read16_machine_func)STATIC_BANK8) -#define MRA16_BANK9 ((read16_machine_func)STATIC_BANK9) -#define MRA16_BANK10 ((read16_machine_func)STATIC_BANK10) -#define MRA16_BANK11 ((read16_machine_func)STATIC_BANK11) -#define MRA16_BANK12 ((read16_machine_func)STATIC_BANK12) -#define MRA16_BANK13 ((read16_machine_func)STATIC_BANK13) -#define MRA16_BANK14 ((read16_machine_func)STATIC_BANK14) -#define MRA16_BANK15 ((read16_machine_func)STATIC_BANK15) -#define MRA16_BANK16 ((read16_machine_func)STATIC_BANK16) -#define MRA16_BANK17 ((read16_machine_func)STATIC_BANK17) -#define MRA16_BANK18 ((read16_machine_func)STATIC_BANK18) -#define MRA16_BANK19 ((read16_machine_func)STATIC_BANK19) -#define MRA16_BANK20 ((read16_machine_func)STATIC_BANK20) -#define MRA16_BANK21 ((read16_machine_func)STATIC_BANK21) -#define MRA16_BANK22 ((read16_machine_func)STATIC_BANK22) -#define MRA16_BANK23 ((read16_machine_func)STATIC_BANK23) -#define MRA16_BANK24 ((read16_machine_func)STATIC_BANK24) -#define MRA16_BANK25 ((read16_machine_func)STATIC_BANK25) -#define MRA16_BANK26 ((read16_machine_func)STATIC_BANK26) -#define MRA16_BANK27 ((read16_machine_func)STATIC_BANK27) -#define MRA16_BANK28 ((read16_machine_func)STATIC_BANK28) -#define MRA16_BANK29 ((read16_machine_func)STATIC_BANK29) -#define MRA16_BANK30 ((read16_machine_func)STATIC_BANK30) -#define MRA16_BANK31 ((read16_machine_func)STATIC_BANK31) -#define MRA16_BANK32 ((read16_machine_func)STATIC_BANK32) -#define MRA16_RAM ((read16_machine_func)STATIC_RAM) -#define MRA16_ROM ((read16_machine_func)STATIC_ROM) -#define MRA16_NOP ((read16_machine_func)STATIC_NOP) -#define MRA16_UNMAP ((read16_machine_func)STATIC_UNMAP) - -/* 16-bit writes */ -#define MWA16_BANK1 ((write16_machine_func)STATIC_BANK1) -#define MWA16_BANK2 ((write16_machine_func)STATIC_BANK2) -#define MWA16_BANK3 ((write16_machine_func)STATIC_BANK3) -#define MWA16_BANK4 ((write16_machine_func)STATIC_BANK4) -#define MWA16_BANK5 ((write16_machine_func)STATIC_BANK5) -#define MWA16_BANK6 ((write16_machine_func)STATIC_BANK6) -#define MWA16_BANK7 ((write16_machine_func)STATIC_BANK7) -#define MWA16_BANK8 ((write16_machine_func)STATIC_BANK8) -#define MWA16_BANK9 ((write16_machine_func)STATIC_BANK9) -#define MWA16_BANK10 ((write16_machine_func)STATIC_BANK10) -#define MWA16_BANK11 ((write16_machine_func)STATIC_BANK11) -#define MWA16_BANK12 ((write16_machine_func)STATIC_BANK12) -#define MWA16_BANK13 ((write16_machine_func)STATIC_BANK13) -#define MWA16_BANK14 ((write16_machine_func)STATIC_BANK14) -#define MWA16_BANK15 ((write16_machine_func)STATIC_BANK15) -#define MWA16_BANK16 ((write16_machine_func)STATIC_BANK16) -#define MWA16_BANK17 ((write16_machine_func)STATIC_BANK17) -#define MWA16_BANK18 ((write16_machine_func)STATIC_BANK18) -#define MWA16_BANK19 ((write16_machine_func)STATIC_BANK19) -#define MWA16_BANK20 ((write16_machine_func)STATIC_BANK20) -#define MWA16_BANK21 ((write16_machine_func)STATIC_BANK21) -#define MWA16_BANK22 ((write16_machine_func)STATIC_BANK22) -#define MWA16_BANK23 ((write16_machine_func)STATIC_BANK23) -#define MWA16_BANK24 ((write16_machine_func)STATIC_BANK24) -#define MWA16_BANK25 ((write16_machine_func)STATIC_BANK25) -#define MWA16_BANK26 ((write16_machine_func)STATIC_BANK26) -#define MWA16_BANK27 ((write16_machine_func)STATIC_BANK27) -#define MWA16_BANK28 ((write16_machine_func)STATIC_BANK28) -#define MWA16_BANK29 ((write16_machine_func)STATIC_BANK29) -#define MWA16_BANK30 ((write16_machine_func)STATIC_BANK30) -#define MWA16_BANK31 ((write16_machine_func)STATIC_BANK31) -#define MWA16_BANK32 ((write16_machine_func)STATIC_BANK32) -#define MWA16_RAM ((write16_machine_func)STATIC_RAM) -#define MWA16_ROM ((write16_machine_func)STATIC_ROM) -#define MWA16_NOP ((write16_machine_func)STATIC_NOP) -#define MWA16_UNMAP ((write16_machine_func)STATIC_UNMAP) - -/* 32-bit reads */ -#define MRA32_BANK1 ((read32_machine_func)STATIC_BANK1) -#define MRA32_BANK2 ((read32_machine_func)STATIC_BANK2) -#define MRA32_BANK3 ((read32_machine_func)STATIC_BANK3) -#define MRA32_BANK4 ((read32_machine_func)STATIC_BANK4) -#define MRA32_BANK5 ((read32_machine_func)STATIC_BANK5) -#define MRA32_BANK6 ((read32_machine_func)STATIC_BANK6) -#define MRA32_BANK7 ((read32_machine_func)STATIC_BANK7) -#define MRA32_BANK8 ((read32_machine_func)STATIC_BANK8) -#define MRA32_BANK9 ((read32_machine_func)STATIC_BANK9) -#define MRA32_BANK10 ((read32_machine_func)STATIC_BANK10) -#define MRA32_BANK11 ((read32_machine_func)STATIC_BANK11) -#define MRA32_BANK12 ((read32_machine_func)STATIC_BANK12) -#define MRA32_BANK13 ((read32_machine_func)STATIC_BANK13) -#define MRA32_BANK14 ((read32_machine_func)STATIC_BANK14) -#define MRA32_BANK15 ((read32_machine_func)STATIC_BANK15) -#define MRA32_BANK16 ((read32_machine_func)STATIC_BANK16) -#define MRA32_BANK17 ((read32_machine_func)STATIC_BANK17) -#define MRA32_BANK18 ((read32_machine_func)STATIC_BANK18) -#define MRA32_BANK19 ((read32_machine_func)STATIC_BANK19) -#define MRA32_BANK20 ((read32_machine_func)STATIC_BANK20) -#define MRA32_BANK21 ((read32_machine_func)STATIC_BANK21) -#define MRA32_BANK22 ((read32_machine_func)STATIC_BANK22) -#define MRA32_BANK23 ((read32_machine_func)STATIC_BANK23) -#define MRA32_BANK24 ((read32_machine_func)STATIC_BANK24) -#define MRA32_BANK25 ((read32_machine_func)STATIC_BANK25) -#define MRA32_BANK26 ((read32_machine_func)STATIC_BANK26) -#define MRA32_BANK27 ((read32_machine_func)STATIC_BANK27) -#define MRA32_BANK28 ((read32_machine_func)STATIC_BANK28) -#define MRA32_BANK29 ((read32_machine_func)STATIC_BANK29) -#define MRA32_BANK30 ((read32_machine_func)STATIC_BANK30) -#define MRA32_BANK31 ((read32_machine_func)STATIC_BANK31) -#define MRA32_BANK32 ((read32_machine_func)STATIC_BANK32) -#define MRA32_RAM ((read32_machine_func)STATIC_RAM) -#define MRA32_ROM ((read32_machine_func)STATIC_ROM) -#define MRA32_NOP ((read32_machine_func)STATIC_NOP) -#define MRA32_UNMAP ((read32_machine_func)STATIC_UNMAP) - -/* 32-bit writes */ -#define MWA32_BANK1 ((write32_machine_func)STATIC_BANK1) -#define MWA32_BANK2 ((write32_machine_func)STATIC_BANK2) -#define MWA32_BANK3 ((write32_machine_func)STATIC_BANK3) -#define MWA32_BANK4 ((write32_machine_func)STATIC_BANK4) -#define MWA32_BANK5 ((write32_machine_func)STATIC_BANK5) -#define MWA32_BANK6 ((write32_machine_func)STATIC_BANK6) -#define MWA32_BANK7 ((write32_machine_func)STATIC_BANK7) -#define MWA32_BANK8 ((write32_machine_func)STATIC_BANK8) -#define MWA32_BANK9 ((write32_machine_func)STATIC_BANK9) -#define MWA32_BANK10 ((write32_machine_func)STATIC_BANK10) -#define MWA32_BANK11 ((write32_machine_func)STATIC_BANK11) -#define MWA32_BANK12 ((write32_machine_func)STATIC_BANK12) -#define MWA32_BANK13 ((write32_machine_func)STATIC_BANK13) -#define MWA32_BANK14 ((write32_machine_func)STATIC_BANK14) -#define MWA32_BANK15 ((write32_machine_func)STATIC_BANK15) -#define MWA32_BANK16 ((write32_machine_func)STATIC_BANK16) -#define MWA32_BANK17 ((write32_machine_func)STATIC_BANK17) -#define MWA32_BANK18 ((write32_machine_func)STATIC_BANK18) -#define MWA32_BANK19 ((write32_machine_func)STATIC_BANK19) -#define MWA32_BANK20 ((write32_machine_func)STATIC_BANK20) -#define MWA32_BANK21 ((write32_machine_func)STATIC_BANK21) -#define MWA32_BANK22 ((write32_machine_func)STATIC_BANK22) -#define MWA32_BANK23 ((write32_machine_func)STATIC_BANK23) -#define MWA32_BANK24 ((write32_machine_func)STATIC_BANK24) -#define MWA32_BANK25 ((write32_machine_func)STATIC_BANK25) -#define MWA32_BANK26 ((write32_machine_func)STATIC_BANK26) -#define MWA32_BANK27 ((write32_machine_func)STATIC_BANK27) -#define MWA32_BANK28 ((write32_machine_func)STATIC_BANK28) -#define MWA32_BANK29 ((write32_machine_func)STATIC_BANK29) -#define MWA32_BANK30 ((write32_machine_func)STATIC_BANK30) -#define MWA32_BANK31 ((write32_machine_func)STATIC_BANK31) -#define MWA32_BANK32 ((write32_machine_func)STATIC_BANK32) -#define MWA32_RAM ((write32_machine_func)STATIC_RAM) -#define MWA32_ROM ((write32_machine_func)STATIC_ROM) -#define MWA32_NOP ((write32_machine_func)STATIC_NOP) -#define MWA32_UNMAP ((write32_machine_func)STATIC_UNMAP) - -/* 64-bit reads */ -#define MRA64_BANK1 ((read64_machine_func)STATIC_BANK1) -#define MRA64_BANK2 ((read64_machine_func)STATIC_BANK2) -#define MRA64_BANK3 ((read64_machine_func)STATIC_BANK3) -#define MRA64_BANK4 ((read64_machine_func)STATIC_BANK4) -#define MRA64_BANK5 ((read64_machine_func)STATIC_BANK5) -#define MRA64_BANK6 ((read64_machine_func)STATIC_BANK6) -#define MRA64_BANK7 ((read64_machine_func)STATIC_BANK7) -#define MRA64_BANK8 ((read64_machine_func)STATIC_BANK8) -#define MRA64_BANK9 ((read64_machine_func)STATIC_BANK9) -#define MRA64_BANK10 ((read64_machine_func)STATIC_BANK10) -#define MRA64_BANK11 ((read64_machine_func)STATIC_BANK11) -#define MRA64_BANK12 ((read64_machine_func)STATIC_BANK12) -#define MRA64_BANK13 ((read64_machine_func)STATIC_BANK13) -#define MRA64_BANK14 ((read64_machine_func)STATIC_BANK14) -#define MRA64_BANK15 ((read64_machine_func)STATIC_BANK15) -#define MRA64_BANK16 ((read64_machine_func)STATIC_BANK16) -#define MRA64_BANK17 ((read64_machine_func)STATIC_BANK17) -#define MRA64_BANK18 ((read64_machine_func)STATIC_BANK18) -#define MRA64_BANK19 ((read64_machine_func)STATIC_BANK19) -#define MRA64_BANK20 ((read64_machine_func)STATIC_BANK20) -#define MRA64_BANK21 ((read64_machine_func)STATIC_BANK21) -#define MRA64_BANK22 ((read64_machine_func)STATIC_BANK22) -#define MRA64_BANK23 ((read64_machine_func)STATIC_BANK23) -#define MRA64_BANK24 ((read64_machine_func)STATIC_BANK24) -#define MRA64_BANK25 ((read64_machine_func)STATIC_BANK25) -#define MRA64_BANK26 ((read64_machine_func)STATIC_BANK26) -#define MRA64_BANK27 ((read64_machine_func)STATIC_BANK27) -#define MRA64_BANK28 ((read64_machine_func)STATIC_BANK28) -#define MRA64_BANK29 ((read64_machine_func)STATIC_BANK29) -#define MRA64_BANK30 ((read64_machine_func)STATIC_BANK30) -#define MRA64_BANK31 ((read64_machine_func)STATIC_BANK31) -#define MRA64_BANK32 ((read64_machine_func)STATIC_BANK32) -#define MRA64_RAM ((read64_machine_func)STATIC_RAM) -#define MRA64_ROM ((read64_machine_func)STATIC_ROM) -#define MRA64_NOP ((read64_machine_func)STATIC_NOP) -#define MRA64_UNMAP ((read64_machine_func)STATIC_UNMAP) - -/* 64-bit writes */ -#define MWA64_BANK1 ((write64_machine_func)STATIC_BANK1) -#define MWA64_BANK2 ((write64_machine_func)STATIC_BANK2) -#define MWA64_BANK3 ((write64_machine_func)STATIC_BANK3) -#define MWA64_BANK4 ((write64_machine_func)STATIC_BANK4) -#define MWA64_BANK5 ((write64_machine_func)STATIC_BANK5) -#define MWA64_BANK6 ((write64_machine_func)STATIC_BANK6) -#define MWA64_BANK7 ((write64_machine_func)STATIC_BANK7) -#define MWA64_BANK8 ((write64_machine_func)STATIC_BANK8) -#define MWA64_BANK9 ((write64_machine_func)STATIC_BANK9) -#define MWA64_BANK10 ((write64_machine_func)STATIC_BANK10) -#define MWA64_BANK11 ((write64_machine_func)STATIC_BANK11) -#define MWA64_BANK12 ((write64_machine_func)STATIC_BANK12) -#define MWA64_BANK13 ((write64_machine_func)STATIC_BANK13) -#define MWA64_BANK14 ((write64_machine_func)STATIC_BANK14) -#define MWA64_BANK15 ((write64_machine_func)STATIC_BANK15) -#define MWA64_BANK16 ((write64_machine_func)STATIC_BANK16) -#define MWA64_BANK17 ((write64_machine_func)STATIC_BANK17) -#define MWA64_BANK18 ((write64_machine_func)STATIC_BANK18) -#define MWA64_BANK19 ((write64_machine_func)STATIC_BANK19) -#define MWA64_BANK20 ((write64_machine_func)STATIC_BANK20) -#define MWA64_BANK21 ((write64_machine_func)STATIC_BANK21) -#define MWA64_BANK22 ((write64_machine_func)STATIC_BANK22) -#define MWA64_BANK23 ((write64_machine_func)STATIC_BANK23) -#define MWA64_BANK24 ((write64_machine_func)STATIC_BANK24) -#define MWA64_BANK25 ((write64_machine_func)STATIC_BANK25) -#define MWA64_BANK26 ((write64_machine_func)STATIC_BANK26) -#define MWA64_BANK27 ((write64_machine_func)STATIC_BANK27) -#define MWA64_BANK28 ((write64_machine_func)STATIC_BANK28) -#define MWA64_BANK29 ((write64_machine_func)STATIC_BANK29) -#define MWA64_BANK30 ((write64_machine_func)STATIC_BANK30) -#define MWA64_BANK31 ((write64_machine_func)STATIC_BANK31) -#define MWA64_BANK32 ((write64_machine_func)STATIC_BANK32) -#define MWA64_RAM ((write64_machine_func)STATIC_RAM) -#define MWA64_ROM ((write64_machine_func)STATIC_ROM) -#define MWA64_NOP ((write64_machine_func)STATIC_NOP) -#define MWA64_UNMAP ((write64_machine_func)STATIC_UNMAP) +#define SMH_BANK1 SMH_BANK(1) +#define SMH_BANK2 SMH_BANK(2) +#define SMH_BANK3 SMH_BANK(3) +#define SMH_BANK4 SMH_BANK(4) +#define SMH_BANK5 SMH_BANK(5) +#define SMH_BANK6 SMH_BANK(6) +#define SMH_BANK7 SMH_BANK(7) +#define SMH_BANK8 SMH_BANK(8) +#define SMH_BANK9 SMH_BANK(9) +#define SMH_BANK10 SMH_BANK(10) +#define SMH_BANK11 SMH_BANK(11) +#define SMH_BANK12 SMH_BANK(12) +#define SMH_BANK13 SMH_BANK(13) +#define SMH_BANK14 SMH_BANK(14) +#define SMH_BANK15 SMH_BANK(15) +#define SMH_BANK16 SMH_BANK(16) +#define SMH_BANK17 SMH_BANK(17) +#define SMH_BANK18 SMH_BANK(18) +#define SMH_BANK19 SMH_BANK(19) +#define SMH_BANK20 SMH_BANK(20) +#define SMH_BANK21 SMH_BANK(21) +#define SMH_BANK22 SMH_BANK(22) +#define SMH_BANK23 SMH_BANK(23) +#define SMH_BANK24 SMH_BANK(24) +#define SMH_BANK25 SMH_BANK(25) +#define SMH_BANK26 SMH_BANK(26) +#define SMH_BANK27 SMH_BANK(27) +#define SMH_BANK28 SMH_BANK(28) +#define SMH_BANK29 SMH_BANK(29) +#define SMH_BANK30 SMH_BANK(30) +#define SMH_BANK31 SMH_BANK(31) +#define SMH_BANK32 SMH_BANK(32) @@ -847,15 +514,15 @@ enum /* ----- common shortcuts ----- */ #define AM_READWRITE(_read,_write) AM_READ(_read) AM_WRITE(_write) #define AM_DEVREADWRITE(_type,_tag,_read,_write) AM_DEVREAD(_type,_tag,_read) AM_DEVWRITE(_type,_tag,_write) -#define AM_ROM AM_READ((void *)STATIC_ROM) -#define AM_RAM AM_READWRITE((void *)STATIC_RAM, (void *)STATIC_RAM) -#define AM_WRITEONLY AM_WRITE((void *)STATIC_RAM) -#define AM_UNMAP AM_READWRITE((void *)STATIC_UNMAP, (void *)STATIC_UNMAP) -#define AM_ROMBANK(_bank) AM_READ((void *)(STATIC_BANK1 + (_bank) - 1)) -#define AM_RAMBANK(_bank) AM_READWRITE((void *)(STATIC_BANK1 + (_bank) - 1), (void *)(STATIC_BANK1 + (_bank) - 1)) -#define AM_NOP AM_READWRITE((void *)STATIC_NOP, (void *)STATIC_NOP) -#define AM_READNOP AM_READ((void *)STATIC_NOP) -#define AM_WRITENOP AM_WRITE((void *)STATIC_NOP) +#define AM_ROM AM_READ(SMH_ROM) +#define AM_RAM AM_READWRITE(SMH_RAM, SMH_RAM) +#define AM_WRITEONLY AM_WRITE(SMH_RAM) +#define AM_UNMAP AM_READWRITE(SMH_UNMAP, SMH_UNMAP) +#define AM_ROMBANK(_bank) AM_READ(SMH_BANK(_bank)) +#define AM_RAMBANK(_bank) AM_READWRITE(SMH_BANK(_bank), SMH_BANK(_bank)) +#define AM_NOP AM_READWRITE(SMH_NOP, SMH_NOP) +#define AM_READNOP AM_READ(SMH_NOP) +#define AM_WRITENOP AM_WRITE(SMH_NOP) @@ -872,35 +539,6 @@ enum ADDRESS_SPACES /* maximum number of address spaces */ }; -extern const char *const address_space_names[ADDRESS_SPACES]; - -/* ----- address map lookup table definitions ----- */ -#define SUBTABLE_COUNT 64 /* number of slots reserved for subtables */ -#define SUBTABLE_BASE (256-SUBTABLE_COUNT) /* first index of a subtable */ -#define ENTRY_COUNT (SUBTABLE_BASE) /* number of legitimate (non-subtable) entries */ -#define SUBTABLE_ALLOC 8 /* number of subtables to allocate at a time */ - -/* ----- bit counts ----- */ -#define LEVEL1_BITS 18 /* number of address bits in the level 1 table */ -#define LEVEL2_BITS (32 - LEVEL1_BITS) /* number of address bits in the level 2 table */ - -/* ----- other address map constants ----- */ -#define MAX_MEMORY_BLOCKS 1024 /* maximum memory blocks we can track */ -#define MAX_SHARED_POINTERS 256 /* maximum number of shared pointers in memory maps */ -#define MEMORY_BLOCK_SIZE 65536 /* size of allocated memory blocks */ - - - -/*************************************************************************** - ADDRESS MAP LOOKUP MACROS -***************************************************************************/ - -/* ----- table lookup helpers ----- */ -#define LEVEL1_INDEX(a) ((a) >> LEVEL2_BITS) -#define LEVEL2_INDEX(e,a) ((1 << LEVEL1_BITS) + (((e) - SUBTABLE_BASE) << LEVEL2_BITS) + ((a) & ((1 << LEVEL2_BITS) - 1))) - - - /*************************************************************************** FUNCTION PROTOTYPES FOR CORE READ/WRITE ROUTINES ***************************************************************************/ @@ -1140,8 +778,8 @@ extern offs_t opcode_mask; /* mask to apply to the opcode address */ extern offs_t opcode_memory_min; /* opcode memory minimum */ extern offs_t opcode_memory_max; /* opcode memory maximum */ extern address_space active_address_space[]; /* address spaces */ -#define construct_map_0 NULL +extern const char *const address_space_names[ADDRESS_SPACES]; /*************************************************************************** @@ -1264,10 +902,10 @@ INLINE UINT32 cpu_readop_arg32(offs_t A) { if (address_is_unsafe(A)) { memory_se INLINE UINT64 cpu_readop_arg64(offs_t A) { if (address_is_unsafe(A)) { memory_set_opbase(A); } return cpu_readop_arg64_unsafe(A); } /* ----- bank switching for CPU cores ----- */ -#define change_pc(pc) memory_set_opbase(pc); +#define change_pc(pc) do { memory_set_opbase(pc); } while (0) /* ----- forces the next branch to generate a call to the opbase handler ----- */ -#define catch_nextBranch() (opcode_entry = 0xff) +#define catch_nextBranch() do { opcode_entry = 0xff; } while (0) #endif /* __MEMORY_H__ */ diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c index c5b8c95550d..c28ea7020c8 100644 --- a/src/emu/video/generic.c +++ b/src/emu/video/generic.c @@ -368,7 +368,7 @@ equal to the size of normal spriteram. Spriteram size _must_ be declared in the memory map: - { 0x120000, 0x1207ff, MWA8_BANK2, &spriteram, &spriteram_size }, + { 0x120000, 0x1207ff, SMH_BANK2, &spriteram, &spriteram_size }, Then the video driver must draw the sprites from the buffered_spriteram pointer. The function buffer_spriteram_w() is used to simulate hardware diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c index 60d597f8480..7b0686f4b9a 100644 --- a/src/mame/audio/cinemat.c +++ b/src/mame/audio/cinemat.c @@ -1533,7 +1533,7 @@ static ADDRESS_MAP_START( demon_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6001, 0x6001) AM_READ(AY8910_read_port_2_r) AM_RANGE(0x6002, 0x6002) AM_WRITE(AY8910_write_port_2_w) AM_RANGE(0x6003, 0x6003) AM_WRITE(AY8910_control_port_2_w) - AM_RANGE(0x7000, 0x7000) AM_WRITE(MWA8_NOP) /* watchdog? */ + AM_RANGE(0x7000, 0x7000) AM_WRITE(SMH_NOP) /* watchdog? */ ADDRESS_MAP_END diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index ee8a86d3170..c72f837c58e 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -1077,30 +1077,30 @@ static void sdrc_remap_memory(void) /* if SRAM disabled, clean it out */ if (SDRC_SM_EN == 0) { - memory_install_read32_handler (dcs.cpunum, ADDRESS_SPACE_PROGRAM, 0x0800, 0x3fff, 0, 0, MRA32_UNMAP); - memory_install_write32_handler(dcs.cpunum, ADDRESS_SPACE_PROGRAM, 0x0800, 0x3fff, 0, 0, MWA32_UNMAP); - memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x37ff, 0, 0, MRA16_UNMAP); - memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x37ff, 0, 0, MWA16_UNMAP); + memory_install_read32_handler (dcs.cpunum, ADDRESS_SPACE_PROGRAM, 0x0800, 0x3fff, 0, 0, SMH_UNMAP); + memory_install_write32_handler(dcs.cpunum, ADDRESS_SPACE_PROGRAM, 0x0800, 0x3fff, 0, 0, SMH_UNMAP); + memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x37ff, 0, 0, SMH_UNMAP); + memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x37ff, 0, 0, SMH_UNMAP); } /* otherwise, map the SRAM */ else { /* first start with a clean program map */ - memory_install_read32_handler (dcs.cpunum, ADDRESS_SPACE_PROGRAM, 0x0800, 0x3fff, 0, 0, MRA32_BANK21); - memory_install_write32_handler(dcs.cpunum, ADDRESS_SPACE_PROGRAM, 0x0800, 0x3fff, 0, 0, MWA32_BANK21); + memory_install_read32_handler (dcs.cpunum, ADDRESS_SPACE_PROGRAM, 0x0800, 0x3fff, 0, 0, SMH_BANK21); + memory_install_write32_handler(dcs.cpunum, ADDRESS_SPACE_PROGRAM, 0x0800, 0x3fff, 0, 0, SMH_BANK21); memory_set_bankptr(21, 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_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x17ff, 0, 0, MRA16_BANK22); - memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x17ff, 0, 0, MWA16_BANK22); - memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x1800, 0x27ff, 0, 0, MRA16_BANK23); - memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x1800, 0x27ff, 0, 0, MWA16_BANK23); - memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x2800, 0x37ff, 0, 0, MRA16_BANK24); - memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x2800, 0x37ff, 0, 0, MWA16_BANK24); + memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x17ff, 0, 0, SMH_BANK22); + memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x17ff, 0, 0, SMH_BANK22); + memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x1800, 0x27ff, 0, 0, SMH_BANK23); + memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x1800, 0x27ff, 0, 0, SMH_BANK23); + memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x2800, 0x37ff, 0, 0, SMH_BANK24); + memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x2800, 0x37ff, 0, 0, SMH_BANK24); memory_set_bankptr(22, dcs_sram + 0x0000); memory_set_bankptr(23, dcs_sram + 0x1000); memory_set_bankptr(24, dcs_sram + 0x2000); @@ -1109,12 +1109,12 @@ static void sdrc_remap_memory(void) /* map 1: nothing from 0800-17ff, alternate RAM at 1800-27ff, same RAM at 2800-37ff */ else { - memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x17ff, 0, 0, MRA16_UNMAP); - memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x17ff, 0, 0, MWA16_UNMAP); - memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x1800, 0x27ff, 0, 0, MRA16_BANK23); - memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x1800, 0x27ff, 0, 0, MWA16_BANK23); - memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x2800, 0x37ff, 0, 0, MRA16_BANK24); - memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x2800, 0x37ff, 0, 0, MWA16_BANK24); + memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x17ff, 0, 0, SMH_UNMAP); + memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x0800, 0x17ff, 0, 0, SMH_UNMAP); + memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x1800, 0x27ff, 0, 0, SMH_BANK23); + memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x1800, 0x27ff, 0, 0, SMH_BANK23); + memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, 0x2800, 0x37ff, 0, 0, SMH_BANK24); + memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, 0x2800, 0x37ff, 0, 0, SMH_BANK24); memory_set_bankptr(23, dcs_sram + 0x3000); memory_set_bankptr(24, dcs_sram + 0x2000); } @@ -1125,15 +1125,15 @@ static void sdrc_remap_memory(void) { 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.cpunum, ADDRESS_SPACE_DATA, baseaddr, baseaddr + pagesize - 1, 0, 0, MRA16_BANK25); + memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, baseaddr, baseaddr + pagesize - 1, 0, 0, SMH_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_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, baseaddr, baseaddr + 0x3ff, 0, 0, MRA16_BANK26); - memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, baseaddr, baseaddr + 0x3ff, 0, 0, MWA16_BANK26); + memory_install_read16_handler (dcs.cpunum, ADDRESS_SPACE_DATA, baseaddr, baseaddr + 0x3ff, 0, 0, SMH_BANK26); + memory_install_write16_handler(dcs.cpunum, ADDRESS_SPACE_DATA, baseaddr, baseaddr + 0x3ff, 0, 0, SMH_BANK26); } /* update the bank pointers */ diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c index 445e71b15cb..1b6eb51015c 100644 --- a/src/mame/audio/exidy440.c +++ b/src/mame/audio/exidy440.c @@ -894,11 +894,11 @@ static void decode_and_filter_cvsd(UINT8 *input, int bytes, int maskbits, int fr static ADDRESS_MAP_START( exidy440_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x801f) AM_MIRROR(0x03e0) AM_READWRITE(m6844_r, m6844_w) AM_BASE(&m6844_data) - AM_RANGE(0x8400, 0x840f) AM_MIRROR(0x03f0) AM_READWRITE(MRA8_RAM, sound_volume_w) AM_BASE(&sound_volume) - AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_READWRITE(sound_command_r, MWA8_NOP) + AM_RANGE(0x8400, 0x840f) AM_MIRROR(0x03f0) AM_READWRITE(SMH_RAM, sound_volume_w) AM_BASE(&sound_volume) + AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_READWRITE(sound_command_r, SMH_NOP) AM_RANGE(0x8c00, 0x93ff) AM_NOP - AM_RANGE(0x9400, 0x9403) AM_MIRROR(0x03fc) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&sound_banks) - AM_RANGE(0x9800, 0x9800) AM_MIRROR(0x03ff) AM_READWRITE(MRA8_NOP, sound_interrupt_clear_w) + AM_RANGE(0x9400, 0x9403) AM_MIRROR(0x03fc) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&sound_banks) + AM_RANGE(0x9800, 0x9800) AM_MIRROR(0x03ff) AM_READWRITE(SMH_NOP, sound_interrupt_clear_w) AM_RANGE(0x9c00, 0x9fff) AM_NOP AM_RANGE(0xa000, 0xbfff) AM_RAM AM_RANGE(0xc000, 0xdfff) AM_NOP diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c index d5e7a9d1cef..3550b1994bc 100644 --- a/src/mame/audio/jedi.c +++ b/src/mame/audio/jedi.c @@ -177,15 +177,15 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0810, 0x081f) AM_MIRROR(0x07c0) AM_READWRITE(pokey2_r, pokey2_w) AM_RANGE(0x0820, 0x082f) AM_MIRROR(0x07c0) AM_READWRITE(pokey3_r, pokey3_w) AM_RANGE(0x0830, 0x083f) AM_MIRROR(0x07c0) AM_READWRITE(pokey4_r, pokey4_w) - AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x00ff) AM_READWRITE(MRA8_NOP, irq_ack_w) - AM_RANGE(0x1100, 0x1100) AM_MIRROR(0x00ff) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE_MEMBER(jedi_state, speech_data) - AM_RANGE(0x1200, 0x13ff) AM_READWRITE(MRA8_NOP, speech_strobe_w) - AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x00ff) AM_READWRITE(MRA8_NOP, audio_ack_latch_w) - AM_RANGE(0x1500, 0x1500) AM_MIRROR(0x00ff) AM_READWRITE(MRA8_NOP, speech_reset_w) + AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x00ff) AM_READWRITE(SMH_NOP, irq_ack_w) + AM_RANGE(0x1100, 0x1100) AM_MIRROR(0x00ff) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE_MEMBER(jedi_state, speech_data) + AM_RANGE(0x1200, 0x13ff) AM_READWRITE(SMH_NOP, speech_strobe_w) + AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x00ff) AM_READWRITE(SMH_NOP, audio_ack_latch_w) + AM_RANGE(0x1500, 0x1500) AM_MIRROR(0x00ff) AM_READWRITE(SMH_NOP, speech_reset_w) AM_RANGE(0x1600, 0x17ff) AM_NOP - AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x03ff) AM_READWRITE(audio_latch_r, MWA8_NOP) - AM_RANGE(0x1c00, 0x1c00) AM_MIRROR(0x03fe) AM_READWRITE(speech_ready_r, MWA8_NOP) - AM_RANGE(0x1c01, 0x1c01) AM_MIRROR(0x03fe) AM_READWRITE(MRA8_RAM, MWA8_NOP) AM_BASE_MEMBER(jedi_state, audio_comm_stat) + AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x03ff) AM_READWRITE(audio_latch_r, SMH_NOP) + AM_RANGE(0x1c00, 0x1c00) AM_MIRROR(0x03fe) AM_READWRITE(speech_ready_r, SMH_NOP) + AM_RANGE(0x1c01, 0x1c01) AM_MIRROR(0x03fe) AM_READWRITE(SMH_RAM, SMH_NOP) AM_BASE_MEMBER(jedi_state, audio_comm_stat) AM_RANGE(0x2000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c index 6f669e10841..7342746068e 100644 --- a/src/mame/audio/mcr.c +++ b/src/mame/audio/mcr.c @@ -475,7 +475,7 @@ static ADDRESS_MAP_START( ssio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb000, 0xb000) AM_MIRROR(0x0ffc) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0xb001, 0xb001) AM_MIRROR(0x0ffc) AM_READ(AY8910_read_port_1_r) AM_RANGE(0xb002, 0xb002) AM_MIRROR(0x0ffc) AM_WRITE(AY8910_write_port_1_w) - AM_RANGE(0xc000, 0xcfff) AM_READWRITE(MRA8_NOP, ssio_status_w) + AM_RANGE(0xc000, 0xcfff) AM_READWRITE(SMH_NOP, ssio_status_w) AM_RANGE(0xd000, 0xdfff) AM_WRITENOP /* low bit controls yellow LED */ AM_RANGE(0xe000, 0xefff) AM_READ(ssio_irq_clear) AM_RANGE(0xf000, 0xffff) AM_READ_PORT("SSIO.DIP") /* 6 DIP switches */ diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c index ab7332a6861..312bdb4a923 100644 --- a/src/mame/audio/redalert.c +++ b/src/mame/audio/redalert.c @@ -136,7 +136,7 @@ static const struct AY8910interface redalert_ay8910_interface = static ADDRESS_MAP_START( redalert_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x0c00) AM_RAM - AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0ffe) AM_READWRITE(MRA8_NOP, redalert_AY8910_w) + AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0ffe) AM_READWRITE(SMH_NOP, redalert_AY8910_w) AM_RANGE(0x1001, 0x1001) AM_MIRROR(0x0ffe) AM_READWRITE(redalert_ay8910_latch_1_r, redalert_ay8910_latch_2_w) AM_RANGE(0x2000, 0x6fff) AM_NOP AM_RANGE(0x7000, 0x77ff) AM_MIRROR(0x0800) AM_ROM @@ -187,7 +187,7 @@ static ADDRESS_MAP_START( redalert_voice_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x3c00) AM_RAM - AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x3fff) AM_READWRITE(soundlatch2_r, MWA8_NOP) + AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x3fff) AM_READWRITE(soundlatch2_r, SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 60f827d1baf..7a4ed6debc6 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -130,15 +130,15 @@ static WRITE16_HANDLER( k3_soundbanks_w ) static ADDRESS_MAP_START( k3_map, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x0009CE, 0x0009CF) AM_WRITE(MWA16_NOP) // bug in code? (clean up log) - AM_RANGE(0x0009D2, 0x0009D3) AM_WRITE(MWA16_NOP) // bug in code? (clean up log) + AM_RANGE(0x0009CE, 0x0009CF) AM_WRITE(SMH_NOP) // bug in code? (clean up log) + AM_RANGE(0x0009D2, 0x0009D3) AM_WRITE(SMH_NOP) // bug in code? (clean up log) AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM // Main Ram - AM_RANGE(0x200000, 0x200fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) // palette + AM_RANGE(0x200000, 0x200fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) // palette AM_RANGE(0x240000, 0x240fff) AM_RAM AM_BASE(&k3_spriteram_1) AM_RANGE(0x280000, 0x280fff) AM_RAM AM_BASE(&k3_spriteram_2) - AM_RANGE(0x2c0000, 0x2c0fff) AM_READWRITE(MRA16_RAM, k3_bgram_w) AM_BASE(&k3_bgram) + AM_RANGE(0x2c0000, 0x2c0fff) AM_READWRITE(SMH_RAM, k3_bgram_w) AM_BASE(&k3_bgram) AM_RANGE(0x340000, 0x340001) AM_WRITE(k3_scrollx_w) AM_RANGE(0x380000, 0x380001) AM_WRITE(k3_scrolly_w) AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(k3_soundbanks_w) diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index 2e01ad1d02b..131fee38d58 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -200,12 +200,12 @@ static ADDRESS_MAP_START( 20pacgal_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x45040, 0x4505f) AM_WRITE(pacman_sound_w) AM_BASE(&namco_soundregs) AM_RANGE(0x44800, 0x45eff) AM_RAM AM_RANGE(0x45f00, 0x45fff) AM_WRITE(_20pacgal_wavedata_w) AM_BASE(&namco_wavedata) - AM_RANGE(0x46000, 0x46fff) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(_20pacgal_state, char_gfx_ram) + AM_RANGE(0x46000, 0x46fff) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(_20pacgal_state, char_gfx_ram) AM_RANGE(0x47100, 0x47100) AM_RAM /* leftover from original Galaga code */ - AM_RANGE(0x48000, 0x49fff) AM_READWRITE(MRA8_ROM, rom_48000_w) /* this should be a mirror of 08000-09ffff */ - AM_RANGE(0x4c000, 0x4dfff) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(_20pacgal_state, sprite_gfx_ram) - AM_RANGE(0x4e000, 0x4e17f) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(_20pacgal_state, sprite_ram) - AM_RANGE(0x4ff00, 0x4ffff) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(_20pacgal_state, sprite_color_lookup) + AM_RANGE(0x48000, 0x49fff) AM_READWRITE(SMH_ROM, rom_48000_w) /* this should be a mirror of 08000-09ffff */ + AM_RANGE(0x4c000, 0x4dfff) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(_20pacgal_state, sprite_gfx_ram) + AM_RANGE(0x4e000, 0x4e17f) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(_20pacgal_state, sprite_ram) + AM_RANGE(0x4ff00, 0x4ffff) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(_20pacgal_state, sprite_color_lookup) ADDRESS_MAP_END @@ -224,14 +224,14 @@ static ADDRESS_MAP_START( 20pacgal_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x81, 0x81) AM_READ(input_port_1_r) AM_RANGE(0x82, 0x82) AM_READ(input_port_2_r) AM_RANGE(0x80, 0x80) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x81, 0x81) AM_WRITE(MWA8_NOP) /* ??? pulsed by the timer irq */ + AM_RANGE(0x81, 0x81) AM_WRITE(SMH_NOP) /* ??? pulsed by the timer irq */ AM_RANGE(0x82, 0x82) AM_WRITE(irqack_w) - AM_RANGE(0x85, 0x86) AM_WRITE(MWA8_NOP) /* stars: rng seed (lo/hi) */ + AM_RANGE(0x85, 0x86) AM_WRITE(SMH_NOP) /* stars: rng seed (lo/hi) */ AM_RANGE(0x87, 0x87) AM_READWRITE(eeprom_r, eeprom_w) AM_RANGE(0x88, 0x88) AM_WRITE(rom_bank_select_w) AM_RANGE(0x89, 0x89) AM_WRITE(_20pacgal_dac_w) - AM_RANGE(0x8a, 0x8a) AM_WRITE(MWA8_NOP) /* stars: bits 3-4 = active set; bit 5 = enable */ - AM_RANGE(0x8b, 0x8b) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(_20pacgal_state, flip) + AM_RANGE(0x8a, 0x8a) AM_WRITE(SMH_NOP) /* stars: bits 3-4 = active set; bit 5 = enable */ + AM_RANGE(0x8b, 0x8b) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(_20pacgal_state, flip) AM_RANGE(0x8f, 0x8f) AM_WRITE(_20pacgal_coin_counter_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index c69423a4dc9..d7ffcd2124a 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -135,13 +135,13 @@ static ADDRESS_MAP_START( drill_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x4fffff) AM_RAM AM_BASE(&unkram)// video stuff, 460000 - video regs ? AM_RANGE(0x500000, 0x501fff) AM_RAM AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x502000, 0x503fff) AM_RAM - AM_RANGE(0x700000, 0x70000f) AM_READ(drill_unk_r) AM_WRITE(MWA16_NOP) // i/o + AM_RANGE(0x700000, 0x70000f) AM_READ(drill_unk_r) AM_WRITE(SMH_NOP) // i/o AM_RANGE(0x600000, 0x600001) AM_READ(YM2610_status_port_0_A_lsb_r) AM_WRITE(YM2610_control_port_0_A_lsb_w) AM_RANGE(0x600002, 0x600003) AM_READ(YM2610_read_port_0_lsb_r) AM_WRITE(YM2610_data_port_0_A_lsb_w) AM_RANGE(0x600004, 0x600005) AM_READ(YM2610_status_port_0_B_lsb_r) AM_WRITE(YM2610_control_port_0_B_lsb_w) AM_RANGE(0x600006, 0x600007) AM_WRITE(YM2610_data_port_0_B_lsb_w) - AM_RANGE(0x60000c, 0x60000d) AM_READ(MRA16_NOP) AM_WRITE(MWA16_NOP) - AM_RANGE(0x60000e, 0x60000f) AM_READ(MRA16_NOP) AM_WRITE(MWA16_NOP) + AM_RANGE(0x60000c, 0x60000d) AM_READ(SMH_NOP) AM_WRITE(SMH_NOP) + AM_RANGE(0x60000e, 0x60000f) AM_READ(SMH_NOP) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static INPUT_PORTS_START( drill ) diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index 969327a4898..d4f203516b7 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -481,13 +481,13 @@ ADDRESS_MAP_END /* at least one of these MWA8_NOPs must be sound related */ static ADDRESS_MAP_START( cosmo_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00, 0x00) AM_READWRITE(input_port_0_r, MWA8_NOP) - AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_1_r, MWA8_NOP) - AM_RANGE(0x02, 0x02) AM_READWRITE(input_port_2_r, MWA8_NOP) + AM_RANGE(0x00, 0x00) AM_READWRITE(input_port_0_r, SMH_NOP) + AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_1_r, SMH_NOP) + AM_RANGE(0x02, 0x02) AM_READWRITE(input_port_2_r, SMH_NOP) AM_RANGE(0x03, 0x03) AM_WRITE(invadpt2_sh_port_1_w) AM_RANGE(0x05, 0x05) AM_WRITE(cosmo_sh_port_2_w) AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x07, 0x07) AM_WRITE(MWA8_NOP) + AM_RANGE(0x07, 0x07) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -1522,9 +1522,9 @@ static ADDRESS_MAP_START( sflush_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x800b, 0x800b) AM_READ(input_port_0_r) AM_RANGE(0x8018, 0x8018) AM_WRITE(mb14241_0_shift_data_w) AM_RANGE(0x8019, 0x8019) AM_WRITE(mb14241_0_shift_count_w) - AM_RANGE(0x801a, 0x801a) AM_WRITE(MWA8_NOP) - AM_RANGE(0x801c, 0x801c) AM_WRITE(MWA8_NOP) - AM_RANGE(0x801d, 0x801d) AM_WRITE(MWA8_NOP) + AM_RANGE(0x801a, 0x801a) AM_WRITE(SMH_NOP) + AM_RANGE(0x801c, 0x801c) AM_WRITE(SMH_NOP) + AM_RANGE(0x801d, 0x801d) AM_WRITE(SMH_NOP) AM_RANGE(0xa000, 0xbfff) AM_MIRROR(0x00e0) AM_RAM AM_BASE(&c8080bw_colorram) AM_RANGE(0xd800, 0xffff) AM_ROM ADDRESS_MAP_END @@ -2142,7 +2142,7 @@ MACHINE_DRIVER_END static ADDRESS_MAP_START( yosakdon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE(&mw8080bw_ram) AM_SIZE(&mw8080bw_ram_size) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) /* what's this? */ + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) /* what's this? */ ADDRESS_MAP_END static ADDRESS_MAP_START( yosakdon_io_map, ADDRESS_SPACE_IO, 8 ) @@ -2150,7 +2150,7 @@ static ADDRESS_MAP_START( yosakdon_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_READ(input_port_1_r) AM_RANGE(0x03, 0x03) AM_WRITE(yosakdon_sh_port_1_w) AM_RANGE(0x05, 0x05) AM_WRITE(yosakdon_sh_port_2_w) - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP) /* character numbers */ + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) /* character numbers */ ADDRESS_MAP_END diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 2b8a3b88b41..5a4e1ab1e7d 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -122,7 +122,7 @@ static WRITE8_HANDLER( speech_msg_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&banked_rom) /* banked ROM + palette RAM */ - AM_RANGE(0x1000, 0x1fff) AM_READWRITE(MRA8_RAM, paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE(&paletteram_1000) /* banked ROM + palette RAM */ + AM_RANGE(0x1000, 0x1fff) AM_READWRITE(SMH_RAM, paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE(&paletteram_1000) /* banked ROM + palette RAM */ AM_RANGE(0x2000, 0x2fff) AM_RAM AM_RANGE(0x3000, 0x37ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x3800, 0x3fff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE(&ram) diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index acfc66244b6..8fce3b83285 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -255,7 +255,7 @@ static ADDRESS_MAP_START( acefruit_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x20ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE(&videoram) - AM_RANGE(0x4400, 0x47ff) AM_READWRITE(MRA8_RAM, acefruit_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4400, 0x47ff) AM_READWRITE(SMH_RAM, acefruit_colorram_w) AM_BASE(&colorram) AM_RANGE(0x8000, 0x8000) AM_READ(input_port_0_r) AM_RANGE(0x8001, 0x8001) AM_READ(input_port_1_r) AM_RANGE(0x8002, 0x8002) AM_READ(input_port_2_r) diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index 0035d5136b9..12f5048c7a9 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -365,9 +365,9 @@ static ADDRESS_MAP_START( acommand, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x082000, 0x082005) AM_WRITE(ac_bgscroll_w) AM_RANGE(0x082100, 0x082105) AM_WRITE(ac_txscroll_w) AM_RANGE(0x082208, 0x082209) AM_WRITE(ac_unk2_w) - AM_RANGE(0x0a0000, 0x0a3fff) AM_READWRITE(MRA16_RAM, ac_bgvram_w) AM_BASE(&ac_bgvram) - AM_RANGE(0x0b0000, 0x0b3fff) AM_READWRITE(MRA16_RAM, ac_txvram_w) AM_BASE(&ac_txvram) - AM_RANGE(0x0b8000, 0x0bffff) AM_READWRITE(MRA16_RAM, paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0a0000, 0x0a3fff) AM_READWRITE(SMH_RAM, ac_bgvram_w) AM_BASE(&ac_bgvram) + AM_RANGE(0x0b0000, 0x0b3fff) AM_READWRITE(SMH_RAM, ac_txvram_w) AM_BASE(&ac_txvram) + AM_RANGE(0x0b8000, 0x0bffff) AM_READWRITE(SMH_RAM, paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0f0000, 0x0f7fff) AM_RAM AM_RANGE(0x0f8000, 0x0f8fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x0f9000, 0x0fffff) AM_RAM diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index 59d68434f44..703d4525fa1 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -98,7 +98,7 @@ static ADDRESS_MAP_START( actfan_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x072000, 0x0727ff) AM_READWRITE(actfancr_pf2_data_r, actfancr_pf2_data_w) AM_BASE(&actfancr_pf2_data) AM_RANGE(0x100000, 0x1007ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x110000, 0x110001) AM_WRITE(buffer_spriteram_w) - AM_RANGE(0x120000, 0x1205ff) AM_READWRITE(MRA8_RAM, paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) + AM_RANGE(0x120000, 0x1205ff) AM_READWRITE(SMH_RAM, paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) AM_RANGE(0x130000, 0x130003) AM_READ(actfan_control_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(actfan_control_0_r) AM_RANGE(0x150000, 0x150001) AM_WRITE(actfancr_sound_w) @@ -109,14 +109,14 @@ static ADDRESS_MAP_START( triothep_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x040000, 0x04001f) AM_WRITE(actfancr_pf2_control_w) AM_RANGE(0x044000, 0x045fff) AM_READWRITE(actfancr_pf2_data_r, actfancr_pf2_data_w) AM_BASE(&actfancr_pf2_data) - AM_RANGE(0x046400, 0x0467ff) AM_WRITE(MWA8_NOP) /* Pf2 rowscroll - is it used? */ + AM_RANGE(0x046400, 0x0467ff) AM_WRITE(SMH_NOP) /* Pf2 rowscroll - is it used? */ AM_RANGE(0x060000, 0x06001f) AM_WRITE(actfancr_pf1_control_w) AM_RANGE(0x064000, 0x0647ff) AM_READWRITE(actfancr_pf1_data_r, actfancr_pf1_data_w) AM_BASE(&actfancr_pf1_data) - AM_RANGE(0x066400, 0x0667ff) AM_WRITE(MWA8_RAM) AM_BASE(&actfancr_pf1_rowscroll_data) + AM_RANGE(0x066400, 0x0667ff) AM_WRITE(SMH_RAM) AM_BASE(&actfancr_pf1_rowscroll_data) AM_RANGE(0x100000, 0x100001) AM_WRITE(actfancr_sound_w) AM_RANGE(0x110000, 0x110001) AM_WRITE(buffer_spriteram_w) AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x130000, 0x1305ff) AM_READWRITE(MRA8_RAM, paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) + AM_RANGE(0x130000, 0x1305ff) AM_READWRITE(SMH_RAM, paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) AM_RANGE(0x140000, 0x140001) AM_READNOP /* Value doesn't matter */ AM_RANGE(0x1f0000, 0x1f3fff) AM_RAM AM_BASE(&actfancr_ram) /* Main ram */ AM_RANGE(0x1ff000, 0x1ff001) AM_READWRITE(triothep_control_r, triothep_control_select_w) diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c index dac5305dc36..d9193451b0e 100644 --- a/src/mame/drivers/aeroboto.c +++ b/src/mame/drivers/aeroboto.c @@ -77,19 +77,19 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x01a2, 0x01a2) AM_WRITE(aeroboto_1a2_w) // affects IRQ line (more protection?) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&aeroboto_mainram) // main RAM AM_RANGE(0x0800, 0x08ff) AM_RAM // tile color buffer; copied to 0x2000 - AM_RANGE(0x0900, 0x09ff) AM_WRITE(MWA8_RAM) // a backup of default tile colors - AM_RANGE(0x1000, 0x17ff) AM_READWRITE(MRA8_RAM, aeroboto_videoram_w) AM_BASE(&aeroboto_videoram) // tile RAM + AM_RANGE(0x0900, 0x09ff) AM_WRITE(SMH_RAM) // a backup of default tile colors + AM_RANGE(0x1000, 0x17ff) AM_READWRITE(SMH_RAM, aeroboto_videoram_w) AM_BASE(&aeroboto_videoram) // tile RAM AM_RANGE(0x1800, 0x183f) AM_RAM AM_BASE(&aeroboto_hscroll) // horizontal scroll regs - AM_RANGE(0x2000, 0x20ff) AM_READWRITE(MRA8_RAM, aeroboto_tilecolor_w) AM_BASE(&aeroboto_tilecolor) // tile color RAM - AM_RANGE(0x1840, 0x27ff) AM_WRITE(MWA8_NOP) // cleared during custom LSI test + AM_RANGE(0x2000, 0x20ff) AM_READWRITE(SMH_RAM, aeroboto_tilecolor_w) AM_BASE(&aeroboto_tilecolor) // tile color RAM + AM_RANGE(0x1840, 0x27ff) AM_WRITE(SMH_NOP) // cleared during custom LSI test AM_RANGE(0x2800, 0x28ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) // sprite RAM - AM_RANGE(0x2900, 0x2fff) AM_WRITE(MWA8_NOP) // cleared along with sprite RAM + AM_RANGE(0x2900, 0x2fff) AM_WRITE(SMH_NOP) // cleared along with sprite RAM AM_RANGE(0x2973, 0x2973) AM_READ(aeroboto_2973_r) // protection read AM_RANGE(0x3000, 0x3000) AM_READWRITE(aeroboto_in0_r, aeroboto_3000_w) AM_RANGE(0x3001, 0x3001) AM_READWRITE(input_port_2_r, soundlatch_w) AM_RANGE(0x3002, 0x3002) AM_READWRITE(input_port_3_r, soundlatch2_w) AM_RANGE(0x3003, 0x3003) AM_WRITEONLY AM_BASE(&aeroboto_vscroll) - AM_RANGE(0x3004, 0x3004) AM_READWRITE(aeroboto_201_r, MWA8_RAM) AM_BASE(&aeroboto_starx) + AM_RANGE(0x3004, 0x3004) AM_READWRITE(aeroboto_201_r, SMH_RAM) AM_BASE(&aeroboto_starx) AM_RANGE(0x3005, 0x3005) AM_WRITEONLY AM_BASE(&aeroboto_stary) // usable but probably wrong AM_RANGE(0x3006, 0x3006) AM_WRITEONLY AM_BASE(&aeroboto_bgcolor) AM_RANGE(0x3800, 0x3800) AM_READNOP // watchdog or IRQ ack diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index dfd1bfe75e1..aa57603fafe 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -165,10 +165,10 @@ static ADDRESS_MAP_START( pspikes_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE(&aerofgt_spriteram1) AM_SIZE(&aerofgt_spriteram1_size) - AM_RANGE(0xff8000, 0xff8fff) AM_READWRITE(MRA16_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) + AM_RANGE(0xff8000, 0xff8fff) AM_READWRITE(SMH_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) AM_RANGE(0xffc000, 0xffc3ff) AM_WRITEONLY AM_BASE(&aerofgt_spriteram3) AM_SIZE(&aerofgt_spriteram3_size) AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(&aerofgt_rasterram) /* bg1 scroll registers */ - AM_RANGE(0xffe000, 0xffefff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xffe000, 0xffefff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xfff000, 0xfff001) AM_READWRITE(input_port_0_word_r, pspikes_palette_bank_w) AM_RANGE(0xfff002, 0xfff003) AM_READWRITE(input_port_1_word_r, pspikes_gfxbank_w) AM_RANGE(0xfff004, 0xfff005) AM_READWRITE(input_port_2_word_r, aerofgt_bg1scrolly_w) @@ -180,11 +180,11 @@ static ADDRESS_MAP_START( pspikesb_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE(&aerofgt_spriteram1) AM_SIZE(&aerofgt_spriteram1_size) AM_RANGE(0xc04000, 0xc04001) AM_WRITENOP - AM_RANGE(0xff8000, 0xff8fff) AM_READWRITE(MRA16_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) + AM_RANGE(0xff8000, 0xff8fff) AM_READWRITE(SMH_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) AM_RANGE(0xffc000, 0xffcbff) AM_RAM AM_BASE(&aerofgt_spriteram3) AM_SIZE(&aerofgt_spriteram3_size) AM_RANGE(0xffd200, 0xffd201) AM_WRITE(pspikesb_gfxbank_w) AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(&aerofgt_rasterram) /* bg1 scroll registers */ - AM_RANGE(0xffe000, 0xffefff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xffe000, 0xffefff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xfff000, 0xfff001) AM_READ(input_port_0_word_r) AM_RANGE(0xfff002, 0xfff003) AM_READ(input_port_1_word_r) AM_RANGE(0xfff004, 0xfff005) AM_READWRITE(input_port_2_word_r, aerofgt_bg1scrolly_w) @@ -213,10 +213,10 @@ static ADDRESS_MAP_START( pspikesc_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE(&aerofgt_spriteram1) AM_SIZE(&aerofgt_spriteram1_size) - AM_RANGE(0xff8000, 0xff8fff) AM_READWRITE(MRA16_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) + AM_RANGE(0xff8000, 0xff8fff) AM_READWRITE(SMH_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) AM_RANGE(0xffc000, 0xffcbff) AM_RAM AM_BASE(&aerofgt_spriteram3) AM_SIZE(&aerofgt_spriteram3_size) AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(&aerofgt_rasterram) /* bg1 scroll registers */ - AM_RANGE(0xffe000, 0xffefff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xffe000, 0xffefff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xfff000, 0xfff001) AM_READWRITE(input_port_0_word_r, pspikes_palette_bank_w) AM_RANGE(0xfff002, 0xfff003) AM_READWRITE(input_port_1_word_r, pspikes_gfxbank_w) AM_RANGE(0xfff004, 0xfff005) AM_READ(input_port_2_word_r) @@ -227,14 +227,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( karatblz_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x080000, 0x081fff) AM_READWRITE(MRA16_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) - AM_RANGE(0x082000, 0x083fff) AM_READWRITE(MRA16_RAM, aerofgt_bg2videoram_w) AM_BASE(&aerofgt_bg2videoram) + AM_RANGE(0x080000, 0x081fff) AM_READWRITE(SMH_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) + AM_RANGE(0x082000, 0x083fff) AM_READWRITE(SMH_RAM, aerofgt_bg2videoram_w) AM_BASE(&aerofgt_bg2videoram) AM_RANGE(0x0a0000, 0x0affff) AM_RAM AM_BASE(&aerofgt_spriteram1) AM_SIZE(&aerofgt_spriteram1_size) AM_RANGE(0x0b0000, 0x0bffff) AM_RAM AM_BASE(&aerofgt_spriteram2) AM_SIZE(&aerofgt_spriteram2_size) AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */ AM_RANGE(0x0fc000, 0x0fc7ff) AM_RAM AM_BASE(&aerofgt_spriteram3) AM_SIZE(&aerofgt_spriteram3_size) - AM_RANGE(0x0fe000, 0x0fe7ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0fe000, 0x0fe7ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0ff000, 0x0ff001) AM_READ(input_port_0_word_r) AM_RANGE(0x0ff002, 0x0ff003) AM_READWRITE(input_port_1_word_r, karatblz_gfxbank_w) AM_RANGE(0x0ff004, 0x0ff005) AM_READ(input_port_2_word_r) @@ -247,12 +247,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spinlbrk_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) - AM_RANGE(0x082000, 0x082fff) AM_READWRITE(MRA16_RAM, aerofgt_bg2videoram_w) AM_BASE(&aerofgt_bg2videoram) + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(SMH_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) + AM_RANGE(0x082000, 0x082fff) AM_READWRITE(SMH_RAM, aerofgt_bg2videoram_w) AM_BASE(&aerofgt_bg2videoram) AM_RANGE(0xff8000, 0xffbfff) AM_RAM /* work RAM */ AM_RANGE(0xffc000, 0xffc7ff) AM_RAM AM_BASE(&aerofgt_spriteram3) AM_SIZE(&aerofgt_spriteram3_size) AM_RANGE(0xffd000, 0xffd1ff) AM_RAM AM_BASE(&aerofgt_rasterram) /* bg1 scroll registers */ - AM_RANGE(0xffe000, 0xffe7ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xffe000, 0xffe7ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xfff000, 0xfff001) AM_READWRITE(input_port_0_word_r, spinlbrk_gfxbank_w) AM_RANGE(0xfff002, 0xfff003) AM_READWRITE(input_port_1_word_r, aerofgt_bg2scrollx_w) AM_RANGE(0xfff004, 0xfff005) AM_READ(input_port_2_word_r) @@ -263,34 +263,34 @@ static ADDRESS_MAP_START( turbofrc_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) AM_RANGE(0x000000, 0x0bffff) AM_ROM AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ - AM_RANGE(0x0d0000, 0x0d1fff) AM_READWRITE(MRA16_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) - AM_RANGE(0x0d2000, 0x0d3fff) AM_READWRITE(MRA16_RAM, aerofgt_bg2videoram_w) AM_BASE(&aerofgt_bg2videoram) + AM_RANGE(0x0d0000, 0x0d1fff) AM_READWRITE(SMH_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) + AM_RANGE(0x0d2000, 0x0d3fff) AM_READWRITE(SMH_RAM, aerofgt_bg2videoram_w) AM_BASE(&aerofgt_bg2videoram) AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM AM_BASE(&aerofgt_spriteram1) AM_SIZE(&aerofgt_spriteram1_size) AM_RANGE(0x0e4000, 0x0e7fff) AM_RAM AM_BASE(&aerofgt_spriteram2) AM_SIZE(&aerofgt_spriteram2_size) AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */ AM_RANGE(0x0fc000, 0x0fc7ff) AM_RAM AM_BASE(&aerofgt_spriteram3) AM_SIZE(&aerofgt_spriteram3_size) AM_RANGE(0x0fd000, 0x0fdfff) AM_RAM AM_BASE(&aerofgt_rasterram) /* bg1 scroll registers */ - AM_RANGE(0x0fe000, 0x0fe7ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0fe000, 0x0fe7ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0ff000, 0x0ff001) AM_READ(input_port_0_word_r) AM_RANGE(0x0ff002, 0x0ff003) AM_READWRITE(input_port_1_word_r, aerofgt_bg1scrolly_w) AM_RANGE(0x0ff004, 0x0ff005) AM_READWRITE(input_port_2_word_r, aerofgt_bg2scrollx_w) AM_RANGE(0x0ff006, 0x0ff007) AM_READWRITE(pending_command_r, aerofgt_bg2scrolly_w) AM_RANGE(0x0ff008, 0x0ff009) AM_READ(input_port_3_word_r) AM_RANGE(0x0ff008, 0x0ff00b) AM_WRITE(turbofrc_gfxbank_w) - AM_RANGE(0x0ff00c, 0x0ff00d) AM_WRITE(MWA16_NOP) /* related to bg2 (written together with the scroll registers) */ + AM_RANGE(0x0ff00c, 0x0ff00d) AM_WRITE(SMH_NOP) /* related to bg2 (written together with the scroll registers) */ AM_RANGE(0x0ff00e, 0x0ff00f) AM_WRITE(turbofrc_sound_command_w) ADDRESS_MAP_END static ADDRESS_MAP_START( aerofgtb_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ - AM_RANGE(0x0d0000, 0x0d1fff) AM_READWRITE(MRA16_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) - AM_RANGE(0x0d2000, 0x0d3fff) AM_READWRITE(MRA16_RAM, aerofgt_bg2videoram_w) AM_BASE(&aerofgt_bg2videoram) + AM_RANGE(0x0d0000, 0x0d1fff) AM_READWRITE(SMH_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) + AM_RANGE(0x0d2000, 0x0d3fff) AM_READWRITE(SMH_RAM, aerofgt_bg2videoram_w) AM_BASE(&aerofgt_bg2videoram) AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM AM_BASE(&aerofgt_spriteram1) AM_SIZE(&aerofgt_spriteram1_size) AM_RANGE(0x0e4000, 0x0e7fff) AM_RAM AM_BASE(&aerofgt_spriteram2) AM_SIZE(&aerofgt_spriteram2_size) AM_RANGE(0x0f8000, 0x0fbfff) AM_RAM /* work RAM */ AM_RANGE(0x0fc000, 0x0fc7ff) AM_RAM AM_BASE(&aerofgt_spriteram3) AM_SIZE(&aerofgt_spriteram3_size) - AM_RANGE(0x0fd000, 0x0fd7ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0fd000, 0x0fd7ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0fe000, 0x0fe001) AM_READ(input_port_0_word_r) AM_RANGE(0x0fe002, 0x0fe003) AM_READWRITE(input_port_1_word_r, aerofgt_bg1scrolly_w) AM_RANGE(0x0fe004, 0x0fe005) AM_READWRITE(input_port_2_word_r, aerofgt_bg2scrollx_w) @@ -303,12 +303,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( aerofgt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x1a0000, 0x1a07ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x1a0000, 0x1a07ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x1b0000, 0x1b07ff) AM_RAM AM_BASE(&aerofgt_rasterram) /* used only for the scroll registers */ AM_RANGE(0x1b0800, 0x1b0801) AM_NOP /* ??? */ AM_RANGE(0x1b0ff0, 0x1b0fff) AM_RAM /* stack area during boot */ - AM_RANGE(0x1b2000, 0x1b3fff) AM_READWRITE(MRA16_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) - AM_RANGE(0x1b4000, 0x1b5fff) AM_READWRITE(MRA16_RAM, aerofgt_bg2videoram_w) AM_BASE(&aerofgt_bg2videoram) + AM_RANGE(0x1b2000, 0x1b3fff) AM_READWRITE(SMH_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) + AM_RANGE(0x1b4000, 0x1b5fff) AM_READWRITE(SMH_RAM, aerofgt_bg2videoram_w) AM_BASE(&aerofgt_bg2videoram) AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM AM_BASE(&aerofgt_spriteram1) AM_SIZE(&aerofgt_spriteram1_size) AM_RANGE(0x1c4000, 0x1c7fff) AM_RAM AM_BASE(&aerofgt_spriteram2) AM_SIZE(&aerofgt_spriteram2_size) AM_RANGE(0x1d0000, 0x1d1fff) AM_RAM AM_BASE(&aerofgt_spriteram3) AM_SIZE(&aerofgt_spriteram3_size) @@ -321,7 +321,7 @@ static ADDRESS_MAP_START( aerofgt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xffffa4, 0xffffa5) AM_READ(input_port_2_word_r) AM_RANGE(0xffffa6, 0xffffa7) AM_READ(input_port_3_word_r) AM_RANGE(0xffffa8, 0xffffa9) AM_READ(input_port_4_word_r) - AM_RANGE(0xffffac, 0xffffad) AM_READWRITE(pending_command_r, MWA16_NOP) /* ??? */ + AM_RANGE(0xffffac, 0xffffad) AM_READWRITE(pending_command_r, SMH_NOP) /* ??? */ AM_RANGE(0xffffae, 0xffffaf) AM_READ(input_port_5_word_r) AM_RANGE(0xffffc0, 0xffffc1) AM_WRITE(sound_command_w) ADDRESS_MAP_END @@ -357,14 +357,14 @@ static ADDRESS_MAP_START( wbbc97_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x50ffff) AM_RAM /* work RAM */ AM_RANGE(0x600000, 0x605fff) AM_RAM AM_BASE(&aerofgt_spriteram1) AM_SIZE(&aerofgt_spriteram1_size) AM_RANGE(0xa00000, 0xa3ffff) AM_RAM AM_BASE(&wbbc97_bitmapram) - AM_RANGE(0xff8000, 0xff8fff) AM_READWRITE(MRA16_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) + AM_RANGE(0xff8000, 0xff8fff) AM_READWRITE(SMH_RAM, aerofgt_bg1videoram_w) AM_BASE(&aerofgt_bg1videoram) AM_RANGE(0xffc000, 0xffc3ff) AM_WRITEONLY AM_BASE(&aerofgt_spriteram3) AM_SIZE(&aerofgt_spriteram3_size) AM_RANGE(0xffd000, 0xffdfff) AM_RAM AM_BASE(&aerofgt_rasterram) /* bg1 scroll registers */ - AM_RANGE(0xffe000, 0xffefff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xffe000, 0xffefff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xfff000, 0xfff001) AM_READWRITE(input_port_0_word_r, pspikes_palette_bank_w) AM_RANGE(0xfff002, 0xfff003) AM_READWRITE(input_port_1_word_r, pspikes_gfxbank_w) AM_RANGE(0xfff004, 0xfff005) AM_READWRITE(input_port_2_word_r, aerofgt_bg1scrolly_w) - AM_RANGE(0xfff006, 0xfff007) AM_READWRITE(MRA16_NOP, sound_command_w) + AM_RANGE(0xfff006, 0xfff007) AM_READWRITE(SMH_NOP, sound_command_w) AM_RANGE(0xfff00e, 0xfff00f) AM_WRITE(wbbc97_bitmap_enable_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c index 57b3898d5ac..6ef5d3df46a 100644 --- a/src/mame/drivers/ajax.c +++ b/src/mame/drivers/ajax.c @@ -35,7 +35,7 @@ static ADDRESS_MAP_START( ajax_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01c0) AM_READWRITE(ajax_ls138_f10_r, ajax_ls138_f10_w) /* bankswitch + sound command + FIRQ command */ AM_RANGE(0x0800, 0x0807) AM_READWRITE(K051937_r, K051937_w) /* sprite control registers */ AM_RANGE(0x0c00, 0x0fff) AM_READWRITE(K051960_r, K051960_w) /* sprite RAM 2128SL at J7 */ - AM_RANGE(0x1000, 0x1fff) AM_READWRITE(MRA8_RAM, paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE(&paletteram)/* palette */ + AM_RANGE(0x1000, 0x1fff) AM_READWRITE(SMH_RAM, paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE(&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 */ diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c index 7f1d5249678..1e2cf530604 100644 --- a/src/mame/drivers/aleck64.c +++ b/src/mame/drivers/aleck64.c @@ -201,7 +201,7 @@ static ADDRESS_MAP_START( n64_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1fc00000, 0x1fc007bf) AM_ROM AM_REGION(REGION_USER1, 0) // PIF ROM AM_RANGE(0x1fc007c0, 0x1fc007ff) AM_READWRITE(n64_pif_ram_r, n64_pif_ram_w) - AM_RANGE(0xc0800000, 0xc08fffff) AM_READWRITE(aleck_dips_r, MWA32_NOP) + AM_RANGE(0xc0800000, 0xc08fffff) AM_READWRITE(aleck_dips_r, SMH_NOP) AM_RANGE(0xd0000000, 0xd0000fff) AM_RAM AM_RANGE(0xd0010000, 0xd00109ff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index 951a535e332..922a352840f 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -276,11 +276,11 @@ static void alg_cia_0_porta_w(UINT8 data) /* 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(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, MWA16_BANK1); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, SMH_BANK1); else /* overlay enabled, map Amiga system ROM on 0x000000 */ - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, MWA16_UNMAP); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, SMH_UNMAP); } diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index 5c61f719ff9..0ab2549085a 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -700,7 +700,7 @@ static ADDRESS_MAP_START( alpha68k_I_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM // main program AM_RANGE(0x080000, 0x083fff) AM_RAM // work RAM AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE(&spriteram16) // video RAM - AM_RANGE(0x180000, 0x180001) AM_READWRITE(input_port_3_word_r, MWA16_NOP) // LSB: DSW0, MSB: watchdog(?) + AM_RANGE(0x180000, 0x180001) AM_READWRITE(input_port_3_word_r, SMH_NOP) // LSB: DSW0, MSB: watchdog(?) AM_RANGE(0x180008, 0x180009) AM_READ(input_port_4_word_r) // LSB: DSW1 AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r) // joy1, joy2 AM_RANGE(0x340000, 0x340001) AM_READ(input_port_1_word_r) // coin, start, service @@ -716,13 +716,13 @@ static ADDRESS_MAP_START( alpha68k_II_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0000, 0x0c00ff) AM_WRITE(alpha68k_II_video_bank_w) AM_RANGE(0x0c8000, 0x0c8001) AM_READ(control_3_r) /* Bottom of CN2 */ AM_RANGE(0x0d0000, 0x0d0001) AM_READ(control_4_r) /* Top of CN1 & CN2 */ - AM_RANGE(0x0d8000, 0x0d8001) AM_READ(MRA16_NOP) /* IRQ ack? */ - AM_RANGE(0x0e0000, 0x0e0001) AM_READ(MRA16_NOP) /* IRQ ack? */ - AM_RANGE(0x0e8000, 0x0e8001) AM_READ(MRA16_NOP) /* watchdog? */ - AM_RANGE(0x100000, 0x100fff) AM_READWRITE(MRA16_RAM, alpha68k_videoram_w) AM_BASE(&videoram16) + AM_RANGE(0x0d8000, 0x0d8001) AM_READ(SMH_NOP) /* IRQ ack? */ + AM_RANGE(0x0e0000, 0x0e0001) AM_READ(SMH_NOP) /* IRQ ack? */ + AM_RANGE(0x0e8000, 0x0e8001) AM_READ(SMH_NOP) /* watchdog? */ + AM_RANGE(0x100000, 0x100fff) AM_READWRITE(SMH_RAM, alpha68k_videoram_w) AM_BASE(&videoram16) AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE(&spriteram16) AM_RANGE(0x300000, 0x3001ff) AM_READWRITE(alpha_II_trigger_r, alpha_microcontroller_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, alpha68k_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, alpha68k_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x800000, 0x83ffff) AM_ROMBANK(8) ADDRESS_MAP_END @@ -735,12 +735,12 @@ static ADDRESS_MAP_START( alpha68k_V_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0d8000, 0x0d8001) AM_READNOP /* IRQ ack? */ AM_RANGE(0x0e0000, 0x0e0001) AM_READNOP /* IRQ ack? */ AM_RANGE(0x0e8000, 0x0e8001) AM_READNOP /* watchdog? */ - AM_RANGE(0x100000, 0x100fff) AM_READWRITE(MRA16_RAM, alpha68k_videoram_w) AM_BASE(&videoram16) + AM_RANGE(0x100000, 0x100fff) AM_READWRITE(SMH_RAM, alpha68k_videoram_w) AM_BASE(&videoram16) AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE(&spriteram16) AM_RANGE(0x300000, 0x303fff) AM_READ(alpha_V_trigger_r) 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_READWRITE(MRA16_RAM, alpha68k_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x401fff) AM_READWRITE(SMH_RAM, alpha68k_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x800000, 0x83ffff) AM_ROMBANK(8) ADDRESS_MAP_END @@ -787,13 +787,13 @@ static ADDRESS_MAP_START( kyros_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) AM_RANGE(0xe002, 0xe002) AM_WRITE(soundlatch_clear_w) AM_RANGE(0xe004, 0xe004) AM_WRITE(DAC_0_signed_data_w) - AM_RANGE(0xe006, 0xe00e) AM_WRITE(MWA8_NOP) // soundboard I/O's, ignored + AM_RANGE(0xe006, 0xe00e) AM_WRITE(SMH_NOP) // soundboard I/O's, ignored /* reference only - AM_RANGE(0xe006, 0xe006) AM_WRITE(MWA8_NOP) // NMI: diminishing saw-tooth - AM_RANGE(0xe008, 0xe008) AM_WRITE(MWA8_NOP) // NMI: 00 - AM_RANGE(0xe00a, 0xe00a) AM_WRITE(MWA8_NOP) // RST38: 20 - AM_RANGE(0xe00c, 0xe00c) AM_WRITE(MWA8_NOP) // RST30: 00 on entry - AM_RANGE(0xe00e, 0xe00e) AM_WRITE(MWA8_NOP) // RST30: 00,02,ff on exit(0x1d88) + AM_RANGE(0xe006, 0xe006) AM_WRITE(SMH_NOP) // NMI: diminishing saw-tooth + AM_RANGE(0xe008, 0xe008) AM_WRITE(SMH_NOP) // NMI: 00 + AM_RANGE(0xe00a, 0xe00a) AM_WRITE(SMH_NOP) // RST38: 20 + AM_RANGE(0xe00c, 0xe00c) AM_WRITE(SMH_NOP) // RST30: 00 on entry + AM_RANGE(0xe00e, 0xe00e) AM_WRITE(SMH_NOP) // RST30: 00,02,ff on exit(0x1d88) */ ADDRESS_MAP_END @@ -853,7 +853,7 @@ static ADDRESS_MAP_START( jongbou_sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x01, 0x01) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) AM_RANGE(0x02, 0x02) AM_WRITE(soundlatch_clear_w) - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP) + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( tnexspce_sound_portmap, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c index d61a795b3d3..dd5eea64d8b 100644 --- a/src/mame/drivers/ambush.c +++ b/src/mame/drivers/ambush.c @@ -66,9 +66,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc200, 0xc3ff) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc400, 0xc7ff) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xc800, 0xc800) AM_READ(input_port_2_r) - AM_RANGE(0xcc00, 0xcc03) AM_WRITE(MWA8_NOP) + AM_RANGE(0xcc00, 0xcc03) AM_WRITE(SMH_NOP) AM_RANGE(0xcc04, 0xcc04) AM_WRITE(flip_screen_w) - AM_RANGE(0xcc05, 0xcc05) AM_WRITE(MWA8_RAM) AM_BASE(&ambush_colorbank) + AM_RANGE(0xcc05, 0xcc05) AM_WRITE(SMH_RAM) AM_BASE(&ambush_colorbank) AM_RANGE(0xcc07, 0xcc07) AM_WRITE(ambush_coin_counter_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/amidar.c b/src/mame/drivers/amidar.c index ecbebfdc16f..66bb68b74ad 100644 --- a/src/mame/drivers/amidar.c +++ b/src/mame/drivers/amidar.c @@ -81,22 +81,22 @@ static WRITE8_HANDLER(amidar_ppi8255_1_w) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) AM_RANGE(0xa800, 0xa800) AM_READ(watchdog_reset_r) AM_RANGE(0xb000, 0xb03f) AM_READ(amidar_ppi8255_0_r) AM_RANGE(0xb800, 0xb83f) AM_READ(amidar_ppi8255_1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(scramble_background_red_w) AM_RANGE(0xa008, 0xa008) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0xa010, 0xa010) AM_WRITE(galaxian_flip_screen_x_w) @@ -111,14 +111,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( amidar_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_READ(amidar_soundram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( amidar_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(amidar_soundram_w) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_NOP) AM_BASE(&amidar_soundram) /* only here to initialize pointer */ + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_NOP) AM_BASE(&amidar_soundram) /* only here to initialize pointer */ AM_RANGE(0x9000, 0x9fff) AM_WRITE(scramble_filter_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index e7b15538b1b..8069ff6d00e 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -75,8 +75,8 @@ static WRITE8_HANDLER( amspdwy_sound_w ) static ADDRESS_MAP_START( amspdwy_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM AM_RANGE(0x8000, 0x801f) AM_WRITE(amspdwy_paletteram_w) AM_BASE(&paletteram)// Palette - AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_READWRITE(MRA8_RAM, amspdwy_videoram_w) AM_BASE(&videoram) // Layer, mirrored? - AM_RANGE(0x9800, 0x9bff) AM_READWRITE(MRA8_RAM, amspdwy_colorram_w) AM_BASE(&colorram) // Layer + AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_READWRITE(SMH_RAM, amspdwy_videoram_w) AM_BASE(&videoram) // Layer, mirrored? + AM_RANGE(0x9800, 0x9bff) AM_READWRITE(SMH_RAM, amspdwy_colorram_w) AM_BASE(&colorram) // Layer AM_RANGE(0x9c00, 0x9fff) AM_RAM // Unused? // AM_RANGE(0xa000, 0xa000) AM_WRITENOP // ? AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) // DSW 1 diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c index a13839b148a..23bd9c4d77c 100644 --- a/src/mame/drivers/angelkds.c +++ b/src/mame/drivers/angelkds.c @@ -217,11 +217,11 @@ 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(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xe3ff) AM_READWRITE(MRA8_RAM, angelkds_bgtopvideoram_w) AM_BASE(&angelkds_bgtopvideoram) /* Top Half of Screen */ - AM_RANGE(0xe400, 0xe7ff) AM_READWRITE(MRA8_RAM, angelkds_bgbotvideoram_w) AM_BASE(&angelkds_bgbotvideoram) /* Bottom Half of Screen */ - AM_RANGE(0xe800, 0xebff) AM_READWRITE(MRA8_RAM, angelkds_txvideoram_w) AM_BASE(&angelkds_txvideoram) + AM_RANGE(0xe000, 0xe3ff) AM_READWRITE(SMH_RAM, angelkds_bgtopvideoram_w) AM_BASE(&angelkds_bgtopvideoram) /* Top Half of Screen */ + AM_RANGE(0xe400, 0xe7ff) AM_READWRITE(SMH_RAM, angelkds_bgbotvideoram_w) AM_BASE(&angelkds_bgbotvideoram) /* Bottom Half of Screen */ + AM_RANGE(0xe800, 0xebff) AM_READWRITE(SMH_RAM, angelkds_txvideoram_w) AM_BASE(&angelkds_txvideoram) AM_RANGE(0xec00, 0xecff) AM_RAM AM_BASE(&spriteram) - AM_RANGE(0xed00, 0xeeff) AM_READWRITE(MRA8_RAM, angelkds_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0xed00, 0xeeff) AM_READWRITE(SMH_RAM, angelkds_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xef00, 0xefff) AM_RAM AM_RANGE(0xf000, 0xf000) AM_WRITE(angelkds_bgtopbank_write) AM_RANGE(0xf001, 0xf001) AM_WRITE(angelkds_bgtopscroll_write) @@ -233,15 +233,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) // 00 on start-up, not again + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) // 00 on start-up, not again AM_RANGE(0x42, 0x42) AM_WRITE(angelkds_cpu_bank_write) - AM_RANGE(0x43, 0x43) AM_WRITE(MWA8_NOP) // 9a on start-up, not again + AM_RANGE(0x43, 0x43) AM_WRITE(SMH_NOP) // 9a on start-up, not again AM_RANGE(0x40, 0x40) AM_READ(input_port_0_r) /* "Coinage" Dip Switches */ AM_RANGE(0x41, 0x41) AM_READ(input_port_1_r) /* Other Dip Switches */ AM_RANGE(0x42, 0x42) AM_READ(input_port_2_r) /* Players inputs (not needed ?) */ AM_RANGE(0x80, 0x80) AM_READ(input_port_3_r) /* System inputs */ AM_RANGE(0x81, 0x82) AM_READ(angelkds_input_r) /* Players inputs */ - AM_RANGE(0x83, 0x83) AM_WRITE(MWA8_NOP) // 9b on start-up, not again + AM_RANGE(0x83, 0x83) AM_WRITE(SMH_NOP) // 9b on start-up, not again AM_RANGE(0xc0, 0xc3) AM_READWRITE(angelkds_main_sound_r, angelkds_main_sound_w) // 02 various points ADDRESS_MAP_END diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index 18dfe9f5954..6632a726841 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -145,40 +145,40 @@ static WRITE8_HANDLER( aquarium_oki_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM) - AM_RANGE(0xc80000, 0xc81fff) AM_READ(MRA16_RAM) /* sprite ram */ - AM_RANGE(0xd00000, 0xd00fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM) + AM_RANGE(0xc80000, 0xc81fff) AM_READ(SMH_RAM) /* sprite ram */ + AM_RANGE(0xd00000, 0xd00fff) AM_READ(SMH_RAM) AM_RANGE(0xd80080, 0xd80081) AM_READ(input_port_0_word_r) - AM_RANGE(0xd80082, 0xd80083) AM_READ(MRA16_NOP) /* stored but not read back ? check code at 0x01f440 */ + AM_RANGE(0xd80082, 0xd80083) AM_READ(SMH_NOP) /* stored but not read back ? check code at 0x01f440 */ AM_RANGE(0xd80084, 0xd80085) AM_READ(input_port_1_word_r) AM_RANGE(0xd80086, 0xd80087) AM_READ(aquarium_coins_r) - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0xc00000, 0xc00fff) AM_WRITE(aquarium_mid_videoram_w) AM_BASE(&aquarium_mid_videoram) AM_RANGE(0xc01000, 0xc01fff) AM_WRITE(aquarium_bak_videoram_w) AM_BASE(&aquarium_bak_videoram) AM_RANGE(0xc02000, 0xc03fff) AM_WRITE(aquarium_txt_videoram_w) AM_BASE(&aquarium_txt_videoram) - AM_RANGE(0xc80000, 0xc81fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xc80000, 0xc81fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xd00000, 0xd00fff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xd80014, 0xd8001f) AM_WRITE(MWA16_RAM) AM_BASE(&aquarium_scroll) + AM_RANGE(0xd80014, 0xd8001f) AM_WRITE(SMH_RAM) AM_BASE(&aquarium_scroll) AM_RANGE(0xd80068, 0xd80069) AM_WRITENOP /* probably not used */ AM_RANGE(0xd80088, 0xd80089) AM_WRITENOP /* ?? video related */ AM_RANGE(0xd8008a, 0xd8008b) AM_WRITE(aquarium_sound_w) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( snd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( snd_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c index 06149376528..93b086096ff 100644 --- a/src/mame/drivers/arabian.c +++ b/src/mame/drivers/arabian.c @@ -215,7 +215,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x01ff) AM_READ(input_port_0_r) AM_RANGE(0xc200, 0xc200) AM_MIRROR(0x01ff) AM_READ(input_port_1_r) AM_RANGE(0xd000, 0xd7ef) AM_RAM AM_BASE(&custom_cpu_ram) - AM_RANGE(0xd7f0, 0xd7ff) AM_READWRITE(custom_cpu_r, MWA8_RAM) + AM_RANGE(0xd7f0, 0xd7ff) AM_READWRITE(custom_cpu_r, SMH_RAM) AM_RANGE(0xe000, 0xe007) AM_MIRROR(0x0ff8) AM_WRITE(arabian_blitter_w) AM_BASE(&arabian_blitter) ADDRESS_MAP_END diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c index bb70884f360..4d24525976e 100644 --- a/src/mame/drivers/arcadecl.c +++ b/src/mame/drivers/arcadecl.c @@ -173,10 +173,10 @@ static WRITE16_HANDLER( latch_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x200000, 0x21ffff) AM_RAM AM_BASE(&rampart_bitmap) - AM_RANGE(0x3c0000, 0x3c07ff) AM_READWRITE(MRA16_RAM, atarigen_expanded_666_paletteram_w) AM_BASE(&paletteram16) - AM_RANGE(0x3e0000, 0x3e07ff) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0x3c0000, 0x3c07ff) AM_READWRITE(SMH_RAM, atarigen_expanded_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x3e0000, 0x3e07ff) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3e0800, 0x3effbf) AM_RAM - AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(MRA16_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) + AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(SMH_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x640000, 0x640001) AM_READ(input_port_0_word_r) AM_RANGE(0x640002, 0x640003) AM_READ(input_port_1_word_r) AM_RANGE(0x640010, 0x640011) AM_READ(input_port_2_word_r) diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c index cee6237ed64..362ab94ef86 100644 --- a/src/mame/drivers/arcadia.c +++ b/src/mame/drivers/arcadia.c @@ -71,7 +71,7 @@ static UINT8 coin_counter[2]; static WRITE16_HANDLER( arcadia_multibios_change_game ) { - memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x800000, 0x97ffff, 0, 0, (data == 0) ? MRA16_BANK2 : MRA16_NOP); + memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x800000, 0x97ffff, 0, 0, (data == 0) ? SMH_BANK2 : SMH_NOP); } @@ -104,11 +104,11 @@ static void arcadia_cia_0_porta_w(UINT8 data) /* 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(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, MWA16_BANK1); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, SMH_BANK1); else /* overlay enabled, map Amiga system ROM on 0x000000 */ - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, MWA16_UNMAP); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, SMH_UNMAP); /* bit 2 = Power Led on Amiga */ set_led_status(0, (data & 2) ? 0 : 1); diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c index 70af92a8f61..5d0451e6136 100644 --- a/src/mame/drivers/argus.c +++ b/src/mame/drivers/argus.c @@ -277,8 +277,8 @@ static WRITE8_HANDLER( butasan_pagedram_w ) ***************************************************************************/ static ADDRESS_MAP_START( argus_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r) // Coin AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r) // Player 1 AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r) // Player 2 @@ -287,14 +287,14 @@ static ADDRESS_MAP_START( argus_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc400, 0xcfff) AM_READ(argus_paletteram_r) AM_RANGE(0xd000, 0xd7ff) AM_READ(argus_txram_r) AM_RANGE(0xd800, 0xdfff) AM_READ(argus_bg1ram_r) - AM_RANGE(0xe000, 0xf1ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf200, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xf1ff) AM_READ(SMH_RAM) + AM_RANGE(0xf200, 0xf7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( argus_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_BANK1) AM_RANGE(0xc200, 0xc200) AM_WRITE(soundlatch_w) AM_RANGE(0xc201, 0xc201) AM_WRITE(argus_flipscreen_w) AM_RANGE(0xc202, 0xc202) AM_WRITE(argus_bankselect_w) @@ -306,14 +306,14 @@ static ADDRESS_MAP_START( argus_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc400, 0xcfff) AM_WRITE(argus_paletteram_w) AM_BASE(&argus_paletteram) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(argus_txram_w) AM_BASE(&argus_txram) AM_RANGE(0xd800, 0xdfff) AM_WRITE(argus_bg1ram_w) AM_BASE(&argus_bg1ram) - AM_RANGE(0xe000, 0xf1ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf200, 0xf7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xf1ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf200, 0xf7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( valtric_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r) // Coin AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r) // Player 1 AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r) // Player 2 @@ -322,14 +322,14 @@ static ADDRESS_MAP_START( valtric_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc400, 0xcfff) AM_READ(argus_paletteram_r) AM_RANGE(0xd000, 0xd7ff) AM_READ(argus_txram_r) AM_RANGE(0xd800, 0xdfff) AM_READ(argus_bg1ram_r) - AM_RANGE(0xe000, 0xf1ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf200, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xf1ff) AM_READ(SMH_RAM) + AM_RANGE(0xf200, 0xf7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( valtric_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_BANK1) AM_RANGE(0xc200, 0xc200) AM_WRITE(soundlatch_w) AM_RANGE(0xc201, 0xc201) AM_WRITE(argus_flipscreen_w) AM_RANGE(0xc202, 0xc202) AM_WRITE(argus_bankselect_w) @@ -340,14 +340,14 @@ static ADDRESS_MAP_START( valtric_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc400, 0xcfff) AM_WRITE(valtric_paletteram_w) AM_BASE(&argus_paletteram) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(argus_txram_w) AM_BASE(&argus_txram) AM_RANGE(0xd800, 0xdfff) AM_WRITE(argus_bg1ram_w) AM_BASE(&argus_bg1ram) - AM_RANGE(0xe000, 0xf1ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf200, 0xf7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xf1ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf200, 0xf7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( butasan_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r) // Coin AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r) // Player 1 AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r) // Player 2 @@ -356,14 +356,14 @@ static ADDRESS_MAP_START( butasan_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc400, 0xc7ff) AM_READ(butasan_bg1ram_r) AM_RANGE(0xc800, 0xcfff) AM_READ(argus_paletteram_r) AM_RANGE(0xd000, 0xdfff) AM_READ(butasan_pagedram_r) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf67f) AM_READ(MRA8_RAM) - AM_RANGE(0xf680, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf67f) AM_READ(SMH_RAM) + AM_RANGE(0xf680, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( butasan_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_BANK1) AM_RANGE(0xc200, 0xc200) AM_WRITE(soundlatch_w) AM_RANGE(0xc201, 0xc201) AM_WRITE(argus_flipscreen_w) AM_RANGE(0xc202, 0xc202) AM_WRITE(argus_bankselect_w) @@ -377,23 +377,23 @@ static ADDRESS_MAP_START( butasan_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc400, 0xc7ff) AM_WRITE(butasan_bg1ram_w) AM_BASE(&butasan_bg1ram) AM_RANGE(0xc800, 0xcfff) AM_WRITE(butasan_paletteram_w) AM_BASE(&argus_paletteram) AM_RANGE(0xd000, 0xdfff) AM_WRITE(butasan_pagedram_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf000, 0xf67f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf680, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf000, 0xf67f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf680, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END WRITE8_HANDLER( bombsa_txram_w ); READ8_HANDLER( bombsa_txram_r ); static ADDRESS_MAP_START( bombsa_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) - AM_RANGE(0xd000, 0xd1ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd200, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xd1ff) AM_READ(SMH_RAM) + AM_RANGE(0xd200, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) /* Input ports */ AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) // Coin AM_RANGE(0xe001, 0xe001) AM_READ(input_port_1_r) // Player 1 @@ -406,10 +406,10 @@ static ADDRESS_MAP_START( bombsa_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bombsa_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_BANK1) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) /* ports look like the other games */ AM_RANGE(0xd000, 0xd000) AM_WRITE(soundlatch_w) // confirmed @@ -417,41 +417,41 @@ static ADDRESS_MAP_START( bombsa_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd002, 0xd002) AM_WRITE(argus_bankselect_w) AM_RANGE(0xd003, 0xd003) AM_WRITE(bombsa_pageselect_w) // 0,1,0,1,0,1 etc. - AM_RANGE(0xd000, 0xd1ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd200, 0xd7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd800, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd000, 0xd1ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd200, 0xd7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd800, 0xdfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) // ?? + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) // ?? AM_RANGE(0xe800, 0xefff) AM_WRITE(bombsa_txram_w) AM_BASE(&argus_txram) // banked? it gets corrupted at game start, maybe its banked and one layer can be 16x16 or 8x8? AM_RANGE(0xf000, 0xffff) AM_WRITE(bombsa_paletteram_w) AM_BASE(&argus_paletteram) // banked? ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem_a, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_a, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem_b, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_b, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_c, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_RAM) // Is this a confirm of some sort? + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_RAM) // Is this a confirm of some sort? ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport_1, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index 988d9dab38a..e35b1a5fe8b 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -248,14 +248,14 @@ static WRITE16_HANDLER( legion_command_c ) static ADDRESS_MAP_START( terraf_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x04ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) - AM_RANGE(0x064000, 0x064fff) AM_READ(MRA16_RAM) - AM_RANGE(0x068000, 0x069fff) AM_READ(MRA16_RAM) - AM_RANGE(0x06a000, 0x06a9ff) AM_READ(MRA16_RAM) - AM_RANGE(0x06C000, 0x06C9ff) AM_READ(MRA16_RAM) - AM_RANGE(0x070000, 0x070fff) AM_READ(MRA16_RAM) - AM_RANGE(0x074000, 0x074fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x04ffff) AM_READ(SMH_ROM) + AM_RANGE(0x060000, 0x063fff) AM_READ(SMH_RAM) + AM_RANGE(0x064000, 0x064fff) AM_READ(SMH_RAM) + AM_RANGE(0x068000, 0x069fff) AM_READ(SMH_RAM) + AM_RANGE(0x06a000, 0x06a9ff) AM_READ(SMH_RAM) + AM_RANGE(0x06C000, 0x06C9ff) AM_READ(SMH_RAM) + AM_RANGE(0x070000, 0x070fff) AM_READ(SMH_RAM) + AM_RANGE(0x074000, 0x074fff) AM_READ(SMH_RAM) AM_RANGE(0x078000, 0x078001) AM_READ(input_port_0_word_r) AM_RANGE(0x078002, 0x078003) AM_READ(input_port_1_word_r) AM_RANGE(0x078004, 0x078005) AM_READ(input_port_2_word_r) @@ -263,13 +263,13 @@ static ADDRESS_MAP_START( terraf_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( terraf_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x04ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x060000, 0x0603ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x060400, 0x063fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x04ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x060000, 0x0603ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x060400, 0x063fff) AM_WRITE(SMH_RAM) AM_RANGE(0x064000, 0x064fff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x068000, 0x069fff) AM_WRITE(armedf_text_videoram_w) AM_BASE(&terraf_text_videoram) - AM_RANGE(0x06a000, 0x06a9ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x06C000, 0x06C9ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x06a000, 0x06a9ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x06C000, 0x06C9ff) AM_WRITE(SMH_RAM) AM_RANGE(0x070000, 0x070fff) AM_WRITE(armedf_fg_videoram_w) AM_BASE(&armedf_fg_videoram) AM_RANGE(0x074000, 0x074fff) AM_WRITE(armedf_bg_videoram_w) AM_BASE(&armedf_bg_videoram) AM_RANGE(0x07c000, 0x07c001) AM_WRITE(terraf_io_w) @@ -278,20 +278,20 @@ static ADDRESS_MAP_START( terraf_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x07c006, 0x07c007) AM_WRITE(terraf_fg_scrollx_w) /* not use in terrafu, 0x07c008 neither */ AM_RANGE(0x07c008, 0x07c009) AM_WRITE(terraf_fg_scrolly_w) /* written twice, lsb and msb */ AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w) - AM_RANGE(0x07c00c, 0x07c00d) AM_WRITE(MWA16_NOP) /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ + AM_RANGE(0x07c00c, 0x07c00d) AM_WRITE(SMH_NOP) /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ AM_RANGE(0x07c00e, 0x07c00f) AM_WRITE(armedf_mcu_cmd) /* MCU Command ? */ AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(terraf_fg_scroll_msb_arm_w) /* written between two consecutive writes to 7c008 */ ADDRESS_MAP_END static ADDRESS_MAP_START( kodure_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) - AM_RANGE(0x064000, 0x064fff) AM_READ(MRA16_RAM) - AM_RANGE(0x068000, 0x069fff) AM_READ(MRA16_RAM) - AM_RANGE(0x06a000, 0x06a9ff) AM_READ(MRA16_RAM) - AM_RANGE(0x06C000, 0x06C9ff) AM_READ(MRA16_RAM) - AM_RANGE(0x070000, 0x070fff) AM_READ(MRA16_RAM) - AM_RANGE(0x074000, 0x074fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) + AM_RANGE(0x060000, 0x063fff) AM_READ(SMH_RAM) + AM_RANGE(0x064000, 0x064fff) AM_READ(SMH_RAM) + AM_RANGE(0x068000, 0x069fff) AM_READ(SMH_RAM) + AM_RANGE(0x06a000, 0x06a9ff) AM_READ(SMH_RAM) + AM_RANGE(0x06C000, 0x06C9ff) AM_READ(SMH_RAM) + AM_RANGE(0x070000, 0x070fff) AM_READ(SMH_RAM) + AM_RANGE(0x074000, 0x074fff) AM_READ(SMH_RAM) AM_RANGE(0x078000, 0x078001) AM_READ(input_port_0_word_r) AM_RANGE(0x078002, 0x078003) AM_READ(input_port_1_word_r) AM_RANGE(0x078004, 0x078005) AM_READ(input_port_2_word_r) @@ -299,32 +299,32 @@ static ADDRESS_MAP_START( kodure_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( kodure_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x060000, 0x060fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x061000, 0x063fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x060000, 0x060fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x061000, 0x063fff) AM_WRITE(SMH_RAM) AM_RANGE(0x064000, 0x064fff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x068000, 0x069fff) AM_WRITE(armedf_text_videoram_w) AM_BASE(&terraf_text_videoram) - AM_RANGE(0x06a000, 0x06a9ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x06C000, 0x06C9ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x06a000, 0x06a9ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x06C000, 0x06C9ff) AM_WRITE(SMH_RAM) AM_RANGE(0x070000, 0x070fff) AM_WRITE(armedf_fg_videoram_w) AM_BASE(&armedf_fg_videoram) AM_RANGE(0x074000, 0x074fff) AM_WRITE(armedf_bg_videoram_w) AM_BASE(&armedf_bg_videoram) AM_RANGE(0x07c000, 0x07c001) AM_WRITE(kodure_io_w) AM_RANGE(0x07c002, 0x07c003) AM_WRITE(armedf_bg_scrollx_w) AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w) AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w) - AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(MWA16_NOP) /* watchdog? */ - AM_RANGE(0xffd000, 0xffd001) AM_WRITE(MWA16_NOP) /* ? */ + AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(SMH_NOP) /* watchdog? */ + AM_RANGE(0xffd000, 0xffd001) AM_WRITE(SMH_NOP) /* ? */ ADDRESS_MAP_END static ADDRESS_MAP_START( cclimbr2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) - AM_RANGE(0x064000, 0x064fff) AM_READ(MRA16_RAM) - AM_RANGE(0x068000, 0x069fff) AM_READ(MRA16_RAM) - AM_RANGE(0x06a000, 0x06a9ff) AM_READ(MRA16_RAM) - AM_RANGE(0x06c000, 0x06c9ff) AM_READ(MRA16_RAM) - AM_RANGE(0x070000, 0x070fff) AM_READ(MRA16_RAM) - AM_RANGE(0x074000, 0x074fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) + AM_RANGE(0x060000, 0x063fff) AM_READ(SMH_RAM) + AM_RANGE(0x064000, 0x064fff) AM_READ(SMH_RAM) + AM_RANGE(0x068000, 0x069fff) AM_READ(SMH_RAM) + AM_RANGE(0x06a000, 0x06a9ff) AM_READ(SMH_RAM) + AM_RANGE(0x06c000, 0x06c9ff) AM_READ(SMH_RAM) + AM_RANGE(0x070000, 0x070fff) AM_READ(SMH_RAM) + AM_RANGE(0x074000, 0x074fff) AM_READ(SMH_RAM) AM_RANGE(0x078000, 0x078001) AM_READ(input_port_0_word_r) AM_RANGE(0x078002, 0x078003) AM_READ(input_port_1_word_r) AM_RANGE(0x078004, 0x078005) AM_READ(input_port_2_word_r) @@ -332,33 +332,33 @@ static ADDRESS_MAP_START( cclimbr2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cclimbr2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x060000, 0x060fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x061000, 0x063fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x060000, 0x060fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x061000, 0x063fff) AM_WRITE(SMH_RAM) AM_RANGE(0x064000, 0x064fff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x068000, 0x069fff) AM_WRITE(armedf_text_videoram_w) AM_BASE(&terraf_text_videoram) - AM_RANGE(0x06a000, 0x06a9ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x06c000, 0x06c9ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x06ca00, 0x06cbff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x06a000, 0x06a9ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x06c000, 0x06c9ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x06ca00, 0x06cbff) AM_WRITE(SMH_RAM) AM_RANGE(0x070000, 0x070fff) AM_WRITE(armedf_fg_videoram_w) AM_BASE(&armedf_fg_videoram) AM_RANGE(0x074000, 0x074fff) AM_WRITE(armedf_bg_videoram_w) AM_BASE(&armedf_bg_videoram) AM_RANGE(0x07c000, 0x07c001) AM_WRITE(io_w) AM_RANGE(0x07c002, 0x07c003) AM_WRITE(armedf_bg_scrollx_w) AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w) AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w) - AM_RANGE(0x07c00e, 0x07c00f) AM_WRITE(MWA16_NOP) /* ? */ - AM_RANGE(0x07c00c, 0x07c00d) AM_WRITE(MWA16_NOP) /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ + AM_RANGE(0x07c00e, 0x07c00f) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0x07c00c, 0x07c00d) AM_WRITE(SMH_NOP) /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ ADDRESS_MAP_END static ADDRESS_MAP_START( legion_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x060000, 0x060fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x061000, 0x063fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x060000, 0x060fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x061000, 0x063fff) AM_WRITE(SMH_RAM) AM_RANGE(0x064000, 0x064fff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x068000, 0x069fff) AM_WRITE(armedf_text_videoram_w) AM_BASE(&terraf_text_videoram) - AM_RANGE(0x06a000, 0x06a9ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x06c000, 0x06c9ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x06ca00, 0x06cbff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x06a000, 0x06a9ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x06c000, 0x06c9ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x06ca00, 0x06cbff) AM_WRITE(SMH_RAM) AM_RANGE(0x070000, 0x070fff) AM_WRITE(armedf_fg_videoram_w) AM_BASE(&armedf_fg_videoram) AM_RANGE(0x074000, 0x074fff) AM_WRITE(armedf_bg_videoram_w) AM_BASE(&armedf_bg_videoram) AM_RANGE(0x07c000, 0x07c001) AM_WRITE(terraf_io_w) @@ -366,20 +366,20 @@ static ADDRESS_MAP_START( legion_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w) AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w) AM_RANGE(0x07c00e, 0x07c00f) AM_WRITE(armedf_mcu_cmd) /* MCU Command ? */ - AM_RANGE(0x07c00c, 0x07c00d) AM_WRITE(MWA16_NOP) /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ + AM_RANGE(0x07c00c, 0x07c00d) AM_WRITE(SMH_NOP) /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ ADDRESS_MAP_END static ADDRESS_MAP_START( legiono_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x04003f) AM_WRITE(MWA16_RAM) AM_BASE(&legion_cmd) - AM_RANGE(0x040040, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x060000, 0x060fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x061000, 0x063fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x04003f) AM_WRITE(SMH_RAM) AM_BASE(&legion_cmd) + AM_RANGE(0x040040, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x060000, 0x060fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x061000, 0x063fff) AM_WRITE(SMH_RAM) AM_RANGE(0x064000, 0x064fff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x068000, 0x069fff) AM_WRITE(armedf_text_videoram_w) AM_BASE(&terraf_text_videoram) - AM_RANGE(0x06a000, 0x06a9ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x06c000, 0x06c9ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x06ca00, 0x06cbff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x06a000, 0x06a9ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x06c000, 0x06c9ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x06ca00, 0x06cbff) AM_WRITE(SMH_RAM) AM_RANGE(0x070000, 0x070fff) AM_WRITE(armedf_fg_videoram_w) AM_BASE(&armedf_fg_videoram) AM_RANGE(0x074000, 0x074fff) AM_WRITE(armedf_bg_videoram_w) AM_BASE(&armedf_bg_videoram) AM_RANGE(0x07c000, 0x07c001) AM_WRITE(terraf_io_w) @@ -387,34 +387,34 @@ static ADDRESS_MAP_START( legiono_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w) AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w) //AM_RANGE(0x07c00e, 0x07c00f) AM_WRITE(armedf_mcu_cmd) /* MCU Command ? */ - //AM_RANGE(0x07c00c, 0x07c00d) AM_WRITE(MWA16_NOP) /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ + //AM_RANGE(0x07c00c, 0x07c00d) AM_WRITE(SMH_NOP) /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */ ADDRESS_MAP_END static ADDRESS_MAP_START( armedf_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x060000, 0x065fff) AM_READ(MRA16_RAM) - AM_RANGE(0x066000, 0x066fff) AM_READ(MRA16_RAM) - AM_RANGE(0x067000, 0x067fff) AM_READ(MRA16_RAM) - AM_RANGE(0x068000, 0x069fff) AM_READ(MRA16_RAM) - AM_RANGE(0x06a000, 0x06afff) AM_READ(MRA16_RAM) - AM_RANGE(0x06b000, 0x06bfff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) + AM_RANGE(0x060000, 0x065fff) AM_READ(SMH_RAM) + AM_RANGE(0x066000, 0x066fff) AM_READ(SMH_RAM) + AM_RANGE(0x067000, 0x067fff) AM_READ(SMH_RAM) + AM_RANGE(0x068000, 0x069fff) AM_READ(SMH_RAM) + AM_RANGE(0x06a000, 0x06afff) AM_READ(SMH_RAM) + AM_RANGE(0x06b000, 0x06bfff) AM_READ(SMH_RAM) AM_RANGE(0x06c000, 0x06c001) AM_READ(input_port_0_word_r) AM_RANGE(0x06c002, 0x06c003) AM_READ(input_port_1_word_r) AM_RANGE(0x06c004, 0x06c005) AM_READ(input_port_2_word_r) AM_RANGE(0x06c006, 0x06c007) AM_READ(input_port_3_word_r) - AM_RANGE(0x06c008, 0x06c7ff) AM_READ(MRA16_RAM) + AM_RANGE(0x06c008, 0x06c7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( armedf_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x060000, 0x060fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x061000, 0x065fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x060000, 0x060fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x061000, 0x065fff) AM_WRITE(SMH_RAM) AM_RANGE(0x066000, 0x066fff) AM_WRITE(armedf_bg_videoram_w) AM_BASE(&armedf_bg_videoram) AM_RANGE(0x067000, 0x067fff) AM_WRITE(armedf_fg_videoram_w) AM_BASE(&armedf_fg_videoram) AM_RANGE(0x068000, 0x069fff) AM_WRITE(armedf_text_videoram_w) AM_BASE(&terraf_text_videoram) AM_RANGE(0x06a000, 0x06afff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x06b000, 0x06bfff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x06c000, 0x06c7ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x06b000, 0x06bfff) AM_WRITE(SMH_RAM) + AM_RANGE(0x06c000, 0x06c7ff) AM_WRITE(SMH_RAM) AM_RANGE(0x06d000, 0x06d001) AM_WRITE(io_w) AM_RANGE(0x06d002, 0x06d003) AM_WRITE(armedf_bg_scrollx_w) AM_RANGE(0x06d004, 0x06d005) AM_WRITE(armedf_bg_scrolly_w) @@ -425,23 +425,23 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( soundreadmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xf7ff) AM_READ(MRA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xf7ff) AM_READ(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( soundwritemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xf7ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xf7ff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( cclimbr2_soundreadmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( cclimbr2_soundwritemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static READ8_HANDLER( soundlatch_clear_r ) diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index 11582d9026c..636cbb2c2a6 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -117,18 +117,18 @@ static WRITE16_HANDLER( ashnojoe_soundlatch_w ) static ADDRESS_MAP_START( ashnojoe_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM - AM_RANGE(0x040000, 0x041fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram3_w) AM_BASE(&ashnojoetileram16_3) - AM_RANGE(0x042000, 0x043fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram4_w) AM_BASE(&ashnojoetileram16_4) - AM_RANGE(0x044000, 0x044fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram5_w) AM_BASE(&ashnojoetileram16_5) - AM_RANGE(0x045000, 0x045fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram2_w) AM_BASE(&ashnojoetileram16_2) - AM_RANGE(0x046000, 0x046fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram6_w) AM_BASE(&ashnojoetileram16_6) - AM_RANGE(0x047000, 0x047fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram7_w) AM_BASE(&ashnojoetileram16_7) - AM_RANGE(0x048000, 0x048fff) AM_READWRITE(MRA16_RAM, ashnojoe_tileram_w) AM_BASE(&ashnojoetileram16) - AM_RANGE(0x049000, 0x049fff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x040000, 0x041fff) AM_READWRITE(SMH_RAM, ashnojoe_tileram3_w) AM_BASE(&ashnojoetileram16_3) + AM_RANGE(0x042000, 0x043fff) AM_READWRITE(SMH_RAM, ashnojoe_tileram4_w) AM_BASE(&ashnojoetileram16_4) + AM_RANGE(0x044000, 0x044fff) AM_READWRITE(SMH_RAM, ashnojoe_tileram5_w) AM_BASE(&ashnojoetileram16_5) + AM_RANGE(0x045000, 0x045fff) AM_READWRITE(SMH_RAM, ashnojoe_tileram2_w) AM_BASE(&ashnojoetileram16_2) + AM_RANGE(0x046000, 0x046fff) AM_READWRITE(SMH_RAM, ashnojoe_tileram6_w) AM_BASE(&ashnojoetileram16_6) + AM_RANGE(0x047000, 0x047fff) AM_READWRITE(SMH_RAM, ashnojoe_tileram7_w) AM_BASE(&ashnojoetileram16_7) + AM_RANGE(0x048000, 0x048fff) AM_READWRITE(SMH_RAM, ashnojoe_tileram_w) AM_BASE(&ashnojoetileram16) + AM_RANGE(0x049000, 0x049fff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x04a000, 0x04a001) AM_READ(input_port_0_word_r) // p1 inputs, coins AM_RANGE(0x04a002, 0x04a003) AM_READ(input_port_1_word_r) // p2 inputs AM_RANGE(0x04a004, 0x04a005) AM_READ(input_port_2_word_r) // dipswitches - AM_RANGE(0x04a006, 0x04a007) AM_WRITE(MWA16_RAM) AM_BASE(&ashnojoe_tilemap_reg) + AM_RANGE(0x04a006, 0x04a007) AM_WRITE(SMH_RAM) AM_BASE(&ashnojoe_tilemap_reg) AM_RANGE(0x04a008, 0x04a009) AM_WRITE(ashnojoe_soundlatch_w) AM_RANGE(0x04a00a, 0x04a00b) AM_READ(fake_4a00a_r) // ?? AM_RANGE(0x04a010, 0x04a019) AM_WRITE(joe_tilemaps_xscroll_w) diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index 126e31861c7..a1e51bd539c 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -189,7 +189,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x180000, 0x1807ff) AM_READWRITE(K053245_word_r, K053245_word_w) AM_RANGE(0x180800, 0x180fff) AM_RAM // extra RAM, or mirror for the above? AM_RANGE(0x200000, 0x20000f) AM_READWRITE(K053244_word_r, K053244_word_w) - AM_RANGE(0x280000, 0x280fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x280000, 0x280fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300000, 0x30001f) AM_READWRITE(K053244_lsb_r, K053244_lsb_w) AM_RANGE(0x380000, 0x380001) AM_READ(input_port_0_word_r) AM_RANGE(0x380002, 0x380003) AM_READ(control1_r) diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index 4185ba33b21..9558cc671b7 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -325,7 +325,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spaceint_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x17ff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_RAM - AM_RANGE(0x4000, 0x5fff) AM_READWRITE(MRA8_RAM, spaceint_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4000, 0x5fff) AM_READWRITE(SMH_RAM, spaceint_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index eabbb87412a..020516baf40 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -421,7 +421,7 @@ static WRITE8_HANDLER( profpac_banksw_w ) profpac_bank = data; /* set the main banking */ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0xbfff, 0, 0, MRA8_BANK1); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0xbfff, 0, 0, SMH_BANK1); memory_set_bankptr(1, memory_region(REGION_USER1) + 0x8000 * bank); /* bank 0 reads video RAM in the 4000-7FFF range */ @@ -437,11 +437,11 @@ static WRITE8_HANDLER( profpac_banksw_w ) /* if the bank is in range, map the appropriate bank */ if (bank < 0x28) { - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, MRA8_BANK2); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, SMH_BANK2); memory_set_bankptr(2, memory_region(REGION_USER2) + 0x4000 * bank); } else - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, MRA8_UNMAP); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, SMH_UNMAP); } } diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index 27e0c9f246f..34cb9392ee5 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -511,14 +511,14 @@ static ADDRESS_MAP_START( astrof_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x5fff) AM_RAM AM_WRITE(astrof_videoram_w) AM_BASE(&astrof_videoram) AM_SIZE(&astrof_videoram_size) AM_RANGE(0x6000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x8002) AM_MIRROR(0x1ff8) AM_NOP - AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&astrof_color) - AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, video_control_1_w) - AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, astrof_video_control_2_w) - AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, astrof_audio_1_w) - AM_RANGE(0x8007, 0x8007) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, astrof_audio_2_w) + AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&astrof_color) + AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, video_control_1_w) + AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, astrof_video_control_2_w) + AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, astrof_audio_1_w) + AM_RANGE(0x8007, 0x8007) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, astrof_audio_2_w) AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ff8) AM_READ_PORT("IN") AM_WRITENOP AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ff8) AM_READ_PORT("DSW") AM_WRITENOP - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READWRITE(irq_ack_r, MWA8_NOP) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READWRITE(irq_ack_r, SMH_NOP) AM_RANGE(0xa003, 0xa007) AM_MIRROR(0x1ff8) AM_NOP AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -530,14 +530,14 @@ static ADDRESS_MAP_START( spfghmk2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x5fff) AM_RAM AM_WRITE(astrof_videoram_w) AM_BASE(&astrof_videoram) AM_SIZE(&astrof_videoram_size) AM_RANGE(0x6000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x8002) AM_MIRROR(0x1ff8) AM_NOP - AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&astrof_color) - AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, video_control_1_w) - AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, spfghmk2_video_control_2_w) - AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, spfghmk2_audio_w) + AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&astrof_color) + AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, video_control_1_w) + AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, spfghmk2_video_control_2_w) + AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, spfghmk2_audio_w) AM_RANGE(0x8007, 0x8007) AM_MIRROR(0x1ff8) AM_NOP AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ff8) AM_READ_PORT("IN") AM_WRITENOP AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ff8) AM_READ_PORT("DSW") AM_WRITENOP - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READWRITE(irq_ack_r, MWA8_NOP) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READWRITE(irq_ack_r, SMH_NOP) AM_RANGE(0xa003, 0xa007) AM_MIRROR(0x1ff8) AM_NOP AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -549,15 +549,15 @@ static ADDRESS_MAP_START( tomahawk_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x5fff) AM_RAM AM_WRITE(tomahawk_videoram_w) AM_BASE(&astrof_videoram) AM_SIZE(&astrof_videoram_size) AM_RANGE(0x6000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x8002) AM_MIRROR(0x1ff8) AM_NOP - AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&astrof_color) - AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, video_control_1_w) - AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, tomahawk_video_control_2_w) - AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, tomahawk_audio_w) - AM_RANGE(0x8007, 0x8007) AM_MIRROR(0x1ff8) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&tomahawk_protection) - AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ff8) AM_READ_PORT("IN") AM_WRITE(MWA8_NOP) - AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ff8) AM_READ_PORT("DSW") AM_WRITE(MWA8_NOP) - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READWRITE(irq_ack_r, MWA8_NOP) - AM_RANGE(0xa003, 0xa003) AM_MIRROR(0x1ff8) AM_READWRITE(tomahawk_protection_r, MWA8_NOP) + AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&astrof_color) + AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, video_control_1_w) + AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, tomahawk_video_control_2_w) + AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, tomahawk_audio_w) + AM_RANGE(0x8007, 0x8007) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&tomahawk_protection) + AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ff8) AM_READ_PORT("IN") AM_WRITE(SMH_NOP) + AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ff8) AM_READ_PORT("DSW") AM_WRITE(SMH_NOP) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READWRITE(irq_ack_r, SMH_NOP) + AM_RANGE(0xa003, 0xa003) AM_MIRROR(0x1ff8) AM_READWRITE(tomahawk_protection_r, SMH_NOP) AM_RANGE(0xa004, 0xa007) AM_MIRROR(0x1ff8) AM_NOP AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index ae5c87e4347..504e7a22169 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -332,7 +332,7 @@ static ADDRESS_MAP_START( asuka_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1076f0, 0x1076f1) AM_READNOP /* Mofflott init does dummy reads here */ AM_RANGE(0x200000, 0x20000f) AM_READWRITE(TC0110PCR_word_r, TC0110PCR_step1_word_w) AM_RANGE(0x3a0000, 0x3a0003) AM_WRITE(asuka_spritectrl_w) - AM_RANGE(0x3e0000, 0x3e0001) AM_READWRITE(MRA16_NOP, taitosound_port16_lsb_w) + AM_RANGE(0x3e0000, 0x3e0001) AM_READWRITE(SMH_NOP, taitosound_port16_lsb_w) AM_RANGE(0x3e0002, 0x3e0003) AM_READWRITE(taitosound_comm16_lsb_r, taitosound_comm16_lsb_w) AM_RANGE(0x400000, 0x40000f) AM_READWRITE(TC0220IOC_halfword_r, TC0220IOC_halfword_w) AM_RANGE(0xc00000, 0xc0ffff) AM_READWRITE(TC0100SCN_word_0_r, TC0100SCN_word_0_w) /* tilemaps */ @@ -344,7 +344,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cadash_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x080000, 0x080003) AM_WRITE(asuka_spritectrl_w) - AM_RANGE(0x0c0000, 0x0c0001) AM_READWRITE(MRA16_NOP, taitosound_port16_lsb_w) + AM_RANGE(0x0c0000, 0x0c0001) AM_READWRITE(SMH_NOP, taitosound_port16_lsb_w) AM_RANGE(0x0c0002, 0x0c0003) AM_READWRITE(taitosound_comm16_lsb_r, taitosound_comm16_lsb_w) AM_RANGE(0x100000, 0x107fff) AM_RAM AM_RANGE(0x800000, 0x800fff) AM_RAM /* network ram */ @@ -362,7 +362,7 @@ static ADDRESS_MAP_START( eto_map, ADDRESS_SPACE_PROGRAM, 16 ) /* N.B. tc100scn AM_RANGE(0x300000, 0x30000f) AM_READWRITE(TC0220IOC_halfword_r, TC0220IOC_halfword_w) AM_RANGE(0x400000, 0x40000f) AM_READ(TC0220IOC_halfword_r) /* service mode mirror */ AM_RANGE(0x4a0000, 0x4a0003) AM_WRITE(asuka_spritectrl_w) - AM_RANGE(0x4e0000, 0x4e0001) AM_READWRITE(MRA16_NOP, taitosound_port16_lsb_w) + AM_RANGE(0x4e0000, 0x4e0001) AM_READWRITE(SMH_NOP, taitosound_port16_lsb_w) AM_RANGE(0x4e0002, 0x4e0003) AM_READWRITE(taitosound_comm16_lsb_r, taitosound_comm16_lsb_w) AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(PC090OJ_word_0_r, PC090OJ_word_0_w) /* sprite ram */ AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(TC0100SCN_word_0_w) /* service mode mirror */ @@ -396,7 +396,7 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x9001, 0x9001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) -// AM_RANGE(0x9002, 0x9100) AM_READ(MRA8_RAM) +// AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(asuka_msm5205_address_w) diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c index 6c45261dbaa..7f8214527a9 100644 --- a/src/mame/drivers/atarifb.c +++ b/src/mame/drivers/atarifb.c @@ -151,17 +151,17 @@ static PALETTE_INIT( atarifb ) static ADDRESS_MAP_START( atarifb_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x0200, 0x025f) AM_READWRITE(MRA8_RAM, atarifb_alpha1_videoram_w) AM_BASE(&atarifb_alphap1_videoram) + AM_RANGE(0x0200, 0x025f) AM_READWRITE(SMH_RAM, atarifb_alpha1_videoram_w) AM_BASE(&atarifb_alphap1_videoram) AM_RANGE(0x0260, 0x039f) AM_RAM - AM_RANGE(0x03a0, 0x03ff) AM_READWRITE(MRA8_RAM, atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) - AM_RANGE(0x1000, 0x13bf) AM_READWRITE(MRA8_RAM, atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) + AM_RANGE(0x03a0, 0x03ff) AM_READWRITE(SMH_RAM, atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) + AM_RANGE(0x1000, 0x13bf) AM_READWRITE(SMH_RAM, atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x2000, 0x2000) AM_WRITE(MWA8_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ + AM_RANGE(0x2000, 0x2000) AM_WRITE(SMH_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ AM_RANGE(0x2001, 0x2001) AM_WRITE(atarifb_out1_w) /* OUT 1 */ AM_RANGE(0x2002, 0x2002) AM_WRITE(atarifb_out2_w) /* OUT 2 */ AM_RANGE(0x2003, 0x2003) AM_WRITE(atarifb_out3_w) /* OUT 3 */ - AM_RANGE(0x3000, 0x3000) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x3000) AM_WRITE(MWA8_NOP) /* Interrupt Acknowledge */ + AM_RANGE(0x3000, 0x3000) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x3000) AM_WRITE(SMH_NOP) /* Interrupt Acknowledge */ AM_RANGE(0x4000, 0x4000) AM_READ(atarifb_in0_r) AM_RANGE(0x4002, 0x4002) AM_READ(atarifb_in2_r) AM_RANGE(0x5000, 0x5000) AM_WRITE(watchdog_reset_w) @@ -172,17 +172,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atarifb4_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x0200, 0x025f) AM_READWRITE(MRA8_RAM, atarifb_alpha1_videoram_w) AM_BASE(&atarifb_alphap1_videoram) + AM_RANGE(0x0200, 0x025f) AM_READWRITE(SMH_RAM, atarifb_alpha1_videoram_w) AM_BASE(&atarifb_alphap1_videoram) AM_RANGE(0x0260, 0x039f) AM_RAM - AM_RANGE(0x03a0, 0x03ff) AM_READWRITE(MRA8_RAM, atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) - AM_RANGE(0x1000, 0x13bf) AM_READWRITE(MRA8_RAM, atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) + AM_RANGE(0x03a0, 0x03ff) AM_READWRITE(SMH_RAM, atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) + AM_RANGE(0x1000, 0x13bf) AM_READWRITE(SMH_RAM, atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x2000, 0x2000) AM_WRITE(MWA8_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ + AM_RANGE(0x2000, 0x2000) AM_WRITE(SMH_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ AM_RANGE(0x2001, 0x2001) AM_WRITE(atarifb4_out1_w) /* OUT 1 */ AM_RANGE(0x2002, 0x2002) AM_WRITE(atarifb_out2_w) /* OUT 2 */ AM_RANGE(0x2003, 0x2003) AM_WRITE(atarifb_out3_w) /* OUT 3 */ - AM_RANGE(0x3000, 0x3000) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x3000) AM_WRITE(MWA8_NOP) /* Interrupt Acknowledge */ + AM_RANGE(0x3000, 0x3000) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x3000) AM_WRITE(SMH_NOP) /* Interrupt Acknowledge */ AM_RANGE(0x4000, 0x4000) AM_READ(atarifb4_in0_r) AM_RANGE(0x4001, 0x4001) AM_READ(input_port_1_r) AM_RANGE(0x4002, 0x4002) AM_READ(atarifb4_in2_r) @@ -194,17 +194,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( abaseb_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x0200, 0x025f) AM_READWRITE(MRA8_RAM, atarifb_alpha1_videoram_w) AM_BASE(&atarifb_alphap1_videoram) + AM_RANGE(0x0200, 0x025f) AM_READWRITE(SMH_RAM, atarifb_alpha1_videoram_w) AM_BASE(&atarifb_alphap1_videoram) AM_RANGE(0x0260, 0x039f) AM_RAM - AM_RANGE(0x03a0, 0x03ff) AM_READWRITE(MRA8_RAM, atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) - AM_RANGE(0x1000, 0x13bf) AM_READWRITE(MRA8_RAM, atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) + AM_RANGE(0x03a0, 0x03ff) AM_READWRITE(SMH_RAM, atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) + AM_RANGE(0x1000, 0x13bf) AM_READWRITE(SMH_RAM, atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x2000, 0x2000) AM_WRITE(MWA8_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ + AM_RANGE(0x2000, 0x2000) AM_WRITE(SMH_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ AM_RANGE(0x2001, 0x2001) AM_WRITE(abaseb_out1_w) /* OUT 1 */ AM_RANGE(0x2002, 0x2002) AM_WRITE(atarifb_out2_w) /* OUT 2 */ AM_RANGE(0x2003, 0x2003) AM_WRITE(atarifb_out3_w) /* OUT 3 */ - AM_RANGE(0x3000, 0x3000) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x3000) AM_WRITE(MWA8_NOP) /* Interrupt Acknowledge */ + AM_RANGE(0x3000, 0x3000) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x3000) AM_WRITE(SMH_NOP) /* Interrupt Acknowledge */ AM_RANGE(0x4000, 0x4000) AM_READ(atarifb_in0_r) AM_RANGE(0x4002, 0x4002) AM_READ(atarifb_in2_r) AM_RANGE(0x5000, 0x5000) AM_WRITE(watchdog_reset_w) @@ -215,15 +215,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( soccer_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x0200, 0x025f) AM_READWRITE(MRA8_RAM, atarifb_alpha1_videoram_w) AM_BASE(&atarifb_alphap1_videoram) + AM_RANGE(0x0200, 0x025f) AM_READWRITE(SMH_RAM, atarifb_alpha1_videoram_w) AM_BASE(&atarifb_alphap1_videoram) AM_RANGE(0x0260, 0x039f) AM_RAM - AM_RANGE(0x03a0, 0x03ff) AM_READWRITE(MRA8_RAM, atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) - AM_RANGE(0x0800, 0x0bbf) AM_READWRITE(MRA8_RAM, atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) + AM_RANGE(0x03a0, 0x03ff) AM_READWRITE(SMH_RAM, atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) + AM_RANGE(0x0800, 0x0bbf) AM_READWRITE(SMH_RAM, atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) AM_RANGE(0x0bc0, 0x0bff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x1000, 0x1000) AM_WRITE(MWA8_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ + AM_RANGE(0x1000, 0x1000) AM_WRITE(SMH_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ AM_RANGE(0x1001, 0x1001) AM_WRITE(soccer_out1_w) /* OUT 1 */ AM_RANGE(0x1002, 0x1002) AM_WRITE(soccer_out2_w) /* OUT 2 */ - AM_RANGE(0x1004, 0x1004) AM_WRITE(MWA8_NOP) /* Interrupt Acknowledge */ + AM_RANGE(0x1004, 0x1004) AM_WRITE(SMH_NOP) /* Interrupt Acknowledge */ AM_RANGE(0x1005, 0x1005) AM_WRITE(watchdog_reset_w) AM_RANGE(0x1800, 0x1800) AM_READ(atarifb4_in0_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_1_r) diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c index 0d3d8b4cd73..78902914d06 100644 --- a/src/mame/drivers/atarig1.c +++ b/src/mame/drivers/atarig1.c @@ -230,7 +230,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfd0000, 0xfd0001) AM_READ(atarigen_sound_upper_r) AM_RANGE(0xfd8000, 0xfdffff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) /* AM_RANGE(0xfe0000, 0xfe7fff) AM_READ(from_r)*/ - AM_RANGE(0xfe8000, 0xfe89ff) AM_READWRITE(MRA16_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0xfe8000, 0xfe89ff) AM_READWRITE(SMH_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0xff0000, 0xff0fff) AM_WRITE(atarirle_0_spriteram_w) AM_BASE(&atarirle_0_spriteram) AM_RANGE(0xff2000, 0xff2001) AM_WRITE(mo_command_w) AM_BASE(&mo_command) AM_RANGE(0xff4000, 0xff5fff) AM_WRITE(atarigen_playfield_w) AM_BASE(&atarigen_playfield) diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c index 63bb8d6ac50..7aecfe8083a 100644 --- a/src/mame/drivers/atarig42.c +++ b/src/mame/drivers/atarig42.c @@ -365,7 +365,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf60000, 0xf60001) AM_READ(asic65_r) AM_RANGE(0xf80000, 0xf80003) AM_WRITE(asic65_data_w) AM_RANGE(0xfa0000, 0xfa0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) - AM_RANGE(0xfc0000, 0xfc0fff) AM_READWRITE(MRA16_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0xfc0000, 0xfc0fff) AM_READWRITE(SMH_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0xff0000, 0xff0fff) AM_WRITE(atarirle_0_spriteram_w) AM_BASE(&atarirle_0_spriteram) AM_RANGE(0xff2000, 0xff5fff) AM_WRITE(atarigen_playfield_w) AM_BASE(&atarigen_playfield) AM_RANGE(0xff6000, 0xff6fff) AM_WRITE(atarigen_alpha_w) AM_BASE(&atarigen_alpha) diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index 0af2da48e87..cb7b3de2864 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -628,7 +628,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xe08000, 0xe08003) AM_WRITE(latch_w) AM_RANGE(0xe0a000, 0xe0a003) AM_WRITE(atarigen_scanline_int_ack32_w) AM_RANGE(0xe0c000, 0xe0c003) AM_WRITE(atarigen_video_int_ack32_w) - AM_RANGE(0xe0e000, 0xe0e003) AM_WRITE(MWA32_NOP)//watchdog_reset_w }, + AM_RANGE(0xe0e000, 0xe0e003) AM_WRITE(SMH_NOP)//watchdog_reset_w }, AM_RANGE(0xe80000, 0xe80003) AM_READ(inputs_01_r) AM_RANGE(0xe82000, 0xe82003) AM_READ(special_port2_r) AM_RANGE(0xe82004, 0xe82007) AM_READ(special_port3_r) diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c index 72d527eb41a..79d5dccfb46 100644 --- a/src/mame/drivers/atarigx2.c +++ b/src/mame/drivers/atarigx2.c @@ -1188,7 +1188,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xca0000, 0xca0fff) AM_READWRITE(atarigx2_protection_r, atarigx2_protection_w) AM_BASE(&protection_base) AM_RANGE(0xd00000, 0xd1ffff) AM_READ(a2d_data_r) AM_RANGE(0xd20000, 0xd20fff) AM_READWRITE(atarigen_eeprom_upper32_r, atarigen_eeprom32_w) AM_BASE((UINT32 **)&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) - AM_RANGE(0xd40000, 0xd40fff) AM_READWRITE(MRA32_RAM, atarigen_666_paletteram32_w) AM_BASE(&paletteram32) + AM_RANGE(0xd40000, 0xd40fff) AM_READWRITE(SMH_RAM, atarigen_666_paletteram32_w) AM_BASE(&paletteram32) AM_RANGE(0xd72000, 0xd75fff) AM_WRITE(atarigen_playfield32_w) AM_BASE(&atarigen_playfield32) AM_RANGE(0xd76000, 0xd76fff) AM_WRITE(atarigen_alpha32_w) AM_BASE(&atarigen_alpha32) AM_RANGE(0xd78000, 0xd78fff) AM_WRITE(atarirle_0_spriteram32_w) AM_BASE(&atarirle_0_spriteram32) @@ -1198,7 +1198,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xe06000, 0xe06003) AM_WRITE(atarigen_sound_upper32_w) AM_RANGE(0xe08000, 0xe08003) AM_WRITE(latch_w) AM_RANGE(0xe0c000, 0xe0c003) AM_WRITE(atarigen_video_int_ack32_w) - AM_RANGE(0xe0e000, 0xe0e003) AM_WRITE(MWA32_NOP)//watchdog_reset_w }, + AM_RANGE(0xe0e000, 0xe0e003) AM_WRITE(SMH_NOP)//watchdog_reset_w }, AM_RANGE(0xe80000, 0xe80003) AM_READ(inputs_01_r) AM_RANGE(0xe82000, 0xe82003) AM_READ(special_port2_r) AM_RANGE(0xe82004, 0xe82007) AM_READ(special_port3_r) diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c index cca78385b27..a023511bfd1 100644 --- a/src/mame/drivers/atarisy1.c +++ b/src/mame/drivers/atarisy1.c @@ -463,10 +463,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x8a0000, 0x8a0001) AM_WRITE(atarigen_video_int_ack_w) AM_RANGE(0x8c0000, 0x8c0001) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x900000, 0x9fffff) AM_RAM - AM_RANGE(0xa00000, 0xa01fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0xa02000, 0xa02fff) AM_READWRITE(MRA16_RAM, atarisy1_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0xa03000, 0xa03fff) AM_READWRITE(MRA16_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) - AM_RANGE(0xb00000, 0xb007ff) AM_READWRITE(MRA16_RAM, paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xa00000, 0xa01fff) AM_READWRITE(SMH_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0xa02000, 0xa02fff) AM_READWRITE(SMH_RAM, atarisy1_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0xa03000, 0xa03fff) AM_READWRITE(SMH_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) + AM_RANGE(0xb00000, 0xb007ff) AM_READWRITE(SMH_RAM, paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xf00000, 0xf00fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) AM_RANGE(0xf20000, 0xf20007) AM_READ(trakball_r) AM_RANGE(0xf40000, 0xf4001f) AM_READWRITE(joystick_r, joystick_w) diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index 9247333778f..8e640da2d69 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -710,7 +710,7 @@ static WRITE8_HANDLER( coincount_w ) /* full memory map derived from schematics */ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0000, 0x0fff) AM_RAM - AM_RANGE(0x1000, 0x11ff) AM_MIRROR(0x0200) AM_READWRITE(MRA16_RAM, atarisy2_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x1000, 0x11ff) AM_MIRROR(0x0200) AM_READWRITE(SMH_RAM, atarisy2_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x1400, 0x1403) AM_MIRROR(0x007c) AM_READWRITE(adc_r, bankselect_w) AM_BASE(&bankselect) AM_RANGE(0x1480, 0x1487) AM_MIRROR(0x0078) AM_WRITE(adc_strobe_w) AM_RANGE(0x1580, 0x1581) AM_MIRROR(0x001e) AM_WRITE(int0_ack_w) diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c index d8cc18d7601..3f66a8c55fd 100644 --- a/src/mame/drivers/ataxx.c +++ b/src/mame/drivers/ataxx.c @@ -792,7 +792,7 @@ static DRIVER_INIT( asylum ) leland_rotate_memory(1); /* asylum appears to have some extra RAM for the slave CPU */ - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0xf000, 0xfffb, 0, 0, MRA8_BANK4, MWA8_BANK4); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0xf000, 0xfffb, 0, 0, SMH_BANK4, SMH_BANK4); memory_set_bankptr(4, auto_malloc(0x1000)); /* set up additional input ports */ diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c index 9f99a5ce43c..eb46ea9b5c3 100644 --- a/src/mame/drivers/atetris.c +++ b/src/mame/drivers/atetris.c @@ -201,9 +201,9 @@ static WRITE8_HANDLER( nvram_enable_w ) /* full address map derived from schematics */ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM - AM_RANGE(0x1000, 0x1fff) AM_READWRITE(MRA8_RAM, atetris_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0300) AM_READWRITE(MRA8_RAM, paletteram_RRRGGGBB_w) AM_BASE(&paletteram) - AM_RANGE(0x2400, 0x25ff) AM_MIRROR(0x0200) AM_READWRITE(MRA8_RAM, nvram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x1000, 0x1fff) AM_READWRITE(SMH_RAM, atetris_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0300) AM_READWRITE(SMH_RAM, paletteram_RRRGGGBB_w) AM_BASE(&paletteram) + AM_RANGE(0x2400, 0x25ff) AM_MIRROR(0x0200) AM_READWRITE(SMH_RAM, nvram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x2800, 0x280f) AM_MIRROR(0x03e0) AM_READWRITE(pokey1_r, pokey1_w) AM_RANGE(0x2810, 0x281f) AM_MIRROR(0x03e0) AM_READWRITE(pokey2_r, pokey2_w) AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_WRITE(watchdog_reset_w) @@ -218,9 +218,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( atetrsb2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM - AM_RANGE(0x1000, 0x1fff) AM_READWRITE(MRA8_RAM, atetris_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2000, 0x20ff) AM_READWRITE(MRA8_RAM, paletteram_RRRGGGBB_w) AM_BASE(&paletteram) - AM_RANGE(0x2400, 0x25ff) AM_READWRITE(MRA8_RAM, nvram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x1000, 0x1fff) AM_READWRITE(SMH_RAM, atetris_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x2000, 0x20ff) AM_READWRITE(SMH_RAM, paletteram_RRRGGGBB_w) AM_BASE(&paletteram) + AM_RANGE(0x2400, 0x25ff) AM_READWRITE(SMH_RAM, nvram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x2802, 0x2802) AM_WRITE(SN76496_0_w) AM_RANGE(0x2804, 0x2804) AM_WRITE(SN76496_1_w) AM_RANGE(0x2806, 0x2806) AM_WRITE(SN76496_2_w) diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c index 3a56bd91c51..09f2593ef7e 100644 --- a/src/mame/drivers/avalnche.c +++ b/src/mame/drivers/avalnche.c @@ -134,7 +134,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0ffc) AM_READ(input_port_0_r) AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x0ffc) AM_READ(input_port_1_r) AM_RANGE(0x2002, 0x2002) AM_MIRROR(0x0ffc) AM_READ(input_port_2_r) - AM_RANGE(0x2003, 0x2003) AM_MIRROR(0x0ffc) AM_READ(MRA8_NOP) + AM_RANGE(0x2003, 0x2003) AM_MIRROR(0x0ffc) AM_READ(SMH_NOP) AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x0fff) AM_WRITE(watchdog_reset_w) AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0ff8) AM_WRITE(avalance_credit_1_lamp_w) AM_RANGE(0x4001, 0x4001) AM_MIRROR(0x0ff8) AM_WRITE(avalnche_attract_enable_w) diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c index 93a95fb1f5a..51893c33c50 100644 --- a/src/mame/drivers/aztarac.c +++ b/src/mame/drivers/aztarac.c @@ -74,7 +74,7 @@ static READ16_HANDLER( joystick_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x00bfff) AM_ROM - AM_RANGE(0x022000, 0x0220ff) AM_READWRITE(nvram_r, MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x022000, 0x0220ff) AM_READWRITE(nvram_r, SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x027000, 0x027001) AM_READ(joystick_r) AM_RANGE(0x027004, 0x027005) AM_READ(input_port_3_word_r) AM_RANGE(0x027008, 0x027009) AM_READWRITE(aztarac_sound_r, aztarac_sound_w) diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index ed01c85f7f9..052a4f0759e 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -348,7 +348,7 @@ static ADDRESS_MAP_START( backfire_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1a8000, 0x1a8003) AM_RAM AM_BASE(&backfire_left_priority) AM_RANGE(0x1ac000, 0x1ac003) AM_RAM AM_BASE(&backfire_right_priority) -// AM_RANGE(0x1b0000, 0x1b0003) AM_WRITE(MWA32_NOP) // always 1b0000 +// AM_RANGE(0x1b0000, 0x1b0003) AM_WRITE(SMH_NOP) // always 1b0000 /* when set to pentometer in test mode */ // AM_RANGE(0x1e4000, 0x1e4003) AM_READ(backfire_unknown_wheel_r) diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index e2032eef180..fdb655c4121 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -325,9 +325,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfea000, 0xfebfff) AM_READ(atarigen_sound_upper_r) AM_RANGE(0xfec000, 0xfedfff) AM_WRITE(badlands_pf_bank_w) AM_RANGE(0xfee000, 0xfeffff) AM_WRITE(atarigen_eeprom_enable_w) - AM_RANGE(0xffc000, 0xffc3ff) AM_READWRITE(MRA16_RAM, atarigen_expanded_666_paletteram_w) AM_BASE(&paletteram16) - AM_RANGE(0xffe000, 0xffefff) AM_READWRITE(MRA16_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0xfff000, 0xfff1ff) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_expanded_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0xffc000, 0xffc3ff) AM_READWRITE(SMH_RAM, atarigen_expanded_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0xffe000, 0xffefff) AM_READWRITE(SMH_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0xfff000, 0xfff1ff) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_expanded_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xfff200, 0xffffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c index c4c98998604..5f295721343 100644 --- a/src/mame/drivers/bagman.c +++ b/src/mame/drivers/bagman.c @@ -193,66 +193,66 @@ static WRITE8_HANDLER( bagman_coin_counter_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x67ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9800, 0x9bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) + AM_RANGE(0x9800, 0x9bff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(bagman_pal16r6_r) //AM_RANGE(0xa800, 0xa805) AM_READ(bagman_ls259_r) /*just for debugging purposes*/ AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) /* DSW */ - AM_RANGE(0xb800, 0xb800) AM_READ(MRA8_NOP) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) /* Super Bagman only */ + AM_RANGE(0xb800, 0xb800) AM_READ(SMH_NOP) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) /* Super Bagman only */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x67ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x67ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(bagman_videoram_w) AM_BASE(&videoram) AM_RANGE(0x9800, 0x9bff) AM_WRITE(bagman_colorram_w) AM_BASE(&colorram) AM_RANGE(0xa000, 0xa000) AM_WRITE(interrupt_enable_w) AM_RANGE(0xa001, 0xa002) AM_WRITE(bagman_flipscreen_w) - AM_RANGE(0xa003, 0xa003) AM_WRITE(MWA8_RAM) AM_BASE(&bagman_video_enable) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM) /* Super Bagman only */ - AM_RANGE(0x9800, 0x981f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* hidden portion of color RAM */ + AM_RANGE(0xa003, 0xa003) AM_WRITE(SMH_RAM) AM_BASE(&bagman_video_enable) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) /* Super Bagman only */ + AM_RANGE(0x9800, 0x981f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* hidden portion of color RAM */ /* here only to initialize the pointer, */ /* writes are handled by bagman_colorram_w */ AM_RANGE(0xa800, 0xa805) AM_WRITE(bagman_ls259_w) /* TMS5110 driving state machine */ - AM_RANGE(0x9c00, 0x9fff) AM_WRITE(MWA8_NOP) /* written to, but unused */ + AM_RANGE(0x9c00, 0x9fff) AM_WRITE(SMH_NOP) /* written to, but unused */ AM_RANGE(0xa004, 0xa004) AM_WRITE(bagman_coin_counter_w) #if 0 - AM_RANGE(0xa007, 0xa007) AM_WRITE(MWA8_NOP) /* ???? */ - AM_RANGE(0xb000, 0xb000) AM_WRITE(MWA8_NOP) /* ???? */ - AM_RANGE(0xb800, 0xb800) AM_WRITE(MWA8_NOP) /* ???? */ + AM_RANGE(0xa007, 0xa007) AM_WRITE(SMH_NOP) /* ???? */ + AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP) /* ???? */ + AM_RANGE(0xb800, 0xb800) AM_WRITE(SMH_NOP) /* ???? */ #endif ADDRESS_MAP_END static ADDRESS_MAP_START( pickin_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x7000, 0x77ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8800, 0x8bff) AM_READ(MRA8_RAM) - AM_RANGE(0x9800, 0x9bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x7000, 0x77ff) AM_READ(SMH_RAM) + AM_RANGE(0x8800, 0x8bff) AM_READ(SMH_RAM) + AM_RANGE(0x9800, 0x9bff) AM_READ(SMH_RAM) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_2_r) - AM_RANGE(0xb800, 0xb800) AM_READ(MRA8_NOP) + AM_RANGE(0xb800, 0xb800) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( pickin_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7000, 0x77ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7000, 0x77ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8bff) AM_WRITE(bagman_videoram_w) AM_BASE(&videoram) AM_RANGE(0x9800, 0x9bff) AM_WRITE(bagman_colorram_w) AM_BASE(&colorram) AM_RANGE(0xa000, 0xa000) AM_WRITE(interrupt_enable_w) AM_RANGE(0xa001, 0xa002) AM_WRITE(bagman_flipscreen_w) - AM_RANGE(0xa003, 0xa003) AM_WRITE(MWA8_RAM) AM_BASE(&bagman_video_enable) - AM_RANGE(0x9800, 0x981f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* hidden portion of color RAM */ + AM_RANGE(0xa003, 0xa003) AM_WRITE(SMH_RAM) AM_BASE(&bagman_video_enable) + AM_RANGE(0x9800, 0x981f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* hidden portion of color RAM */ /* here only to initialize the pointer, */ /* writes are handled by bagman_colorram_w */ - AM_RANGE(0x9c00, 0x9fff) AM_WRITE(MWA8_NOP) /* written to, but unused */ + AM_RANGE(0x9c00, 0x9fff) AM_WRITE(SMH_NOP) /* written to, but unused */ AM_RANGE(0xa004, 0xa004) AM_WRITE(bagman_coin_counter_w) #if 0 - AM_RANGE(0xa007, 0xa007) AM_WRITE(MWA8_NOP) /* ???? */ - AM_RANGE(0xb000, 0xb000) AM_WRITE(MWA8_NOP) /* ???? */ - AM_RANGE(0xb800, 0xb800) AM_WRITE(MWA8_NOP) /* ???? */ + AM_RANGE(0xa007, 0xa007) AM_WRITE(SMH_NOP) /* ???? */ + AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP) /* ???? */ + AM_RANGE(0xb800, 0xb800) AM_WRITE(SMH_NOP) /* ???? */ #endif ADDRESS_MAP_END @@ -265,7 +265,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x08, 0x08) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x09, 0x09) AM_WRITE(AY8910_write_port_0_w) - //AM_RANGE(0x56, 0x56) AM_WRITE(MWA8_NOP) + //AM_RANGE(0x56, 0x56) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c index 2fbc9c23a59..f649546fc98 100644 --- a/src/mame/drivers/balsente.c +++ b/src/mame/drivers/balsente.c @@ -233,8 +233,8 @@ DIP locations verified for: static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&spriteram) - AM_RANGE(0x0800, 0x7fff) AM_READWRITE(MRA8_RAM, balsente_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x8000, 0x8fff) AM_READWRITE(MRA8_RAM, balsente_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0x0800, 0x7fff) AM_READWRITE(SMH_RAM, balsente_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x8000, 0x8fff) AM_READWRITE(SMH_RAM, balsente_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0x9000, 0x9007) AM_WRITE(balsente_adc_select_w) AM_RANGE(0x9400, 0x9401) AM_READ(balsente_adc_data_r) AM_RANGE(0x9800, 0x987f) AM_WRITE(balsente_misc_output_w) @@ -245,7 +245,7 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9900, 0x9900) AM_READ(input_port_0_r) AM_RANGE(0x9901, 0x9901) AM_READ(input_port_1_r) AM_RANGE(0x9902, 0x9902) AM_READ(input_port_2_r) - AM_RANGE(0x9903, 0x9903) AM_READWRITE(input_port_3_r, MWA8_NOP) + AM_RANGE(0x9903, 0x9903) AM_READWRITE(input_port_3_r, SMH_NOP) 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(&generic_nvram) AM_SIZE(&generic_nvram_size) /* system+cart NOVRAM */ diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c index 0c70d7413f6..80ff58a9602 100644 --- a/src/mame/drivers/baraduke.c +++ b/src/mame/drivers/baraduke.c @@ -179,7 +179,7 @@ static ADDRESS_MAP_START( baraduke_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8800, 0x8800) AM_WRITE(baraduke_irq_ack_w) /* irq acknowledge */ AM_RANGE(0xb000, 0xb002) AM_WRITE(baraduke_scroll0_w) /* scroll (layer 0) */ AM_RANGE(0xb004, 0xb006) AM_WRITE(baraduke_scroll1_w) /* scroll (layer 1) */ - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static READ8_HANDLER( soundkludge_r ) @@ -194,11 +194,11 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0080, 0x00ff) AM_RAM /* built in RAM */ AM_RANGE(0x1105, 0x1105) AM_READ(soundkludge_r) /* cures speech */ AM_RANGE(0x1000, 0x13ff) AM_READWRITE(namcos1_cus30_r,namcos1_cus30_w) AM_BASE(&namco_wavedata)/* PSG device, shared RAM */ - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_ROM) /* MCU external ROM */ - AM_RANGE(0x8000, 0x8000) AM_WRITE(MWA8_NOP) /* watchdog reset? */ - AM_RANGE(0x8800, 0x8800) AM_WRITE(MWA8_NOP) /* irq acknoledge? */ + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_ROM) /* MCU external ROM */ + AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_NOP) /* watchdog reset? */ + AM_RANGE(0x8800, 0x8800) AM_WRITE(SMH_NOP) /* irq acknoledge? */ AM_RANGE(0xc000, 0xc7ff) AM_RAM /* RAM */ - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) /* MCU internal ROM */ + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) /* MCU internal ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c index de21d889778..f967e86b666 100644 --- a/src/mame/drivers/batman.c +++ b/src/mame/drivers/batman.c @@ -131,7 +131,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x260050, 0x260051) AM_MIRROR(0x11ff8e) AM_WRITE(latch_w) AM_RANGE(0x260060, 0x260061) AM_MIRROR(0x11ff8e) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x2a0000, 0x2a0001) AM_MIRROR(0x11fffe) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x3e0000, 0x3e0fff) AM_MIRROR(0x100000) AM_READWRITE(MRA16_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x3e0000, 0x3e0fff) AM_MIRROR(0x100000) AM_READWRITE(SMH_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x3effc0, 0x3effff) AM_MIRROR(0x100000) AM_READWRITE(atarivc_r, atarivc_w) AM_BASE(&atarivc_data) AM_RANGE(0x3f0000, 0x3f1fff) AM_MIRROR(0x100000) AM_WRITE(atarigen_playfield2_latched_msb_w) AM_BASE(&atarigen_playfield2) AM_RANGE(0x3f2000, 0x3f3fff) AM_MIRROR(0x100000) AM_WRITE(atarigen_playfield_latched_lsb_w) AM_BASE(&atarigen_playfield) diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c index 4f1f0a80e52..aa9ce91b967 100644 --- a/src/mame/drivers/battlera.c +++ b/src/mame/drivers/battlera.c @@ -75,19 +75,19 @@ static READ8_HANDLER( control_data_r ) /******************************************************************************/ static ADDRESS_MAP_START( battlera_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA8_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(HuC6270_debug_r) /* Cheat to view vram data */ - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) AM_RANGE(0x1fe000, 0x1fe001) AM_READ(HuC6270_register_r) AM_RANGE(0x1ff000, 0x1ff001) AM_READ(control_data_r) ADDRESS_MAP_END static ADDRESS_MAP_START( battlera_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_WRITE(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(&paletteram) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) /* Main ram */ + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) /* Main ram */ AM_RANGE(0x1fe000, 0x1fe001) AM_WRITE(HuC6270_register_w) AM_RANGE(0x1fe002, 0x1fe003) AM_WRITE(HuC6270_data_w) AM_RANGE(0x1ff000, 0x1ff001) AM_WRITE(control_data_w) @@ -134,17 +134,17 @@ static WRITE8_HANDLER( battlera_adpcm_reset_w ) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK7) /* Main ram */ + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK7) /* Main ram */ AM_RANGE(0x1ff000, 0x1ff001) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x040000, 0x040001) AM_WRITE(YM2203_w) AM_RANGE(0x080000, 0x080001) AM_WRITE(battlera_adpcm_data_w) AM_RANGE(0x1fe800, 0x1fe80f) AM_WRITE(C6280_0_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK7) /* Main ram */ + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK7) /* Main ram */ AM_RANGE(0x1ff000, 0x1ff001) AM_WRITE(battlera_adpcm_reset_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c index 79551b47bfa..601008b4836 100644 --- a/src/mame/drivers/battlex.c +++ b/src/mame/drivers/battlex.c @@ -59,18 +59,18 @@ extern VIDEO_UPDATE( battlex ); /*** MEMORY & PORT READ / WRITE **********************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) /* not read? */ - AM_RANGE(0x9000, 0x91ff) AM_READ(MRA8_RAM) /* not read? */ - AM_RANGE(0xa000, 0xa3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe03f) AM_READ(MRA8_RAM) /* not read? */ + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) /* not read? */ + AM_RANGE(0x9000, 0x91ff) AM_READ(SMH_RAM) /* not read? */ + AM_RANGE(0xa000, 0xa3ff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe03f) AM_READ(SMH_RAM) /* not read? */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(battlex_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x9000, 0x91ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) - AM_RANGE(0xa000, 0xa3ff) AM_WRITE(MWA8_RAM) /* main */ + AM_RANGE(0x9000, 0x91ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) + AM_RANGE(0xa000, 0xa3ff) AM_WRITE(SMH_RAM) /* main */ AM_RANGE(0xe000, 0xe03f) AM_WRITE(battlex_palette_w) /* probably palette */ ADDRESS_MAP_END @@ -92,7 +92,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) /* 0x30 looks like scroll, but can't be ? changes (increases or decreases) depending on the direction your ship is facing on lev 2. at least */ - AM_RANGE(0x30, 0x30) AM_WRITE(MWA8_NOP) + AM_RANGE(0x30, 0x30) AM_WRITE(SMH_NOP) AM_RANGE(0x32, 0x32) AM_WRITE(battlex_scroll_x_lsb_w) AM_RANGE(0x33, 0x33) AM_WRITE(battlex_scroll_x_msb_w) diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index 4165fd5bb68..833e092dc20 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -53,14 +53,14 @@ static ADDRESS_MAP_START( battlnts_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READ(K007342_r) /* Color RAM + Video RAM */ AM_RANGE(0x2000, 0x21ff) AM_READ(K007420_r) /* Sprite RAM */ AM_RANGE(0x2200, 0x23ff) AM_READ(K007342_scroll_r) /* Scroll RAM */ - AM_RANGE(0x2400, 0x24ff) AM_READ(MRA8_RAM) /* Palette */ + AM_RANGE(0x2400, 0x24ff) AM_READ(SMH_RAM) /* Palette */ AM_RANGE(0x2e00, 0x2e00) AM_READ(input_port_0_r) /* DIPSW #1 */ AM_RANGE(0x2e01, 0x2e01) AM_READ(input_port_4_r) /* 2P controls */ AM_RANGE(0x2e02, 0x2e02) AM_READ(input_port_3_r) /* 1P controls */ AM_RANGE(0x2e03, 0x2e03) AM_READ(input_port_2_r) /* coinsw, testsw, startsw */ AM_RANGE(0x2e04, 0x2e04) AM_READ(input_port_1_r) /* DISPW #2 */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM 777e02.bin */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM 777e02.bin */ ADDRESS_MAP_END static ADDRESS_MAP_START( battlnts_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -74,21 +74,21 @@ static ADDRESS_MAP_START( battlnts_writemem, 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_WRITE(MWA8_ROM) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM 777e02.bin */ + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM 777e02.bin */ ADDRESS_MAP_END static ADDRESS_MAP_START( battlnts_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* ROM 777c01.rom */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM 777c01.rom */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0xa000, 0xa000) AM_READ(YM3812_status_port_0_r) /* YM3812 (chip 1) */ AM_RANGE(0xc000, 0xc000) AM_READ(YM3812_status_port_1_r) /* YM3812 (chip 2) */ AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) /* soundlatch_r */ ADDRESS_MAP_END static ADDRESS_MAP_START( battlnts_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* ROM 777c01.rom */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM 777c01.rom */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0xa000, 0xa000) AM_WRITE(YM3812_control_port_0_w) /* YM3812 (chip 1) */ AM_RANGE(0xa001, 0xa001) AM_WRITE(YM3812_write_port_0_w) /* YM3812 (chip 1) */ AM_RANGE(0xc000, 0xc000) AM_WRITE(YM3812_control_port_1_w) /* YM3812 (chip 2) */ diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index 59ab0f3079d..86b394c7e2a 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -291,14 +291,14 @@ static READ16_HANDLER( mechatt_gun_r ) /*******************************************************************************/ static ADDRESS_MAP_START( bbuster_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x08ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x090000, 0x090fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a0000, 0x0a0fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a8000, 0x0a8fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0b0000, 0x0b1fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0b2000, 0x0b3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0d0000, 0x0d0fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x08ffff) AM_READ(SMH_RAM) + AM_RANGE(0x090000, 0x090fff) AM_READ(SMH_RAM) + AM_RANGE(0x0a0000, 0x0a0fff) AM_READ(SMH_RAM) + AM_RANGE(0x0a8000, 0x0a8fff) AM_READ(SMH_RAM) + AM_RANGE(0x0b0000, 0x0b1fff) AM_READ(SMH_RAM) + AM_RANGE(0x0b2000, 0x0b3fff) AM_READ(SMH_RAM) + AM_RANGE(0x0d0000, 0x0d0fff) AM_READ(SMH_RAM) AM_RANGE(0x0e0000, 0x0e0001) AM_READ(input_port_2_word_r) /* Coins */ AM_RANGE(0x0e0002, 0x0e0003) AM_READ(input_port_0_word_r) /* Player 1 & 2 */ AM_RANGE(0x0e0004, 0x0e0005) AM_READ(input_port_1_word_r) /* Player 3 */ @@ -311,32 +311,32 @@ static ADDRESS_MAP_START( bbuster_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bbuster_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x08ffff) AM_WRITE(MWA16_RAM) AM_BASE(&bbuster_ram) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x08ffff) AM_WRITE(SMH_RAM) AM_BASE(&bbuster_ram) AM_RANGE(0x090000, 0x090fff) AM_WRITE(bbuster_video_w) AM_BASE(&videoram16) - AM_RANGE(0x0a0000, 0x0a0fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x0a8000, 0x0a8fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x0a0000, 0x0a0fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x0a8000, 0x0a8fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) AM_RANGE(0x0b0000, 0x0b1fff) AM_WRITE(bbuster_pf1_w) AM_BASE(&bbuster_pf1_data) AM_RANGE(0x0b2000, 0x0b3fff) AM_WRITE(bbuster_pf2_w) AM_BASE(&bbuster_pf2_data) - AM_RANGE(0x0b8000, 0x0b8003) AM_WRITE(MWA16_RAM) AM_BASE(&bbuster_pf1_scroll_data) - AM_RANGE(0x0b8008, 0x0b800b) AM_WRITE(MWA16_RAM) AM_BASE(&bbuster_pf2_scroll_data) + AM_RANGE(0x0b8000, 0x0b8003) AM_WRITE(SMH_RAM) AM_BASE(&bbuster_pf1_scroll_data) + AM_RANGE(0x0b8008, 0x0b800b) AM_WRITE(SMH_RAM) AM_BASE(&bbuster_pf2_scroll_data) AM_RANGE(0x0d0000, 0x0d0fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0e8000, 0x0e8001) AM_WRITE(gun_select_w) - AM_RANGE(0x0f0008, 0x0f0009) AM_WRITE(MWA16_NOP) + AM_RANGE(0x0f0008, 0x0f0009) AM_WRITE(SMH_NOP) AM_RANGE(0x0f0018, 0x0f0019) AM_WRITE(sound_cpu_w) - AM_RANGE(0x0f8000, 0x0f80ff) AM_WRITE(MWA16_RAM) AM_BASE(&eprom_data) /* Eeprom */ + AM_RANGE(0x0f8000, 0x0f80ff) AM_WRITE(SMH_RAM) AM_BASE(&eprom_data) /* Eeprom */ ADDRESS_MAP_END /*******************************************************************************/ static ADDRESS_MAP_START( mechatt_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x06ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x070000, 0x07ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x090000, 0x090fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a0000, 0x0a0fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0d0000, 0x0d07ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x06ffff) AM_READ(SMH_ROM) + AM_RANGE(0x070000, 0x07ffff) AM_READ(SMH_RAM) + AM_RANGE(0x090000, 0x090fff) AM_READ(SMH_RAM) + AM_RANGE(0x0a0000, 0x0a0fff) AM_READ(SMH_RAM) + AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(SMH_RAM) + AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(SMH_RAM) + AM_RANGE(0x0d0000, 0x0d07ff) AM_READ(SMH_RAM) AM_RANGE(0x0e0000, 0x0e0001) AM_READ(input_port_0_word_r) AM_RANGE(0x0e0002, 0x0e0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0e0004, 0x0e0007) AM_READ(mechatt_gun_r) @@ -344,31 +344,31 @@ static ADDRESS_MAP_START( mechatt_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mechatt_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x06ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x070000, 0x07ffff) AM_WRITE(MWA16_RAM) AM_BASE(&bbuster_ram) + AM_RANGE(0x000000, 0x06ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x070000, 0x07ffff) AM_WRITE(SMH_RAM) AM_BASE(&bbuster_ram) AM_RANGE(0x090000, 0x090fff) AM_WRITE(bbuster_video_w) AM_BASE(&videoram16) - AM_RANGE(0x0a0000, 0x0a0fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x0a1000, 0x0a7fff) AM_WRITE(MWA16_NOP) + AM_RANGE(0x0a0000, 0x0a0fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x0a1000, 0x0a7fff) AM_WRITE(SMH_NOP) AM_RANGE(0x0b0000, 0x0b3fff) AM_WRITE(bbuster_pf1_w) AM_BASE(&bbuster_pf1_data) - AM_RANGE(0x0b8000, 0x0b8003) AM_WRITE(MWA16_RAM) AM_BASE(&bbuster_pf1_scroll_data) + AM_RANGE(0x0b8000, 0x0b8003) AM_WRITE(SMH_RAM) AM_BASE(&bbuster_pf1_scroll_data) AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(bbuster_pf2_w) AM_BASE(&bbuster_pf2_data) - AM_RANGE(0x0c8000, 0x0c8003) AM_WRITE(MWA16_RAM) AM_BASE(&bbuster_pf2_scroll_data) + AM_RANGE(0x0c8000, 0x0c8003) AM_WRITE(SMH_RAM) AM_BASE(&bbuster_pf2_scroll_data) AM_RANGE(0x0d0000, 0x0d07ff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0e4002, 0x0e4003) AM_WRITE(MWA16_NOP) /* Gun force feedback? */ + AM_RANGE(0x0e4002, 0x0e4003) AM_WRITE(SMH_NOP) /* Gun force feedback? */ AM_RANGE(0x0e8000, 0x0e8001) AM_WRITE(sound_cpu_w) ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -383,7 +383,7 @@ static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0x02, 0x02) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0x03, 0x03) AM_WRITE(YM2610_data_port_0_B_w) - AM_RANGE(0xc0, 0xc1) AM_WRITE(MWA8_NOP) /* -> Main CPU */ + AM_RANGE(0xc0, 0xc1) AM_WRITE(SMH_NOP) /* -> Main CPU */ ADDRESS_MAP_END static ADDRESS_MAP_START( sounda_readport, ADDRESS_SPACE_IO, 8 ) @@ -398,7 +398,7 @@ static ADDRESS_MAP_START( sounda_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(YM2608_data_port_0_A_w) AM_RANGE(0x02, 0x02) AM_WRITE(YM2608_control_port_0_B_w) AM_RANGE(0x03, 0x03) AM_WRITE(YM2608_data_port_0_B_w) - AM_RANGE(0xc0, 0xc1) AM_WRITE(MWA8_NOP) /* -> Main CPU */ + AM_RANGE(0xc0, 0xc1) AM_WRITE(SMH_NOP) /* -> Main CPU */ ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c index a7cfdc884ac..ec7e98ace5b 100644 --- a/src/mame/drivers/beathead.c +++ b/src/mame/drivers/beathead.c @@ -345,7 +345,7 @@ static WRITE32_HANDLER( coin_count_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x0001ffff) AM_RAM AM_BASE(&ram_base) AM_RANGE(0x01800000, 0x01bfffff) AM_ROM AM_REGION(REGION_USER1, 0) AM_BASE(&rom_base) - AM_RANGE(0x40000000, 0x400007ff) AM_READWRITE(MRA32_RAM, eeprom_data_w) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x40000000, 0x400007ff) AM_READWRITE(SMH_RAM, eeprom_data_w) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) AM_RANGE(0x41000000, 0x41000003) AM_READWRITE(sound_data_r, sound_data_w) AM_RANGE(0x41000100, 0x41000103) AM_READ(interrupt_control_r) AM_RANGE(0x41000100, 0x4100011f) AM_WRITE(interrupt_control_w) @@ -355,18 +355,18 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x41000220, 0x41000227) AM_WRITE(coin_count_w) AM_RANGE(0x41000300, 0x41000303) AM_READ(input_2_r) AM_RANGE(0x41000304, 0x41000307) AM_READ(input_3_r) - AM_RANGE(0x41000400, 0x41000403) AM_WRITE(MWA32_RAM) AM_BASE(&beathead_palette_select) + AM_RANGE(0x41000400, 0x41000403) AM_WRITE(SMH_RAM) AM_BASE(&beathead_palette_select) AM_RANGE(0x41000500, 0x41000503) AM_WRITE(eeprom_enable_w) AM_RANGE(0x41000600, 0x41000603) AM_WRITE(beathead_finescroll_w) AM_RANGE(0x41000700, 0x41000703) AM_WRITE(watchdog_reset32_w) - AM_RANGE(0x42000000, 0x4201ffff) AM_READWRITE(MRA32_RAM, beathead_palette_w) AM_BASE(&paletteram32) + AM_RANGE(0x42000000, 0x4201ffff) AM_READWRITE(SMH_RAM, beathead_palette_w) AM_BASE(&paletteram32) AM_RANGE(0x43000000, 0x43000007) AM_READWRITE(beathead_hsync_ram_r, beathead_hsync_ram_w) - AM_RANGE(0x8df80000, 0x8df80003) AM_READ(MRA32_NOP) /* noisy x4 during scanline int */ + AM_RANGE(0x8df80000, 0x8df80003) AM_READ(SMH_NOP) /* noisy x4 during scanline int */ AM_RANGE(0x8f380000, 0x8f3fffff) AM_WRITE(beathead_vram_latch_w) AM_RANGE(0x8f900000, 0x8f97ffff) AM_WRITE(beathead_vram_transparent_w) AM_RANGE(0x8f980000, 0x8f9fffff) AM_RAM AM_BASE(&videoram32) AM_RANGE(0x8fb80000, 0x8fbfffff) AM_WRITE(beathead_vram_bulk_w) - AM_RANGE(0x8fff8000, 0x8fff8003) AM_WRITE(MWA32_RAM) AM_BASE(&beathead_vram_bulk_latch) + AM_RANGE(0x8fff8000, 0x8fff8003) AM_WRITE(SMH_RAM) AM_BASE(&beathead_vram_bulk_latch) AM_RANGE(0x9e280000, 0x9e2fffff) AM_WRITE(beathead_vram_copy_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c index 550eabc0595..078106f2be6 100644 --- a/src/mame/drivers/beezer.c +++ b/src/mame/drivers/beezer.c @@ -21,30 +21,30 @@ DRIVER_INIT( beezer ); WRITE8_HANDLER( beezer_bankswitch_w ); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_RAM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xd000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_RAM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_BANK1) + AM_RANGE(0xd000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_BANK1) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_BANK1) AM_RANGE(0xd000, 0xffff) AM_WRITE(beezer_bankswitch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) // AM_RANGE(0x1000, 0x10ff) AM_READ(beezer_6840_r) AM_RANGE(0x1800, 0x18ff) AM_READ(via_1_r) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) // AM_RANGE(0x1000, 0x10ff) AM_WRITE(beezer_6840_w) AM_RANGE(0x1800, 0x18ff) AM_WRITE(via_1_w) // AM_RANGE(0x8000, 0x9fff) AM_WRITE(beezer_dac_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c index 648dac383a8..ef48ab6c0b1 100644 --- a/src/mame/drivers/berzerk.c +++ b/src/mame/drivers/berzerk.c @@ -559,7 +559,7 @@ static ADDRESS_MAP_START( berzerk_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x0400) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x1000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(&berzerk_videoram) AM_SIZE(&berzerk_videoram_size) AM_SHARE(1) - AM_RANGE(0x6000, 0x7fff) AM_READWRITE(MRA8_RAM, magicram_w) AM_SHARE(1) + AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_RAM, magicram_w) AM_SHARE(1) AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x3800) AM_RAM AM_BASE(&berzerk_colorram) AM_RANGE(0xc000, 0xffff) AM_NOP ADDRESS_MAP_END @@ -568,7 +568,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( frenzy_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(&berzerk_videoram) AM_SIZE(&berzerk_videoram_size) AM_SHARE(1) - AM_RANGE(0x6000, 0x7fff) AM_READWRITE(MRA8_RAM, magicram_w) AM_SHARE(1) + AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_RAM, magicram_w) AM_SHARE(1) AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x3800) AM_RAM AM_BASE(&berzerk_colorram) AM_RANGE(0xc000, 0xcfff) AM_ROM AM_RANGE(0xf800, 0xfbff) AM_MIRROR(0x0400) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) @@ -586,22 +586,22 @@ static ADDRESS_MAP_START( berzerk_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x3f) AM_NOP AM_RANGE(0x40, 0x47) AM_READWRITE(berzerk_audio_r, berzerk_audio_w) - AM_RANGE(0x48, 0x48) AM_READWRITE(input_port_0_r, MWA8_NOP) - AM_RANGE(0x49, 0x49) AM_READWRITE(input_port_1_r, MWA8_NOP) - AM_RANGE(0x4a, 0x4a) AM_READWRITE(input_port_2_r, MWA8_NOP) - AM_RANGE(0x4b, 0x4b) AM_READWRITE(MRA8_NOP, magicram_control_w) + AM_RANGE(0x48, 0x48) AM_READWRITE(input_port_0_r, SMH_NOP) + AM_RANGE(0x49, 0x49) AM_READWRITE(input_port_1_r, SMH_NOP) + AM_RANGE(0x4a, 0x4a) AM_READWRITE(input_port_2_r, SMH_NOP) + AM_RANGE(0x4b, 0x4b) AM_READWRITE(SMH_NOP, magicram_control_w) AM_RANGE(0x4c, 0x4c) AM_READWRITE(nmi_enable_r, nmi_enable_w) AM_RANGE(0x4d, 0x4d) AM_READWRITE(nmi_disable_r, nmi_disable_w) - AM_RANGE(0x4e, 0x4e) AM_READWRITE(intercept_v256_r, MWA8_NOP) - AM_RANGE(0x4f, 0x4f) AM_READWRITE(MRA8_NOP, irq_enable_w) + AM_RANGE(0x4e, 0x4e) AM_READWRITE(intercept_v256_r, SMH_NOP) + AM_RANGE(0x4f, 0x4f) AM_READWRITE(SMH_NOP, irq_enable_w) AM_RANGE(0x50, 0x57) AM_NOP /* second sound board, but not used */ AM_RANGE(0x58, 0x5f) AM_NOP - AM_RANGE(0x60, 0x60) AM_MIRROR(0x18) AM_READWRITE(input_port_3_r, MWA8_NOP) - AM_RANGE(0x61, 0x61) AM_MIRROR(0x18) AM_READWRITE(input_port_4_r, MWA8_NOP) - AM_RANGE(0x62, 0x62) AM_MIRROR(0x18) AM_READWRITE(input_port_5_r, MWA8_NOP) - AM_RANGE(0x63, 0x63) AM_MIRROR(0x18) AM_READWRITE(input_port_6_r, MWA8_NOP) - AM_RANGE(0x64, 0x64) AM_MIRROR(0x18) AM_READWRITE(input_port_7_r, MWA8_NOP) - AM_RANGE(0x65, 0x65) AM_MIRROR(0x18) AM_READWRITE(input_port_8_r, MWA8_NOP) + AM_RANGE(0x60, 0x60) AM_MIRROR(0x18) AM_READWRITE(input_port_3_r, SMH_NOP) + AM_RANGE(0x61, 0x61) AM_MIRROR(0x18) AM_READWRITE(input_port_4_r, SMH_NOP) + AM_RANGE(0x62, 0x62) AM_MIRROR(0x18) AM_READWRITE(input_port_5_r, SMH_NOP) + AM_RANGE(0x63, 0x63) AM_MIRROR(0x18) AM_READWRITE(input_port_6_r, SMH_NOP) + AM_RANGE(0x64, 0x64) AM_MIRROR(0x18) AM_READWRITE(input_port_7_r, SMH_NOP) + AM_RANGE(0x65, 0x65) AM_MIRROR(0x18) AM_READWRITE(input_port_8_r, SMH_NOP) AM_RANGE(0x66, 0x66) AM_MIRROR(0x18) AM_READWRITE(led_off_r, led_off_w) AM_RANGE(0x67, 0x67) AM_MIRROR(0x18) AM_READWRITE(led_on_r, led_on_w) AM_RANGE(0x80, 0xff) AM_NOP diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index 8d1f11b7f4a..92709f92b0a 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -1083,10 +1083,10 @@ static MACHINE_RESET( bfcobra ) ***************************************************************************/ static ADDRESS_MAP_START( z80_prog_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_BANK4) - AM_RANGE(0x4000, 0x7fff) AM_READWRITE(MRA8_BANK1, MWA8_BANK1) - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(MRA8_BANK2, MWA8_BANK2) - AM_RANGE(0xc000, 0xffff) AM_READWRITE(MRA8_BANK3, MWA8_BANK3) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_BANK4) + AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK1, SMH_BANK1) + AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK2, SMH_BANK2) + AM_RANGE(0xc000, 0xffff) AM_READWRITE(SMH_BANK3, SMH_BANK3) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_io_map, ADDRESS_SPACE_IO, 8 ) @@ -1231,8 +1231,8 @@ static ADDRESS_MAP_START( m6809_prog_map, ADDRESS_SPACE_PROGRAM, 8 ) // AM_RANGE(0x340A, 0x340A) AM_NOP // AM_RANGE(0x3600, 0x3600) AM_NOP AM_RANGE(0x3801, 0x3801) AM_READWRITE(upd7759_r, upd7759_w) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* Watchdog */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* Watchdog */ ADDRESS_MAP_END static INPUT_PORTS_START( bfcobra ) diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 00ecc94a2ac..cbc7f6fbcd2 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -1558,7 +1558,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_READ(MRA8_BANK1) // 8k paged ROM (4 pages) + AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK1) // 8k paged ROM (4 pages) AM_RANGE(0x8000, 0xFFFF) AM_ROM // 32k ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index e9c1a0ce5aa..d5008649740 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -304,28 +304,28 @@ INPUT_PORTS_END /*****************************************************************************/ /* Main CPU */ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_BANK1) AM_RANGE(0xd800, 0xdbff) AM_READ(beg_sharedram_r) /* only half of the RAM is accessible, line a10 of IC73 (6116) is GNDed */ AM_RANGE(0xf000, 0xf0ff) AM_READ(bigevglf_vidram_r) /* 41464 (64kB * 8 chips), addressed using ports 1 and 5 */ - AM_RANGE(0xf840, 0xf8ff) AM_READ(MRA8_RAM) + AM_RANGE(0xf840, 0xf8ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xd800, 0xdbff) AM_WRITE(beg_sharedram_w) AM_BASE(&beg_sharedram) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(bigevglf_palette_w) AM_BASE(&paletteram) - AM_RANGE(0xe800, 0xefff) AM_WRITE(MWA8_RAM) AM_BASE(&bigevglf_spriteram1) /* sprite 'templates' */ + AM_RANGE(0xe800, 0xefff) AM_WRITE(SMH_RAM) AM_BASE(&bigevglf_spriteram1) /* sprite 'templates' */ AM_RANGE(0xf000, 0xf0ff) AM_WRITE(bigevglf_vidram_w) - AM_RANGE(0xf840, 0xf8ff) AM_WRITE(MWA8_RAM) AM_BASE(&bigevglf_spriteram2) /* spriteram (x,y,offset in spriteram1,palette) */ + AM_RANGE(0xf840, 0xf8ff) AM_WRITE(SMH_RAM) AM_BASE(&bigevglf_spriteram2) /* spriteram (x,y,offset in spriteram1,palette) */ ADDRESS_MAP_END static ADDRESS_MAP_START( bigevglf_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) /* video ram enable ???*/ + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /* video ram enable ???*/ AM_RANGE(0x01, 0x01) AM_WRITE(bigevglf_gfxcontrol_w) /* plane select */ AM_RANGE(0x02, 0x02) AM_WRITE(beg_banking_w) AM_RANGE(0x03, 0x03) AM_WRITE(beg13A_set_w) @@ -343,23 +343,23 @@ ADDRESS_MAP_END /* Sub CPU */ static ADDRESS_MAP_START( readmem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0x8000, 0x83ff) AM_READ(beg_sharedram_r) /* shared with main CPU */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0x83ff) AM_WRITE(beg_sharedram_w) /* shared with main CPU */ ADDRESS_MAP_END static ADDRESS_MAP_START( bigevglf_sub_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x08, 0x08) AM_WRITE(MWA8_NOP) /*coinlockout_w ???? watchdog ???? */ + AM_RANGE(0x08, 0x08) AM_WRITE(SMH_NOP) /*coinlockout_w ???? watchdog ???? */ AM_RANGE(0x0c, 0x0c) AM_WRITE(bigevglf_mcu_w) - AM_RANGE(0x0e, 0x0e) AM_WRITE(MWA8_NOP) /* 0-enable MCU, 1-keep reset line ASSERTED; D0 goes to the input of ls74 and the /Q of this ls74 goes to reset line on 68705 */ + AM_RANGE(0x0e, 0x0e) AM_WRITE(SMH_NOP) /* 0-enable MCU, 1-keep reset line ASSERTED; D0 goes to the input of ls74 and the /Q of this ls74 goes to reset line on 68705 */ AM_RANGE(0x10, 0x17) AM_WRITE(beg13A_clr_w) AM_RANGE(0x18, 0x1f) AM_WRITE(beg13B_set_w) AM_RANGE(0x20, 0x20) AM_WRITE(sound_command_w) @@ -383,13 +383,13 @@ static READ8_HANDLER( sub_cpu_mcu_coin_port_r ) static ADDRESS_MAP_START( bigevglf_sub_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r) - AM_RANGE(0x01, 0x01) AM_READ(MRA8_NOP) + AM_RANGE(0x01, 0x01) AM_READ(SMH_NOP) AM_RANGE(0x02, 0x02) AM_READ(input_port_4_r) AM_RANGE(0x03, 0x03) AM_READ(input_port_5_r) AM_RANGE(0x04, 0x04) AM_READ(sub_cpu_mcu_coin_port_r) AM_RANGE(0x05, 0x05) AM_READ(input_port_2_r) AM_RANGE(0x06, 0x06) AM_READ(input_port_3_r) - AM_RANGE(0x07, 0x07) AM_READ(MRA8_NOP) + AM_RANGE(0x07, 0x07) AM_READ(SMH_NOP) AM_RANGE(0x0b, 0x0b) AM_READ(bigevglf_mcu_r) AM_RANGE(0x20, 0x20) AM_READ(beg_fromsound_r) AM_RANGE(0x21, 0x21) AM_READ(beg_soundstate_r) @@ -400,25 +400,25 @@ ADDRESS_MAP_END /* Sound CPU */ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xda00, 0xda00) AM_READ(soundstate_r) AM_RANGE(0xd800, 0xd800) AM_READ(sound_command_r) /* read from D800 sets bit 0 in status */ - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_NOP) /* space for diagnostics ROM */ + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_NOP) /* space for diagnostics ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc800, 0xc800) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0xca00, 0xca0d) AM_WRITE(MSM5232_0_w) - AM_RANGE(0xcc00, 0xcc00) AM_WRITE(MWA8_NOP) - AM_RANGE(0xce00, 0xce00) AM_WRITE(MWA8_NOP) + AM_RANGE(0xcc00, 0xcc00) AM_WRITE(SMH_NOP) + AM_RANGE(0xce00, 0xce00) AM_WRITE(SMH_NOP) AM_RANGE(0xd800, 0xd800) AM_WRITE(beg_fromsound_w) /* write to D800 sets bit 1 in status */ AM_RANGE(0xda00, 0xda00) AM_WRITE(nmi_enable_w) AM_RANGE(0xdc00, 0xdc00) AM_WRITE(nmi_disable_w) - AM_RANGE(0xde00, 0xde00) AM_WRITE(MWA8_NOP) + AM_RANGE(0xde00, 0xde00) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -430,8 +430,8 @@ static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(bigevglf_68705_portA_r) AM_RANGE(0x0001, 0x0001) AM_READ(bigevglf_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(bigevglf_68705_portC_r) - AM_RANGE(0x0010, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -442,8 +442,8 @@ static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0004, 0x0004) AM_WRITE(bigevglf_68705_ddrA_w) AM_RANGE(0x0005, 0x0005) AM_WRITE(bigevglf_68705_ddrB_w) AM_RANGE(0x0006, 0x0006) AM_WRITE(bigevglf_68705_ddrC_w) - AM_RANGE(0x0010, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index cd4fa1c4348..cc6857e1990 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -329,10 +329,10 @@ static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x0805ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x080600, 0x080fff) AM_READ(sharedram_r) AM_WRITE(sharedram_w) AM_BASE(&sharedram16) AM_RANGE(0x081000, 0x085fff) AM_RAM //?? - AM_RANGE(0x086000, 0x086fff) AM_READ(MRA16_RAM) AM_WRITE(bg_videoram_w) AM_BASE(&bg_videoram) - AM_RANGE(0x087000, 0x087fff) AM_READ(MRA16_RAM) AM_WRITE(fg_videoram_w) AM_BASE(&fg_videoram) - AM_RANGE(0x088000, 0x089fff) AM_READ(MRA16_RAM) AM_WRITE(text_videoram_w) AM_BASE(&text_videoram) - AM_RANGE(0x08a000, 0x08afff) AM_READ(MRA16_RAM) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x086000, 0x086fff) AM_READ(SMH_RAM) AM_WRITE(bg_videoram_w) AM_BASE(&bg_videoram) + AM_RANGE(0x087000, 0x087fff) AM_READ(SMH_RAM) AM_WRITE(fg_videoram_w) AM_BASE(&fg_videoram) + AM_RANGE(0x088000, 0x089fff) AM_READ(SMH_RAM) AM_WRITE(text_videoram_w) AM_BASE(&text_videoram) + AM_RANGE(0x08a000, 0x08afff) AM_READ(SMH_RAM) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x08b000, 0x08bfff) AM_RAM //?? AM_RANGE(0x08c000, 0x08c001) AM_READ(input_port_0_word_r) AM_RANGE(0x08c002, 0x08c003) AM_READ(input_port_1_word_r) diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c index 1611d30e035..69df2135c95 100644 --- a/src/mame/drivers/bigstrkb.c +++ b/src/mame/drivers/bigstrkb.c @@ -44,15 +44,15 @@ VIDEO_UPDATE(bigstrkb); /* some regions might be too large */ static ADDRESS_MAP_START( bigstrkb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) /* most region sizes are unknown */ // AM_RANGE(0x0c0000, 0x0cffff) AM_READ(megasys1_vregs_C_r) - AM_RANGE(0x0D0000, 0x0dffff) AM_READ(MRA16_RAM) - AM_RANGE(0x0E0000, 0x0E3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0e8000, 0x0ebfff) AM_READ(MRA16_RAM) - AM_RANGE(0x0ec000, 0x0effff) AM_READ(MRA16_RAM) - AM_RANGE(0x0f0000, 0x0fffff) AM_READ(MRA16_RAM) - AM_RANGE(0x1f0000, 0x1fffff) AM_READ(MRA16_RAM) + AM_RANGE(0x0D0000, 0x0dffff) AM_READ(SMH_RAM) + AM_RANGE(0x0E0000, 0x0E3fff) AM_READ(SMH_RAM) + AM_RANGE(0x0e8000, 0x0ebfff) AM_READ(SMH_RAM) + AM_RANGE(0x0ec000, 0x0effff) AM_READ(SMH_RAM) + AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM) + AM_RANGE(0x1f0000, 0x1fffff) AM_READ(SMH_RAM) AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r) /* Dip 1 */ AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r) /* Dip 2 */ AM_RANGE(0x700004, 0x700005) AM_READ(input_port_2_word_r) /* System */ @@ -62,48 +62,48 @@ static ADDRESS_MAP_START( bigstrkb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xE00000, 0xE00001) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0xE00002, 0xE00003) AM_READ(OKIM6295_status_1_lsb_r) - AM_RANGE(0xF00000, 0xFFFFFF) AM_READ(MRA16_RAM) // main RAM + AM_RANGE(0xF00000, 0xFFFFFF) AM_READ(SMH_RAM) // main RAM ADDRESS_MAP_END static ADDRESS_MAP_START( bigstrkb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) // AM_RANGE(0x0c0000, 0x0cffff) AM_WRITE(megasys1_vregs_C_w) AM_BASE(&megasys1_vregs) - AM_RANGE(0x0C2004, 0x0C2005) AM_WRITE(MWA16_NOP) - AM_RANGE(0x0C200C, 0x0C200d) AM_WRITE(MWA16_NOP) - AM_RANGE(0x0C2104, 0x0C2105) AM_WRITE(MWA16_NOP) - AM_RANGE(0x0C2108, 0x0C2109) AM_WRITE(MWA16_NOP) - AM_RANGE(0x0C2200, 0x0C2201) AM_WRITE(MWA16_NOP) - AM_RANGE(0x0C2208, 0x0C2209) AM_WRITE(MWA16_NOP) - AM_RANGE(0x0c2308, 0x0c2309) AM_WRITE(MWA16_NOP) // bit 0 of DSW1 (flip screen) - use vregs + AM_RANGE(0x0C2004, 0x0C2005) AM_WRITE(SMH_NOP) + AM_RANGE(0x0C200C, 0x0C200d) AM_WRITE(SMH_NOP) + AM_RANGE(0x0C2104, 0x0C2105) AM_WRITE(SMH_NOP) + AM_RANGE(0x0C2108, 0x0C2109) AM_WRITE(SMH_NOP) + AM_RANGE(0x0C2200, 0x0C2201) AM_WRITE(SMH_NOP) + AM_RANGE(0x0C2208, 0x0C2209) AM_WRITE(SMH_NOP) + AM_RANGE(0x0c2308, 0x0c2309) AM_WRITE(SMH_NOP) // bit 0 of DSW1 (flip screen) - use vregs - AM_RANGE(0x0D0000, 0x0dffff) AM_WRITE(MWA16_RAM) // 0xd2000 - 0xd3fff? 0xd8000? + AM_RANGE(0x0D0000, 0x0dffff) AM_WRITE(SMH_RAM) // 0xd2000 - 0xd3fff? 0xd8000? AM_RANGE(0x0e0000, 0x0e3fff) AM_WRITE(bsb_videoram2_w) AM_BASE(&bsb_videoram2) AM_RANGE(0x0e8000, 0x0ebfff) AM_WRITE(bsb_videoram3_w) AM_BASE(&bsb_videoram3) AM_RANGE(0x0ec000, 0x0effff) AM_WRITE(bsb_videoram_w) AM_BASE(&bsb_videoram) - AM_RANGE(0x0f0000, 0x0f7fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x0f0000, 0x0f7fff) AM_WRITE(SMH_RAM) AM_RANGE(0x0f8000, 0x0f87ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0f8800, 0x0fffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x0f8800, 0x0fffff) AM_WRITE(SMH_RAM) - AM_RANGE(0x1f0000, 0x1f7fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x1f8000, 0x1f87ff) AM_WRITE(MWA16_RAM) AM_BASE(&bigstrkb_spriteram) - AM_RANGE(0x1f8800, 0x1fffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1f0000, 0x1f7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1f8000, 0x1f87ff) AM_WRITE(SMH_RAM) AM_BASE(&bigstrkb_spriteram) + AM_RANGE(0x1f8800, 0x1fffff) AM_WRITE(SMH_RAM) - AM_RANGE(0x700020, 0x700027) AM_WRITE(MWA16_RAM) AM_BASE(&bsb_vidreg1) - AM_RANGE(0x700030, 0x700037) AM_WRITE(MWA16_RAM) AM_BASE(&bsb_vidreg2) + AM_RANGE(0x700020, 0x700027) AM_WRITE(SMH_RAM) AM_BASE(&bsb_vidreg1) + AM_RANGE(0x700030, 0x700037) AM_WRITE(SMH_RAM) AM_BASE(&bsb_vidreg2) - AM_RANGE(0xB00000, 0xB00001) AM_WRITE(MWA16_NOP) + AM_RANGE(0xB00000, 0xB00001) AM_WRITE(SMH_NOP) AM_RANGE(0xE00000, 0xE00001) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0xE00002, 0xE00003) AM_WRITE(OKIM6295_data_1_lsb_w) - AM_RANGE(0xE00008, 0xE00009) AM_WRITE(MWA16_NOP) - AM_RANGE(0xE0000c, 0xE0000d) AM_WRITE(MWA16_NOP) + AM_RANGE(0xE00008, 0xE00009) AM_WRITE(SMH_NOP) + AM_RANGE(0xE0000c, 0xE0000d) AM_WRITE(SMH_NOP) - AM_RANGE(0xF00000, 0xFFFFFF) AM_WRITE(MWA16_RAM) + AM_RANGE(0xF00000, 0xFFFFFF) AM_WRITE(SMH_RAM) ADDRESS_MAP_END #define BIGSTRKB_PLAYER_INPUT( player, start ) \ diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index 13e25ce4b53..8755a40f429 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -144,26 +144,26 @@ static INTERRUPT_GEN( bionicc_interrupt ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) /* 68000 ROM */ - AM_RANGE(0xfe0000, 0xfe07ff) AM_READ(MRA16_RAM) /* RAM? */ - AM_RANGE(0xfe0800, 0xfe0cff) AM_READ(MRA16_RAM) /* sprites */ - AM_RANGE(0xfe0d00, 0xfe3fff) AM_READ(MRA16_RAM) /* RAM? */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) /* 68000 ROM */ + AM_RANGE(0xfe0000, 0xfe07ff) AM_READ(SMH_RAM) /* RAM? */ + AM_RANGE(0xfe0800, 0xfe0cff) AM_READ(SMH_RAM) /* sprites */ + AM_RANGE(0xfe0d00, 0xfe3fff) AM_READ(SMH_RAM) /* RAM? */ AM_RANGE(0xfe4000, 0xfe4001) AM_READ(input_port_0_word_r) AM_RANGE(0xfe4002, 0xfe4003) AM_READ(input_port_1_word_r) - AM_RANGE(0xfec000, 0xfecfff) AM_READ(MRA16_RAM) - AM_RANGE(0xff0000, 0xff3fff) AM_READ(MRA16_RAM) - AM_RANGE(0xff4000, 0xff7fff) AM_READ(MRA16_RAM) - AM_RANGE(0xff8000, 0xff87ff) AM_READ(MRA16_RAM) - AM_RANGE(0xffc000, 0xfffff7) AM_READ(MRA16_RAM) /* working RAM */ + AM_RANGE(0xfec000, 0xfecfff) AM_READ(SMH_RAM) + AM_RANGE(0xff0000, 0xff3fff) AM_READ(SMH_RAM) + AM_RANGE(0xff4000, 0xff7fff) AM_READ(SMH_RAM) + AM_RANGE(0xff8000, 0xff87ff) AM_READ(SMH_RAM) + AM_RANGE(0xffc000, 0xfffff7) AM_READ(SMH_RAM) /* working RAM */ AM_RANGE(0xfffff8, 0xfffff9) AM_READ(hacked_soundcommand_r) /* hack */ AM_RANGE(0xfffffa, 0xffffff) AM_READ(hacked_controls_r) /* hack */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0xfe0000, 0xfe07ff) AM_WRITE(MWA16_RAM) /* RAM? */ - AM_RANGE(0xfe0800, 0xfe0cff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0xfe0d00, 0xfe3fff) AM_WRITE(MWA16_RAM) /* RAM? */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xfe0000, 0xfe07ff) AM_WRITE(SMH_RAM) /* RAM? */ + AM_RANGE(0xfe0800, 0xfe0cff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xfe0d00, 0xfe3fff) AM_WRITE(SMH_RAM) /* RAM? */ AM_RANGE(0xfe4000, 0xfe4001) AM_WRITE(bionicc_gfxctrl_w) /* + coin counters */ AM_RANGE(0xfe8010, 0xfe8017) AM_WRITE(bionicc_scroll_w) AM_RANGE(0xfe801a, 0xfe801b) AM_WRITE(bionicc_mpu_trigger_w) /* ??? not sure, but looks like it */ @@ -171,24 +171,24 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff0000, 0xff3fff) AM_WRITE(bionicc_fgvideoram_w) AM_BASE(&bionicc_fgvideoram) AM_RANGE(0xff4000, 0xff7fff) AM_WRITE(bionicc_bgvideoram_w) AM_BASE(&bionicc_bgvideoram) AM_RANGE(0xff8000, 0xff87ff) AM_WRITE(bionicc_paletteram_w) AM_BASE(&paletteram16) - AM_RANGE(0xffc000, 0xfffff7) AM_WRITE(MWA16_RAM) /* working RAM */ + AM_RANGE(0xffc000, 0xfffff7) AM_WRITE(SMH_RAM) /* working RAM */ AM_RANGE(0xfffff8, 0xfffff9) AM_WRITE(hacked_soundcommand_w) /* hack */ AM_RANGE(0xfffffa, 0xffffff) AM_WRITE(hacked_controls_w) /* hack */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8001, 0x8001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x8001, 0x8001) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c index ed441e43370..f34ac79ca95 100644 --- a/src/mame/drivers/bishi.c +++ b/src/mame/drivers/bishi.c @@ -119,25 +119,25 @@ static READ16_HANDLER( bishi_K056832_rom_r ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x400000, 0x407fff) AM_READ(MRA16_RAM) // work RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x400000, 0x407fff) AM_READ(SMH_RAM) // work RAM AM_RANGE(0x800000, 0x800001) AM_READ(control_r) AM_RANGE(0x800004, 0x800005) AM_READ(dipsw_r) AM_RANGE(0x800006, 0x800007) AM_READ(player1_r) AM_RANGE(0x800008, 0x800009) AM_READ(player2_r) AM_RANGE(0x880000, 0x880003) AM_READ(bishi_sound_r) AM_RANGE(0xa00000, 0xa01fff) AM_READ(K056832_ram_word_r) // VRAM - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM) + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM) AM_RANGE(0xb04000, 0xb047ff) AM_READ(bishi_mirror_r) // bug in the ram/rom test? AM_RANGE(0xc00000, 0xc01fff) AM_READ(bishi_K056832_rom_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x400000, 0x407fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_RANGE(0x800000, 0x800001) AM_WRITE(control_w) AM_RANGE(0x810000, 0x810003) AM_WRITE(control2_w) // bank switch for K056832 character ROM test - AM_RANGE(0x820000, 0x820001) AM_WRITE(MWA16_NOP) // lamps (see lamp test in service menu) + AM_RANGE(0x820000, 0x820001) AM_WRITE(SMH_NOP) // lamps (see lamp test in service menu) AM_RANGE(0x830000, 0x83003f) AM_WRITE(K056832_word_w) AM_RANGE(0x840000, 0x840007) AM_WRITE(K056832_b_word_w) // VSCCS AM_RANGE(0x850000, 0x85001f) AM_WRITE(K054338_word_w) // CLTC diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index 99dc045f95c..a0d5af82f3e 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -265,28 +265,28 @@ static ADDRESS_MAP_START( bishjan_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x200000, 0x207fff ) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) // battery AM_RANGE( 0x412000, 0x412fff ) AM_READ( bishjan_tmap2_lo_r ) //? - AM_RANGE( 0x413000, 0x413fff ) AM_READ( MRA16_RAM ) AM_SHARE(1) + AM_RANGE( 0x413000, 0x413fff ) AM_READ( SMH_RAM ) AM_SHARE(1) AM_RANGE( 0x416000, 0x416fff ) AM_READ( bishjan_tmap1_lo_r ) //? - AM_RANGE( 0x417000, 0x417fff ) AM_READ( MRA16_RAM ) AM_SHARE(1) + AM_RANGE( 0x417000, 0x417fff ) AM_READ( SMH_RAM ) AM_SHARE(1) AM_RANGE( 0x422000, 0x422fff ) AM_READ( bishjan_tmap2_hi_r ) //? - AM_RANGE( 0x423000, 0x423fff ) AM_READ( MRA16_RAM ) AM_SHARE(2) + AM_RANGE( 0x423000, 0x423fff ) AM_READ( SMH_RAM ) AM_SHARE(2) AM_RANGE( 0x426000, 0x426fff ) AM_READ( bishjan_tmap1_hi_r ) - AM_RANGE( 0x427000, 0x427fff ) AM_READ( MRA16_RAM ) AM_SHARE(2) + AM_RANGE( 0x427000, 0x427fff ) AM_READ( SMH_RAM ) AM_SHARE(2) AM_RANGE( 0x430000, 0x431fff ) AM_WRITE( bishjan_tmap2_w ) AM_RANGE( 0x432000, 0x432fff ) AM_WRITE( bishjan_tmap2_w ) //? - AM_RANGE( 0x433000, 0x433fff ) AM_WRITE( MWA16_RAM ) AM_SHARE(1) + AM_RANGE( 0x433000, 0x433fff ) AM_WRITE( SMH_RAM ) AM_SHARE(1) AM_RANGE( 0x434000, 0x435fff ) AM_WRITE( bishjan_tmap1_w ) AM_RANGE( 0x436000, 0x436fff ) AM_WRITE( bishjan_tmap1_w ) //? - AM_RANGE( 0x437000, 0x437fff ) AM_WRITE( MWA16_RAM ) AM_SHARE(2) + AM_RANGE( 0x437000, 0x437fff ) AM_WRITE( SMH_RAM ) AM_SHARE(2) - AM_RANGE( 0x600000, 0x600001 ) AM_READWRITE( MRA16_NOP, bishjan_sel_w ) + AM_RANGE( 0x600000, 0x600001 ) AM_READWRITE( SMH_NOP, bishjan_sel_w ) AM_RANGE( 0x600060, 0x600061 ) AM_WRITE( colordac_w ) - AM_RANGE( 0x600062, 0x600063 ) AM_WRITE( MWA16_NOP ) // ff to 600062 + AM_RANGE( 0x600062, 0x600063 ) AM_WRITE( SMH_NOP ) // ff to 600062 AM_RANGE( 0x6000a0, 0x6000a1 ) AM_WRITE( bishjan_low_w ) - AM_RANGE( 0xa0001e, 0xa0001f ) AM_WRITE( MWA16_RAM ) AM_BASE( &bishjan_layers ) + AM_RANGE( 0xa0001e, 0xa0001f ) AM_WRITE( SMH_RAM ) AM_BASE( &bishjan_layers ) - AM_RANGE( 0xa00020, 0xa00025 ) AM_WRITE( MWA16_RAM ) AM_BASE( &bishjan_scroll ) + AM_RANGE( 0xa00020, 0xa00025 ) AM_WRITE( SMH_RAM ) AM_BASE( &bishjan_scroll ) AM_RANGE( 0xc00000, 0xc00001 ) AM_READ( input_port_1_word_r ) // c00001 sw1 AM_RANGE( 0xc00002, 0xc00003 ) AM_READWRITE( input_port_2_word_r, bishjan_input_w ) // in c diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index 2144fcac509..f6a3190e45e 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -108,7 +108,7 @@ static ADDRESS_MAP_START( bladestl_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READ(K007342_r) /* Color RAM + Video RAM */ AM_RANGE(0x2000, 0x21ff) AM_READ(K007420_r) /* Sprite RAM */ AM_RANGE(0x2200, 0x23ff) AM_READ(K007342_scroll_r) /* Scroll RAM */ - AM_RANGE(0x2400, 0x245f) AM_READ(MRA8_RAM) /* Palette */ + AM_RANGE(0x2400, 0x245f) AM_READ(SMH_RAM) /* Palette */ AM_RANGE(0x2e01, 0x2e01) AM_READ(input_port_3_r) /* 1P controls */ AM_RANGE(0x2e02, 0x2e02) AM_READ(input_port_4_r) /* 2P controls */ AM_RANGE(0x2e03, 0x2e03) AM_READ(input_port_1_r) /* DISPW #2 */ @@ -116,43 +116,43 @@ static ADDRESS_MAP_START( bladestl_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2e00, 0x2e00) AM_READ(input_port_2_r) /* DIPSW #3, coinsw, startsw */ AM_RANGE(0x2f00, 0x2f03) AM_READ(trackball_r) /* Trackballs */ AM_RANGE(0x2f80, 0x2f9f) AM_READ(K051733_r) /* Protection: 051733 */ - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) /* Work RAM */ - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) /* Work RAM */ + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( bladestl_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_WRITE(K007342_w) /* Color RAM + Video RAM */ AM_RANGE(0x2000, 0x21ff) AM_WRITE(K007420_w) /* Sprite RAM */ AM_RANGE(0x2200, 0x23ff) AM_WRITE(K007342_scroll_w) /* Scroll RAM */ - AM_RANGE(0x2400, 0x245f) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram)/* palette */ + AM_RANGE(0x2400, 0x245f) AM_WRITE(SMH_RAM) AM_BASE(&paletteram)/* palette */ AM_RANGE(0x2600, 0x2607) AM_WRITE(K007342_vreg_w) /* Video Registers */ AM_RANGE(0x2e80, 0x2e80) AM_WRITE(bladestl_sh_irqtrigger_w)/* cause interrupt on audio CPU */ AM_RANGE(0x2ec0, 0x2ec0) AM_WRITE(watchdog_reset_w) /* watchdog reset */ AM_RANGE(0x2f40, 0x2f40) AM_WRITE(bladestl_bankswitch_w) /* bankswitch control */ AM_RANGE(0x2f80, 0x2f9f) AM_WRITE(K051733_w) /* Protection: 051733 */ - AM_RANGE(0x2fc0, 0x2fc0) AM_WRITE(MWA8_NOP) /* ??? */ - AM_RANGE(0x4000, 0x5fff) AM_WRITE(MWA8_RAM) /* Work RAM */ - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_RAM) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x2fc0, 0x2fc0) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_RAM) /* Work RAM */ + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_RAM) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( bladestl_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0x1000, 0x1000) AM_READ(YM2203_status_port_0_r) /* YM2203 */ AM_RANGE(0x1001, 0x1001) AM_READ(YM2203_read_port_0_r) /* YM2203 */ AM_RANGE(0x4000, 0x4000) AM_READ(upd7759_0_busy_r) /* UPD7759 */ AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) /* soundlatch_r */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( bladestl_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x1000, 0x1000) AM_WRITE(YM2203_control_port_0_w)/* YM2203 */ AM_RANGE(0x1001, 0x1001) AM_WRITE(YM2203_write_port_0_w) /* YM2203 */ AM_RANGE(0x3000, 0x3000) AM_WRITE(bladestl_speech_ctrl_w) /* UPD7759 */ - AM_RANGE(0x5000, 0x5000) AM_WRITE(MWA8_NOP) /* ??? */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c index 381ebb36e09..05ce9912a3e 100644 --- a/src/mame/drivers/blktiger.c +++ b/src/mame/drivers/blktiger.c @@ -64,11 +64,11 @@ static WRITE8_HANDLER( blktiger_coinlockout_w ) static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(MRA8_BANK1, MWA8_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK1, SMH_ROM) AM_RANGE(0xc000, 0xcfff) AM_READWRITE(blktiger_bgvideoram_r, blktiger_bgvideoram_w) - AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(MRA8_RAM, blktiger_txvideoram_w) AM_BASE(&blktiger_txvideoram) - AM_RANGE(0xd800, 0xdbff) AM_READWRITE(MRA8_RAM, paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE(&paletteram) - AM_RANGE(0xdc00, 0xdfff) AM_READWRITE(MRA8_RAM, paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_BASE(&paletteram_2) + AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(SMH_RAM, blktiger_txvideoram_w) AM_BASE(&blktiger_txvideoram) + AM_RANGE(0xd800, 0xdbff) AM_READWRITE(SMH_RAM, paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE(&paletteram) + AM_RANGE(0xdc00, 0xdfff) AM_READWRITE(SMH_RAM, paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_BASE(&paletteram_2) AM_RANGE(0xe000, 0xfdff) AM_RAM AM_RANGE(0xfe00, 0xffff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) ADDRESS_MAP_END @@ -82,7 +82,7 @@ static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") AM_WRITE(blktiger_video_control_w) AM_RANGE(0x05, 0x05) AM_READ_PORT("FREEZE") AM_RANGE(0x06, 0x06) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x07, 0x07) AM_READ(blktiger_protection_r) AM_WRITE(MWA8_NOP) /* Software protection (7) */ + AM_RANGE(0x07, 0x07) AM_READ(blktiger_protection_r) AM_WRITE(SMH_NOP) /* Software protection (7) */ AM_RANGE(0x08, 0x09) AM_WRITE(blktiger_scrollx_w) AM_RANGE(0x0a, 0x0b) AM_WRITE(blktiger_scrolly_w) AM_RANGE(0x0c, 0x0c) AM_WRITE(blktiger_video_enable_w) diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index 4d5197e3b06..3618be0977a 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -115,16 +115,16 @@ static READ16_HANDLER( blmbycar_opt_wheel_r ) ***************************************************************************/ static ADDRESS_MAP_START( blmbycar_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xfec000, 0xfeffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x200000, 0x2005ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x200600, 0x203fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x204000, 0x2045ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x204600, 0x207fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x104000, 0x105fff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x106000, 0x107fff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x440000, 0x441fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x444000, 0x445fff) AM_READ(MRA16_RAM ) // Sprites (size?) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xfec000, 0xfeffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x200000, 0x2005ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x200600, 0x203fff) AM_READ(SMH_RAM ) // + AM_RANGE(0x204000, 0x2045ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x204600, 0x207fff) AM_READ(SMH_RAM ) // + AM_RANGE(0x104000, 0x105fff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x106000, 0x107fff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x440000, 0x441fff) AM_READ(SMH_RAM ) // + AM_RANGE(0x444000, 0x445fff) AM_READ(SMH_RAM ) // Sprites (size?) AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r ) // 2 x DSW0 AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r ) // Joystick + Buttons AM_RANGE(0x700004, 0x700005) AM_READ(blmbycar_opt_wheel_r ) // Wheel (optical) @@ -134,21 +134,21 @@ static ADDRESS_MAP_START( blmbycar_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( blmbycar_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xfec000, 0xfeffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xfec000, 0xfeffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x104000, 0x105fff) AM_WRITE(blmbycar_vram_1_w) AM_BASE(&blmbycar_vram_1 ) // Layer 1 AM_RANGE(0x106000, 0x107fff) AM_WRITE(blmbycar_vram_0_w) AM_BASE(&blmbycar_vram_0 ) // Layer 0 - AM_RANGE(0x108000, 0x10bfff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x10c000, 0x10c003) AM_WRITE(MWA16_RAM) AM_BASE(&blmbycar_scroll_1 ) // Scroll 1 - AM_RANGE(0x10c004, 0x10c007) AM_WRITE(MWA16_RAM) AM_BASE(&blmbycar_scroll_0 ) // Scroll 0 + AM_RANGE(0x108000, 0x10bfff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x10c000, 0x10c003) AM_WRITE(SMH_RAM) AM_BASE(&blmbycar_scroll_1 ) // Scroll 1 + AM_RANGE(0x10c004, 0x10c007) AM_WRITE(SMH_RAM) AM_BASE(&blmbycar_scroll_0 ) // Scroll 0 AM_RANGE(0x200000, 0x2005ff) AM_WRITE(blmbycar_palette_w ) // Palette - AM_RANGE(0x200600, 0x203fff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x200600, 0x203fff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x204000, 0x2045ff) AM_WRITE(blmbycar_palette_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x204600, 0x207fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x440000, 0x441fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x444000, 0x445fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites (size?) - AM_RANGE(0x70000a, 0x70000b) AM_WRITE(MWA16_NOP ) // ? Wheel + AM_RANGE(0x204600, 0x207fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x440000, 0x441fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x444000, 0x445fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites (size?) + AM_RANGE(0x70000a, 0x70000b) AM_WRITE(SMH_NOP ) // ? Wheel AM_RANGE(0x70000c, 0x70000d) AM_WRITE(blmbycar_okibank_w ) // Sound AM_RANGE(0x70000e, 0x70000f) AM_WRITE(OKIM6295_data_0_lsb_w ) // AM_RANGE(0x70006a, 0x70006b) AM_WRITE(blmbycar_pot_wheel_reset_w ) // Wheel (potentiometer) @@ -165,39 +165,39 @@ static READ16_HANDLER( waterball_unk_r ) } static ADDRESS_MAP_START( watrball_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xfec000, 0xfeffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x200000, 0x2005ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x200600, 0x203fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x204000, 0x2045ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x204600, 0x207fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x104000, 0x105fff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x106000, 0x107fff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x440000, 0x441fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x444000, 0x445fff) AM_READ(MRA16_RAM ) // Sprites (size?) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xfec000, 0xfeffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x200000, 0x2005ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x200600, 0x203fff) AM_READ(SMH_RAM ) // + AM_RANGE(0x204000, 0x2045ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x204600, 0x207fff) AM_READ(SMH_RAM ) // + AM_RANGE(0x104000, 0x105fff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x106000, 0x107fff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x440000, 0x441fff) AM_READ(SMH_RAM ) // + AM_RANGE(0x444000, 0x445fff) AM_READ(SMH_RAM ) // Sprites (size?) AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r ) AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r ) - AM_RANGE(0x700006, 0x700007) AM_READ(MRA16_NOP ) // read + AM_RANGE(0x700006, 0x700007) AM_READ(SMH_NOP ) // read AM_RANGE(0x700008, 0x700009) AM_READ(waterball_unk_r ) // 0x0008 must toggle AM_RANGE(0x70000e, 0x70000f) AM_READ(OKIM6295_status_0_lsb_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( watrball_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xfec000, 0xfeffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xfec000, 0xfeffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x104000, 0x105fff) AM_WRITE(blmbycar_vram_1_w) AM_BASE(&blmbycar_vram_1 ) // Layer 1 AM_RANGE(0x106000, 0x107fff) AM_WRITE(blmbycar_vram_0_w) AM_BASE(&blmbycar_vram_0 ) // Layer 0 - AM_RANGE(0x108000, 0x10bfff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x10c000, 0x10c003) AM_WRITE(MWA16_RAM) AM_BASE(&blmbycar_scroll_1 ) // Scroll 1 - AM_RANGE(0x10c004, 0x10c007) AM_WRITE(MWA16_RAM) AM_BASE(&blmbycar_scroll_0 ) // Scroll 0 + AM_RANGE(0x108000, 0x10bfff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x10c000, 0x10c003) AM_WRITE(SMH_RAM) AM_BASE(&blmbycar_scroll_1 ) // Scroll 1 + AM_RANGE(0x10c004, 0x10c007) AM_WRITE(SMH_RAM) AM_BASE(&blmbycar_scroll_0 ) // Scroll 0 AM_RANGE(0x200000, 0x2005ff) AM_WRITE(blmbycar_palette_w ) // Palette - AM_RANGE(0x200600, 0x203fff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x200600, 0x203fff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x204000, 0x2045ff) AM_WRITE(blmbycar_palette_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x204600, 0x207fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x440000, 0x441fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x444000, 0x445fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites (size?) - AM_RANGE(0x70000a, 0x70000b) AM_WRITE(MWA16_NOP ) // ?? busy + AM_RANGE(0x204600, 0x207fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x440000, 0x441fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x444000, 0x445fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites (size?) + AM_RANGE(0x70000a, 0x70000b) AM_WRITE(SMH_NOP ) // ?? busy AM_RANGE(0x70000c, 0x70000d) AM_WRITE(blmbycar_okibank_w ) // Sound AM_RANGE(0x70000e, 0x70000f) AM_WRITE(OKIM6295_data_0_lsb_w ) // ADDRESS_MAP_END diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c index 3f1de2987b8..83ca744fd26 100644 --- a/src/mame/drivers/blockade.c +++ b/src/mame/drivers/blockade.c @@ -116,15 +116,15 @@ static WRITE8_HANDLER( blockade_coin_latch_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_ROM) AM_MIRROR(0x6000) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) AM_MIRROR(0x6c00) - AM_RANGE(0x9000, 0x90ff) AM_READ(MRA8_RAM) AM_MIRROR(0x6f00) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_ROM) AM_MIRROR(0x6000) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) AM_MIRROR(0x6c00) + AM_RANGE(0x9000, 0x90ff) AM_READ(SMH_RAM) AM_MIRROR(0x6f00) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_ROM) AM_MIRROR(0x6000) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_ROM) AM_MIRROR(0x6000) AM_RANGE(0x8000, 0x83ff) AM_WRITE(blockade_videoram_w) AM_BASE(&videoram) AM_MIRROR(0x6c00) - AM_RANGE(0x9000, 0x90ff) AM_WRITE(MWA8_RAM) AM_MIRROR(0x6f00) + AM_RANGE(0x9000, 0x90ff) AM_WRITE(SMH_RAM) AM_MIRROR(0x6f00) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index 8d68687f925..986bea2ff77 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -73,10 +73,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1f97, 0x1f97) AM_READ(input_port_2_r) AM_RANGE(0x1f98, 0x1f98) AM_READ(input_port_3_r) AM_RANGE(0x0000, 0x3fff) AM_READ(K052109_051960_r) - AM_RANGE(0x4000, 0x57ff) AM_READ(MRA8_RAM) + AM_RANGE(0x4000, 0x57ff) AM_READ(SMH_RAM) AM_RANGE(0x5800, 0x5fff) AM_READ(bankedram_r) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -84,25 +84,25 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1f88, 0x1f88) AM_WRITE(blockhl_sh_irqtrigger_w) AM_RANGE(0x1f8c, 0x1f8c) AM_WRITE(watchdog_reset_w) AM_RANGE(0x0000, 0x3fff) AM_WRITE(K052109_051960_w) - AM_RANGE(0x4000, 0x57ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x4000, 0x57ff) AM_WRITE(SMH_RAM) AM_RANGE(0x5800, 0x5fff) AM_WRITE(bankedram_w) AM_BASE(&ram) - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0xe00c, 0xe00d) AM_WRITE(MWA8_NOP) /* leftover from missing 007232? */ + AM_RANGE(0xe00c, 0xe00d) AM_WRITE(SMH_NOP) /* leftover from missing 007232? */ ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c index d844f20378b..b2b361b96aa 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -43,44 +43,44 @@ static WRITE16_HANDLER( blockout_sound_command_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r) AM_RANGE(0x100002, 0x100003) AM_READ(input_port_1_word_r) AM_RANGE(0x100004, 0x100005) AM_READ(input_port_2_word_r) AM_RANGE(0x100006, 0x100007) AM_READ(input_port_3_word_r) AM_RANGE(0x100008, 0x100009) AM_READ(input_port_4_word_r) - AM_RANGE(0x180000, 0x1bffff) AM_READ(MRA16_RAM) - AM_RANGE(0x1d4000, 0x1dffff) AM_READ(MRA16_RAM) - AM_RANGE(0x1f4000, 0x1fffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x207fff) AM_READ(MRA16_RAM) - AM_RANGE(0x208000, 0x21ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x280200, 0x2805ff) AM_READ(MRA16_RAM) + AM_RANGE(0x180000, 0x1bffff) AM_READ(SMH_RAM) + AM_RANGE(0x1d4000, 0x1dffff) AM_READ(SMH_RAM) + AM_RANGE(0x1f4000, 0x1fffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x207fff) AM_READ(SMH_RAM) + AM_RANGE(0x208000, 0x21ffff) AM_READ(SMH_RAM) + AM_RANGE(0x280200, 0x2805ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100014, 0x100015) AM_WRITE(blockout_sound_command_w) - AM_RANGE(0x100016, 0x100017) AM_WRITE(MWA16_NOP) /* don't know, maybe reset sound CPU */ + AM_RANGE(0x100016, 0x100017) AM_WRITE(SMH_NOP) /* don't know, maybe reset sound CPU */ AM_RANGE(0x180000, 0x1bffff) AM_WRITE(blockout_videoram_w) AM_BASE(&blockout_videoram) - AM_RANGE(0x1d4000, 0x1dffff) AM_WRITE(MWA16_RAM) /* work RAM */ - AM_RANGE(0x1f4000, 0x1fffff) AM_WRITE(MWA16_RAM) /* work RAM */ - AM_RANGE(0x200000, 0x207fff) AM_WRITE(MWA16_RAM) AM_BASE(&blockout_frontvideoram) - AM_RANGE(0x208000, 0x21ffff) AM_WRITE(MWA16_RAM) /* ??? */ + AM_RANGE(0x1d4000, 0x1dffff) AM_WRITE(SMH_RAM) /* work RAM */ + AM_RANGE(0x1f4000, 0x1fffff) AM_WRITE(SMH_RAM) /* work RAM */ + AM_RANGE(0x200000, 0x207fff) AM_WRITE(SMH_RAM) AM_BASE(&blockout_frontvideoram) + AM_RANGE(0x208000, 0x21ffff) AM_WRITE(SMH_RAM) /* ??? */ AM_RANGE(0x280002, 0x280003) AM_WRITE(blockout_frontcolor_w) AM_RANGE(0x280200, 0x2805ff) AM_WRITE(blockout_paletteram_w) AM_BASE(&paletteram16) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8801, 0x8801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c index 507967880ef..5cb427e727d 100644 --- a/src/mame/drivers/blstroid.c +++ b/src/mame/drivers/blstroid.c @@ -89,7 +89,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff8200, 0xff8201) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_scanline_int_ack_w) AM_RANGE(0xff8400, 0xff8401) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_video_int_ack_w) AM_RANGE(0xff8600, 0xff8601) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_eeprom_enable_w) - AM_RANGE(0xff8800, 0xff89ff) AM_MIRROR(0x7f8000) AM_WRITE(MWA16_RAM) AM_BASE(&blstroid_priorityram) + AM_RANGE(0xff8800, 0xff89ff) AM_MIRROR(0x7f8000) AM_WRITE(SMH_RAM) AM_BASE(&blstroid_priorityram) AM_RANGE(0xff8a00, 0xff8a01) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_sound_w) AM_RANGE(0xff8c00, 0xff8c01) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0xff8e00, 0xff8e01) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_halt_until_hblank_0_w) @@ -97,10 +97,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff9800, 0xff9801) AM_MIRROR(0x7f83f8) AM_READ(input_port_0_word_r) AM_RANGE(0xff9804, 0xff9805) AM_MIRROR(0x7f83f8) AM_READ(input_port_1_word_r) AM_RANGE(0xff9c00, 0xff9c03) AM_MIRROR(0x7f83fc) AM_READ(inputs_r) - AM_RANGE(0xffa000, 0xffa3ff) AM_MIRROR(0x7f8c00) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xffa000, 0xffa3ff) AM_MIRROR(0x7f8c00) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xffb000, 0xffb3ff) AM_MIRROR(0x7f8c00) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) - AM_RANGE(0xffc000, 0xffcfff) AM_MIRROR(0x7f8000) AM_READWRITE(MRA16_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0xffd000, 0xffdfff) AM_MIRROR(0x7f8000) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0xffc000, 0xffcfff) AM_MIRROR(0x7f8000) AM_READWRITE(SMH_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0xffd000, 0xffdfff) AM_MIRROR(0x7f8000) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xffe000, 0xffffff) AM_MIRROR(0x7f8000) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index 5d86b1dcf94..4b80291b6ac 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -327,20 +327,20 @@ static ADDRESS_MAP_START( bmcbowl_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x090000, 0x090001) AM_WRITE(bmc_RAMDAC_offset_w) AM_RANGE(0x090002, 0x090003) AM_WRITE(bmc_RAMDAC_color_w) - AM_RANGE(0x090004, 0x090005) AM_WRITE(MWA16_NOP)//RAMDAC + AM_RANGE(0x090004, 0x090005) AM_WRITE(SMH_NOP)//RAMDAC - AM_RANGE(0x090800, 0x090803) AM_WRITE(MWA16_NOP) - AM_RANGE(0x091000, 0x091001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x090800, 0x090803) AM_WRITE(SMH_NOP) + AM_RANGE(0x091000, 0x091001) AM_WRITE(SMH_NOP) AM_RANGE(0x091800, 0x091801) AM_WRITE(scroll_w) AM_RANGE(0x092000, 0x09201f) AM_READWRITE(via_r,via_w) - AM_RANGE(0x093000, 0x093003) AM_WRITE(MWA16_NOP) // related to music + AM_RANGE(0x093000, 0x093003) AM_WRITE(SMH_NOP) // related to music AM_RANGE(0x092800, 0x092801) AM_WRITE(AY8910_write_port_0_msb_w ) AM_RANGE(0x092802, 0x092803) AM_READ(AY8910_read_port_0_msb_r) AM_WRITE(AY8910_control_port_0_msb_w ) AM_RANGE(0x093802, 0x093803) AM_READ(input_port_0_word_r) AM_RANGE(0x095000, 0x095fff) AM_RAM AM_BASE((UINT16 **)&stats_ram) AM_SIZE(&stats_ram_size) /* 8 bit */ - AM_RANGE(0x097000, 0x097001) AM_READ(MRA16_NOP) + AM_RANGE(0x097000, 0x097001) AM_READ(SMH_NOP) AM_RANGE(0x140000, 0x1bffff) AM_ROM AM_RANGE(0x1c0000, 0x1effff) AM_RAM AM_BASE(&bmcbowl_vid1) AM_RANGE(0x1f0000, 0x1fffff) AM_RAM @@ -349,13 +349,13 @@ static ADDRESS_MAP_START( bmcbowl_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x28c000, 0x28c001) AM_READWRITE(OKIM6295_status_0_msb_r,OKIM6295_data_0_msb_w) /* protection device*/ - AM_RANGE(0x30c000, 0x30c001) AM_WRITE(MWA16_NOP) - AM_RANGE(0x30c040, 0x30c041) AM_WRITE(MWA16_NOP) - AM_RANGE(0x30c080, 0x30c081) AM_WRITE(MWA16_NOP) - AM_RANGE(0x30c0c0, 0x30c0c1) AM_WRITE(MWA16_NOP) + AM_RANGE(0x30c000, 0x30c001) AM_WRITE(SMH_NOP) + AM_RANGE(0x30c040, 0x30c041) AM_WRITE(SMH_NOP) + AM_RANGE(0x30c080, 0x30c081) AM_WRITE(SMH_NOP) + AM_RANGE(0x30c0c0, 0x30c0c1) AM_WRITE(SMH_NOP) AM_RANGE(0x30c100, 0x30c101) AM_READ(bmc_protection_r) - AM_RANGE(0x30c140, 0x30c141) AM_WRITE(MWA16_NOP) - AM_RANGE(0x30ca00, 0x30ca01) AM_READ(bmc_random_read) AM_WRITE(MWA16_NOP) + AM_RANGE(0x30c140, 0x30c141) AM_WRITE(SMH_NOP) + AM_RANGE(0x30ca00, 0x30ca01) AM_READ(bmc_random_read) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 4ae08cb3a52..fe35d77fc63 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -1239,18 +1239,18 @@ static ADDRESS_MAP_START( bnstars_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xfcc00008, 0xfcc0000b) AM_READ( bnstars2_r ) AM_RANGE(0xfcc00010, 0xfcc00013) AM_READ( bnstars3_r ) - AM_RANGE(0xfce00034, 0xfce00037) AM_WRITE(MWA32_NOP) + AM_RANGE(0xfce00034, 0xfce00037) AM_WRITE(SMH_NOP) - AM_RANGE(0xfce00050, 0xfce00053) AM_WRITE(MWA32_NOP) - AM_RANGE(0xfce00058, 0xfce0005b) AM_WRITE(MWA32_NOP) - AM_RANGE(0xfce0005c, 0xfce0005f) AM_WRITE(MWA32_NOP) + AM_RANGE(0xfce00050, 0xfce00053) AM_WRITE(SMH_NOP) + AM_RANGE(0xfce00058, 0xfce0005b) AM_WRITE(SMH_NOP) + AM_RANGE(0xfce0005c, 0xfce0005f) AM_WRITE(SMH_NOP) - AM_RANGE(0xfce00400, 0xfce0045f) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_roz_ctrl[0]) - AM_RANGE(0xfce00700, 0xfce0075f) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_roz_ctrl[1]) // guess - AM_RANGE(0xfce00a00, 0xfce00a17) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_tx0_scroll) - AM_RANGE(0xfce00a20, 0xfce00a37) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_bg0_scroll) - AM_RANGE(0xfce00c00, 0xfce00c17) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_tx1_scroll) - AM_RANGE(0xfce00c20, 0xfce00c37) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_bg1_scroll) + AM_RANGE(0xfce00400, 0xfce0045f) AM_WRITE(SMH_RAM) AM_BASE(&ms32_roz_ctrl[0]) + AM_RANGE(0xfce00700, 0xfce0075f) AM_WRITE(SMH_RAM) AM_BASE(&ms32_roz_ctrl[1]) // guess + AM_RANGE(0xfce00a00, 0xfce00a17) AM_WRITE(SMH_RAM) AM_BASE(&ms32_tx0_scroll) + AM_RANGE(0xfce00a20, 0xfce00a37) AM_WRITE(SMH_RAM) AM_BASE(&ms32_bg0_scroll) + AM_RANGE(0xfce00c00, 0xfce00c17) AM_WRITE(SMH_RAM) AM_BASE(&ms32_tx1_scroll) + AM_RANGE(0xfce00c20, 0xfce00c37) AM_WRITE(SMH_RAM) AM_BASE(&ms32_bg1_scroll) AM_RANGE(0xfce00e00, 0xfce00e03) AM_WRITE(bnstars1_mahjong_select_w) // ? @@ -1268,7 +1268,7 @@ static ADDRESS_MAP_START( bnstars_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xfec08000, 0xfec0ffff) AM_RAM AM_WRITE(ms32_bg0_ram_w) AM_BASE(&ms32_bg0_ram) AM_RANGE(0xfee00000, 0xfee1ffff) AM_RAM - AM_RANGE(0xffe00000, 0xffffffff) AM_READWRITE(MRA32_BANK1, MWA32_ROM) + AM_RANGE(0xffe00000, 0xffffffff) AM_READWRITE(SMH_BANK1, SMH_ROM) ADDRESS_MAP_END #if 0 diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c index 2ab20c3c972..f40d945dc78 100644 --- a/src/mame/drivers/bombjack.c +++ b/src/mame/drivers/bombjack.c @@ -137,41 +137,41 @@ static READ8_HANDLER( bombjack_soundlatch_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x97ff) AM_READ(MRA8_RAM) /* including video and color RAM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x97ff) AM_READ(SMH_RAM) /* including video and color RAM */ AM_RANGE(0xb000, 0xb000) AM_READ(input_port_0_r) /* player 1 input */ AM_RANGE(0xb001, 0xb001) AM_READ(input_port_1_r) /* player 2 input */ AM_RANGE(0xb002, 0xb002) AM_READ(input_port_2_r) /* coin */ - AM_RANGE(0xb003, 0xb003) AM_READ(MRA8_NOP) /* watchdog reset? */ + AM_RANGE(0xb003, 0xb003) AM_READ(SMH_NOP) /* watchdog reset? */ AM_RANGE(0xb004, 0xb004) AM_READ(input_port_3_r) /* DSW1 */ AM_RANGE(0xb005, 0xb005) AM_READ(input_port_4_r) /* DSW2 */ - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(bombjack_videoram_w) AM_BASE(&videoram) AM_RANGE(0x9400, 0x97ff) AM_WRITE(bombjack_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x9820, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x9a00, 0x9a00) AM_WRITE(MWA8_NOP) + AM_RANGE(0x9820, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x9a00, 0x9a00) AM_WRITE(SMH_NOP) AM_RANGE(0x9c00, 0x9cff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) AM_RANGE(0x9e00, 0x9e00) AM_WRITE(bombjack_background_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(interrupt_enable_w) AM_RANGE(0xb004, 0xb004) AM_WRITE(bombjack_flipscreen_w) AM_RANGE(0xb800, 0xb800) AM_WRITE(bombjack_soundlatch_w) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( bombjack_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(bombjack_soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( bombjack_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index 881f7dacd4b..6eeccf9cbe2 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -107,17 +107,17 @@ static ADDRESS_MAP_START( boogwing_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x24e344, 0x24e345) AM_READ(input_port_2_word_r) AM_RANGE(0x24e000, 0x24e7ff) AM_WRITE(deco16_104_prot_w) AM_BASE(&deco16_prot_ram) - AM_RANGE(0x260000, 0x26000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) - AM_RANGE(0x264000, 0x265fff) AM_READ(MRA16_RAM) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) - AM_RANGE(0x266000, 0x267fff) AM_READ(MRA16_RAM) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x268000, 0x268fff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x26a000, 0x26afff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x260000, 0x26000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x264000, 0x265fff) AM_READ(SMH_RAM) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) + AM_RANGE(0x266000, 0x267fff) AM_READ(SMH_RAM) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) + AM_RANGE(0x268000, 0x268fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x26a000, 0x26afff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x270000, 0x27000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) - AM_RANGE(0x274000, 0x275fff) AM_READ(MRA16_RAM) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) - AM_RANGE(0x276000, 0x277fff) AM_READ(MRA16_RAM) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x278000, 0x278fff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf3_rowscroll) - AM_RANGE(0x27a000, 0x27afff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x270000, 0x27000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x274000, 0x275fff) AM_READ(SMH_RAM) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) + AM_RANGE(0x276000, 0x277fff) AM_READ(SMH_RAM) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) + AM_RANGE(0x278000, 0x278fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf3_rowscroll) + AM_RANGE(0x27a000, 0x27afff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) AM_RANGE(0x280000, 0x28000f) AM_NOP // ? AM_RANGE(0x282000, 0x282001) AM_NOP // Palette setup? @@ -129,22 +129,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_READ(MRA8_NOP) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA8_NOP) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_1_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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 22d6ea7ab8e..67af2761f91 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -136,9 +136,9 @@ static ADDRESS_MAP_START( bottom9_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1fe0, 0x1fe0) AM_READ(input_port_3_r) AM_RANGE(0x2000, 0x27ff) AM_READ(bottom9_bankedram2_r) AM_RANGE(0x0000, 0x3fff) AM_READ(K052109_051960_r) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( bottom9_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -151,22 +151,22 @@ static ADDRESS_MAP_START( bottom9_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1ff0, 0x1fff) AM_WRITE(K051316_ctrl_0_w) AM_RANGE(0x2000, 0x27ff) AM_WRITE(bottom9_bankedram2_w) AM_BASE(&paletteram) AM_RANGE(0x0000, 0x3fff) AM_WRITE(K052109_051960_w) - AM_RANGE(0x4000, 0x5fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( bottom9_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa00d) AM_READ(K007232_read_port_0_r) AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_1_r) AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( bottom9_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(sound_bank_w) AM_RANGE(0xa000, 0xa00d) AM_WRITE(K007232_write_port_0_w) AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_1_w) diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 2c395105bc0..6163941b88d 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -189,7 +189,7 @@ static ADDRESS_MAP_START( boxer_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1b00, 0x1bff) AM_WRITE(boxer_crowd_w) AM_RANGE(0x1c00, 0x1cff) AM_WRITE(boxer_irq_reset_w) AM_RANGE(0x1d00, 0x1dff) AM_WRITE(boxer_bell_w) - AM_RANGE(0x1e00, 0x1eff) AM_WRITE(MWA8_RAM) AM_BASE(&boxer_sprite_ram) + AM_RANGE(0x1e00, 0x1eff) AM_WRITE(SMH_RAM) AM_BASE(&boxer_sprite_ram) AM_RANGE(0x1f00, 0x1fff) AM_WRITE(watchdog_reset_w) AM_RANGE(0x3000, 0x3fff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c index c5c55696a6a..8dc9de69f53 100644 --- a/src/mame/drivers/brkthru.c +++ b/src/mame/drivers/brkthru.c @@ -98,9 +98,9 @@ static INPUT_CHANGED( coin_inserted ) static ADDRESS_MAP_START( brkthru_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READWRITE(MRA8_RAM, brkthru_fgram_w) AM_BASE(&brkthru_videoram) AM_SIZE(&brkthru_videoram_size) + AM_RANGE(0x0000, 0x03ff) AM_READWRITE(SMH_RAM, brkthru_fgram_w) AM_BASE(&brkthru_videoram) AM_SIZE(&brkthru_videoram_size) AM_RANGE(0x0400, 0x0bff) AM_RAM - AM_RANGE(0x0c00, 0x0fff) AM_READWRITE(MRA8_RAM, brkthru_bgram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x0c00, 0x0fff) AM_READWRITE(SMH_RAM, brkthru_bgram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x1100, 0x17ff) AM_RAM AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) /* player controls, player start */ @@ -117,11 +117,11 @@ ADDRESS_MAP_END /* same as brktrhu, but xor 0x1000 below 8k */ static ADDRESS_MAP_START( darwin_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x1000, 0x13ff) AM_READWRITE(MRA8_RAM, brkthru_fgram_w) AM_BASE(&brkthru_videoram) AM_SIZE(&brkthru_videoram_size) + AM_RANGE(0x1000, 0x13ff) AM_READWRITE(SMH_RAM, brkthru_fgram_w) AM_BASE(&brkthru_videoram) AM_SIZE(&brkthru_videoram_size) AM_RANGE(0x1400, 0x1bff) AM_RAM - AM_RANGE(0x1c00, 0x1fff) AM_READWRITE(MRA8_RAM, brkthru_bgram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x1c00, 0x1fff) AM_READWRITE(SMH_RAM, brkthru_bgram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x0000, 0x00ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x0100, 0x01ff) AM_WRITE(MWA8_NOP) /*tidyup, nothing realy here?*/ + AM_RANGE(0x0100, 0x01ff) AM_WRITE(SMH_NOP) /*tidyup, nothing realy here?*/ AM_RANGE(0x0800, 0x0800) AM_READ(input_port_0_r) /* player controls, player start */ AM_RANGE(0x0801, 0x0801) AM_READ(input_port_1_r) /* cocktail player controls */ AM_RANGE(0x0802, 0x0802) AM_READ(input_port_3_r) /* DSW 0 */ diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c index 5b81dbebc8c..1f58b216496 100644 --- a/src/mame/drivers/bsktball.c +++ b/src/mame/drivers/bsktball.c @@ -77,9 +77,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0800) AM_READ(bsktball_in0_r) AM_RANGE(0x0802, 0x0802) AM_READ(input_port_5_r) AM_RANGE(0x0803, 0x0803) AM_READ(input_port_6_r) - AM_RANGE(0x1000, 0x1000) AM_WRITE(MWA8_NOP) /* Timer Reset */ + AM_RANGE(0x1000, 0x1000) AM_WRITE(SMH_NOP) /* Timer Reset */ AM_RANGE(0x1010, 0x1010) AM_WRITE(bsktball_bounce_w) /* Crowd Amp / Bounce */ - AM_RANGE(0x1022, 0x1023) AM_WRITE(MWA8_NOP) /* Coin Counter */ + AM_RANGE(0x1022, 0x1023) AM_WRITE(SMH_NOP) /* Coin Counter */ AM_RANGE(0x1024, 0x1025) AM_WRITE(bsktball_led1_w) /* LED 1 */ AM_RANGE(0x1026, 0x1027) AM_WRITE(bsktball_led2_w) /* LED 2 */ AM_RANGE(0x1028, 0x1029) AM_WRITE(bsktball_ld1_w) /* LD 1 */ @@ -87,7 +87,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x102c, 0x102d) AM_WRITE(bsktball_noise_reset_w) /* Noise Reset */ AM_RANGE(0x102e, 0x102f) AM_WRITE(bsktball_nmion_w) /* NMI On */ AM_RANGE(0x1030, 0x1030) AM_WRITE(bsktball_note_w) /* Music Ckt Note Dvsr */ - AM_RANGE(0x1800, 0x1bbf) AM_READWRITE(MRA8_RAM, bsktball_videoram_w) AM_BASE(&videoram) /* DISPLAY */ + AM_RANGE(0x1800, 0x1bbf) AM_READWRITE(SMH_RAM, bsktball_videoram_w) AM_BASE(&videoram) /* DISPLAY */ AM_RANGE(0x1bc0, 0x1bff) AM_RAM AM_BASE(&bsktball_motion) AM_RANGE(0x1c00, 0x1cff) AM_RAM AM_RANGE(0x2000, 0x3fff) AM_ROM /* PROGRAM */ diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index a299aad3fba..5f8a9777c44 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -151,10 +151,10 @@ static WRITE8_HANDLER( lnc_w ) if (offset <= 0x3bff) ; else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(machine,offset - 0x3c00,data); return; } else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(machine,offset - 0x7c00,data); return; } - else if (offset == 0x8000) { return; } /* MWA8_NOP */ + else if (offset == 0x8000) { return; } /* SMH_NOP */ else if (offset == 0x8001) { lnc_video_control_w(machine,0,data); return; } else if (offset == 0x8003) ; - else if (offset == 0x9000) { return; } /* MWA8_NOP */ + else if (offset == 0x9000) { return; } /* SMH_NOP */ else if (offset == 0x9002) { audio_command_w(machine,0,data); return; } else if (offset >= 0xb000 && offset <= 0xb1ff) ; else logerror("CPU #%d PC %04x: warning - write %02x to unmapped memory address %04x\n",cpu_getactivecpu(),activecpu_get_pc(),data,offset); @@ -172,7 +172,7 @@ static WRITE8_HANDLER( mmonkey_w ) else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(machine,offset - 0x7c00,data); return; } else if (offset == 0x8001) { lnc_video_control_w(machine,0,data); return; } else if (offset == 0x8003) ; - else if (offset == 0x9000) { return; } /* MWA8_NOP */ + else if (offset == 0x9000) { return; } /* SMH_NOP */ else if (offset == 0x9002) { audio_command_w(machine,0,data); return; } else if (offset >= 0xb000 && offset <= 0xbfff) { mmonkey_protection_w(machine,offset - 0xb000, data); return; } else logerror("CPU #%d PC %04x: warning - write %02x to unmapped memory address %04x\n",cpu_getactivecpu(),activecpu_get_pc(),data,offset); @@ -242,12 +242,12 @@ static ADDRESS_MAP_START( btime_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1400, 0x17ff) AM_RAM AM_BASE(&btime_colorram) AM_RANGE(0x1800, 0x1bff) AM_READWRITE(btime_mirrorvideoram_r, btime_mirrorvideoram_w) AM_RANGE(0x1c00, 0x1fff) AM_READWRITE(btime_mirrorcolorram_r, btime_mirrorcolorram_w) - AM_RANGE(0x4000, 0x4000) AM_READWRITE(input_port_0_r, MWA8_NOP) + AM_RANGE(0x4000, 0x4000) AM_READWRITE(input_port_0_r, SMH_NOP) AM_RANGE(0x4001, 0x4001) AM_READ(input_port_1_r) AM_RANGE(0x4002, 0x4002) AM_READWRITE(input_port_2_r, btime_video_control_w) AM_RANGE(0x4003, 0x4003) AM_READWRITE(input_port_3_r, audio_command_w) AM_RANGE(0x4004, 0x4004) AM_READWRITE(input_port_4_r, bnj_scroll1_w) - AM_RANGE(0xb000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xb000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( cookrace_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -274,8 +274,8 @@ static ADDRESS_MAP_START( zoar_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xffff) AM_WRITE(zoar_w) /* override the following entries to */ /* support ROM decryption */ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&rambase) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) - AM_RANGE(0x8400, 0x87ff) AM_WRITE(MWA8_RAM) AM_BASE(&btime_colorram) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) + AM_RANGE(0x8400, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&btime_colorram) AM_RANGE(0x8800, 0x8bff) AM_WRITE(btime_mirrorvideoram_w) AM_RANGE(0x8c00, 0x8fff) AM_WRITE(btime_mirrorcolorram_w) AM_RANGE(0x9000, 0x9000) AM_WRITE(zoar_video_control_w) @@ -283,45 +283,45 @@ static ADDRESS_MAP_START( zoar_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9801, 0x9801) AM_READ(input_port_4_r) AM_RANGE(0x9802, 0x9802) AM_READ(input_port_0_r) AM_RANGE(0x9803, 0x9803) AM_READ(input_port_1_r) - AM_RANGE(0x9800, 0x9803) AM_WRITE(MWA8_RAM) AM_BASE(&zoar_scrollram) + AM_RANGE(0x9800, 0x9803) AM_WRITE(SMH_RAM) AM_BASE(&zoar_scrollram) AM_RANGE(0x9804, 0x9804) AM_READWRITE(input_port_2_r, bnj_scroll2_w) AM_RANGE(0x9805, 0x9805) AM_WRITE(bnj_scroll1_w) AM_RANGE(0x9806, 0x9806) AM_WRITE(audio_command_w) - AM_RANGE(0xd000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xd000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( lnc_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xffff) AM_WRITE(lnc_w) /* override the following entries to */ /* support ROM decryption */ AM_RANGE(0x0000, 0x3bff) AM_RAM AM_BASE(&rambase) - AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(MRA8_RAM, lnc_videoram_w) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) - AM_RANGE(0x7800, 0x7bff) AM_WRITE(MWA8_RAM) AM_BASE(&btime_colorram) /* this is just here to initialize the pointer */ + AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(SMH_RAM, lnc_videoram_w) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) + AM_RANGE(0x7800, 0x7bff) AM_WRITE(SMH_RAM) AM_BASE(&btime_colorram) /* this is just here to initialize the pointer */ AM_RANGE(0x7c00, 0x7fff) AM_READWRITE(btime_mirrorvideoram_r, lnc_mirrorvideoram_w) - AM_RANGE(0x8000, 0x8000) AM_READWRITE(input_port_3_r, MWA8_NOP) /* ??? */ + AM_RANGE(0x8000, 0x8000) AM_READWRITE(input_port_3_r, SMH_NOP) /* ??? */ AM_RANGE(0x8001, 0x8001) AM_READWRITE(input_port_4_r, lnc_video_control_w) - AM_RANGE(0x8003, 0x8003) AM_WRITE(MWA8_RAM) AM_BASE(&lnc_charbank) - AM_RANGE(0x9000, 0x9000) AM_READWRITE(input_port_0_r, MWA8_NOP) /* IRQ ack??? */ + AM_RANGE(0x8003, 0x8003) AM_WRITE(SMH_RAM) AM_BASE(&lnc_charbank) + AM_RANGE(0x9000, 0x9000) AM_READWRITE(input_port_0_r, SMH_NOP) /* IRQ ack??? */ AM_RANGE(0x9001, 0x9001) AM_READ(input_port_1_r) AM_RANGE(0x9002, 0x9002) AM_READWRITE(input_port_2_r, audio_command_w) AM_RANGE(0xb000, 0xb1ff) AM_RAM - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mmonkey_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xffff) AM_WRITE(mmonkey_w) /* override the following entries to */ /* support ROM decryption */ AM_RANGE(0x0000, 0x3bff) AM_RAM AM_BASE(&rambase) - AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(MRA8_RAM, lnc_videoram_w) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) - AM_RANGE(0x7800, 0x7bff) AM_WRITE(MWA8_RAM) AM_BASE(&btime_colorram) /* this is just here to initialize the pointer */ + AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(SMH_RAM, lnc_videoram_w) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) + AM_RANGE(0x7800, 0x7bff) AM_WRITE(SMH_RAM) AM_BASE(&btime_colorram) /* this is just here to initialize the pointer */ AM_RANGE(0x7c00, 0x7fff) AM_READWRITE(btime_mirrorvideoram_r, lnc_mirrorvideoram_w) AM_RANGE(0x8000, 0x8000) AM_READ(input_port_3_r) AM_RANGE(0x8001, 0x8001) AM_READWRITE(input_port_4_r, lnc_video_control_w) - AM_RANGE(0x8003, 0x8003) AM_WRITE(MWA8_RAM) AM_BASE(&lnc_charbank) - AM_RANGE(0x9000, 0x9000) AM_READWRITE(input_port_0_r, MWA8_NOP) /* IRQ ack??? */ + AM_RANGE(0x8003, 0x8003) AM_WRITE(SMH_RAM) AM_BASE(&lnc_charbank) + AM_RANGE(0x9000, 0x9000) AM_READWRITE(input_port_0_r, SMH_NOP) /* IRQ ack??? */ AM_RANGE(0x9001, 0x9001) AM_READ(input_port_1_r) AM_RANGE(0x9002, 0x9002) AM_READWRITE(input_port_2_r, audio_command_w) AM_RANGE(0xb000, 0xbfff) AM_READWRITE(mmonkey_protection_r, mmonkey_protection_w) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( bnj_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -339,14 +339,14 @@ static ADDRESS_MAP_START( bnj_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5400, 0x5400) AM_WRITE(bnj_scroll1_w) AM_RANGE(0x5800, 0x5800) AM_WRITE(bnj_scroll2_w) AM_RANGE(0x5c00, 0x5c0f) AM_WRITE(btime_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0xa000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( disco_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xffff) AM_WRITE(disco_w) /* override the following entries to */ /* support ROM decryption */ AM_RANGE(0x0000, 0x04ff) AM_RAM AM_BASE(&rambase) - AM_RANGE(0x2000, 0x7fff) AM_READWRITE(MRA8_RAM, deco_charram_w) AM_BASE(&deco_charram) + AM_RANGE(0x2000, 0x7fff) AM_READWRITE(SMH_RAM, deco_charram_w) AM_BASE(&deco_charram) AM_RANGE(0x8000, 0x83ff) AM_RAM AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) AM_RANGE(0x8400, 0x87ff) AM_RAM AM_BASE(&btime_colorram) AM_RANGE(0x8800, 0x881f) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) @@ -356,7 +356,7 @@ static ADDRESS_MAP_START( disco_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9800, 0x9800) AM_READ(input_port_3_r) AM_RANGE(0x9a00, 0x9a00) AM_READWRITE(input_port_4_r, audio_command_w) AM_RANGE(0x9c00, 0x9c00) AM_READWRITE(input_port_5_r, disco_video_control_w) - AM_RANGE(0xa000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -378,7 +378,7 @@ static ADDRESS_MAP_START( disco_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x5fff) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x6000, 0x6fff) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x7000, 0x7fff) AM_WRITE(AY8910_control_port_1_w) - AM_RANGE(0x8000, 0x8fff) AM_READWRITE(soundlatch_r, MWA8_NOP) /* ack ? */ + AM_RANGE(0x8000, 0x8fff) AM_READWRITE(soundlatch_r, SMH_NOP) /* ack ? */ AM_RANGE(0xf000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c index e5151272f87..25368067be9 100644 --- a/src/mame/drivers/btoads.c +++ b/src/mame/drivers/btoads.c @@ -191,20 +191,20 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x20000180, 0x200001ff) AM_READ(input_port_3_word_r) AM_RANGE(0x20000200, 0x2000027f) AM_READ(special_port_4_r) AM_RANGE(0x20000280, 0x200002ff) AM_READ(input_port_5_word_r) - AM_RANGE(0x20000000, 0x200000ff) AM_WRITE(MWA16_RAM) AM_BASE(&btoads_sprite_scale) - AM_RANGE(0x20000100, 0x2000017f) AM_WRITE(MWA16_RAM) AM_BASE(&btoads_sprite_control) + AM_RANGE(0x20000000, 0x200000ff) AM_WRITE(SMH_RAM) AM_BASE(&btoads_sprite_scale) + AM_RANGE(0x20000100, 0x2000017f) AM_WRITE(SMH_RAM) AM_BASE(&btoads_sprite_control) AM_RANGE(0x20000180, 0x200001ff) AM_WRITE(btoads_display_control_w) AM_RANGE(0x20000200, 0x2000027f) AM_WRITE(btoads_scroll0_w) AM_RANGE(0x20000280, 0x200002ff) AM_WRITE(btoads_scroll1_w) AM_RANGE(0x20000300, 0x2000037f) AM_READWRITE(btoads_paletteram_r, btoads_paletteram_w) AM_RANGE(0x20000380, 0x200003ff) AM_READWRITE(main_sound_r, main_sound_w) AM_RANGE(0x20000400, 0x2000047f) AM_WRITE(btoads_misc_control_w) - AM_RANGE(0x40000000, 0x4000000f) AM_WRITE(MWA16_NOP) /* watchdog? */ + AM_RANGE(0x40000000, 0x4000000f) AM_WRITE(SMH_NOP) /* watchdog? */ AM_RANGE(0x60000000, 0x6003ffff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0xa0000000, 0xa03fffff) AM_READWRITE(btoads_vram_fg_display_r, btoads_vram_fg_display_w) AM_BASE(&btoads_vram_fg0) AM_RANGE(0xa4000000, 0xa43fffff) AM_READWRITE(btoads_vram_fg_draw_r, btoads_vram_fg_draw_w) AM_BASE(&btoads_vram_fg1) AM_RANGE(0xa8000000, 0xa87fffff) AM_RAM AM_BASE(&btoads_vram_fg_data) - AM_RANGE(0xa8800000, 0xa8ffffff) AM_WRITE(MWA16_NOP) + AM_RANGE(0xa8800000, 0xa8ffffff) AM_WRITE(SMH_NOP) AM_RANGE(0xb0000000, 0xb03fffff) AM_READWRITE(btoads_vram_bg0_r, btoads_vram_bg0_w) AM_BASE(&btoads_vram_bg0) AM_RANGE(0xb4000000, 0xb43fffff) AM_READWRITE(btoads_vram_bg1_r, btoads_vram_bg1_w) AM_BASE(&btoads_vram_bg1) AM_RANGE(0xc0000000, 0xc00003ff) AM_READWRITE(tms34020_io_register_r, tms34020_io_register_w) diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index 1b12122de88..a3c54ec3a6c 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -160,12 +160,12 @@ static WRITE8_HANDLER( sound_enable_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) /* A22-04 (23) */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_ROM) /* A22-05 (22) */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* 6116 SRAM (36) */ - AM_RANGE(0x8800, 0x8fff) AM_READ(MRA8_RAM) /* 6116 SRAM (35) */ - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) /* A22-04 (23) */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_ROM) /* A22-05 (22) */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* 6116 SRAM (36) */ + AM_RANGE(0x8800, 0x8fff) AM_READ(SMH_RAM) /* 6116 SRAM (35) */ + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) AM_RANGE(0xd400, 0xd400) AM_READ(buggychl_mcu_r) AM_RANGE(0xd401, 0xd401) AM_READ(buggychl_mcu_status_r) AM_RANGE(0xd600, 0xd600) AM_READ(input_port_0_r) /* dsw */ @@ -179,13 +179,13 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) /* A22-04 (23) */ - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM) /* A22-05 (22) */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* 6116 SRAM (36) */ - AM_RANGE(0x8800, 0x8fff) AM_WRITE(MWA8_RAM) /* 6116 SRAM (35) */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) /* A22-04 (23) */ + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM) /* A22-05 (22) */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* 6116 SRAM (36) */ + AM_RANGE(0x8800, 0x8fff) AM_WRITE(SMH_RAM) /* 6116 SRAM (35) */ AM_RANGE(0x9000, 0x9fff) AM_WRITE(buggychl_sprite_lookup_w) AM_RANGE(0xa000, 0xbfff) AM_WRITE(buggychl_chargen_w) AM_BASE(&buggychl_character_ram) - AM_RANGE(0xc800, 0xcfff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xc800, 0xcfff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) // { 0xd000, 0xd000, horizon AM_RANGE(0xd100, 0xd100) AM_WRITE(buggychl_ctrl_w) AM_RANGE(0xd200, 0xd200) AM_WRITE(bankswitch_w) @@ -195,40 +195,40 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd303, 0xd303) AM_WRITE(buggychl_sprite_lookup_bank_w) // { 0xd304, 0xd307, sccon 1-4 AM_RANGE(0xd400, 0xd400) AM_WRITE(buggychl_mcu_w) - AM_RANGE(0xd500, 0xd57f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd500, 0xd57f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd610, 0xd610) AM_WRITE(sound_command_w) // { 0xd613, 0xd613, reset sound cpu & sound chips - AM_RANGE(0xd618, 0xd618) AM_WRITE(MWA8_NOP) /* accelerator clear */ + AM_RANGE(0xd618, 0xd618) AM_WRITE(SMH_NOP) /* accelerator clear */ AM_RANGE(0xd700, 0xd7ff) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_be_w) AM_BASE(&paletteram) - AM_RANGE(0xd840, 0xd85f) AM_WRITE(MWA8_RAM) AM_BASE(&buggychl_scrollv) - AM_RANGE(0xdb00, 0xdbff) AM_WRITE(MWA8_RAM) AM_BASE(&buggychl_scrollh) - AM_RANGE(0xdc04, 0xdc04) AM_WRITE(MWA8_RAM) /* should be fg scroll */ + AM_RANGE(0xd840, 0xd85f) AM_WRITE(SMH_RAM) AM_BASE(&buggychl_scrollv) + AM_RANGE(0xdb00, 0xdbff) AM_WRITE(SMH_RAM) AM_BASE(&buggychl_scrollh) + AM_RANGE(0xdc04, 0xdc04) AM_WRITE(SMH_RAM) /* should be fg scroll */ AM_RANGE(0xdc06, 0xdc06) AM_WRITE(buggychl_bg_scrollx_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r) -// AM_RANGE(0x5001, 0x5001) AM_READ(MRA8_RAM) /* is command pending? */ - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_ROM) /* space for diagnostics ROM */ +// AM_RANGE(0x5001, 0x5001) AM_READ(SMH_RAM) /* is command pending? */ + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) /* space for diagnostics ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4800) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x4801, 0x4801) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x4802, 0x4802) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x4803, 0x4803) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x4810, 0x481d) AM_WRITE(MSM5232_0_w) - AM_RANGE(0x4820, 0x4820) AM_WRITE(MWA8_RAM) /* VOL/BAL for the 7630 on the MSM5232 output */ - AM_RANGE(0x4830, 0x4830) AM_WRITE(MWA8_RAM) /* TRBL/BASS for the 7630 on the MSM5232 output */ -// AM_RANGE(0x5000, 0x5000) AM_WRITE(MWA8_RAM) /* to main cpu */ + AM_RANGE(0x4820, 0x4820) AM_WRITE(SMH_RAM) /* VOL/BAL for the 7630 on the MSM5232 output */ + AM_RANGE(0x4830, 0x4830) AM_WRITE(SMH_RAM) /* TRBL/BASS for the 7630 on the MSM5232 output */ +// AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_RAM) /* to main cpu */ AM_RANGE(0x5001, 0x5001) AM_WRITE(nmi_enable_w) AM_RANGE(0x5002, 0x5002) AM_WRITE(nmi_disable_w) AM_RANGE(0x5003, 0x5003) AM_WRITE(sound_enable_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -236,8 +236,8 @@ static ADDRESS_MAP_START( mcu_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(buggychl_68705_portA_r) AM_RANGE(0x0001, 0x0001) AM_READ(buggychl_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(buggychl_68705_portC_r) - AM_RANGE(0x0010, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -248,8 +248,8 @@ static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0004, 0x0004) AM_WRITE(buggychl_68705_ddrA_w) AM_RANGE(0x0005, 0x0005) AM_WRITE(buggychl_68705_ddrB_w) AM_RANGE(0x0006, 0x0006) AM_WRITE(buggychl_68705_ddrC_w) - AM_RANGE(0x0010, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c index 06585c5a154..01848102bb6 100644 --- a/src/mame/drivers/bwidow.c +++ b/src/mame/drivers/bwidow.c @@ -353,7 +353,7 @@ static ADDRESS_MAP_START( bwidow_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x88c0, 0x88c0) AM_WRITE(irq_ack_w) /* interrupt acknowledge */ AM_RANGE(0x8900, 0x8900) AM_WRITE(atari_vg_earom_ctrl_w) AM_RANGE(0x8940, 0x897f) AM_WRITE(atari_vg_earom_w) - AM_RANGE(0x8980, 0x89ed) AM_WRITE(MWA8_NOP) /* watchdog clear */ + AM_RANGE(0x8980, 0x89ed) AM_WRITE(SMH_NOP) /* watchdog clear */ AM_RANGE(0x9000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -362,11 +362,11 @@ static ADDRESS_MAP_START( spacduel_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_RANGE(0x0800, 0x0800) AM_READ(bzone_IN0_r) /* IN0 */ AM_RANGE(0x0900, 0x0907) AM_READ(spacduel_IN3_r) /* IN1 */ - AM_RANGE(0x0905, 0x0906) AM_WRITE(MWA8_NOP) /* ignore? */ + AM_RANGE(0x0905, 0x0906) AM_WRITE(SMH_NOP) /* ignore? */ AM_RANGE(0x0a00, 0x0a00) AM_READ(atari_vg_earom_r) // AM_RANGE(0x0c00, 0x0c00) AM_WRITE(coin_counter_w) /* coin out */ AM_RANGE(0x0c80, 0x0c80) AM_WRITE(avgdvg_go_w) - AM_RANGE(0x0d00, 0x0d00) AM_WRITE(MWA8_NOP) /* watchdog clear */ + AM_RANGE(0x0d00, 0x0d00) AM_WRITE(SMH_NOP) /* watchdog clear */ AM_RANGE(0x0d80, 0x0d80) AM_WRITE(avgdvg_reset_w) AM_RANGE(0x0e00, 0x0e00) AM_WRITE(irq_ack_w) /* interrupt acknowledge */ AM_RANGE(0x0e80, 0x0e80) AM_WRITE(atari_vg_earom_ctrl_w) diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c index 71663581169..b130fb0ce63 100644 --- a/src/mame/drivers/bwing.c +++ b/src/mame/drivers/bwing.c @@ -183,48 +183,48 @@ static WRITE8_HANDLER( bwp2_ctrl_w ) // Main CPU static ADDRESS_MAP_START( bwp1_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1b00, 0x1b07) AM_READ(bwp1_io_r) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x3fff) AM_READ(bwing_scrollram_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( bwp1_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(bwp12_sharedram1_w) AM_BASE(&bwp1_sharedram1) - AM_RANGE(0x0800, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0800, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x13ff) AM_WRITE(bwing_videoram_w) AM_BASE(&videoram) AM_RANGE(0x1800, 0x19ff) AM_WRITE(bwing_spriteram_w) AM_BASE(&buffered_spriteram) AM_RANGE(0x1a00, 0x1aff) AM_WRITE(bwing_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0x1b00, 0x1b07) AM_WRITE(bwing_scrollreg_w) AM_RANGE(0x1c00, 0x1c07) AM_WRITE(bwp1_ctrl_w) AM_RANGE(0x2000, 0x3fff) AM_WRITE(bwing_scrollram_w) - AM_RANGE(0x1000, 0x1fff) AM_WRITE(MWA8_RAM) // falls through - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_NOP) // "B-Wings US" writes to 9631-9632(debug?) + AM_RANGE(0x1000, 0x1fff) AM_WRITE(SMH_RAM) // falls through + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_NOP) // "B-Wings US" writes to 9631-9632(debug?) ADDRESS_MAP_END // Sub CPU static ADDRESS_MAP_START( bwp2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( bwp2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(bwp12_sharedram1_w) AM_BASE(&bwp2_sharedram1) - AM_RANGE(0x0800, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0800, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x1800, 0x1803) AM_WRITE(bwp2_ctrl_w) - AM_RANGE(0xa000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xa000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END // Sound CPU static ADDRESS_MAP_START( bwp3_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( bwp3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0200, 0x0200) AM_WRITE(DAC_0_signed_data_w) AM_RANGE(0x1000, 0x1000) AM_WRITE(bwp3_nmiack_w) AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w) @@ -232,7 +232,7 @@ static ADDRESS_MAP_START( bwp3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(bwp3_nmimask_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) AM_BASE(&bwp3_rombase) AM_SIZE(&bwp3_romsize) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) AM_BASE(&bwp3_rombase) AM_SIZE(&bwp3_romsize) ADDRESS_MAP_END static ADDRESS_MAP_START( bwp3_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c index b8d857c476d..d9273e6799c 100644 --- a/src/mame/drivers/bzone.c +++ b/src/mame/drivers/bzone.c @@ -336,7 +336,7 @@ static ADDRESS_MAP_START( redbaron_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0800) AM_READ(bzone_IN0_r) /* IN0 */ AM_RANGE(0x0a00, 0x0a00) AM_READ(input_port_1_r) /* DSW1 */ AM_RANGE(0x0c00, 0x0c00) AM_READ(input_port_2_r) /* DSW2 */ - AM_RANGE(0x1000, 0x1000) AM_WRITE(MWA8_NOP) /* coin out */ + AM_RANGE(0x1000, 0x1000) AM_WRITE(SMH_NOP) /* coin out */ AM_RANGE(0x1200, 0x1200) AM_WRITE(avgdvg_go_w) AM_RANGE(0x1400, 0x1400) AM_WRITE(watchdog_reset_w) AM_RANGE(0x1600, 0x1600) AM_WRITE(avgdvg_reset_w) @@ -345,7 +345,7 @@ static ADDRESS_MAP_START( redbaron_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1804, 0x1804) AM_READ(mb_lo_r) AM_RANGE(0x1806, 0x1806) AM_READ(mb_hi_r) AM_RANGE(0x1808, 0x1808) AM_WRITE(redbaron_sounds_w) /* and select joystick pot also */ - AM_RANGE(0x180a, 0x180a) AM_WRITE(MWA8_NOP) /* sound reset, yet todo */ + AM_RANGE(0x180a, 0x180a) AM_WRITE(SMH_NOP) /* sound reset, yet todo */ AM_RANGE(0x180c, 0x180c) AM_WRITE(atari_vg_earom_ctrl_w) AM_RANGE(0x1810, 0x181f) AM_READWRITE(pokey1_r, pokey1_w) AM_RANGE(0x1820, 0x185f) AM_READWRITE(atari_vg_earom_r, atari_vg_earom_w) @@ -813,7 +813,7 @@ static WRITE8_HANDLER( analog_select_w ) static DRIVER_INIT( bradley ) { - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x400, 0x7ff, 0, 0, MRA8_BANK1, MWA8_BANK1); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x400, 0x7ff, 0, 0, SMH_BANK1, SMH_BANK1); memory_set_bankptr(1, auto_malloc(0x400)); memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1808, 0x1808, 0, 0, input_port_4_r); diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index d004f8f14a6..56d2e71c45c 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -119,30 +119,30 @@ static WRITE16_HANDLER( cabalbl_sound_irq_trigger_word_w ) static ADDRESS_MAP_START( readmem_cpu, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x40000, 0x437ff) AM_READ(MRA16_RAM) - AM_RANGE(0x43800, 0x43fff) AM_READ(MRA16_RAM) - AM_RANGE(0x44000, 0x4ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x60000, 0x607ff) AM_READ(MRA16_RAM) - AM_RANGE(0x80000, 0x801ff) AM_READ(MRA16_RAM) - AM_RANGE(0x80200, 0x803ff) AM_READ(MRA16_RAM) + AM_RANGE(0x00000, 0x3ffff) AM_READ(SMH_ROM) + AM_RANGE(0x40000, 0x437ff) AM_READ(SMH_RAM) + AM_RANGE(0x43800, 0x43fff) AM_READ(SMH_RAM) + AM_RANGE(0x44000, 0x4ffff) AM_READ(SMH_RAM) + AM_RANGE(0x60000, 0x607ff) AM_READ(SMH_RAM) + AM_RANGE(0x80000, 0x801ff) AM_READ(SMH_RAM) + AM_RANGE(0x80200, 0x803ff) AM_READ(SMH_RAM) AM_RANGE(0xa0000, 0xa0001) AM_READ(input_port_0_word_r) AM_RANGE(0xa0008, 0xa000f) AM_READ(track_r) AM_RANGE(0xa0010, 0xa0011) AM_READ(input_port_1_word_r) - AM_RANGE(0xe0000, 0xe07ff) AM_READ(MRA16_RAM) + AM_RANGE(0xe0000, 0xe07ff) AM_READ(SMH_RAM) AM_RANGE(0xe8000, 0xe800d) AM_READ(seibu_main_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x40000, 0x437ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x43800, 0x43fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x44000, 0x4ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x00000, 0x3ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x40000, 0x437ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x43800, 0x43fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x44000, 0x4ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x60000, 0x607ff) AM_WRITE(cabal_text_videoram16_w) AM_BASE(&colorram16) AM_RANGE(0x80000, 0x801ff) AM_WRITE(cabal_background_videoram16_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) - AM_RANGE(0x80200, 0x803ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x80200, 0x803ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc0000, 0xc0001) AM_WRITE(track_reset_w) - AM_RANGE(0xc0040, 0xc0041) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0xc0040, 0xc0041) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xc0080, 0xc0081) AM_WRITE(cabal_flipscreen_w) AM_RANGE(0xe0000, 0xe07ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0xe8008, 0xe8009) AM_WRITE(cabal_sound_irq_trigger_word_w) // fix coin insertion @@ -150,29 +150,29 @@ static ADDRESS_MAP_START( writemem_cpu, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cabalbl_readmem_cpu, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x40000, 0x437ff) AM_READ(MRA16_RAM) - AM_RANGE(0x43800, 0x43fff) AM_READ(MRA16_RAM) - AM_RANGE(0x44000, 0x4ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x60000, 0x607ff) AM_READ(MRA16_RAM) - AM_RANGE(0x80000, 0x801ff) AM_READ(MRA16_RAM) - AM_RANGE(0x80200, 0x803ff) AM_READ(MRA16_RAM) + AM_RANGE(0x00000, 0x3ffff) AM_READ(SMH_ROM) + AM_RANGE(0x40000, 0x437ff) AM_READ(SMH_RAM) + AM_RANGE(0x43800, 0x43fff) AM_READ(SMH_RAM) + AM_RANGE(0x44000, 0x4ffff) AM_READ(SMH_RAM) + AM_RANGE(0x60000, 0x607ff) AM_READ(SMH_RAM) + AM_RANGE(0x80000, 0x801ff) AM_READ(SMH_RAM) + AM_RANGE(0x80200, 0x803ff) AM_READ(SMH_RAM) AM_RANGE(0xa0000, 0xa0001) AM_READ(input_port_0_word_r) AM_RANGE(0xa0008, 0xa0009) AM_READ(input_port_1_word_r) AM_RANGE(0xa0010, 0xa0011) AM_READ(input_port_2_word_r) - AM_RANGE(0xe0000, 0xe07ff) AM_READ(MRA16_RAM) + AM_RANGE(0xe0000, 0xe07ff) AM_READ(SMH_RAM) AM_RANGE(0xe8004, 0xe8005) AM_READ(soundlatch2_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( cabalbl_writemem_cpu, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x40000, 0x437ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x43800, 0x43fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x44000, 0x4ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x00000, 0x3ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x40000, 0x437ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x43800, 0x43fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x44000, 0x4ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x60000, 0x607ff) AM_WRITE(cabal_text_videoram16_w) AM_BASE(&colorram16) AM_RANGE(0x80000, 0x801ff) AM_WRITE(cabal_background_videoram16_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) - AM_RANGE(0x80200, 0x803ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0xc0040, 0xc0041) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0x80200, 0x803ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xc0040, 0xc0041) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xc0080, 0xc0081) AM_WRITE(cabal_flipscreen_w) AM_RANGE(0xe0000, 0xe07ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0xe8000, 0xe8003) AM_WRITE(cabalbl_sndcmd_w) @@ -201,18 +201,18 @@ static WRITE8_HANDLER( cabalbl_coin_w ) } static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) AM_RANGE(0x4009, 0x4009) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r) AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r) AM_RANGE(0x4013, 0x4013) AM_READ(input_port_2_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x27ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x27ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4001, 0x4001) AM_WRITE(seibu_irq_clear_w) AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w) AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w) @@ -224,30 +224,30 @@ static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w) AM_RANGE(0x6005, 0x6006) AM_WRITE(seibu_adpcm_adr_2_w) AM_RANGE(0x601a, 0x601a) AM_WRITE(seibu_adpcm_ctl_2_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( cabalbl_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_RAM) AM_RANGE(0x4008, 0x4008) AM_READ(cabalbl_snd2_r) AM_RANGE(0x400a, 0x400a) AM_READ(cabalbl_snd1_r) AM_RANGE(0x4006, 0x4006) AM_READ(input_port_3_r) AM_RANGE(0x400f, 0x400f) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( cabalbl_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x2fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_RAM) AM_RANGE(0x4000, 0x4000) AM_WRITE(soundlatch3_w) AM_RANGE(0x4002, 0x4002) AM_WRITE(soundlatch4_w) AM_RANGE(0x4004, 0x4004) AM_WRITE(cabalbl_coin_w) AM_RANGE(0x400c, 0x400c) AM_WRITE(soundlatch2_w) AM_RANGE(0x400e, 0x400e) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x400f, 0x400f) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0x6000, 0x6000) AM_WRITE(MWA8_NOP) /* ??? */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0x6000) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /* the bootleg has 2x z80 sample players */ diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c index 842f03f205d..3c65daac281 100644 --- a/src/mame/drivers/canyon.c +++ b/src/mame/drivers/canyon.c @@ -114,8 +114,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0600, 0x0603) AM_WRITE(canyon_whistle_w) AM_RANGE(0x0680, 0x0683) AM_WRITE(canyon_led_w) AM_RANGE(0x0700, 0x0703) AM_WRITE(canyon_attract_w) - AM_RANGE(0x0800, 0x0bff) AM_READWRITE(MRA8_RAM, canyon_videoram_w) AM_BASE(&canyon_videoram) - AM_RANGE(0x1000, 0x17ff) AM_READWRITE(canyon_switches_r, MWA8_NOP) /* sloppy code writes here */ + AM_RANGE(0x0800, 0x0bff) AM_READWRITE(SMH_RAM, canyon_videoram_w) AM_BASE(&canyon_videoram) + AM_RANGE(0x1000, 0x17ff) AM_READWRITE(canyon_switches_r, SMH_NOP) /* sloppy code writes here */ AM_RANGE(0x1800, 0x1fff) AM_READ(canyon_options_r) AM_RANGE(0x2000, 0x3fff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index 33a333b0d08..f92a35cbf75 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -243,7 +243,7 @@ static NVRAM_HANDLER( capbowl ) static ADDRESS_MAP_START( capbowl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(1) - AM_RANGE(0x4000, 0x4000) AM_WRITE(MWA8_RAM) AM_BASE(&capbowl_rowaddress) + AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_RAM) AM_BASE(&capbowl_rowaddress) AM_RANGE(0x4800, 0x4800) AM_WRITE(capbowl_rom_select_w) AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x5800, 0x5fff) AM_READWRITE(capbowl_tms34061_r, capbowl_tms34061_w) @@ -257,7 +257,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bowlrama_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x001f) AM_READWRITE(bowlrama_blitter_r, bowlrama_blitter_w) - AM_RANGE(0x4000, 0x4000) AM_WRITE(MWA8_RAM) AM_BASE(&capbowl_rowaddress) + AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_RAM) AM_BASE(&capbowl_rowaddress) AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x5800, 0x5fff) AM_READWRITE(capbowl_tms34061_r, capbowl_tms34061_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(capbowl_sndcmd_w) diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c index 5394b128a28..1871867f6be 100644 --- a/src/mame/drivers/carjmbre.c +++ b/src/mame/drivers/carjmbre.c @@ -53,59 +53,59 @@ VIDEO_UPDATE( carjmbre ); static ADDRESS_MAP_START( carjmbre_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8800, 0x8800) AM_READ(MRA8_NOP) //?? possibly watchdog - AM_RANGE(0x9000, 0x97ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x8800, 0x8800) AM_READ(SMH_NOP) //?? possibly watchdog + AM_RANGE(0x9000, 0x97ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb800, 0xb800) AM_READ(input_port_2_r) ADDRESS_MAP_END static ADDRESS_MAP_START( carjmbre_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8803, 0x8803) AM_WRITE(interrupt_enable_w) AM_RANGE(0x8805, 0x8806) AM_WRITE(carjmbre_bgcolor_w) //guess AM_RANGE(0x8807, 0x8807) AM_WRITE(carjmbre_flipscreen_w) - AM_RANGE(0x8fc1, 0x8fc1) AM_WRITE(MWA8_NOP) //overrun during initial screen clear - AM_RANGE(0x8fe1, 0x8fe1) AM_WRITE(MWA8_NOP) //overrun during initial screen clear + AM_RANGE(0x8fc1, 0x8fc1) AM_WRITE(SMH_NOP) //overrun during initial screen clear + AM_RANGE(0x8fe1, 0x8fe1) AM_WRITE(SMH_NOP) //overrun during initial screen clear AM_RANGE(0x9000, 0x97ff) AM_WRITE(carjmbre_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x9800, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x9880, 0x98df) AM_WRITE(MWA8_RAM) //spriteram mirror + AM_RANGE(0x9800, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x9880, 0x98df) AM_WRITE(SMH_RAM) //spriteram mirror AM_RANGE(0xb800, 0xb800) AM_WRITE(soundlatch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( carjmbre_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) - AM_RANGE(0x1000, 0x10ff) AM_READ(MRA8_NOP) //look to be stray reads from 10/12/14/16/18xx - AM_RANGE(0x1200, 0x12ff) AM_READ(MRA8_NOP) - AM_RANGE(0x1400, 0x14ff) AM_READ(MRA8_NOP) - AM_RANGE(0x1600, 0x16ff) AM_READ(MRA8_NOP) - AM_RANGE(0x1800, 0x18ff) AM_READ(MRA8_NOP) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) + AM_RANGE(0x1000, 0x10ff) AM_READ(SMH_NOP) //look to be stray reads from 10/12/14/16/18xx + AM_RANGE(0x1200, 0x12ff) AM_READ(SMH_NOP) + AM_RANGE(0x1400, 0x14ff) AM_READ(SMH_NOP) + AM_RANGE(0x1600, 0x16ff) AM_READ(SMH_NOP) + AM_RANGE(0x1800, 0x18ff) AM_READ(SMH_NOP) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( carjmbre_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x27ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x27ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( carjmbre_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) - AM_RANGE(0x24, 0x24) AM_READ(MRA8_NOP) //?? + AM_RANGE(0x24, 0x24) AM_READ(SMH_NOP) //?? ADDRESS_MAP_END static ADDRESS_MAP_START( carjmbre_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x10) AM_WRITE(MWA8_NOP) //?? written on init/0xff sound command reset + AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP) //?? written on init/0xff sound command reset AM_RANGE(0x20, 0x20) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x21, 0x21) AM_WRITE(AY8910_write_port_0_w) - AM_RANGE(0x22, 0x22) AM_WRITE(MWA8_NOP) //?? written before and after 0x21 with same value + AM_RANGE(0x22, 0x22) AM_WRITE(SMH_NOP) //?? written before and after 0x21 with same value AM_RANGE(0x30, 0x30) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x31, 0x31) AM_WRITE(AY8910_write_port_1_w) - AM_RANGE(0x32, 0x32) AM_WRITE(MWA8_NOP) //?? written before and after 0x31 with same value + AM_RANGE(0x32, 0x32) AM_WRITE(SMH_NOP) //?? written before and after 0x31 with same value ADDRESS_MAP_END static INPUT_PORTS_START( carjmbre ) diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c index f601271a3fd..e915a192335 100644 --- a/src/mame/drivers/carpolo.c +++ b/src/mame/drivers/carpolo.c @@ -29,7 +29,7 @@ *************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM) AM_RANGE(0x5400, 0x5403) AM_READ(pia_0_r) AM_RANGE(0x5800, 0x5803) AM_READ(pia_1_r) AM_RANGE(0xa000, 0xa000) AM_READ(carpolo_ball_screen_collision_cause_r) @@ -41,13 +41,13 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa006, 0xa006) AM_READ(carpolo_car_goal_collision_cause_r) AM_RANGE(0xa007, 0xa007) AM_READ(input_port_1_r) AM_RANGE(0xc000, 0xc000) AM_READ(carpolo_interrupt_cause_r) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x3000, 0x30ff) AM_WRITE(MWA8_RAM) AM_BASE(&carpolo_alpharam) - AM_RANGE(0x4000, 0x400f) AM_WRITE(MWA8_RAM) AM_BASE(&carpolo_spriteram) + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x3000, 0x30ff) AM_WRITE(SMH_RAM) AM_BASE(&carpolo_alpharam) + AM_RANGE(0x4000, 0x400f) AM_WRITE(SMH_RAM) AM_BASE(&carpolo_spriteram) AM_RANGE(0x5400, 0x5403) AM_WRITE(pia_0_w) AM_RANGE(0x5800, 0x5803) AM_WRITE(pia_1_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(carpolo_ball_screen_interrupt_clear_w) @@ -56,7 +56,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb004, 0xb004) AM_WRITE(carpolo_car_border_interrupt_clear_w) AM_RANGE(0xb005, 0xb005) AM_WRITE(carpolo_car_ball_interrupt_clear_w) AM_RANGE(0xb006, 0xb006) AM_WRITE(carpolo_car_goal_interrupt_clear_w) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index 3bd935992da..bee4aacf7ec 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -51,17 +51,17 @@ static UINT8* carrera_tileram; static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x4fff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x4fff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x4fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x4fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe800, 0xe800) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) AM_RANGE(0xe801, 0xe801) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&carrera_tileram) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&carrera_tileram) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) @@ -76,7 +76,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP) // ? + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) // ? AM_RANGE(0x08, 0x08) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x09, 0x09) AM_WRITE(AY8910_write_port_0_w) diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index f0fc194cd51..4a7d4562b21 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -494,35 +494,35 @@ static NVRAM_HANDLER( korokoro ) ***************************************************************************/ static ADDRESS_MAP_START( dfeveron_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x300002, 0x300003) AM_READ(cave_sound_r ) // YMZ280 -/**/AM_RANGE(0x400000, 0x407fff) AM_READ(MRA16_RAM ) // Sprites -/**/AM_RANGE(0x408000, 0x40ffff) AM_READ(MRA16_RAM ) // Sprites? -/**/AM_RANGE(0x500000, 0x507fff) AM_READ(MRA16_RAM ) // Layer 0 -/**/AM_RANGE(0x600000, 0x607fff) AM_READ(MRA16_RAM ) // Layer 1 -/**/AM_RANGE(0x708000, 0x708fff) AM_READ(MRA16_RAM ) // Palette -/**/AM_RANGE(0x710000, 0x710fff) AM_READ(MRA16_RAM ) // ? +/**/AM_RANGE(0x400000, 0x407fff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0x408000, 0x40ffff) AM_READ(SMH_RAM ) // Sprites? +/**/AM_RANGE(0x500000, 0x507fff) AM_READ(SMH_RAM ) // Layer 0 +/**/AM_RANGE(0x600000, 0x607fff) AM_READ(SMH_RAM ) // Layer 1 +/**/AM_RANGE(0x708000, 0x708fff) AM_READ(SMH_RAM ) // Palette +/**/AM_RANGE(0x710000, 0x710fff) AM_READ(SMH_RAM ) // ? AM_RANGE(0x800000, 0x800007) AM_READ(cave_irq_cause_r ) // IRQ Cause -/**/AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(MRA16_RAM ) // Layer 1 Control +/**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(SMH_RAM ) // Layer 1 Control AM_RANGE(0xb00000, 0xb00001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xb00002, 0xb00003) AM_READ(cave_input1_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( dfeveron_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x300003) AM_WRITE(cave_sound_w ) // YMZ280 - AM_RANGE(0x400000, 0x407fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x408000, 0x40ffff) AM_WRITE(MWA16_RAM ) // Sprites? + AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x408000, 0x40ffff) AM_WRITE(SMH_RAM ) // Sprites? AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 AM_RANGE(0x600000, 0x607fff) AM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1 ) // Layer 1 - AM_RANGE(0x708000, 0x708fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette - AM_RANGE(0x710c00, 0x710fff) AM_WRITE(MWA16_RAM ) // ? - AM_RANGE(0x800000, 0x80007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control - AM_RANGE(0xa00000, 0xa00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control + AM_RANGE(0x708000, 0x708fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x710c00, 0x710fff) AM_WRITE(SMH_RAM ) // ? + AM_RANGE(0x800000, 0x80007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0xa00000, 0xa00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control AM_RANGE(0xc00000, 0xc00001) AM_WRITE(cave_eeprom_msb_w ) // EEPROM ADDRESS_MAP_END @@ -532,37 +532,37 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( ddonpach_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x300002, 0x300003) AM_READ(cave_sound_r ) // YMZ280 -/**/AM_RANGE(0x400000, 0x407fff) AM_READ(MRA16_RAM ) // Sprites -/**/AM_RANGE(0x408000, 0x40ffff) AM_READ(MRA16_RAM ) // Sprites? -/**/AM_RANGE(0x500000, 0x507fff) AM_READ(MRA16_RAM ) // Layer 0 -/**/AM_RANGE(0x600000, 0x607fff) AM_READ(MRA16_RAM ) // Layer 1 -/**/AM_RANGE(0x700000, 0x70ffff) AM_READ(MRA16_RAM ) // Layer 2 +/**/AM_RANGE(0x400000, 0x407fff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0x408000, 0x40ffff) AM_READ(SMH_RAM ) // Sprites? +/**/AM_RANGE(0x500000, 0x507fff) AM_READ(SMH_RAM ) // Layer 0 +/**/AM_RANGE(0x600000, 0x607fff) AM_READ(SMH_RAM ) // Layer 1 +/**/AM_RANGE(0x700000, 0x70ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x800000, 0x800007) AM_READ(cave_irq_cause_r ) // IRQ Cause -/**/AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(MRA16_RAM ) // Layer 1 Control -/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(MRA16_RAM ) // Layer 2 Control -/**/AM_RANGE(0xc00000, 0xc0ffff) AM_READ(MRA16_RAM ) // Palette +/**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(SMH_RAM ) // Layer 1 Control +/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 2 Control +/**/AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xd00000, 0xd00001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xd00002, 0xd00003) AM_READ(cave_input1_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( ddonpach_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x300003) AM_WRITE(cave_sound_w ) // YMZ280 - AM_RANGE(0x400000, 0x407fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x408000, 0x40ffff) AM_WRITE(MWA16_RAM ) // Sprites? + AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x408000, 0x40ffff) AM_WRITE(SMH_RAM ) // Sprites? AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 AM_RANGE(0x600000, 0x607fff) AM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1 ) // Layer 1 AM_RANGE(0x700000, 0x70ffff) AM_WRITE(cave_vram_2_8x8_w) AM_BASE(&cave_vram_2 ) // Layer 2 - AM_RANGE(0x800000, 0x80007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control - AM_RANGE(0xa00000, 0xa00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control - AM_RANGE(0xb00000, 0xb00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control - AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x800000, 0x80007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0xa00000, 0xa00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control + AM_RANGE(0xb00000, 0xb00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control + AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette AM_RANGE(0xe00000, 0xe00001) AM_WRITE(cave_eeprom_msb_w ) // EEPROM ADDRESS_MAP_END @@ -597,18 +597,18 @@ WRITE16_HANDLER( donpachi_videoregs_w ) #endif static ADDRESS_MAP_START( donpachi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x200000, 0x207fff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x300000, 0x307fff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x400000, 0x407fff) AM_READ(MRA16_RAM ) // Layer 2 - AM_RANGE(0x500000, 0x507fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x508000, 0x50ffff) AM_READ(MRA16_RAM ) // Sprites? -/**/AM_RANGE(0x600000, 0x600005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0x700000, 0x700005) AM_READ(MRA16_RAM ) // Layer 1 Control -/**/AM_RANGE(0x800000, 0x800005) AM_READ(MRA16_RAM ) // Layer 2 Control + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x200000, 0x207fff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x300000, 0x307fff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x400000, 0x407fff) AM_READ(SMH_RAM ) // Layer 2 + AM_RANGE(0x500000, 0x507fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x508000, 0x50ffff) AM_READ(SMH_RAM ) // Sprites? +/**/AM_RANGE(0x600000, 0x600005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0x700000, 0x700005) AM_READ(SMH_RAM ) // Layer 1 Control +/**/AM_RANGE(0x800000, 0x800005) AM_READ(SMH_RAM ) // Layer 2 Control AM_RANGE(0x900000, 0x90007f) AM_READ(donpachi_videoregs_r ) // Video Regs -/**/AM_RANGE(0xa08000, 0xa08fff) AM_READ(MRA16_RAM ) // Palette +/**/AM_RANGE(0xa08000, 0xa08fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xb00000, 0xb00001) AM_READ(OKIM6295_status_0_lsb_r ) // M6295 AM_RANGE(0xb00010, 0xb00011) AM_READ(OKIM6295_status_1_lsb_r ) // AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r ) // Inputs @@ -616,18 +616,18 @@ static ADDRESS_MAP_START( donpachi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( donpachi_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x200000, 0x207fff) AM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1 ) // Layer 1 AM_RANGE(0x300000, 0x307fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 AM_RANGE(0x400000, 0x407fff) AM_WRITE(cave_vram_2_8x8_w) AM_BASE(&cave_vram_2 ) // Layer 2 - AM_RANGE(0x500000, 0x507fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x508000, 0x50ffff) AM_WRITE(MWA16_RAM ) // Sprites? - AM_RANGE(0x600000, 0x600005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control - AM_RANGE(0x700000, 0x700005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control - AM_RANGE(0x800000, 0x800005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control - AM_RANGE(0x900000, 0x90007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs - AM_RANGE(0xa08000, 0xa08fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x500000, 0x507fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x508000, 0x50ffff) AM_WRITE(SMH_RAM ) // Sprites? + AM_RANGE(0x600000, 0x600005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control + AM_RANGE(0x700000, 0x700005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0x800000, 0x800005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control + AM_RANGE(0x900000, 0x90007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0xa08000, 0xa08fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette AM_RANGE(0xb00000, 0xb00003) AM_WRITE(OKIM6295_data_0_lsb_w ) // M6295 AM_RANGE(0xb00010, 0xb00013) AM_WRITE(OKIM6295_data_1_lsb_w ) // AM_RANGE(0xb00020, 0xb0002f) AM_WRITE(NMK112_okibank_lsb_w ) // @@ -640,37 +640,37 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( esprade_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x300002, 0x300003) AM_READ(cave_sound_r ) // YMZ280 -/**/AM_RANGE(0x400000, 0x407fff) AM_READ(MRA16_RAM ) // Sprites -/**/AM_RANGE(0x408000, 0x40ffff) AM_READ(MRA16_RAM ) // Sprites? -/**/AM_RANGE(0x500000, 0x507fff) AM_READ(MRA16_RAM ) // Layer 0 -/**/AM_RANGE(0x600000, 0x607fff) AM_READ(MRA16_RAM ) // Layer 1 -/**/AM_RANGE(0x700000, 0x707fff) AM_READ(MRA16_RAM ) // Layer 2 +/**/AM_RANGE(0x400000, 0x407fff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0x408000, 0x40ffff) AM_READ(SMH_RAM ) // Sprites? +/**/AM_RANGE(0x500000, 0x507fff) AM_READ(SMH_RAM ) // Layer 0 +/**/AM_RANGE(0x600000, 0x607fff) AM_READ(SMH_RAM ) // Layer 1 +/**/AM_RANGE(0x700000, 0x707fff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x800000, 0x800007) AM_READ(cave_irq_cause_r ) // IRQ Cause -/**/AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(MRA16_RAM ) // Layer 1 Control -/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(MRA16_RAM ) // Layer 2 Control -/**/AM_RANGE(0xc00000, 0xc0ffff) AM_READ(MRA16_RAM ) // Palette +/**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(SMH_RAM ) // Layer 1 Control +/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 2 Control +/**/AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xd00000, 0xd00001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xd00002, 0xd00003) AM_READ(cave_input1_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( esprade_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x300003) AM_WRITE(cave_sound_w ) // YMZ280 - AM_RANGE(0x400000, 0x407fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x408000, 0x40ffff) AM_WRITE(MWA16_RAM ) // Sprites? + AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x408000, 0x40ffff) AM_WRITE(SMH_RAM ) // Sprites? AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 AM_RANGE(0x600000, 0x607fff) AM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1 ) // Layer 1 AM_RANGE(0x700000, 0x707fff) AM_WRITE(cave_vram_2_w) AM_BASE(&cave_vram_2 ) // Layer 2 - AM_RANGE(0x800000, 0x80007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control - AM_RANGE(0xa00000, 0xa00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control - AM_RANGE(0xb00000, 0xb00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control - AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x800000, 0x80007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0xa00000, 0xa00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control + AM_RANGE(0xb00000, 0xb00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control + AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette AM_RANGE(0xe00000, 0xe00001) AM_WRITE(cave_eeprom_msb_w ) // EEPROM ADDRESS_MAP_END @@ -680,44 +680,44 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( gaia_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x300002, 0x300003) AM_READ(cave_sound_r ) // YMZ280 - AM_RANGE(0x400000, 0x407fff) AM_READ(MRA16_RAM ) // Sprite bank 1 - AM_RANGE(0x408000, 0x40ffff) AM_READ(MRA16_RAM ) // Sprite bank 2 - AM_RANGE(0x500000, 0x507fff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x508000, 0x50ffff) AM_READ(MRA16_RAM ) // More Layer 0, Tested but not used? - AM_RANGE(0x600000, 0x607fff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x608000, 0x60ffff) AM_READ(MRA16_RAM ) // More Layer 1, Tested but not used? - AM_RANGE(0x700000, 0x707fff) AM_READ(MRA16_RAM ) // Layer 2 - AM_RANGE(0x708000, 0x70ffff) AM_READ(MRA16_RAM ) // More Layer 2, Tested but not used? + AM_RANGE(0x400000, 0x407fff) AM_READ(SMH_RAM ) // Sprite bank 1 + AM_RANGE(0x408000, 0x40ffff) AM_READ(SMH_RAM ) // Sprite bank 2 + AM_RANGE(0x500000, 0x507fff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x508000, 0x50ffff) AM_READ(SMH_RAM ) // More Layer 0, Tested but not used? + AM_RANGE(0x600000, 0x607fff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x608000, 0x60ffff) AM_READ(SMH_RAM ) // More Layer 1, Tested but not used? + AM_RANGE(0x700000, 0x707fff) AM_READ(SMH_RAM ) // Layer 2 + AM_RANGE(0x708000, 0x70ffff) AM_READ(SMH_RAM ) // More Layer 2, Tested but not used? AM_RANGE(0x800000, 0x800007) AM_READ(cave_irq_cause_r ) // IRQ Cause -/**/AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(MRA16_RAM ) // Layer 1 Control -/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(MRA16_RAM ) // Layer 2 Control - AM_RANGE(0xc00000, 0xc0ffff) AM_READ(MRA16_RAM ) // Palette +/**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(SMH_RAM ) // Layer 1 Control +/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 2 Control + AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xd00010, 0xd00011) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xd00012, 0xd00013) AM_READ(input_port_1_word_r ) // Inputs AM_RANGE(0xd00014, 0xd00015) AM_READ(gaia_dsw_r ) // Dips ADDRESS_MAP_END static ADDRESS_MAP_START( gaia_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x300003) AM_WRITE(cave_sound_w ) // YMZ280 - AM_RANGE(0x400000, 0x407fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprite bank 1 - AM_RANGE(0x408000, 0x40ffff) AM_WRITE(MWA16_RAM ) // Sprite bank 2 + AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprite bank 1 + AM_RANGE(0x408000, 0x40ffff) AM_WRITE(SMH_RAM ) // Sprite bank 2 AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 - AM_RANGE(0x508000, 0x50ffff) AM_WRITE(MWA16_RAM ) // More Layer 0, Tested but not used? + AM_RANGE(0x508000, 0x50ffff) AM_WRITE(SMH_RAM ) // More Layer 0, Tested but not used? AM_RANGE(0x600000, 0x607fff) AM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1 ) // Layer 1 - AM_RANGE(0x608000, 0x60ffff) AM_WRITE(MWA16_RAM ) // More Layer 1, Tested but not used? + AM_RANGE(0x608000, 0x60ffff) AM_WRITE(SMH_RAM ) // More Layer 1, Tested but not used? AM_RANGE(0x700000, 0x707fff) AM_WRITE(cave_vram_2_w) AM_BASE(&cave_vram_2 ) // Layer 2 - AM_RANGE(0x708000, 0x70ffff) AM_WRITE(MWA16_RAM ) // More Layer 2, Tested but not used? - AM_RANGE(0x800000, 0x80007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control - AM_RANGE(0xa00000, 0xa00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control - AM_RANGE(0xb00000, 0xb00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control - AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x708000, 0x70ffff) AM_WRITE(SMH_RAM ) // More Layer 2, Tested but not used? + AM_RANGE(0x800000, 0x80007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0xa00000, 0xa00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control + AM_RANGE(0xb00000, 0xb00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control + AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette AM_RANGE(0xd00010, 0xd00011) AM_WRITE(gaia_coin_lsb_w ) // Coin counter only AM_RANGE(0xd00014, 0xd00015) AM_WRITE(watchdog_reset16_w ) // Watchdog? ADDRESS_MAP_END @@ -728,40 +728,40 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( guwange_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x300007) AM_READ(cave_irq_cause_r ) // IRQ Cause -/**/AM_RANGE(0x400000, 0x407fff) AM_READ(MRA16_RAM ) // Sprites -/**/AM_RANGE(0x408000, 0x40ffff) AM_READ(MRA16_RAM ) // Sprites? -/**/AM_RANGE(0x500000, 0x507fff) AM_READ(MRA16_RAM ) // Layer 0 -/**/AM_RANGE(0x600000, 0x607fff) AM_READ(MRA16_RAM ) // Layer 1 -/**/AM_RANGE(0x700000, 0x707fff) AM_READ(MRA16_RAM ) // Layer 2 +/**/AM_RANGE(0x400000, 0x407fff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0x408000, 0x40ffff) AM_READ(SMH_RAM ) // Sprites? +/**/AM_RANGE(0x500000, 0x507fff) AM_READ(SMH_RAM ) // Layer 0 +/**/AM_RANGE(0x600000, 0x607fff) AM_READ(SMH_RAM ) // Layer 1 +/**/AM_RANGE(0x700000, 0x707fff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x800002, 0x800003) AM_READ(cave_sound_r ) // YMZ280 -/**/AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(MRA16_RAM ) // Layer 1 Control -/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(MRA16_RAM ) // Layer 2 Control -/**/AM_RANGE(0xc00000, 0xc0ffff) AM_READ(MRA16_RAM ) // Palette +/**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(SMH_RAM ) // Layer 1 Control +/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 2 Control +/**/AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xd00010, 0xd00011) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xd00012, 0xd00013) AM_READ(guwange_input1_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( guwange_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x300000, 0x30007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs - AM_RANGE(0x400000, 0x407fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x408000, 0x40ffff) AM_WRITE(MWA16_RAM ) // Sprites? + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x300000, 0x30007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x408000, 0x40ffff) AM_WRITE(SMH_RAM ) // Sprites? AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 AM_RANGE(0x600000, 0x607fff) AM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1 ) // Layer 1 AM_RANGE(0x700000, 0x707fff) AM_WRITE(cave_vram_2_w) AM_BASE(&cave_vram_2 ) // Layer 2 AM_RANGE(0x800000, 0x800003) AM_WRITE(cave_sound_w ) // YMZ280 - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control - AM_RANGE(0xa00000, 0xa00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control - AM_RANGE(0xb00000, 0xb00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control - AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0xa00000, 0xa00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control + AM_RANGE(0xb00000, 0xb00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control + AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette AM_RANGE(0xd00010, 0xd00011) AM_WRITE(cave_eeprom_lsb_w ) // EEPROM -// AM_RANGE(0xd00012, 0xd00013) AM_WRITE(MWA16_NOP ) // ? -// AM_RANGE(0xd00014, 0xd00015) AM_WRITE(MWA16_NOP ) // ? $800068 in dfeveron ? probably Watchdog +// AM_RANGE(0xd00012, 0xd00013) AM_WRITE(SMH_NOP ) // ? +// AM_RANGE(0xd00014, 0xd00015) AM_WRITE(SMH_NOP ) // ? $800068 in dfeveron ? probably Watchdog ADDRESS_MAP_END @@ -770,39 +770,39 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( hotdogst_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM ) // RAM -/**/AM_RANGE(0x408000, 0x408fff) AM_READ(MRA16_RAM ) // Palette -/**/AM_RANGE(0x880000, 0x887fff) AM_READ(MRA16_RAM ) // Layer 0 -/**/AM_RANGE(0x900000, 0x907fff) AM_READ(MRA16_RAM ) // Layer 1 -/**/AM_RANGE(0x980000, 0x987fff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // RAM +/**/AM_RANGE(0x408000, 0x408fff) AM_READ(SMH_RAM ) // Palette +/**/AM_RANGE(0x880000, 0x887fff) AM_READ(SMH_RAM ) // Layer 0 +/**/AM_RANGE(0x900000, 0x907fff) AM_READ(SMH_RAM ) // Layer 1 +/**/AM_RANGE(0x980000, 0x987fff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0xa80000, 0xa80007) AM_READ(cave_irq_cause_r ) // IRQ Cause // AM_RANGE(0xa8006e, 0xa8006f) AM_READ(soundlatch_ack_r ) // From Sound CPU -/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0xb80000, 0xb80005) AM_READ(MRA16_RAM ) // Layer 1 Control -/**/AM_RANGE(0xc00000, 0xc00005) AM_READ(MRA16_RAM ) // Layer 2 Control +/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0xb80000, 0xb80005) AM_READ(SMH_RAM ) // Layer 1 Control +/**/AM_RANGE(0xc00000, 0xc00005) AM_READ(SMH_RAM ) // Layer 2 Control AM_RANGE(0xc80000, 0xc80001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xc80002, 0xc80003) AM_READ(cave_input1_r ) // Inputs + EEPROM -/**/AM_RANGE(0xf00000, 0xf07fff) AM_READ(MRA16_RAM ) // Sprites -/**/AM_RANGE(0xf08000, 0xf0ffff) AM_READ(MRA16_RAM ) // Sprites? +/**/AM_RANGE(0xf00000, 0xf07fff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0xf08000, 0xf0ffff) AM_READ(SMH_RAM ) // Sprites? ADDRESS_MAP_END static ADDRESS_MAP_START( hotdogst_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x408000, 0x408fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x408000, 0x408fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette AM_RANGE(0x880000, 0x887fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 AM_RANGE(0x900000, 0x907fff) AM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1 ) // Layer 1 AM_RANGE(0x980000, 0x987fff) AM_WRITE(cave_vram_2_w) AM_BASE(&cave_vram_2 ) // Layer 2 AM_RANGE(0xa8006e, 0xa8006f) AM_WRITE(sound_cmd_w ) // To Sound CPU - AM_RANGE(0xa80000, 0xa8007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs - AM_RANGE(0xb00000, 0xb00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control - AM_RANGE(0xb80000, 0xb80005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control - AM_RANGE(0xc00000, 0xc00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control + AM_RANGE(0xa80000, 0xa8007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0xb00000, 0xb00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0xb80000, 0xb80005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control + AM_RANGE(0xc00000, 0xc00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control AM_RANGE(0xd00000, 0xd00001) AM_WRITE(hotdogst_eeprom_msb_w ) // EEPROM - AM_RANGE(0xd00002, 0xd00003) AM_WRITE(MWA16_NOP ) // ??? - AM_RANGE(0xf00000, 0xf07fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0xf08000, 0xf0ffff) AM_WRITE(MWA16_RAM ) // Sprites? + AM_RANGE(0xd00002, 0xd00003) AM_WRITE(SMH_NOP ) // ??? + AM_RANGE(0xf00000, 0xf07fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xf08000, 0xf0ffff) AM_WRITE(SMH_RAM ) // Sprites? ADDRESS_MAP_END @@ -879,30 +879,30 @@ static READ16_HANDLER( korokoro_input1_r ) } static ADDRESS_MAP_START( korokoro_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ( MRA16_ROM ) // ROM -// AM_RANGE(0x100000, 0x107fff) AM_READ( MRA16_RAM ) // Layer 0 -// AM_RANGE(0x140000, 0x140005) AM_READ( MRA16_RAM ) // Layer 0 Control -// AM_RANGE(0x180000, 0x187fff) AM_READ( MRA16_RAM ) // Sprites + AM_RANGE(0x000000, 0x07ffff) AM_READ( SMH_ROM ) // ROM +// AM_RANGE(0x100000, 0x107fff) AM_READ( SMH_RAM ) // Layer 0 +// AM_RANGE(0x140000, 0x140005) AM_READ( SMH_RAM ) // Layer 0 Control +// AM_RANGE(0x180000, 0x187fff) AM_READ( SMH_RAM ) // Sprites AM_RANGE(0x1c0000, 0x1c0007) AM_READ( cave_irq_cause_r ) // IRQ Cause -// AM_RANGE(0x200000, 0x207fff) AM_READ( MRA16_RAM ) // Palette +// AM_RANGE(0x200000, 0x207fff) AM_READ( SMH_RAM ) // Palette // AM_RANGE(0x240000, 0x240003) AM_READ( cave_sound_r ) // YMZ280 AM_RANGE(0x280000, 0x280001) AM_READ( korokoro_input0_r ) // Inputs + ??? AM_RANGE(0x280002, 0x280003) AM_READ( korokoro_input1_r ) // Inputs + EEPROM - AM_RANGE(0x300000, 0x30ffff) AM_READ( MRA16_RAM ) // RAM + AM_RANGE(0x300000, 0x30ffff) AM_READ( SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( korokoro_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE( MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE( SMH_ROM ) // ROM AM_RANGE(0x100000, 0x107fff) AM_WRITE( cave_vram_0_w ) AM_BASE( &cave_vram_0 ) // Layer 0 - AM_RANGE(0x140000, 0x140005) AM_WRITE( MWA16_RAM ) AM_BASE( &cave_vctrl_0 ) // Layer 0 Control - AM_RANGE(0x180000, 0x187fff) AM_WRITE( MWA16_RAM ) AM_BASE( &spriteram16 ) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x1c0000, 0x1c007f) AM_WRITE( MWA16_RAM ) AM_BASE( &cave_videoregs ) // Video Regs - AM_RANGE(0x200000, 0x207fff) AM_WRITE( MWA16_RAM ) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x140000, 0x140005) AM_WRITE( SMH_RAM ) AM_BASE( &cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0x180000, 0x187fff) AM_WRITE( SMH_RAM ) AM_BASE( &spriteram16 ) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x1c0000, 0x1c007f) AM_WRITE( SMH_RAM ) AM_BASE( &cave_videoregs ) // Video Regs + AM_RANGE(0x200000, 0x207fff) AM_WRITE( SMH_RAM ) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette AM_RANGE(0x240000, 0x240003) AM_WRITE( cave_sound_w ) // YMZ280 AM_RANGE(0x280008, 0x280009) AM_WRITE( korokoro_leds_w ) AM_RANGE(0x28000a, 0x28000b) AM_WRITE( korokoro_eeprom_msb_w ) // EEPROM - AM_RANGE(0x28000c, 0x28000d) AM_WRITE( MWA16_NOP ) // 0 (watchdog?) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE( MWA16_RAM ) // RAM + AM_RANGE(0x28000c, 0x28000d) AM_WRITE( SMH_NOP ) // 0 (watchdog?) + AM_RANGE(0x300000, 0x30ffff) AM_WRITE( SMH_RAM ) // RAM ADDRESS_MAP_END @@ -911,37 +911,37 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( mazinger_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // RAM -/**/AM_RANGE(0x200000, 0x207fff) AM_READ(MRA16_RAM ) // Sprites -/**/AM_RANGE(0x208000, 0x20ffff) AM_READ(MRA16_RAM ) // Sprites? + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM +/**/AM_RANGE(0x200000, 0x207fff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0x208000, 0x20ffff) AM_READ(SMH_RAM ) // Sprites? AM_RANGE(0x300000, 0x300007) AM_READ(cave_irq_cause_r ) // IRQ Cause AM_RANGE(0x30006e, 0x30006f) AM_READ(soundlatch_ack_r ) // From Sound CPU -/**/AM_RANGE(0x404000, 0x407fff) AM_READ(MRA16_RAM ) // Layer 1 -/**/AM_RANGE(0x504000, 0x507fff) AM_READ(MRA16_RAM ) // Layer 0 -/**/AM_RANGE(0x600000, 0x600005) AM_READ(MRA16_RAM ) // Layer 1 Control -/**/AM_RANGE(0x700000, 0x700005) AM_READ(MRA16_RAM ) // Layer 0 Control +/**/AM_RANGE(0x404000, 0x407fff) AM_READ(SMH_RAM ) // Layer 1 +/**/AM_RANGE(0x504000, 0x507fff) AM_READ(SMH_RAM ) // Layer 0 +/**/AM_RANGE(0x600000, 0x600005) AM_READ(SMH_RAM ) // Layer 1 Control +/**/AM_RANGE(0x700000, 0x700005) AM_READ(SMH_RAM ) // Layer 0 Control AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x800002, 0x800003) AM_READ(cave_input1_r ) // Inputs + EEPROM -/**/AM_RANGE(0xc08000, 0xc0ffff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xd00000, 0xd7ffff) AM_READ(MRA16_BANK1 ) // ROM +/**/AM_RANGE(0xc08000, 0xc0ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xd00000, 0xd7ffff) AM_READ(SMH_BANK1 ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( mazinger_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x200000, 0x207fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x208000, 0x20ffff) AM_WRITE(MWA16_RAM ) // Sprites? + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x200000, 0x207fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x208000, 0x20ffff) AM_WRITE(SMH_RAM ) // Sprites? AM_RANGE(0x300068, 0x300069) AM_WRITE(watchdog_reset16_w ) // Watchdog AM_RANGE(0x30006e, 0x30006f) AM_WRITE(sound_cmd_w ) // To Sound CPU - AM_RANGE(0x300000, 0x30007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0x300000, 0x30007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs AM_RANGE(0x400000, 0x407fff) AM_WRITE(cave_vram_1_8x8_w) AM_BASE(&cave_vram_1 ) // Layer 1 AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_8x8_w) AM_BASE(&cave_vram_0 ) // Layer 0 - AM_RANGE(0x600000, 0x600005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control - AM_RANGE(0x700000, 0x700005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0x600000, 0x600005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control + AM_RANGE(0x700000, 0x700005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control AM_RANGE(0x900000, 0x900001) AM_WRITE(cave_eeprom_msb_w ) // EEPROM - AM_RANGE(0xc08000, 0xc0ffff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette - AM_RANGE(0xd00000, 0xd7ffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0xc08000, 0xc0ffff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0xd00000, 0xd7ffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END @@ -950,50 +950,50 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( metmqstr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x17ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x27ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x408000, 0x408fff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x17ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x27ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x408000, 0x408fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x600000, 0x600001) AM_READ(watchdog_reset16_r ) // Watchdog? - AM_RANGE(0x880000, 0x887fff) AM_READ(MRA16_RAM ) // Layer 2 - AM_RANGE(0x888000, 0x88ffff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x900000, 0x907fff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x908000, 0x90ffff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x980000, 0x987fff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x988000, 0x98ffff) AM_READ(MRA16_RAM ) // + AM_RANGE(0x880000, 0x887fff) AM_READ(SMH_RAM ) // Layer 2 + AM_RANGE(0x888000, 0x88ffff) AM_READ(SMH_RAM ) // + AM_RANGE(0x900000, 0x907fff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x908000, 0x90ffff) AM_READ(SMH_RAM ) // + AM_RANGE(0x980000, 0x987fff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x988000, 0x98ffff) AM_READ(SMH_RAM ) // AM_RANGE(0xa80000, 0xa80007) AM_READ(cave_irq_cause_r ) // IRQ Cause AM_RANGE(0xa8006c, 0xa8006d) AM_READ(soundflags_ack_r ) // Communication AM_RANGE(0xa8006e, 0xa8006f) AM_READ(soundlatch_ack_r ) // From Sound CPU -/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0xb80000, 0xb80005) AM_READ(MRA16_RAM ) // Layer 1 Control -/**/AM_RANGE(0xc00000, 0xc00005) AM_READ(MRA16_RAM ) // Layer 2 Control +/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0xb80000, 0xb80005) AM_READ(SMH_RAM ) // Layer 1 Control +/**/AM_RANGE(0xc00000, 0xc00005) AM_READ(SMH_RAM ) // Layer 2 Control AM_RANGE(0xc80000, 0xc80001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xc80002, 0xc80003) AM_READ(cave_input1_r ) // Inputs + EEPROM - AM_RANGE(0xf00000, 0xf07fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xf08000, 0xf0ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0xf00000, 0xf07fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xf08000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( metmqstr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x17ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x27ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x408000, 0x408fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x17ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x27ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x408000, 0x408fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette AM_RANGE(0x880000, 0x887fff) AM_WRITE(cave_vram_2_w) AM_BASE(&cave_vram_2 ) // Layer 2 - AM_RANGE(0x888000, 0x88ffff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x888000, 0x88ffff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x900000, 0x907fff) AM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1 ) // Layer 1 - AM_RANGE(0x908000, 0x90ffff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x908000, 0x90ffff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x980000, 0x987fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 - AM_RANGE(0x988000, 0x98ffff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x988000, 0x98ffff) AM_WRITE(SMH_RAM ) // AM_RANGE(0xa80068, 0xa80069) AM_WRITE(watchdog_reset16_w ) // Watchdog? - AM_RANGE(0xa8006c, 0xa8006d) AM_WRITE(MWA16_NOP ) // ? + AM_RANGE(0xa8006c, 0xa8006d) AM_WRITE(SMH_NOP ) // ? AM_RANGE(0xa8006e, 0xa8006f) AM_WRITE(sound_cmd_w ) // To Sound CPU - AM_RANGE(0xa80000, 0xa8007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs - AM_RANGE(0xb00000, 0xb00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control - AM_RANGE(0xb80000, 0xb80005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control - AM_RANGE(0xc00000, 0xc00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0xa80000, 0xa8007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0xb00000, 0xb00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control + AM_RANGE(0xb80000, 0xb80005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control + AM_RANGE(0xc00000, 0xc00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control AM_RANGE(0xd00000, 0xd00001) AM_WRITE(metmqstr_eeprom_msb_w ) // EEPROM - AM_RANGE(0xf00000, 0xf07fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0xf08000, 0xf0ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0xf00000, 0xf07fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xf08000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -1027,46 +1027,46 @@ static WRITE16_HANDLER( pwrinst2_vctrl_2_w ) { vctrl_w(cave_vctrl_2, offset, dat static WRITE16_HANDLER( pwrinst2_vctrl_3_w ) { vctrl_w(cave_vctrl_3, offset, data, mem_mask); } static ADDRESS_MAP_START( pwrinst2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // - AM_RANGE(0x600000, 0x6fffff) AM_READ(MRA16_ROM ) AM_REGION(REGION_USER1, 0) // extra data ROM space - AM_RANGE(0x800000, 0x807fff) AM_READ(MRA16_RAM ) // Layer 2 - AM_RANGE(0x880000, 0x887fff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x900000, 0x907fff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x980000, 0x987fff) AM_READ(MRA16_RAM ) // Layer 3 - AM_RANGE(0xa00000, 0xa07fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xa08000, 0xa0ffff) AM_READ(MRA16_RAM ) // Sprites? - AM_RANGE(0xa10000, 0xa1ffff) AM_READ(MRA16_RAM ) // Sprites? -/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(MRA16_RAM ) // Layer 2 Control -/**/AM_RANGE(0xb80000, 0xb80005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0xc00000, 0xc00005) AM_READ(MRA16_RAM ) // Layer 1 Control -/**/AM_RANGE(0xc80000, 0xc80005) AM_READ(MRA16_RAM ) // Layer 3 Control + AM_RANGE(0x600000, 0x6fffff) AM_READ(SMH_ROM ) AM_REGION(REGION_USER1, 0) // extra data ROM space + AM_RANGE(0x800000, 0x807fff) AM_READ(SMH_RAM ) // Layer 2 + AM_RANGE(0x880000, 0x887fff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x900000, 0x907fff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x980000, 0x987fff) AM_READ(SMH_RAM ) // Layer 3 + AM_RANGE(0xa00000, 0xa07fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xa08000, 0xa0ffff) AM_READ(SMH_RAM ) // Sprites? + AM_RANGE(0xa10000, 0xa1ffff) AM_READ(SMH_RAM ) // Sprites? +/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 2 Control +/**/AM_RANGE(0xb80000, 0xb80005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0xc00000, 0xc00005) AM_READ(SMH_RAM ) // Layer 1 Control +/**/AM_RANGE(0xc80000, 0xc80005) AM_READ(SMH_RAM ) // Layer 3 Control AM_RANGE(0xa80000, 0xa8007f) AM_READ(donpachi_videoregs_r ) // Video Regs - AM_RANGE(0xd80000, 0xd80001) AM_READ(MRA16_NOP ) // ? From Sound CPU + AM_RANGE(0xd80000, 0xd80001) AM_READ(SMH_NOP ) // ? From Sound CPU AM_RANGE(0xe80000, 0xe80001) AM_READ(pwrinst2_eeprom_r ) // EEPROM - AM_RANGE(0xf00000, 0xf04fff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0xf00000, 0xf04fff) AM_READ(SMH_RAM ) // Palette ADDRESS_MAP_END static ADDRESS_MAP_START( pwrinst2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x400000, 0x40ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x700000, 0x700001) AM_WRITE(cave_eeprom_msb_w ) // EEPROM AM_RANGE(0x800000, 0x807fff) AM_WRITE(cave_vram_2_w) AM_BASE(&cave_vram_2 ) // Layer 2 AM_RANGE(0x880000, 0x887fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 AM_RANGE(0x900000, 0x907fff) AM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1 ) // Layer 1 AM_RANGE(0x980000, 0x987fff) AM_WRITE(cave_vram_3_8x8_w) AM_BASE(&cave_vram_3 ) // Layer 3 - AM_RANGE(0xa00000, 0xa07fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0xa08000, 0xa0ffff) AM_WRITE(MWA16_RAM ) // Sprites? - AM_RANGE(0xa10000, 0xa1ffff) AM_WRITE(MWA16_RAM ) // Sprites? - AM_RANGE(0xa80000, 0xa8007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0xa00000, 0xa07fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xa08000, 0xa0ffff) AM_WRITE(SMH_RAM ) // Sprites? + AM_RANGE(0xa10000, 0xa1ffff) AM_WRITE(SMH_RAM ) // Sprites? + AM_RANGE(0xa80000, 0xa8007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs AM_RANGE(0xb00000, 0xb00005) AM_WRITE(pwrinst2_vctrl_2_w) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control AM_RANGE(0xb80000, 0xb80005) AM_WRITE(pwrinst2_vctrl_0_w) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control AM_RANGE(0xc00000, 0xc00005) AM_WRITE(pwrinst2_vctrl_1_w) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control AM_RANGE(0xc80000, 0xc80005) AM_WRITE(pwrinst2_vctrl_3_w) AM_BASE(&cave_vctrl_3 ) // Layer 3 Control AM_RANGE(0xe00000, 0xe00001) AM_WRITE(sound_cmd_w ) // To Sound CPU - AM_RANGE(0xf00000, 0xf04fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0xf00000, 0xf04fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette ADDRESS_MAP_END @@ -1095,53 +1095,53 @@ static READ16_HANDLER( agallet_irq_cause_r ) } static ADDRESS_MAP_START( sailormn_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x110000, 0x110001) AM_READ(MRA16_RAM ) // (agallet) - AM_RANGE(0x200000, 0x3fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x400000, 0x407fff) AM_READ(MRA16_RAM ) // (agallet) - AM_RANGE(0x408000, 0x40bfff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x40c000, 0x40ffff) AM_READ(MRA16_RAM ) // (agallet) - AM_RANGE(0x410000, 0x410001) AM_READ(MRA16_RAM ) // (agallet) - AM_RANGE(0x500000, 0x507fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x508000, 0x50ffff) AM_READ(MRA16_RAM ) // Sprites? - AM_RANGE(0x510000, 0x510001) AM_READ(MRA16_RAM ) // (agallet) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x110000, 0x110001) AM_READ(SMH_RAM ) // (agallet) + AM_RANGE(0x200000, 0x3fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x407fff) AM_READ(SMH_RAM ) // (agallet) + AM_RANGE(0x408000, 0x40bfff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x40c000, 0x40ffff) AM_READ(SMH_RAM ) // (agallet) + AM_RANGE(0x410000, 0x410001) AM_READ(SMH_RAM ) // (agallet) + AM_RANGE(0x500000, 0x507fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x508000, 0x50ffff) AM_READ(SMH_RAM ) // Sprites? + AM_RANGE(0x510000, 0x510001) AM_READ(SMH_RAM ) // (agallet) AM_RANGE(0x600000, 0x600001) AM_READ(sailormn_input0_r ) // Inputs + Watchdog! AM_RANGE(0x600002, 0x600003) AM_READ(cave_input1_r ) // Inputs + EEPROM - AM_RANGE(0x800000, 0x887fff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x880000, 0x887fff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x900000, 0x907fff) AM_READ(MRA16_RAM ) // Layer 2 - AM_RANGE(0x908000, 0x908001) AM_READ(MRA16_RAM ) // (agallet) -/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0xa80000, 0xa80005) AM_READ(MRA16_RAM ) // Layer 1 Control -/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(MRA16_RAM ) // Layer 2 Control + AM_RANGE(0x800000, 0x887fff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x880000, 0x887fff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x900000, 0x907fff) AM_READ(SMH_RAM ) // Layer 2 + AM_RANGE(0x908000, 0x908001) AM_READ(SMH_RAM ) // (agallet) +/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0xa80000, 0xa80005) AM_READ(SMH_RAM ) // Layer 1 Control +/**/AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // Layer 2 Control AM_RANGE(0xb80000, 0xb80007) AM_READ(cave_irq_cause_r ) // IRQ Cause (bit 2 tested!) AM_RANGE(0xb8006c, 0xb8006d) AM_READ(soundflags_ack_r ) // Communication AM_RANGE(0xb8006e, 0xb8006f) AM_READ(soundlatch_ack_r ) // From Sound CPU ADDRESS_MAP_END static ADDRESS_MAP_START( sailormn_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x110000, 0x110001) AM_WRITE(MWA16_RAM ) // (agallet) - AM_RANGE(0x200000, 0x3fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x400000, 0x407fff) AM_WRITE(MWA16_RAM ) // (agallet) - AM_RANGE(0x408000, 0x40bfff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette - AM_RANGE(0x40c000, 0x40ffff) AM_WRITE(MWA16_RAM ) // (agallet) - AM_RANGE(0x410000, 0x410001) AM_WRITE(MWA16_RAM ) // (agallet) - AM_RANGE(0x500000, 0x507fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x508000, 0x50ffff) AM_WRITE(MWA16_RAM ) // Sprites? - AM_RANGE(0x510000, 0x510001) AM_WRITE(MWA16_RAM ) // (agallet) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x110000, 0x110001) AM_WRITE(SMH_RAM ) // (agallet) + AM_RANGE(0x200000, 0x3fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM ) // (agallet) + AM_RANGE(0x408000, 0x40bfff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x40c000, 0x40ffff) AM_WRITE(SMH_RAM ) // (agallet) + AM_RANGE(0x410000, 0x410001) AM_WRITE(SMH_RAM ) // (agallet) + AM_RANGE(0x500000, 0x507fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x508000, 0x50ffff) AM_WRITE(SMH_RAM ) // Sprites? + AM_RANGE(0x510000, 0x510001) AM_WRITE(SMH_RAM ) // (agallet) AM_RANGE(0x700000, 0x700001) AM_WRITE(sailormn_eeprom_msb_w ) // EEPROM AM_RANGE(0x800000, 0x807fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 AM_RANGE(0x880000, 0x887fff) AM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1 ) // Layer 1 AM_RANGE(0x900000, 0x907fff) AM_WRITE(cave_vram_2_w) AM_BASE(&cave_vram_2 ) // Layer 2 - AM_RANGE(0x908000, 0x908001) AM_WRITE(MWA16_RAM ) // (agallet) - AM_RANGE(0xa00000, 0xa00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control - AM_RANGE(0xa80000, 0xa80005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control - AM_RANGE(0xb00000, 0xb00005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control + AM_RANGE(0x908000, 0x908001) AM_WRITE(SMH_RAM ) // (agallet) + AM_RANGE(0xa00000, 0xa00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0xa80000, 0xa80005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_1 ) // Layer 1 Control + AM_RANGE(0xb00000, 0xb00005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_2 ) // Layer 2 Control AM_RANGE(0xb8006e, 0xb8006f) AM_WRITE(sound_cmd_w ) // To Sound CPU - AM_RANGE(0xb80000, 0xb8007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0xb80000, 0xb8007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs ADDRESS_MAP_END @@ -1150,29 +1150,29 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( uopoko_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x300002, 0x300003) AM_READ(cave_sound_r ) // YMZ280 -/**/AM_RANGE(0x400000, 0x407fff) AM_READ(MRA16_RAM ) // Sprites -/**/AM_RANGE(0x408000, 0x40ffff) AM_READ(MRA16_RAM ) // Sprites? -/**/AM_RANGE(0x500000, 0x507fff) AM_READ(MRA16_RAM ) // Layer 0 +/**/AM_RANGE(0x400000, 0x407fff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0x408000, 0x40ffff) AM_READ(SMH_RAM ) // Sprites? +/**/AM_RANGE(0x500000, 0x507fff) AM_READ(SMH_RAM ) // Layer 0 AM_RANGE(0x600000, 0x600007) AM_READ(cave_irq_cause_r ) // IRQ Cause -/**/AM_RANGE(0x700000, 0x700005) AM_READ(MRA16_RAM ) // Layer 0 Control -/**/AM_RANGE(0x800000, 0x80ffff) AM_READ(MRA16_RAM ) // Palette +/**/AM_RANGE(0x700000, 0x700005) AM_READ(SMH_RAM ) // Layer 0 Control +/**/AM_RANGE(0x800000, 0x80ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x900000, 0x900001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x900002, 0x900003) AM_READ(cave_input1_r ) // Inputs + EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( uopoko_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x300003) AM_WRITE(cave_sound_w ) // YMZ280 - AM_RANGE(0x400000, 0x407fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x408000, 0x40ffff) AM_WRITE(MWA16_RAM ) // Sprites? + AM_RANGE(0x400000, 0x407fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x408000, 0x40ffff) AM_WRITE(SMH_RAM ) // Sprites? AM_RANGE(0x500000, 0x507fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0 ) // Layer 0 - AM_RANGE(0x600000, 0x60007f) AM_WRITE(MWA16_RAM) AM_BASE(&cave_videoregs ) // Video Regs - AM_RANGE(0x700000, 0x700005) AM_WRITE(MWA16_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control - AM_RANGE(0x800000, 0x80ffff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette + AM_RANGE(0x600000, 0x60007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs ) // Video Regs + AM_RANGE(0x700000, 0x700005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0 ) // Layer 0 Control + AM_RANGE(0x800000, 0x80ffff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette AM_RANGE(0xa00000, 0xa00001) AM_WRITE(cave_eeprom_msb_w ) // EEPROM ADDRESS_MAP_END @@ -1209,15 +1209,15 @@ static WRITE8_HANDLER( hotdogst_okibank_w ) } static ADDRESS_MAP_START( hotdogst_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK2 ) // ROM (Banked) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2 ) // ROM (Banked) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( hotdogst_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM (Banked) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM (Banked) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( hotdogst_sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -1253,17 +1253,17 @@ static WRITE8_HANDLER( mazinger_rombank_w ) } static ADDRESS_MAP_START( mazinger_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK2 ) // ROM (Banked) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2 ) // ROM (Banked) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( mazinger_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM (Banked) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM (Banked) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( mazinger_sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -1315,15 +1315,15 @@ static WRITE8_HANDLER( metmqstr_okibank1_w ) } static ADDRESS_MAP_START( metmqstr_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1 ) // ROM (Banked) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1 ) // ROM (Banked) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( metmqstr_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM (Banked) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM (Banked) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( metmqstr_sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -1360,15 +1360,15 @@ static WRITE8_HANDLER( pwrinst2_rombank_w ) } static ADDRESS_MAP_START( pwrinst2_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // ROM (Banked) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // ROM (Banked) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( pwrinst2_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // ROM (Banked) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // ROM (Banked) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( pwrinst2_sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -1388,8 +1388,8 @@ static ADDRESS_MAP_START( pwrinst2_sound_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x17) AM_WRITE(NMK112_okibank_w ) // Samples bank AM_RANGE(0x40, 0x40) AM_WRITE(YM2203_control_port_0_w ) // YM2203 AM_RANGE(0x41, 0x41) AM_WRITE(YM2203_write_port_0_w ) // -// AM_RANGE(0x50, 0x50) AM_WRITE(MWA8_NOP ) // ?? volume -// AM_RANGE(0x51, 0x51) AM_WRITE(MWA8_NOP ) // ?? volume +// AM_RANGE(0x50, 0x50) AM_WRITE(SMH_NOP ) // ?? volume +// AM_RANGE(0x51, 0x51) AM_WRITE(SMH_NOP ) // ?? volume AM_RANGE(0x80, 0x80) AM_WRITE(pwrinst2_rombank_w ) // ROM bank ADDRESS_MAP_END @@ -1436,15 +1436,15 @@ static WRITE8_HANDLER( sailormn_okibank1_w ) } static ADDRESS_MAP_START( sailormn_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1 ) // ROM (Banked) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1 ) // ROM (Banked) AM_RANGE(0xc000, 0xdfff) AM_READ(mirror_ram_r ) // RAM AM_RANGE(0xe000, 0xffff) AM_READ(mirror_ram_r ) // Mirrored RAM (agallet) ADDRESS_MAP_END static ADDRESS_MAP_START( sailormn_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM (Banked) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM (Banked) AM_RANGE(0xc000, 0xdfff) AM_WRITE(mirror_ram_w) AM_BASE(&mirror_ram ) // RAM AM_RANGE(0xe000, 0xffff) AM_WRITE(mirror_ram_w ) // Mirrored RAM (agallet) ADDRESS_MAP_END diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 20746c7c10f..b38da32b16c 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -100,7 +100,7 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x03ff) AM_READ(cball_wram_r) AM_MASK(0x7f) - AM_RANGE(0x0400, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0400, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x1001, 0x1001) AM_READ(input_port_0_r) AM_RANGE(0x1003, 0x1003) AM_READ(input_port_1_r) AM_RANGE(0x1020, 0x1020) AM_READ(input_port_2_r) diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index 54311e4681b..e140e4b5f49 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -108,44 +108,44 @@ static READ16_HANDLER( twocrude_control_r ) /******************************************************************************/ static ADDRESS_MAP_START( twocrude_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM) - AM_RANGE(0x0a0000, 0x0a1fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a2000, 0x0a2fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a4000, 0x0a47ff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a6000, 0x0a67ff) AM_READ(MRA16_RAM) + AM_RANGE(0x0a0000, 0x0a1fff) AM_READ(SMH_RAM) + AM_RANGE(0x0a2000, 0x0a2fff) AM_READ(SMH_RAM) + AM_RANGE(0x0a4000, 0x0a47ff) AM_READ(SMH_RAM) + AM_RANGE(0x0a6000, 0x0a67ff) AM_READ(SMH_RAM) - AM_RANGE(0x0a8000, 0x0a8fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0aa000, 0x0aafff) AM_READ(MRA16_RAM) - AM_RANGE(0x0ac000, 0x0ac7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x0ae000, 0x0ae7ff) AM_READ(MRA16_RAM) + AM_RANGE(0x0a8000, 0x0a8fff) AM_READ(SMH_RAM) + AM_RANGE(0x0aa000, 0x0aafff) AM_READ(SMH_RAM) + AM_RANGE(0x0ac000, 0x0ac7ff) AM_READ(SMH_RAM) + AM_RANGE(0x0ae000, 0x0ae7ff) AM_READ(SMH_RAM) - AM_RANGE(0x0b0000, 0x0b07ff) AM_READ(MRA16_RAM) - AM_RANGE(0x0b8000, 0x0b8fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0b9000, 0x0b9fff) AM_READ(MRA16_RAM) + AM_RANGE(0x0b0000, 0x0b07ff) AM_READ(SMH_RAM) + AM_RANGE(0x0b8000, 0x0b8fff) AM_READ(SMH_RAM) + AM_RANGE(0x0b9000, 0x0b9fff) AM_READ(SMH_RAM) AM_RANGE(0x0bc000, 0x0bc00f) AM_READ(twocrude_control_r) ADDRESS_MAP_END static ADDRESS_MAP_START( twocrude_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_WRITE(MWA16_RAM) AM_BASE(&twocrude_ram) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) AM_BASE(&twocrude_ram) AM_RANGE(0x0a0000, 0x0a1fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x0a2000, 0x0a2fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x0a4000, 0x0a47ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x0a6000, 0x0a67ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x0a4000, 0x0a47ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x0a6000, 0x0a67ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) AM_RANGE(0x0a8000, 0x0a8fff) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x0aa000, 0x0aafff) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x0ac000, 0x0ac7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf3_rowscroll) - AM_RANGE(0x0ae000, 0x0ae7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x0ac000, 0x0ac7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf3_rowscroll) + AM_RANGE(0x0ae000, 0x0ae7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) - AM_RANGE(0x0b0000, 0x0b07ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x0b4000, 0x0b4001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x0b0000, 0x0b07ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x0b4000, 0x0b4001) AM_WRITE(SMH_NOP) - AM_RANGE(0x0b5000, 0x0b500f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) - AM_RANGE(0x0b6000, 0x0b600f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x0b5000, 0x0b500f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x0b6000, 0x0b600f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) AM_RANGE(0x0b8000, 0x0b8fff) AM_WRITE(twocrude_palette_24bit_rg_w) AM_BASE(&paletteram16) AM_RANGE(0x0b9000, 0x0b9fff) AM_WRITE(twocrude_palette_24bit_b_w) AM_BASE(&paletteram16_2) @@ -179,22 +179,22 @@ static WRITE8_HANDLER( YM2203_w ) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(YM2203_w) AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_1_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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 19f47fb2be0..746152de63a 100644 --- a/src/mame/drivers/ccastles.c +++ b/src/mame/drivers/ccastles.c @@ -342,7 +342,7 @@ static WRITE8_HANDLER( nvram_store_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0001) AM_WRITE(ccastles_bitmode_addr_w) AM_RANGE(0x0002, 0x0002) AM_READWRITE(ccastles_bitmode_r, ccastles_bitmode_w) - AM_RANGE(0x0000, 0x7fff) AM_READWRITE(MRA8_RAM, ccastles_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x0000, 0x7fff) AM_READWRITE(SMH_RAM, ccastles_videoram_w) AM_BASE(&videoram) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x8e00, 0x8fff) AM_BASE(&spriteram) AM_RANGE(0x9000, 0x90ff) AM_MIRROR(0x0300) AM_RAM AM_BASE(&nvram_stage) AM_SIZE(&generic_nvram_size) diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index 0909376d509..eee498611fc 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -276,9 +276,9 @@ static ADDRESS_MAP_START( cclimber_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9880, 0x989f) AM_RAM AM_BASE(&cclimber_spriteram) AM_RANGE(0x98dc, 0x98df) AM_RAM AM_BASE(&cclimber_bigsprite_control) AM_RANGE(0x9800, 0x9bff) AM_RAM /* not used, but initialized */ - AM_RANGE(0x9c00, 0x9fff) AM_READWRITE(MRA8_RAM, cclimber_colorram_w) AM_BASE(&cclimber_colorram) + AM_RANGE(0x9c00, 0x9fff) AM_READWRITE(SMH_RAM, cclimber_colorram_w) AM_BASE(&cclimber_colorram) AM_RANGE(0xa000, 0xa000) AM_READWRITE(input_port_0_r, interrupt_enable_w) - AM_RANGE(0xa001, 0xa002) AM_WRITE(MWA8_RAM) AM_BASE(&cclimber_flip_screen) + AM_RANGE(0xa001, 0xa002) AM_WRITE(SMH_RAM) AM_BASE(&cclimber_flip_screen) AM_RANGE(0xa003, 0xa003) AM_WRITE(interrupt_enable_w) //used by Crazy Kong Bootleg with alt levels and speed up AM_RANGE(0xa004, 0xa004) AM_WRITE(cclimber_sample_trigger_w) AM_RANGE(0xa800, 0xa800) AM_READWRITE(input_port_1_r, cclimber_sample_rate_w) @@ -291,8 +291,8 @@ static ADDRESS_MAP_START( cannonb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6bff) AM_RAM AM_RANGE(0x8000, 0x83ff) AM_RAM - AM_RANGE(0x8800, 0x88ff) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&cclimber_bigsprite_videoram) /* must not return what's written (game will reset after coin insert if it returns 0xff)*/ -//AM_RANGE(0x8900, 0x8bff) AM_WRITE(MWA8_RAM) /* not used, but initialized */ + AM_RANGE(0x8800, 0x88ff) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&cclimber_bigsprite_videoram) /* must not return what's written (game will reset after coin insert if it returns 0xff)*/ +//AM_RANGE(0x8900, 0x8bff) AM_WRITE(SMH_RAM) /* not used, but initialized */ AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM AM_BASE(&cclimber_videoram) /* 9800-9bff and 9c00-9fff share the same RAM, interleaved */ /* (9800-981f for scroll, 9c20-9c3f for color RAM, and so on) */ @@ -300,7 +300,7 @@ static ADDRESS_MAP_START( cannonb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9880, 0x989f) AM_RAM AM_BASE(&cclimber_spriteram) AM_RANGE(0x98dc, 0x98df) AM_RAM AM_BASE(&cclimber_bigsprite_control) AM_RANGE(0x9800, 0x9bff) AM_RAM /* not used, but initialized */ - AM_RANGE(0x9c00, 0x9fff) AM_READWRITE(MRA8_RAM, cclimber_colorram_w) AM_BASE(&cclimber_colorram) + AM_RANGE(0x9c00, 0x9fff) AM_READWRITE(SMH_RAM, cclimber_colorram_w) AM_BASE(&cclimber_colorram) AM_RANGE(0xa000, 0xa000) AM_READWRITE(input_port_0_r, interrupt_enable_w) AM_RANGE(0xa001, 0xa002) AM_WRITE(cannonb_flip_screen_w) AM_BASE(&cclimber_flip_screen) AM_RANGE(0xa004, 0xa004) AM_WRITE(cclimber_sample_trigger_w) @@ -314,17 +314,17 @@ static ADDRESS_MAP_START( swimmer_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x8800, 0x88ff) AM_MIRROR(0x0100) AM_RAM AM_BASE(&cclimber_bigsprite_videoram) AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM AM_BASE(&cclimber_videoram) - AM_RANGE(0x9800, 0x981f) AM_WRITE(MWA8_RAM) AM_BASE(&cclimber_column_scroll) - AM_RANGE(0x9880, 0x989f) AM_WRITE(MWA8_RAM) AM_BASE(&cclimber_spriteram) - AM_RANGE(0x98fc, 0x98ff) AM_WRITE(MWA8_RAM) AM_BASE(&cclimber_bigsprite_control) - AM_RANGE(0x9c00, 0x9fff) AM_READWRITE(MRA8_RAM, cclimber_colorram_w) AM_BASE(&cclimber_colorram) + AM_RANGE(0x9800, 0x981f) AM_WRITE(SMH_RAM) AM_BASE(&cclimber_column_scroll) + AM_RANGE(0x9880, 0x989f) AM_WRITE(SMH_RAM) AM_BASE(&cclimber_spriteram) + AM_RANGE(0x98fc, 0x98ff) AM_WRITE(SMH_RAM) AM_BASE(&cclimber_bigsprite_control) + AM_RANGE(0x9c00, 0x9fff) AM_READWRITE(SMH_RAM, cclimber_colorram_w) AM_BASE(&cclimber_colorram) AM_RANGE(0xa000, 0xa000) AM_READWRITE(input_port_0_r, interrupt_enable_w) - AM_RANGE(0xa001, 0xa002) AM_WRITE(MWA8_RAM) AM_BASE(&cclimber_flip_screen) - AM_RANGE(0xa003, 0xa003) AM_WRITE(MWA8_RAM) AM_BASE(&swimmer_side_background_enabled) - AM_RANGE(0xa004, 0xa004) AM_WRITE(MWA8_RAM) AM_BASE(&swimmer_palettebank) + AM_RANGE(0xa001, 0xa002) AM_WRITE(SMH_RAM) AM_BASE(&cclimber_flip_screen) + AM_RANGE(0xa003, 0xa003) AM_WRITE(SMH_RAM) AM_BASE(&swimmer_side_background_enabled) + AM_RANGE(0xa004, 0xa004) AM_WRITE(SMH_RAM) AM_BASE(&swimmer_palettebank) AM_RANGE(0xa800, 0xa800) AM_READWRITE(input_port_1_r, swimmer_sh_soundlatch_w) AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) - AM_RANGE(0xb800, 0xb800) AM_READWRITE(input_port_3_r, MWA8_RAM) AM_BASE(&swimmer_background_color) + AM_RANGE(0xb800, 0xb800) AM_READWRITE(input_port_3_r, SMH_RAM) AM_BASE(&swimmer_background_color) AM_RANGE(0xb880, 0xb880) AM_READ(input_port_4_r) AM_RANGE(0xc000, 0xc7ff) AM_RAM /* ??? used by Guzzler */ AM_RANGE(0xe000, 0xffff) AM_ROM /* Guzzler only */ @@ -343,9 +343,9 @@ static ADDRESS_MAP_START( yamato_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9880, 0x989f) AM_RAM AM_BASE(&cclimber_spriteram) AM_RANGE(0x98dc, 0x98df) AM_RAM AM_BASE(&cclimber_bigsprite_control) AM_RANGE(0x9800, 0x9bff) AM_RAM /* not used, but initialized */ - AM_RANGE(0x9c00, 0x9fff) AM_READWRITE(MRA8_RAM, cclimber_colorram_w) AM_BASE(&cclimber_colorram) + AM_RANGE(0x9c00, 0x9fff) AM_READWRITE(SMH_RAM, cclimber_colorram_w) AM_BASE(&cclimber_colorram) AM_RANGE(0xa000, 0xa000) AM_READWRITE(input_port_0_r, interrupt_enable_w) - AM_RANGE(0xa001, 0xa002) AM_WRITE(MWA8_RAM) AM_BASE(&cclimber_flip_screen) + AM_RANGE(0xa001, 0xa002) AM_WRITE(SMH_RAM) AM_BASE(&cclimber_flip_screen) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) AM_RANGE(0xb800, 0xb800) AM_READ(input_port_3_r) @@ -353,7 +353,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_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_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) @@ -364,7 +364,7 @@ static ADDRESS_MAP_START( toprollr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x99dc, 0x99df) AM_RAM AM_BASE(&cclimber_bigsprite_control) AM_RANGE(0x9c00, 0x9fff) AM_RAM AM_BASE(&cclimber_colorram) AM_RANGE(0xa000, 0xa000) AM_WRITE(interrupt_enable_w) AM_READ(input_port_0_r) - AM_RANGE(0xa001, 0xa002) AM_WRITE(MWA8_RAM) AM_BASE(&cclimber_flip_screen) + AM_RANGE(0xa001, 0xa002) AM_WRITE(SMH_RAM) AM_BASE(&cclimber_flip_screen) AM_RANGE(0xa004, 0xa004) AM_WRITE(cclimber_sample_trigger_w) AM_RANGE(0xa005, 0xa006) AM_WRITE(toprollr_rombank_w) AM_RANGE(0xa800, 0xa800) AM_READWRITE(input_port_1_r, cclimber_sample_rate_w) diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index 376fc01969e..5f483f5344c 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -679,7 +679,7 @@ static READ8_HANDLER( caterplr_AY8910_r ) static ADDRESS_MAP_START( centiped_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(&rambase) - AM_RANGE(0x0400, 0x07bf) AM_READWRITE(MRA8_RAM, centiped_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x0400, 0x07bf) AM_READWRITE(SMH_RAM, centiped_videoram_w) AM_BASE(&videoram) AM_RANGE(0x07c0, 0x07ff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x0800, 0x0800) AM_READ(input_port_4_r) /* DSW1 */ AM_RANGE(0x0801, 0x0801) AM_READ(input_port_5_r) /* DSW2 */ @@ -704,7 +704,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( centipdb_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x4000) AM_RAM - AM_RANGE(0x0400, 0x07bf) AM_MIRROR(0x4000) AM_READWRITE(MRA8_RAM, centiped_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x0400, 0x07bf) AM_MIRROR(0x4000) AM_READWRITE(SMH_RAM, centiped_videoram_w) AM_BASE(&videoram) AM_RANGE(0x07c0, 0x07ff) AM_MIRROR(0x4000) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x0800, 0x0800) AM_MIRROR(0x4000) AM_READ(input_port_4_r) /* DSW1 */ AM_RANGE(0x0801, 0x0801) AM_MIRROR(0x4000) AM_READ(input_port_5_r) /* DSW2 */ @@ -740,7 +740,7 @@ static ADDRESS_MAP_START( milliped_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_RANGE(0x0400, 0x040f) AM_READWRITE(pokey1_r, pokey1_w) AM_RANGE(0x0800, 0x080f) AM_READWRITE(pokey2_r, pokey2_w) - AM_RANGE(0x1000, 0x13bf) AM_READWRITE(MRA8_RAM, centiped_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x1000, 0x13bf) AM_READWRITE(SMH_RAM, centiped_videoram_w) AM_BASE(&videoram) AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x2000, 0x2000) AM_READ(centiped_IN0_r) AM_RANGE(0x2001, 0x2001) AM_READ(milliped_IN1_r) @@ -771,7 +771,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( warlords_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x0400, 0x07bf) AM_READWRITE(MRA8_RAM, centiped_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x0400, 0x07bf) AM_READWRITE(SMH_RAM, centiped_videoram_w) AM_BASE(&videoram) AM_RANGE(0x07c0, 0x07ff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x0800, 0x0800) AM_READ(input_port_2_r) /* DSW1 */ AM_RANGE(0x0801, 0x0801) AM_READ(input_port_3_r) /* DSW2 */ @@ -798,7 +798,7 @@ static ADDRESS_MAP_START( mazeinv_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_RANGE(0x0400, 0x040f) AM_READWRITE(pokey1_r, pokey1_w) AM_RANGE(0x0800, 0x080f) AM_READWRITE(pokey2_r, pokey2_w) - AM_RANGE(0x1000, 0x13bf) AM_READWRITE(MRA8_RAM, centiped_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x1000, 0x13bf) AM_READWRITE(SMH_RAM, centiped_videoram_w) AM_BASE(&videoram) AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x2000, 0x2000) AM_READ(input_port_0_r) AM_RANGE(0x2001, 0x2001) AM_READ(input_port_1_r) @@ -810,7 +810,7 @@ static ADDRESS_MAP_START( mazeinv_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2500, 0x2502) AM_WRITE(coin_count_w) AM_RANGE(0x2503, 0x2504) AM_WRITE(led_w) AM_RANGE(0x2505, 0x2505) AM_WRITE(input_select_w) -// AM_RANGE(0x2506, 0x2507) AM_WRITE(MWA8_NOP) /* ? */ +// AM_RANGE(0x2506, 0x2507) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0x2580, 0x2583) AM_WRITE(mazeinv_input_select_w) AM_RANGE(0x2600, 0x2600) AM_WRITE(irq_ack_w) AM_RANGE(0x2680, 0x2680) AM_WRITE(watchdog_reset_w) diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c index f687a3a402a..866902aa048 100644 --- a/src/mame/drivers/chaknpop.c +++ b/src/mame/drivers/chaknpop.c @@ -68,8 +68,8 @@ static WRITE8_HANDLER ( coinlock_w ) ***************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_READ(chaknpop_mcu_portA_r) AM_RANGE(0x8801, 0x8801) AM_READ(chaknpop_mcu_portB_r) AM_RANGE(0x8802, 0x8802) AM_READ(chaknpop_mcu_portC_r) @@ -80,16 +80,16 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x880a, 0x880a) AM_READ(input_port_0_r) // IN0 AM_RANGE(0x880b, 0x880b) AM_READ(input_port_2_r) // IN2 AM_RANGE(0x880c, 0x880c) AM_READ(chaknpop_gfxmode_r) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) // TX tilemap - AM_RANGE(0x9800, 0x983f) AM_READ(MRA8_RAM) // Color attribute - AM_RANGE(0x9840, 0x98ff) AM_READ(MRA8_RAM) // sprite - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_BANK1) // bitmap plane 1-4 + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) // TX tilemap + AM_RANGE(0x9800, 0x983f) AM_READ(SMH_RAM) // Color attribute + AM_RANGE(0x9840, 0x98ff) AM_READ(SMH_RAM) // sprite + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_BANK1) // bitmap plane 1-4 ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) AM_BASE(&chaknpop_ram) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&chaknpop_ram) AM_RANGE(0x8800, 0x8800) AM_WRITE(chaknpop_mcu_portA_w) AM_RANGE(0x8801, 0x8801) AM_WRITE(chaknpop_mcu_portB_w) AM_RANGE(0x8802, 0x8802) AM_WRITE(chaknpop_mcu_portC_w) @@ -101,9 +101,9 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x880D, 0x880D) AM_WRITE(coinlock_w) // coin lock out AM_RANGE(0x9000, 0x93ff) AM_WRITE(chaknpop_txram_w) AM_BASE(&chaknpop_txram) AM_RANGE(0x9800, 0x983f) AM_WRITE(chaknpop_attrram_w) AM_BASE(&chaknpop_attrram) - AM_RANGE(0x9840, 0x98ff) AM_WRITE(MWA8_RAM) AM_BASE(&chaknpop_sprram) AM_SIZE(&chaknpop_sprram_size) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_BANK1) // bitmap plane 1-4 + AM_RANGE(0x9840, 0x98ff) AM_WRITE(SMH_RAM) AM_BASE(&chaknpop_sprram) AM_SIZE(&chaknpop_sprram_size) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_BANK1) // bitmap plane 1-4 ADDRESS_MAP_END static const struct AY8910interface ay8910_interface_1 = diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index 13561b748c4..daa2bd3be40 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -121,8 +121,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7001, 0x7001) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x7800, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x83ff) AM_WRITE(champbas_videoram_w) AM_READ(MRA8_RAM) AM_BASE(&videoram) - AM_RANGE(0x8400, 0x87ff) AM_WRITE(champbas_colorram_w) AM_READ(MRA8_RAM) AM_BASE(&colorram) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(champbas_videoram_w) AM_READ(SMH_RAM) AM_BASE(&videoram) + AM_RANGE(0x8400, 0x87ff) AM_WRITE(champbas_colorram_w) AM_READ(SMH_RAM) AM_BASE(&colorram) AM_RANGE(0x8800, 0x8fef) AM_RAM AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xa000, 0xa000) AM_WRITE(interrupt_enable_w) AM_READ(input_port_0_r) @@ -132,7 +132,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa005, 0xa005) AM_NOP AM_RANGE(0xa040, 0xa040) AM_READ(input_port_1_r) - AM_RANGE(0xa060, 0xa06f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0xa060, 0xa06f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_RANGE(0xa080, 0xa080) AM_WRITE(soundlatch_w) AM_READ(input_port_2_r) /* AM_RANGE(0xa0a0, 0xa0a0) ???? */ AM_RANGE(0xa0c0, 0xa0c0) AM_WRITE(watchdog_reset_w) AM_READ(input_port_3_r) @@ -150,11 +150,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xe3ff) AM_READ(MRA8_RAM) -/* AM_RANGE(0x8000, 0x8000) AM_WRITE(MWA8_NOP) return low 4bit to main CPU */ + AM_RANGE(0xe000, 0xe3ff) AM_READ(SMH_RAM) +/* AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_NOP) return low 4bit to main CPU */ AM_RANGE(0xa000, 0xa000) AM_WRITE(soundlatch_clear_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(champbas_dac_w) - AM_RANGE(0xe000, 0xe3ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xe3ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index 82a5adec39a..85e07ed31d9 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -198,7 +198,7 @@ static ADDRESS_MAP_START( champbwl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe000, 0xe1ff) AM_RAM AM_BASE(&tnzs_vdcram) AM_RANGE(0xe200, 0xe2ff) AM_RAM AM_BASE(&tnzs_scrollram) /* scrolling info */ AM_RANGE(0xe300, 0xe303) AM_MIRROR(0xfc) AM_WRITE(champbwl_objctrl_w) AM_BASE(&tnzs_objctrl) /* control registers (0x80 mirror used by Arkanoid 2) */ - AM_RANGE(0xe800, 0xe800) AM_WRITE(MWA8_RAM) AM_BASE(&tnzs_bg_flag) /* enable / disable background transparency */ + AM_RANGE(0xe800, 0xe800) AM_WRITE(SMH_RAM) AM_BASE(&tnzs_bg_flag) /* enable / disable background transparency */ AM_RANGE(0xf000, 0xf000) AM_READ(trackball_r) AM_RANGE(0xf002, 0xf002) AM_READ(input_port_0_r) diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c index 4500bfe6310..ffd0b71d648 100644 --- a/src/mame/drivers/changela.c +++ b/src/mame/drivers/changela.c @@ -144,8 +144,8 @@ static ADDRESS_MAP_START( mcu_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0001, 0x0001) AM_READ(changela_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(changela_68705_portC_r) - AM_RANGE(0x0000, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -157,8 +157,8 @@ static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0005, 0x0005) AM_WRITE(changela_68705_ddrB_w) AM_RANGE(0x0006, 0x0006) AM_WRITE(changela_68705_ddrC_w) - AM_RANGE(0x0000, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -259,10 +259,10 @@ static WRITE8_HANDLER( changela_coin_counter_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) /* OBJ0 RAM */ - AM_RANGE(0x9000, 0x97ff) AM_READ(MRA8_RAM) /* OBJ1 RAM */ - AM_RANGE(0xb000, 0xbfff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) /* OBJ0 RAM */ + AM_RANGE(0x9000, 0x97ff) AM_READ(SMH_RAM) /* OBJ1 RAM */ + AM_RANGE(0xb000, 0xbfff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_READ(changela_mem_device_r) /* RAM4 (River Bed RAM); RAM5 (Tree RAM) */ @@ -279,21 +279,21 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd030, 0xd030) AM_READ(changela_30_r) AM_RANGE(0xd031, 0xd031) AM_READ(changela_31_r) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) /* RAM2 (Processor RAM) */ + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) /* RAM2 (Processor RAM) */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* Processor ROM */ - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) /* OBJ0 RAM (A10 = GND )*/ - AM_RANGE(0x9000, 0x97ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) /* OBJ1 RAM */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* Processor ROM */ + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) /* OBJ0 RAM (A10 = GND )*/ + AM_RANGE(0x9000, 0x97ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) /* OBJ1 RAM */ AM_RANGE(0xa000, 0xa07f) AM_WRITE(changela_colors_w) AM_BASE(&colorram) /* Color 93419 RAM 64x9(nine!!!) bits A0-used as the 8-th bit data input (d0-d7->normal, a0->d8) */ - AM_RANGE(0xb000, 0xbfff) AM_WRITE(MWA8_ROM) /* Processor ROM */ + AM_RANGE(0xb000, 0xbfff) AM_WRITE(SMH_ROM) /* Processor ROM */ AM_RANGE(0xc000, 0xc7ff) AM_WRITE(changela_mem_device_w) /* River-Tree RAMs, slope ROM, tree ROM */ /* LS138 - U16 */ - AM_RANGE(0xc800, 0xc800) AM_WRITE(MWA8_NOP) /* not connected */ + AM_RANGE(0xc800, 0xc800) AM_WRITE(SMH_NOP) /* not connected */ AM_RANGE(0xc900, 0xc900) AM_WRITE(changela_mem_device_select_w) /* selects the memory device to be accessible at 0xc000-0xc7ff */ AM_RANGE(0xca00, 0xca00) AM_WRITE(changela_slope_rom_addr_hi_w) AM_RANGE(0xcb00, 0xcb00) AM_WRITE(changela_slope_rom_addr_lo_w) @@ -306,14 +306,14 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) /* LS259 - U44 */ AM_RANGE(0xd020, 0xd020) AM_WRITE(changela_collision_reset_0) AM_RANGE(0xd021, 0xd022) AM_WRITE(changela_coin_counter_w) -//AM_RANGE(0xd023, 0xd023) AM_WRITE(MWA8_NOP) +//AM_RANGE(0xd023, 0xd023) AM_WRITE(SMH_NOP) AM_RANGE(0xd024, 0xd024) AM_WRITE(mcu_PC0_w) AM_RANGE(0xd025, 0xd025) AM_WRITE(changela_collision_reset_1) - AM_RANGE(0xd026, 0xd026) AM_WRITE(MWA8_NOP) + AM_RANGE(0xd026, 0xd026) AM_WRITE(SMH_NOP) AM_RANGE(0xd030, 0xd030) AM_WRITE(mcu_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(watchdog_reset_w) /* Watchdog */ - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) /* Processor RAM */ + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) /* Processor RAM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c index 4813459617e..e5d95831eb7 100644 --- a/src/mame/drivers/cheekyms.c +++ b/src/mame/drivers/cheekyms.c @@ -40,7 +40,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r) AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r) - AM_RANGE(0x20, 0x3f) AM_WRITE(MWA8_RAM) AM_BASE(&cheekyms_spriteram) + AM_RANGE(0x20, 0x3f) AM_WRITE(SMH_RAM) AM_BASE(&cheekyms_spriteram) AM_RANGE(0x40, 0x40) AM_WRITE(cheekyms_port_40_w) AM_RANGE(0x80, 0x80) AM_WRITE(cheekyms_port_80_w) AM_BASE(&cheekyms_port_80) ADDRESS_MAP_END diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index 8d3564fccc3..da62cd83e10 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -264,18 +264,18 @@ static void saiyugb1_m5205_irq_w(int num) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE(1) - AM_RANGE(0x2000, 0x27ff) AM_READWRITE(MRA8_RAM, ddragon_fgvideoram_w) AM_BASE(&ddragon_fgvideoram) - AM_RANGE(0x2800, 0x2fff) AM_READWRITE(MRA8_RAM, ddragon_bgvideoram_w) AM_BASE(&ddragon_bgvideoram) + AM_RANGE(0x2000, 0x27ff) AM_READWRITE(SMH_RAM, ddragon_fgvideoram_w) AM_BASE(&ddragon_fgvideoram) + AM_RANGE(0x2800, 0x2fff) AM_READWRITE(SMH_RAM, ddragon_bgvideoram_w) AM_BASE(&ddragon_bgvideoram) AM_RANGE(0x3000, 0x317f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) AM_RANGE(0x3400, 0x357f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) - AM_RANGE(0x3800, 0x397f) AM_WRITE(MWA8_BANK3) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3800, 0x397f) AM_WRITE(SMH_BANK3) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3e00, 0x3e00) AM_WRITE(chinagat_cpu_sound_cmd_w) -// AM_RANGE(0x3e01, 0x3e01) AM_WRITE(MWA8_NOP) -// AM_RANGE(0x3e02, 0x3e02) AM_WRITE(MWA8_NOP) -// AM_RANGE(0x3e03, 0x3e03) AM_WRITE(MWA8_NOP) +// AM_RANGE(0x3e01, 0x3e01) AM_WRITE(SMH_NOP) +// AM_RANGE(0x3e02, 0x3e02) AM_WRITE(SMH_NOP) +// AM_RANGE(0x3e03, 0x3e03) AM_WRITE(SMH_NOP) AM_RANGE(0x3e04, 0x3e04) AM_WRITE(chinagat_sub_IRQ_w) - AM_RANGE(0x3e06, 0x3e06) AM_WRITE(MWA8_RAM) AM_BASE(&ddragon_scrolly_lo) - AM_RANGE(0x3e07, 0x3e07) AM_WRITE(MWA8_RAM) AM_BASE(&ddragon_scrollx_lo) + AM_RANGE(0x3e06, 0x3e06) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrolly_lo) + AM_RANGE(0x3e07, 0x3e07) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrollx_lo) AM_RANGE(0x3f00, 0x3f00) AM_WRITE(chinagat_video_ctrl_w) AM_RANGE(0x3f01, 0x3f01) AM_WRITE(chinagat_bankswitch_w) AM_RANGE(0x3f00, 0x3f00) AM_READ(input_port_0_r) @@ -290,9 +290,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE(1) AM_RANGE(0x2000, 0x2000) AM_WRITE(chinagat_sub_bankswitch_w) - AM_RANGE(0x2800, 0x2800) AM_WRITE(MWA8_RAM) /* Called on CPU start and after return from jump table */ -// AM_RANGE(0x2a2b, 0x2a2b) AM_READ(MRA8_NOP) /* What lives here? */ -// AM_RANGE(0x2a30, 0x2a30) AM_READ(MRA8_NOP) /* What lives here? */ + AM_RANGE(0x2800, 0x2800) AM_WRITE(SMH_RAM) /* Called on CPU start and after return from jump table */ +// AM_RANGE(0x2a2b, 0x2a2b) AM_READ(SMH_NOP) /* What lives here? */ +// AM_RANGE(0x2a30, 0x2a30) AM_READ(SMH_NOP) /* What lives here? */ AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(4) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -318,8 +318,8 @@ static ADDRESS_MAP_START( ym2203c_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) // AM_RANGE(0x8803, 0x8803) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x8804, 0x8804) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w) AM_RANGE(0x8805, 0x8805) AM_WRITE(YM2203_write_port_1_w) -// AM_RANGE(0x8804, 0x8804) AM_WRITE(MWA8_RAM) -// AM_RANGE(0x8805, 0x8805) AM_WRITE(MWA8_RAM) +// AM_RANGE(0x8804, 0x8804) AM_WRITE(SMH_RAM) +// AM_RANGE(0x8805, 0x8805) AM_WRITE(SMH_RAM) // AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w) // AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w) diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 5ebe78d372d..9f3a78bc20e 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -51,7 +51,7 @@ static WRITE8_HANDLER( chqflag_bankswitch_w ) /* bit 5 = memory bank select */ if (data & 0x20) { - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1800, 0x1fff, 0, 0, MRA8_BANK5, paletteram_xBBBBBGGGGGRRRRR_be_w); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1800, 0x1fff, 0, 0, SMH_BANK5, paletteram_xBBBBBGGGGGRRRRR_be_w); memory_set_bankptr(5, paletteram); if (K051316_readroms) @@ -61,8 +61,8 @@ static WRITE8_HANDLER( chqflag_bankswitch_w ) } else { - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1000, 0x17ff, 0, 0, MRA8_BANK1, MWA8_BANK1); /* RAM */ - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1800, 0x1fff, 0, 0, MRA8_BANK2, MWA8_BANK2); /* RAM */ + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1000, 0x17ff, 0, 0, SMH_BANK1, SMH_BANK1); /* RAM */ + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1800, 0x1fff, 0, 0, SMH_BANK2, SMH_BANK2); /* RAM */ } /* other bits unknown/unused */ @@ -143,12 +143,12 @@ static WRITE8_HANDLER( chqflag_sh_irqtrigger_w ) /****************************************************************************/ static ADDRESS_MAP_START( chqflag_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) /* RAM */ - AM_RANGE(0x1000, 0x17ff) AM_READ(MRA8_BANK1) /* banked RAM (RAM/051316 (chip 1)) */ - AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_BANK2) /* palette + RAM */ + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) /* RAM */ + AM_RANGE(0x1000, 0x17ff) AM_READ(SMH_BANK1) /* banked RAM (RAM/051316 (chip 1)) */ + AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_BANK2) /* palette + RAM */ AM_RANGE(0x2000, 0x2007) AM_READ(K051937_r) /* Sprite control registers */ AM_RANGE(0x2400, 0x27ff) AM_READ(K051960_r) /* Sprite RAM */ - AM_RANGE(0x2800, 0x2fff) AM_READ(MRA8_BANK3) /* 051316 zoom/rotation (chip 2) */ + AM_RANGE(0x2800, 0x2fff) AM_READ(SMH_BANK3) /* 051316 zoom/rotation (chip 2) */ AM_RANGE(0x3100, 0x3100) AM_READ(input_port_0_r) /* DIPSW #1 */ AM_RANGE(0x3200, 0x3200) AM_READ(input_port_3_r) /* COINSW, STARTSW, test mode */ AM_RANGE(0x3201, 0x3201) AM_READ(input_port_2_r) /* DIPSW #3, SW 4 */ @@ -156,14 +156,14 @@ static ADDRESS_MAP_START( chqflag_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3400, 0x341f) AM_READ(K051733_r) /* 051733 (protection) */ AM_RANGE(0x3701, 0x3701) AM_READ(input_port_4_r) /* Brake + Shift + ? */ AM_RANGE(0x3702, 0x3702) AM_READ(analog_read_r) /* accelerator/wheel */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK4) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK4) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( chqflag_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) /* RAM */ - AM_RANGE(0x1000, 0x17ff) AM_WRITE(MWA8_BANK1) /* banked RAM (RAM/051316 (chip 1)) */ - AM_RANGE(0x1800, 0x1fff) AM_WRITE(MWA8_BANK2) /* palette + RAM */ + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) /* RAM */ + AM_RANGE(0x1000, 0x17ff) AM_WRITE(SMH_BANK1) /* banked RAM (RAM/051316 (chip 1)) */ + AM_RANGE(0x1800, 0x1fff) AM_WRITE(SMH_BANK2) /* palette + RAM */ AM_RANGE(0x2000, 0x2007) AM_WRITE(K051937_w) /* Sprite control registers */ AM_RANGE(0x2400, 0x27ff) AM_WRITE(K051960_w) /* Sprite RAM */ AM_RANGE(0x2800, 0x2fff) AM_WRITE(K051316_1_w) /* 051316 zoom/rotation (chip 2) */ @@ -177,18 +177,18 @@ static ADDRESS_MAP_START( chqflag_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3600, 0x360f) AM_WRITE(K051316_ctrl_1_w) /* 051316 control registers (chip 2) */ AM_RANGE(0x3700, 0x3700) AM_WRITE(select_analog_ctrl_w) /* select accelerator/wheel */ AM_RANGE(0x3702, 0x3702) AM_WRITE(select_analog_ctrl_w) /* select accelerator/wheel (mirror?) */ - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( chqflag_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0xa000, 0xa00d) AM_READ(K007232_read_port_0_r) /* 007232 (chip 1) */ AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_1_r) /* 007232 (chip 2) */ AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) /* YM2151 */ AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) /* soundlatch_r */ - //AM_RANGE(0xe000, 0xe000) AM_READ(MRA8_NOP) /* ??? */ + //AM_RANGE(0xe000, 0xe000) AM_READ(SMH_NOP) /* ??? */ ADDRESS_MAP_END static WRITE8_HANDLER( k007232_bankswitch_w ) @@ -207,8 +207,8 @@ static WRITE8_HANDLER( k007232_bankswitch_w ) } static ADDRESS_MAP_START( chqflag_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x9000, 0x9000) AM_WRITE(k007232_bankswitch_w) /* 007232 bankswitch */ AM_RANGE(0xa000, 0xa00d) AM_WRITE(K007232_write_port_0_w) /* 007232 (chip 1) */ AM_RANGE(0xa01c, 0xa01c) AM_WRITE(k007232_extvolume_w)/* extra volume, goes to the 007232 w/ A11 */ @@ -216,7 +216,7 @@ static ADDRESS_MAP_START( chqflag_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_1_w) /* 007232 (chip 2) */ AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) /* YM2151 */ AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) /* YM2151 */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ??? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ??? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c index 01b725f8087..339e30159d1 100644 --- a/src/mame/drivers/circus.c +++ b/src/mame/drivers/circus.c @@ -52,25 +52,25 @@ static READ8_HANDLER( ripcord_IN2_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0x8000) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0x8000) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_1_r) /* DSW */ AM_RANGE(0xd000, 0xd000) AM_READ(input_port_2_r) //AT //AM_RANGE(0xd000, 0xd000) AM_READ(ripcord_IN2_r) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x2000, 0x2000) AM_WRITE(circus_clown_x_w) AM_RANGE(0x3000, 0x3000) AM_WRITE(circus_clown_y_w) AM_RANGE(0x4000, 0x43ff) AM_WRITE(circus_videoram_w) AM_BASE(&videoram) AM_RANGE(0x8000, 0x8000) AM_WRITE(circus_clown_z_w) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c index 139c6139fa3..382283eaa35 100644 --- a/src/mame/drivers/circusc.c +++ b/src/mame/drivers/circusc.c @@ -130,13 +130,13 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1003, 0x1003) AM_MIRROR(0x03fc) AM_READNOP /* unpopulated DIPSW 3*/ AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x03ff) AM_READ(input_port_3_r) /* DIPSW 1 */ AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x03ff) AM_READ(input_port_4_r) /* DIPSW 2 */ - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x33ff) AM_READ(MRA8_RAM) /* colorram */ - AM_RANGE(0x3400, 0x37ff) AM_READ(MRA8_RAM) /* videoram */ - AM_RANGE(0x3800, 0x38ff) AM_READ(MRA8_RAM) /* spriteram2 */ - AM_RANGE(0x3900, 0x39ff) AM_READ(MRA8_RAM) /* spriteram */ - AM_RANGE(0x3a00, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x33ff) AM_READ(SMH_RAM) /* colorram */ + AM_RANGE(0x3400, 0x37ff) AM_READ(SMH_RAM) /* videoram */ + AM_RANGE(0x3800, 0x38ff) AM_READ(SMH_RAM) /* spriteram2 */ + AM_RANGE(0x3900, 0x39ff) AM_READ(SMH_RAM) /* spriteram */ + AM_RANGE(0x3a00, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -144,30 +144,30 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0001, 0x0001) AM_MIRROR(0x03f8) AM_WRITE(interrupt_enable_w) /* INTST */ // AM_RANGE(0x0002, 0x0002) AM_MIRROR(0x03f8) AM_WRITENOP /* MUT - not used /* AM_RANGE(0x0003, 0x0004) AM_MIRROR(0x03f8) AM_WRITE(circusc_coin_counter_w) /* COIN1, COIN2 */ - AM_RANGE(0x0005, 0x0005) AM_MIRROR(0x03f8) AM_WRITE(MWA8_RAM) AM_BASE(&circusc_spritebank) /* OBJ CHENG */ + AM_RANGE(0x0005, 0x0005) AM_MIRROR(0x03f8) AM_WRITE(SMH_RAM) AM_BASE(&circusc_spritebank) /* OBJ CHENG */ AM_RANGE(0x0400, 0x0400) AM_MIRROR(0x03ff) AM_WRITE(watchdog_reset_w) /* WDOG */ AM_RANGE(0x0800, 0x0800) AM_MIRROR(0x03ff) AM_WRITE(soundlatch_w) /* SOUND DATA */ AM_RANGE(0x0c00, 0x0c00) AM_MIRROR(0x03ff) AM_WRITE(circusc_sh_irqtrigger_w) /* SOUND-ON causes interrupt on audio CPU */ - AM_RANGE(0x1c00, 0x1c00) AM_MIRROR(0x03ff) AM_WRITE(MWA8_RAM) AM_BASE(&circusc_scroll) /* VGAP */ - AM_RANGE(0x2000, 0x2fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x1c00, 0x1c00) AM_MIRROR(0x03ff) AM_WRITE(SMH_RAM) AM_BASE(&circusc_scroll) /* VGAP */ + AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_RAM) AM_RANGE(0x3000, 0x33ff) AM_WRITE(circusc_colorram_w) AM_BASE(&circusc_colorram) AM_RANGE(0x3400, 0x37ff) AM_WRITE(circusc_videoram_w) AM_BASE(&circusc_videoram) - AM_RANGE(0x3800, 0x38ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x3900, 0x39ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x3a00, 0x3fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x3800, 0x38ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x3900, 0x39ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3a00, 0x3fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x1c00) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x1c00) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_READ(soundlatch_r) /* CS0 */ AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x1fff) AM_READ(circusc_sh_timer_r) /* CS1 */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x1c00) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x1c00) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa07f) AM_MIRROR(0x1f80) AM_WRITE(circusc_sound_w) /* CS2 - CS6 */ ADDRESS_MAP_END diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c index ee816a3a1ab..9f3bcedcdd9 100644 --- a/src/mame/drivers/cischeat.c +++ b/src/mame/drivers/cischeat.c @@ -246,29 +246,29 @@ static WRITE16_HANDLER( bigrun_paletteram16_w ) } static ADDRESS_MAP_START( bigrun_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x13ffff) AM_READ(rom_1_r ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x080000, 0x083fff) AM_READ(bigrun_vregs_r ) // Vregs - AM_RANGE(0x084000, 0x087fff) AM_READ(MRA16_RAM ) // Linking with other units + AM_RANGE(0x084000, 0x087fff) AM_READ(SMH_RAM ) // Linking with other units /* this is the right order of sharedram's */ AM_RANGE(0x088000, 0x08bfff) AM_READ(sharedram2_r ) // Sharedram with sub CPU#2 AM_RANGE(0x08c000, 0x08ffff) AM_READ(sharedram1_r ) // Sharedram with sub CPU#1 - AM_RANGE(0x090000, 0x093fff) AM_READ(MRA16_RAM ) // Scroll ram 0 - AM_RANGE(0x094000, 0x097fff) AM_READ(MRA16_RAM ) // Scroll ram 1 - AM_RANGE(0x098000, 0x09bfff) AM_READ(MRA16_RAM ) // Scroll ram 2 + AM_RANGE(0x090000, 0x093fff) AM_READ(SMH_RAM ) // Scroll ram 0 + AM_RANGE(0x094000, 0x097fff) AM_READ(SMH_RAM ) // Scroll ram 1 + AM_RANGE(0x098000, 0x09bfff) AM_READ(SMH_RAM ) // Scroll ram 2 - AM_RANGE(0x09c000, 0x09ffff) AM_READ(MRA16_RAM ) // Palettes + AM_RANGE(0x09c000, 0x09ffff) AM_READ(SMH_RAM ) // Palettes ADDRESS_MAP_END static ADDRESS_MAP_START( bigrun_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x13ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_ram ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x13ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_ram ) // RAM AM_RANGE(0x080000, 0x083fff) AM_WRITE(bigrun_vregs_w) AM_BASE(&megasys1_vregs ) // Vregs - AM_RANGE(0x084000, 0x087fff) AM_WRITE(MWA16_RAM ) // Linking with other units + AM_RANGE(0x084000, 0x087fff) AM_WRITE(SMH_RAM ) // Linking with other units AM_RANGE(0x088000, 0x08bfff) AM_WRITE(sharedram2_w) AM_BASE(&sharedram2 ) // Sharedram with sub CPU#2 AM_RANGE(0x08c000, 0x08ffff) AM_WRITE(sharedram1_w) AM_BASE(&sharedram1 ) // Sharedram with sub CPU#1 @@ -318,11 +318,11 @@ static WRITE16_HANDLER( cischeat_paletteram16_w ) } static ADDRESS_MAP_START( cischeat_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x17ffff) AM_READ(rom_1_r ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x080000, 0x087fff) AM_READ(cischeat_vregs_r ) // Vregs - AM_RANGE(0x088000, 0x088fff) AM_READ(MRA16_RAM ) // Linking with other units + AM_RANGE(0x088000, 0x088fff) AM_READ(SMH_RAM ) // Linking with other units /* Only the first 0x800 bytes are tested but: CPU #0 PC 0000278c: warning - write 68c0 to unmapped memory address 0009c7fe @@ -333,19 +333,19 @@ static ADDRESS_MAP_START( cischeat_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x090000, 0x097fff) AM_READ(sharedram2_r ) // Sharedram with sub CPU#2 AM_RANGE(0x098000, 0x09ffff) AM_READ(sharedram1_r ) // Sharedram with sub CPU#1 - AM_RANGE(0x0a0000, 0x0a7fff) AM_READ(MRA16_RAM ) // Scroll ram 0 - AM_RANGE(0x0a8000, 0x0affff) AM_READ(MRA16_RAM ) // Scroll ram 1 - AM_RANGE(0x0b0000, 0x0b7fff) AM_READ(MRA16_RAM ) // Scroll ram 2 + AM_RANGE(0x0a0000, 0x0a7fff) AM_READ(SMH_RAM ) // Scroll ram 0 + AM_RANGE(0x0a8000, 0x0affff) AM_READ(SMH_RAM ) // Scroll ram 1 + AM_RANGE(0x0b0000, 0x0b7fff) AM_READ(SMH_RAM ) // Scroll ram 2 - AM_RANGE(0x0b8000, 0x0bffff) AM_READ(MRA16_RAM ) // Palettes + AM_RANGE(0x0b8000, 0x0bffff) AM_READ(SMH_RAM ) // Palettes ADDRESS_MAP_END static ADDRESS_MAP_START( cischeat_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x17ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_ram ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x17ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_ram ) // RAM AM_RANGE(0x080000, 0x087fff) AM_WRITE(cischeat_vregs_w) AM_BASE(&megasys1_vregs ) // Vregs - AM_RANGE(0x088000, 0x088fff) AM_WRITE(MWA16_RAM ) // Linking with other units + AM_RANGE(0x088000, 0x088fff) AM_WRITE(SMH_RAM ) // Linking with other units AM_RANGE(0x090000, 0x097fff) AM_WRITE(sharedram2_w) AM_BASE(&sharedram2 ) // Sharedram with sub CPU#2 AM_RANGE(0x098000, 0x09ffff) AM_WRITE(sharedram1_w) AM_BASE(&sharedram1 ) // Sharedram with sub CPU#1 @@ -394,28 +394,28 @@ static WRITE16_HANDLER( f1gpstar_paletteram16_w ) 0F8000-0F9000 */ static ADDRESS_MAP_START( f1gpstar_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x17ffff) AM_READ(rom_1_r ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x080000, 0x087fff) AM_READ(f1gpstar_vregs_r ) // Vregs - AM_RANGE(0x088000, 0x088fff) AM_READ(MRA16_RAM ) // Linking with other units + AM_RANGE(0x088000, 0x088fff) AM_READ(SMH_RAM ) // Linking with other units AM_RANGE(0x090000, 0x097fff) AM_READ(sharedram2_r ) // Sharedram with sub CPU#2 AM_RANGE(0x098000, 0x09ffff) AM_READ(sharedram1_r ) // Sharedram with sub CPU#1 - AM_RANGE(0x0a0000, 0x0a7fff) AM_READ(MRA16_RAM ) // Scroll ram 0 - AM_RANGE(0x0a8000, 0x0affff) AM_READ(MRA16_RAM ) // Scroll ram 1 - AM_RANGE(0x0b0000, 0x0b7fff) AM_READ(MRA16_RAM ) // Scroll ram 2 + AM_RANGE(0x0a0000, 0x0a7fff) AM_READ(SMH_RAM ) // Scroll ram 0 + AM_RANGE(0x0a8000, 0x0affff) AM_READ(SMH_RAM ) // Scroll ram 1 + AM_RANGE(0x0b0000, 0x0b7fff) AM_READ(SMH_RAM ) // Scroll ram 2 - AM_RANGE(0x0b8000, 0x0bffff) AM_READ(MRA16_RAM ) // Palettes + AM_RANGE(0x0b8000, 0x0bffff) AM_READ(SMH_RAM ) // Palettes ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpstar_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) - AM_RANGE(0x100000, 0x17ffff) AM_WRITE(MWA16_ROM ) - AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_ram ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) + AM_RANGE(0x100000, 0x17ffff) AM_WRITE(SMH_ROM ) + AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_ram ) // RAM AM_RANGE(0x080000, 0x087fff) AM_WRITE(f1gpstar_vregs_w) AM_BASE(&megasys1_vregs ) // Vregs - AM_RANGE(0x088000, 0x088fff) AM_WRITE(MWA16_RAM ) // Linking with other units + AM_RANGE(0x088000, 0x088fff) AM_WRITE(SMH_RAM ) // Linking with other units AM_RANGE(0x090000, 0x097fff) AM_WRITE(sharedram2_w) AM_BASE(&sharedram2 ) // Sharedram with sub CPU#2 AM_RANGE(0x098000, 0x09ffff) AM_WRITE(sharedram1_w) AM_BASE(&sharedram1 ) // Sharedram with sub CPU#1 @@ -436,28 +436,28 @@ ADDRESS_MAP_END // Same as f1gpstar, but vregs are slightly different: static ADDRESS_MAP_START( f1gpstr2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x17ffff) AM_READ(rom_1_r ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x080000, 0x087fff) AM_READ(f1gpstr2_vregs_r ) // Vregs (slightly different from f1gpstar) - AM_RANGE(0x088000, 0x088fff) AM_READ(MRA16_RAM ) // Linking with other units + AM_RANGE(0x088000, 0x088fff) AM_READ(SMH_RAM ) // Linking with other units AM_RANGE(0x090000, 0x097fff) AM_READ(sharedram2_r ) // Sharedram with sub CPU#2 AM_RANGE(0x098000, 0x09ffff) AM_READ(sharedram1_r ) // Sharedram with sub CPU#1 - AM_RANGE(0x0a0000, 0x0a7fff) AM_READ(MRA16_RAM ) // Scroll ram 0 - AM_RANGE(0x0a8000, 0x0affff) AM_READ(MRA16_RAM ) // Scroll ram 1 - AM_RANGE(0x0b0000, 0x0b7fff) AM_READ(MRA16_RAM ) // Scroll ram 2 + AM_RANGE(0x0a0000, 0x0a7fff) AM_READ(SMH_RAM ) // Scroll ram 0 + AM_RANGE(0x0a8000, 0x0affff) AM_READ(SMH_RAM ) // Scroll ram 1 + AM_RANGE(0x0b0000, 0x0b7fff) AM_READ(SMH_RAM ) // Scroll ram 2 - AM_RANGE(0x0b8000, 0x0bffff) AM_READ(MRA16_RAM ) // Palettes + AM_RANGE(0x0b8000, 0x0bffff) AM_READ(SMH_RAM ) // Palettes ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpstr2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) - AM_RANGE(0x100000, 0x17ffff) AM_WRITE(MWA16_ROM ) - AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_ram ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) + AM_RANGE(0x100000, 0x17ffff) AM_WRITE(SMH_ROM ) + AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_ram ) // RAM AM_RANGE(0x080000, 0x087fff) AM_WRITE(f1gpstr2_vregs_w) AM_BASE(&megasys1_vregs ) // Vregs (slightly different from f1gpstar) - AM_RANGE(0x088000, 0x088fff) AM_WRITE(MWA16_RAM ) // Linking with other units + AM_RANGE(0x088000, 0x088fff) AM_WRITE(SMH_RAM ) // Linking with other units AM_RANGE(0x090000, 0x097fff) AM_WRITE(sharedram2_w) AM_BASE(&sharedram2 ) // Sharedram with sub CPU#2 AM_RANGE(0x098000, 0x09ffff) AM_WRITE(sharedram1_w) AM_BASE(&sharedram1 ) // Sharedram with sub CPU#1 @@ -576,12 +576,12 @@ static WRITE16_HANDLER( scudhamm_oki_bank_w ) } static ADDRESS_MAP_START( readmem_scudhamm, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_READ(MRA16_RAM ) // Work RAM + Spriteram - AM_RANGE(0x082000, 0x082fff) AM_READ(MRA16_RAM ) // Video Registers + RAM - AM_RANGE(0x0a0000, 0x0a3fff) AM_READ(MRA16_RAM ) // Scroll RAM 0 - AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(MRA16_RAM ) // Scroll RAM 2 - AM_RANGE(0x0b8000, 0x0bffff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM ) // Work RAM + Spriteram + AM_RANGE(0x082000, 0x082fff) AM_READ(SMH_RAM ) // Video Registers + RAM + AM_RANGE(0x0a0000, 0x0a3fff) AM_READ(SMH_RAM ) // Scroll RAM 0 + AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(SMH_RAM ) // Scroll RAM 2 + AM_RANGE(0x0b8000, 0x0bffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x100008, 0x100009) AM_READ(input_port_0_word_r ) // Buttons AM_RANGE(0x100014, 0x100015) AM_READ(OKIM6295_status_0_lsb_r ) // Sound AM_RANGE(0x100018, 0x100019) AM_READ(OKIM6295_status_1_lsb_r ) // @@ -592,8 +592,8 @@ static ADDRESS_MAP_START( readmem_scudhamm, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_scudhamm, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(MWA16_RAM) AM_BASE( &megasys1_ram ) // Work RAM + Spriteram + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM) AM_BASE( &megasys1_ram ) // Work RAM + Spriteram AM_RANGE(0x082000, 0x082fff) AM_WRITE(scudhamm_vregs_w) AM_BASE( &megasys1_vregs ) // Video Registers + RAM AM_RANGE(0x0a0000, 0x0a3fff) AM_WRITE(megasys1_scrollram_0_w) AM_BASE( &megasys1_scrollram[0] ) // Scroll RAM 0 AM_RANGE(0x0b0000, 0x0b3fff) AM_WRITE(megasys1_scrollram_2_w) AM_BASE( &megasys1_scrollram[2] ) // Scroll RAM 2 @@ -603,7 +603,7 @@ static ADDRESS_MAP_START( writemem_scudhamm, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100014, 0x100015) AM_WRITE(OKIM6295_data_0_lsb_w ) // Sound AM_RANGE(0x100018, 0x100019) AM_WRITE(OKIM6295_data_1_lsb_w ) // AM_RANGE(0x10001c, 0x10001d) AM_WRITE(scudhamm_enable_w ) // ? - AM_RANGE(0x100040, 0x100041) AM_WRITE(MWA16_NOP ) // ? 0 written before reading + AM_RANGE(0x100040, 0x100041) AM_WRITE(SMH_NOP ) // ? 0 written before reading AM_RANGE(0x100050, 0x100051) AM_WRITE(scudhamm_motor_command_w ) // Move Motor ADDRESS_MAP_END @@ -672,12 +672,12 @@ static WRITE16_HANDLER( armchmp2_leds_w ) } static ADDRESS_MAP_START( readmem_armchmp2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_READ(MRA16_RAM ) // Work RAM + Spriteram - AM_RANGE(0x082000, 0x082fff) AM_READ(MRA16_RAM ) // Video Registers + RAM - AM_RANGE(0x0a0000, 0x0a3fff) AM_READ(MRA16_RAM ) // Scroll RAM 0 - AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(MRA16_RAM ) // Scroll RAM 2 - AM_RANGE(0x0b8000, 0x0bffff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM ) // Work RAM + Spriteram + AM_RANGE(0x082000, 0x082fff) AM_READ(SMH_RAM ) // Video Registers + RAM + AM_RANGE(0x0a0000, 0x0a3fff) AM_READ(SMH_RAM ) // Scroll RAM 0 + AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(SMH_RAM ) // Scroll RAM 2 + AM_RANGE(0x0b8000, 0x0bffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x100000, 0x100001) AM_READ(input_port_2_word_r ) // DSW AM_RANGE(0x100004, 0x100005) AM_READ(input_port_3_word_r ) // DSW AM_RANGE(0x100008, 0x100009) AM_READ(armchmp2_buttons_r ) // Buttons + Sensors @@ -688,15 +688,15 @@ static ADDRESS_MAP_START( readmem_armchmp2, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_armchmp2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(MWA16_RAM) AM_BASE( &megasys1_ram ) // Work RAM + Spriteram + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM) AM_BASE( &megasys1_ram ) // Work RAM + Spriteram AM_RANGE(0x082000, 0x082fff) AM_WRITE(scudhamm_vregs_w) AM_BASE( &megasys1_vregs ) // Video Registers + RAM AM_RANGE(0x0a0000, 0x0a3fff) AM_WRITE(megasys1_scrollram_0_w) AM_BASE( &megasys1_scrollram[0] ) // Scroll RAM 0 AM_RANGE(0x0b0000, 0x0b3fff) AM_WRITE(megasys1_scrollram_2_w) AM_BASE( &megasys1_scrollram[2] ) // Scroll RAM 2 AM_RANGE(0x0b8000, 0x0bffff) AM_WRITE(scudhamm_paletteram16_w) AM_BASE( &paletteram16 ) // Palette AM_RANGE(0x100000, 0x100001) AM_WRITE(scudhamm_oki_bank_w ) // Sound AM_RANGE(0x100008, 0x100009) AM_WRITE(armchmp2_leds_w ) // Leds + Coin Counters - AM_RANGE(0x10000c, 0x10000d) AM_WRITE(MWA16_NOP ) // ? + AM_RANGE(0x10000c, 0x10000d) AM_WRITE(SMH_NOP ) // ? AM_RANGE(0x100010, 0x100011) AM_WRITE(armchmp2_motor_command_w ) // Move Motor AM_RANGE(0x100014, 0x100015) AM_WRITE(OKIM6295_data_0_lsb_w ) // Sound AM_RANGE(0x100018, 0x100019) AM_WRITE(OKIM6295_data_1_lsb_w ) // @@ -716,31 +716,31 @@ ADDRESS_MAP_END **************************************************************************/ static ADDRESS_MAP_START( bigrun_readmem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x040000, 0x047fff) AM_READ(sharedram1_r ) // Shared RAM (with Main CPU) - AM_RANGE(0x080000, 0x0807ff) AM_READ(MRA16_RAM ) // Road RAM + AM_RANGE(0x080000, 0x0807ff) AM_READ(SMH_RAM ) // Road RAM ADDRESS_MAP_END static ADDRESS_MAP_START( bigrun_writemem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(SMH_RAM ) // RAM /* 800 bytes tested: */ AM_RANGE(0x040000, 0x047fff) AM_WRITE(sharedram1_w ) // Shared RAM (with Main CPU) - AM_RANGE(0x080000, 0x0807ff) AM_WRITE(MWA16_RAM) AM_BASE(&cischeat_roadram[0] ) // Road RAM + AM_RANGE(0x080000, 0x0807ff) AM_WRITE(SMH_RAM) AM_BASE(&cischeat_roadram[0] ) // Road RAM ADDRESS_MAP_END static ADDRESS_MAP_START( bigrun_readmem3, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x040000, 0x047fff) AM_READ(sharedram2_r ) // Shared RAM (with Main CPU) - AM_RANGE(0x080000, 0x0807ff) AM_READ(MRA16_RAM ) // Road RAM + AM_RANGE(0x080000, 0x0807ff) AM_READ(SMH_RAM ) // Road RAM ADDRESS_MAP_END static ADDRESS_MAP_START( bigrun_writemem3, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x040000, 0x047fff) AM_WRITE(sharedram2_w ) // Shared RAM (with Main CPU) - AM_RANGE(0x080000, 0x0807ff) AM_WRITE(MWA16_RAM) AM_BASE(&cischeat_roadram[1] ) // Road RAM + AM_RANGE(0x080000, 0x0807ff) AM_WRITE(SMH_RAM) AM_BASE(&cischeat_roadram[1] ) // Road RAM ADDRESS_MAP_END @@ -749,35 +749,35 @@ ADDRESS_MAP_END **************************************************************************/ static ADDRESS_MAP_START( cischeat_readmem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x23ffff) AM_READ(rom_2_r ) // ROM - AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x040000, 0x047fff) AM_READ(sharedram1_r ) // Shared RAM (with Main CPU) - AM_RANGE(0x080000, 0x0807ff) AM_READ(MRA16_RAM ) // Road RAM + AM_RANGE(0x080000, 0x0807ff) AM_READ(SMH_RAM ) // Road RAM ADDRESS_MAP_END static ADDRESS_MAP_START( cischeat_writemem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x23ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x23ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x040000, 0x047fff) AM_WRITE(sharedram1_w ) // Shared RAM (with Main CPU) - AM_RANGE(0x080000, 0x0807ff) AM_WRITE(MWA16_RAM) AM_BASE(&cischeat_roadram[0] ) // Road RAM - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA16_NOP ) // watchdog + AM_RANGE(0x080000, 0x0807ff) AM_WRITE(SMH_RAM) AM_BASE(&cischeat_roadram[0] ) // Road RAM + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP ) // watchdog ADDRESS_MAP_END static ADDRESS_MAP_START( cischeat_readmem3, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x23ffff) AM_READ(rom_3_r ) // ROM - AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x040000, 0x047fff) AM_READ(sharedram2_r ) // Shared RAM (with Main CPU) - AM_RANGE(0x080000, 0x0807ff) AM_READ(MRA16_RAM ) // Road RAM + AM_RANGE(0x080000, 0x0807ff) AM_READ(SMH_RAM ) // Road RAM ADDRESS_MAP_END static ADDRESS_MAP_START( cischeat_writemem3, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x23ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x23ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x040000, 0x047fff) AM_WRITE(sharedram2_w ) // Shared RAM (with Main CPU) - AM_RANGE(0x080000, 0x0807ff) AM_WRITE(MWA16_RAM) AM_BASE(&cischeat_roadram[1] ) // Road RAM - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA16_NOP ) // watchdog + AM_RANGE(0x080000, 0x0807ff) AM_WRITE(SMH_RAM) AM_BASE(&cischeat_roadram[1] ) // Road RAM + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP ) // watchdog ADDRESS_MAP_END @@ -787,31 +787,31 @@ ADDRESS_MAP_END **************************************************************************/ static ADDRESS_MAP_START( f1gpstar_readmem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x180000, 0x183fff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x180000, 0x183fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x080000, 0x0807ff) AM_READ(sharedram1_r ) // Shared RAM (with Main CPU) - AM_RANGE(0x100000, 0x1007ff) AM_READ(MRA16_RAM ) // Road RAM + AM_RANGE(0x100000, 0x1007ff) AM_READ(SMH_RAM ) // Road RAM ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpstar_writemem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x180000, 0x183fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x180000, 0x183fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x080000, 0x0807ff) AM_WRITE(sharedram1_w ) // Shared RAM (with Main CPU) - AM_RANGE(0x100000, 0x1007ff) AM_WRITE(MWA16_RAM) AM_BASE(&cischeat_roadram[0] ) // Road RAM - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP ) // watchdog + AM_RANGE(0x100000, 0x1007ff) AM_WRITE(SMH_RAM) AM_BASE(&cischeat_roadram[0] ) // Road RAM + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // watchdog ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpstar_readmem3, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x180000, 0x183fff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x180000, 0x183fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x080000, 0x0807ff) AM_READ(sharedram2_r ) // Shared RAM (with Main CPU) - AM_RANGE(0x100000, 0x1007ff) AM_READ(MRA16_RAM ) // Road RAM + AM_RANGE(0x100000, 0x1007ff) AM_READ(SMH_RAM ) // Road RAM ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpstar_writemem3, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x180000, 0x183fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x180000, 0x183fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x080000, 0x0807ff) AM_WRITE(sharedram2_w ) // Shared RAM (with Main CPU) - AM_RANGE(0x100000, 0x1007ff) AM_WRITE(MWA16_RAM) AM_BASE(&cischeat_roadram[1] ) // Road RAM - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP ) // watchdog + AM_RANGE(0x100000, 0x1007ff) AM_WRITE(SMH_RAM) AM_BASE(&cischeat_roadram[1] ) // Road RAM + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // watchdog ADDRESS_MAP_END @@ -840,8 +840,8 @@ static WRITE16_HANDLER( bigrun_soundbank_w ) } static ADDRESS_MAP_START( bigrun_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x040000, 0x040001) AM_READ(soundlatch_word_r ) // From Main CPU AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r ) AM_RANGE(0x0a0000, 0x0a0001) AM_READ(OKIM6295_status_0_lsb_r ) @@ -849,8 +849,8 @@ static ADDRESS_MAP_START( bigrun_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bigrun_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x040000, 0x040001) AM_WRITE(bigrun_soundbank_w ) // Sample Banking AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w ) // To Main CPU AM_RANGE(0x080000, 0x080001) AM_WRITE(YM2151_register_port_0_lsb_w ) @@ -874,8 +874,8 @@ static WRITE16_HANDLER( cischeat_soundbank_1_w ) } static ADDRESS_MAP_START( cischeat_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x060004, 0x060005) AM_READ(soundlatch_word_r ) // From Main CPU AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r ) AM_RANGE(0x0a0000, 0x0a0001) AM_READ(OKIM6295_status_0_lsb_r ) @@ -883,8 +883,8 @@ static ADDRESS_MAP_START( cischeat_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cischeat_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x040002, 0x040003) AM_WRITE(cischeat_soundbank_0_w ) // Sample Banking AM_RANGE(0x040004, 0x040005) AM_WRITE(cischeat_soundbank_1_w ) // Sample Banking AM_RANGE(0x060002, 0x060003) AM_WRITE(soundlatch2_word_w ) // To Main CPU @@ -900,8 +900,8 @@ ADDRESS_MAP_END **************************************************************************/ static ADDRESS_MAP_START( f1gpstar_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x0e0000, 0x0fffff) AM_READ(MRA16_RAM ) // RAM (cischeat: f0000-fffff) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x0e0000, 0x0fffff) AM_READ(SMH_RAM ) // RAM (cischeat: f0000-fffff) AM_RANGE(0x060000, 0x060001) AM_READ(soundlatch_word_r ) // From Main CPU (cischeat: 60004) AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r ) AM_RANGE(0x0a0000, 0x0a0001) AM_READ(OKIM6295_status_0_lsb_r ) @@ -909,8 +909,8 @@ static ADDRESS_MAP_START( f1gpstar_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpstar_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0e0000, 0x0fffff) AM_WRITE(MWA16_RAM ) // RAM (cischeat: f0000-fffff) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0e0000, 0x0fffff) AM_WRITE(SMH_RAM ) // RAM (cischeat: f0000-fffff) AM_RANGE(0x040004, 0x040005) AM_WRITE(cischeat_soundbank_0_w ) // Sample Banking (cischeat: 40002) AM_RANGE(0x040008, 0x040009) AM_WRITE(cischeat_soundbank_1_w ) // Sample Banking (cischeat: 40004) AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w ) // To Main CPU (cischeat: 60002) @@ -926,8 +926,8 @@ ADDRESS_MAP_END **************************************************************************/ static ADDRESS_MAP_START( f1gpstr2_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x0e0000, 0x0fffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x0e0000, 0x0fffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x060004, 0x060005) AM_READ(soundlatch_word_r ) // From Main CPU (f1gpstar: 60000) AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r ) AM_RANGE(0x0a0000, 0x0a0001) AM_READ(OKIM6295_status_0_lsb_r ) @@ -935,11 +935,11 @@ static ADDRESS_MAP_START( f1gpstr2_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpstr2_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x0e0000, 0x0fffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x0e0000, 0x0fffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x040004, 0x040005) AM_WRITE(cischeat_soundbank_0_w ) // Sample Banking AM_RANGE(0x040008, 0x040009) AM_WRITE(cischeat_soundbank_1_w ) // Sample Banking - AM_RANGE(0x04000e, 0x04000f) AM_WRITE(MWA16_NOP ) // ? 0 (f1gpstar: no) + AM_RANGE(0x04000e, 0x04000f) AM_WRITE(SMH_NOP ) // ? 0 (f1gpstar: no) AM_RANGE(0x060002, 0x060003) AM_WRITE(soundlatch2_word_w ) // To Main CPU (f1gpstar: 60000) AM_RANGE(0x080000, 0x080001) AM_WRITE(YM2151_register_port_0_lsb_w ) AM_RANGE(0x080002, 0x080003) AM_WRITE(YM2151_data_port_0_lsb_w ) @@ -959,17 +959,17 @@ static READ16_HANDLER ( f1gpstr2_io_r ) { return megasys1_vregs[offset + 0x1000/ static WRITE16_HANDLER( f1gpstr2_io_w ) { COMBINE_DATA(&megasys1_vregs[offset + 0x1000/2]); } static ADDRESS_MAP_START( f1gpstr2_io_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x180000, 0x183fff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x180000, 0x183fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x080000, 0x080fff) AM_READ(f1gpstr2_io_r ) // ADDRESS_MAP_END static ADDRESS_MAP_START( f1gpstr2_io_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x180000, 0x183fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x180000, 0x183fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x080000, 0x080fff) AM_WRITE(f1gpstr2_io_w ) // - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA16_RAM) AM_BASE(&f1gpstr2_ioready ) // - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP ) // + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_RAM) AM_BASE(&f1gpstr2_ioready ) // + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // ADDRESS_MAP_END diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c index 1c1481a89d6..3aa2811786c 100644 --- a/src/mame/drivers/citycon.c +++ b/src/mame/drivers/citycon.c @@ -27,41 +27,41 @@ static READ8_HANDLER( citycon_in_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(citycon_in_r) /* player 1 & 2 inputs multiplexed */ AM_RANGE(0x3001, 0x3001) AM_READ(input_port_2_r) AM_RANGE(0x3002, 0x3002) AM_READ(input_port_3_r) AM_RANGE(0x3007, 0x3007) AM_READ(watchdog_reset_r) /* ? */ - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x1fff) AM_WRITE(citycon_videoram_w) AM_BASE(&citycon_videoram) AM_RANGE(0x2000, 0x20ff) AM_WRITE(citycon_linecolor_w) AM_BASE(&citycon_linecolor) - AM_RANGE(0x2800, 0x28ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x2800, 0x28ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3000, 0x3000) AM_WRITE(citycon_background_w) AM_RANGE(0x3001, 0x3001) AM_WRITE(soundlatch_w) AM_RANGE(0x3002, 0x3002) AM_WRITE(soundlatch2_w) - AM_RANGE(0x3004, 0x3005) AM_WRITE(MWA8_RAM) AM_BASE(&citycon_scroll) + AM_RANGE(0x3004, 0x3005) AM_WRITE(SMH_RAM) AM_BASE(&citycon_scroll) AM_RANGE(0x3800, 0x3cff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE(&paletteram) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) // AM_RANGE(0x4002, 0x4002) AM_READ(AY8910_read_port_0_r) /* ?? */ AM_RANGE(0x6001, 0x6001) AM_READ(YM2203_read_port_0_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x4001, 0x4001) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x6001, 0x6001) AM_WRITE(YM2203_write_port_0_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c index c89614c1dc3..6d6df472d67 100644 --- a/src/mame/drivers/clayshoo.c +++ b/src/mame/drivers/clayshoo.c @@ -201,7 +201,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x23ff) AM_RAM AM_RANGE(0x4000, 0x47ff) AM_ROM AM_RANGE(0x8000, 0x97ff) AM_RAM AM_BASE(&clayshoo_videoram) AM_SIZE(&clayshoo_videoram_size) /* 6k of video ram according to readme */ - AM_RANGE(0x9800, 0xa800) AM_WRITE(MWA8_NOP) /* not really mapped, but cleared */ + AM_RANGE(0x9800, 0xa800) AM_WRITE(SMH_NOP) /* not really mapped, but cleared */ AM_RANGE(0xc800, 0xc800) AM_READWRITE(analog_r, analog_reset_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c index b62873d2b1b..e75612a67cb 100644 --- a/src/mame/drivers/cloak.c +++ b/src/mame/drivers/cloak.c @@ -169,10 +169,10 @@ static WRITE8_HANDLER( cloak_nvram_enable_w ) static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x0400, 0x07ff) AM_READWRITE(MRA8_RAM, cloak_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x0400, 0x07ff) AM_READWRITE(SMH_RAM, cloak_videoram_w) AM_BASE(&videoram) AM_RANGE(0x0800, 0x0fff) AM_RAM AM_SHARE(1) AM_RANGE(0x1000, 0x100f) AM_READWRITE(pokey1_r, pokey1_w) /* DSW0 also */ -// AM_RANGE(0x1008, 0x1008) AM_READ(MRA8_RAM) +// AM_RANGE(0x1008, 0x1008) AM_READ(SMH_RAM) AM_RANGE(0x1800, 0x180f) AM_READWRITE(pokey2_r, pokey2_w) /* DSW1 also */ AM_RANGE(0x2000, 0x2000) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x2200, 0x2200) AM_READ(input_port_1_r) /* IN1 */ diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c index 4226d9c6590..7b56e229d8f 100644 --- a/src/mame/drivers/cloud9.c +++ b/src/mame/drivers/cloud9.c @@ -303,11 +303,11 @@ 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_READWRITE(MRA8_BANK1, cloud9_videoram_w) + AM_RANGE(0x0000, 0x4fff) AM_READWRITE(SMH_BANK1, cloud9_videoram_w) AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x5400, 0x547f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5480, 0x54ff) AM_WRITE(irq_ack_w) - AM_RANGE(0x5500, 0x557f) AM_READWRITE(MRA8_RAM, cloud9_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0x5500, 0x557f) AM_READWRITE(SMH_RAM, cloud9_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0x5580, 0x5587) AM_MIRROR(0x0078) AM_WRITE(cloud9_video_control_w) AM_RANGE(0x5600, 0x5601) AM_MIRROR(0x0078) AM_WRITE(cloud9_coin_counter_w) AM_RANGE(0x5602, 0x5603) AM_MIRROR(0x0078) AM_WRITE(cloud9_led_w) @@ -318,7 +318,7 @@ static ADDRESS_MAP_START( cloud9_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5900, 0x5903) AM_MIRROR(0x007c) AM_READ(leta_r) AM_RANGE(0x5a00, 0x5a0f) AM_MIRROR(0x00f0) AM_READWRITE(pokey1_r, pokey1_w) AM_RANGE(0x5b00, 0x5b0f) AM_MIRROR(0x00f0) AM_READWRITE(pokey2_r, pokey2_w) - AM_RANGE(0x5c00, 0x5cff) AM_MIRROR(0x0300) AM_READWRITE(nvram_r, MWA8_RAM) AM_BASE(&nvram_stage) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x5c00, 0x5cff) AM_MIRROR(0x0300) AM_READWRITE(nvram_r, SMH_RAM) AM_BASE(&nvram_stage) AM_SIZE(&generic_nvram_size) AM_RANGE(0x6000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c index a8d1ac227db..f42c8404618 100644 --- a/src/mame/drivers/clshroad.c +++ b/src/mame/drivers/clshroad.c @@ -64,39 +64,39 @@ static READ8_HANDLER( clshroad_input_r ) static ADDRESS_MAP_START( clshroad_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0x95ff) AM_READ(MRA8_RAM ) // Work RAM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0x95ff) AM_READ(SMH_RAM ) // Work RAM AM_RANGE(0x9600, 0x97ff) AM_READ(clshroad_sharedram_r ) // Shared RAM - AM_RANGE(0x9800, 0x9dff) AM_READ(MRA8_RAM ) // Work RAM - AM_RANGE(0x9e00, 0x9fff) AM_READ(MRA8_RAM ) // Sprite RAM + AM_RANGE(0x9800, 0x9dff) AM_READ(SMH_RAM ) // Work RAM + AM_RANGE(0x9e00, 0x9fff) AM_READ(SMH_RAM ) // Sprite RAM AM_RANGE(0xa100, 0xa107) AM_READ(clshroad_input_r ) // Inputs - AM_RANGE(0xa800, 0xafff) AM_READ(MRA8_RAM ) // Layer 1 - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM ) // Layers 0 + AM_RANGE(0xa800, 0xafff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM ) // Layers 0 ADDRESS_MAP_END static ADDRESS_MAP_START( clshroad_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0x95ff) AM_WRITE(MWA8_RAM ) // Work RAM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0x95ff) AM_WRITE(SMH_RAM ) // Work RAM AM_RANGE(0x9600, 0x97ff) AM_WRITE(clshroad_sharedram_w) AM_BASE(&clshroad_sharedram ) // Shared RAM - AM_RANGE(0x9800, 0x9dff) AM_WRITE(MWA8_RAM ) // Work RAM - AM_RANGE(0x9e00, 0x9fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size ) // Sprite RAM - AM_RANGE(0xa001, 0xa001) AM_WRITE(MWA8_NOP ) // ? Interrupt related + AM_RANGE(0x9800, 0x9dff) AM_WRITE(SMH_RAM ) // Work RAM + AM_RANGE(0x9e00, 0x9fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size ) // Sprite RAM + AM_RANGE(0xa001, 0xa001) AM_WRITE(SMH_NOP ) // ? Interrupt related AM_RANGE(0xa004, 0xa004) AM_WRITE(clshroad_flipscreen_w ) // Flip Screen AM_RANGE(0xa800, 0xafff) AM_WRITE(clshroad_vram_1_w) AM_BASE(&clshroad_vram_1 ) // Layer 1 - AM_RANGE(0xb000, 0xb003) AM_WRITE(MWA8_RAM) AM_BASE(&clshroad_vregs ) // Scroll + AM_RANGE(0xb000, 0xb003) AM_WRITE(SMH_RAM) AM_BASE(&clshroad_vregs ) // Scroll AM_RANGE(0xc000, 0xc7ff) AM_WRITE(clshroad_vram_0_w) AM_BASE(&clshroad_vram_0 ) // Layers 0 ADDRESS_MAP_END static ADDRESS_MAP_START( clshroad_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM ) // ROM + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x9600, 0x97ff) AM_READ(clshroad_sharedram_r ) // Shared RAM ADDRESS_MAP_END static ADDRESS_MAP_START( clshroad_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x4000, 0x7fff) AM_WRITE(wiping_sound_w) AM_BASE(&wiping_soundregs) AM_RANGE(0x9600, 0x97ff) AM_WRITE(clshroad_sharedram_w ) // Shared RAM - AM_RANGE(0xa003, 0xa003) AM_WRITE(MWA8_NOP ) // ? Interrupt related + AM_RANGE(0xa003, 0xa003) AM_WRITE(SMH_NOP ) // ? Interrupt related ADDRESS_MAP_END diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index aa9d663e39a..0ab08732b3c 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -155,232 +155,232 @@ static READ16_HANDLER( robocop2_prot_r ) /**********************************************************************************/ static ADDRESS_MAP_START( cninja_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) - AM_RANGE(0x144000, 0x144fff) AM_READ(MRA16_RAM) - AM_RANGE(0x146000, 0x146fff) AM_READ(MRA16_RAM) - AM_RANGE(0x14e000, 0x14e7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x154000, 0x154fff) AM_READ(MRA16_RAM) - AM_RANGE(0x156000, 0x156fff) AM_READ(MRA16_RAM) - AM_RANGE(0x15c000, 0x15c7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x15e000, 0x15e7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x184000, 0x187fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) + AM_RANGE(0x144000, 0x144fff) AM_READ(SMH_RAM) + AM_RANGE(0x146000, 0x146fff) AM_READ(SMH_RAM) + AM_RANGE(0x14e000, 0x14e7ff) AM_READ(SMH_RAM) + AM_RANGE(0x154000, 0x154fff) AM_READ(SMH_RAM) + AM_RANGE(0x156000, 0x156fff) AM_READ(SMH_RAM) + AM_RANGE(0x15c000, 0x15c7ff) AM_READ(SMH_RAM) + AM_RANGE(0x15e000, 0x15e7ff) AM_READ(SMH_RAM) + AM_RANGE(0x184000, 0x187fff) AM_READ(SMH_RAM) AM_RANGE(0x190000, 0x190007) AM_READ(cninja_irq_r) - AM_RANGE(0x19c000, 0x19dfff) AM_READ(MRA16_RAM) - AM_RANGE(0x1a4000, 0x1a47ff) AM_READ(MRA16_RAM) /* Sprites */ + AM_RANGE(0x19c000, 0x19dfff) AM_READ(SMH_RAM) + AM_RANGE(0x1a4000, 0x1a47ff) AM_READ(SMH_RAM) /* Sprites */ AM_RANGE(0x1bc000, 0x1bcfff) AM_READ(deco16_104_cninja_prot_r) /* Protection device */ ADDRESS_MAP_END static ADDRESS_MAP_START( cninja_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0bffff) AM_WRITE(SMH_ROM) - AM_RANGE(0x140000, 0x14000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x140000, 0x14000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x144000, 0x144fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x146000, 0x146fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x14c000, 0x14c7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x14e000, 0x14e7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x14c000, 0x14c7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x14e000, 0x14e7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x150000, 0x15000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x150000, 0x15000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) AM_RANGE(0x154000, 0x154fff) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x156000, 0x156fff) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x15c000, 0x15c7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf3_rowscroll) - AM_RANGE(0x15e000, 0x15e7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x15c000, 0x15c7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf3_rowscroll) + AM_RANGE(0x15e000, 0x15e7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) - AM_RANGE(0x184000, 0x187fff) AM_WRITE(MWA16_RAM) AM_BASE(&cninja_ram) /* Main ram */ + AM_RANGE(0x184000, 0x187fff) AM_WRITE(SMH_RAM) AM_BASE(&cninja_ram) /* Main ram */ AM_RANGE(0x190000, 0x190007) AM_WRITE(cninja_irq_w) AM_RANGE(0x19c000, 0x19dfff) AM_WRITE(deco16_nonbuffered_palette_w) AM_BASE(&paletteram16) - AM_RANGE(0x1a4000, 0x1a47ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x1a4000, 0x1a47ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x1b4000, 0x1b4001) AM_WRITE(buffer_spriteram16_w) /* DMA flag */ AM_RANGE(0x1bc000, 0x1bc0ff) AM_WRITE(deco16_104_cninja_prot_w) AM_BASE(&deco16_prot_ram) /* Protection writes */ - AM_RANGE(0x308000, 0x308fff) AM_WRITE(MWA16_NOP) /* Bootleg only */ + AM_RANGE(0x308000, 0x308fff) AM_WRITE(SMH_NOP) /* Bootleg only */ ADDRESS_MAP_END static ADDRESS_MAP_START( edrandy_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x144000, 0x144fff) AM_READ(MRA16_RAM) - AM_RANGE(0x144000, 0x144fff) AM_READ(MRA16_RAM) - AM_RANGE(0x146000, 0x146fff) AM_READ(MRA16_RAM) - AM_RANGE(0x14c000, 0x14c7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x14e000, 0x14e7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x154000, 0x154fff) AM_READ(MRA16_RAM) - AM_RANGE(0x156000, 0x156fff) AM_READ(MRA16_RAM) - AM_RANGE(0x15c000, 0x15c7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x15e000, 0x15e7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x188000, 0x189fff) AM_READ(MRA16_RAM) - AM_RANGE(0x194000, 0x197fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x144000, 0x144fff) AM_READ(SMH_RAM) + AM_RANGE(0x144000, 0x144fff) AM_READ(SMH_RAM) + AM_RANGE(0x146000, 0x146fff) AM_READ(SMH_RAM) + AM_RANGE(0x14c000, 0x14c7ff) AM_READ(SMH_RAM) + AM_RANGE(0x14e000, 0x14e7ff) AM_READ(SMH_RAM) + AM_RANGE(0x154000, 0x154fff) AM_READ(SMH_RAM) + AM_RANGE(0x156000, 0x156fff) AM_READ(SMH_RAM) + AM_RANGE(0x15c000, 0x15c7ff) AM_READ(SMH_RAM) + AM_RANGE(0x15e000, 0x15e7ff) AM_READ(SMH_RAM) + AM_RANGE(0x188000, 0x189fff) AM_READ(SMH_RAM) + AM_RANGE(0x194000, 0x197fff) AM_READ(SMH_RAM) AM_RANGE(0x198000, 0x1987ff) AM_READ(deco16_60_prot_r) /* Protection device */ AM_RANGE(0x1a4000, 0x1a4007) AM_READ(cninja_irq_r) - AM_RANGE(0x1bc000, 0x1bc7ff) AM_READ(MRA16_RAM) /* Sprites */ + AM_RANGE(0x1bc000, 0x1bc7ff) AM_READ(SMH_RAM) /* Sprites */ ADDRESS_MAP_END static ADDRESS_MAP_START( edrandy_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) - AM_RANGE(0x140000, 0x14000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x140000, 0x14000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x144000, 0x144fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x146000, 0x146fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x14c000, 0x14c7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x14e000, 0x14e7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x14c000, 0x14c7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x14e000, 0x14e7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x150000, 0x15000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x150000, 0x15000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) AM_RANGE(0x154000, 0x154fff) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x156000, 0x156fff) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x15c000, 0x15c7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf3_rowscroll) - AM_RANGE(0x15e000, 0x15e7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x15c000, 0x15c7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf3_rowscroll) + AM_RANGE(0x15e000, 0x15e7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) AM_RANGE(0x188000, 0x189fff) AM_WRITE(deco16_nonbuffered_palette_w) AM_BASE(&paletteram16) - AM_RANGE(0x194000, 0x197fff) AM_WRITE(MWA16_RAM) AM_BASE(&cninja_ram) /* Main ram */ + AM_RANGE(0x194000, 0x197fff) AM_WRITE(SMH_RAM) AM_BASE(&cninja_ram) /* Main ram */ AM_RANGE(0x198000, 0x1987ff) AM_WRITE(deco16_60_prot_w) AM_BASE(&deco16_prot_ram) /* Protection writes */ - AM_RANGE(0x199550, 0x199551) AM_WRITE(MWA16_NOP) /* Looks like a bug in game code, a protection write is referenced off a5 instead of a6 and ends up here */ - AM_RANGE(0x199750, 0x199751) AM_WRITE(MWA16_NOP) /* Looks like a bug in game code, a protection write is referenced off a5 instead of a6 and ends up here */ + AM_RANGE(0x199550, 0x199551) AM_WRITE(SMH_NOP) /* Looks like a bug in game code, a protection write is referenced off a5 instead of a6 and ends up here */ + AM_RANGE(0x199750, 0x199751) AM_WRITE(SMH_NOP) /* Looks like a bug in game code, a protection write is referenced off a5 instead of a6 and ends up here */ AM_RANGE(0x1a4000, 0x1a4007) AM_WRITE(cninja_irq_w) AM_RANGE(0x1ac000, 0x1ac001) AM_WRITE(buffer_spriteram16_w) /* DMA flag */ - AM_RANGE(0x1bc000, 0x1bc7ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x1bc800, 0x1bcfff) AM_WRITE(MWA16_NOP) /* Another bug in game code? Sprite list can overrun. Doesn't seem to mirror */ + AM_RANGE(0x1bc000, 0x1bc7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x1bc800, 0x1bcfff) AM_WRITE(SMH_NOP) /* Another bug in game code? Sprite list can overrun. Doesn't seem to mirror */ ADDRESS_MAP_END static ADDRESS_MAP_START( robocop2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x180000, 0x1807ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x180000, 0x1807ff) AM_READ(SMH_RAM) AM_RANGE(0x18c000, 0x18c7ff) AM_READ(robocop2_prot_r) /* Protection device */ - AM_RANGE(0x1a8000, 0x1a9fff) AM_READ(MRA16_RAM) + AM_RANGE(0x1a8000, 0x1a9fff) AM_READ(SMH_RAM) AM_RANGE(0x1b0000, 0x1b0007) AM_READ(cninja_irq_r) - AM_RANGE(0x1b8000, 0x1bbfff) AM_READ(MRA16_RAM) - AM_RANGE(0x144000, 0x144fff) AM_READ(MRA16_RAM) - AM_RANGE(0x146000, 0x146fff) AM_READ(MRA16_RAM) - AM_RANGE(0x14c000, 0x14c7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x14e000, 0x14e7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x154000, 0x154fff) AM_READ(MRA16_RAM) - AM_RANGE(0x156000, 0x156fff) AM_READ(MRA16_RAM) - AM_RANGE(0x15c000, 0x15c7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x15e000, 0x15e7ff) AM_READ(MRA16_RAM) + AM_RANGE(0x1b8000, 0x1bbfff) AM_READ(SMH_RAM) + AM_RANGE(0x144000, 0x144fff) AM_READ(SMH_RAM) + AM_RANGE(0x146000, 0x146fff) AM_READ(SMH_RAM) + AM_RANGE(0x14c000, 0x14c7ff) AM_READ(SMH_RAM) + AM_RANGE(0x14e000, 0x14e7ff) AM_READ(SMH_RAM) + AM_RANGE(0x154000, 0x154fff) AM_READ(SMH_RAM) + AM_RANGE(0x156000, 0x156fff) AM_READ(SMH_RAM) + AM_RANGE(0x15c000, 0x15c7ff) AM_READ(SMH_RAM) + AM_RANGE(0x15e000, 0x15e7ff) AM_READ(SMH_RAM) AM_RANGE(0x1f8000, 0x1f8001) AM_READ(robocop2_dip3_r ) /* Dipswitch #3 */ ADDRESS_MAP_END static ADDRESS_MAP_START( robocop2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x140000, 0x14000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x140000, 0x14000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x144000, 0x144fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x146000, 0x146fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x14c000, 0x14c7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x14e000, 0x14e7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x14c000, 0x14c7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x14e000, 0x14e7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x150000, 0x15000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x150000, 0x15000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) AM_RANGE(0x154000, 0x154fff) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x156000, 0x156fff) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x15c000, 0x15c7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf3_rowscroll) - AM_RANGE(0x15e000, 0x15e7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x15c000, 0x15c7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf3_rowscroll) + AM_RANGE(0x15e000, 0x15e7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) - AM_RANGE(0x180000, 0x1807ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x180000, 0x1807ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x18c064, 0x18c065) AM_WRITE(cninja_sound_w) // AM_RANGE(0x18c000, 0x18c0ff) AM_WRITE(cninja_loopback_w) /* Protection writes */ AM_RANGE(0x198000, 0x198001) AM_WRITE(buffer_spriteram16_w) /* DMA flag */ AM_RANGE(0x1a8000, 0x1a9fff) AM_WRITE(deco16_nonbuffered_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x1b0000, 0x1b0007) AM_WRITE(cninja_irq_w) - AM_RANGE(0x1b8000, 0x1bbfff) AM_WRITE(MWA16_RAM) AM_BASE(&cninja_ram) /* Main ram */ + AM_RANGE(0x1b8000, 0x1bbfff) AM_WRITE(SMH_RAM) AM_BASE(&cninja_ram) /* Main ram */ AM_RANGE(0x1f0000, 0x1f0001) AM_WRITE(deco16_priority_w) ADDRESS_MAP_END static ADDRESS_MAP_START( mutantf_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x160000, 0x161fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) + AM_RANGE(0x160000, 0x161fff) AM_READ(SMH_RAM) AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(deco16_66_prot_r) /* Protection device */ AM_RANGE(0x1c0000, 0x1c0001) AM_READ(deco16_71_r) - AM_RANGE(0x304000, 0x305fff) AM_READ(MRA16_RAM) - AM_RANGE(0x306000, 0x307fff) AM_READ(MRA16_RAM) - AM_RANGE(0x308000, 0x3087ff) AM_READ(MRA16_RAM) - AM_RANGE(0x30a000, 0x30a7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x314000, 0x315fff) AM_READ(MRA16_RAM) - AM_RANGE(0x316000, 0x317fff) AM_READ(MRA16_RAM) - AM_RANGE(0x318000, 0x3187ff) AM_READ(MRA16_RAM) - AM_RANGE(0x31a000, 0x31a7ff) AM_READ(MRA16_RAM) - AM_RANGE(0xad00ac, 0xad00ff) AM_READ(MRA16_NOP) /* Reads from here seem to be a game code bug */ + AM_RANGE(0x304000, 0x305fff) AM_READ(SMH_RAM) + AM_RANGE(0x306000, 0x307fff) AM_READ(SMH_RAM) + AM_RANGE(0x308000, 0x3087ff) AM_READ(SMH_RAM) + AM_RANGE(0x30a000, 0x30a7ff) AM_READ(SMH_RAM) + AM_RANGE(0x314000, 0x315fff) AM_READ(SMH_RAM) + AM_RANGE(0x316000, 0x317fff) AM_READ(SMH_RAM) + AM_RANGE(0x318000, 0x3187ff) AM_READ(SMH_RAM) + AM_RANGE(0x31a000, 0x31a7ff) AM_READ(SMH_RAM) + AM_RANGE(0xad00ac, 0xad00ff) AM_READ(SMH_NOP) /* Reads from here seem to be a game code bug */ ADDRESS_MAP_END static ADDRESS_MAP_START( mutantf_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) /* Main ram */ - AM_RANGE(0x120000, 0x1207ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x140000, 0x1407ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) /* Main ram */ + AM_RANGE(0x120000, 0x1207ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x140000, 0x1407ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) AM_RANGE(0x160000, 0x161fff) AM_WRITE(deco16_nonbuffered_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x180000, 0x180001) AM_WRITE(deco16_priority_w) - AM_RANGE(0x180002, 0x180003) AM_WRITE(MWA16_NOP) /* VBL irq ack */ + AM_RANGE(0x180002, 0x180003) AM_WRITE(SMH_NOP) /* VBL irq ack */ AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(deco16_66_prot_w) AM_BASE(&deco16_prot_ram) /* Protection writes */ AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE(buffer_spriteram16_w) AM_RANGE(0x1e0000, 0x1e0001) AM_WRITE(buffer_spriteram16_2_w) - AM_RANGE(0x300000, 0x30000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x300000, 0x30000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x304000, 0x305fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x306000, 0x307fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x308000, 0x3087ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x30a000, 0x30a7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x308000, 0x3087ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x30a000, 0x30a7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x310000, 0x31000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x310000, 0x31000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) AM_RANGE(0x314000, 0x315fff) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x316000, 0x317fff) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x318000, 0x3187ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf3_rowscroll) - AM_RANGE(0x31a000, 0x31a7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x318000, 0x3187ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf3_rowscroll) + AM_RANGE(0x31a000, 0x31a7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(YM2203_word_0_w) AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_1_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem_mutantf, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_READ(MRA8_NOP) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_mutantf, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA8_NOP) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_1_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( stoneage_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8801, 0x8801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( stoneage_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 8106a6248f3..30a54d8651e 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -340,7 +340,7 @@ static ADDRESS_MAP_START( cntsteer_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE(1) AM_RANGE(0x1000, 0x11ff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x1200, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x27ff) AM_READWRITE(MRA8_RAM, cntsteer_foreground_w) AM_BASE(&videoram) + AM_RANGE(0x2000, 0x27ff) AM_READWRITE(SMH_RAM, cntsteer_foreground_w) AM_BASE(&videoram) AM_RANGE(0x2800, 0x2fff) AM_RAM // { 0x1b00, 0x1b00, input_port_0_r }, @@ -356,7 +356,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cntsteer_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE(1) - AM_RANGE(0x1000, 0x1fff) AM_READWRITE(MRA8_RAM, cntsteer_background_w) AM_BASE(&videoram2) + AM_RANGE(0x1000, 0x1fff) AM_READWRITE(SMH_RAM, cntsteer_background_w) AM_BASE(&videoram2) AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r) AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r) AM_RANGE(0x3002, 0x3002) AM_READ(input_port_2_r) @@ -378,7 +378,7 @@ static ADDRESS_MAP_START( gekitsui_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE(1) AM_RANGE(0x1000, 0x11ff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x1200, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x27ff) AM_READWRITE(MRA8_RAM, cntsteer_foreground_w) AM_BASE(&videoram) + AM_RANGE(0x2000, 0x27ff) AM_READWRITE(SMH_RAM, cntsteer_foreground_w) AM_BASE(&videoram) AM_RANGE(0x3000, 0x3003) AM_WRITE(zerotrgt_ctrl_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -452,7 +452,7 @@ static WRITE8_HANDLER(scrivi) static ADDRESS_MAP_START( gekitsui_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE(1) - AM_RANGE(0x1000, 0x1fff) AM_READWRITE(MRA8_RAM, cntsteer_background_w) AM_BASE(&videoram2) + AM_RANGE(0x1000, 0x1fff) AM_READWRITE(SMH_RAM, cntsteer_background_w) AM_BASE(&videoram2) AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r) AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r) AM_RANGE(0x3002, 0x3002) AM_READ(input_port_2_r) diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index 64ec5c9ba6b..e8e341b14e0 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -13,7 +13,7 @@ * Freeze To do: - * map out unused RAM per-game via MRA8_NOP/MWA8_NOP + * map out unused RAM per-game via SMH_NOP/SMH_NOP Note: There is believed to be a 68020 version of Maximum Force (not confirmed or dumped) diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index c6071d23a5c..69037fb95ac 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -266,17 +266,17 @@ static ADDRESS_MAP_START( combasc_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0402, 0x0402) AM_READ(input_port_2_r) /* DSW #1 */ AM_RANGE(0x0403, 0x0403) AM_READ(input_port_3_r) /* DSW #2 */ AM_RANGE(0x0404, 0x0407) AM_READ(trackball_r) /* 1P & 2P controls / trackball */ - AM_RANGE(0x0600, 0x06ff) AM_READ(MRA8_RAM) /* palette */ - AM_RANGE(0x0800, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0600, 0x06ff) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0x0800, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x3fff) AM_READ(combasc_video_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) /* banked ROM area */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) /* banked ROM area */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( combasc_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0007) AM_WRITE(combasc_pf_control_w) AM_RANGE(0x0020, 0x005f) AM_WRITE(combasc_scrollram_w) -// AM_RANGE(0x0060, 0x00ff) AM_WRITE(MWA8_RAM) /* RAM */ +// AM_RANGE(0x0060, 0x00ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x0200, 0x0201) AM_WRITE(protection_w) AM_RANGE(0x0206, 0x0206) AM_WRITE(protection_clock_w) AM_RANGE(0x0408, 0x0408) AM_WRITE(combasc_coin_counter_w) /* coin counters */ @@ -285,68 +285,68 @@ static ADDRESS_MAP_START( combasc_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0414, 0x0414) AM_WRITE(soundlatch_w) AM_RANGE(0x0418, 0x0418) AM_WRITE(combasc_sh_irqtrigger_w) AM_RANGE(0x041c, 0x041c) AM_WRITE(watchdog_reset_w) /* watchdog reset? */ - AM_RANGE(0x0600, 0x06ff) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) - AM_RANGE(0x0800, 0x1fff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0600, 0x06ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) + AM_RANGE(0x0800, 0x1fff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x2000, 0x3fff) AM_WRITE(combasc_video_w) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM) /* banked ROM area */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM) /* banked ROM area */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( combascb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x04ff) AM_READ(MRA8_RAM) - AM_RANGE(0x0600, 0x06ff) AM_READ(MRA8_RAM) /* palette */ - AM_RANGE(0x0800, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x04ff) AM_READ(SMH_RAM) + AM_RANGE(0x0600, 0x06ff) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0x0800, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x3fff) AM_READ(combasc_video_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) /* banked ROM/RAM area */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) /* banked ROM/RAM area */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( combascb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x04ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x04ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0500, 0x0500) AM_WRITE(combascb_bankselect_w) - AM_RANGE(0x0600, 0x06ff) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) - AM_RANGE(0x0800, 0x1fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0600, 0x06ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) + AM_RANGE(0x0800, 0x1fff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x3fff) AM_WRITE(combasc_video_w) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_BANK1) /* banked ROM/RAM area */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_BANK1) /* banked ROM/RAM area */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END #if 0 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0x87ef) AM_READ(MRA8_RAM) /* RAM */ - AM_RANGE(0x87f0, 0x87ff) AM_READ(MRA8_RAM) /* ??? */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0x87ef) AM_READ(SMH_RAM) /* RAM */ + AM_RANGE(0x87f0, 0x87ff) AM_READ(SMH_RAM) /* ??? */ AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r) /* YM 2203 */ AM_RANGE(0x9008, 0x9008) AM_READ(YM2203_status_port_0_r) /* ??? */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r? */ - AM_RANGE(0x8800, 0xfffb) AM_READ(MRA8_ROM) /* ROM? */ - AM_RANGE(0xfffc, 0xffff) AM_READ(MRA8_RAM) /* ??? */ + AM_RANGE(0x8800, 0xfffb) AM_READ(SMH_ROM) /* ROM? */ + AM_RANGE(0xfffc, 0xffff) AM_READ(SMH_RAM) /* ??? */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0x87ef) AM_WRITE(MWA8_RAM) /* RAM */ - AM_RANGE(0x87f0, 0x87ff) AM_WRITE(MWA8_RAM) /* ??? */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0x87ef) AM_WRITE(SMH_RAM) /* RAM */ + AM_RANGE(0x87f0, 0x87ff) AM_WRITE(SMH_RAM) /* ??? */ AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w)/* YM 2203 */ AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w) /* YM 2203 */ //AM_RANGE(0x9800, 0x9800) AM_WRITE(combasc_unknown_w_1) /* OKIM5205? */ //AM_RANGE(0xa800, 0xa800) AM_WRITE(combasc_unknown_w_2) /* OKIM5205? */ - AM_RANGE(0x8800, 0xfffb) AM_WRITE(MWA8_ROM) /* ROM */ - AM_RANGE(0xfffc, 0xffff) AM_WRITE(MWA8_RAM) /* ??? */ + AM_RANGE(0x8800, 0xfffb) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0xfffc, 0xffff) AM_WRITE(SMH_RAM) /* ??? */ ADDRESS_MAP_END #endif static ADDRESS_MAP_START( combasc_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0xb000, 0xb000) AM_READ(upd7759_0_busy_r) /* upd7759 busy? */ AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) /* soundlatch_r? */ AM_RANGE(0xe000, 0xe000) AM_READ(combasc_YM2203_status_port_0_r) /* YM 2203 intercepted */ ADDRESS_MAP_END static ADDRESS_MAP_START( combasc_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x9000, 0x9000) AM_WRITE(combasc_play_w) /* upd7759 play voice */ AM_RANGE(0xa000, 0xa000) AM_WRITE(upd7759_0_port_w) /* upd7759 voice select */ AM_RANGE(0xc000, 0xc000) AM_WRITE(combasc_voice_reset_w) /* upd7759 reset? */ diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c index 9e401b7ca52..32c423e22be 100644 --- a/src/mame/drivers/compgolf.c +++ b/src/mame/drivers/compgolf.c @@ -51,30 +51,30 @@ static WRITE8_HANDLER( compgolf_ctrl_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x17ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x2060) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x17ff) AM_READ(SMH_RAM) + AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x2060) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r) //player 1 + start buttons AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r) //player 2 + vblank AM_RANGE(0x3002, 0x3002) AM_READ(input_port_2_r) //dip-switches AM_RANGE(0x3003, 0x3003) AM_READ(input_port_3_r) //coins AM_RANGE(0x3800, 0x3800) AM_READ(YM2203_status_port_0_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x17ff) AM_WRITE(compgolf_video_w) AM_BASE(&videoram) AM_RANGE(0x1800, 0x1fff) AM_WRITE(compgolf_back_w) AM_BASE(&compgolf_bg_ram) - AM_RANGE(0x2000, 0x2060) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) - AM_RANGE(0x2061, 0x2061) AM_WRITE(MWA8_NOP) + AM_RANGE(0x2000, 0x2060) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) + AM_RANGE(0x2061, 0x2061) AM_WRITE(SMH_NOP) AM_RANGE(0x3001, 0x3001) AM_WRITE(compgolf_ctrl_w) AM_RANGE(0x3800, 0x3800) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x3801, 0x3801) AM_WRITE(YM2203_write_port_0_w) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /***************************************************************************/ diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c index 94ddbe973ca..980354dce1b 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -75,10 +75,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0015, 0x0015) AM_READ(input_port_4_r) /* DIPSW2 */ AM_RANGE(0x0016, 0x0016) AM_READ(input_port_5_r) /* DIPSW3 */ - AM_RANGE(0x0c00, 0x0cff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x5fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0c00, 0x0cff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x5fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -86,37 +86,37 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0018, 0x0018) AM_WRITE(contra_coin_counter_w) AM_RANGE(0x001a, 0x001a) AM_WRITE(contra_sh_irqtrigger_w) AM_RANGE(0x001c, 0x001c) AM_WRITE(cpu_sound_command_w) - AM_RANGE(0x001e, 0x001e) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0x001e, 0x001e) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0x0060, 0x0067) AM_WRITE(contra_K007121_ctrl_1_w) - AM_RANGE(0x0c00, 0x0cff) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) - AM_RANGE(0x1000, 0x1fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0c00, 0x0cff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) + AM_RANGE(0x1000, 0x1fff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x23ff) AM_WRITE(contra_fg_cram_w) AM_BASE(&contra_fg_cram) AM_RANGE(0x2400, 0x27ff) AM_WRITE(contra_fg_vram_w) AM_BASE(&contra_fg_vram) AM_RANGE(0x2800, 0x2bff) AM_WRITE(contra_text_cram_w) AM_BASE(&contra_text_cram) AM_RANGE(0x2c00, 0x2fff) AM_WRITE(contra_text_vram_w) AM_BASE(&contra_text_vram) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram)/* 2nd bank is at 0x5000 */ - AM_RANGE(0x3800, 0x3fff) AM_WRITE(MWA8_RAM) // second sprite buffer + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram)/* 2nd bank is at 0x5000 */ + AM_RANGE(0x3800, 0x3fff) AM_WRITE(SMH_RAM) // second sprite buffer AM_RANGE(0x4000, 0x43ff) AM_WRITE(contra_bg_cram_w) AM_BASE(&contra_bg_cram) AM_RANGE(0x4400, 0x47ff) AM_WRITE(contra_bg_vram_w) AM_BASE(&contra_bg_vram) - AM_RANGE(0x4800, 0x5fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4800, 0x5fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_ROM) AM_RANGE(0x7000, 0x7000) AM_WRITE(contra_bankswitch_w) - AM_RANGE(0x7001, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x7001, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(soundlatch_r) AM_RANGE(0x2001, 0x2001) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0x6000, 0x67ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x2001, 0x2001) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0x4000, 0x4000) AM_WRITE(MWA8_NOP) /* read triggers irq reset and latch read (in the hardware only). */ - AM_RANGE(0x6000, 0x67ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_NOP) /* read triggers irq reset and latch read (in the hardware only). */ + AM_RANGE(0x6000, 0x67ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c index 9f872aa6a07..36ef09ea5de 100644 --- a/src/mame/drivers/coolpool.c +++ b/src/mame/drivers/coolpool.c @@ -490,7 +490,7 @@ static ADDRESS_MAP_START( amerdart_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000000, 0x000fffff) AM_RAM AM_BASE(&vram_base) AM_RANGE(0x04000000, 0x0400000f) AM_WRITE(amerdart_misc_w) AM_RANGE(0x05000000, 0x0500000f) AM_READWRITE(coolpool_iop_r, amerdart_iop_w) - AM_RANGE(0x06000000, 0x06007fff) AM_READWRITE(MRA16_RAM, nvram_thrash_data_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x06000000, 0x06007fff) AM_READWRITE(SMH_RAM, nvram_thrash_data_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w) AM_RANGE(0xffb00000, 0xffffffff) AM_ROM AM_REGION(REGION_USER1, 0) ADDRESS_MAP_END @@ -502,7 +502,7 @@ static ADDRESS_MAP_START( coolpool_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x02000000, 0x020000ff) AM_READWRITE(coolpool_iop_r, coolpool_iop_w) AM_RANGE(0x03000000, 0x0300000f) AM_WRITE(coolpool_misc_w) AM_RANGE(0x03000000, 0x03ffffff) AM_ROM AM_REGION(REGION_GFX1, 0) - AM_RANGE(0x06000000, 0x06007fff) AM_READWRITE(MRA16_RAM, nvram_thrash_data_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x06000000, 0x06007fff) AM_READWRITE(SMH_RAM, nvram_thrash_data_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w) AM_RANGE(0xffe00000, 0xffffffff) AM_ROM AM_REGION(REGION_USER1, 0) ADDRESS_MAP_END @@ -513,7 +513,7 @@ static ADDRESS_MAP_START( nballsht_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x02000000, 0x020000ff) AM_READWRITE(coolpool_iop_r, coolpool_iop_w) AM_RANGE(0x03000000, 0x0300000f) AM_WRITE(coolpool_misc_w) AM_RANGE(0x04000000, 0x040000ff) AM_READWRITE(tlc34076_lsb_r, tlc34076_lsb_w) // IMSG176P-40 - AM_RANGE(0x06000000, 0x0601ffff) AM_MIRROR(0x00020000) AM_READWRITE(MRA16_RAM, nvram_thrash_data_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x06000000, 0x0601ffff) AM_MIRROR(0x00020000) AM_READWRITE(SMH_RAM, nvram_thrash_data_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w) AM_RANGE(0xff000000, 0xff7fffff) AM_ROM AM_REGION(REGION_GFX1, 0) AM_RANGE(0xffc00000, 0xffffffff) AM_ROM AM_REGION(REGION_USER1, 0) diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c index fa1ae16a2b9..5e3646d3dfe 100644 --- a/src/mame/drivers/cop01.c +++ b/src/mame/drivers/cop01.c @@ -113,16 +113,16 @@ static READ8_HANDLER( mightguy_dsw_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) /* c000-c7ff in cop01 */ - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) /* c000-c7ff in cop01 */ + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) /* c000-c7ff in cop01 */ + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) /* c000-c7ff in cop01 */ AM_RANGE(0xd000, 0xdfff) AM_WRITE(cop01_background_w) AM_BASE(&cop01_bgvideoram) - AM_RANGE(0xe000, 0xe0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe000, 0xe0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xf000, 0xf3ff) AM_WRITE(cop01_foreground_w) AM_BASE(&cop01_fgvideoram) ADDRESS_MAP_END @@ -151,14 +151,14 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8000) AM_READ(MRA8_NOP) /* irq ack? */ - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8000) AM_READ(SMH_NOP) /* irq ack? */ + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -189,8 +189,8 @@ static ADDRESS_MAP_START( mightguy_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(YM3526_control_port_0_w) AM_RANGE(0x01, 0x01) AM_WRITE(YM3526_write_port_0_w) - AM_RANGE(0x02, 0x02) AM_WRITE(MWA8_NOP) /* 1412M2? */ - AM_RANGE(0x03, 0x03) AM_WRITE(MWA8_NOP) /* 1412M2? */ + AM_RANGE(0x02, 0x02) AM_WRITE(SMH_NOP) /* 1412M2? */ + AM_RANGE(0x03, 0x03) AM_WRITE(SMH_NOP) /* 1412M2? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c index 09d6bf216e5..4c214f875b7 100644 --- a/src/mame/drivers/copsnrob.c +++ b/src/mame/drivers/copsnrob.c @@ -107,14 +107,14 @@ static WRITE8_HANDLER( copsnrob_led_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x1fff) AM_RANGE(0x0000, 0x01ff) AM_RAM - AM_RANGE(0x0500, 0x0503) AM_WRITE(MWA8_RAM) -// AM_RANGE(0x0504, 0x0507) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0x0500, 0x0503) AM_WRITE(SMH_RAM) +// AM_RANGE(0x0504, 0x0507) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0x0506, 0x0506) AM_WRITE(copsnrob_led_w) - AM_RANGE(0x0600, 0x0600) AM_WRITE(MWA8_RAM) AM_BASE(&copsnrob_trucky) - AM_RANGE(0x0700, 0x07ff) AM_WRITE(MWA8_RAM) AM_BASE(&copsnrob_truckram) + AM_RANGE(0x0600, 0x0600) AM_WRITE(SMH_RAM) AM_BASE(&copsnrob_trucky) + AM_RANGE(0x0700, 0x07ff) AM_WRITE(SMH_RAM) AM_BASE(&copsnrob_truckram) AM_RANGE(0x0800, 0x08ff) AM_RAM AM_BASE(&copsnrob_bulletsram) - AM_RANGE(0x0900, 0x0903) AM_WRITE(MWA8_RAM) AM_BASE(&copsnrob_carimage) - AM_RANGE(0x0a00, 0x0a03) AM_WRITE(MWA8_RAM) AM_BASE(&copsnrob_cary) + AM_RANGE(0x0900, 0x0903) AM_WRITE(SMH_RAM) AM_BASE(&copsnrob_carimage) + AM_RANGE(0x0a00, 0x0a03) AM_WRITE(SMH_RAM) AM_BASE(&copsnrob_cary) AM_RANGE(0x0b00, 0x0bff) AM_RAM AM_RANGE(0x0c00, 0x0fff) AM_RAM AM_BASE(&videoram) AM_SIZE(&videoram_size) // AM_RANGE(0x1000, 0x1003) AM_WRITENOP diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index f61af4071be..343568c0dae 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -296,8 +296,8 @@ static WRITE8_HANDLER( flip_screen_w ) static ADDRESS_MAP_START( panic_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) AM_RANGE(0x6800, 0x6800) AM_READ(input_port_0_r) /* IN1 */ AM_RANGE(0x6801, 0x6801) AM_READ(input_port_1_r) /* IN2 */ AM_RANGE(0x6802, 0x6802) AM_READ(input_port_2_r) /* DSW */ @@ -305,9 +305,9 @@ static ADDRESS_MAP_START( panic_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( panic_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x5fff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x6000, 0x601f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x6000, 0x601f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x7000, 0x700b) AM_WRITE(panic_sound_output_w) AM_RANGE(0x700c, 0x700e) AM_WRITE(cosmic_color_register_w) AM_RANGE(0x700f, 0x700f) AM_WRITE(flip_screen_w) @@ -316,8 +316,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cosmica_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) AM_RANGE(0x6800, 0x6800) AM_READ(input_port_0_r) /* IN1 */ AM_RANGE(0x6801, 0x6801) AM_READ(input_port_1_r) /* IN2 */ AM_RANGE(0x6802, 0x6802) AM_READ(input_port_2_r) /* DSW */ @@ -325,22 +325,22 @@ static ADDRESS_MAP_START( cosmica_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cosmica_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x5fff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x6000, 0x601f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x6000, 0x601f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x700c, 0x700d) AM_WRITE(cosmic_color_register_w) AM_RANGE(0x700f, 0x700f) AM_WRITE(flip_screen_w) ADDRESS_MAP_END static ADDRESS_MAP_START( cosmicg_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( cosmicg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( cosmicg_readport, ADDRESS_SPACE_IO, 8 ) @@ -355,22 +355,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( magspot_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM) AM_RANGE(0x3800, 0x3807) AM_READ(magspot_coinage_dip_r) AM_RANGE(0x5000, 0x5000) AM_READ(input_port_0_r) AM_RANGE(0x5001, 0x5001) AM_READ(input_port_1_r) AM_RANGE(0x5002, 0x5002) AM_READ(input_port_2_r) AM_RANGE(0x5003, 0x5003) AM_READ(input_port_3_r) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_RAM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( magspot_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x401f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x401f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x4800, 0x4800) AM_WRITE(DAC_0_data_w) AM_RANGE(0x480c, 0x480d) AM_WRITE(cosmic_color_register_w) AM_RANGE(0x480f, 0x480f) AM_WRITE(flip_screen_w) - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END @@ -1485,7 +1485,7 @@ static DRIVER_INIT( devzone ) static DRIVER_INIT( nomnlnd ) { memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5000, 0x5001, 0, 0, nomnlnd_port_0_1_r); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4800, 0x4800, 0, 0, MWA8_NOP); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4800, 0x4800, 0, 0, SMH_NOP); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4807, 0x4807, 0, 0, cosmic_background_enable_w); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x480a, 0x480a, 0, 0, DAC_0_data_w); } diff --git a/src/mame/drivers/couple.c b/src/mame/drivers/couple.c index 0b5f5dba13c..5fa40e01156 100644 --- a/src/mame/drivers/couple.c +++ b/src/mame/drivers/couple.c @@ -148,8 +148,8 @@ static ADDRESS_MAP_START( merit_mem, ADDRESS_SPACE_PROGRAM, 8 ) // AM_RANGE( 0xc00a, 0xc00a ) AM_READ(input_port_1_r) AM_RANGE( 0xe000, 0xe000 ) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) AM_RANGE( 0xe001, 0xe001 ) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) - AM_RANGE( 0xe800, 0xefff ) AM_READWRITE(MRA8_RAM, couple_vram_hi_w) AM_BASE(&vram_hi) - AM_RANGE( 0xf000, 0xf7ff ) AM_READWRITE(MRA8_RAM, couple_vram_lo_w) AM_BASE(&vram_lo) + AM_RANGE( 0xe800, 0xefff ) AM_READWRITE(SMH_RAM, couple_vram_hi_w) AM_BASE(&vram_hi) + AM_RANGE( 0xf000, 0xf7ff ) AM_READWRITE(SMH_RAM, couple_vram_lo_w) AM_BASE(&vram_lo) AM_RANGE( 0xf800, 0xfbff ) AM_RAM /*extra VRAM?*/ ADDRESS_MAP_END diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c index 5d179bb9888..7ed93a050b5 100644 --- a/src/mame/drivers/cowrace.c +++ b/src/mame/drivers/cowrace.c @@ -89,8 +89,8 @@ AM_RANGE(0x38c2, 0x38c2) AM_READWRITE( ret_ff, cowrace_38c2_w ) AM_RANGE(0x0000, 0x2fff) AM_ROM AM_RANGE(0x3000, 0x33ff) AM_RAM - AM_RANGE(0x4000, 0x43ff) AM_READWRITE( MRA8_RAM, cowrace_videoram_w ) AM_BASE( &videoram ) - AM_RANGE(0x5000, 0x53ff) AM_READWRITE( MRA8_RAM, cowrace_colorram_w ) AM_BASE( &colorram ) + AM_RANGE(0x4000, 0x43ff) AM_READWRITE( SMH_RAM, cowrace_videoram_w ) AM_BASE( &videoram ) + AM_RANGE(0x5000, 0x53ff) AM_READWRITE( SMH_RAM, cowrace_colorram_w ) AM_BASE( &colorram ) ADDRESS_MAP_END static ADDRESS_MAP_START( io_map_cowrace, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 2aab359677f..d8a1ef9ead1 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -450,30 +450,30 @@ WRITE16_HANDLER( cps1_eeprom_port_w ) static ADDRESS_MAP_START( cps1_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) /* 68000 ROM */ + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) /* 68000 ROM */ AM_RANGE(0x800000, 0x800001) AM_READ(cps1_in1_r) /* Player input ports */ AM_RANGE(0x800010, 0x800011) AM_READ(cps1_in1_r) /* ?? */ AM_RANGE(0x800018, 0x800019) AM_READ(cps1_in0_r) /* System input ports */ AM_RANGE(0x80001a, 0x80001f) AM_READ(cps1_dsw_r) /* Dip Switches */ - AM_RANGE(0x800020, 0x800021) AM_READ(MRA16_NOP) /* ? Used by Rockman ? */ + AM_RANGE(0x800020, 0x800021) AM_READ(SMH_NOP) /* ? Used by Rockman ? */ AM_RANGE(0x800052, 0x800055) AM_READ(forgottn_dial_0_r) /* Forgotten Worlds */ AM_RANGE(0x80005a, 0x80005d) AM_READ(forgottn_dial_1_r) /* Forgotten Worlds */ AM_RANGE(0x800176, 0x800177) AM_READ(cps1_in2_r) /* Extra input ports */ AM_RANGE(0x800178, 0x800179) AM_READ(cps1_in3_r) /* Player 4 controls ("Captain Commando") */ AM_RANGE(0x8001fc, 0x8001fd) AM_READ(cps1_in2_r) /* Extra input ports ("SF Rev E") */ AM_RANGE(0x800100, 0x8001ff) AM_READ(cps1_output_r) /* Output ports */ - AM_RANGE(0x900000, 0x92ffff) AM_READ(MRA16_RAM) /* SF2CE executes code from here */ + AM_RANGE(0x900000, 0x92ffff) AM_READ(SMH_RAM) /* SF2CE executes code from here */ AM_RANGE(0xf00000, 0xf0ffff) AM_READ(qsound_rom_r) /* Slammasters protection */ AM_RANGE(0xf18000, 0xf19fff) AM_READ(qsound_sharedram1_r) /* Q RAM */ AM_RANGE(0xf1c000, 0xf1c001) AM_READ(cps1_in2_r) /* Player 3 controls (later games) */ AM_RANGE(0xf1c002, 0xf1c003) AM_READ(cps1_in3_r) /* Player 4 controls ("Muscle Bombers") */ AM_RANGE(0xf1c006, 0xf1c007) AM_READ(cps1_eeprom_port_r) AM_RANGE(0xf1e000, 0xf1ffff) AM_READ(qsound_sharedram2_r) /* Q RAM */ - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( cps1_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x800030, 0x800031) AM_WRITE(cps1_coinctrl_w) AM_RANGE(0x800040, 0x800041) AM_WRITE(forgottn_dial_0_reset_w) AM_RANGE(0x800048, 0x800049) AM_WRITE(forgottn_dial_1_reset_w) @@ -485,14 +485,14 @@ static ADDRESS_MAP_START( cps1_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf1c004, 0xf1c005) AM_WRITE(cpsq_coinctrl2_w) /* Coin control2 (later games) */ AM_RANGE(0xf1c006, 0xf1c007) AM_WRITE(cps1_eeprom_port_w) AM_RANGE(0xf1e000, 0xf1ffff) AM_WRITE(qsound_sharedram2_w) /* Q RAM */ - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) /* RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) /* RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) AM_RANGE(0xf001, 0xf001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xf002, 0xf002) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_r) @@ -500,8 +500,8 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(OKIM6295_data_0_w) diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index b0e0a57b572..c96163b097e 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -862,14 +862,14 @@ static READ16_HANDLER( joy_or_paddle_r ) *************************************/ static ADDRESS_MAP_START( cps2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x3fffff) AM_READ(MRA16_ROM) /* 68000 ROM */ - AM_RANGE(0x400000, 0x40000b) AM_READ(MRA16_RAM) /* CPS2 object output */ + AM_RANGE(0x000000, 0x3fffff) AM_READ(SMH_ROM) /* 68000 ROM */ + AM_RANGE(0x400000, 0x40000b) AM_READ(SMH_RAM) /* CPS2 object output */ AM_RANGE(0x618000, 0x619fff) AM_READ(qsound_sharedram1_r) /* Q RAM */ - AM_RANGE(0x662000, 0x662001) AM_READ(MRA16_RAM) /* Network adapter related, accessed in SSF2TB */ - AM_RANGE(0x662008, 0x662009) AM_READ(MRA16_RAM) /* Network adapter related, accessed in SSF2TB */ - AM_RANGE(0x662020, 0x662021) AM_READ(MRA16_RAM) /* Network adapter related, accessed in SSF2TB */ - AM_RANGE(0x660000, 0x663fff) AM_READ(MRA16_RAM) /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */ - AM_RANGE(0x664000, 0x664001) AM_READ(MRA16_RAM) /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */ + AM_RANGE(0x662000, 0x662001) AM_READ(SMH_RAM) /* Network adapter related, accessed in SSF2TB */ + AM_RANGE(0x662008, 0x662009) AM_READ(SMH_RAM) /* Network adapter related, accessed in SSF2TB */ + AM_RANGE(0x662020, 0x662021) AM_READ(SMH_RAM) /* Network adapter related, accessed in SSF2TB */ + AM_RANGE(0x660000, 0x663fff) AM_READ(SMH_RAM) /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */ + AM_RANGE(0x664000, 0x664001) AM_READ(SMH_RAM) /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */ AM_RANGE(0x708000, 0x709fff) AM_READ(cps2_objram2_r) /* Object RAM */ AM_RANGE(0x70a000, 0x70bfff) AM_READ(cps2_objram2_r) /* mirror */ AM_RANGE(0x70c000, 0x70dfff) AM_READ(cps2_objram2_r) /* mirror */ @@ -881,19 +881,19 @@ static ADDRESS_MAP_START( cps2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x804030, 0x804031) AM_READ(cps2_qsound_volume_r) /* Master volume. Also when bit 14=0 addon memory is present, when bit 15=0 network adapter present. */ AM_RANGE(0x8040b0, 0x8040b3) AM_READ(kludge_r) /* unknown (xmcotaj hangs if this is 0) */ AM_RANGE(0x804100, 0x8041ff) AM_READ(cps1_output_r) /* CPS1 Output ports */ - AM_RANGE(0x900000, 0x92ffff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* RAM */ + AM_RANGE(0x900000, 0x92ffff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( cps2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x3fffff) AM_WRITE(MWA16_ROM) /* ROM */ - AM_RANGE(0x400000, 0x40000b) AM_WRITE(MWA16_RAM) AM_BASE(&cps2_output) AM_SIZE(&cps2_output_size) /* CPS2 output */ + AM_RANGE(0x000000, 0x3fffff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x400000, 0x40000b) AM_WRITE(SMH_RAM) AM_BASE(&cps2_output) AM_SIZE(&cps2_output_size) /* CPS2 output */ AM_RANGE(0x618000, 0x619fff) AM_WRITE(qsound_sharedram1_w) /* Q RAM */ - AM_RANGE(0x662000, 0x662001) AM_WRITE(MWA16_RAM) /* Network adapter related, accessed in SSF2TB */ - AM_RANGE(0x662008, 0x662009) AM_WRITE(MWA16_RAM) /* Network adapter related, accessed in SSF2TB (not sure if this port is write only yet)*/ - AM_RANGE(0x662020, 0x662021) AM_WRITE(MWA16_RAM) /* Network adapter related, accessed in SSF2TB */ - AM_RANGE(0x660000, 0x663fff) AM_WRITE(MWA16_RAM) /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */ - AM_RANGE(0x664000, 0x664001) AM_WRITE(MWA16_RAM) /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */ + AM_RANGE(0x662000, 0x662001) AM_WRITE(SMH_RAM) /* Network adapter related, accessed in SSF2TB */ + AM_RANGE(0x662008, 0x662009) AM_WRITE(SMH_RAM) /* Network adapter related, accessed in SSF2TB (not sure if this port is write only yet)*/ + AM_RANGE(0x662020, 0x662021) AM_WRITE(SMH_RAM) /* Network adapter related, accessed in SSF2TB */ + AM_RANGE(0x660000, 0x663fff) AM_WRITE(SMH_RAM) /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */ + AM_RANGE(0x664000, 0x664001) AM_WRITE(SMH_RAM) /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */ AM_RANGE(0x700000, 0x701fff) AM_WRITE(cps2_objram1_w) AM_BASE(&cps2_objram1) /* Object RAM, no game seems to use it directly */ AM_RANGE(0x708000, 0x709fff) AM_WRITE(cps2_objram2_w) AM_BASE(&cps2_objram2) /* Object RAM */ AM_RANGE(0x70a000, 0x70bfff) AM_WRITE(cps2_objram2_w) /* mirror */ @@ -901,11 +901,11 @@ static ADDRESS_MAP_START( cps2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x70e000, 0x70ffff) AM_WRITE(cps2_objram2_w) /* mirror */ AM_RANGE(0x800100, 0x8001ff) AM_WRITE(cps1_output_w) /* Output ports mirror (sfa) */ AM_RANGE(0x804040, 0x804041) AM_WRITE(cps2_eeprom_port_w) /* EEPROM */ - AM_RANGE(0x8040a0, 0x8040a1) AM_WRITE(MWA16_NOP) /* Unknown (reset once on startup) */ + AM_RANGE(0x8040a0, 0x8040a1) AM_WRITE(SMH_NOP) /* Unknown (reset once on startup) */ AM_RANGE(0x8040e0, 0x8040e1) AM_WRITE(cps2_objram_bank_w) /* bit 0 = Object ram bank swap */ AM_RANGE(0x804100, 0x8041ff) AM_WRITE(cps1_output_w) AM_BASE(&cps1_output) AM_SIZE(&cps1_output_size) /* Output ports */ AM_RANGE(0x900000, 0x92ffff) AM_WRITE(cps1_gfxram_w) AM_BASE(&cps1_gfxram) AM_SIZE(&cps1_gfxram_size) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) /* RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) /* RAM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index 212edc718df..5eb8dc884a7 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -2355,22 +2355,22 @@ static ADDRESS_MAP_START( cps3_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x03000000, 0x030003ff) AM_RAM // 'FRAM' (SFIII memory test mode ONLY) -// AM_RANGE(0x04000000, 0x0407dfff) AM_RAM AM_BASE(&cps3_spriteram)//AM_WRITE(MWA32_RAM) // Sprite RAM (jojoba tests this size) - AM_RANGE(0x04000000, 0x0407ffff) AM_RAM AM_BASE(&cps3_spriteram)//AM_WRITE(MWA32_RAM) // Sprite RAM +// AM_RANGE(0x04000000, 0x0407dfff) AM_RAM AM_BASE(&cps3_spriteram)//AM_WRITE(SMH_RAM) // Sprite RAM (jojoba tests this size) + AM_RANGE(0x04000000, 0x0407ffff) AM_RAM AM_BASE(&cps3_spriteram)//AM_WRITE(SMH_RAM) // Sprite RAM AM_RANGE(0x04080000, 0x040bffff) AM_RAM AM_READWRITE(cps3_colourram_r, cps3_colourram_w) AM_BASE(&cps3_colourram) // Colour RAM (jojoba tests this size) 0x20000 colours?! // video registers of some kind probably AM_RANGE(0x040C0000, 0x040C0003) AM_READ(cps3_40C0000_r)//?? every frame AM_RANGE(0x040C0004, 0x040C0007) AM_READ(cps3_40C0004_r)//AM_READ(cps3_40C0004_r) // warzard reads this! -// AM_RANGE(0x040C0008, 0x040C000b) AM_WRITE(MWA32_NOP)//?? - AM_RANGE(0x040C000c, 0x040C000f) AM_READ(cps3_vbl_r)// AM_WRITE(MWA32_NOP)/ +// AM_RANGE(0x040C0008, 0x040C000b) AM_WRITE(SMH_NOP)//?? + AM_RANGE(0x040C000c, 0x040C000f) AM_READ(cps3_vbl_r)// AM_WRITE(SMH_NOP)/ AM_RANGE(0x040C0000, 0x040C001f) AM_WRITE(cps3_unk_vidregs_w) - AM_RANGE(0x040C0020, 0x040C002b) AM_WRITE(MWA32_RAM) AM_BASE(&tilemap20_regs_base) - AM_RANGE(0x040C0030, 0x040C003b) AM_WRITE(MWA32_RAM) AM_BASE(&tilemap30_regs_base) - AM_RANGE(0x040C0040, 0x040C004b) AM_WRITE(MWA32_RAM) AM_BASE(&tilemap40_regs_base) - AM_RANGE(0x040C0050, 0x040C005b) AM_WRITE(MWA32_RAM) AM_BASE(&tilemap50_regs_base) + AM_RANGE(0x040C0020, 0x040C002b) AM_WRITE(SMH_RAM) AM_BASE(&tilemap20_regs_base) + AM_RANGE(0x040C0030, 0x040C003b) AM_WRITE(SMH_RAM) AM_BASE(&tilemap30_regs_base) + AM_RANGE(0x040C0040, 0x040C004b) AM_WRITE(SMH_RAM) AM_BASE(&tilemap40_regs_base) + AM_RANGE(0x040C0050, 0x040C005b) AM_WRITE(SMH_RAM) AM_BASE(&tilemap50_regs_base) AM_RANGE(0x040C0060, 0x040C007f) AM_RAM AM_BASE(&cps3_fullscreenzoom) @@ -2392,7 +2392,7 @@ static ADDRESS_MAP_START( cps3_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x05000000, 0x05000003) AM_READ( cps3_io1_r ) AM_RANGE(0x05000004, 0x05000007) AM_READ( cps3_io2_r ) - AM_RANGE(0x05000008, 0x0500000b) AM_WRITE( MWA32_NOP ) // ?? every frame + AM_RANGE(0x05000008, 0x0500000b) AM_WRITE( SMH_NOP ) // ?? every frame AM_RANGE(0x05000a00, 0x05000a1f) AM_READ( cps3_unk_io_r ) // ?? every frame diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c index 4108ea53780..c5937817ac5 100644 --- a/src/mame/drivers/crbaloon.c +++ b/src/mame/drivers/crbaloon.c @@ -203,8 +203,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 is not decoded */ AM_RANGE(0x0000, 0x3fff) AM_ROM /* not fully populated */ AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM - AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_READWRITE(MRA8_RAM, crbaloon_videoram_w) AM_BASE(&crbaloon_videoram) - AM_RANGE(0x5000, 0x53ff) AM_MIRROR(0x0400) AM_READWRITE(MRA8_RAM, crbaloon_colorram_w) AM_BASE(&crbaloon_colorram) + AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_READWRITE(SMH_RAM, crbaloon_videoram_w) AM_BASE(&crbaloon_videoram) + AM_RANGE(0x5000, 0x53ff) AM_MIRROR(0x0400) AM_READWRITE(SMH_RAM, crbaloon_colorram_w) AM_BASE(&crbaloon_colorram) AM_RANGE(0x5800, 0x7fff) AM_NOP ADDRESS_MAP_END @@ -223,15 +223,15 @@ static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_MIRROR(0x0c) AM_MASK(0x0c) AM_READ(pc3259_r) AM_RANGE(0x03, 0x03) AM_MIRROR(0x0c) AM_READ_PORT("IN1") - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) /* not connected */ - AM_RANGE(0x01, 0x01) AM_WRITE(MWA8_NOP) /* watchdog */ - AM_RANGE(0x02, 0x04) AM_WRITE(MWA8_RAM) AM_BASE(&crbaloon_spriteram) + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /* not connected */ + AM_RANGE(0x01, 0x01) AM_WRITE(SMH_NOP) /* watchdog */ + AM_RANGE(0x02, 0x04) AM_WRITE(SMH_RAM) AM_BASE(&crbaloon_spriteram) AM_RANGE(0x05, 0x05) AM_WRITE(port_music_w) AM_RANGE(0x06, 0x06) AM_WRITE(port_sound_w) AM_RANGE(0x07, 0x0b) AM_WRITE(pc3092_w) AM_BASE(&pc3092_data) - AM_RANGE(0x0c, 0x0c) AM_WRITE(MWA8_NOP) /* MSK - to PC3259 */ - AM_RANGE(0x0d, 0x0d) AM_WRITE(MWA8_NOP) /* schematics has it in a box marked "NOT USE" */ - AM_RANGE(0x0e, 0x0f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x0c, 0x0c) AM_WRITE(SMH_NOP) /* MSK - to PC3259 */ + AM_RANGE(0x0d, 0x0d) AM_WRITE(SMH_NOP) /* schematics has it in a box marked "NOT USE" */ + AM_RANGE(0x0e, 0x0f) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c index 8ad977b5fdc..c3ec7e2cd4b 100644 --- a/src/mame/drivers/crgolf.c +++ b/src/mame/drivers/crgolf.c @@ -232,11 +232,11 @@ 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(0x8003, 0x8003) AM_WRITE(MWA8_RAM) AM_BASE(&crgolf_color_select) - AM_RANGE(0x8004, 0x8004) AM_WRITE(MWA8_RAM) AM_BASE(&crgolf_screen_flip) - AM_RANGE(0x8005, 0x8005) AM_WRITE(MWA8_RAM) AM_BASE(&crgolf_screen_select) - AM_RANGE(0x8006, 0x8006) AM_WRITE(MWA8_RAM) AM_BASE(&crgolf_screenb_enable) - AM_RANGE(0x8007, 0x8007) AM_WRITE(MWA8_RAM) AM_BASE(&crgolf_screena_enable) + AM_RANGE(0x8003, 0x8003) AM_WRITE(SMH_RAM) AM_BASE(&crgolf_color_select) + AM_RANGE(0x8004, 0x8004) AM_WRITE(SMH_RAM) AM_BASE(&crgolf_screen_flip) + AM_RANGE(0x8005, 0x8005) AM_WRITE(SMH_RAM) AM_BASE(&crgolf_screen_select) + AM_RANGE(0x8006, 0x8006) AM_WRITE(SMH_RAM) AM_BASE(&crgolf_screenb_enable) + AM_RANGE(0x8007, 0x8007) AM_WRITE(SMH_RAM) AM_BASE(&crgolf_screena_enable) AM_RANGE(0x8800, 0x8800) AM_READWRITE(sound_to_main_r, main_to_sound_w) AM_RANGE(0x9000, 0x9000) AM_WRITE(rom_bank_select_w) AM_RANGE(0xa000, 0xffff) AM_READWRITE(crgolf_videoram_r, crgolf_videoram_w) @@ -255,7 +255,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0xc000, 0xc000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(AY8910_write_port_0_w) - AM_RANGE(0xc002, 0xc002) AM_WRITE(MWA8_NOP) + AM_RANGE(0xc002, 0xc002) AM_WRITE(SMH_NOP) AM_RANGE(0xe000, 0xe000) AM_READWRITE(switch_input_r, switch_input_select_w) AM_RANGE(0xe001, 0xe001) AM_READWRITE(analog_input_r, unknown_w) AM_RANGE(0xe003, 0xe003) AM_READWRITE(main_to_sound_r, sound_to_main_w) diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index d8d092f8e59..0f47da279e3 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -49,8 +49,8 @@ static WRITE8_HANDLER( crimfght_snd_bankswitch_w ) /********************************************/ static ADDRESS_MAP_START( crimfght_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READ(MRA8_BANK1) /* banked RAM */ - AM_RANGE(0x0400, 0x1fff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_BANK1) /* banked RAM */ + AM_RANGE(0x0400, 0x1fff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0x3f80, 0x3f80) AM_READ(input_port_7_r) /* Coinsw */ AM_RANGE(0x3f81, 0x3f81) AM_READ(input_port_3_r) /* 1P controls */ AM_RANGE(0x3f82, 0x3f82) AM_READ(input_port_4_r) /* 2P controls */ @@ -61,31 +61,31 @@ static ADDRESS_MAP_START( crimfght_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3f87, 0x3f87) AM_READ(input_port_0_r) /* DSW #1 */ AM_RANGE(0x3f88, 0x3f88) AM_READ(watchdog_reset_r) /* watchdog reset */ AM_RANGE(0x2000, 0x5fff) AM_READ(K052109_051960_r) /* video RAM + sprite RAM */ - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK2) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK2) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( crimfght_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_WRITE(MWA8_BANK1) /* banked RAM */ - AM_RANGE(0x0400, 0x1fff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x03ff) AM_WRITE(SMH_BANK1) /* banked RAM */ + AM_RANGE(0x0400, 0x1fff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x3f88, 0x3f88) AM_WRITE(crimfght_coin_w) /* coin counters */ AM_RANGE(0x3f8c, 0x3f8c) AM_WRITE(crimfght_sh_irqtrigger_w) /* cause interrupt on audio CPU? */ AM_RANGE(0x2000, 0x5fff) AM_WRITE(K052109_051960_w) /* video RAM + sprite RAM */ - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_ROM) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_ROM) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( crimfght_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* ROM 821l01.h4 */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM 821l01.h4 */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0xa001, 0xa001) AM_READ(YM2151_status_port_0_r) /* YM2151 */ AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0xe000, 0xe00d) AM_READ(K007232_read_port_0_r) /* 007232 registers */ ADDRESS_MAP_END static ADDRESS_MAP_START( crimfght_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* ROM 821l01.h4 */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM 821l01.h4 */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2151_register_port_0_w) /* YM2151 */ AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2151_data_port_0_w) /* YM2151 */ AM_RANGE(0xe000, 0xe00d) AM_WRITE(K007232_write_port_0_w) /* 007232 registers */ @@ -495,11 +495,11 @@ static void crimfght_banking( int lines ) /* bit 5 = select work RAM or palette */ if (lines & 0x20) { - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x03ff, 0, 0, MRA8_BANK3, paletteram_xBBBBBGGGGGRRRRR_be_w); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x03ff, 0, 0, SMH_BANK3, paletteram_xBBBBBGGGGGRRRRR_be_w); memory_set_bankptr(3, paletteram); } else - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x03ff, 0, 0, MRA8_BANK1, MWA8_BANK1); /* RAM */ + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x03ff, 0, 0, SMH_BANK1, SMH_BANK1); /* RAM */ /* bit 6 = enable char ROM reading through the video RAM */ K052109_set_RMRD_line((lines & 0x40) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index 5da1b5b9b70..50c22ebdd59 100644 --- a/src/mame/drivers/crospang.c +++ b/src/mame/drivers/crospang.c @@ -61,47 +61,47 @@ static WRITE16_HANDLER ( crospang_soundlatch_w ) /* main cpu */ static ADDRESS_MAP_START( crospang_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) - AM_RANGE(0x122000, 0x1227ff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x2005ff) AM_READ(MRA16_RAM) - AM_RANGE(0x210000, 0x2107ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) + AM_RANGE(0x122000, 0x1227ff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x2005ff) AM_READ(SMH_RAM) + AM_RANGE(0x210000, 0x2107ff) AM_READ(SMH_RAM) AM_RANGE(0x280000, 0x280001) AM_READ(input_port_0_word_r) AM_RANGE(0x280002, 0x280003) AM_READ(input_port_1_word_r) AM_RANGE(0x280004, 0x280005) AM_READ(input_port_2_word_r) - AM_RANGE(0x320000, 0x32ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x320000, 0x32ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( crospang_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_NOP) // writes to rom quite often - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_NOP) // writes to rom quite often + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) AM_RANGE(0x100002, 0x100003) AM_WRITE(crospang_fg_scrolly_w) AM_RANGE(0x100004, 0x100005) AM_WRITE(crospang_bg_scrollx_w) AM_RANGE(0x100006, 0x100007) AM_WRITE(crospang_bg_scrolly_w) AM_RANGE(0x100008, 0x100009) AM_WRITE(crospang_fg_scrollx_w) - AM_RANGE(0x10000e, 0x10000f) AM_WRITE(MWA16_NOP) + AM_RANGE(0x10000e, 0x10000f) AM_WRITE(SMH_NOP) AM_RANGE(0x120000, 0x1207ff) AM_WRITE(crospang_fg_videoram_w) AM_BASE(&crospang_fg_videoram) AM_RANGE(0x122000, 0x1227ff) AM_WRITE(crospang_bg_videoram_w) AM_BASE(&crospang_bg_videoram) AM_RANGE(0x200000, 0x2005ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x210000, 0x2107ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x210000, 0x2107ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x270000, 0x270001) AM_WRITE(crospang_soundlatch_w) - AM_RANGE(0x320000, 0x32ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x320000, 0x32ffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( bestri_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) - AM_RANGE(0x122000, 0x1227ff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x2005ff) AM_READ(MRA16_RAM) - AM_RANGE(0x210000, 0x2107ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) + AM_RANGE(0x122000, 0x1227ff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x2005ff) AM_READ(SMH_RAM) + AM_RANGE(0x210000, 0x2107ff) AM_READ(SMH_RAM) AM_RANGE(0x280000, 0x280001) AM_READ(input_port_0_word_r) AM_RANGE(0x280002, 0x280003) AM_READ(input_port_1_word_r) AM_RANGE(0x280004, 0x280005) AM_READ(input_port_2_word_r) - AM_RANGE(0x3a0000, 0x3affff) AM_READ(MRA16_RAM) + AM_RANGE(0x3a0000, 0x3affff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( bestri_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_NOP) // writes to rom quite often + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_NOP) // writes to rom quite often AM_RANGE(0x100004, 0x100005) AM_WRITE(bestri_fg_scrollx_w) AM_RANGE(0x100006, 0x100007) AM_WRITE(bestri_fg_scrolly_w) @@ -112,25 +112,25 @@ static ADDRESS_MAP_START( bestri_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x120000, 0x1207ff) AM_WRITE(crospang_fg_videoram_w) AM_BASE(&crospang_fg_videoram) AM_RANGE(0x122000, 0x1227ff) AM_WRITE(crospang_bg_videoram_w) AM_BASE(&crospang_bg_videoram) AM_RANGE(0x200000, 0x2005ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x210000, 0x2107ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x210000, 0x2107ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x270000, 0x270001) AM_WRITE(crospang_soundlatch_w) - AM_RANGE(0x270004, 0x270005) AM_WRITE(MWA16_NOP) + AM_RANGE(0x270004, 0x270005) AM_WRITE(SMH_NOP) - AM_RANGE(0x3a0000, 0x3affff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x3a0000, 0x3affff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /* sound cpu */ static ADDRESS_MAP_START( crospang_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( crospang_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( crospang_sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index 16b24432c97..81c646aed4e 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -184,16 +184,16 @@ static WRITE8_HANDLER( pending_command_clear_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x300000, 0x3fffff) AM_READ(extrarom1_r) AM_RANGE(0x400000, 0x4fffff) AM_READ(extrarom2_r) AM_RANGE(0x500000, 0x5fffff) AM_READ(extrarom2_r) /* mirror */ - AM_RANGE(0xa00000, 0xa0ffff) AM_READ(MRA16_RAM) - AM_RANGE(0xd00000, 0xd01fff) AM_READ(MRA16_RAM) - AM_RANGE(0xe00000, 0xe01fff) AM_READ(MRA16_RAM) - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) - AM_RANGE(0xffd000, 0xffdfff) AM_READ(MRA16_RAM) - AM_RANGE(0xffe000, 0xffefff) AM_READ(MRA16_RAM) + AM_RANGE(0xa00000, 0xa0ffff) AM_READ(SMH_RAM) + AM_RANGE(0xd00000, 0xd01fff) AM_READ(SMH_RAM) + AM_RANGE(0xe00000, 0xe01fff) AM_READ(SMH_RAM) + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) + AM_RANGE(0xffd000, 0xffdfff) AM_READ(SMH_RAM) + AM_RANGE(0xffe000, 0xffefff) AM_READ(SMH_RAM) AM_RANGE(0xfff000, 0xfff001) AM_READ(input_port_0_word_r) AM_RANGE(0xfff002, 0xfff003) AM_READ(input_port_1_word_r) AM_RANGE(0xfff004, 0xfff005) AM_READ(input_port_2_word_r) @@ -203,30 +203,30 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) // RAM-5 + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) // RAM-5 AM_RANGE(0xd00000, 0xd01fff) AM_WRITE(crshrace_videoram1_w) AM_BASE(&crshrace_videoram1) // RAM-3 H/L - AM_RANGE(0xe00000, 0xe01fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // RAM-6 + AM_RANGE(0xe00000, 0xe01fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // RAM-6 AM_RANGE(0xffc000, 0xffc001) AM_WRITE(crshrace_roz_bank_w) - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) /* work RAM */ // RAM-1 H/L + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* work RAM */ // RAM-1 H/L AM_RANGE(0xffd000, 0xffdfff) AM_WRITE(crshrace_videoram2_w) AM_BASE(&crshrace_videoram2) // RAM-2 H/L AM_RANGE(0xffe000, 0xffefff) AM_WRITE(paletteram16_xGGGGGBBBBBRRRRR_word_w) AM_BASE(&paletteram16) // RAM-4 H/L AM_RANGE(0xfff000, 0xfff001) AM_WRITE(crshrace_gfxctrl_w) AM_RANGE(0xfff008, 0xfff009) AM_WRITE(sound_command_w) - AM_RANGE(0xfff020, 0xfff03f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) - AM_RANGE(0xfff044, 0xfff047) AM_WRITE(MWA16_RAM) // ??? moves during race + AM_RANGE(0xfff020, 0xfff03f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) + AM_RANGE(0xfff044, 0xfff047) AM_WRITE(SMH_RAM) // ??? moves during race ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index 97b029c299c..5cb90532c24 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -519,7 +519,7 @@ static ADDRESS_MAP_START( crystal_mem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x04800000, 0x04800fff) AM_READ(VR0_Snd_Read) AM_WRITE(VR0_Snd_Write) AM_RANGE(0x05000000, 0x05000003) AM_READ(FlashCmd_r) AM_WRITE(FlashCmd_w) - AM_RANGE(0x05000000, 0x05ffffff) AM_READ(MRA32_BANK1) + AM_RANGE(0x05000000, 0x05ffffff) AM_READ(SMH_BANK1) AM_RANGE(0x44414F4C, 0x44414F7F) AM_RAM AM_BASE(&ResetPatch) diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index a0ea27e7d44..3465d8b2b56 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -258,9 +258,9 @@ static READ8_HANDLER(pal_r) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xafff) AM_READ(MRA8_BANK1) - AM_RANGE(0xb000, 0xb0ff) AM_READ(MRA8_RAM) // sound related ? + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xafff) AM_READ(SMH_BANK1) + AM_RANGE(0xb000, 0xb0ff) AM_READ(SMH_RAM) // sound related ? AM_RANGE(0xc000, 0xc1ff) AM_WRITE(pal_w) AM_READ(pal_r) AM_BASE(&paletteram) AM_RANGE(0xc200, 0xc200) AM_READ(input_port_0_r) AM_RANGE(0xc201, 0xc201) AM_READ(input_port_1_r) @@ -268,34 +268,34 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc203, 0xc203) AM_READ(input_port_3_r) AM_RANGE(0xc204, 0xc204) AM_READ(input_port_4_r) AM_RANGE(0xc205, 0xc205) AM_READ(cshooter_coin_r) // hack until I understand - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xafff) AM_WRITE(MWA8_RAM) // to be confirmed + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xafff) AM_WRITE(SMH_RAM) // to be confirmed AM_RANGE(0xc500, 0xc500) AM_WRITE(cshooter_c500_w) - AM_RANGE(0xc600, 0xc600) AM_WRITE(MWA8_NOP) // see notes + AM_RANGE(0xc600, 0xc600) AM_WRITE(SMH_NOP) // see notes AM_RANGE(0xc700, 0xc700) AM_WRITE(cshooter_c700_w) - AM_RANGE(0xc801, 0xc801) AM_WRITE(MWA8_NOP) // see notes + AM_RANGE(0xc801, 0xc801) AM_WRITE(SMH_NOP) // see notes AM_RANGE(0xd000, 0xd7ff) AM_WRITE(cshooter_txram_w) AM_BASE(&cshooter_txram) - AM_RANGE(0xd800, 0xdfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd800, 0xdfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( arreadmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xb000, 0xb0ff) AM_RAM // sound related ? - AM_RANGE(0xb100, 0xb1ff) AM_RAM//READ(MRA8_BANK1) // sound related ? + AM_RANGE(0xb100, 0xb1ff) AM_RAM//READ(SMH_BANK1) // sound related ? AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r) AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r) AM_RANGE(0xc004, 0xc004) AM_READ(input_port_4_r) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) AM_RANGE(0xd800, 0xdbff) AM_WRITE(pal2_w) AM_READ(pal_r) AM_BASE(&paletteram) AM_RANGE(0xdc11, 0xdc11) AM_WRITE(bank_w) AM_RANGE(0xdc00, 0xddff) AM_RAM @@ -305,13 +305,13 @@ static ADDRESS_MAP_START( arreadmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( arwritemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc500, 0xc500) AM_WRITE(cshooter_c500_w) - AM_RANGE(0xc600, 0xc600) AM_WRITE(MWA8_NOP) // see notes + AM_RANGE(0xc600, 0xc600) AM_WRITE(SMH_NOP) // see notes AM_RANGE(0xc700, 0xc700) AM_WRITE(cshooter_c700_w) - AM_RANGE(0xc801, 0xc801) AM_WRITE(MWA8_NOP) // see notes + AM_RANGE(0xc801, 0xc801) AM_WRITE(SMH_NOP) // see notes AM_RANGE(0xd000, 0xd7ff) AM_WRITE(cshooter_txram_w) AM_BASE(&cshooter_txram) ADDRESS_MAP_END @@ -329,17 +329,17 @@ ADDRESS_MAP_END /* Sound CPU */ static ADDRESS_MAP_START( s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc000) AM_WRITE(MWA8_NOP) // YM2203_control_port_0_w ? - AM_RANGE(0xc001, 0xc001) AM_WRITE(MWA8_NOP) // YM2203_write_port_0_w - AM_RANGE(0xc800, 0xc800) AM_WRITE(MWA8_NOP) // YM2203_control_port_1_w ? - AM_RANGE(0xc801, 0xc801) AM_WRITE(MWA8_NOP) // YM2203_write_port_1_w - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_NOP) // YM2203_control_port_0_w ? + AM_RANGE(0xc001, 0xc001) AM_WRITE(SMH_NOP) // YM2203_write_port_0_w + AM_RANGE(0xc800, 0xc800) AM_WRITE(SMH_NOP) // YM2203_control_port_1_w ? + AM_RANGE(0xc801, 0xc801) AM_WRITE(SMH_NOP) // YM2203_write_port_1_w + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( s2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -349,11 +349,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( s2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x4000, 0x4000) AM_WRITE(MWA8_NOP) // YM2203_control_port_0_w ? - AM_RANGE(0x4001, 0x4001) AM_WRITE(MWA8_NOP) // YM2203_write_port_0_w + AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_NOP) // YM2203_control_port_0_w ? + AM_RANGE(0x4001, 0x4001) AM_WRITE(SMH_NOP) // YM2203_write_port_0_w - AM_RANGE(0x4008, 0x4008) AM_WRITE(MWA8_NOP) // YM2203_control_port_0_w ? - AM_RANGE(0x4009, 0x4009) AM_WRITE(MWA8_NOP) // YM2203_write_port_0_w + AM_RANGE(0x4008, 0x4008) AM_WRITE(SMH_NOP) // YM2203_control_port_0_w ? + AM_RANGE(0x4009, 0x4009) AM_WRITE(SMH_NOP) // YM2203_write_port_0_w ADDRESS_MAP_END diff --git a/src/mame/drivers/csk.c b/src/mame/drivers/csk.c index ffa10d3ce43..97e233e0f07 100644 --- a/src/mame/drivers/csk.c +++ b/src/mame/drivers/csk.c @@ -206,7 +206,7 @@ static ADDRESS_MAP_START( cpoker_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x50a0, 0x50a0) AM_READ(input_port_8_r) /* Not connected */ AM_RANGE(0x50b0, 0x50b0) AM_WRITE(YM2413_register_port_0_w) AM_RANGE(0x50b1, 0x50b1) AM_WRITE(YM2413_data_port_0_w) - AM_RANGE(0x6800, 0x6fff) AM_WRITE(MWA8_RAM) AM_BASE(&cpk_expram) + AM_RANGE(0x6800, 0x6fff) AM_WRITE(SMH_RAM) AM_BASE(&cpk_expram) AM_RANGE(0x7000, 0x77ff) AM_RAM AM_BASE(&cpk_videoram) AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&cpk_colorram) AM_RANGE(0x8000, 0xffff) AM_READ(cpk_expansion_r) @@ -226,7 +226,7 @@ static ADDRESS_MAP_START( csk227_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x50a0, 0x50a0) AM_READ(input_port_8_r) /* Not connected */ AM_RANGE(0x50b0, 0x50b0) AM_WRITE(YM2413_register_port_0_w) AM_RANGE(0x50b1, 0x50b1) AM_WRITE(YM2413_data_port_0_w) - AM_RANGE(0x6800, 0x6fff) AM_WRITE(MWA8_RAM) AM_BASE(&cpk_expram) + AM_RANGE(0x6800, 0x6fff) AM_WRITE(SMH_RAM) AM_BASE(&cpk_expram) AM_RANGE(0x7000, 0x77ff) AM_RAM AM_BASE(&cpk_videoram) AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&cpk_colorram) AM_RANGE(0x8000, 0xffff) AM_READ(cpk_expansion_r) @@ -247,7 +247,7 @@ static ADDRESS_MAP_START( csk234_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x50a0, 0x50a0) AM_READ(input_port_8_r) /* Not connected */ AM_RANGE(0x50b0, 0x50b0) AM_WRITE(YM2413_register_port_0_w) AM_RANGE(0x50b1, 0x50b1) AM_WRITE(YM2413_data_port_0_w) - AM_RANGE(0x6800, 0x6fff) AM_WRITE(MWA8_RAM) AM_BASE(&cpk_expram) + AM_RANGE(0x6800, 0x6fff) AM_WRITE(SMH_RAM) AM_BASE(&cpk_expram) AM_RANGE(0x7000, 0x77ff) AM_RAM AM_BASE(&cpk_videoram) AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&cpk_colorram) AM_RANGE(0x8000, 0xffff) AM_READ(cpk_expansion_r) diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c index 5357028a5b3..7f325bd3a50 100644 --- a/src/mame/drivers/cubocd32.c +++ b/src/mame/drivers/cubocd32.c @@ -82,10 +82,10 @@ static WRITE32_HANDLER( aga_overlay_w ) /* 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(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x1fffff, 0, 0, MWA32_BANK1); + memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x1fffff, 0, 0, SMH_BANK1); else /* overlay enabled, map Amiga system ROM on 0x000000 */ - memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x1fffff, 0, 0, MWA32_UNMAP); + memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x1fffff, 0, 0, SMH_UNMAP); } } diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index 5879b3c005b..108f0934bb4 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -557,7 +557,7 @@ static ADDRESS_MAP_START( cvs_dac_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x1800) AM_READ(soundlatch_r) AM_RANGE(0x1840, 0x1840) AM_WRITE(DAC_0_data_w) AM_RANGE(0x1880, 0x1883) AM_WRITE(cvs_4_bit_dac_data_w) AM_BASE(&cvs_4_bit_dac_data) - AM_RANGE(0x1884, 0x1887) AM_WRITE(MWA8_NOP) /* not connected to anything */ + AM_RANGE(0x1884, 0x1887) AM_WRITE(SMH_NOP) /* not connected to anything */ ADDRESS_MAP_END diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index 11482358a11..545fa82238f 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -171,17 +171,17 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfd8000, 0xfd9fff) AM_WRITE(atarigen_sound_upper_w) AM_RANGE(0xfe0000, 0xfe0fff) AM_READ(special_port0_r) AM_RANGE(0xfe1000, 0xfe1fff) AM_READ(input_port_1_word_r) - AM_RANGE(0xfe8000, 0xfe8fff) AM_READWRITE(MRA16_RAM, cyberbal_paletteram_1_w) AM_SHARE(1) AM_BASE(&cyberbal_paletteram_1) - AM_RANGE(0xfec000, 0xfecfff) AM_READWRITE(MRA16_RAM, cyberbal_paletteram_0_w) AM_SHARE(2) AM_BASE(&cyberbal_paletteram_0) - AM_RANGE(0xff0000, 0xff1fff) AM_READWRITE(MRA16_RAM, atarigen_playfield2_w) AM_SHARE(3) AM_BASE(&atarigen_playfield2) - AM_RANGE(0xff2000, 0xff2fff) AM_READWRITE(MRA16_RAM, atarigen_alpha2_w) AM_SHARE(4) AM_BASE(&atarigen_alpha2) - AM_RANGE(0xff3000, 0xff37ff) AM_READWRITE(MRA16_RAM, atarimo_1_spriteram_w) AM_SHARE(5) AM_BASE(&atarimo_1_spriteram) + AM_RANGE(0xfe8000, 0xfe8fff) AM_READWRITE(SMH_RAM, cyberbal_paletteram_1_w) AM_SHARE(1) AM_BASE(&cyberbal_paletteram_1) + AM_RANGE(0xfec000, 0xfecfff) AM_READWRITE(SMH_RAM, cyberbal_paletteram_0_w) AM_SHARE(2) AM_BASE(&cyberbal_paletteram_0) + AM_RANGE(0xff0000, 0xff1fff) AM_READWRITE(SMH_RAM, atarigen_playfield2_w) AM_SHARE(3) AM_BASE(&atarigen_playfield2) + AM_RANGE(0xff2000, 0xff2fff) AM_READWRITE(SMH_RAM, atarigen_alpha2_w) AM_SHARE(4) AM_BASE(&atarigen_alpha2) + AM_RANGE(0xff3000, 0xff37ff) AM_READWRITE(SMH_RAM, atarimo_1_spriteram_w) AM_SHARE(5) AM_BASE(&atarimo_1_spriteram) AM_RANGE(0xff3800, 0xff3fff) AM_RAM AM_SHARE(6) - AM_RANGE(0xff4000, 0xff5fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_w) AM_SHARE(7) AM_BASE(&atarigen_playfield) - AM_RANGE(0xff6000, 0xff6fff) AM_READWRITE(MRA16_RAM, atarigen_alpha_w) AM_SHARE(8) AM_BASE(&atarigen_alpha) - AM_RANGE(0xff7000, 0xff77ff) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_SHARE(9) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0xff4000, 0xff5fff) AM_READWRITE(SMH_RAM, atarigen_playfield_w) AM_SHARE(7) AM_BASE(&atarigen_playfield) + AM_RANGE(0xff6000, 0xff6fff) AM_READWRITE(SMH_RAM, atarigen_alpha_w) AM_SHARE(8) AM_BASE(&atarigen_alpha) + AM_RANGE(0xff7000, 0xff77ff) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_SHARE(9) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xff7800, 0xff9fff) AM_RAM AM_SHARE(10) - AM_RANGE(0xffa000, 0xffbfff) AM_READWRITE(MRA16_RAM, MWA16_NOP) AM_SHARE(11) + AM_RANGE(0xffa000, 0xffbfff) AM_READWRITE(SMH_RAM, SMH_NOP) AM_SHARE(11) AM_RANGE(0xffc000, 0xffffff) AM_RAM AM_SHARE(12) ADDRESS_MAP_END @@ -198,18 +198,18 @@ static ADDRESS_MAP_START( extra_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfc0000, 0xfdffff) AM_WRITE(atarigen_video_int_ack_w) AM_RANGE(0xfe0000, 0xfe0fff) AM_READ(special_port0_r) AM_RANGE(0xfe1000, 0xfe1fff) AM_READ(input_port_1_word_r) - AM_RANGE(0xfe8000, 0xfe8fff) AM_READWRITE(MRA16_RAM, cyberbal_paletteram_1_w) AM_SHARE(1) - AM_RANGE(0xfec000, 0xfecfff) AM_READWRITE(MRA16_RAM, cyberbal_paletteram_0_w) AM_SHARE(2) - AM_RANGE(0xff0000, 0xff1fff) AM_READWRITE(MRA16_RAM, atarigen_playfield2_w) AM_SHARE(3) - AM_RANGE(0xff2000, 0xff2fff) AM_READWRITE(MRA16_RAM, atarigen_alpha2_w) AM_SHARE(4) - AM_RANGE(0xff3000, 0xff37ff) AM_READWRITE(MRA16_RAM, atarimo_1_spriteram_w) AM_SHARE(5) + AM_RANGE(0xfe8000, 0xfe8fff) AM_READWRITE(SMH_RAM, cyberbal_paletteram_1_w) AM_SHARE(1) + AM_RANGE(0xfec000, 0xfecfff) AM_READWRITE(SMH_RAM, cyberbal_paletteram_0_w) AM_SHARE(2) + AM_RANGE(0xff0000, 0xff1fff) AM_READWRITE(SMH_RAM, atarigen_playfield2_w) AM_SHARE(3) + AM_RANGE(0xff2000, 0xff2fff) AM_READWRITE(SMH_RAM, atarigen_alpha2_w) AM_SHARE(4) + AM_RANGE(0xff3000, 0xff37ff) AM_READWRITE(SMH_RAM, atarimo_1_spriteram_w) AM_SHARE(5) AM_RANGE(0xff3800, 0xff3fff) AM_RAM AM_SHARE(6) - AM_RANGE(0xff4000, 0xff5fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_w) AM_SHARE(7) - AM_RANGE(0xff6000, 0xff6fff) AM_READWRITE(MRA16_RAM, atarigen_alpha_w) AM_SHARE(8) - AM_RANGE(0xff7000, 0xff77ff) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_SHARE(9) + AM_RANGE(0xff4000, 0xff5fff) AM_READWRITE(SMH_RAM, atarigen_playfield_w) AM_SHARE(7) + AM_RANGE(0xff6000, 0xff6fff) AM_READWRITE(SMH_RAM, atarigen_alpha_w) AM_SHARE(8) + AM_RANGE(0xff7000, 0xff77ff) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_SHARE(9) AM_RANGE(0xff7800, 0xff9fff) AM_RAM AM_SHARE(10) AM_RANGE(0xffa000, 0xffbfff) AM_RAM AM_SHARE(11) - AM_RANGE(0xffc000, 0xffffff) AM_READWRITE(MRA16_RAM, MWA16_NOP) AM_SHARE(12) + AM_RANGE(0xffc000, 0xffffff) AM_READWRITE(SMH_RAM, SMH_NOP) AM_SHARE(12) ADDRESS_MAP_END @@ -268,16 +268,16 @@ static ADDRESS_MAP_START( cyberb2p_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfc4000, 0xfc4003) AM_READ(special_port2_r) AM_RANGE(0xfc6000, 0xfc6003) AM_READ(atarigen_sound_upper_r) AM_RANGE(0xfc8000, 0xfc8fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) - AM_RANGE(0xfca000, 0xfcafff) AM_READWRITE(MRA16_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0xfca000, 0xfcafff) AM_READWRITE(SMH_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0xfd0000, 0xfd0003) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0xfd2000, 0xfd2003) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0xfd4000, 0xfd4003) AM_WRITE(watchdog_reset16_w) AM_RANGE(0xfd6000, 0xfd6003) AM_WRITE(atarigen_video_int_ack_w) AM_RANGE(0xfd8000, 0xfd8003) AM_WRITE(atarigen_sound_upper_w) AM_RANGE(0xfe0000, 0xfe0003) AM_READ(sound_state_r) - AM_RANGE(0xff0000, 0xff1fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0xff2000, 0xff2fff) AM_READWRITE(MRA16_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) - AM_RANGE(0xff3000, 0xff37ff) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0xff0000, 0xff1fff) AM_READWRITE(SMH_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0xff2000, 0xff2fff) AM_READWRITE(SMH_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) + AM_RANGE(0xff3000, 0xff37ff) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xff3800, 0xffffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index 716abae61a4..b1ff9f6368a 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -372,10 +372,10 @@ static ADDRESS_MAP_START( master_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x080000, 0x087fff) AM_RAM /*Work RAM*/ AM_RANGE(0x0a0000, 0x0a0fff) AM_RAM - AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(MRA16_RAM, tx_vram_w) AM_BASE(&tx_vram) + AM_RANGE(0x0c0000, 0x0c3fff) AM_READWRITE(SMH_RAM, tx_vram_w) AM_BASE(&tx_vram) AM_RANGE(0x0c4000, 0x0cffff) AM_RAM AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(share_r, share_w) AM_BASE(&shared_ram) - AM_RANGE(0x100000, 0x107fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x100000, 0x107fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x110000, 0x1101ff) AM_READWRITE(io_r,io_w) AM_BASE(&io_ram) ADDRESS_MAP_END diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c index c015bc70b38..4eb6afe94c9 100644 --- a/src/mame/drivers/dambustr.c +++ b/src/mame/drivers/dambustr.c @@ -33,11 +33,11 @@ static WRITE8_HANDLER( dambustr_noise_enable_w ) static ADDRESS_MAP_START( dambustr_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd3ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd3ff) AM_READ(SMH_RAM) AM_RANGE(0xd400, 0xd7ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0xd800, 0xd8ff) AM_READ(MRA8_RAM) + AM_RANGE(0xd800, 0xd8ff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) AM_RANGE(0xe800, 0xefff) AM_READ(input_port_1_r) AM_RANGE(0xf000, 0xf7ff) AM_READ(input_port_2_r) @@ -46,15 +46,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dambustr_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_WRITE(dambustr_bg_color_w) AM_RANGE(0x8001, 0x8001) AM_WRITE(dambustr_bg_split_line_w) AM_RANGE(0xd000, 0xd3ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0xd800, 0xd83f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0xd840, 0xd85f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0xd860, 0xd87f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0xd880, 0xd8ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd840, 0xd85f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0xd860, 0xd87f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0xd880, 0xd8ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe002, 0xe003) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0xe004, 0xe007) AM_WRITE(galaxian_lfo_freq_w) AM_RANGE(0xe800, 0xe802) AM_WRITE(galaxian_background_enable_w) diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index 8d5335d2f2a..89771b3f3d9 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -248,20 +248,20 @@ logerror("CPU #0 PC %06x: warning - write unmapped ioc offset %06x with %04x\n", ***********************************************************/ static ADDRESS_MAP_START( darius_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x08ffff) AM_READ(MRA16_RAM) /* main RAM */ + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x08ffff) AM_READ(SMH_RAM) /* main RAM */ AM_RANGE(0xc00000, 0xc0001f) AM_READ(darius_ioc_r) /* inputs, sound */ AM_RANGE(0xd00000, 0xd0ffff) AM_READ(PC080SN_word_0_r) /* tilemaps */ - AM_RANGE(0xd80000, 0xd80fff) AM_READ(MRA16_RAM) /* palette */ + AM_RANGE(0xd80000, 0xd80fff) AM_READ(SMH_RAM) /* palette */ AM_RANGE(0xe00100, 0xe00fff) AM_RAM AM_SHARE(1) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xe01000, 0xe02fff) AM_RAM AM_SHARE(2) - AM_RANGE(0xe08000, 0xe0ffff) AM_READWRITE(MRA16_RAM, darius_fg_layer_w) AM_SHARE(3) AM_BASE(&darius_fg_ram) - AM_RANGE(0xe10000, 0xe10fff) AM_READ(MRA16_RAM) /* ??? */ + AM_RANGE(0xe08000, 0xe0ffff) AM_READWRITE(SMH_RAM, darius_fg_layer_w) AM_SHARE(3) AM_BASE(&darius_fg_ram) + AM_RANGE(0xe10000, 0xe10fff) AM_READ(SMH_RAM) /* ??? */ ADDRESS_MAP_END static ADDRESS_MAP_START( darius_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x08ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x08ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(cpua_ctrl_w) AM_RANGE(0x0b0000, 0x0b0001) AM_WRITE(darius_watchdog_w) AM_RANGE(0xc00000, 0xc0007f) AM_WRITE(darius_ioc_w) /* coin ctr & lockout, sound */ @@ -270,20 +270,20 @@ static ADDRESS_MAP_START( darius_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd40000, 0xd40003) AM_WRITE(PC080SN_xscroll_word_0_w) AM_RANGE(0xd50000, 0xd50003) AM_WRITE(PC080SN_ctrl_word_0_w) AM_RANGE(0xd80000, 0xd80fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xe10000, 0xe10fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xe10000, 0xe10fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( darius_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x04ffff) AM_READ(MRA16_RAM) /* local RAM */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x04ffff) AM_READ(SMH_RAM) /* local RAM */ AM_RANGE(0xe00100, 0xe00fff) AM_RAM AM_SHARE(1) AM_RANGE(0xe01000, 0xe02fff) AM_RAM AM_SHARE(2) - AM_RANGE(0xe08000, 0xe0ffff) AM_READWRITE(MRA16_RAM, darius_fg_layer_w) AM_SHARE(3) + AM_RANGE(0xe08000, 0xe0ffff) AM_READWRITE(SMH_RAM, darius_fg_layer_w) AM_SHARE(3) ADDRESS_MAP_END static ADDRESS_MAP_START( darius_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x04ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x04ffff) AM_WRITE(SMH_RAM) AM_RANGE(0xc00000, 0xc0007f) AM_WRITE(darius_ioc_w) /* only writes $c00050 (?) */ AM_RANGE(0xd80000, 0xd80fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) ADDRESS_MAP_END @@ -475,19 +475,19 @@ static WRITE8_HANDLER( darius_write_portB1 ) *****************************************************/ static ADDRESS_MAP_START( darius_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x9001, 0x9001) AM_READ(YM2203_read_port_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_1_r) AM_RANGE(0xa001, 0xa001) AM_READ(YM2203_read_port_1_r) - AM_RANGE(0xb000, 0xb000) AM_READ(MRA8_NOP) + AM_RANGE(0xb000, 0xb000) AM_READ(SMH_NOP) AM_RANGE(0xb001, 0xb001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END static ADDRESS_MAP_START( darius_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_1_w) @@ -505,12 +505,12 @@ static ADDRESS_MAP_START( darius_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( darius_sound2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xffff) AM_READ(SMH_ROM) /* yes, no RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( darius_sound2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xffff) AM_WRITE(MWA8_NOP) /* writes rom whenever interrupt occurs - as no stack */ + AM_RANGE(0x0000, 0xffff) AM_WRITE(SMH_NOP) /* writes rom whenever interrupt occurs - as no stack */ /* yes, no RAM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 55fe2816b53..19aa4610ef5 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -313,35 +313,35 @@ static WRITE32_HANDLER( darkhors_unk1_w ) } static ADDRESS_MAP_START( darkhors_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ( MRA32_ROM ) - AM_RANGE(0x400000, 0x41ffff) AM_READ( MRA32_RAM ) + AM_RANGE(0x000000, 0x0fffff) AM_READ( SMH_ROM ) + AM_RANGE(0x400000, 0x41ffff) AM_READ( SMH_RAM ) AM_RANGE(0x4e0080, 0x4e0083) AM_READ( darkhors_eeprom_r ) AM_RANGE(0x580000, 0x580003) AM_READ( input_port_0_dword_r ) AM_RANGE(0x580004, 0x580007) AM_READ( input_port_1_dword_r ) AM_RANGE(0x580008, 0x58000b) AM_READ( darkhors_input_sel_r ) AM_RANGE(0x580084, 0x580087) AM_READ( OKIM6295_status_0_msb32_r ) - AM_RANGE(0x580200, 0x580203) AM_READ( MRA32_NOP ) + AM_RANGE(0x580200, 0x580203) AM_READ( SMH_NOP ) AM_RANGE(0x580400, 0x580403) AM_READ( input_port_2_dword_r ) AM_RANGE(0x580420, 0x580423) AM_READ( input_port_3_dword_r ) - AM_RANGE(0x800000, 0x87ffff) AM_READ( MRA32_RAM ) + AM_RANGE(0x800000, 0x87ffff) AM_READ( SMH_RAM ) ADDRESS_MAP_END static ADDRESS_MAP_START( darkhors_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE( MWA32_ROM ) - AM_RANGE(0x400000, 0x41ffff) AM_WRITE( MWA32_RAM ) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE( SMH_ROM ) + AM_RANGE(0x400000, 0x41ffff) AM_WRITE( SMH_RAM ) AM_RANGE(0x490040, 0x490043) AM_WRITE( darkhors_eeprom_w ) AM_RANGE(0x58000c, 0x58000f) AM_WRITE( darkhors_input_sel_w ) AM_RANGE(0x4e0080, 0x4e0083) AM_WRITE( darkhors_unk1_w ) AM_RANGE(0x580084, 0x580087) AM_WRITE( OKIM6295_data_0_msb32_w ) - AM_RANGE(0x800000, 0x86bfff) AM_WRITE( MWA32_RAM ) + AM_RANGE(0x800000, 0x86bfff) AM_WRITE( SMH_RAM ) AM_RANGE(0x86c000, 0x86ffff) AM_WRITE( darkhors_tmapram_w ) AM_BASE(&darkhors_tmapram) AM_RANGE(0x870000, 0x873fff) AM_WRITE( darkhors_tmapram2_w ) AM_BASE(&darkhors_tmapram2) - AM_RANGE(0x874000, 0x87dfff) AM_WRITE( MWA32_RAM ) - AM_RANGE(0x87e000, 0x87ffff) AM_WRITE( MWA32_RAM ) AM_BASE(&spriteram32) + AM_RANGE(0x874000, 0x87dfff) AM_WRITE( SMH_RAM ) + AM_RANGE(0x87e000, 0x87ffff) AM_WRITE( SMH_RAM ) AM_BASE(&spriteram32) AM_RANGE(0x880000, 0x89ffff) AM_WRITE( paletteram32_xBBBBBGGGGGRRRRR_dword_w) AM_BASE(&paletteram32) - AM_RANGE(0x8a0000, 0x8bffff) AM_WRITE( MWA32_RAM ) // this should still be palette ram! - AM_RANGE(0x8c0120, 0x8c012f) AM_WRITE( MWA32_RAM ) AM_BASE(&darkhors_tmapscroll) - AM_RANGE(0x8c0130, 0x8c013f) AM_WRITE( MWA32_RAM ) AM_BASE(&darkhors_tmapscroll2) + AM_RANGE(0x8a0000, 0x8bffff) AM_WRITE( SMH_RAM ) // this should still be palette ram! + AM_RANGE(0x8c0120, 0x8c012f) AM_WRITE( SMH_RAM ) AM_BASE(&darkhors_tmapscroll) + AM_RANGE(0x8c0130, 0x8c013f) AM_WRITE( SMH_RAM ) AM_BASE(&darkhors_tmapscroll2) ADDRESS_MAP_END diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c index ad45abf4a1e..1290e78653b 100644 --- a/src/mame/drivers/darkmist.c +++ b/src/mame/drivers/darkmist.c @@ -59,12 +59,12 @@ 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_READ(MRA8_BANK1) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc801, 0xc801) AM_READ(input_port_0_r) AM_RANGE(0xc802, 0xc802) AM_READ(input_port_1_r) AM_RANGE(0xc803, 0xc803) AM_READ(input_port_2_r) AM_RANGE(0xc804, 0xc804) AM_WRITE(darkmist_hw_w) - AM_RANGE(0xc805, 0xc805) AM_WRITE(MWA8_RAM) AM_BASE(&darkmist_spritebank) + AM_RANGE(0xc805, 0xc805) AM_WRITE(SMH_RAM) AM_BASE(&darkmist_spritebank) AM_RANGE(0xc806, 0xc806) AM_READ(input_port_3_r) AM_RANGE(0xc807, 0xc807) AM_READ(input_port_4_r) AM_RANGE(0xc808, 0xc808) AM_READ(input_port_5_r) diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c index b7e09dad088..7e405f50e83 100644 --- a/src/mame/drivers/darkseal.c +++ b/src/mame/drivers/darkseal.c @@ -69,27 +69,27 @@ static READ16_HANDLER( darkseal_control_r ) /******************************************************************************/ static ADDRESS_MAP_START( darkseal_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x140fff) AM_READ(MRA16_RAM) - AM_RANGE(0x141000, 0x141fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x140fff) AM_READ(SMH_RAM) + AM_RANGE(0x141000, 0x141fff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(darkseal_control_r) - AM_RANGE(0x220000, 0x220fff) AM_READ(MRA16_RAM) - AM_RANGE(0x222000, 0x222fff) AM_READ(MRA16_RAM) + AM_RANGE(0x220000, 0x220fff) AM_READ(SMH_RAM) + AM_RANGE(0x222000, 0x222fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( darkseal_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&darkseal_ram) - AM_RANGE(0x120000, 0x1207ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&darkseal_ram) + AM_RANGE(0x120000, 0x1207ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x140000, 0x140fff) AM_WRITE(darkseal_palette_24bit_rg_w) AM_BASE(&paletteram16) AM_RANGE(0x141000, 0x141fff) AM_WRITE(darkseal_palette_24bit_b_w) AM_BASE(&paletteram16_2) AM_RANGE(0x180000, 0x18000f) AM_WRITE(darkseal_control_w) AM_RANGE(0x200000, 0x200fff) AM_WRITE(darkseal_pf3b_data_w) /* 2nd half of pf3, only used on last level */ AM_RANGE(0x202000, 0x203fff) AM_WRITE(darkseal_pf3_data_w) AM_BASE(&darkseal_pf3_data) - AM_RANGE(0x220000, 0x220fff) AM_WRITE(MWA16_RAM) AM_BASE(&darkseal_pf12_row) - AM_RANGE(0x222000, 0x222fff) AM_WRITE(MWA16_RAM) AM_BASE(&darkseal_pf34_row) + AM_RANGE(0x220000, 0x220fff) AM_WRITE(SMH_RAM) AM_BASE(&darkseal_pf12_row) + AM_RANGE(0x222000, 0x222fff) AM_WRITE(SMH_RAM) AM_BASE(&darkseal_pf34_row) AM_RANGE(0x240000, 0x24000f) AM_WRITE(darkseal_control_0_w) AM_RANGE(0x260000, 0x261fff) AM_WRITE(darkseal_pf2_data_w) AM_BASE(&darkseal_pf2_data) AM_RANGE(0x262000, 0x263fff) AM_WRITE(darkseal_pf1_data_w) AM_BASE(&darkseal_pf1_data) @@ -123,22 +123,22 @@ static WRITE8_HANDLER( YM2203_w ) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(YM2203_w) AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_1_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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 a34a1225570..de2c9fce469 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -207,23 +207,23 @@ static READ16_HANDLER( shared_ram_r ) /**********************************************************************************/ static ADDRESS_MAP_START( dassault_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x1c0000, 0x1c000f) AM_READ(dassault_control_r) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) - AM_RANGE(0x202000, 0x203fff) AM_READ(MRA16_RAM) - AM_RANGE(0x240000, 0x240fff) AM_READ(MRA16_RAM) - AM_RANGE(0x242000, 0x242fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3f8000, 0x3fbfff) AM_READ(MRA16_RAM) /* Main ram */ - AM_RANGE(0x3fc000, 0x3fcfff) AM_READ(MRA16_RAM) /* Spriteram (2nd) */ + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) + AM_RANGE(0x202000, 0x203fff) AM_READ(SMH_RAM) + AM_RANGE(0x240000, 0x240fff) AM_READ(SMH_RAM) + AM_RANGE(0x242000, 0x242fff) AM_READ(SMH_RAM) + AM_RANGE(0x3f8000, 0x3fbfff) AM_READ(SMH_RAM) /* Main ram */ + AM_RANGE(0x3fc000, 0x3fcfff) AM_READ(SMH_RAM) /* Spriteram (2nd) */ AM_RANGE(0x3feffc, 0x3fefff) AM_READ(dassault_irq_r) AM_RANGE(0x3fe000, 0x3fefff) AM_READ(shared_ram_r) /* Shared ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( dassault_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x103fff) AM_WRITE(deco16_nonbuffered_palette_w) AM_BASE(&paletteram16) - AM_RANGE(0x140004, 0x140007) AM_WRITE(MWA16_NOP) /* ? */ + AM_RANGE(0x140004, 0x140007) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0x180000, 0x180001) AM_WRITE(dassault_sound_w) AM_RANGE(0x1c000a, 0x1c000b) AM_WRITE(deco16_priority_w) AM_RANGE(0x1c000c, 0x1c000d) AM_WRITE(buffer_spriteram16_2_w) @@ -231,35 +231,35 @@ static ADDRESS_MAP_START( dassault_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x201fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x202000, 0x203fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x212000, 0x212fff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x220000, 0x22000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x212000, 0x212fff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x220000, 0x22000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x240000, 0x240fff) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x242000, 0x242fff) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x252000, 0x252fff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) - AM_RANGE(0x260000, 0x26000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x252000, 0x252fff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x260000, 0x26000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) - AM_RANGE(0x3f8000, 0x3fbfff) AM_WRITE(MWA16_RAM) AM_BASE(&dassault_ram) - AM_RANGE(0x3fc000, 0x3fcfff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x3f8000, 0x3fbfff) AM_WRITE(SMH_RAM) AM_BASE(&dassault_ram) + AM_RANGE(0x3fc000, 0x3fcfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) AM_RANGE(0x3feffc, 0x3fefff) AM_WRITE(dassault_irq_w) AM_RANGE(0x3fe000, 0x3fefff) AM_WRITE(shared_ram_w) AM_BASE(&shared_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( dassault_sub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100004, 0x100005) AM_READ(dassault_sub_control_r) - AM_RANGE(0x3f8000, 0x3fbfff) AM_READ(MRA16_RAM) /* Sub cpu ram */ - AM_RANGE(0x3fc000, 0x3fcfff) AM_READ(MRA16_RAM) /* Sprite ram */ + AM_RANGE(0x3f8000, 0x3fbfff) AM_READ(SMH_RAM) /* Sub cpu ram */ + AM_RANGE(0x3fc000, 0x3fcfff) AM_READ(SMH_RAM) /* Sprite ram */ AM_RANGE(0x3feffc, 0x3fefff) AM_READ(dassault_irq_r) AM_RANGE(0x3fe000, 0x3fefff) AM_READ(shared_ram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( dassault_sub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(buffer_spriteram16_w) - AM_RANGE(0x100002, 0x100007) AM_WRITE(MWA16_NOP) /* ? */ - AM_RANGE(0x3f8000, 0x3fbfff) AM_WRITE(MWA16_RAM) AM_BASE(&dassault_ram2) - AM_RANGE(0x3fc000, 0x3fcfff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x100002, 0x100007) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0x3f8000, 0x3fbfff) AM_WRITE(SMH_RAM) AM_BASE(&dassault_ram2) + AM_RANGE(0x3fc000, 0x3fcfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x3feffc, 0x3fefff) AM_WRITE(dassault_irq_w) AM_RANGE(0x3fe000, 0x3fefff) AM_WRITE(shared_ram_w) ADDRESS_MAP_END @@ -267,22 +267,22 @@ ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(YM2203_word_0_w) AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_1_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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/dblewing.c b/src/mame/drivers/dblewing.c index 172c8e6ec8a..83f2514eb54 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -301,28 +301,28 @@ static WRITE16_HANDLER( dblewing_prot_w ) static ADDRESS_MAP_START( dblewing_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) - AM_RANGE(0x102000, 0x102fff) AM_READ(MRA16_RAM) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x104000, 0x104fff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x106000, 0x106fff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) + AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) + AM_RANGE(0x104000, 0x104fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x106000, 0x106fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) /* protection */ -// AM_RANGE(0x280104, 0x280105) AM_WRITE(MWA16_NOP) // ?? +// AM_RANGE(0x280104, 0x280105) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0x2800ac, 0x2800ad) AM_READ(input_port_2_word_r) // dips AM_RANGE(0x280298, 0x280299) AM_READ(input_port_1_word_r) // vbl AM_RANGE(0x280506, 0x280507) AM_READ(input_port_3_word_r) AM_RANGE(0x2802B4, 0x2802B5) AM_READ(input_port_0_word_r) // inverted? -// AM_RANGE(0x280330, 0x280331) AM_READ(MRA16_NOP) // sound? -// AM_RANGE(0x280380, 0x280381) AM_WRITE(MWA16_NOP) // sound +// AM_RANGE(0x280330, 0x280331) AM_READ(SMH_NOP) // sound? +// AM_RANGE(0x280380, 0x280381) AM_WRITE(SMH_NOP) // sound AM_RANGE(0x280000, 0x2807ff) AM_READWRITE(dlbewing_prot_r,dblewing_prot_w) AM_RANGE(0x284000, 0x284001) AM_RAM AM_RANGE(0x288000, 0x288001) AM_RAM - AM_RANGE(0x28C000, 0x28C00f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x28C000, 0x28C00f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x300000, 0x3007ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x320000, 0x3207ff) AM_READWRITE(MRA16_RAM,paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x320000, 0x3207ff) AM_READWRITE(SMH_RAM,paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0xff0000, 0xff3fff) AM_MIRROR(0xc000) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index 9a9e18dbc16..f15ba470fc3 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -147,65 +147,65 @@ static void dbz_sound_irq(int irq) } static ADDRESS_MAP_START( dbz_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x480000, 0x48ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x480000, 0x48ffff) AM_READ(SMH_RAM) AM_RANGE(0x490000, 0x491fff) AM_READ(K056832_ram_word_r) // '157 RAM is mirrored twice AM_RANGE(0x492000, 0x493fff) AM_READ(K056832_ram_word_r) AM_RANGE(0x498000, 0x49ffff) AM_READ(K056832_rom_word_8000_r) // code near a60 in dbz2, subroutine at 730 in dbz AM_RANGE(0x4a0000, 0x4a0fff) AM_READ(K053247_word_r) - AM_RANGE(0x4a1000, 0x4a3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x4a8000, 0x4abfff) AM_READ(MRA16_RAM) // palette + AM_RANGE(0x4a1000, 0x4a3fff) AM_READ(SMH_RAM) + AM_RANGE(0x4a8000, 0x4abfff) AM_READ(SMH_RAM) // palette AM_RANGE(0x4c0000, 0x4c0001) AM_READ(K053246_word_r) AM_RANGE(0x4e0000, 0x4e0001) AM_READ(dbz_inp0_r) AM_RANGE(0x4e0002, 0x4e0003) AM_READ(dbz_inp1_r) AM_RANGE(0x4e4000, 0x4e4001) AM_READ(dbz_inp2_r) - AM_RANGE(0x500000, 0x501fff) AM_READ(MRA16_RAM) - AM_RANGE(0x508000, 0x509fff) AM_READ(MRA16_RAM) - AM_RANGE(0x510000, 0x513fff) AM_READ(MRA16_RAM) - AM_RANGE(0x518000, 0x51bfff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x6fffff) AM_READ(MRA16_NOP) // PSAC 1 ROM readback window - AM_RANGE(0x700000, 0x7fffff) AM_READ(MRA16_NOP) // PSAC 2 ROM readback window + AM_RANGE(0x500000, 0x501fff) AM_READ(SMH_RAM) + AM_RANGE(0x508000, 0x509fff) AM_READ(SMH_RAM) + AM_RANGE(0x510000, 0x513fff) AM_READ(SMH_RAM) + AM_RANGE(0x518000, 0x51bfff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x6fffff) AM_READ(SMH_NOP) // PSAC 1 ROM readback window + AM_RANGE(0x700000, 0x7fffff) AM_READ(SMH_NOP) // PSAC 2 ROM readback window ADDRESS_MAP_END static ADDRESS_MAP_START( dbz_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x480000, 0x48ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x480000, 0x48ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x490000, 0x491fff) AM_WRITE(K056832_ram_word_w) AM_RANGE(0x492000, 0x493fff) AM_WRITE(K056832_ram_word_w) AM_RANGE(0x4a0000, 0x4a0fff) AM_WRITE(K053247_word_w) - AM_RANGE(0x4a1000, 0x4a3fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x4a1000, 0x4a3fff) AM_WRITE(SMH_RAM) AM_RANGE(0x4a8000, 0x4abfff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x4c0000, 0x4c0007) AM_WRITE(K053246_word_w) AM_RANGE(0x4c4000, 0x4c4007) AM_WRITE(K053246_word_w) AM_RANGE(0x4c8000, 0x4c8007) AM_WRITE(K056832_b_word_w) AM_RANGE(0x4cc000, 0x4cc03f) AM_WRITE(K056832_word_w) AM_RANGE(0x4ec000, 0x4ec001) AM_WRITE(dbzcontrol_w) - AM_RANGE(0x4d0000, 0x4d001f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) - AM_RANGE(0x4d4000, 0x4d401f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_1_ctrl) - AM_RANGE(0x4e8000, 0x4e8001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x4d0000, 0x4d001f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) + AM_RANGE(0x4d4000, 0x4d401f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_1_ctrl) + AM_RANGE(0x4e8000, 0x4e8001) AM_WRITE(SMH_NOP) AM_RANGE(0x4f0000, 0x4f0001) AM_WRITE(dbz_sound_command_w) AM_RANGE(0x4f4000, 0x4f4001) AM_WRITE(dbz_sound_cause_nmi) - AM_RANGE(0x4f8000, 0x4f801f) AM_WRITE(MWA16_NOP) // 251 #1 + AM_RANGE(0x4f8000, 0x4f801f) AM_WRITE(SMH_NOP) // 251 #1 AM_RANGE(0x4fc000, 0x4fc01f) AM_WRITE(K053251_lsb_w) // 251 #2 AM_RANGE(0x500000, 0x501fff) AM_WRITE(dbz_bg2_videoram_w) AM_BASE(&dbz_bg2_videoram) AM_RANGE(0x508000, 0x509fff) AM_WRITE(dbz_bg1_videoram_w) AM_BASE(&dbz_bg1_videoram) - AM_RANGE(0x510000, 0x513fff) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_linectrl) // ?? guess, it might not be - AM_RANGE(0x518000, 0x51bfff) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_1_linectrl) // ?? guess, it might not be + AM_RANGE(0x510000, 0x513fff) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_linectrl) // ?? guess, it might not be + AM_RANGE(0x518000, 0x51bfff) AM_WRITE(SMH_RAM) AM_BASE(&K053936_1_linectrl) // ?? guess, it might not be ADDRESS_MAP_END /* dbz sound */ /* IRQ: from YM2151. NMI: from 68000. Port 0: write to ack NMI */ static ADDRESS_MAP_START( dbz_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xc001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xd000, 0xd002) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xe000, 0xe001) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( dbz_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xd000, 0xd001) AM_WRITE(OKIM6295_data_0_w) @@ -213,7 +213,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dbz_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) ADDRESS_MAP_END /**********************************************************************************/ diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c index ad542e378ac..e8c41ef190d 100644 --- a/src/mame/drivers/dcon.c +++ b/src/mame/drivers/dcon.c @@ -33,14 +33,14 @@ extern UINT16 *dcon_back_data,*dcon_fore_data,*dcon_mid_data,*dcon_scroll_ram,*d /***************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x7ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x80000, 0x8bfff) AM_READ(MRA16_RAM) - AM_RANGE(0x8c000, 0x8c7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x8c800, 0x8cfff) AM_READ(MRA16_RAM) - AM_RANGE(0x8d000, 0x8d7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x8d800, 0x8e7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x8e800, 0x8f7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x8f800, 0x8ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x00000, 0x7ffff) AM_READ(SMH_ROM) + AM_RANGE(0x80000, 0x8bfff) AM_READ(SMH_RAM) + AM_RANGE(0x8c000, 0x8c7ff) AM_READ(SMH_RAM) + AM_RANGE(0x8c800, 0x8cfff) AM_READ(SMH_RAM) + AM_RANGE(0x8d000, 0x8d7ff) AM_READ(SMH_RAM) + AM_RANGE(0x8d800, 0x8e7ff) AM_READ(SMH_RAM) + AM_RANGE(0x8e800, 0x8f7ff) AM_READ(SMH_RAM) + AM_RANGE(0x8f800, 0x8ffff) AM_READ(SMH_RAM) AM_RANGE(0xa0000, 0xa000d) AM_READ(seibu_main_word_r) AM_RANGE(0xc001c, 0xc001d) AM_READ(dcon_control_r) AM_RANGE(0xe0000, 0xe0001) AM_READ(input_port_1_word_r) @@ -49,20 +49,20 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x7ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x80000, 0x8bfff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x00000, 0x7ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x80000, 0x8bfff) AM_WRITE(SMH_RAM) AM_RANGE(0x8c000, 0x8c7ff) AM_WRITE(dcon_background_w) AM_BASE(&dcon_back_data) AM_RANGE(0x8c800, 0x8cfff) AM_WRITE(dcon_foreground_w) AM_BASE(&dcon_fore_data) AM_RANGE(0x8d000, 0x8d7ff) AM_WRITE(dcon_midground_w) AM_BASE(&dcon_mid_data) AM_RANGE(0x8d800, 0x8e7ff) AM_WRITE(dcon_text_w) AM_BASE(&dcon_textram) AM_RANGE(0x8e800, 0x8f7ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x8f800, 0x8ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x8f800, 0x8ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x9d000, 0x9d7ff) AM_WRITE(dcon_gfxbank_w) AM_RANGE(0xa0000, 0xa000d) AM_WRITE(seibu_main_word_w) AM_RANGE(0xc001c, 0xc001d) AM_WRITE(dcon_control_w) - AM_RANGE(0xc0020, 0xc002f) AM_WRITE(MWA16_RAM) AM_BASE(&dcon_scroll_ram) - AM_RANGE(0xc0080, 0xc0081) AM_WRITE(MWA16_NOP) - AM_RANGE(0xc00c0, 0xc00c1) AM_WRITE(MWA16_NOP) + AM_RANGE(0xc0020, 0xc002f) AM_WRITE(SMH_RAM) AM_BASE(&dcon_scroll_ram) + AM_RANGE(0xc0080, 0xc0081) AM_WRITE(SMH_NOP) + AM_RANGE(0xc00c0, 0xc00c1) AM_WRITE(SMH_NOP) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c index 8bcae74eadb..8e7eb795ea4 100644 --- a/src/mame/drivers/dday.c +++ b/src/mame/drivers/dday.c @@ -71,10 +71,10 @@ READ8_HANDLER( dday_countdown_timer_r ); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x5000, 0x5bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x5000, 0x5bff) AM_READ(SMH_RAM) AM_RANGE(0x5c00, 0x5fff) AM_READ(dday_colorram_r) - AM_RANGE(0x6000, 0x63ff) AM_READ(MRA8_RAM) + AM_RANGE(0x6000, 0x63ff) AM_READ(SMH_RAM) AM_RANGE(0x6c00, 0x6c00) AM_READ(input_port_0_r) AM_RANGE(0x7000, 0x7000) AM_READ(input_port_1_r) AM_RANGE(0x7400, 0x7400) AM_READ(input_port_2_r) @@ -83,13 +83,13 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x4000) AM_WRITE(dday_sl_control_w) AM_RANGE(0x5000, 0x53ff) AM_WRITE(dday_textvideoram_w) AM_BASE(&dday_textvideoram) AM_RANGE(0x5400, 0x57ff) AM_WRITE(dday_fgvideoram_w) AM_BASE(&dday_fgvideoram) AM_RANGE(0x5800, 0x5bff) AM_WRITE(dday_bgvideoram_w) AM_BASE(&dday_bgvideoram) AM_RANGE(0x5c00, 0x5fff) AM_WRITE(dday_colorram_w) AM_BASE(&dday_colorram) - AM_RANGE(0x6000, 0x63ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x6000, 0x63ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6400, 0x6400) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x6401, 0x6401) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x6402, 0x6402) AM_WRITE(AY8910_control_port_0_w) diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 131498b0d77..dda9139dd0e 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -208,8 +208,8 @@ static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8fff) AM_RAM AM_BASE(&mainram) AM_RANGE(0x9000, 0x93ff) AM_RAM AM_BASE(&spriteram) - AM_RANGE(0x9400, 0x97ff) AM_READWRITE(MRA8_RAM, ddayjlc_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x9800, 0x9fff) AM_READWRITE(MRA8_RAM, ddayjlc_bgram_w) AM_BASE(&bgram) /* 9800-981f - videoregs */ + AM_RANGE(0x9400, 0x97ff) AM_READWRITE(SMH_RAM, ddayjlc_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x9800, 0x9fff) AM_READWRITE(SMH_RAM, ddayjlc_bgram_w) AM_BASE(&bgram) /* 9800-981f - videoregs */ AM_RANGE(0xa000, 0xdfff) AM_ROMBANK(1) AM_WRITENOP AM_RANGE(0xe000, 0xe003) AM_WRITE(i8257_CH0_w) AM_RANGE(0xe008, 0xe008) AM_WRITENOP diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 4856912e907..4073cf7912f 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -1590,7 +1590,7 @@ static WRITE16_HANDLER( quiz365_protection_w ) } static ADDRESS_MAP_START( quiz365_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x17ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x17ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200c02, 0x200c03) AM_READ(quiz365_protection_r ) // Protection AM_RANGE(0x300204, 0x300207) AM_READ(quiz365_input2_r ) // AM_RANGE(0x300270, 0x300271) AM_READ(unk16_r ) // ? must be 78 on startup (not necessary in ddlover) @@ -1598,14 +1598,14 @@ static ADDRESS_MAP_START( quiz365_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x3002c0, 0x3002c1) AM_READ(OKIM6295_status_0_lsb_r ) // Sound AM_RANGE(0x300340, 0x30035f) AM_READ(msm6242_lsb_r ) // 6242RTC AM_RANGE(0x300384, 0x300385) AM_READ(AY8910_read_port_0_lsb_r ) - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( quiz365_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x17ffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x17ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x2003ff) AM_WRITE(ddenlovr_palette_w ) // Palette AM_RANGE(0x200e0a, 0x200e0d) AM_WRITE(quiz365_protection_w ) // Protection -// AM_RANGE(0x201000, 0x2017ff) AM_WRITE(MWA16_RAM ) // ? +// AM_RANGE(0x201000, 0x2017ff) AM_WRITE(SMH_RAM ) // ? AM_RANGE(0x300200, 0x300201) AM_WRITE(ddenlovr_select2_16_w ) AM_RANGE(0x300202, 0x300203) AM_WRITE(quiz365_coincounter_w ) // Coin Counters + more stuff written on startup AM_RANGE(0x300240, 0x300247) AM_WRITE(ddenlovr16_palette_base_w ) @@ -1625,7 +1625,7 @@ static ADDRESS_MAP_START( quiz365_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x3002c0, 0x3002c1) AM_WRITE(OKIM6295_data_0_lsb_w ) AM_RANGE(0x3003c2, 0x3003c3) AM_WRITE(quiz365_oki_bank1_w ) AM_RANGE(0x3003cc, 0x3003cd) AM_WRITE(quiz365_oki_bank2_w ) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -1656,7 +1656,7 @@ static READ16_HANDLER( ddenlvrj_blitter_r ) } static ADDRESS_MAP_START( ddenlvrj_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x300070, 0x300071) AM_READ(unk16_r ) // ? must be 78 on startup (not necessary in ddlover) AM_RANGE(0x300086, 0x300087) AM_READ(ddenlovr_gfxrom_r ) // Video Chip AM_RANGE(0x300100, 0x30011f) AM_READ(msm6242_lsb_r ) // 6242RTC @@ -1665,13 +1665,13 @@ static ADDRESS_MAP_START( ddenlvrj_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300184, 0x300185) AM_READ(ddenlvrj_blitter_r ) // Coins + ? AM_RANGE(0x300186, 0x300187) AM_READ(ddenlvrj_dsw_r ) // DSW AM_RANGE(0x300240, 0x300241) AM_READ(OKIM6295_status_0_lsb_r ) // Sound - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( ddenlvrj_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x2003ff) AM_WRITE(ddenlovr_palette_w ) // Palette -// AM_RANGE(0x201000, 0x2017ff) AM_WRITE(MWA16_RAM ) // ? B0 on startup, then 00 +// AM_RANGE(0x201000, 0x2017ff) AM_WRITE(SMH_RAM ) // ? B0 on startup, then 00 AM_RANGE(0x300040, 0x300047) AM_WRITE(ddenlovr16_palette_base_w ) AM_RANGE(0x300048, 0x30004f) AM_WRITE(ddenlovr16_palette_mask_w ) AM_RANGE(0x300050, 0x300057) AM_WRITE(ddenlovr16_transparency_pen_w ) @@ -1686,16 +1686,16 @@ static ADDRESS_MAP_START( ddenlvrj_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300140, 0x300141) AM_WRITE(AY8910_control_port_0_lsb_w ) AM_RANGE(0x300142, 0x300143) AM_WRITE(AY8910_write_port_0_lsb_w ) AM_RANGE(0x300188, 0x300189) AM_WRITE(ddenlvrj_coincounter_w ) // Coin Counters - AM_RANGE(0x30018a, 0x30018b) AM_WRITE(MWA16_RAM ) AM_BASE( &ddenlvrj_dsw_sel ) // DSW select + AM_RANGE(0x30018a, 0x30018b) AM_WRITE(SMH_RAM ) AM_BASE( &ddenlvrj_dsw_sel ) // DSW select AM_RANGE(0x30018c, 0x30018d) AM_WRITE(ddenlovr_oki_bank_w ) AM_RANGE(0x3001ca, 0x3001cb) AM_WRITE(ddenlovr_blitter_irq_ack_w ) // Blitter irq acknowledge AM_RANGE(0x300240, 0x300241) AM_WRITE(OKIM6295_data_0_lsb_w ) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( ddenlovr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0xe00086, 0xe00087) AM_READ(ddenlovr_gfxrom_r ) // Video Chip AM_RANGE(0xe00070, 0xe00071) AM_READ(unk16_r ) // ? must be 78 on startup (not necessary in ddlover) AM_RANGE(0xe00100, 0xe00101) AM_READ(input_port_0_word_r ) // P1? @@ -1705,14 +1705,14 @@ static ADDRESS_MAP_START( ddenlovr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00500, 0xe0051f) AM_READ(msm6242_lsb_r ) // 6242RTC AM_RANGE(0xe00604, 0xe00605) AM_READ(AY8910_read_port_0_lsb_r ) AM_RANGE(0xe00700, 0xe00701) AM_READ(OKIM6295_status_0_lsb_r ) // Sound - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( ddenlovr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x300000, 0x300001) AM_WRITE(ddenlovr_oki_bank_w ) AM_RANGE(0xd00000, 0xd003ff) AM_WRITE(ddenlovr_palette_w ) // Palette -// AM_RANGE(0xd01000, 0xd017ff) MWA16_RAM ) // ? B0 on startup, then 00 +// AM_RANGE(0xd01000, 0xd017ff) SMH_RAM ) // ? B0 on startup, then 00 AM_RANGE(0xe00040, 0xe00047) AM_WRITE(ddenlovr16_palette_base_w ) AM_RANGE(0xe00048, 0xe0004f) AM_WRITE(ddenlovr16_palette_mask_w ) AM_RANGE(0xe00050, 0xe00057) AM_WRITE(ddenlovr16_transparency_pen_w ) @@ -1727,11 +1727,11 @@ static ADDRESS_MAP_START( ddenlovr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00400, 0xe00401) AM_WRITE(YM2413_register_port_0_lsb_w ) AM_RANGE(0xe00402, 0xe00403) AM_WRITE(YM2413_data_port_0_lsb_w ) AM_RANGE(0xe00500, 0xe0051f) AM_WRITE(msm6242_lsb_w ) // 6242RTC -// AM_RANGE(0xe00302, 0xe00303) AM_WRITE(MWA16_NOP ) // ? +// AM_RANGE(0xe00302, 0xe00303) AM_WRITE(SMH_NOP ) // ? AM_RANGE(0xe00600, 0xe00601) AM_WRITE(AY8910_control_port_0_lsb_w ) AM_RANGE(0xe00602, 0xe00603) AM_WRITE(AY8910_write_port_0_lsb_w ) AM_RANGE(0xe00700, 0xe00701) AM_WRITE(OKIM6295_data_0_lsb_w ) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -1783,7 +1783,7 @@ static WRITE16_HANDLER( nettoqc_oki_bank_w ) } static ADDRESS_MAP_START( nettoqc_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x17ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x17ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200c02, 0x200c03) AM_READ(nettoqc_protection_r ) // AM_RANGE(0x300070, 0x300071) AM_READ(unk16_r ) // ? must be 78 on startup (not necessary in ddlover) AM_RANGE(0x300086, 0x300087) AM_READ(ddenlovr_gfxrom_r ) // Video Chip @@ -1793,14 +1793,14 @@ static ADDRESS_MAP_START( nettoqc_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300184, 0x300185) AM_READ(nettoqc_special_r ) // Coins + ? AM_RANGE(0x300186, 0x300187) AM_READ(nettoqc_input_r ) // DSW's AM_RANGE(0x300240, 0x300241) AM_READ(OKIM6295_status_0_lsb_r ) // Sound - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( nettoqc_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x17ffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x17ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x2003ff) AM_WRITE(ddenlovr_palette_w ) // Palette - AM_RANGE(0x200e0a, 0x200e0d) AM_WRITE(MWA16_RAM) AM_BASE(&nettoqc_protection_val ) // - AM_RANGE(0x201000, 0x2017ff) AM_WRITE(MWA16_RAM ) // ? + AM_RANGE(0x200e0a, 0x200e0d) AM_WRITE(SMH_RAM) AM_BASE(&nettoqc_protection_val ) // + AM_RANGE(0x201000, 0x2017ff) AM_WRITE(SMH_RAM ) // ? AM_RANGE(0x300040, 0x300047) AM_WRITE(ddenlovr16_palette_base_w ) AM_RANGE(0x300048, 0x30004f) AM_WRITE(ddenlovr16_palette_mask_w ) AM_RANGE(0x300050, 0x300057) AM_WRITE(ddenlovr16_transparency_pen_w ) @@ -1819,7 +1819,7 @@ static ADDRESS_MAP_START( nettoqc_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x30018c, 0x30018d) AM_WRITE(nettoqc_oki_bank_w ) AM_RANGE(0x3001ca, 0x3001cb) AM_WRITE(ddenlovr_blitter_irq_ack_w ) // Blitter irq acknowledge AM_RANGE(0x300240, 0x300241) AM_WRITE(OKIM6295_data_0_lsb_w ) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -1853,15 +1853,15 @@ static WRITE8_HANDLER( rongrong_select_w ) static ADDRESS_MAP_START( quizchq_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_BANK2 ) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1 ) // ROM (Banked) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_BANK2 ) // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1 ) // ROM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( quizchq_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_BANK2 ) // RAM (Banked) AM_RANGE(0x8000, 0x81ff) AM_WRITE(rongrong_palette_w ) ADDRESS_MAP_END @@ -1892,21 +1892,21 @@ static ADDRESS_MAP_START( quizchq_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0x96, 0x96) AM_WRITE(ddenlovr_layer_enable_w ) AM_RANGE(0xa0, 0xaf) AM_WRITE(msm6242_w ) // 6242RTC AM_RANGE(0xc0, 0xc0) AM_WRITE(quizchq_oki_bank_w ) - AM_RANGE(0xc2, 0xc2) AM_WRITE(MWA8_NOP ) // enables palette RAM at 8000 + AM_RANGE(0xc2, 0xc2) AM_WRITE(SMH_NOP ) // enables palette RAM at 8000 ADDRESS_MAP_END static ADDRESS_MAP_START( rongrong_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_BANK2 ) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1 ) // ROM (Banked) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_BANK2 ) // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1 ) // ROM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( rongrong_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_BANK2 ) // RAM (Banked) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(rongrong_palette_w ) ADDRESS_MAP_END @@ -1936,7 +1936,7 @@ static ADDRESS_MAP_START( rongrong_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_ AM_RANGE(0x95, 0x95) AM_WRITE(ddenlovr_priority_w ) AM_RANGE(0x96, 0x96) AM_WRITE(ddenlovr_layer_enable_w ) AM_RANGE(0xa0, 0xa0) AM_WRITE(ddenlovr_select2_w ) - AM_RANGE(0xc2, 0xc2) AM_WRITE(MWA8_NOP ) // enables palette RAM at f000, and protection device at f705/f706/f601 + AM_RANGE(0xc2, 0xc2) AM_WRITE(SMH_NOP ) // enables palette RAM at f000, and protection device at f705/f706/f601 ADDRESS_MAP_END /* 1e input select,1c input read @@ -2016,15 +2016,15 @@ static READ8_HANDLER( mmpanic_link_r ) { return 0xff; } static ADDRESS_MAP_START( mmpanic_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0051, 0x0051) AM_READ(magic_r ) // ? - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_BANK2 ) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1 ) // ROM (Banked) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_BANK2 ) // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1 ) // ROM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( mmpanic_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_BANK2 ) // RAM (Banked) AM_RANGE(0x8000, 0x81ff) AM_WRITE(rongrong_palette_w ) ADDRESS_MAP_END @@ -2067,36 +2067,36 @@ static ADDRESS_MAP_START( mmpanic_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_G AM_RANGE(0x69, 0x69) AM_WRITE(mmpanic_lockout_w ) AM_RANGE(0x74, 0x74) AM_WRITE(mmpanic_rombank_w ) - AM_RANGE(0x78, 0x78) AM_WRITE(MWA8_NOP ) // 0, during RST 08 (irq acknowledge?) + AM_RANGE(0x78, 0x78) AM_WRITE(SMH_NOP ) // 0, during RST 08 (irq acknowledge?) AM_RANGE(0x7c, 0x7c) AM_WRITE(OKIM6295_data_0_w ) // Sound AM_RANGE(0x8c, 0x8c) AM_WRITE(mmpanic_soundlatch_w ) // AM_RANGE(0x88, 0x88) AM_WRITE(mmpanic_leds_w ) // Leds - AM_RANGE(0x90, 0x90) AM_WRITE(MWA8_NOP ) // written just before port 8c + AM_RANGE(0x90, 0x90) AM_WRITE(SMH_NOP ) // written just before port 8c AM_RANGE(0xa6, 0xa6) AM_WRITE(mmpanic_leds2_w ) // ADDRESS_MAP_END /* Sound CPU */ static ADDRESS_MAP_START( mmpanic_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x66ff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM ) // ROM + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x66ff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( mmpanic_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x6000, 0x66ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x6000, 0x66ff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( mmpanic_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r ) - AM_RANGE(0x02, 0x02) AM_READ(MRA8_NOP ) // read just before port 00 - AM_RANGE(0x04, 0x04) AM_READ(MRA8_NOP ) // read only once at the start + AM_RANGE(0x02, 0x02) AM_READ(SMH_NOP ) // read just before port 00 + AM_RANGE(0x04, 0x04) AM_READ(SMH_NOP ) // read only once at the start ADDRESS_MAP_END static ADDRESS_MAP_START( mmpanic_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x04, 0x04) AM_WRITE(MWA8_NOP ) // 0, during IRQ - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP ) // almost always 1, sometimes 0 + AM_RANGE(0x04, 0x04) AM_WRITE(SMH_NOP ) // 0, during IRQ + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP ) // almost always 1, sometimes 0 AM_RANGE(0x08, 0x08) AM_WRITE(YM2413_register_port_0_w ) AM_RANGE(0x09, 0x09) AM_WRITE(YM2413_data_port_0_w ) AM_RANGE(0x0c, 0x0c) AM_WRITE(AY8910_write_port_0_w ) @@ -2112,17 +2112,17 @@ ADDRESS_MAP_END /* Main CPU */ static ADDRESS_MAP_START( funkyfig_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ( MRA8_ROM ) - AM_RANGE(0x6000, 0x6fff) AM_READ( MRA8_RAM ) - AM_RANGE(0x7000, 0x7fff) AM_READ( MRA8_BANK2 ) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_READ( MRA8_BANK1 ) // ROM (Banked) + AM_RANGE(0x0000, 0x5fff) AM_READ( SMH_ROM ) + AM_RANGE(0x6000, 0x6fff) AM_READ( SMH_RAM ) + AM_RANGE(0x7000, 0x7fff) AM_READ( SMH_BANK2 ) // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_READ( SMH_BANK1 ) // ROM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( funkyfig_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x6000, 0x6fff) AM_WRITE( MWA8_RAM ) - AM_RANGE(0x7000, 0x7fff) AM_WRITE( MWA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x6000, 0x6fff) AM_WRITE( SMH_RAM ) + AM_RANGE(0x7000, 0x7fff) AM_WRITE( SMH_BANK2 ) // RAM (Banked) AM_RANGE(0x8000, 0x81ff) AM_WRITE( rongrong_palette_w ) - AM_RANGE(0x8400, 0x87ff) AM_WRITE( MWA8_NOP ) + AM_RANGE(0x8400, 0x87ff) AM_WRITE( SMH_NOP ) ADDRESS_MAP_END @@ -2239,7 +2239,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( funkyfig_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r ) - AM_RANGE(0x04, 0x04) AM_READ(MRA8_NOP ) // read only once at the start + AM_RANGE(0x04, 0x04) AM_READ(SMH_NOP ) // read only once at the start ADDRESS_MAP_END @@ -2260,14 +2260,14 @@ static WRITE8_HANDLER( hanakanz_rombank_w ) } static ADDRESS_MAP_START( hanakanz_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_BANK2 ) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1 ) // ROM (Banked) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_BANK2 ) // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1 ) // ROM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( hanakanz_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_BANK2 ) // RAM (Banked) ADDRESS_MAP_END @@ -2621,17 +2621,17 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( mjmyster_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ( MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x6fff) AM_READ( MRA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_READ( MRA8_BANK2 ) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_READ( MRA8_BANK1 ) // ROM/RAM (Banked) + AM_RANGE(0x0000, 0x5fff) AM_READ( SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x6fff) AM_READ( SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_READ( SMH_BANK2 ) // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_READ( SMH_BANK1 ) // ROM/RAM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( mjmyster_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x6000, 0x6fff) AM_WRITE( MWA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_WRITE( MWA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x6000, 0x6fff) AM_WRITE( SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_WRITE( SMH_BANK2 ) // RAM (Banked) AM_RANGE(0xf000, 0xf1ff) AM_WRITE( rongrong_palette_w ) // RAM enabled by bit 4 of rombank - AM_RANGE(0xf200, 0xffff) AM_WRITE( MWA8_NOP ) // "" + AM_RANGE(0xf200, 0xffff) AM_WRITE( SMH_NOP ) // "" ADDRESS_MAP_END static WRITE8_HANDLER( mjmyster_rambank_w ) @@ -2768,18 +2768,18 @@ static READ8_HANDLER( hginga_protection_r ) } static ADDRESS_MAP_START( hginga_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ( MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x6fff) AM_READ( MRA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_READ( MRA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x0000, 0x5fff) AM_READ( SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x6fff) AM_READ( SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_READ( SMH_BANK2 ) // RAM (Banked) AM_RANGE(0xf601, 0xf601) AM_READ( hginga_protection_r ) - AM_RANGE(0x8000, 0xffff) AM_READ( MRA8_BANK1 ) // ROM/RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_READ( SMH_BANK1 ) // ROM/RAM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( hginga_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x6000, 0x6fff) AM_WRITE( MWA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_WRITE( MWA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x6000, 0x6fff) AM_WRITE( SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_WRITE( SMH_BANK2 ) // RAM (Banked) AM_RANGE(0xf000, 0xf1ff) AM_WRITE( rongrong_palette_w ) // RAM enabled by bit 4 of rombank - AM_RANGE(0xf700, 0xf706) AM_WRITE( MWA8_NOP ) + AM_RANGE(0xf700, 0xf706) AM_WRITE( SMH_NOP ) ADDRESS_MAP_END static READ8_HANDLER( hginga_dsw_r ) @@ -2893,7 +2893,7 @@ static WRITE8_HANDLER( hginga_blitter_w ) static ADDRESS_MAP_START( hginga_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x03, 0x03) AM_READ( rongrong_gfxrom_r ) - AM_RANGE(0x1c, 0x1c) AM_READ( MRA8_NOP ) + AM_RANGE(0x1c, 0x1c) AM_READ( SMH_NOP ) AM_RANGE(0x24, 0x24) AM_READ( AY8910_read_port_0_r ) AM_RANGE(0x60, 0x6f) AM_READ( msm6242_r ) // 6242RTC AM_RANGE(0x42, 0x42) AM_READ( hginga_coins_r ) @@ -2990,23 +2990,23 @@ static READ8_HANDLER( hgokou_protection_r ) } static ADDRESS_MAP_START( hgokou_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_BANK2 ) // RAM (Banked) AM_RANGE(0xe601, 0xe601) AM_READ(hgokou_protection_r ) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1 ) // ROM (Banked) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1 ) // ROM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( hgokou_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_BANK2 ) // RAM (Banked) AM_RANGE(0xe000, 0xe1ff) AM_WRITE(rongrong_palette_w ) - AM_RANGE(0xe700, 0xe706) AM_WRITE(MWA8_NOP ) + AM_RANGE(0xe700, 0xe706) AM_WRITE(SMH_NOP ) ADDRESS_MAP_END static ADDRESS_MAP_START( hgokou_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r ) - AM_RANGE(0x1c, 0x1c) AM_READ(MRA8_NOP ) // ? ack on RTC int + AM_RANGE(0x1c, 0x1c) AM_READ(SMH_NOP ) // ? ack on RTC int AM_RANGE(0x20, 0x2f) AM_READ(msm6242_r ) // 6242RTC AM_RANGE(0x58, 0x58) AM_READ(unk_r ) // ? must be 78 on startup AM_RANGE(0x62, 0x62) AM_READ(hgokou_input_r ) @@ -3089,14 +3089,14 @@ static WRITE8_HANDLER( hparadis_coin_w ) } static ADDRESS_MAP_START( hparadis_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_BANK2 ) // RAM (Banked) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1 ) // ROM (Banked) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_BANK2 ) // RAM (Banked) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1 ) // ROM (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( hparadis_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_BANK2 ) // RAM (Banked) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_BANK2 ) // RAM (Banked) AM_RANGE(0xc000, 0xc1ff) AM_WRITE(rongrong_palette_w ) ADDRESS_MAP_END @@ -3125,7 +3125,7 @@ static ADDRESS_MAP_START( hparadis_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_ AM_RANGE(0x96, 0x96) AM_WRITE(ddenlovr_layer_enable_w ) AM_RANGE(0xa0, 0xa0) AM_WRITE(hginga_input_w ) AM_RANGE(0xa1, 0xa1) AM_WRITE(hparadis_coin_w ) - AM_RANGE(0xc2, 0xc2) AM_WRITE(MWA8_NOP ) // enables palette RAM at c000 + AM_RANGE(0xc2, 0xc2) AM_WRITE(SMH_NOP ) // enables palette RAM at c000 ADDRESS_MAP_END @@ -3229,7 +3229,7 @@ static READ16_HANDLER( akamaru_e0010d_r ) } static ADDRESS_MAP_START( akamaru_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x624680, 0x624681) AM_READ(akamaru_protection1_r ) AM_RANGE(0xe00086, 0xe00087) AM_READ(ddenlovr_gfxrom_r ) // Video Chip AM_RANGE(0xe00070, 0xe00071) AM_READ(unk16_r ) // ? must be 78 on startup (not necessary in ddlover) @@ -3243,14 +3243,14 @@ static ADDRESS_MAP_START( akamaru_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00500, 0xe0051f) AM_READ(msm6242_lsb_r ) // 6242RTC AM_RANGE(0xe00604, 0xe00605) AM_READ(AY8910_read_port_0_lsb_r ) AM_RANGE(0xe00700, 0xe00701) AM_READ(OKIM6295_status_0_lsb_r ) // Sound - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( akamaru_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x213570, 0x213571) AM_WRITE(akamaru_protection1_w ) // OKI bank AM_RANGE(0xd00000, 0xd003ff) AM_WRITE(ddenlovr_palette_w ) // Palette -// AM_RANGE(0xd01000, 0xd017ff) AM_WRITE(MWA16_RAM ) // 0 +// AM_RANGE(0xd01000, 0xd017ff) AM_WRITE(SMH_RAM ) // 0 AM_RANGE(0xe00040, 0xe00047) AM_WRITE(ddenlovr16_palette_base_w ) AM_RANGE(0xe00048, 0xe0004f) AM_WRITE(ddenlovr16_palette_mask_w ) AM_RANGE(0xe00050, 0xe00057) AM_WRITE(ddenlovr16_transparency_pen_w ) @@ -3259,9 +3259,9 @@ static ADDRESS_MAP_START( akamaru_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe0006a, 0xe0006b) AM_WRITE(ddenlovr16_priority_w ) AM_RANGE(0xe0006c, 0xe0006d) AM_WRITE(ddenlovr16_layer_enable_w ) AM_RANGE(0xe00080, 0xe00083) AM_WRITE(ddenlovr_blitter_w ) - AM_RANGE(0xe00108, 0xe0010b) AM_WRITE(MWA16_RAM ) AM_BASE( &akamaru_protection2 ) + AM_RANGE(0xe00108, 0xe0010b) AM_WRITE(SMH_RAM ) AM_BASE( &akamaru_protection2 ) AM_RANGE(0xe00302, 0xe00303) AM_WRITE(ddenlovr_blitter_irq_ack_w ) // Blitter irq acknowledge - AM_RANGE(0xe00304, 0xe00307) AM_WRITE(MWA16_RAM ) AM_BASE( &akamaru_dsw_sel ) // DSW select + AM_RANGE(0xe00304, 0xe00307) AM_WRITE(SMH_RAM ) AM_BASE( &akamaru_dsw_sel ) // DSW select AM_RANGE(0xe00308, 0xe00309) AM_WRITE(ddenlovr_coincounter_0_w ) // Coin Counters AM_RANGE(0xe0030c, 0xe0030d) AM_WRITE(ddenlovr_coincounter_1_w ) // AM_RANGE(0xe00400, 0xe00401) AM_WRITE(YM2413_register_port_0_lsb_w ) @@ -3270,7 +3270,7 @@ static ADDRESS_MAP_START( akamaru_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe00600, 0xe00601) AM_WRITE(AY8910_control_port_0_lsb_w ) AM_RANGE(0xe00602, 0xe00603) AM_WRITE(AY8910_write_port_0_lsb_w ) AM_RANGE(0xe00700, 0xe00701) AM_WRITE(OKIM6295_data_0_lsb_w ) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -3338,7 +3338,7 @@ static WRITE8_HANDLER( mjflove_coincounter_w ) static ADDRESS_MAP_START( mjflove_readport, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O AM_RANGE(0x0010, 0x0010) AM_READ( hanakanz_rand_r ) AM_MIRROR(0xff00) AM_RANGE(0x001c, 0x001c) AM_READ( input_port_12_r ) AM_MIRROR(0xff00) - AM_RANGE(0x0038, 0x0038) AM_READ( MRA8_NOP ) // ? ack or watchdog + AM_RANGE(0x0038, 0x0038) AM_READ( SMH_NOP ) // ? ack or watchdog AM_RANGE(0x0043, 0x0043) AM_READ( rongrong_gfxrom_r ) AM_RANGE(0x0080, 0x0081) AM_READ( mjflove_keyb_r ) AM_RANGE(0x0082, 0x0082) AM_READ( mjflove_blitter_r ) @@ -3361,7 +3361,7 @@ static ADDRESS_MAP_START( mjflove_writeport, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O AM_RANGE(0x00f2, 0x00f2) AM_WRITE( mjmyster_rambank_w ) AM_MIRROR(0xff00) AM_RANGE(0x00f8, 0x00f8) AM_WRITE( mjflove_rombank_w ) AM_MIRROR(0xff00) AM_RANGE(0x00fa, 0x00fa) AM_WRITE( mjflove_okibank_w ) - AM_RANGE(0x0181, 0x0181) AM_WRITE( MWA8_NOP ) // ? int. enable + AM_RANGE(0x0181, 0x0181) AM_WRITE( SMH_NOP ) // ? int. enable AM_RANGE(0x0184, 0x0184) AM_WRITE( mjflove_coincounter_w ) AM_RANGE(0x0200, 0x0200) AM_WRITE( YM2413_register_port_0_w ) AM_RANGE(0x0201, 0x0201) AM_WRITE( YM2413_data_port_0_w ) @@ -7549,7 +7549,7 @@ static DRIVER_INIT( rongrong ) version of the game might be a bootleg with the protection patched. (both sets need this) */ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x60d4, 0x60d4, 0, 0, MRA8_NOP); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x60d4, 0x60d4, 0, 0, SMH_NOP); } /*************************************************************************** diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c index abc44769a43..ffd3dfba1a6 100644 --- a/src/mame/drivers/ddragon.c +++ b/src/mame/drivers/ddragon.c @@ -295,7 +295,7 @@ static WRITE8_HANDLER( darktowr_bankswitch_w ) if (newbank == 4 && oldbank != 4) memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, darktowr_mcu_bank_r, darktowr_mcu_bank_w); else if (newbank != 4 && oldbank == 4) - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_BANK1); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, SMH_BANK1, SMH_BANK1); } @@ -495,20 +495,20 @@ static READ8_HANDLER( dd_adpcm_status_r ) static ADDRESS_MAP_START( ddragon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&rambase) - AM_RANGE(0x1000, 0x11ff) AM_READWRITE(MRA8_RAM, paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) - AM_RANGE(0x1200, 0x13ff) AM_READWRITE(MRA8_RAM, paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) + AM_RANGE(0x1000, 0x11ff) AM_READWRITE(SMH_RAM, paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) + AM_RANGE(0x1200, 0x13ff) AM_READWRITE(SMH_RAM, paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) AM_RANGE(0x1400, 0x17ff) AM_RAM - AM_RANGE(0x1800, 0x1fff) AM_READWRITE(MRA8_RAM, ddragon_fgvideoram_w) AM_BASE(&ddragon_fgvideoram) + AM_RANGE(0x1800, 0x1fff) AM_READWRITE(SMH_RAM, ddragon_fgvideoram_w) AM_BASE(&ddragon_fgvideoram) AM_RANGE(0x2000, 0x2fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE(&ddragon_spriteram) - AM_RANGE(0x3000, 0x37ff) AM_READWRITE(MRA8_RAM, ddragon_bgvideoram_w) AM_BASE(&ddragon_bgvideoram) + AM_RANGE(0x3000, 0x37ff) AM_READWRITE(SMH_RAM, ddragon_bgvideoram_w) AM_BASE(&ddragon_bgvideoram) AM_RANGE(0x3800, 0x3800) AM_READ(input_port_0_r) AM_RANGE(0x3801, 0x3801) AM_READ(input_port_1_r) AM_RANGE(0x3802, 0x3802) AM_READ(input_port_4_r) AM_RANGE(0x3803, 0x3803) AM_READ(input_port_2_r) AM_RANGE(0x3804, 0x3804) AM_READ(input_port_3_r) AM_RANGE(0x3808, 0x3808) AM_WRITE(ddragon_bankswitch_w) - AM_RANGE(0x3809, 0x3809) AM_WRITE(MWA8_RAM) AM_BASE(&ddragon_scrollx_lo) - AM_RANGE(0x380a, 0x380a) AM_WRITE(MWA8_RAM) AM_BASE(&ddragon_scrolly_lo) + AM_RANGE(0x3809, 0x3809) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrollx_lo) + AM_RANGE(0x380a, 0x380a) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrolly_lo) AM_RANGE(0x380b, 0x380f) AM_WRITE(ddragon_interrupt_w) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0xffff) AM_ROM @@ -517,20 +517,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dd2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x17ff) AM_RAM - AM_RANGE(0x1800, 0x1fff) AM_READWRITE(MRA8_RAM, ddragon_fgvideoram_w) AM_BASE(&ddragon_fgvideoram) + AM_RANGE(0x1800, 0x1fff) AM_READWRITE(SMH_RAM, ddragon_fgvideoram_w) AM_BASE(&ddragon_fgvideoram) AM_RANGE(0x2000, 0x2fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE(&ddragon_spriteram) - AM_RANGE(0x3000, 0x37ff) AM_READWRITE(MRA8_RAM, ddragon_bgvideoram_w) AM_BASE(&ddragon_bgvideoram) + AM_RANGE(0x3000, 0x37ff) AM_READWRITE(SMH_RAM, ddragon_bgvideoram_w) AM_BASE(&ddragon_bgvideoram) AM_RANGE(0x3800, 0x3800) AM_READ(input_port_0_r) AM_RANGE(0x3801, 0x3801) AM_READ(input_port_1_r) AM_RANGE(0x3802, 0x3802) AM_READ(input_port_4_r) AM_RANGE(0x3803, 0x3803) AM_READ(input_port_2_r) AM_RANGE(0x3804, 0x3804) AM_READ(input_port_3_r) AM_RANGE(0x3808, 0x3808) AM_WRITE(ddragon_bankswitch_w) - AM_RANGE(0x3809, 0x3809) AM_WRITE(MWA8_RAM) AM_BASE(&ddragon_scrollx_lo) - AM_RANGE(0x380a, 0x380a) AM_WRITE(MWA8_RAM) AM_BASE(&ddragon_scrolly_lo) + AM_RANGE(0x3809, 0x3809) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrollx_lo) + AM_RANGE(0x380a, 0x380a) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrolly_lo) AM_RANGE(0x380b, 0x380f) AM_WRITE(ddragon_interrupt_w) - AM_RANGE(0x3c00, 0x3dff) AM_READWRITE(MRA8_RAM, paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) - AM_RANGE(0x3e00, 0x3fff) AM_READWRITE(MRA8_RAM, paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) + AM_RANGE(0x3c00, 0x3dff) AM_READWRITE(SMH_RAM, paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) + AM_RANGE(0x3e00, 0x3fff) AM_READWRITE(SMH_RAM, paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -614,7 +614,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7ff) - AM_RANGE(0x0000, 0x0007) AM_READWRITE(MRA8_RAM, darktowr_mcu_w) AM_BASE(&darktowr_mcu_ports) + AM_RANGE(0x0000, 0x0007) AM_READWRITE(SMH_RAM, darktowr_mcu_w) AM_BASE(&darktowr_mcu_ports) AM_RANGE(0x0008, 0x007f) AM_RAM AM_RANGE(0x0080, 0x07ff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index 04146041e98..56274db2f6d 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -92,91 +92,91 @@ static WRITE16_HANDLER( ddragon3_io16_w ) /* Memory Maps */ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) /* Foreground (32x32 Tiles - 4 by per tile) */ - AM_RANGE(0x082000, 0x0827ff) AM_READ(MRA16_RAM) /* Background (32x32 Tiles - 2 by per tile) */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) /* Foreground (32x32 Tiles - 4 by per tile) */ + AM_RANGE(0x082000, 0x0827ff) AM_READ(SMH_RAM) /* Background (32x32 Tiles - 2 by per tile) */ AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r) AM_RANGE(0x100002, 0x100003) AM_READ(input_port_1_word_r) AM_RANGE(0x100004, 0x100005) AM_READ(input_port_2_word_r) AM_RANGE(0x100006, 0x100007) AM_READ(input_port_3_word_r) - AM_RANGE(0x140000, 0x1405ff) AM_READ(MRA16_RAM) /* Palette RAM */ - AM_RANGE(0x180000, 0x180fff) AM_READ(MRA16_RAM) - AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(MRA16_RAM) /* working RAM */ + AM_RANGE(0x140000, 0x1405ff) AM_READ(SMH_RAM) /* Palette RAM */ + AM_RANGE(0x180000, 0x180fff) AM_READ(SMH_RAM) + AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(SMH_RAM) /* working RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080000, 0x080fff) AM_WRITE(ddragon3_fg_videoram16_w) AM_BASE(&ddragon3_fg_videoram16) AM_RANGE(0x082000, 0x0827ff) AM_WRITE(ddragon3_bg_videoram16_w) AM_BASE(&ddragon3_bg_videoram16) AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(ddragon3_scroll16_w) AM_RANGE(0x100000, 0x10000f) AM_WRITE(ddragon3_io16_w) AM_RANGE(0x140000, 0x1405ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x180000, 0x180fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) /* Sprites (16 bytes per sprite) */ - AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x180000, 0x180fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) /* Sprites (16 bytes per sprite) */ + AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( dd3b_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) /* Foreground (32x32 Tiles - 4 by per tile) */ - AM_RANGE(0x081000, 0x081fff) AM_READ(MRA16_RAM) - AM_RANGE(0x082000, 0x0827ff) AM_READ(MRA16_RAM) /* Background (32x32 Tiles - 2 by per tile) */ - AM_RANGE(0x100000, 0x1005ff) AM_READ(MRA16_RAM) /* Palette RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) /* Foreground (32x32 Tiles - 4 by per tile) */ + AM_RANGE(0x081000, 0x081fff) AM_READ(SMH_RAM) + AM_RANGE(0x082000, 0x0827ff) AM_READ(SMH_RAM) /* Background (32x32 Tiles - 2 by per tile) */ + AM_RANGE(0x100000, 0x1005ff) AM_READ(SMH_RAM) /* Palette RAM */ AM_RANGE(0x180000, 0x180001) AM_READ(input_port_0_word_r) AM_RANGE(0x180002, 0x180003) AM_READ(input_port_1_word_r) AM_RANGE(0x180004, 0x180005) AM_READ(input_port_2_word_r) AM_RANGE(0x180006, 0x180007) AM_READ(input_port_3_word_r) - AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(MRA16_RAM) /* working RAM */ + AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(SMH_RAM) /* working RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( dd3b_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080000, 0x080fff) AM_WRITE(ddragon3_fg_videoram16_w) AM_BASE(&ddragon3_fg_videoram16) - AM_RANGE(0x081000, 0x081fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) /* Sprites (16 bytes per sprite) */ + AM_RANGE(0x081000, 0x081fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) /* Sprites (16 bytes per sprite) */ AM_RANGE(0x082000, 0x0827ff) AM_WRITE(ddragon3_bg_videoram16_w) AM_BASE(&ddragon3_bg_videoram16) AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(ddragon3_scroll16_w) AM_RANGE(0x100000, 0x1005ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x140000, 0x14000f) AM_WRITE(ddragon3_io16_w) - AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ctribe_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) /* Foreground (32x32 Tiles - 4 by per tile) */ - AM_RANGE(0x081000, 0x081fff) AM_READ(MRA16_RAM) - AM_RANGE(0x082000, 0x0827ff) AM_READ(MRA16_RAM) /* Background (32x32 Tiles - 2 by per tile) */ - AM_RANGE(0x082800, 0x082fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) /* Foreground (32x32 Tiles - 4 by per tile) */ + AM_RANGE(0x081000, 0x081fff) AM_READ(SMH_RAM) + AM_RANGE(0x082000, 0x0827ff) AM_READ(SMH_RAM) /* Background (32x32 Tiles - 2 by per tile) */ + AM_RANGE(0x082800, 0x082fff) AM_READ(SMH_RAM) AM_RANGE(0x0c0000, 0x0c000f) AM_READ(ddragon3_scroll16_r) - AM_RANGE(0x100000, 0x1005ff) AM_READ(MRA16_RAM) /* Palette RAM */ + AM_RANGE(0x100000, 0x1005ff) AM_READ(SMH_RAM) /* Palette RAM */ AM_RANGE(0x180000, 0x180001) AM_READ(input_port_0_word_r) AM_RANGE(0x180002, 0x180003) AM_READ(input_port_1_word_r) AM_RANGE(0x180004, 0x180005) AM_READ(input_port_2_word_r) AM_RANGE(0x180006, 0x180007) AM_READ(input_port_3_word_r) - AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(MRA16_RAM) /* working RAM */ + AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(SMH_RAM) /* working RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( ctribe_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080000, 0x080fff) AM_WRITE(ddragon3_fg_videoram16_w) AM_BASE(&ddragon3_fg_videoram16) - AM_RANGE(0x081000, 0x081fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) /* Sprites (16 bytes per sprite) */ + AM_RANGE(0x081000, 0x081fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) /* Sprites (16 bytes per sprite) */ AM_RANGE(0x082000, 0x0827ff) AM_WRITE(ddragon3_bg_videoram16_w) AM_BASE(&ddragon3_bg_videoram16) - AM_RANGE(0x082800, 0x082fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x082800, 0x082fff) AM_WRITE(SMH_RAM) AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(ddragon3_scroll16_w) AM_RANGE(0x100000, 0x1005ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x140000, 0x14000f) AM_WRITE(ddragon3_io16_w) - AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc801, 0xc801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xd800, 0xd800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc800, 0xc800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xd800, 0xd800) AM_WRITE(OKIM6295_data_0_w) @@ -184,16 +184,16 @@ static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ctribe_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8801, 0x8801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( ctribe_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c index 561e06ed556..61a4b8d3198 100644 --- a/src/mame/drivers/ddrible.c +++ b/src/mame/drivers/ddrible.c @@ -127,26 +127,26 @@ static WRITE8_HANDLER( ddrible_vlm5030_ctrl_w ) static ADDRESS_MAP_START( readmem_cpu0, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x1800, 0x187f) AM_READ(MRA8_RAM) /* palette */ - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM) /* Video RAM 1 + Object RAM 1 */ - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) /* shared RAM with CPU #1 */ - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_RAM) /* Video RAM 2 + Object RAM 2 */ - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK1) /* banked ROM */ - AM_RANGE(0xa000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x1800, 0x187f) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_RAM) /* Video RAM 1 + Object RAM 1 */ + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) /* shared RAM with CPU #1 */ + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_RAM) /* Video RAM 2 + Object RAM 2 */ + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK1) /* banked ROM */ + AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu0, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0004) AM_WRITE(K005885_0_w) /* video registers (005885 #1) */ AM_RANGE(0x0800, 0x0804) AM_WRITE(K005885_1_w) /* video registers (005885 #2) */ - AM_RANGE(0x1800, 0x187f) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) + AM_RANGE(0x1800, 0x187f) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) AM_RANGE(0x2000, 0x2fff) AM_WRITE(ddrible_fg_videoram_w) AM_BASE(&ddrible_fg_videoram)/* Video RAM 1 */ - AM_RANGE(0x3000, 0x3fff) AM_WRITE(MWA8_RAM) AM_BASE(&ddrible_spriteram_1) /* Object RAM 1 */ - AM_RANGE(0x4000, 0x5fff) AM_WRITE(MWA8_RAM) AM_BASE(&ddrible_sharedram) /* shared RAM with CPU #1 */ + AM_RANGE(0x3000, 0x3fff) AM_WRITE(SMH_RAM) AM_BASE(&ddrible_spriteram_1) /* Object RAM 1 */ + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_RAM) AM_BASE(&ddrible_sharedram) /* shared RAM with CPU #1 */ AM_RANGE(0x6000, 0x6fff) AM_WRITE(ddrible_bg_videoram_w) AM_BASE(&ddrible_bg_videoram)/* Video RAM 2 */ - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_RAM) AM_BASE(&ddrible_spriteram_2) /* Object RAM 2 + Work RAM */ + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_RAM) AM_BASE(&ddrible_spriteram_2) /* Object RAM 2 + Work RAM */ AM_RANGE(0x8000, 0x8000) AM_WRITE(ddrible_bankswitch_w) /* bankswitch control */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) @@ -158,7 +158,7 @@ static ADDRESS_MAP_START( readmem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2803, 0x2803) AM_READ(input_port_2_r) /* coinsw & start */ AM_RANGE(0x2c00, 0x2c00) AM_READ(input_port_4_r) /* DSW #2 */ AM_RANGE(0x3000, 0x3000) AM_READ(input_port_5_r) /* DSW #3 */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) @@ -166,22 +166,22 @@ static ADDRESS_MAP_START( writemem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x27ff) AM_WRITE(ddrible_snd_sharedram_w) /* shared RAM with CPU #2 */ AM_RANGE(0x3400, 0x3400) AM_WRITE(ddrible_coin_counter_w) /* coin counters */ AM_RANGE(0x3c00, 0x3c00) AM_WRITE(watchdog_reset_w) /* watchdog reset */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) /* shared RAM with CPU #1 */ + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) /* shared RAM with CPU #1 */ AM_RANGE(0x1000, 0x1000) AM_READ(YM2203_status_port_0_r) /* YM2203 */ AM_RANGE(0x1001, 0x1001) AM_READ(YM2203_read_port_0_r) /* YM2203 */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) AM_BASE(&ddrible_snd_sharedram) /* shared RAM with CPU #1 */ + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_BASE(&ddrible_snd_sharedram) /* shared RAM with CPU #1 */ AM_RANGE(0x1000, 0x1000) AM_WRITE(YM2203_control_port_0_w) /* YM2203 */ AM_RANGE(0x1001, 0x1001) AM_WRITE(YM2203_write_port_0_w) /* YM2203 */ AM_RANGE(0x3000, 0x3000) AM_WRITE(VLM5030_data_w) /* Speech data */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static INPUT_PORTS_START( ddribble ) diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c index 0cbfd97eded..8aa8f1e3d7b 100644 --- a/src/mame/drivers/deadang.c +++ b/src/mame/drivers/deadang.c @@ -66,23 +66,23 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x037ff) AM_RAM AM_RANGE(0x03800, 0x03fff) AM_RAM AM_BASE(&spriteram16) AM_RANGE(0x04000, 0x04fff) AM_RAM AM_SHARE(1) - AM_RANGE(0x05000, 0x05fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x05000, 0x05fff) AM_WRITE(SMH_RAM) AM_RANGE(0x06000, 0x0600f) AM_READWRITE(seibu_main_word_r, seibu_main_word_w) - AM_RANGE(0x06010, 0x07fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x06010, 0x07fff) AM_WRITE(SMH_RAM) AM_RANGE(0x08000, 0x087ff) AM_WRITE(deadang_text_w) AM_BASE(&videoram16) - AM_RANGE(0x08800, 0x0bfff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x08800, 0x0bfff) AM_WRITE(SMH_RAM) AM_RANGE(0x0a000, 0x0a001) AM_READ(input_port_1_word_r) AM_RANGE(0x0a002, 0x0a003) AM_READ(input_port_2_word_r) AM_RANGE(0x0c000, 0x0cfff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0d000, 0x0dfff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x0e000, 0x0e0ff) AM_WRITE(MWA16_RAM) AM_BASE(&deadang_scroll_ram) - AM_RANGE(0x0e100, 0x0ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x0d000, 0x0dfff) AM_WRITE(SMH_RAM) + AM_RANGE(0x0e000, 0x0e0ff) AM_WRITE(SMH_RAM) AM_BASE(&deadang_scroll_ram) + AM_RANGE(0x0e100, 0x0ffff) AM_WRITE(SMH_RAM) AM_RANGE(0xc0000, 0xfffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x037ff) AM_RAM - AM_RANGE(0x03800, 0x03fff) AM_READWRITE(MRA16_RAM, deadang_foreground_w) AM_BASE(&deadang_video_data) + AM_RANGE(0x03800, 0x03fff) AM_READWRITE(SMH_RAM, deadang_foreground_w) AM_BASE(&deadang_video_data) AM_RANGE(0x04000, 0x04fff) AM_RAM AM_SHARE(1) AM_RANGE(0x08000, 0x08001) AM_WRITE(deadang_bank_w) AM_RANGE(0x0c000, 0x0c001) AM_WRITE(watchdog_reset16_w) diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 8a9c66b9309..cb282d220c0 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -125,102 +125,102 @@ static WRITE16_HANDLER( midres_sound_w ) /******************************************************************************/ static ADDRESS_MAP_START( dec0_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x242800, 0x243fff) AM_READ(MRA16_RAM) /* Robocop only */ - AM_RANGE(0x244000, 0x245fff) AM_READ(MRA16_RAM) - AM_RANGE(0x24a000, 0x24a7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x24c800, 0x24c87f) AM_READ(MRA16_RAM) - AM_RANGE(0x24d000, 0x24d7ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) + AM_RANGE(0x242800, 0x243fff) AM_READ(SMH_RAM) /* Robocop only */ + AM_RANGE(0x244000, 0x245fff) AM_READ(SMH_RAM) + AM_RANGE(0x24a000, 0x24a7ff) AM_READ(SMH_RAM) + AM_RANGE(0x24c800, 0x24c87f) AM_READ(SMH_RAM) + AM_RANGE(0x24d000, 0x24d7ff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x30001f) AM_READ(dec0_rotary_r) AM_RANGE(0x30c000, 0x30c00b) AM_READ(dec0_controls_r) - AM_RANGE(0x310000, 0x3107ff) AM_READ(MRA16_RAM) - AM_RANGE(0x314000, 0x3147ff) AM_READ(MRA16_RAM) - AM_RANGE(0xff8000, 0xffbfff) AM_READ(MRA16_RAM) /* Main ram */ - AM_RANGE(0xffc000, 0xffc7ff) AM_READ(MRA16_RAM) /* Sprites */ + AM_RANGE(0x310000, 0x3107ff) AM_READ(SMH_RAM) + AM_RANGE(0x314000, 0x3147ff) AM_READ(SMH_RAM) + AM_RANGE(0xff8000, 0xffbfff) AM_READ(SMH_RAM) /* Main ram */ + AM_RANGE(0xffc000, 0xffc7ff) AM_READ(SMH_RAM) /* Sprites */ ADDRESS_MAP_END static ADDRESS_MAP_START( dec0_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x240000, 0x240007) AM_WRITE(dec0_pf1_control_0_w) /* text layer */ AM_RANGE(0x240010, 0x240017) AM_WRITE(dec0_pf1_control_1_w) - AM_RANGE(0x242000, 0x24207f) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf1_colscroll) - AM_RANGE(0x242400, 0x2427ff) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf1_rowscroll) - AM_RANGE(0x242800, 0x243fff) AM_WRITE(MWA16_RAM) /* Robocop only */ + AM_RANGE(0x242000, 0x24207f) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf1_colscroll) + AM_RANGE(0x242400, 0x2427ff) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf1_rowscroll) + AM_RANGE(0x242800, 0x243fff) AM_WRITE(SMH_RAM) /* Robocop only */ AM_RANGE(0x244000, 0x245fff) AM_WRITE(dec0_pf1_data_w) AM_BASE(&dec0_pf1_data) AM_RANGE(0x246000, 0x246007) AM_WRITE(dec0_pf2_control_0_w) /* first tile layer */ AM_RANGE(0x246010, 0x246017) AM_WRITE(dec0_pf2_control_1_w) - AM_RANGE(0x248000, 0x24807f) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf2_colscroll) - AM_RANGE(0x248400, 0x2487ff) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf2_rowscroll) + AM_RANGE(0x248000, 0x24807f) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf2_colscroll) + AM_RANGE(0x248400, 0x2487ff) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf2_rowscroll) AM_RANGE(0x24a000, 0x24a7ff) AM_WRITE(dec0_pf2_data_w) AM_BASE(&dec0_pf2_data) AM_RANGE(0x24c000, 0x24c007) AM_WRITE(dec0_pf3_control_0_w) /* second tile layer */ AM_RANGE(0x24c010, 0x24c017) AM_WRITE(dec0_pf3_control_1_w) - AM_RANGE(0x24c800, 0x24c87f) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf3_colscroll) - AM_RANGE(0x24cc00, 0x24cfff) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf3_rowscroll) + AM_RANGE(0x24c800, 0x24c87f) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf3_colscroll) + AM_RANGE(0x24cc00, 0x24cfff) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf3_rowscroll) AM_RANGE(0x24d000, 0x24d7ff) AM_WRITE(dec0_pf3_data_w) AM_BASE(&dec0_pf3_data) AM_RANGE(0x30c010, 0x30c01f) AM_WRITE(dec0_control_w) /* Priority, sound, etc. */ AM_RANGE(0x310000, 0x3107ff) AM_WRITE(dec0_paletteram_rg_w) AM_BASE(&paletteram16) /* Red & Green bits */ AM_RANGE(0x314000, 0x3147ff) AM_WRITE(dec0_paletteram_b_w) AM_BASE(&paletteram16_2) /* Blue bits */ - AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_ram) - AM_RANGE(0xffc000, 0xffc7ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(SMH_RAM) AM_BASE(&dec0_ram) + AM_RANGE(0xffc000, 0xffc7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) ADDRESS_MAP_END static ADDRESS_MAP_START( robocop_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_RAM) /* Main ram */ - AM_RANGE(0x1f2000, 0x1f3fff) AM_READ(MRA8_RAM) /* Shared ram */ + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_RAM) /* Main ram */ + AM_RANGE(0x1f2000, 0x1f3fff) AM_READ(SMH_RAM) /* Shared ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( robocop_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_RAM) /* Main ram */ - AM_RANGE(0x1f2000, 0x1f3fff) AM_WRITE(MWA8_RAM) AM_BASE(&robocop_shared_ram) /* Shared ram */ + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_RAM) /* Main ram */ + AM_RANGE(0x1f2000, 0x1f3fff) AM_WRITE(SMH_RAM) AM_BASE(&robocop_shared_ram) /* Shared ram */ AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hippodrm_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x180000, 0x1800ff) AM_READ(hippodrm_shared_r) AM_RANGE(0x1a1000, 0x1a17ff) AM_READ(dec0_pf3_data_8bit_r) AM_RANGE(0x1d0000, 0x1d00ff) AM_READ(hippodrm_prot_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) /* Main ram */ + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) /* Main ram */ AM_RANGE(0x1ff402, 0x1ff403) AM_READ(input_port_5_r) /* VBL */ ADDRESS_MAP_END static ADDRESS_MAP_START( hippodrm_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x180000, 0x1800ff) AM_WRITE(hippodrm_shared_w) AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(dec0_pf3_control_8bit_w) AM_RANGE(0x1a1000, 0x1a17ff) AM_WRITE(dec0_pf3_data_8bit_w) AM_RANGE(0x1d0000, 0x1d00ff) AM_WRITE(hippodrm_prot_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) /* Main ram */ + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) /* Main ram */ AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( slyspy_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) AM_RANGE(0x244000, 0x244001) AM_READ(slyspy_state_r) /* protection */ - AM_RANGE(0x304000, 0x307fff) AM_READ(MRA16_RAM) /* Sly spy main ram */ - AM_RANGE(0x308000, 0x3087ff) AM_READ(MRA16_RAM) /* Sprites */ - AM_RANGE(0x310000, 0x3107ff) AM_READ(MRA16_RAM) + AM_RANGE(0x304000, 0x307fff) AM_READ(SMH_RAM) /* Sly spy main ram */ + AM_RANGE(0x308000, 0x3087ff) AM_READ(SMH_RAM) /* Sprites */ + AM_RANGE(0x310000, 0x3107ff) AM_READ(SMH_RAM) AM_RANGE(0x314008, 0x31400f) AM_READ(slyspy_controls_r) AM_RANGE(0x31c000, 0x31c00f) AM_READ(slyspy_protection_r) ADDRESS_MAP_END static ADDRESS_MAP_START( slyspy_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) /* These locations aren't real! They are just there so memory is allocated */ - AM_RANGE(0x232000, 0x23207f) AM_WRITE(MWA16_NOP) AM_BASE(&dec0_pf2_colscroll) - AM_RANGE(0x232400, 0x2327ff) AM_WRITE(MWA16_NOP) AM_BASE(&dec0_pf2_rowscroll) - AM_RANGE(0x23c000, 0x23c07f) AM_WRITE(MWA16_NOP) AM_BASE(&dec0_pf1_colscroll) - AM_RANGE(0x23c400, 0x23c7ff) AM_WRITE(MWA16_NOP) AM_BASE(&dec0_pf1_rowscroll) - AM_RANGE(0x200000, 0x2007ff) AM_WRITE(MWA16_NOP) AM_BASE(&dec0_pf2_data) - AM_RANGE(0x202000, 0x203fff) AM_WRITE(MWA16_NOP) AM_BASE(&dec0_pf1_data) + AM_RANGE(0x232000, 0x23207f) AM_WRITE(SMH_NOP) AM_BASE(&dec0_pf2_colscroll) + AM_RANGE(0x232400, 0x2327ff) AM_WRITE(SMH_NOP) AM_BASE(&dec0_pf2_rowscroll) + AM_RANGE(0x23c000, 0x23c07f) AM_WRITE(SMH_NOP) AM_BASE(&dec0_pf1_colscroll) + AM_RANGE(0x23c400, 0x23c7ff) AM_WRITE(SMH_NOP) AM_BASE(&dec0_pf1_rowscroll) + AM_RANGE(0x200000, 0x2007ff) AM_WRITE(SMH_NOP) AM_BASE(&dec0_pf2_data) + AM_RANGE(0x202000, 0x203fff) AM_WRITE(SMH_NOP) AM_BASE(&dec0_pf1_data) - AM_RANGE(0x244000, 0x244001) AM_WRITE(MWA16_NOP) /* Extra protection? */ + AM_RANGE(0x244000, 0x244001) AM_WRITE(SMH_NOP) /* Extra protection? */ /* The location of p1 & pf2 can change between these according to protection */ AM_RANGE(0x240000, 0x241fff) AM_WRITE(slyspy_240000_w) @@ -235,58 +235,58 @@ static ADDRESS_MAP_START( slyspy_writemem, ADDRESS_SPACE_PROGRAM, 16 ) /* Pf3 is unaffected by protection */ AM_RANGE(0x300000, 0x300007) AM_WRITE(dec0_pf3_control_0_w) AM_RANGE(0x300010, 0x300017) AM_WRITE(dec0_pf3_control_1_w) - AM_RANGE(0x300800, 0x30087f) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf3_colscroll) - AM_RANGE(0x300c00, 0x300fff) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf3_rowscroll) + AM_RANGE(0x300800, 0x30087f) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf3_colscroll) + AM_RANGE(0x300c00, 0x300fff) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf3_rowscroll) AM_RANGE(0x301000, 0x3017ff) AM_WRITE(dec0_pf3_data_w) AM_BASE(&dec0_pf3_data) - AM_RANGE(0x304000, 0x307fff) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_ram) /* Sly spy main ram */ - AM_RANGE(0x308000, 0x3087ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x304000, 0x307fff) AM_WRITE(SMH_RAM) AM_BASE(&dec0_ram) /* Sly spy main ram */ + AM_RANGE(0x308000, 0x3087ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0x310000, 0x3107ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x314000, 0x314003) AM_WRITE(slyspy_control_w) - AM_RANGE(0x31c000, 0x31c00f) AM_WRITE(MWA16_NOP) + AM_RANGE(0x31c000, 0x31c00f) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( midres_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(midres_controls_r) - AM_RANGE(0x240000, 0x24007f) AM_READ(MRA16_RAM) - AM_RANGE(0x240400, 0x2407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x2c0000, 0x2c007f) AM_READ(MRA16_RAM) - AM_RANGE(0x2c0400, 0x2c07ff) AM_READ(MRA16_RAM) - AM_RANGE(0x340000, 0x34007f) AM_READ(MRA16_RAM) - AM_RANGE(0x340400, 0x3407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x320000, 0x321fff) AM_READ(MRA16_RAM) + AM_RANGE(0x240000, 0x24007f) AM_READ(SMH_RAM) + AM_RANGE(0x240400, 0x2407ff) AM_READ(SMH_RAM) + AM_RANGE(0x2c0000, 0x2c007f) AM_READ(SMH_RAM) + AM_RANGE(0x2c0400, 0x2c07ff) AM_READ(SMH_RAM) + AM_RANGE(0x340000, 0x34007f) AM_READ(SMH_RAM) + AM_RANGE(0x340400, 0x3407ff) AM_READ(SMH_RAM) + AM_RANGE(0x320000, 0x321fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( midres_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_ram) - AM_RANGE(0x120000, 0x1207ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&dec0_ram) + AM_RANGE(0x120000, 0x1207ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x160000, 0x160001) AM_WRITE(dec0_priority_w) - AM_RANGE(0x180008, 0x18000f) AM_WRITE(MWA16_NOP) /* ?? watchdog ?? */ + AM_RANGE(0x180008, 0x18000f) AM_WRITE(SMH_NOP) /* ?? watchdog ?? */ AM_RANGE(0x1a0000, 0x1a0001) AM_WRITE(midres_sound_w) AM_RANGE(0x200000, 0x200007) AM_WRITE(dec0_pf2_control_0_w) AM_RANGE(0x200010, 0x200017) AM_WRITE(dec0_pf2_control_1_w) AM_RANGE(0x220000, 0x2207ff) AM_WRITE(dec0_pf2_data_w) AM_BASE(&dec0_pf2_data) AM_RANGE(0x220800, 0x220fff) AM_WRITE(dec0_pf2_data_w) /* mirror address used in end sequence */ - AM_RANGE(0x240000, 0x24007f) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf2_colscroll) - AM_RANGE(0x240400, 0x2407ff) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf2_rowscroll) + AM_RANGE(0x240000, 0x24007f) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf2_colscroll) + AM_RANGE(0x240400, 0x2407ff) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf2_rowscroll) AM_RANGE(0x280000, 0x280007) AM_WRITE(dec0_pf3_control_0_w) AM_RANGE(0x280010, 0x280017) AM_WRITE(dec0_pf3_control_1_w) AM_RANGE(0x2a0000, 0x2a07ff) AM_WRITE(dec0_pf3_data_w) AM_BASE(&dec0_pf3_data) - AM_RANGE(0x2c0000, 0x2c007f) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf3_colscroll) - AM_RANGE(0x2c0400, 0x2c07ff) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf3_rowscroll) + AM_RANGE(0x2c0000, 0x2c007f) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf3_colscroll) + AM_RANGE(0x2c0400, 0x2c07ff) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf3_rowscroll) AM_RANGE(0x300000, 0x300007) AM_WRITE(dec0_pf1_control_0_w) AM_RANGE(0x300010, 0x300017) AM_WRITE(dec0_pf1_control_1_w) AM_RANGE(0x320000, 0x321fff) AM_WRITE(dec0_pf1_data_w) AM_BASE(&dec0_pf1_data) - AM_RANGE(0x340000, 0x34007f) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf1_colscroll) - AM_RANGE(0x340400, 0x3407ff) AM_WRITE(MWA16_RAM) AM_BASE(&dec0_pf1_rowscroll) + AM_RANGE(0x340000, 0x34007f) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf1_colscroll) + AM_RANGE(0x340400, 0x3407ff) AM_WRITE(SMH_RAM) AM_BASE(&dec0_pf1_rowscroll) ADDRESS_MAP_END /******************************************************************************/ @@ -316,51 +316,51 @@ static WRITE8_HANDLER( YM2203_w ) } static ADDRESS_MAP_START( dec0_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x05ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x05ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) AM_RANGE(0x3800, 0x3800) AM_READ(OKIM6295_status_0_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( dec0_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x05ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0801) AM_WRITE(YM2203_w) AM_RANGE(0x1000, 0x1001) AM_WRITE(YM3812_w) AM_RANGE(0x3800, 0x3800) AM_WRITE(OKIM6295_data_0_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /* Physical memory map (21 bits) */ static ADDRESS_MAP_START( slyspy_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x0a0000, 0x0a0001) AM_READ(MRA8_NOP) /* Protection counter */ + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x0a0000, 0x0a0001) AM_READ(SMH_NOP) /* Protection counter */ AM_RANGE(0x0e0000, 0x0e0001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x0f0000, 0x0f0001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( slyspy_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x090000, 0x090001) AM_WRITE(YM3812_w) AM_RANGE(0x0b0000, 0x0b0001) AM_WRITE(YM2203_w) AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE(OKIM6295_data_0_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) /* Main ram */ + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) /* Main ram */ AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( midres_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x138000, 0x138001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( midres_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x108000, 0x108001) AM_WRITE(YM3812_w) AM_RANGE(0x118000, 0x118001) AM_WRITE(YM2203_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_0_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) /* Main ram */ + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) /* Main ram */ 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 6fe2d78b987..2a21885e6af 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -538,43 +538,43 @@ static WRITE8_HANDLER( flip_screen_w ) { flip_screen_set(data); } /******************************************************************************/ static ADDRESS_MAP_START( cobra_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x0800, 0x0fff) AM_READ(dec8_pf0_data_r) AM_RANGE(0x1000, 0x17ff) AM_READ(dec8_pf1_data_r) - AM_RANGE(0x1800, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x31ff) AM_READ(MRA8_RAM) + AM_RANGE(0x1800, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x31ff) AM_READ(SMH_RAM) AM_RANGE(0x3800, 0x3800) AM_READ(input_port_0_r) /* Player 1 */ AM_RANGE(0x3801, 0x3801) AM_READ(input_port_1_r) /* Player 2 */ AM_RANGE(0x3802, 0x3802) AM_READ(input_port_3_r) /* Dip 1 */ AM_RANGE(0x3803, 0x3803) AM_READ(input_port_4_r) /* Dip 2 */ AM_RANGE(0x3a00, 0x3a00) AM_READ(input_port_2_r) /* VBL & coins */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( cobra_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0fff) AM_WRITE(dec8_pf0_data_w) AM_BASE(&dec8_pf0_data) AM_RANGE(0x1000, 0x17ff) AM_WRITE(dec8_pf1_data_w) AM_BASE(&dec8_pf1_data) - AM_RANGE(0x1800, 0x1fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x1800, 0x1fff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2800, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x2800, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3000, 0x31ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_BASE(&paletteram) - AM_RANGE(0x3200, 0x37ff) AM_WRITE(MWA8_RAM) /* Unused */ + AM_RANGE(0x3200, 0x37ff) AM_WRITE(SMH_RAM) /* Unused */ AM_RANGE(0x3800, 0x381f) AM_WRITE(dec8_bac06_0_w) AM_RANGE(0x3a00, 0x3a1f) AM_WRITE(dec8_bac06_1_w) 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, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( ghostb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_RAM) - AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_RAM) + AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x27ff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x2800, 0x2dff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) + AM_RANGE(0x2800, 0x2dff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_RANGE(0x3800, 0x3800) AM_READ(input_port_0_r) /* Player 1 */ AM_RANGE(0x3801, 0x3801) AM_READ(input_port_1_r) /* Player 2 */ AM_RANGE(0x3802, 0x3802) AM_READ(input_port_2_r) /* Player 3 */ @@ -582,28 +582,28 @@ static ADDRESS_MAP_START( ghostb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3820, 0x3820) AM_READ(input_port_5_r) /* Dip */ AM_RANGE(0x3840, 0x3840) AM_READ(i8751_h_r) AM_RANGE(0x3860, 0x3860) AM_READ(i8751_l_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( ghostb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1000, 0x17ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1000, 0x17ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1800, 0x1fff) AM_WRITE(dec8_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_pf0_data_w) AM_BASE(&dec8_pf0_data) - AM_RANGE(0x2800, 0x2bff) AM_WRITE(MWA8_RAM) /* Scratch ram for rowscroll? */ - AM_RANGE(0x2c00, 0x2dff) AM_WRITE(MWA8_RAM) AM_BASE(&dec8_row) - AM_RANGE(0x2e00, 0x2fff) AM_WRITE(MWA8_RAM) /* Unused */ - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x2800, 0x2bff) AM_WRITE(SMH_RAM) /* Scratch ram for rowscroll? */ + AM_RANGE(0x2c00, 0x2dff) AM_WRITE(SMH_RAM) AM_BASE(&dec8_row) + AM_RANGE(0x2e00, 0x2fff) AM_WRITE(SMH_RAM) /* Unused */ + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3800, 0x3800) AM_WRITE(dec8_sound_w) AM_RANGE(0x3820, 0x383f) AM_WRITE(dec8_bac06_0_w) AM_RANGE(0x3840, 0x3840) AM_WRITE(ghostb_bank_w) AM_RANGE(0x3860, 0x3861) AM_WRITE(ghostb_i8751_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( srdarwin_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x13ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x13ff) AM_READ(SMH_RAM) AM_RANGE(0x1400, 0x17ff) AM_READ(dec8_pf0_data_r) AM_RANGE(0x2000, 0x2000) AM_READ(i8751_h_r) AM_RANGE(0x2001, 0x2001) AM_READ(i8751_l_r) @@ -611,35 +611,35 @@ static ADDRESS_MAP_START( srdarwin_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3801, 0x3801) AM_READ(input_port_0_r) /* Player 1 */ AM_RANGE(0x3802, 0x3802) AM_READ(input_port_1_r) /* Player 2 (cocktail) + VBL */ AM_RANGE(0x3803, 0x3803) AM_READ(input_port_3_r) /* Dip 2 */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( srdarwin_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x05ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0600, 0x07ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) + AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x0600, 0x07ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_RANGE(0x0800, 0x0fff) AM_WRITE(srdarwin_videoram_w) AM_BASE(&videoram) AM_SIZE(&spriteram_size) - AM_RANGE(0x1000, 0x13ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x1000, 0x13ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1400, 0x17ff) AM_WRITE(dec8_pf0_data_w) AM_BASE(&dec8_pf0_data) AM_RANGE(0x1800, 0x1801) AM_WRITE(srdarwin_i8751_w) AM_RANGE(0x1802, 0x1802) AM_WRITE(i8751_reset_w) /* Maybe.. */ - AM_RANGE(0x1803, 0x1803) AM_WRITE(MWA8_NOP) /* NMI ack */ + AM_RANGE(0x1803, 0x1803) AM_WRITE(SMH_NOP) /* NMI ack */ AM_RANGE(0x1804, 0x1804) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x1805, 0x1806) AM_WRITE(srdarwin_control_w) /* Scroll & Bank */ AM_RANGE(0x2000, 0x2000) AM_WRITE(dec8_sound_w) /* Sound */ AM_RANGE(0x2001, 0x2001) AM_WRITE(flip_screen_w) /* Flipscreen */ AM_RANGE(0x2800, 0x288f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) AM_RANGE(0x3000, 0x308f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( gondo_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x17ff) AM_READ(SMH_RAM) + AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x27ff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x2800, 0x2bff) AM_READ(MRA8_RAM) - AM_RANGE(0x2c00, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) /* Sprites */ + AM_RANGE(0x2800, 0x2bff) AM_READ(SMH_RAM) + AM_RANGE(0x2c00, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) /* Sprites */ AM_RANGE(0x3800, 0x3800) AM_READ(input_port_7_r) /* Dip 1 */ AM_RANGE(0x3801, 0x3801) AM_READ(input_port_8_r) /* Dip 2 */ AM_RANGE(0x380a, 0x380b) AM_READ(gondo_player_1_r) /* Player 1 rotary */ @@ -648,77 +648,77 @@ static ADDRESS_MAP_START( gondo_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x380f, 0x380f) AM_READ(input_port_2_r) /* Fire buttons */ AM_RANGE(0x3838, 0x3838) AM_READ(i8751_h_r) AM_RANGE(0x3839, 0x3839) AM_READ(i8751_l_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( gondo_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x17ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1800, 0x1fff) AM_WRITE(dec8_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_pf0_data_w) AM_BASE(&dec8_pf0_data) AM_RANGE(0x2800, 0x2bff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) AM_RANGE(0x2c00, 0x2fff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3810, 0x3810) AM_WRITE(dec8_sound_w) AM_RANGE(0x3818, 0x382f) AM_WRITE(gondo_scroll_w) AM_RANGE(0x3830, 0x3830) AM_WRITE(ghostb_bank_w) /* Bank + NMI enable */ AM_RANGE(0x383a, 0x383b) AM_WRITE(gondo_i8751_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( oscar_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0eff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x0f00, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x1fff) AM_READ(MRA8_RAM) AM_SHARE(2) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0eff) AM_READ(SMH_RAM) AM_SHARE(1) + AM_RANGE(0x0f00, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x1fff) AM_READ(SMH_RAM) AM_SHARE(2) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) AM_RANGE(0x2800, 0x2fff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) /* Sprites */ - AM_RANGE(0x3800, 0x3bff) AM_READ(MRA8_RAM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) /* Sprites */ + AM_RANGE(0x3800, 0x3bff) AM_READ(SMH_RAM) AM_RANGE(0x3c00, 0x3c00) AM_READ(input_port_0_r) AM_RANGE(0x3c01, 0x3c01) AM_READ(input_port_1_r) AM_RANGE(0x3c02, 0x3c02) AM_READ(input_port_2_r) /* VBL & coins */ AM_RANGE(0x3c03, 0x3c03) AM_READ(input_port_3_r) /* Dip 1 */ AM_RANGE(0x3c04, 0x3c04) AM_READ(input_port_4_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( oscar_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0eff) AM_WRITE(MWA8_RAM) AM_SHARE(1) - AM_RANGE(0x0f00, 0x0fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1000, 0x1fff) AM_WRITE(MWA8_RAM) AM_SHARE(2) + AM_RANGE(0x0000, 0x0eff) AM_WRITE(SMH_RAM) AM_SHARE(1) + AM_RANGE(0x0f00, 0x0fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1000, 0x1fff) AM_WRITE(SMH_RAM) AM_SHARE(2) AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x2800, 0x2fff) AM_WRITE(dec8_pf0_data_w) AM_BASE(&dec8_pf0_data) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3800, 0x3bff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_BASE(&paletteram) AM_RANGE(0x3c00, 0x3c1f) AM_WRITE(dec8_bac06_0_w) AM_RANGE(0x3c80, 0x3c80) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x3d00, 0x3d00) AM_WRITE(dec8_bank_w) /* BNKS */ AM_RANGE(0x3d80, 0x3d80) AM_WRITE(oscar_sound_w) /* SOUN */ - AM_RANGE(0x3e00, 0x3e00) AM_WRITE(MWA8_NOP) /* COINCL */ + AM_RANGE(0x3e00, 0x3e00) AM_WRITE(SMH_NOP) /* COINCL */ AM_RANGE(0x3e80, 0x3e83) AM_WRITE(oscar_int_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( oscar_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0eff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x0f00, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x1fff) AM_READ(MRA8_RAM) AM_SHARE(2) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x0eff) AM_READ(SMH_RAM) AM_SHARE(1) + AM_RANGE(0x0f00, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x1fff) AM_READ(SMH_RAM) AM_SHARE(2) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( oscar_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0eff) AM_WRITE(MWA8_RAM) AM_SHARE(1) - AM_RANGE(0x0f00, 0x0fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1000, 0x1fff) AM_WRITE(MWA8_RAM) AM_SHARE(2) + AM_RANGE(0x0000, 0x0eff) AM_WRITE(SMH_RAM) AM_SHARE(1) + AM_RANGE(0x0f00, 0x0fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1000, 0x1fff) AM_WRITE(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3e80, 0x3e83) AM_WRITE(oscar_int_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( lastmiss_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) - AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_SHARE(1) + AM_RANGE(0x1000, 0x13ff) AM_READ(SMH_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(SMH_RAM) AM_SHARE(4) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_1_r) AM_RANGE(0x1802, 0x1802) AM_READ(input_port_2_r) @@ -726,16 +726,16 @@ static ADDRESS_MAP_START( lastmiss_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1804, 0x1804) AM_READ(input_port_4_r) /* Dip 2 */ AM_RANGE(0x1806, 0x1806) AM_READ(i8751_h_r) AM_RANGE(0x1807, 0x1807) AM_READ(i8751_l_r) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) - AM_RANGE(0x2800, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) AM_SHARE(2) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) + AM_RANGE(0x2800, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( lastmiss_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_SHARE(1) AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) AM_BASE(&paletteram) AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_BASE(&paletteram_2) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) @@ -747,29 +747,29 @@ static ADDRESS_MAP_START( lastmiss_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x180d, 0x180d) AM_WRITE(lastmiss_control_w) /* Bank switch + Scroll MSB */ AM_RANGE(0x180e, 0x180f) AM_WRITE(lastmiss_i8751_w) AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2800, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_SHARE(2) + AM_RANGE(0x2800, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_WRITE(dec8_pf0_data_w) AM_BASE(&dec8_pf0_data) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( lastmiss_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) - AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_SHARE(1) + AM_RANGE(0x1000, 0x13ff) AM_READ(SMH_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(SMH_RAM) AM_SHARE(4) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_1_r) AM_RANGE(0x1802, 0x1802) AM_READ(input_port_2_r) AM_RANGE(0x1803, 0x1803) AM_READ(input_port_3_r) /* Dip 1 */ AM_RANGE(0x1804, 0x1804) AM_READ(input_port_4_r) /* Dip 2 */ - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) AM_SHARE(2) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( lastmiss_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_SHARE(1) AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) @@ -778,30 +778,30 @@ static ADDRESS_MAP_START( lastmiss_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x180c, 0x180c) AM_WRITE(oscar_sound_w) AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_videoram_w) AM_RANGE(0x2800, 0x2fff) AM_WRITE(shackled_sprite_w) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_SHARE(2) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_WRITE(dec8_pf0_data_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( shackled_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) - AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_SHARE(1) + AM_RANGE(0x1000, 0x13ff) AM_READ(SMH_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(SMH_RAM) AM_SHARE(4) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_1_r) AM_RANGE(0x1802, 0x1802) AM_READ(input_port_2_r) AM_RANGE(0x1803, 0x1803) AM_READ(input_port_3_r) AM_RANGE(0x1804, 0x1804) AM_READ(input_port_4_r) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) AM_RANGE(0x2800, 0x2fff) AM_READ(shackled_sprite_r) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) AM_SHARE(2) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( shackled_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_SHARE(1) AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) AM_BASE(&paletteram) AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_BASE(&paletteram_2) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) @@ -813,15 +813,15 @@ static ADDRESS_MAP_START( shackled_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x180d, 0x180d) AM_WRITE(shackled_control_w) /* Bank switch + Scroll MSB */ AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_videoram_w) AM_RANGE(0x2800, 0x2fff) AM_WRITE(shackled_sprite_w) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_SHARE(2) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_WRITE(dec8_pf0_data_w) AM_BASE(&dec8_pf0_data) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( shackled_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) - AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_SHARE(1) + AM_RANGE(0x1000, 0x13ff) AM_READ(SMH_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(SMH_RAM) AM_SHARE(4) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_1_r) AM_RANGE(0x1802, 0x1802) AM_READ(input_port_2_r) @@ -829,15 +829,15 @@ static ADDRESS_MAP_START( shackled_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1804, 0x1804) AM_READ(input_port_4_r) AM_RANGE(0x1806, 0x1806) AM_READ(i8751_h_r) AM_RANGE(0x1807, 0x1807) AM_READ(i8751_l_r) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) - AM_RANGE(0x2800, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) AM_SHARE(2) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) + AM_RANGE(0x2800, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( shackled_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_SHARE(1) AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) @@ -849,16 +849,16 @@ static ADDRESS_MAP_START( shackled_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x180d, 0x180d) AM_WRITE(shackled_control_w) /* Bank switch + Scroll MSB */ AM_RANGE(0x180e, 0x180f) AM_WRITE(shackled_i8751_w) AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2800, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_SHARE(2) + AM_RANGE(0x2800, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_WRITE(dec8_pf0_data_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( csilver_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) - AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_SHARE(1) + AM_RANGE(0x1000, 0x13ff) AM_READ(SMH_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(SMH_RAM) AM_SHARE(4) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_1_r) AM_RANGE(0x1801, 0x1801) AM_READ(input_port_0_r) AM_RANGE(0x1803, 0x1803) AM_READ(input_port_2_r) @@ -866,16 +866,16 @@ static ADDRESS_MAP_START( csilver_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1805, 0x1805) AM_READ(input_port_3_r) /* Dip 1 */ AM_RANGE(0x1c00, 0x1c00) AM_READ(i8751_h_r) AM_RANGE(0x1e00, 0x1e00) AM_READ(i8751_l_r) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) AM_RANGE(0x2800, 0x2fff) AM_READ(shackled_sprite_r) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) AM_SHARE(2) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( csilver_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_SHARE(1) AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) AM_BASE(&paletteram) AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_BASE(&paletteram_2) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) @@ -887,133 +887,133 @@ static ADDRESS_MAP_START( csilver_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x180e, 0x180f) AM_WRITE(csilver_i8751_w) AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_videoram_w) AM_RANGE(0x2800, 0x2fff) AM_WRITE(shackled_sprite_w) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_SHARE(2) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_WRITE(dec8_pf0_data_w) AM_BASE(&dec8_pf0_data) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( csilver_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(3) - AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(4) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_SHARE(1) + AM_RANGE(0x1000, 0x13ff) AM_READ(SMH_RAM) AM_SHARE(3) + AM_RANGE(0x1400, 0x17ff) AM_READ(SMH_RAM) AM_SHARE(4) AM_RANGE(0x1803, 0x1803) AM_READ(input_port_2_r) AM_RANGE(0x1804, 0x1804) AM_READ(input_port_4_r) AM_RANGE(0x1805, 0x1805) AM_READ(input_port_3_r) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) - AM_RANGE(0x2800, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) AM_SHARE(2) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) + AM_RANGE(0x2800, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( csilver_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_SHARE(1) AM_RANGE(0x1000, 0x13ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE(3) AM_RANGE(0x1400, 0x17ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE(4) AM_RANGE(0x1800, 0x1804) AM_WRITE(shackled_int_w) AM_RANGE(0x1805, 0x1805) AM_WRITE(buffer_spriteram_w) /* DMA */ AM_RANGE(0x180c, 0x180c) AM_WRITE(oscar_sound_w) AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2800, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_SHARE(2) + AM_RANGE(0x2800, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_SHARE(2) AM_RANGE(0x3800, 0x3fff) AM_WRITE(dec8_pf0_data_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( garyoret_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x17ff) AM_READ(SMH_RAM) + AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x27ff) AM_READ(dec8_pf0_data_r) - AM_RANGE(0x2800, 0x2bff) AM_READ(MRA8_RAM) - AM_RANGE(0x2c00, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) /* Sprites */ + AM_RANGE(0x2800, 0x2bff) AM_READ(SMH_RAM) + AM_RANGE(0x2c00, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) /* Sprites */ AM_RANGE(0x3800, 0x3800) AM_READ(input_port_3_r) /* Dip 1 */ AM_RANGE(0x3801, 0x3801) AM_READ(input_port_4_r) /* Dip 2 */ - AM_RANGE(0x3808, 0x3808) AM_READ(MRA8_NOP) /* ? */ + AM_RANGE(0x3808, 0x3808) AM_READ(SMH_NOP) /* ? */ AM_RANGE(0x380a, 0x380a) AM_READ(input_port_1_r) /* Player 2 + VBL */ AM_RANGE(0x380b, 0x380b) AM_READ(input_port_0_r) /* Player 1 */ AM_RANGE(0x383a, 0x383a) AM_READ(i8751_h_r) AM_RANGE(0x383b, 0x383b) AM_READ(i8751_l_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( garyoret_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x17ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1800, 0x1fff) AM_WRITE(dec8_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x2000, 0x27ff) AM_WRITE(dec8_pf0_data_w) AM_BASE(&dec8_pf0_data) AM_RANGE(0x2800, 0x2bff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) AM_RANGE(0x2c00, 0x2fff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3810, 0x3810) AM_WRITE(dec8_sound_w) AM_RANGE(0x3818, 0x382f) AM_WRITE(gondo_scroll_w) AM_RANGE(0x3830, 0x3830) AM_WRITE(ghostb_bank_w) /* Bank + NMI enable */ AM_RANGE(0x3838, 0x3839) AM_WRITE(garyoret_i8751_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /******************************************************************************/ /* Used for Cobra Command, Maze Hunter, Super Real Darwin etc */ static ADDRESS_MAP_START( dec8_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x05ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x05ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( dec8_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x05ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2203_control_port_0_w) /* OPN */ AM_RANGE(0x2001, 0x2001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x4000, 0x4000) AM_WRITE(YM3812_control_port_0_w) /* OPL */ AM_RANGE(0x4001, 0x4001) AM_WRITE(YM3812_write_port_0_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /* Used by Gondomania, Psycho-Nics Oscar & Garyo Retsuden */ static ADDRESS_MAP_START( oscar_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x05ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2203_control_port_0_w) /* OPN */ AM_RANGE(0x2001, 0x2001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x4000, 0x4000) AM_WRITE(YM3526_control_port_0_w) /* OPL */ AM_RANGE(0x4001, 0x4001) AM_WRITE(YM3526_write_port_0_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /* Used by Last Mission, Shackled & Breywood */ static ADDRESS_MAP_START( ym3526_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x05ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x05ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( ym3526_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x05ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w) /* OPN */ AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3526_control_port_0_w) /* OPL? */ AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3526_write_port_0_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /* Captain Silver - same sound system as Pocket Gal */ static ADDRESS_MAP_START( csilver_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) AM_RANGE(0x3400, 0x3400) AM_READ(csilver_adpcm_reset_r) /* ? not sure */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK3) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK3) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( csilver_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3526_control_port_0_w) AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3526_write_port_0_w) AM_RANGE(0x1800, 0x1800) AM_WRITE(csilver_adpcm_data_w) /* ADPCM data for the MSM5205 chip */ AM_RANGE(0x2000, 0x2000) AM_WRITE(csilver_sound_bank_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index 8d7644e19e2..09b27635dd3 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -245,9 +245,9 @@ static ADDRESS_MAP_START( hvysmsh_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x100000, 0x107fff) AM_RAM AM_RANGE(0x120000, 0x120003) AM_READ(hvysmsh_eeprom_r) - AM_RANGE(0x120000, 0x120003) AM_WRITE(MWA32_NOP) // Volume control in low byte + AM_RANGE(0x120000, 0x120003) AM_WRITE(SMH_NOP) // Volume control in low byte AM_RANGE(0x120004, 0x120007) AM_WRITE(hvysmsh_eeprom_w) - AM_RANGE(0x120008, 0x12000b) AM_WRITE(MWA32_NOP) // IRQ ack? + AM_RANGE(0x120008, 0x12000b) AM_WRITE(SMH_NOP) // IRQ ack? AM_RANGE(0x12000c, 0x12000f) AM_WRITE(hvysmsh_oki_0_bank_w) AM_RANGE(0x140000, 0x140003) AM_READ(hvysmsh_oki_0_r) AM_WRITE(hvysmsh_oki_0_w) AM_RANGE(0x160000, 0x160003) AM_READ(hvysmsh_oki_1_r) AM_WRITE(hvysmsh_oki_1_w) @@ -256,8 +256,8 @@ static ADDRESS_MAP_START( hvysmsh_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x194000, 0x195fff) AM_READWRITE( wcvol95_pf2_data_r, wcvol95_pf2_data_w ) AM_RANGE(0x1a0000, 0x1a0fff) AM_READWRITE( wcvol95_pf1_rowscroll_r, wcvol95_pf1_rowscroll_w ) AM_RANGE(0x1a4000, 0x1a4fff) AM_READWRITE( wcvol95_pf2_rowscroll_r, wcvol95_pf2_rowscroll_w ) - AM_RANGE(0x1c0000, 0x1c0fff) AM_READ(MRA32_RAM) AM_WRITE(deco32_nonbuffered_palette_w) AM_BASE(&paletteram32) - AM_RANGE(0x1d0010, 0x1d002f) AM_READ(MRA32_NOP) // Check for DMA complete? + AM_RANGE(0x1c0000, 0x1c0fff) AM_READ(SMH_RAM) AM_WRITE(deco32_nonbuffered_palette_w) AM_BASE(&paletteram32) + AM_RANGE(0x1d0010, 0x1d002f) AM_READ(SMH_NOP) // Check for DMA complete? AM_RANGE(0x1e0000, 0x1e1fff) AM_RAM AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) ADDRESS_MAP_END @@ -273,7 +273,7 @@ static ADDRESS_MAP_START( wcvol95_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x150000, 0x150003) AM_WRITE(wcvol95_eeprom_w) AM_RANGE(0x160000, 0x161fff) AM_RAM AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x170000, 0x170003) AM_NOP // Irq ack? - AM_RANGE(0x180000, 0x180fff) AM_READ(MRA32_RAM) AM_WRITE(wcvol95_nonbuffered_palette_w) AM_BASE(&paletteram32) + AM_RANGE(0x180000, 0x180fff) AM_READ(SMH_RAM) AM_WRITE(wcvol95_nonbuffered_palette_w) AM_BASE(&paletteram32) AM_RANGE(0x1a0000, 0x1a0007) AM_READ(deco156_snd_r) AM_WRITE(deco156_snd_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 9d4770eb296..db2c82fb48e 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -663,176 +663,176 @@ static WRITE32_HANDLER( nslasher_prot_w ) /**********************************************************************************/ static ADDRESS_MAP_START( captaven_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100007) AM_READ(deco32_71_r) - AM_RANGE(0x110000, 0x110fff) AM_READ(MRA32_RAM) /* Sprites */ - AM_RANGE(0x120000, 0x127fff) AM_READ(MRA32_RAM) /* Main RAM */ - AM_RANGE(0x130000, 0x131fff) AM_READ(MRA32_RAM) /* Palette RAM */ + AM_RANGE(0x110000, 0x110fff) AM_READ(SMH_RAM) /* Sprites */ + AM_RANGE(0x120000, 0x127fff) AM_READ(SMH_RAM) /* Main RAM */ + AM_RANGE(0x130000, 0x131fff) AM_READ(SMH_RAM) /* Palette RAM */ AM_RANGE(0x128000, 0x128fff) AM_READ(captaven_prot_r) AM_RANGE(0x148000, 0x14800f) AM_READ(deco32_irq_controller_r) - AM_RANGE(0x160000, 0x167fff) AM_READ(MRA32_RAM) /* Extra work RAM */ + AM_RANGE(0x160000, 0x167fff) AM_READ(SMH_RAM) /* Extra work RAM */ AM_RANGE(0x168000, 0x168003) AM_READ(captaven_soundcpu_r) - AM_RANGE(0x180000, 0x18001f) AM_READ(MRA32_RAM) - AM_RANGE(0x190000, 0x191fff) AM_READ(MRA32_RAM) - AM_RANGE(0x194000, 0x195fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1a0000, 0x1a1fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1a4000, 0x1a5fff) AM_READ(MRA32_RAM) + AM_RANGE(0x180000, 0x18001f) AM_READ(SMH_RAM) + AM_RANGE(0x190000, 0x191fff) AM_READ(SMH_RAM) + AM_RANGE(0x194000, 0x195fff) AM_READ(SMH_RAM) + AM_RANGE(0x1a0000, 0x1a1fff) AM_READ(SMH_RAM) + AM_RANGE(0x1a4000, 0x1a5fff) AM_READ(SMH_RAM) - AM_RANGE(0x1c0000, 0x1c001f) AM_READ(MRA32_RAM) - AM_RANGE(0x1d0000, 0x1d1fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1e0000, 0x1e1fff) AM_READ(MRA32_RAM) + AM_RANGE(0x1c0000, 0x1c001f) AM_READ(SMH_RAM) + AM_RANGE(0x1d0000, 0x1d1fff) AM_READ(SMH_RAM) + AM_RANGE(0x1e0000, 0x1e1fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( captaven_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA32_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100003) AM_WRITE(buffer_spriteram32_w) - AM_RANGE(0x108000, 0x108003) AM_WRITE(MWA32_NOP) /* ? */ - AM_RANGE(0x110000, 0x110fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) - AM_RANGE(0x120000, 0x127fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_ram) /* Main RAM */ + AM_RANGE(0x108000, 0x108003) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0x110000, 0x110fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x120000, 0x127fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_ram) /* Main RAM */ AM_RANGE(0x1280c8, 0x1280cb) AM_WRITE(deco32_sound_w) AM_RANGE(0x130000, 0x131fff) AM_WRITE(deco32_nonbuffered_palette_w) AM_BASE(&paletteram32) AM_RANGE(0x148000, 0x14800f) AM_WRITE(deco32_irq_controller_w) - AM_RANGE(0x160000, 0x167fff) AM_WRITE(MWA32_RAM) /* Additional work RAM */ + AM_RANGE(0x160000, 0x167fff) AM_WRITE(SMH_RAM) /* Additional work RAM */ AM_RANGE(0x178000, 0x178003) AM_WRITE(deco32_pri_w) - AM_RANGE(0x180000, 0x18001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf12_control) + AM_RANGE(0x180000, 0x18001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf12_control) AM_RANGE(0x190000, 0x191fff) AM_WRITE(deco32_pf1_data_w) AM_BASE(&deco32_pf1_data) AM_RANGE(0x192000, 0x193fff) AM_WRITE(deco32_pf1_data_w) /* Mirror address - bug in program code */ AM_RANGE(0x194000, 0x195fff) AM_WRITE(deco32_pf2_data_w) AM_BASE(&deco32_pf2_data) - AM_RANGE(0x1a0000, 0x1a1fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf1_rowscroll) - AM_RANGE(0x1a4000, 0x1a5fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf2_rowscroll) - AM_RANGE(0x1c0000, 0x1c001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf34_control) + AM_RANGE(0x1a0000, 0x1a1fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf1_rowscroll) + AM_RANGE(0x1a4000, 0x1a5fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf2_rowscroll) + AM_RANGE(0x1c0000, 0x1c001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf34_control) AM_RANGE(0x1d0000, 0x1d1fff) AM_WRITE(deco32_pf3_data_w) AM_BASE(&deco32_pf3_data) - AM_RANGE(0x1e0000, 0x1e1fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf3_rowscroll) + AM_RANGE(0x1e0000, 0x1e1fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf3_rowscroll) ADDRESS_MAP_END static ADDRESS_MAP_START( fghthist_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_READ(MRA32_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_READ(SMH_RAM) AM_RANGE(0x120020, 0x12002f) AM_READ(fghthist_control_r) - AM_RANGE(0x168000, 0x169fff) AM_READ(MRA32_RAM) + AM_RANGE(0x168000, 0x169fff) AM_READ(SMH_RAM) - AM_RANGE(0x178000, 0x178fff) AM_READ(MRA32_RAM) - AM_RANGE(0x179000, 0x179fff) AM_READ(MRA32_RAM) + AM_RANGE(0x178000, 0x178fff) AM_READ(SMH_RAM) + AM_RANGE(0x179000, 0x179fff) AM_READ(SMH_RAM) - AM_RANGE(0x182000, 0x183fff) AM_READ(MRA32_RAM) - AM_RANGE(0x184000, 0x185fff) AM_READ(MRA32_RAM) - AM_RANGE(0x192000, 0x1923ff) AM_READ(MRA32_RAM) - AM_RANGE(0x192800, 0x1928ff) AM_READ(MRA32_RAM) - AM_RANGE(0x194000, 0x1943ff) AM_READ(MRA32_RAM) - AM_RANGE(0x194800, 0x1948ff) AM_READ(MRA32_RAM) - AM_RANGE(0x1a0000, 0x1a001f) AM_READ(MRA32_RAM) + AM_RANGE(0x182000, 0x183fff) AM_READ(SMH_RAM) + AM_RANGE(0x184000, 0x185fff) AM_READ(SMH_RAM) + AM_RANGE(0x192000, 0x1923ff) AM_READ(SMH_RAM) + AM_RANGE(0x192800, 0x1928ff) AM_READ(SMH_RAM) + AM_RANGE(0x194000, 0x1943ff) AM_READ(SMH_RAM) + AM_RANGE(0x194800, 0x1948ff) AM_READ(SMH_RAM) + AM_RANGE(0x1a0000, 0x1a001f) AM_READ(SMH_RAM) - AM_RANGE(0x1c2000, 0x1c3fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1c4000, 0x1c5fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d2000, 0x1d23ff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d2800, 0x1d28ff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d4000, 0x1d43ff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d4800, 0x1d48ff) AM_READ(MRA32_RAM) - AM_RANGE(0x1e0000, 0x1e001f) AM_READ(MRA32_RAM) + AM_RANGE(0x1c2000, 0x1c3fff) AM_READ(SMH_RAM) + AM_RANGE(0x1c4000, 0x1c5fff) AM_READ(SMH_RAM) + AM_RANGE(0x1d2000, 0x1d23ff) AM_READ(SMH_RAM) + AM_RANGE(0x1d2800, 0x1d28ff) AM_READ(SMH_RAM) + AM_RANGE(0x1d4000, 0x1d43ff) AM_READ(SMH_RAM) + AM_RANGE(0x1d4800, 0x1d48ff) AM_READ(SMH_RAM) + AM_RANGE(0x1e0000, 0x1e001f) AM_READ(SMH_RAM) - AM_RANGE(0x16c000, 0x16c01f) AM_READ(MRA32_NOP) - AM_RANGE(0x17c000, 0x17c03f) AM_READ(MRA32_NOP) + AM_RANGE(0x16c000, 0x16c01f) AM_READ(SMH_NOP) + AM_RANGE(0x17c000, 0x17c03f) AM_READ(SMH_NOP) AM_RANGE(0x200000, 0x200fff) AM_READ(deco16_146_fghthist_prot_r) ADDRESS_MAP_END static ADDRESS_MAP_START( fghthist_writemem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x001fff) AM_WRITE(deco32_pf1_data_w) /* Hardware bug? Test mode writes here and expects to get PF1 */ - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_ram) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_ram) AM_RANGE(0x12002c, 0x12002f) AM_WRITE(fghthist_eeprom_w) AM_RANGE(0x1201fc, 0x1201ff) AM_WRITE(deco32_sound_w) - AM_RANGE(0x140000, 0x140003) AM_WRITE(MWA32_NOP) /* VBL irq ack */ + AM_RANGE(0x140000, 0x140003) AM_WRITE(SMH_NOP) /* VBL irq ack */ //148000 - IRQ mask (ca)... AM_RANGE(0x168000, 0x169fff) AM_WRITE(deco32_buffered_palette_w) AM_BASE(&paletteram32) AM_RANGE(0x16c008, 0x16c00b) AM_WRITE(deco32_palette_dma_w) - AM_RANGE(0x178000, 0x178fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) - AM_RANGE(0x179000, 0x179fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32_2) // ? + AM_RANGE(0x178000, 0x178fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x179000, 0x179fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32_2) // ? AM_RANGE(0x17c010, 0x17c013) AM_WRITE(buffer_spriteram32_w) AM_RANGE(0x182000, 0x183fff) AM_WRITE(deco32_pf1_data_w) AM_BASE(&deco32_pf1_data) AM_RANGE(0x184000, 0x185fff) AM_WRITE(deco32_pf2_data_w) AM_BASE(&deco32_pf2_data) - AM_RANGE(0x192000, 0x192fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf1_rowscroll) - AM_RANGE(0x194000, 0x194fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf2_rowscroll) - AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf12_control) + AM_RANGE(0x192000, 0x192fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf1_rowscroll) + AM_RANGE(0x194000, 0x194fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf2_rowscroll) + AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf12_control) AM_RANGE(0x1c2000, 0x1c3fff) AM_WRITE(deco32_pf3_data_w) AM_BASE(&deco32_pf3_data) AM_RANGE(0x1c4000, 0x1c5fff) AM_WRITE(deco32_pf4_data_w) AM_BASE(&deco32_pf4_data) - AM_RANGE(0x1d2000, 0x1d2fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf3_rowscroll) - AM_RANGE(0x1d4000, 0x1d4fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf4_rowscroll) - AM_RANGE(0x1e0000, 0x1e001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf34_control) + AM_RANGE(0x1d2000, 0x1d2fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf3_rowscroll) + AM_RANGE(0x1d4000, 0x1d4fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf4_rowscroll) + AM_RANGE(0x1e0000, 0x1e001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf34_control) AM_RANGE(0x200000, 0x200fff) AM_WRITE(deco16_146_fghthist_prot_w) AM_BASE(&deco32_prot_ram) - AM_RANGE(0x208800, 0x208803) AM_WRITE(MWA32_NOP) /* ? */ + AM_RANGE(0x208800, 0x208803) AM_WRITE(SMH_NOP) /* ? */ ADDRESS_MAP_END static ADDRESS_MAP_START( fghthsta_memmap, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) AM_WRITE(MWA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_ram) - AM_RANGE(0x140000, 0x140003) AM_WRITE(MWA32_NOP) /* VBL irq ack */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco32_ram) + AM_RANGE(0x140000, 0x140003) AM_WRITE(SMH_NOP) /* VBL irq ack */ AM_RANGE(0x150000, 0x150003) AM_WRITE(fghthist_eeprom_w) /* Volume port/Eprom */ - AM_RANGE(0x168000, 0x169fff) AM_READ(MRA32_RAM) AM_WRITE(deco32_buffered_palette_w) AM_BASE(&paletteram32) + AM_RANGE(0x168000, 0x169fff) AM_READ(SMH_RAM) AM_WRITE(deco32_buffered_palette_w) AM_BASE(&paletteram32) AM_RANGE(0x16c008, 0x16c00b) AM_WRITE(deco32_palette_dma_w) - AM_RANGE(0x16c010, 0x16c013) AM_READ(MRA32_NOP) + AM_RANGE(0x16c010, 0x16c013) AM_READ(SMH_NOP) - AM_RANGE(0x178000, 0x179fff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x178000, 0x179fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x17c010, 0x17c013) AM_WRITE(buffer_spriteram32_w) - AM_RANGE(0x17c020, 0x17c023) AM_READ(MRA32_NOP) + AM_RANGE(0x17c020, 0x17c023) AM_READ(SMH_NOP) - AM_RANGE(0x182000, 0x183fff) AM_READ(MRA32_RAM) AM_WRITE(deco32_pf1_data_w) AM_BASE(&deco32_pf1_data) - AM_RANGE(0x184000, 0x185fff) AM_READ(MRA32_RAM) AM_WRITE(deco32_pf2_data_w) AM_BASE(&deco32_pf2_data) - AM_RANGE(0x192000, 0x192fff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf1_rowscroll) - AM_RANGE(0x194000, 0x194fff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf2_rowscroll) - AM_RANGE(0x1a0000, 0x1a001f) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf12_control) + AM_RANGE(0x182000, 0x183fff) AM_READ(SMH_RAM) AM_WRITE(deco32_pf1_data_w) AM_BASE(&deco32_pf1_data) + AM_RANGE(0x184000, 0x185fff) AM_READ(SMH_RAM) AM_WRITE(deco32_pf2_data_w) AM_BASE(&deco32_pf2_data) + AM_RANGE(0x192000, 0x192fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf1_rowscroll) + AM_RANGE(0x194000, 0x194fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf2_rowscroll) + AM_RANGE(0x1a0000, 0x1a001f) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf12_control) - AM_RANGE(0x1c2000, 0x1c3fff) AM_READ(MRA32_RAM) AM_WRITE(deco32_pf3_data_w) AM_BASE(&deco32_pf3_data) - AM_RANGE(0x1c4000, 0x1c5fff) AM_READ(MRA32_RAM) AM_WRITE(deco32_pf4_data_w) AM_BASE(&deco32_pf4_data) - AM_RANGE(0x1d2000, 0x1d2fff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf3_rowscroll) - AM_RANGE(0x1d4000, 0x1d4fff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf4_rowscroll) - AM_RANGE(0x1e0000, 0x1e001f) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf34_control) + AM_RANGE(0x1c2000, 0x1c3fff) AM_READ(SMH_RAM) AM_WRITE(deco32_pf3_data_w) AM_BASE(&deco32_pf3_data) + AM_RANGE(0x1c4000, 0x1c5fff) AM_READ(SMH_RAM) AM_WRITE(deco32_pf4_data_w) AM_BASE(&deco32_pf4_data) + AM_RANGE(0x1d2000, 0x1d2fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf3_rowscroll) + AM_RANGE(0x1d4000, 0x1d4fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf4_rowscroll) + AM_RANGE(0x1e0000, 0x1e001f) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf34_control) AM_RANGE(0x200000, 0x200fff) AM_READ(deco16_146_fghthist_prot_r) AM_WRITE(deco16_146_fghthist_prot_w) AM_BASE(&deco32_prot_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( dragngun_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_READ(MRA32_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_READ(SMH_RAM) AM_RANGE(0x120000, 0x120fff) AM_READ(dragngun_prot_r) AM_RANGE(0x128000, 0x12800f) AM_READ(deco32_irq_controller_r) - AM_RANGE(0x130000, 0x131fff) AM_READ(MRA32_RAM) - AM_RANGE(0x138000, 0x138003) AM_READ(MRA32_NOP) /* Palette dma complete in bit 0x8? ack? return 0 else tight loop */ + AM_RANGE(0x130000, 0x131fff) AM_READ(SMH_RAM) + AM_RANGE(0x138000, 0x138003) AM_READ(SMH_NOP) /* Palette dma complete in bit 0x8? ack? return 0 else tight loop */ - AM_RANGE(0x180000, 0x18001f) AM_READ(MRA32_RAM) - AM_RANGE(0x190000, 0x191fff) AM_READ(MRA32_RAM) - AM_RANGE(0x194000, 0x195fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1a0000, 0x1a0fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1a4000, 0x1a4fff) AM_READ(MRA32_RAM) + AM_RANGE(0x180000, 0x18001f) AM_READ(SMH_RAM) + AM_RANGE(0x190000, 0x191fff) AM_READ(SMH_RAM) + AM_RANGE(0x194000, 0x195fff) AM_READ(SMH_RAM) + AM_RANGE(0x1a0000, 0x1a0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1a4000, 0x1a4fff) AM_READ(SMH_RAM) - AM_RANGE(0x1c0000, 0x1c001f) AM_READ(MRA32_RAM) - AM_RANGE(0x1d0000, 0x1d1fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d4000, 0x1d5fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1e0000, 0x1e0fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1e4000, 0x1e4fff) AM_READ(MRA32_RAM) + AM_RANGE(0x1c0000, 0x1c001f) AM_READ(SMH_RAM) + AM_RANGE(0x1d0000, 0x1d1fff) AM_READ(SMH_RAM) + AM_RANGE(0x1d4000, 0x1d5fff) AM_READ(SMH_RAM) + AM_RANGE(0x1e0000, 0x1e0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1e4000, 0x1e4fff) AM_READ(SMH_RAM) - AM_RANGE(0x208000, 0x208fff) AM_READ(MRA32_RAM) - AM_RANGE(0x20c000, 0x20cfff) AM_READ(MRA32_RAM) - AM_RANGE(0x210000, 0x217fff) AM_READ(MRA32_RAM) - AM_RANGE(0x218000, 0x21ffff) AM_READ(MRA32_RAM) - AM_RANGE(0x220000, 0x221fff) AM_READ(MRA32_RAM) /* Main spriteram */ + AM_RANGE(0x208000, 0x208fff) AM_READ(SMH_RAM) + AM_RANGE(0x20c000, 0x20cfff) AM_READ(SMH_RAM) + AM_RANGE(0x210000, 0x217fff) AM_READ(SMH_RAM) + AM_RANGE(0x218000, 0x21ffff) AM_READ(SMH_RAM) + AM_RANGE(0x220000, 0x221fff) AM_READ(SMH_RAM) /* Main spriteram */ - AM_RANGE(0x204800, 0x204fff) AM_READ(MRA32_RAM) //0x10 byte increments only - AM_RANGE(0x228000, 0x2283ff) AM_READ(MRA32_RAM) //0x10 byte increments only + AM_RANGE(0x204800, 0x204fff) AM_READ(SMH_RAM) //0x10 byte increments only + AM_RANGE(0x228000, 0x2283ff) AM_READ(SMH_RAM) //0x10 byte increments only - AM_RANGE(0x300000, 0x3fffff) AM_READ(MRA32_ROM) + AM_RANGE(0x300000, 0x3fffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x400003) AM_READ(dragngun_oki_2_r) AM_RANGE(0x420000, 0x420003) AM_READ(dragngun_eeprom_r) @@ -841,78 +841,78 @@ static ADDRESS_MAP_START( dragngun_readmem, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dragngun_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_ram) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_ram) AM_RANGE(0x1204c0, 0x1204c3) AM_WRITE(deco32_sound_w) AM_RANGE(0x128000, 0x12800f) AM_WRITE(deco32_irq_controller_w) AM_RANGE(0x130000, 0x131fff) AM_WRITE(deco32_buffered_palette_w) AM_BASE(&paletteram32) - AM_RANGE(0x138000, 0x138003) AM_WRITE(MWA32_NOP) // palette mode? check + AM_RANGE(0x138000, 0x138003) AM_WRITE(SMH_NOP) // palette mode? check AM_RANGE(0x138008, 0x13800b) AM_WRITE(deco32_palette_dma_w) - AM_RANGE(0x180000, 0x18001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf12_control) + AM_RANGE(0x180000, 0x18001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf12_control) AM_RANGE(0x190000, 0x191fff) AM_WRITE(deco32_pf1_data_w) AM_BASE(&deco32_pf1_data) AM_RANGE(0x194000, 0x195fff) AM_WRITE(deco32_pf2_data_w) AM_BASE(&deco32_pf2_data) - AM_RANGE(0x1a0000, 0x1a0fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf1_rowscroll) - AM_RANGE(0x1a4000, 0x1a4fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf2_rowscroll) + AM_RANGE(0x1a0000, 0x1a0fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf1_rowscroll) + AM_RANGE(0x1a4000, 0x1a4fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf2_rowscroll) - AM_RANGE(0x1c0000, 0x1c001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf34_control) + AM_RANGE(0x1c0000, 0x1c001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf34_control) AM_RANGE(0x1d0000, 0x1d1fff) AM_WRITE(deco32_pf3_data_w) AM_BASE(&deco32_pf3_data) AM_RANGE(0x1d4000, 0x1d5fff) AM_WRITE(deco32_pf4_data_w) AM_BASE(&deco32_pf4_data) - AM_RANGE(0x1e0000, 0x1e0fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf3_rowscroll) - AM_RANGE(0x1e4000, 0x1e4fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf4_rowscroll) + AM_RANGE(0x1e0000, 0x1e0fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf3_rowscroll) + AM_RANGE(0x1e4000, 0x1e4fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf4_rowscroll) - AM_RANGE(0x204800, 0x204fff) AM_WRITE(MWA32_RAM) // ace? 0x10 byte increments only // 13f ff stuff + AM_RANGE(0x204800, 0x204fff) AM_WRITE(SMH_RAM) // ace? 0x10 byte increments only // 13f ff stuff - AM_RANGE(0x208000, 0x208fff) AM_WRITE(MWA32_RAM) AM_BASE(&dragngun_sprite_layout_0_ram) - AM_RANGE(0x20c000, 0x20cfff) AM_WRITE(MWA32_RAM) AM_BASE(&dragngun_sprite_layout_1_ram) - AM_RANGE(0x210000, 0x217fff) AM_WRITE(MWA32_RAM) AM_BASE(&dragngun_sprite_lookup_0_ram) - AM_RANGE(0x218000, 0x21ffff) AM_WRITE(MWA32_RAM) AM_BASE(&dragngun_sprite_lookup_1_ram) - AM_RANGE(0x220000, 0x221fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) - AM_RANGE(0x228000, 0x2283ff) AM_WRITE(MWA32_RAM) /* ? */ + AM_RANGE(0x208000, 0x208fff) AM_WRITE(SMH_RAM) AM_BASE(&dragngun_sprite_layout_0_ram) + AM_RANGE(0x20c000, 0x20cfff) AM_WRITE(SMH_RAM) AM_BASE(&dragngun_sprite_layout_1_ram) + AM_RANGE(0x210000, 0x217fff) AM_WRITE(SMH_RAM) AM_BASE(&dragngun_sprite_lookup_0_ram) + AM_RANGE(0x218000, 0x21ffff) AM_WRITE(SMH_RAM) AM_BASE(&dragngun_sprite_lookup_1_ram) + AM_RANGE(0x220000, 0x221fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x228000, 0x2283ff) AM_WRITE(SMH_RAM) /* ? */ AM_RANGE(0x230000, 0x230003) AM_WRITE(dragngun_spriteram_dma_w) - AM_RANGE(0x300000, 0x3fffff) AM_WRITE(MWA32_ROM) + AM_RANGE(0x300000, 0x3fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x400003) AM_WRITE(dragngun_oki_2_w) - AM_RANGE(0x410000, 0x410003) AM_WRITE(MWA32_NOP) /* Some kind of serial bit-stream - digital volume control? */ + AM_RANGE(0x410000, 0x410003) AM_WRITE(SMH_NOP) /* Some kind of serial bit-stream - digital volume control? */ AM_RANGE(0x420000, 0x420003) AM_WRITE(dragngun_eeprom_w) AM_RANGE(0x430000, 0x43001f) AM_WRITE(dragngun_lightgun_w) AM_RANGE(0x500000, 0x500003) AM_WRITE(dragngun_sprite_control_w) ADDRESS_MAP_END static ADDRESS_MAP_START( lockload_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_READ(MRA32_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_READ(SMH_RAM) AM_RANGE(0x120000, 0x120fff) AM_READ(dragngun_prot_r) AM_RANGE(0x128000, 0x12800f) AM_READ(deco32_irq_controller_r) - AM_RANGE(0x130000, 0x131fff) AM_READ(MRA32_RAM) - AM_RANGE(0x138000, 0x138003) AM_READ(MRA32_RAM) //palette dma complete in bit 0x8? ack? return 0 else tight loop + AM_RANGE(0x130000, 0x131fff) AM_READ(SMH_RAM) + AM_RANGE(0x138000, 0x138003) AM_READ(SMH_RAM) //palette dma complete in bit 0x8? ack? return 0 else tight loop AM_RANGE(0x170000, 0x170007) AM_READ(lockload_gun_mirror_r) /* Not on Dragongun */ - AM_RANGE(0x180000, 0x18001f) AM_READ(MRA32_RAM) - AM_RANGE(0x190000, 0x191fff) AM_READ(MRA32_RAM) - AM_RANGE(0x194000, 0x195fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1a0000, 0x1a0fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1a4000, 0x1a4fff) AM_READ(MRA32_RAM) + AM_RANGE(0x180000, 0x18001f) AM_READ(SMH_RAM) + AM_RANGE(0x190000, 0x191fff) AM_READ(SMH_RAM) + AM_RANGE(0x194000, 0x195fff) AM_READ(SMH_RAM) + AM_RANGE(0x1a0000, 0x1a0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1a4000, 0x1a4fff) AM_READ(SMH_RAM) - AM_RANGE(0x1c0000, 0x1c001f) AM_READ(MRA32_RAM) - AM_RANGE(0x1d0000, 0x1d1fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d4000, 0x1d5fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1e0000, 0x1e0fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1e4000, 0x1e4fff) AM_READ(MRA32_RAM) + AM_RANGE(0x1c0000, 0x1c001f) AM_READ(SMH_RAM) + AM_RANGE(0x1d0000, 0x1d1fff) AM_READ(SMH_RAM) + AM_RANGE(0x1d4000, 0x1d5fff) AM_READ(SMH_RAM) + AM_RANGE(0x1e0000, 0x1e0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1e4000, 0x1e4fff) AM_READ(SMH_RAM) - AM_RANGE(0x208000, 0x208fff) AM_READ(MRA32_RAM) - AM_RANGE(0x20c000, 0x20cfff) AM_READ(MRA32_RAM) - AM_RANGE(0x210000, 0x217fff) AM_READ(MRA32_RAM) - AM_RANGE(0x218000, 0x21ffff) AM_READ(MRA32_RAM) - AM_RANGE(0x220000, 0x221fff) AM_READ(MRA32_RAM) /* Main spriteram */ + AM_RANGE(0x208000, 0x208fff) AM_READ(SMH_RAM) + AM_RANGE(0x20c000, 0x20cfff) AM_READ(SMH_RAM) + AM_RANGE(0x210000, 0x217fff) AM_READ(SMH_RAM) + AM_RANGE(0x218000, 0x21ffff) AM_READ(SMH_RAM) + AM_RANGE(0x220000, 0x221fff) AM_READ(SMH_RAM) /* Main spriteram */ - AM_RANGE(0x204800, 0x204fff) AM_READ(MRA32_RAM) //0x10 byte increments only - AM_RANGE(0x228000, 0x2283ff) AM_READ(MRA32_RAM) //0x10 byte increments only + AM_RANGE(0x204800, 0x204fff) AM_READ(SMH_RAM) //0x10 byte increments only + AM_RANGE(0x228000, 0x2283ff) AM_READ(SMH_RAM) //0x10 byte increments only - AM_RANGE(0x300000, 0x3fffff) AM_READ(MRA32_ROM) + AM_RANGE(0x300000, 0x3fffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x400003) AM_READ(dragngun_oki_2_r) AM_RANGE(0x420000, 0x420003) AM_READ(dragngun_eeprom_r) @@ -922,41 +922,41 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lockload_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_ram) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_ram) AM_RANGE(0x1204c0, 0x1204c3) AM_WRITE(deco32_sound_w) AM_RANGE(0x128000, 0x12800f) AM_WRITE(deco32_irq_controller_w) AM_RANGE(0x130000, 0x131fff) AM_WRITE(deco32_buffered_palette_w) AM_BASE(&paletteram32) - AM_RANGE(0x138000, 0x138003) AM_WRITE(MWA32_NOP) // palette mode? check + AM_RANGE(0x138000, 0x138003) AM_WRITE(SMH_NOP) // palette mode? check AM_RANGE(0x138008, 0x13800b) AM_WRITE(deco32_palette_dma_w) - AM_RANGE(0x178008, 0x17800f) AM_WRITE(MWA32_NOP) /* Gun read ACK's */ + AM_RANGE(0x178008, 0x17800f) AM_WRITE(SMH_NOP) /* Gun read ACK's */ - AM_RANGE(0x180000, 0x18001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf12_control) + AM_RANGE(0x180000, 0x18001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf12_control) AM_RANGE(0x190000, 0x191fff) AM_WRITE(deco32_pf1_data_w) AM_BASE(&deco32_pf1_data) AM_RANGE(0x194000, 0x195fff) AM_WRITE(deco32_pf2_data_w) AM_BASE(&deco32_pf2_data) - AM_RANGE(0x1a0000, 0x1a0fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf1_rowscroll) - AM_RANGE(0x1a4000, 0x1a4fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf2_rowscroll) + AM_RANGE(0x1a0000, 0x1a0fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf1_rowscroll) + AM_RANGE(0x1a4000, 0x1a4fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf2_rowscroll) - AM_RANGE(0x1c0000, 0x1c001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf34_control) + AM_RANGE(0x1c0000, 0x1c001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf34_control) AM_RANGE(0x1d0000, 0x1d1fff) AM_WRITE(deco32_pf3_data_w) AM_BASE(&deco32_pf3_data) AM_RANGE(0x1d4000, 0x1d5fff) AM_WRITE(deco32_pf4_data_w) AM_BASE(&deco32_pf4_data) - AM_RANGE(0x1e0000, 0x1e0fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf3_rowscroll) - AM_RANGE(0x1e4000, 0x1e4fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf4_rowscroll) + AM_RANGE(0x1e0000, 0x1e0fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf3_rowscroll) + AM_RANGE(0x1e4000, 0x1e4fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf4_rowscroll) - AM_RANGE(0x204800, 0x204fff) AM_WRITE(MWA32_RAM) // ace? 0x10 byte increments only // 13f ff stuff + AM_RANGE(0x204800, 0x204fff) AM_WRITE(SMH_RAM) // ace? 0x10 byte increments only // 13f ff stuff - AM_RANGE(0x208000, 0x208fff) AM_WRITE(MWA32_RAM) AM_BASE(&dragngun_sprite_layout_0_ram) - AM_RANGE(0x20c000, 0x20cfff) AM_WRITE(MWA32_RAM) AM_BASE(&dragngun_sprite_layout_1_ram) - AM_RANGE(0x210000, 0x217fff) AM_WRITE(MWA32_RAM) AM_BASE(&dragngun_sprite_lookup_0_ram) - AM_RANGE(0x218000, 0x21ffff) AM_WRITE(MWA32_RAM) AM_BASE(&dragngun_sprite_lookup_1_ram) - AM_RANGE(0x220000, 0x221fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x208000, 0x208fff) AM_WRITE(SMH_RAM) AM_BASE(&dragngun_sprite_layout_0_ram) + AM_RANGE(0x20c000, 0x20cfff) AM_WRITE(SMH_RAM) AM_BASE(&dragngun_sprite_layout_1_ram) + AM_RANGE(0x210000, 0x217fff) AM_WRITE(SMH_RAM) AM_BASE(&dragngun_sprite_lookup_0_ram) + AM_RANGE(0x218000, 0x21ffff) AM_WRITE(SMH_RAM) AM_BASE(&dragngun_sprite_lookup_1_ram) + AM_RANGE(0x220000, 0x221fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) - AM_RANGE(0x228000, 0x2283ff) AM_WRITE(MWA32_RAM) + AM_RANGE(0x228000, 0x2283ff) AM_WRITE(SMH_RAM) AM_RANGE(0x230000, 0x230003) AM_WRITE(dragngun_spriteram_dma_w) - AM_RANGE(0x300000, 0x3fffff) AM_WRITE(MWA32_ROM) + AM_RANGE(0x300000, 0x3fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x400003) AM_WRITE(dragngun_oki_2_w) AM_RANGE(0x420000, 0x420003) AM_WRITE(dragngun_eeprom_w) // AM_RANGE(0x430000, 0x43001f) AM_WRITE(dragngun_lightgun_w) @@ -964,151 +964,151 @@ static ADDRESS_MAP_START( lockload_writemem, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_END static ADDRESS_MAP_START( tattass_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_READ(MRA32_RAM) - AM_RANGE(0x120000, 0x120003) AM_READ(MRA32_NOP) /* ACIA (unused) */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x120003) AM_READ(SMH_NOP) /* ACIA (unused) */ - AM_RANGE(0x162000, 0x162fff) AM_READ(MRA32_RAM) /* 'Jack' RAM!? */ - AM_RANGE(0x163000, 0x16309f) AM_READ(MRA32_RAM) - AM_RANGE(0x168000, 0x169fff) AM_READ(MRA32_RAM) + AM_RANGE(0x162000, 0x162fff) AM_READ(SMH_RAM) /* 'Jack' RAM!? */ + AM_RANGE(0x163000, 0x16309f) AM_READ(SMH_RAM) + AM_RANGE(0x168000, 0x169fff) AM_READ(SMH_RAM) - AM_RANGE(0x170000, 0x171fff) AM_READ(MRA32_RAM) - AM_RANGE(0x178000, 0x179fff) AM_READ(MRA32_RAM) + AM_RANGE(0x170000, 0x171fff) AM_READ(SMH_RAM) + AM_RANGE(0x178000, 0x179fff) AM_READ(SMH_RAM) - AM_RANGE(0x182000, 0x183fff) AM_READ(MRA32_RAM) - AM_RANGE(0x184000, 0x185fff) AM_READ(MRA32_RAM) - AM_RANGE(0x192000, 0x1927ff) AM_READ(MRA32_RAM) - AM_RANGE(0x192800, 0x193fff) AM_READ(MRA32_RAM) - AM_RANGE(0x194000, 0x1947ff) AM_READ(MRA32_RAM) - AM_RANGE(0x194800, 0x195fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1a0000, 0x1a001f) AM_READ(MRA32_RAM) + AM_RANGE(0x182000, 0x183fff) AM_READ(SMH_RAM) + AM_RANGE(0x184000, 0x185fff) AM_READ(SMH_RAM) + AM_RANGE(0x192000, 0x1927ff) AM_READ(SMH_RAM) + AM_RANGE(0x192800, 0x193fff) AM_READ(SMH_RAM) + AM_RANGE(0x194000, 0x1947ff) AM_READ(SMH_RAM) + AM_RANGE(0x194800, 0x195fff) AM_READ(SMH_RAM) + AM_RANGE(0x1a0000, 0x1a001f) AM_READ(SMH_RAM) - AM_RANGE(0x1c2000, 0x1c3fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1c4000, 0x1c5fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d2000, 0x1d27ff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d2800, 0x1d3fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d4000, 0x1d47ff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d4800, 0x1d5fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1e0000, 0x1e001f) AM_READ(MRA32_RAM) + AM_RANGE(0x1c2000, 0x1c3fff) AM_READ(SMH_RAM) + AM_RANGE(0x1c4000, 0x1c5fff) AM_READ(SMH_RAM) + AM_RANGE(0x1d2000, 0x1d27ff) AM_READ(SMH_RAM) + AM_RANGE(0x1d2800, 0x1d3fff) AM_READ(SMH_RAM) + AM_RANGE(0x1d4000, 0x1d47ff) AM_READ(SMH_RAM) + AM_RANGE(0x1d4800, 0x1d5fff) AM_READ(SMH_RAM) + AM_RANGE(0x1e0000, 0x1e001f) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x200fff) AM_READ(tattass_prot_r) ADDRESS_MAP_END static ADDRESS_MAP_START( tattass_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0f7fff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x0f8000, 0x0fffff) AM_WRITE(MWA32_NOP) /* Screen area on debug board? Cleared on startup */ - AM_RANGE(0x100000, 0x11ffff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_ram) + AM_RANGE(0x000000, 0x0f7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x0f8000, 0x0fffff) AM_WRITE(SMH_NOP) /* Screen area on debug board? Cleared on startup */ + AM_RANGE(0x100000, 0x11ffff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_ram) - AM_RANGE(0x120000, 0x120003) AM_WRITE(MWA32_NOP) /* ACIA (unused) */ - AM_RANGE(0x130000, 0x130003) AM_WRITE(MWA32_NOP) /* Coin port (unused?) */ - AM_RANGE(0x140000, 0x140003) AM_WRITE(MWA32_NOP) /* Vblank ack */ + AM_RANGE(0x120000, 0x120003) AM_WRITE(SMH_NOP) /* ACIA (unused) */ + AM_RANGE(0x130000, 0x130003) AM_WRITE(SMH_NOP) /* Coin port (unused?) */ + AM_RANGE(0x140000, 0x140003) AM_WRITE(SMH_NOP) /* Vblank ack */ AM_RANGE(0x150000, 0x150003) AM_WRITE(tattass_control_w) /* Volume port/Eprom/Priority */ - AM_RANGE(0x162000, 0x162fff) AM_WRITE(MWA32_RAM) /* 'Jack' RAM!? */ + AM_RANGE(0x162000, 0x162fff) AM_WRITE(SMH_RAM) /* 'Jack' RAM!? */ AM_RANGE(0x163000, 0x16309f) AM_WRITE(deco32_ace_ram_w) AM_BASE(&deco32_ace_ram) /* 'Ace' RAM!? */ - AM_RANGE(0x164000, 0x164003) AM_WRITE(MWA32_NOP) /* Palette control BG2/3 ($1a constant) */ - AM_RANGE(0x164004, 0x164007) AM_WRITE(MWA32_NOP) /* Palette control Obj1 ($6 constant) */ - AM_RANGE(0x164008, 0x16400b) AM_WRITE(MWA32_NOP) /* Palette control Obj2 ($5 constant) */ - AM_RANGE(0x16400c, 0x16400f) AM_WRITE(MWA32_NOP) + AM_RANGE(0x164000, 0x164003) AM_WRITE(SMH_NOP) /* Palette control BG2/3 ($1a constant) */ + AM_RANGE(0x164004, 0x164007) AM_WRITE(SMH_NOP) /* Palette control Obj1 ($6 constant) */ + AM_RANGE(0x164008, 0x16400b) AM_WRITE(SMH_NOP) /* Palette control Obj2 ($5 constant) */ + AM_RANGE(0x16400c, 0x16400f) AM_WRITE(SMH_NOP) AM_RANGE(0x168000, 0x169fff) AM_WRITE(deco32_buffered_palette_w) AM_BASE(&paletteram32) - AM_RANGE(0x16c000, 0x16c003) AM_WRITE(MWA32_NOP) + AM_RANGE(0x16c000, 0x16c003) AM_WRITE(SMH_NOP) AM_RANGE(0x16c008, 0x16c00b) AM_WRITE(deco32_palette_dma_w) - AM_RANGE(0x170000, 0x171fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) - AM_RANGE(0x174000, 0x174003) AM_WRITE(MWA32_NOP) /* Sprite DMA mode (2) */ + AM_RANGE(0x170000, 0x171fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x174000, 0x174003) AM_WRITE(SMH_NOP) /* Sprite DMA mode (2) */ AM_RANGE(0x174010, 0x174013) AM_WRITE(buffer_spriteram32_w) - AM_RANGE(0x174018, 0x17401b) AM_WRITE(MWA32_NOP) /* Sprite 'CPU' (unused) */ + AM_RANGE(0x174018, 0x17401b) AM_WRITE(SMH_NOP) /* Sprite 'CPU' (unused) */ - AM_RANGE(0x178000, 0x179fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32_2) AM_SIZE(&spriteram_2_size) - AM_RANGE(0x17c000, 0x17c003) AM_WRITE(MWA32_NOP) /* Sprite DMA mode (2) */ + AM_RANGE(0x178000, 0x179fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x17c000, 0x17c003) AM_WRITE(SMH_NOP) /* Sprite DMA mode (2) */ AM_RANGE(0x17c010, 0x17c013) AM_WRITE(buffer_spriteram32_2_w) - AM_RANGE(0x17c018, 0x17c01b) AM_WRITE(MWA32_NOP) /* Sprite 'CPU' (unused) */ + AM_RANGE(0x17c018, 0x17c01b) AM_WRITE(SMH_NOP) /* Sprite 'CPU' (unused) */ AM_RANGE(0x182000, 0x183fff) AM_WRITE(deco32_pf1_data_w) AM_BASE(&deco32_pf1_data) AM_RANGE(0x184000, 0x185fff) AM_WRITE(deco32_pf2_data_w) AM_BASE(&deco32_pf2_data) - AM_RANGE(0x192000, 0x193fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf1_rowscroll) - AM_RANGE(0x194000, 0x195fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf2_rowscroll) - AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf12_control) + AM_RANGE(0x192000, 0x193fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf1_rowscroll) + AM_RANGE(0x194000, 0x195fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf2_rowscroll) + AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf12_control) AM_RANGE(0x1c2000, 0x1c3fff) AM_WRITE(deco32_pf3_data_w) AM_BASE(&deco32_pf3_data) AM_RANGE(0x1c4000, 0x1c5fff) AM_WRITE(deco32_pf4_data_w) AM_BASE(&deco32_pf4_data) - AM_RANGE(0x1d2000, 0x1d3fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf3_rowscroll) - AM_RANGE(0x1d4000, 0x1d5fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf4_rowscroll) - AM_RANGE(0x1e0000, 0x1e001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf34_control) + AM_RANGE(0x1d2000, 0x1d3fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf3_rowscroll) + AM_RANGE(0x1d4000, 0x1d5fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf4_rowscroll) + AM_RANGE(0x1e0000, 0x1e001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf34_control) AM_RANGE(0x200000, 0x200fff) AM_WRITE(tattass_prot_w) AM_BASE(&deco32_prot_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( nslasher_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_READ(MRA32_RAM) - AM_RANGE(0x120000, 0x1200ff) AM_READ(MRA32_NOP) /* ACIA (unused) */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x1200ff) AM_READ(SMH_NOP) /* ACIA (unused) */ - AM_RANGE(0x163000, 0x16309f) AM_READ(MRA32_RAM) - AM_RANGE(0x168000, 0x169fff) AM_READ(MRA32_RAM) + AM_RANGE(0x163000, 0x16309f) AM_READ(SMH_RAM) + AM_RANGE(0x168000, 0x169fff) AM_READ(SMH_RAM) - AM_RANGE(0x170000, 0x171fff) AM_READ(MRA32_RAM) - AM_RANGE(0x178000, 0x179fff) AM_READ(MRA32_RAM) + AM_RANGE(0x170000, 0x171fff) AM_READ(SMH_RAM) + AM_RANGE(0x178000, 0x179fff) AM_READ(SMH_RAM) - AM_RANGE(0x182000, 0x183fff) AM_READ(MRA32_RAM) - AM_RANGE(0x184000, 0x185fff) AM_READ(MRA32_RAM) - AM_RANGE(0x192000, 0x1927ff) AM_READ(MRA32_RAM) - AM_RANGE(0x192800, 0x193fff) AM_READ(MRA32_RAM) - AM_RANGE(0x194000, 0x1947ff) AM_READ(MRA32_RAM) - AM_RANGE(0x194800, 0x195fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1a0000, 0x1a001f) AM_READ(MRA32_RAM) + AM_RANGE(0x182000, 0x183fff) AM_READ(SMH_RAM) + AM_RANGE(0x184000, 0x185fff) AM_READ(SMH_RAM) + AM_RANGE(0x192000, 0x1927ff) AM_READ(SMH_RAM) + AM_RANGE(0x192800, 0x193fff) AM_READ(SMH_RAM) + AM_RANGE(0x194000, 0x1947ff) AM_READ(SMH_RAM) + AM_RANGE(0x194800, 0x195fff) AM_READ(SMH_RAM) + AM_RANGE(0x1a0000, 0x1a001f) AM_READ(SMH_RAM) - AM_RANGE(0x1c2000, 0x1c3fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1c4000, 0x1c5fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d2000, 0x1d27ff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d2800, 0x1d3fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d4000, 0x1d47ff) AM_READ(MRA32_RAM) - AM_RANGE(0x1d4800, 0x1d5fff) AM_READ(MRA32_RAM) - AM_RANGE(0x1e0000, 0x1e001f) AM_READ(MRA32_RAM) + AM_RANGE(0x1c2000, 0x1c3fff) AM_READ(SMH_RAM) + AM_RANGE(0x1c4000, 0x1c5fff) AM_READ(SMH_RAM) + AM_RANGE(0x1d2000, 0x1d27ff) AM_READ(SMH_RAM) + AM_RANGE(0x1d2800, 0x1d3fff) AM_READ(SMH_RAM) + AM_RANGE(0x1d4000, 0x1d47ff) AM_READ(SMH_RAM) + AM_RANGE(0x1d4800, 0x1d5fff) AM_READ(SMH_RAM) + AM_RANGE(0x1e0000, 0x1e001f) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x200fff) AM_READ(nslasher_prot_r) ADDRESS_MAP_END static ADDRESS_MAP_START( nslasher_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_ram) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_ram) - AM_RANGE(0x120000, 0x120003) AM_WRITE(MWA32_NOP) /* ACIA (unused) */ -// AM_RANGE(0x130000, 0x130003) AM_WRITE(MWA32_NOP) /* Coin port (unused?) */ - AM_RANGE(0x140000, 0x140003) AM_WRITE(MWA32_NOP) /* Vblank ack */ + AM_RANGE(0x120000, 0x120003) AM_WRITE(SMH_NOP) /* ACIA (unused) */ +// AM_RANGE(0x130000, 0x130003) AM_WRITE(SMH_NOP) /* Coin port (unused?) */ + AM_RANGE(0x140000, 0x140003) AM_WRITE(SMH_NOP) /* Vblank ack */ AM_RANGE(0x150000, 0x150003) AM_WRITE(nslasher_eeprom_w) /* Volume port/Eprom/Priority */ AM_RANGE(0x163000, 0x16309f) AM_WRITE(deco32_ace_ram_w) AM_BASE(&deco32_ace_ram) /* 'Ace' RAM!? */ - AM_RANGE(0x164000, 0x164003) AM_WRITE(MWA32_NOP) /* Palette control BG2/3 ($1a constant) */ - AM_RANGE(0x164004, 0x164007) AM_WRITE(MWA32_NOP) /* Palette control Obj1 ($4 constant) */ - AM_RANGE(0x164008, 0x16400b) AM_WRITE(MWA32_NOP) /* Palette control Obj2 ($6 constant) */ - AM_RANGE(0x16400c, 0x16400f) AM_WRITE(MWA32_NOP) + AM_RANGE(0x164000, 0x164003) AM_WRITE(SMH_NOP) /* Palette control BG2/3 ($1a constant) */ + AM_RANGE(0x164004, 0x164007) AM_WRITE(SMH_NOP) /* Palette control Obj1 ($4 constant) */ + AM_RANGE(0x164008, 0x16400b) AM_WRITE(SMH_NOP) /* Palette control Obj2 ($6 constant) */ + AM_RANGE(0x16400c, 0x16400f) AM_WRITE(SMH_NOP) AM_RANGE(0x168000, 0x169fff) AM_WRITE(deco32_buffered_palette_w) AM_BASE(&paletteram32) - AM_RANGE(0x16c000, 0x16c003) AM_WRITE(MWA32_NOP) + AM_RANGE(0x16c000, 0x16c003) AM_WRITE(SMH_NOP) AM_RANGE(0x16c008, 0x16c00b) AM_WRITE(deco32_palette_dma_w) - AM_RANGE(0x170000, 0x171fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) - AM_RANGE(0x174000, 0x174003) AM_WRITE(MWA32_NOP) /* Sprite DMA mode (2) */ + AM_RANGE(0x170000, 0x171fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x174000, 0x174003) AM_WRITE(SMH_NOP) /* Sprite DMA mode (2) */ AM_RANGE(0x174010, 0x174013) AM_WRITE(buffer_spriteram32_w) - AM_RANGE(0x174018, 0x17401b) AM_WRITE(MWA32_NOP) /* Sprite 'CPU' (unused) */ + AM_RANGE(0x174018, 0x17401b) AM_WRITE(SMH_NOP) /* Sprite 'CPU' (unused) */ - AM_RANGE(0x178000, 0x179fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32_2) AM_SIZE(&spriteram_2_size) - AM_RANGE(0x17c000, 0x17c003) AM_WRITE(MWA32_NOP) /* Sprite DMA mode (2) */ + AM_RANGE(0x178000, 0x179fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x17c000, 0x17c003) AM_WRITE(SMH_NOP) /* Sprite DMA mode (2) */ AM_RANGE(0x17c010, 0x17c013) AM_WRITE(buffer_spriteram32_2_w) - AM_RANGE(0x17c018, 0x17c01b) AM_WRITE(MWA32_NOP) /* Sprite 'CPU' (unused) */ + AM_RANGE(0x17c018, 0x17c01b) AM_WRITE(SMH_NOP) /* Sprite 'CPU' (unused) */ AM_RANGE(0x182000, 0x183fff) AM_WRITE(deco32_pf1_data_w) AM_BASE(&deco32_pf1_data) AM_RANGE(0x184000, 0x185fff) AM_WRITE(deco32_pf2_data_w) AM_BASE(&deco32_pf2_data) - AM_RANGE(0x192000, 0x193fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf1_rowscroll) - AM_RANGE(0x194000, 0x195fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf2_rowscroll) - AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf12_control) + AM_RANGE(0x192000, 0x193fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf1_rowscroll) + AM_RANGE(0x194000, 0x195fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf2_rowscroll) + AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf12_control) AM_RANGE(0x1c2000, 0x1c3fff) AM_WRITE(deco32_pf3_data_w) AM_BASE(&deco32_pf3_data) AM_RANGE(0x1c4000, 0x1c5fff) AM_WRITE(deco32_pf4_data_w) AM_BASE(&deco32_pf4_data) - AM_RANGE(0x1d2000, 0x1d3fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf3_rowscroll) - AM_RANGE(0x1d4000, 0x1d5fff) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf4_rowscroll) - AM_RANGE(0x1e0000, 0x1e001f) AM_WRITE(MWA32_RAM) AM_BASE(&deco32_pf34_control) + AM_RANGE(0x1d2000, 0x1d3fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf3_rowscroll) + AM_RANGE(0x1d4000, 0x1d5fff) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf4_rowscroll) + AM_RANGE(0x1e0000, 0x1e001f) AM_WRITE(SMH_RAM) AM_BASE(&deco32_pf34_control) AM_RANGE(0x200000, 0x200fff) AM_WRITE(nslasher_prot_w) AM_BASE(&deco32_prot_ram) ADDRESS_MAP_END @@ -1143,37 +1143,37 @@ static READ8_HANDLER(deco32_bsmt_status_r) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_1_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem_tattass, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x2002, 0x2003) AM_READ(soundlatch_r) AM_RANGE(0x2006, 0x2007) AM_READ(deco32_bsmt_status_r) - AM_RANGE(0x2000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x2000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_tattass, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2001) AM_WRITE(deco32_bsmt_reset_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(deco32_bsmt0_w) AM_RANGE(0xa000, 0xa0ff) AM_WRITE(deco32_bsmt1_w) - AM_RANGE(0x2000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x2000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static READ8_HANDLER(latch_r) diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c index c669d9e6571..ed0dfd82351 100644 --- a/src/mame/drivers/deco_mlc.c +++ b/src/mame/drivers/deco_mlc.c @@ -297,17 +297,17 @@ static READ32_HANDLER(stadhr96_prot_146_r) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_GLOBAL_MASK(0xffffff) - AM_RANGE(0x0000000, 0x00fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x0100000, 0x011ffff) AM_READ(MRA32_RAM) - AM_RANGE(0x0200000, 0x020000f) AM_READ(MRA32_NOP) /* IRQ control? */ + AM_RANGE(0x0000000, 0x00fffff) AM_READ(SMH_ROM) + AM_RANGE(0x0100000, 0x011ffff) AM_READ(SMH_RAM) + AM_RANGE(0x0200000, 0x020000f) AM_READ(SMH_NOP) /* IRQ control? */ AM_RANGE(0x0200070, 0x0200073) AM_READ(decomlc_vbl_r) AM_RANGE(0x0200074, 0x0200077) AM_READ(mlc_scanline_r) AM_RANGE(0x0200078, 0x020007f) AM_READ(test2_r) - AM_RANGE(0x0200080, 0x02000ff) AM_READ(MRA32_RAM) + AM_RANGE(0x0200080, 0x02000ff) AM_READ(SMH_RAM) AM_RANGE(0x0204000, 0x0206fff) AM_READ(mlc_spriteram_r) - AM_RANGE(0x0200080, 0x02000ff) AM_READ(MRA32_RAM) + AM_RANGE(0x0200080, 0x02000ff) AM_READ(SMH_RAM) AM_RANGE(0x0280000, 0x029ffff) AM_READ(mlc_vram_r) - AM_RANGE(0x0300000, 0x0307fff) AM_READ(MRA32_RAM) + AM_RANGE(0x0300000, 0x0307fff) AM_READ(SMH_RAM) AM_RANGE(0x0400000, 0x0400003) AM_READ(avengrs_control_r) AM_RANGE(0x0440000, 0x044001f) AM_READ(test3_r) AM_RANGE(0x0600004, 0x0600007) AM_READ(avengrs_sound_r) @@ -316,14 +316,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 32 ) ADDRESS_MAP_GLOBAL_MASK(0xffffff) - AM_RANGE(0x0000000, 0x00fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x0100000, 0x011ffff) AM_WRITE(MWA32_RAM) AM_BASE(&mlc_ram) + AM_RANGE(0x0000000, 0x00fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x0100000, 0x011ffff) AM_WRITE(SMH_RAM) AM_BASE(&mlc_ram) AM_RANGE(0x0200000, 0x020007f) AM_WRITE(mlc_irq_w) AM_BASE(&irq_ram) - AM_RANGE(0x0200080, 0x02000ff) AM_WRITE(MWA32_RAM) AM_BASE(&mlc_clip_ram) - AM_RANGE(0x0204000, 0x0206fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) - AM_RANGE(0x0280000, 0x029ffff) AM_WRITE(MWA32_RAM) AM_BASE(&mlc_vram) + AM_RANGE(0x0200080, 0x02000ff) AM_WRITE(SMH_RAM) AM_BASE(&mlc_clip_ram) + AM_RANGE(0x0204000, 0x0206fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x0280000, 0x029ffff) AM_WRITE(SMH_RAM) AM_BASE(&mlc_vram) AM_RANGE(0x0300000, 0x0307fff) AM_WRITE(avengrs_palette_w) AM_BASE(&paletteram32) - AM_RANGE(0x044001c, 0x044001f) AM_WRITE(MWA32_NOP) + AM_RANGE(0x044001c, 0x044001f) AM_WRITE(SMH_NOP) AM_RANGE(0x0500000, 0x0500003) AM_WRITE(avengrs_eprom_w) AM_RANGE(0x0600000, 0x0600007) AM_WRITE(avengrs_sound_w) // AM_RANGE(0x070f000, 0x070ffff) AM_READ(stadhr96_prot_146_w) AM_BASE(&deco32_prot_ram) diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c index feab2068904..e39d4f336ef 100644 --- a/src/mame/drivers/decocass.c +++ b/src/mame/drivers/decocass.c @@ -85,15 +85,15 @@ static READ8_HANDLER( mirrorcolorram_r ) { offset = ((offset >> 5) & 0x1f) | ((o static ADDRESS_MAP_START( decocass_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READWRITE(MRA8_RAM, ram_w) AM_BASE(&decocass_rambase) - AM_RANGE(0x6000, 0xbfff) AM_READWRITE(MRA8_RAM, charram_w) AM_BASE(&decocass_charram) /* still RMS3 RAM */ - AM_RANGE(0xc000, 0xc3ff) AM_READWRITE(MRA8_RAM, fgvideoram_w) AM_BASE(&decocass_fgvideoram) AM_SIZE(&decocass_fgvideoram_size) /* DSP3 RAM */ - AM_RANGE(0xc400, 0xc7ff) AM_READWRITE(MRA8_RAM, fgcolorram_w) AM_BASE(&decocass_colorram) AM_SIZE(&decocass_colorram_size) + AM_RANGE(0x0000, 0x5fff) AM_READWRITE(SMH_RAM, ram_w) AM_BASE(&decocass_rambase) + AM_RANGE(0x6000, 0xbfff) AM_READWRITE(SMH_RAM, charram_w) AM_BASE(&decocass_charram) /* still RMS3 RAM */ + AM_RANGE(0xc000, 0xc3ff) AM_READWRITE(SMH_RAM, fgvideoram_w) AM_BASE(&decocass_fgvideoram) AM_SIZE(&decocass_fgvideoram_size) /* DSP3 RAM */ + AM_RANGE(0xc400, 0xc7ff) AM_READWRITE(SMH_RAM, fgcolorram_w) AM_BASE(&decocass_colorram) AM_SIZE(&decocass_colorram_size) AM_RANGE(0xc800, 0xcbff) AM_READWRITE(mirrorvideoram_r, mirrorvideoram_w) AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(mirrorcolorram_r, mirrorcolorram_w) - AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(MRA8_RAM, tileram_w) AM_BASE(&decocass_tileram) AM_SIZE(&decocass_tileram_size) - AM_RANGE(0xd800, 0xdbff) AM_READWRITE(MRA8_RAM, objectram_w) AM_BASE(&decocass_objectram) AM_SIZE(&decocass_objectram_size) - AM_RANGE(0xe000, 0xe0ff) AM_READWRITE(MRA8_RAM, decocass_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(SMH_RAM, tileram_w) AM_BASE(&decocass_tileram) AM_SIZE(&decocass_tileram_size) + AM_RANGE(0xd800, 0xdbff) AM_READWRITE(SMH_RAM, objectram_w) AM_BASE(&decocass_objectram) AM_SIZE(&decocass_objectram_size) + AM_RANGE(0xe000, 0xe0ff) AM_READWRITE(SMH_RAM, decocass_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xe300, 0xe300) AM_READWRITE(input_port_7_r, decocass_watchdog_count_w) AM_RANGE(0xe301, 0xe301) AM_READWRITE(input_port_8_r, decocass_watchdog_flip_w) AM_RANGE(0xe302, 0xe302) AM_WRITE(decocass_color_missiles_w) @@ -1138,7 +1138,7 @@ static DRIVER_INIT( decocrom ) decrypted2[i] = swap_bits_5_6(rom[i]); /* convert charram to a banked ROM */ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0xafff, 0, 0, MRA8_BANK1); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0xafff, 0, 0, SMH_BANK1); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0xafff, 0, 0, decocass_de0091_w); memory_configure_bank(1, 0, 1, decocass_charram, 0); memory_configure_bank(1, 1, 1, memory_region(REGION_USER3), 0); diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c index a45c6ec4ec9..67d9b7a829f 100644 --- a/src/mame/drivers/deniam.c +++ b/src/mame/drivers/deniam.c @@ -93,38 +93,38 @@ static WRITE16_HANDLER( YM3812_write_port_0_msb_w ) static ADDRESS_MAP_START( deniam16b_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x410000, 0x410fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM) + AM_RANGE(0x410000, 0x410fff) AM_READ(SMH_RAM) AM_RANGE(0xc40002, 0xc40003) AM_READ(deniam_coinctrl_r) AM_RANGE(0xc44000, 0xc44001) AM_READ(input_port_0_word_r) AM_RANGE(0xc44002, 0xc44003) AM_READ(input_port_1_word_r) AM_RANGE(0xc44004, 0xc44005) AM_READ(input_port_2_word_r) - AM_RANGE(0xc44006, 0xc44007) AM_READ(MRA16_NOP) /* unused? */ + AM_RANGE(0xc44006, 0xc44007) AM_READ(SMH_NOP) /* unused? */ AM_RANGE(0xc4400a, 0xc4400b) AM_READ(input_port_3_word_r) - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( deniam16b_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(deniam_videoram_w) AM_BASE(&deniam_videoram) AM_RANGE(0x410000, 0x410fff) AM_WRITE(deniam_textram_w) AM_BASE(&deniam_textram) - AM_RANGE(0x440000, 0x4407ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x440000, 0x4407ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x840000, 0x840fff) AM_WRITE(deniam_palette_w) AM_BASE(&paletteram16) AM_RANGE(0xc40000, 0xc40001) AM_WRITE(sound_command_w) AM_RANGE(0xc40002, 0xc40003) AM_WRITE(deniam_coinctrl_w) - AM_RANGE(0xc40004, 0xc40005) AM_WRITE(MWA16_NOP) /* irq ack? */ - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xc40004, 0xc40005) AM_WRITE(SMH_NOP) /* irq ack? */ + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xf7ff) AM_READ(MRA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xf7ff) AM_READ(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xf7ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xf7ff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -144,32 +144,32 @@ ADDRESS_MAP_END /* identical to 16b, but handles sound directly */ static ADDRESS_MAP_START( deniam16c_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x410000, 0x410fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM) + AM_RANGE(0x410000, 0x410fff) AM_READ(SMH_RAM) AM_RANGE(0xc40000, 0xc40001) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0xc40002, 0xc40003) AM_READ(deniam_coinctrl_r) AM_RANGE(0xc44000, 0xc44001) AM_READ(input_port_0_word_r) AM_RANGE(0xc44002, 0xc44003) AM_READ(input_port_1_word_r) AM_RANGE(0xc44004, 0xc44005) AM_READ(input_port_2_word_r) - AM_RANGE(0xc44006, 0xc44007) AM_READ(MRA16_NOP) /* unused? */ + AM_RANGE(0xc44006, 0xc44007) AM_READ(SMH_NOP) /* unused? */ AM_RANGE(0xc4400a, 0xc4400b) AM_READ(input_port_3_word_r) - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( deniam16c_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(deniam_videoram_w) AM_BASE(&deniam_videoram) AM_RANGE(0x410000, 0x410fff) AM_WRITE(deniam_textram_w) AM_BASE(&deniam_textram) - AM_RANGE(0x440000, 0x4407ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x440000, 0x4407ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x840000, 0x840fff) AM_WRITE(deniam_palette_w) AM_BASE(&paletteram16) AM_RANGE(0xc40000, 0xc40001) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0xc40002, 0xc40003) AM_WRITE(deniam_coinctrl_w) - AM_RANGE(0xc40004, 0xc40005) AM_WRITE(MWA16_NOP) /* irq ack? */ + AM_RANGE(0xc40004, 0xc40005) AM_WRITE(SMH_NOP) /* irq ack? */ AM_RANGE(0xc40006, 0xc40007) AM_WRITE(deniam16c_oki_rom_bank_w) AM_RANGE(0xc40008, 0xc40009) AM_WRITE(YM3812_control_port_0_msb_w) AM_RANGE(0xc4000a, 0xc4000b) AM_WRITE(YM3812_write_port_0_msb_w) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 1079726d6af..c42c2692ff4 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -169,11 +169,11 @@ static ADDRESS_MAP_START( destroyr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0xf00) AM_RAM AM_RANGE(0x1000, 0x1fff) AM_READWRITE(destroyr_input_r, destroyr_output_w) AM_RANGE(0x2000, 0x2fff) AM_READ(input_port_2_r) - AM_RANGE(0x3000, 0x30ff) AM_WRITE(MWA8_RAM) AM_BASE(&destroyr_alpha_num_ram) - AM_RANGE(0x4000, 0x401f) AM_WRITE(MWA8_RAM) AM_BASE(&destroyr_major_obj_ram) + AM_RANGE(0x3000, 0x30ff) AM_WRITE(SMH_RAM) AM_BASE(&destroyr_alpha_num_ram) + AM_RANGE(0x4000, 0x401f) AM_WRITE(SMH_RAM) AM_BASE(&destroyr_major_obj_ram) AM_RANGE(0x5000, 0x5000) AM_WRITE(destroyr_cursor_load_w) AM_RANGE(0x5001, 0x5001) AM_WRITE(destroyr_interrupt_ack_w) - AM_RANGE(0x5002, 0x5007) AM_WRITE(MWA8_RAM) AM_BASE(&destroyr_minor_obj_ram) + AM_RANGE(0x5002, 0x5007) AM_WRITE(SMH_RAM) AM_BASE(&destroyr_minor_obj_ram) AM_RANGE(0x6000, 0x6fff) AM_READ(destroyr_scanline_r) AM_RANGE(0x7000, 0x77ff) AM_NOP /* missing translation ROMs */ AM_RANGE(0x7800, 0x7fff) AM_ROM /* program */ diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c index 9bba2d232b2..83d0131ab8a 100644 --- a/src/mame/drivers/dgpix.c +++ b/src/mame/drivers/dgpix.c @@ -578,7 +578,7 @@ static DRIVER_INIT( xfiles ) rom[BYTE4_XOR_BE(0x3aa933)] = 0; // protection related ? -// memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0c8b440, 0xf0c8b447, 0, 0, MRA32_NOP ); +// memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0c8b440, 0xf0c8b447, 0, 0, SMH_NOP ); flash_roms = 2; } @@ -598,7 +598,7 @@ static DRIVER_INIT( kdynastg ) rom[BYTE4_XOR_BE(0x3a45c9)] = 0; // protection related ? -// memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x12341234, 0x12341243, 0, 0, MRA32_NOP ); +// memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x12341234, 0x12341243, 0, 0, SMH_NOP ); flash_roms = 4; } diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index 33766c2ae6d..738198351d9 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -27,13 +27,13 @@ extern void deco102_decrypt(int region, int address_xor, int data_select_xor, in static ADDRESS_MAP_START( dietgo_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x200000, 0x20000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x200000, 0x20000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x210000, 0x211fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x212000, 0x213fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x220000, 0x2207ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x222000, 0x2227ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x220000, 0x2207ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x222000, 0x2227ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) AM_RANGE(0x280000, 0x2807ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x300000, 0x300bff) AM_READ(MRA16_RAM) AM_WRITE(deco16_nonbuffered_palette_w) AM_BASE(&paletteram16) + AM_RANGE(0x300000, 0x300bff) AM_READ(SMH_RAM) AM_WRITE(deco16_nonbuffered_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x340000, 0x3407ff) AM_READ(dietgo_104_prot_r) AM_WRITE(dietgo_104_prot_w) AM_RANGE(0x380000, 0x38ffff) AM_RAM // mainram ADDRESS_MAP_END @@ -53,22 +53,22 @@ static WRITE8_HANDLER( YM2151_w ) /* Physical memory map (21 bits) */ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_READ(MRA8_NOP) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) - AM_RANGE(0x130000, 0x130001) AM_READ(MRA8_NOP) /* This board only has 1 oki chip */ + AM_RANGE(0x130000, 0x130001) AM_READ(SMH_NOP) /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA8_NOP) /* YM2203 - this board doesn't have one */ + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) /* YM2203 - this board doesn't have one */ AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) - AM_RANGE(0x130000, 0x130001) AM_WRITE(MWA8_NOP) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x130000, 0x130001) AM_WRITE(SMH_NOP) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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 ffccb629371..62cb8566b67 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -284,22 +284,22 @@ static WRITE8_HANDLER( discoboy_ram_att_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xc7ff) AM_READ(rambank_r) AM_RANGE(0xc800, 0xcfff) AM_READ(discoboy_ram_att_r) AM_RANGE(0xd000, 0xdfff) AM_READ(rambank2_r) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(rambank_w) AM_RANGE(0xc800, 0xcfff) AM_WRITE(discoboy_ram_att_w) AM_RANGE(0xd000, 0xdfff) AM_WRITE(rambank2_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static READ8_HANDLER( discoboy_port_06_r ) @@ -345,14 +345,14 @@ static void splash_msm5205_int(int data) static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xec00, 0xec00) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0xec01, 0xec01) AM_WRITE(YM3812_write_port_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index f1f9737561d..d606a1004c8 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -77,38 +77,38 @@ static WRITE8_HANDLER( okibank_w ) static ADDRESS_MAP_START( diverboy_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x04ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x080000, 0x083fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x04ffff) AM_READ(SMH_RAM) + AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x180001) AM_READ(input_port_0_word_r) AM_RANGE(0x180002, 0x180003) AM_READ(input_port_1_word_r) AM_RANGE(0x180008, 0x180009) AM_READ(input_port_2_word_r) -// AM_RANGE(0x18000a, 0x18000b) AM_READ(MRA16_NOP) +// AM_RANGE(0x18000a, 0x18000b) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( diverboy_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x04ffff) AM_WRITE(MWA16_RAM) /* main ram */ - AM_RANGE(0x080000, 0x083fff) AM_WRITE(MWA16_RAM) AM_BASE(&diverboy_spriteram) AM_SIZE(&diverboy_spriteram_size) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x04ffff) AM_WRITE(SMH_RAM) /* main ram */ + AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) AM_BASE(&diverboy_spriteram) AM_SIZE(&diverboy_spriteram_size) AM_RANGE(0x100000, 0x100001) AM_WRITE(soundcmd_w) AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) -// AM_RANGE(0x18000c, 0x18000d) AM_WRITE(MWA16_NOP) - AM_RANGE(0x320000, 0x3207ff) AM_WRITE(MWA16_RAM) /* ?? */ - AM_RANGE(0x322000, 0x3227ff) AM_WRITE(MWA16_RAM) /* ?? */ -// AM_RANGE(0x340000, 0x340001) AM_WRITE(MWA16_NOP) -// AM_RANGE(0x340002, 0x340003) AM_WRITE(MWA16_NOP) +// AM_RANGE(0x18000c, 0x18000d) AM_WRITE(SMH_NOP) + AM_RANGE(0x320000, 0x3207ff) AM_WRITE(SMH_RAM) /* ?? */ + AM_RANGE(0x322000, 0x3227ff) AM_WRITE(SMH_RAM) /* ?? */ +// AM_RANGE(0x340000, 0x340001) AM_WRITE(SMH_NOP) +// AM_RANGE(0x340002, 0x340003) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( snd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(okibank_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index 69db4b96391..022dd404e29 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -737,13 +737,13 @@ static WRITE8_HANDLER( cpu2_bankswitch_w ) /******************************************************************************/ static ADDRESS_MAP_START( cpu0_am, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xafff) AM_READ(MRA8_BANK4) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xafff) AM_READ(SMH_BANK4) AM_RANGE(0xb000, 0xbfff) AM_READWRITE( pandora_spriteram_r, pandora_spriteram_w ) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) AM_BASE(&sharedram) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_BANK1) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&sharedram) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( cpu0_port_am, ADDRESS_SPACE_IO, 8 ) @@ -754,11 +754,11 @@ ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( cpu1_am, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK2) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) AM_WRITE(djboy_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xd000, 0xd3ff) AM_READ(MRA8_RAM) AM_WRITE(djboy_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0xd400, 0xd8ff) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) AM_WRITE(djboy_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xd000, 0xd3ff) AM_READ(SMH_RAM) AM_WRITE(djboy_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0xd400, 0xd8ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xffff) AM_READ(sharedram_r) AM_WRITE(sharedram_w) ADDRESS_MAP_END @@ -777,9 +777,9 @@ ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( cpu2_am, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK3) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK3) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_port_am, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index 20469fc2c17..1520efcfd90 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -461,7 +461,7 @@ static void ide_interrupt(int state) static ADDRESS_MAP_START( memory_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM // PRG ROM AM_RANGE(0x400000, 0x40ffff) AM_RAM // WORK RAM - AM_RANGE(0x480000, 0x48443f) AM_READWRITE(MRA32_RAM, paletteram32_w) // COLOR RAM + AM_RANGE(0x480000, 0x48443f) AM_READWRITE(SMH_RAM, paletteram32_w) // COLOR RAM AM_BASE(&paletteram32) AM_RANGE(0x500000, 0x57ffff) AM_READWRITE(sndram_r, sndram_w) // SOUND RAM AM_RANGE(0x580000, 0x58003f) AM_READWRITE(K056832_long_r, K056832_long_w) // VIDEO REG (tilemap) diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index cc93013ed34..d500c53438b 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -762,7 +762,7 @@ static ADDRESS_MAP_START( dkong_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x6bff) AM_RAM AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) AM_SIZE_MEMBER(dkong_state, sprite_ram_size) /* sprite set 1 */ - AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) + AM_RANGE(0x7400, 0x77ff) AM_READWRITE(SMH_RAM, dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) AM_RANGE(0x7800, 0x780f) AM_READWRITE(dma8257_0_r, dma8257_0_w) /* P8257 control registers */ AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_WRITE(dkong_sh_tuneselect_w) /* IN0, sound CPU intf */ @@ -784,7 +784,7 @@ static ADDRESS_MAP_START( dkongjr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6c00, 0x6fff) AM_RAM /* DK3 bootleg only */ AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) AM_SIZE_MEMBER(dkong_state, sprite_ram_size) /* sprite set 1 */ - AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) + AM_RANGE(0x7400, 0x77ff) AM_READWRITE(SMH_RAM, dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) AM_RANGE(0x7800, 0x780f) AM_READWRITE(dma8257_0_r, dma8257_0_w) /* P8257 control registers */ AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_WRITE(dkongjr_sh_tuneselect_w) @@ -810,7 +810,7 @@ static ADDRESS_MAP_START( dkong3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6800, 0x6fff) AM_RAM AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) AM_SIZE_MEMBER(dkong_state, sprite_ram_size) /* sprite set 1 */ - AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) + AM_RANGE(0x7400, 0x77ff) AM_READWRITE(SMH_RAM, dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_WRITE(soundlatch_w) AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_WRITE(soundlatch2_w) @@ -829,7 +829,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dkong3_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READWRITE(z80dma_0_r, z80dma_0_w) /* dma controller */ - //AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) /* dma controller */ + //AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /* dma controller */ ADDRESS_MAP_END /* Epos conversions */ @@ -856,7 +856,7 @@ static ADDRESS_MAP_START( hunchbkd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1585, 0x1585) AM_WRITE(p8257_drq_w) /* P8257 ==> /DRQ0 /DRQ1 */ AM_RANGE(0x1586, 0x1587) AM_WRITE(dkong_palettebank_w) AM_RANGE(0x1600, 0x17ff) AM_RAM /* 0x6400 spriteram location */ - AM_RANGE(0x1800, 0x1bff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) + AM_RANGE(0x1800, 0x1bff) AM_READWRITE(SMH_RAM, dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) /* 0x7400 */ AM_RANGE(0x1C00, 0x1f7f) AM_RAM /* 0x6000 */ AM_RANGE(0x1f80, 0x1f8f) AM_READWRITE(dma8257_0_r, dma8257_0_w) /* P8257 control registers */ diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index 50a5b9cfc4e..6dfe718f0e7 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -51,7 +51,7 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xC000, 0xC007) AM_READ(dderby_random_reader) AM_RANGE(0xC802, 0xC802) AM_READ(dderby_random_reader) AM_RANGE(0xC803, 0xC803) AM_READ(dderby_random_reader) - AM_RANGE(0xCA01, 0xCA01) AM_WRITE(MWA8_NOP) + AM_RANGE(0xCA01, 0xCA01) AM_WRITE(SMH_NOP) AM_RANGE(0xD000, 0xD7ff) AM_RAM AM_BASE(&dderby_vid) ADDRESS_MAP_END diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index e5f9dcba080..4ebe0837745 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -188,8 +188,8 @@ static ADDRESS_MAP_START( docastle_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9800, 0x99ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared0_r, docastle_shared1_w) AM_RANGE(0xa800, 0xa800) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0800) AM_READWRITE(MRA8_RAM, docastle_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xb400, 0xb7ff) AM_MIRROR(0x0800) AM_READWRITE(MRA8_RAM, docastle_colorram_w) AM_BASE(&colorram) + AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0800) AM_READWRITE(SMH_RAM, docastle_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xb400, 0xb7ff) AM_MIRROR(0x0800) AM_READWRITE(SMH_RAM, docastle_colorram_w) AM_BASE(&colorram) AM_RANGE(0xe000, 0xe000) AM_WRITE(docastle_nmitrigger_w) ADDRESS_MAP_END @@ -232,8 +232,8 @@ static ADDRESS_MAP_START( dorunrun_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x9fff) AM_ROM AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared0_r, docastle_shared1_w) AM_RANGE(0xa800, 0xa800) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xb000, 0xb3ff) AM_READWRITE(MRA8_RAM, docastle_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xb400, 0xb7ff) AM_READWRITE(MRA8_RAM, docastle_colorram_w) AM_BASE(&colorram) + AM_RANGE(0xb000, 0xb3ff) AM_READWRITE(SMH_RAM, docastle_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xb400, 0xb7ff) AM_READWRITE(SMH_RAM, docastle_colorram_w) AM_BASE(&colorram) AM_RANGE(0xb800, 0xb800) AM_WRITE(docastle_nmitrigger_w) ADDRESS_MAP_END @@ -262,8 +262,8 @@ static ADDRESS_MAP_START( idsoccer_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x9fff) AM_ROM AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared0_r, docastle_shared1_w) AM_RANGE(0xa800, 0xa800) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0800) AM_READWRITE(MRA8_RAM, docastle_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xb400, 0xb7ff) AM_MIRROR(0x0800) AM_READWRITE(MRA8_RAM, docastle_colorram_w) AM_BASE(&colorram) + AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0800) AM_READWRITE(SMH_RAM, docastle_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xb400, 0xb7ff) AM_MIRROR(0x0800) AM_READWRITE(SMH_RAM, docastle_colorram_w) AM_BASE(&colorram) AM_RANGE(0xc000, 0xc000) AM_READWRITE(idsoccer_adpcm_status_r, idsoccer_adpcm_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(docastle_nmitrigger_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c index 752707acaac..996cfcd345b 100644 --- a/src/mame/drivers/dogfgt.c +++ b/src/mame/drivers/dogfgt.c @@ -83,12 +83,12 @@ static ADDRESS_MAP_START( main_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1820, 0x1820) AM_READ(input_port_2_r) AM_RANGE(0x1830, 0x1830) AM_READ(input_port_3_r) AM_RANGE(0x2000, 0x3fff) AM_READ(dogfgt_bitmapram_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( main_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(sharedram_w) AM_BASE(&sharedram) - AM_RANGE(0x0f80, 0x0fdf) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0f80, 0x0fdf) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x1000, 0x17ff) AM_WRITE(dogfgt_bgvideoram_w) AM_BASE(&dogfgt_bgvideoram) AM_RANGE(0x1800, 0x1800) AM_WRITE(dogfgt_1800_w) /* text color, flip screen & coin counters */ AM_RANGE(0x1810, 0x1810) AM_WRITE(subirqtrigger_w) @@ -98,20 +98,20 @@ static ADDRESS_MAP_START( main_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1840, 0x1840) AM_WRITE(dogfgt_soundcontrol_w) AM_RANGE(0x1870, 0x187f) AM_WRITE(paletteram_BBGGGRRR_w) AM_BASE(&paletteram) AM_RANGE(0x2000, 0x3fff) AM_WRITE(dogfgt_bitmapram_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x27ff) AM_READ(sharedram_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x27ff) AM_WRITE(sharedram_w) AM_RANGE(0x4000, 0x4000) AM_WRITE(sub_irqack_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index 92ef053ba77..5c7705cd293 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -129,14 +129,14 @@ static READ8_HANDLER( dominob_input_2_r ) static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READWRITE(MRA8_ROM, MWA8_NOP) // there are some garbage writes to ROM + AM_RANGE(0x0000, 0xbfff) AM_READWRITE(SMH_ROM, SMH_NOP) // there are some garbage writes to ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xd001, 0xd001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) AM_RANGE(0xd008, 0xd008) AM_WRITE(dominob_d008_w) AM_RANGE(0xd00c, 0xd00c) AM_READ(input_port_0_r) - AM_RANGE(0xd010, 0xd010) AM_READWRITE(input_port_1_r, MWA8_NOP) + AM_RANGE(0xd010, 0xd010) AM_READWRITE(input_port_1_r, SMH_NOP) AM_RANGE(0xd018, 0xd018) AM_READ(dominob_input_2_r) AM_WRITENOP AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&videoram) @@ -144,7 +144,7 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe840, 0xefff) AM_RAM AM_RANGE(0xf000, 0xf07f) AM_RAM AM_BASE(&bgram) AM_RANGE(0xf080, 0xf7ff) AM_RAM - AM_RANGE(0xf800, 0xfbff) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_READ(MRA8_RAM) AM_BASE(&paletteram) + AM_RANGE(0xf800, 0xfbff) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_READ(SMH_RAM) AM_BASE(&paletteram) AM_RANGE(0xfc00, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c index 497a69afe87..bec54ec5d03 100644 --- a/src/mame/drivers/dooyong.c +++ b/src/mame/drivers/dooyong.c @@ -122,18 +122,18 @@ static WRITE8_HANDLER( flip_screen_w ) ***************************************************************************/ static ADDRESS_MAP_START( lastday_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc010, 0xc010) AM_READ(input_port_4_r) AM_RANGE(0xc011, 0xc011) AM_READ(input_port_2_r) AM_RANGE(0xc012, 0xc012) AM_READ(input_port_3_r) AM_RANGE(0xc013, 0xc013) AM_READ(input_port_0_r) AM_RANGE(0xc014, 0xc014) AM_READ(input_port_1_r) - AM_RANGE(0xc800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xc800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( lastday_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc007) AM_WRITE(dooyong_bgscroll8_w) AM_RANGE(0xc008, 0xc00f) AM_WRITE(dooyong_fgscroll8_w) AM_RANGE(0xc010, 0xc010) AM_WRITE(lastday_ctrl_w) /* coin counter, flip screen */ @@ -141,26 +141,26 @@ static ADDRESS_MAP_START( lastday_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc012, 0xc012) AM_WRITE(soundlatch_w) AM_RANGE(0xc800, 0xcfff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) AM_RANGE(0xd000, 0xdfff) AM_WRITE(dooyong_txvideoram8_w) AM_BASE(&dooyong_txvideoram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( pollux_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xefff) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_READ(input_port_0_r) AM_RANGE(0xf001, 0xf001) AM_READ(input_port_1_r) AM_RANGE(0xf002, 0xf002) AM_READ(input_port_2_r) AM_RANGE(0xf003, 0xf003) AM_READ(input_port_3_r) AM_RANGE(0xf004, 0xf004) AM_READ(input_port_4_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( pollux_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xe000, 0xefff) AM_WRITE(dooyong_txvideoram8_w) AM_BASE(&dooyong_txvideoram) AM_RANGE(0xf000, 0xf000) AM_WRITE(lastday_bankswitch_w) AM_RANGE(0xf008, 0xf008) AM_WRITE(pollux_ctrl_w) /* coin counter, flip screen */ @@ -171,30 +171,30 @@ static ADDRESS_MAP_START( pollux_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( gulfstrm_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xefff) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_READ(input_port_0_r) AM_RANGE(0xf001, 0xf001) AM_READ(input_port_1_r) AM_RANGE(0xf002, 0xf002) AM_READ(input_port_3_r) AM_RANGE(0xf003, 0xf003) AM_READ(input_port_2_r) AM_RANGE(0xf004, 0xf004) AM_READ(input_port_4_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( bluehawk_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r) AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r) AM_RANGE(0xc004, 0xc004) AM_READ(input_port_4_r) - AM_RANGE(0xc800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xc800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( bluehawk_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_WRITE(flip_screen_w) AM_RANGE(0xc008, 0xc008) AM_WRITE(lastday_bankswitch_w) AM_RANGE(0xc010, 0xc010) AM_WRITE(soundlatch_w) @@ -203,29 +203,29 @@ static ADDRESS_MAP_START( bluehawk_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc048, 0xc04f) AM_WRITE(dooyong_fgscroll8_w) AM_RANGE(0xc800, 0xcfff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE(&paletteram) AM_RANGE(0xd000, 0xdfff) AM_WRITE(dooyong_txvideoram8_w) AM_BASE(&dooyong_txvideoram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( flytiger_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_2_r) AM_RANGE(0xe002, 0xe002) AM_READ(input_port_3_r) AM_RANGE(0xe004, 0xe004) AM_READ(input_port_4_r) AM_RANGE(0xe006, 0xe006) AM_READ(input_port_0_r) AM_RANGE(0xe008, 0xe008) AM_READ(input_port_1_r) - AM_RANGE(0xe800, 0xefff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xe800, 0xefff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( flytiger_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(lastday_bankswitch_w) AM_RANGE(0xe010, 0xe010) AM_WRITE(flytiger_ctrl_w) /* coin counter, flip screen */ AM_RANGE(0xe020, 0xe020) AM_WRITE(soundlatch_w) @@ -236,11 +236,11 @@ static ADDRESS_MAP_START( flytiger_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( primella_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd3ff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_0_r) AM_RANGE(0xf810, 0xf810) AM_READ(input_port_1_r) AM_RANGE(0xf820, 0xf820) AM_READ(input_port_2_r) @@ -249,9 +249,9 @@ static ADDRESS_MAP_START( primella_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( primella_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd000, 0xd3ff) AM_WRITE(MWA8_RAM) /* what is this? looks like a palette? scratchpad RAM maybe? */ + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd000, 0xd3ff) AM_WRITE(SMH_RAM) /* what is this? looks like a palette? scratchpad RAM maybe? */ AM_RANGE(0xe000, 0xefff) AM_WRITE(dooyong_txvideoram8_w) AM_BASE(&dooyong_txvideoram) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE(&paletteram) AM_RANGE(0xf800, 0xf800) AM_WRITE(primella_ctrl_w) /* bank switch, flip screen etc */ @@ -262,10 +262,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rshark_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) /* super-x needs this and is similar */ - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x04cfff) AM_READ(MRA16_RAM) - AM_RANGE(0x04d000, 0x04dfff) AM_READ(MRA16_RAM) - AM_RANGE(0x04e000, 0x04ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x04cfff) AM_READ(SMH_RAM) + AM_RANGE(0x04d000, 0x04dfff) AM_READ(SMH_RAM) + AM_RANGE(0x04e000, 0x04ffff) AM_READ(SMH_RAM) AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_0_word_r) AM_RANGE(0x0c0004, 0x0c0005) AM_READ(input_port_1_word_r) AM_RANGE(0x0c0006, 0x0c0007) AM_READ(input_port_2_word_r) @@ -273,10 +273,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rshark_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) /* super-x needs this and is similar */ - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x04cfff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x04d000, 0x04dfff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x04e000, 0x04ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x04cfff) AM_WRITE(SMH_RAM) + AM_RANGE(0x04d000, 0x04dfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x04e000, 0x04ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE(dooyong_bgscroll16_w) AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE(dooyong_bg2scroll16_w) AM_RANGE(0x0c8000, 0x0c8fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) @@ -288,10 +288,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( superx_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x0d0000, 0x0dcfff) AM_READ(MRA16_RAM) - AM_RANGE(0x0dd000, 0x0ddfff) AM_READ(MRA16_RAM) - AM_RANGE(0x0de000, 0x0dffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x0d0000, 0x0dcfff) AM_READ(SMH_RAM) + AM_RANGE(0x0dd000, 0x0ddfff) AM_READ(SMH_RAM) + AM_RANGE(0x0de000, 0x0dffff) AM_READ(SMH_RAM) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_0_word_r) AM_RANGE(0x080004, 0x080005) AM_READ(input_port_1_word_r) AM_RANGE(0x080006, 0x080007) AM_READ(input_port_2_word_r) @@ -299,10 +299,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( superx_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x0d0000, 0x0dcfff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x0dd000, 0x0ddfff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x0de000, 0x0dffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x0d0000, 0x0dcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0x0dd000, 0x0ddfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x0de000, 0x0dffff) AM_WRITE(SMH_RAM) AM_RANGE(0x084000, 0x08400f) AM_WRITE(dooyong_bgscroll16_w) AM_RANGE(0x084010, 0x08401f) AM_WRITE(dooyong_bg2scroll16_w) AM_RANGE(0x088000, 0x088fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) @@ -314,10 +314,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( popbingo_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x04cfff) AM_READ(MRA16_RAM) - AM_RANGE(0x04d000, 0x04dfff) AM_READ(MRA16_RAM) // sprites - AM_RANGE(0x04e000, 0x04ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x04cfff) AM_READ(SMH_RAM) + AM_RANGE(0x04d000, 0x04dfff) AM_READ(SMH_RAM) // sprites + AM_RANGE(0x04e000, 0x04ffff) AM_READ(SMH_RAM) AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_0_word_r) AM_RANGE(0x0c0004, 0x0c0005) AM_READ(input_port_1_word_r) AM_RANGE(0x0c0006, 0x0c0007) AM_READ(input_port_2_word_r) @@ -325,13 +325,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( popbingo_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x04cfff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x04d000, 0x04dfff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x04e000, 0x04ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x04cfff) AM_WRITE(SMH_RAM) + AM_RANGE(0x04d000, 0x04dfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x04e000, 0x04ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x0c0012, 0x0c0013) AM_WRITE(soundlatch_word_w) AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(rshark_ctrl_w) - AM_RANGE(0x0c0018, 0x0c001b) AM_WRITE(MWA16_NOP) // ? + AM_RANGE(0x0c0018, 0x0c001b) AM_WRITE(SMH_NOP) // ? AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE(dooyong_bgscroll16_w) AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE(dooyong_bg2scroll16_w) // not used atm AM_RANGE(0x0c8000, 0x0c8fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) @@ -341,8 +341,8 @@ static ADDRESS_MAP_START( popbingo_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( lastday_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r) AM_RANGE(0xf000, 0xf000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xf001, 0xf001) AM_READ(YM2203_read_port_0_r) @@ -351,8 +351,8 @@ static ADDRESS_MAP_START( lastday_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( lastday_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(YM2203_control_port_1_w) @@ -360,8 +360,8 @@ static ADDRESS_MAP_START( lastday_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( pollux_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) AM_RANGE(0xf802, 0xf802) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xf803, 0xf803) AM_READ(YM2203_read_port_0_r) @@ -370,8 +370,8 @@ static ADDRESS_MAP_START( pollux_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( pollux_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf802, 0xf802) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xf803, 0xf803) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xf804, 0xf804) AM_WRITE(YM2203_control_port_1_w) @@ -379,16 +379,16 @@ static ADDRESS_MAP_START( pollux_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bluehawk_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) AM_RANGE(0xf809, 0xf809) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xf80a, 0xf80a) AM_READ(OKIM6295_status_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( bluehawk_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf808, 0xf808) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xf809, 0xf809) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xf80a, 0xf80a) AM_WRITE(OKIM6295_data_0_w) diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index b83f3c96e61..db12498e9d8 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -152,8 +152,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dorachan_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_WRITE(MWA8_NOP) - AM_RANGE(0x02, 0x02) AM_WRITE(MWA8_NOP) + AM_RANGE(0x01, 0x01) AM_WRITE(SMH_NOP) + AM_RANGE(0x02, 0x02) AM_WRITE(SMH_NOP) AM_RANGE(0x03, 0x03) AM_WRITE(dorachan_ctrl_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c index e4e450745a1..7299d65c337 100644 --- a/src/mame/drivers/dotrikun.c +++ b/src/mame/drivers/dotrikun.c @@ -29,13 +29,13 @@ WRITE8_HANDLER( dotrikun_color_w ); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c index 8caa55bfd34..ee89b3cc816 100644 --- a/src/mame/drivers/dragrace.c +++ b/src/mame/drivers/dragrace.c @@ -170,23 +170,23 @@ static READ8_HANDLER( dragrace_scanline_r ) static ADDRESS_MAP_START( dragrace_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0080, 0x00ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0080, 0x00ff) AM_READ(SMH_RAM) AM_RANGE(0x0800, 0x083f) AM_READ(dragrace_input_r) AM_RANGE(0x0c00, 0x0c00) AM_READ(dragrace_steering_r) AM_RANGE(0x0d00, 0x0d00) AM_READ(dragrace_scanline_r) - AM_RANGE(0x1000, 0x1fff) AM_READ(MRA8_ROM) /* program */ - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_ROM) /* program mirror */ + AM_RANGE(0x1000, 0x1fff) AM_READ(SMH_ROM) /* program */ + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_ROM) /* program mirror */ ADDRESS_MAP_END static ADDRESS_MAP_START( dragrace_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0080, 0x00ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0080, 0x00ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0900, 0x091f) AM_WRITE(dragrace_misc_w) AM_RANGE(0x0920, 0x093f) AM_WRITE(dragrace_misc_clear_w) - AM_RANGE(0x0a00, 0x0aff) AM_WRITE(MWA8_RAM) AM_BASE(&dragrace_playfield_ram) - AM_RANGE(0x0b00, 0x0bff) AM_WRITE(MWA8_RAM) AM_BASE(&dragrace_position_ram) + AM_RANGE(0x0a00, 0x0aff) AM_WRITE(SMH_RAM) AM_BASE(&dragrace_playfield_ram) + AM_RANGE(0x0b00, 0x0bff) AM_WRITE(SMH_RAM) AM_BASE(&dragrace_position_ram) AM_RANGE(0x0e00, 0x0eff) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x1000, 0x1fff) AM_WRITE(MWA8_ROM) /* program */ - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_ROM) /* program mirror */ + AM_RANGE(0x1000, 0x1fff) AM_WRITE(SMH_ROM) /* program */ + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_ROM) /* program mirror */ ADDRESS_MAP_END diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 53af2704e95..9b9fcd9b901 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -288,12 +288,12 @@ static WRITE32_HANDLER( dreamwld_6295_1_bank_w ) } static ADDRESS_MAP_START( dreamwld_map, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_WRITE(MWA32_NOP) + AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_WRITE(SMH_NOP) AM_RANGE(0x400000, 0x401fff) AM_RAM AM_BASE( &spriteram32 ) AM_RANGE(0x600000, 0x601fff) AM_RAM AM_WRITE(dreamwld_palette_w) AM_BASE(&paletteram32) // real palette? - AM_RANGE(0x800000, 0x801fff) AM_READWRITE(MRA32_RAM, dreamwld_bg_videoram_w ) AM_BASE( &dreamwld_bg_videoram ) - AM_RANGE(0x802000, 0x803fff) AM_READWRITE(MRA32_RAM, dreamwld_bg2_videoram_w ) AM_BASE( &dreamwld_bg2_videoram ) + AM_RANGE(0x800000, 0x801fff) AM_READWRITE(SMH_RAM, dreamwld_bg_videoram_w ) AM_BASE( &dreamwld_bg_videoram ) + AM_RANGE(0x802000, 0x803fff) AM_READWRITE(SMH_RAM, dreamwld_bg2_videoram_w ) AM_BASE( &dreamwld_bg2_videoram ) AM_RANGE(0x804000, 0x805fff) AM_RAM AM_BASE( &dreamwld_bg_scroll ) // scroll regs etc. AM_RANGE(0xc00000, 0xc00003) AM_READ(dreamwld_inputs_r) diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c index 778f3ece30b..f73c92cbd74 100644 --- a/src/mame/drivers/drgnmst.c +++ b/src/mame/drivers/drgnmst.c @@ -178,18 +178,18 @@ static ADDRESS_MAP_START( drgnmst_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x80001a, 0x80001b) AM_READ(input_port_2_word_r) AM_RANGE(0x80001c, 0x80001d) AM_READ(input_port_3_word_r) AM_RANGE(0x800030, 0x800031) AM_WRITE(drgnmst_coin_w) - AM_RANGE(0x800100, 0x80011f) AM_WRITE(MWA16_RAM) AM_BASE(&drgnmst_vidregs) + AM_RANGE(0x800100, 0x80011f) AM_WRITE(SMH_RAM) AM_BASE(&drgnmst_vidregs) AM_RANGE(0x800120, 0x800121) AM_WRITENOP AM_RANGE(0x80014a, 0x80014b) AM_WRITENOP - AM_RANGE(0x800154, 0x800155) AM_WRITE(MWA16_RAM) AM_BASE(&drgnmst_vidregs2) // seems to be priority control + AM_RANGE(0x800154, 0x800155) AM_WRITE(SMH_RAM) AM_BASE(&drgnmst_vidregs2) // seems to be priority control AM_RANGE(0x800176, 0x800177) AM_READ(input_port_4_word_r) AM_RANGE(0x800180, 0x800181) AM_WRITE(drgnmst_snd_command_w) AM_RANGE(0x800188, 0x800189) AM_WRITE(drgnmst_snd_flag_w) AM_RANGE(0x8001e0, 0x8001e1) AM_WRITENOP - AM_RANGE(0x900000, 0x903fff) AM_READWRITE(MRA16_RAM, paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x904000, 0x907fff) AM_READWRITE(MRA16_RAM, drgnmst_md_videoram_w) AM_BASE(&drgnmst_md_videoram) - AM_RANGE(0x908000, 0x90bfff) AM_READWRITE(MRA16_RAM, drgnmst_bg_videoram_w) AM_BASE(&drgnmst_bg_videoram) - AM_RANGE(0x90c000, 0x90ffff) AM_READWRITE(MRA16_RAM, drgnmst_fg_videoram_w) AM_BASE(&drgnmst_fg_videoram) + AM_RANGE(0x900000, 0x903fff) AM_READWRITE(SMH_RAM, paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x904000, 0x907fff) AM_READWRITE(SMH_RAM, drgnmst_md_videoram_w) AM_BASE(&drgnmst_md_videoram) + AM_RANGE(0x908000, 0x90bfff) AM_READWRITE(SMH_RAM, drgnmst_bg_videoram_w) AM_BASE(&drgnmst_bg_videoram) + AM_RANGE(0x90c000, 0x90ffff) AM_READWRITE(SMH_RAM, drgnmst_fg_videoram_w) AM_BASE(&drgnmst_fg_videoram) AM_RANGE(0x920000, 0x923fff) AM_RAM AM_BASE(&drgnmst_rowscrollram) // rowscroll ram AM_RANGE(0x930000, 0x9307ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0xff0000, 0xffffff) AM_RAM diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c index 3663c0624e1..2974a7f101a 100644 --- a/src/mame/drivers/dribling.c +++ b/src/mame/drivers/dribling.c @@ -212,17 +212,17 @@ static MACHINE_RESET( dribling ) *************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(dribling_colorram_w) AM_BASE(&colorram) ADDRESS_MAP_END diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c index 07c160bb714..964ae4923ad 100644 --- a/src/mame/drivers/drmicro.c +++ b/src/mame/drivers/drmicro.c @@ -74,17 +74,17 @@ static WRITE8_HANDLER( pcm_set_w ) /****************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_WRITE(drmicro_videoram_w) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) @@ -93,7 +93,7 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r) AM_RANGE(0x03, 0x03) AM_READ(input_port_2_r) AM_RANGE(0x04, 0x04) AM_READ(input_port_3_r) - AM_RANGE(0x05, 0x05) AM_READ(MRA8_NOP) // unused? + AM_RANGE(0x05, 0x05) AM_READ(SMH_NOP) // unused? ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) @@ -103,7 +103,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_WRITE(SN76496_2_w) AM_RANGE(0x03, 0x03) AM_WRITE(pcm_set_w) AM_RANGE(0x04, 0x04) AM_WRITE(nmi_enable_w) - AM_RANGE(0x05, 0x05) AM_WRITE(MWA8_NOP) // watchdog? + AM_RANGE(0x05, 0x05) AM_WRITE(SMH_NOP) // watchdog? ADDRESS_MAP_END /****************************************************************************/ diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index a8a8fe7f358..26a8961c667 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -134,7 +134,7 @@ static ADDRESS_MAP_START( drtomy_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM /* ROM */ AM_RANGE(0x100000, 0x100fff) AM_RAM AM_WRITE(drtomy_vram_fg_w) AM_BASE(&drtomy_videoram_fg) /* Video RAM FG */ AM_RANGE(0x101000, 0x101fff) AM_RAM AM_WRITE(drtomy_vram_bg_w) AM_BASE(&drtomy_videoram_bg) /* Video RAM BG */ - AM_RANGE(0x200000, 0x2007ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) /* Palette */ + AM_RANGE(0x200000, 0x2007ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) /* Palette */ AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(&drtomy_spriteram) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r) /* DIPSW #1 */ AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r) /* DIPSW #2 */ diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index 653b0e492df..18e31dd4c57 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -194,7 +194,7 @@ static DRIVER_INIT( drw80pkr ) *************************/ static ADDRESS_MAP_START( drw80pkr_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READWRITE(MRA8_ROM, MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READWRITE(SMH_ROM, SMH_ROM) 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 e985111a152..7f78f04124d 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -334,7 +334,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( MRA8_BANK1 ) + AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK1 ) ADDRESS_MAP_END // Inputs diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index 6927edddd07..a975eb39736 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -67,7 +67,7 @@ static WRITE8_HANDLER( sound_control_w ) static ADDRESS_MAP_START( dynadice_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x23ff) AM_READWRITE(MRA8_RAM, dynadice_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x2000, 0x23ff) AM_READWRITE(SMH_RAM, dynadice_videoram_w) AM_BASE(&videoram) AM_RANGE(0x4000, 0x40ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) ADDRESS_MAP_END @@ -75,9 +75,9 @@ static ADDRESS_MAP_START( dynadice_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x50, 0x50) AM_READ(input_port_0_r) AM_RANGE(0x51, 0x51) AM_READ(input_port_1_r) AM_RANGE(0x52, 0x52) AM_READ(input_port_2_r) - AM_RANGE(0x62, 0x62) AM_WRITE(MWA8_NOP) + AM_RANGE(0x62, 0x62) AM_WRITE(SMH_NOP) AM_RANGE(0x63, 0x63) AM_WRITE(soundlatch_w) - AM_RANGE(0x70, 0x77) AM_WRITE(MWA8_NOP) + AM_RANGE(0x70, 0x77) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( dynadice_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index 82a4c5d9c24..d62c9c36388 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -459,14 +459,14 @@ 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(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(MRA8_BANK1, hnoridur_palette_w) + AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(SMH_BANK1, 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(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(MRA8_BANK1, hnoridur_palette_w) + AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(SMH_BANK1, hnoridur_palette_w) ADDRESS_MAP_END static ADDRESS_MAP_START( nanajign_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -539,8 +539,8 @@ static ADDRESS_MAP_START( hanamai_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x79, 0x79 ) AM_READWRITE ( YM2203_read_port_0_r, YM2203_write_port_0_w ) // 2 x DSW AM_RANGE( 0x7a, 0x7a ) AM_WRITE ( AY8910_control_port_0_w ) // AY8910 AM_RANGE( 0x7b, 0x7b ) AM_WRITE ( AY8910_write_port_0_w ) // -// AM_RANGE( 0x7c, 0x7c ) AM_WRITE ( MWA8_NOP ) // CRT Controller -// AM_RANGE( 0x7d, 0x7d ) AM_WRITE ( MWA8_NOP ) // +// AM_RANGE( 0x7c, 0x7c ) AM_WRITE ( SMH_NOP ) // CRT Controller +// AM_RANGE( 0x7d, 0x7d ) AM_WRITE ( SMH_NOP ) // AM_RANGE( 0x7e, 0x7e ) AM_WRITE ( dynax_blit_romregion_w ) // Blitter ROM bank ADDRESS_MAP_END @@ -548,8 +548,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hnoridur_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE( 0x01, 0x07 ) AM_WRITE ( dynax_blitter_rev2_w ) // Blitter -// AM_RANGE( 0x10, 0x10 ) AM_WRITE ( MWA8_NOP ) // CRT Controller -// AM_RANGE( 0x11, 0x11 ) AM_WRITE ( MWA8_NOP ) // CRT Controller +// AM_RANGE( 0x10, 0x10 ) AM_WRITE ( SMH_NOP ) // CRT Controller +// AM_RANGE( 0x11, 0x11 ) AM_WRITE ( SMH_NOP ) // CRT Controller AM_RANGE( 0x20, 0x20 ) AM_WRITE ( hanamai_keyboard_w ) // keyboard row select AM_RANGE( 0x21, 0x21 ) AM_READ ( input_port_2_r ) // Coins AM_RANGE( 0x22, 0x22 ) AM_READ ( hanamai_keyboard_1_r ) // P2 @@ -575,7 +575,7 @@ static ADDRESS_MAP_START( hnoridur_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x50, 0x50 ) AM_WRITE ( dynax_extra_scrollx_w ) // screen scroll X AM_RANGE( 0x51, 0x51 ) AM_WRITE ( dynax_extra_scrolly_w ) // screen scroll Y AM_RANGE( 0x54, 0x54 ) AM_WRITE ( hnoridur_rombank_w ) // BANK ROM Select - AM_RANGE( 0x55, 0x55 ) AM_WRITE ( MWA8_NOP ) // ? VBlank IRQ Ack + AM_RANGE( 0x55, 0x55 ) AM_WRITE ( SMH_NOP ) // ? VBlank IRQ Ack AM_RANGE( 0x56, 0x56 ) AM_WRITE ( dynax_vblank_ack_w ) // VBlank IRQ Ack AM_RANGE( 0x57, 0x57 ) AM_READ ( ret_ff ) // ? AM_RANGE( 0x60, 0x60 ) AM_WRITE ( dynax_flipscreen_w ) // Flip Screen @@ -709,8 +709,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mcnpshnt_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE( 0x01, 0x07 ) AM_WRITE ( dynax_blitter_rev2_w ) // Blitter -// AM_RANGE( 0x10, 0x10 ) AM_WRITE ( MWA8_NOP ) // CRT Controller -// AM_RANGE( 0x11, 0x11 ) AM_WRITE ( MWA8_NOP ) // CRT Controller +// AM_RANGE( 0x10, 0x10 ) AM_WRITE ( SMH_NOP ) // CRT Controller +// AM_RANGE( 0x11, 0x11 ) AM_WRITE ( SMH_NOP ) // CRT Controller AM_RANGE( 0x20, 0x20 ) AM_WRITE ( hanamai_keyboard_w ) // keyboard row select AM_RANGE( 0x21, 0x21 ) AM_READ ( input_port_2_r ) // Coins AM_RANGE( 0x22, 0x22 ) AM_READ ( hanamai_keyboard_1_r ) // P2 @@ -750,8 +750,8 @@ static ADDRESS_MAP_START( sprtmtch_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x01, 0x07 ) AM_WRITE ( dynax_blitter_rev2_w ) // Blitter AM_RANGE( 0x10, 0x10 ) AM_READWRITE ( YM2203_status_port_0_r, YM2203_control_port_0_w ) // YM2203 AM_RANGE( 0x11, 0x11 ) AM_READWRITE ( YM2203_read_port_0_r, YM2203_write_port_0_w ) // 2 x DSW -// AM_RANGE( 0x12, 0x12 ) AM_WRITE ( MWA8_NOP ) // CRT Controller -// AM_RANGE( 0x13, 0x13 ) AM_WRITE ( MWA8_NOP ) // CRT Controller +// AM_RANGE( 0x12, 0x12 ) AM_WRITE ( SMH_NOP ) // CRT Controller +// AM_RANGE( 0x13, 0x13 ) AM_WRITE ( SMH_NOP ) // CRT Controller AM_RANGE( 0x20, 0x20 ) AM_READ ( input_port_0_r ) // P1 AM_RANGE( 0x21, 0x21 ) AM_READ ( input_port_1_r ) // P2 AM_RANGE( 0x22, 0x22 ) AM_READ ( input_port_2_r ) // Coins @@ -787,8 +787,8 @@ static ADDRESS_MAP_START( mjfriday_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x15, 0x15 ) AM_WRITE ( dynax_coincounter_1_w ) // AM_RANGE( 0x16, 0x17 ) AM_WRITE ( mjdialq2_layer_enable_w ) // Layers Enable AM_RANGE( 0x41, 0x47 ) AM_WRITE ( dynax_blitter_rev2_w ) // Blitter -// AM_RANGE( 0x50, 0x50 ) AM_WRITE ( MWA8_NOP ) // CRT Controller -// AM_RANGE( 0x51, 0x51 ) AM_WRITE ( MWA8_NOP ) // CRT Controller +// AM_RANGE( 0x50, 0x50 ) AM_WRITE ( SMH_NOP ) // CRT Controller +// AM_RANGE( 0x51, 0x51 ) AM_WRITE ( SMH_NOP ) // CRT Controller AM_RANGE( 0x60, 0x60 ) AM_WRITE ( hanamai_keyboard_w ) // keyboard row select AM_RANGE( 0x61, 0x61 ) AM_READ ( input_port_2_r ) // Coins AM_RANGE( 0x62, 0x62 ) AM_READ ( hanamai_keyboard_1_r ) // P2 @@ -797,7 +797,7 @@ static ADDRESS_MAP_START( mjfriday_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x67, 0x67 ) AM_READ ( input_port_1_r ) // DSW AM_RANGE( 0x70, 0x70 ) AM_WRITE ( YM2413_register_port_0_w ) // YM2413 AM_RANGE( 0x71, 0x71 ) AM_WRITE ( YM2413_data_port_0_w ) // -// AM_RANGE( 0x80, 0x80 ) AM_WRITE ( MWA8_NOP ) // IRQ ack? +// AM_RANGE( 0x80, 0x80 ) AM_WRITE ( SMH_NOP ) // IRQ ack? ADDRESS_MAP_END @@ -816,7 +816,7 @@ static ADDRESS_MAP_START( nanajign_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x14, 0x14 ) AM_READ ( input_port_0_r ) // DSW1 AM_RANGE( 0x15, 0x15 ) AM_READ ( input_port_1_r ) // DSW2 AM_RANGE( 0x16, 0x16 ) AM_READ ( input_port_13_r ) // DSW3 -// AM_RANGE( 0x20, 0x21 ) AM_WRITE ( MWA8_NOP ) // CRT Controller +// AM_RANGE( 0x20, 0x21 ) AM_WRITE ( SMH_NOP ) // CRT Controller AM_RANGE( 0x31, 0x37 ) AM_WRITE ( dynax_blitter_rev2_w ) // Blitter AM_RANGE( 0x40, 0x40 ) AM_WRITE ( dynax_coincounter_0_w ) // Coin Counter AM_RANGE( 0x50, 0x50 ) AM_WRITE ( dynax_flipscreen_w ) // Flip Screen @@ -877,7 +877,7 @@ static WRITE8_HANDLER( jantouki_rombank_w ) static ADDRESS_MAP_START( jantouki_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) -// AM_RANGE( 0x40, 0x41 ) AM_WRITE ( MWA8_NOP ) // CRT Controller +// AM_RANGE( 0x40, 0x41 ) AM_WRITE ( SMH_NOP ) // CRT Controller AM_RANGE( 0x48, 0x48 ) AM_WRITE ( jantouki_rombank_w ) // BANK ROM Select AM_RANGE( 0x49, 0x49 ) AM_WRITE ( jantouki_soundlatch_w ) // To Sound CPU AM_RANGE( 0x4a, 0x4a ) AM_READ ( jantouki_soundlatch_ack_r ) // Soundlatch status @@ -978,8 +978,8 @@ static ADDRESS_MAP_START( mjelctrn_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE( 0x08, 0x08 ) AM_WRITE ( AY8910_write_port_0_w ) // AY8910 AM_RANGE( 0x0a, 0x0a ) AM_WRITE ( AY8910_control_port_0_w ) // AM_RANGE( 0x11, 0x12 ) AM_WRITE ( mjelctrn_blitter_ack_w ) //? -// AM_RANGE( 0x20, 0x20 ) AM_WRITE ( MWA8_NOP ) // CRT Controller -// AM_RANGE( 0x21, 0x21 ) AM_WRITE ( MWA8_NOP ) // CRT Controller +// AM_RANGE( 0x20, 0x20 ) AM_WRITE ( SMH_NOP ) // CRT Controller +// AM_RANGE( 0x21, 0x21 ) AM_WRITE ( SMH_NOP ) // CRT Controller AM_RANGE( 0x40, 0x40 ) AM_WRITE ( dynax_coincounter_0_w ) // Coin Counters AM_RANGE( 0x41, 0x41 ) AM_WRITE ( dynax_coincounter_1_w ) // AM_RANGE( 0x60, 0x60 ) AM_WRITE ( dynax_extra_scrollx_w ) // screen scroll X @@ -1403,7 +1403,7 @@ static ADDRESS_MAP_START( tenkai_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x10068, 0x10068 ) AM_WRITE( yarunara_layer_half2_w ) // AM_RANGE( 0x1006c, 0x1006c ) AM_WRITE( tenkai_6c_w ) // ? AM_RANGE( 0x10070, 0x10070 ) AM_WRITE( tenkai_70_w ) // ? - AM_RANGE( 0x1007c, 0x1007c ) AM_WRITE( MWA8_NOP ) // IRQ Ack? (0,2) + AM_RANGE( 0x1007c, 0x1007c ) AM_WRITE( SMH_NOP ) // IRQ Ack? (0,2) AM_RANGE( 0x100c0, 0x100c0 ) AM_WRITE( tenkai_ipsel_w ) AM_RANGE( 0x100c1, 0x100c1 ) AM_WRITE( tenkai_ip_w ) AM_RANGE( 0x100c2, 0x100c3 ) AM_READ ( tenkai_ip_r ) diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 023e4d4471c..19273838bd5 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -189,18 +189,18 @@ static WRITE8_HANDLER( egghunt_okibanking_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) AM_RANGE(0xd000, 0xdfff) AM_READ(egghunt_bgram_r) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE(&paletteram) AM_RANGE(0xc800, 0xcfff) AM_WRITE(egghunt_atram_w) AM_BASE(&egghunt_atram) AM_RANGE(0xd000, 0xdfff) AM_WRITE(egghunt_bgram_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) @@ -224,17 +224,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) AM_RANGE(0xe004, 0xe004) AM_READ(OKIM6295_status_0_r) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xe001, 0xe001) AM_READWRITE(egghunt_okibanking_r, egghunt_okibanking_w) AM_RANGE(0xe004, 0xe004) AM_WRITE(OKIM6295_data_0_w) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c index b228a841558..b0a30c3dcbd 100644 --- a/src/mame/drivers/embargo.c +++ b/src/mame/drivers/embargo.c @@ -170,7 +170,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_0_r, port_1_w) AM_RANGE(0x02, 0x02) AM_READWRITE(dial_r, port_2_w) - AM_RANGE(0x03, 0x03) AM_WRITE(MWA8_NOP) /* always 0xFE */ + AM_RANGE(0x03, 0x03) AM_WRITE(SMH_NOP) /* always 0xFE */ AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(input_port_2_r) AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READWRITE(input_port_bit_r, input_select_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index 1e1ce066b73..f0fd8aba8e8 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -406,13 +406,13 @@ static ADDRESS_MAP_START( engima2_main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_WRITENOP AM_RANGE(0x2000, 0x3fff) AM_MIRROR(0x4000) AM_RAM AM_BASE(&enigma2_ram) AM_RANGE(0x4000, 0x4fff) AM_ROM AM_WRITENOP - AM_RANGE(0x5000, 0x57ff) AM_READWRITE(dip_switch_r, MWA8_NOP) + AM_RANGE(0x5000, 0x57ff) AM_READWRITE(dip_switch_r, SMH_NOP) AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x07f8) AM_NOP - AM_RANGE(0x5801, 0x5801) AM_MIRROR(0x07f8) AM_READWRITE(input_port_0_r, MWA8_NOP) - AM_RANGE(0x5802, 0x5802) AM_MIRROR(0x07f8) AM_READWRITE(input_port_1_r, MWA8_NOP) - AM_RANGE(0x5803, 0x5803) AM_MIRROR(0x07f8) AM_READWRITE(MRA8_NOP, sound_data_w) + AM_RANGE(0x5801, 0x5801) AM_MIRROR(0x07f8) AM_READWRITE(input_port_0_r, SMH_NOP) + AM_RANGE(0x5802, 0x5802) AM_MIRROR(0x07f8) AM_READWRITE(input_port_1_r, SMH_NOP) + AM_RANGE(0x5803, 0x5803) AM_MIRROR(0x07f8) AM_READWRITE(SMH_NOP, sound_data_w) AM_RANGE(0x5804, 0x5804) AM_MIRROR(0x07f8) AM_NOP - AM_RANGE(0x5805, 0x5805) AM_MIRROR(0x07f8) AM_READWRITE(MRA8_NOP, enigma2_flip_screen_w) + AM_RANGE(0x5805, 0x5805) AM_MIRROR(0x07f8) AM_READWRITE(SMH_NOP, enigma2_flip_screen_w) AM_RANGE(0x5806, 0x5807) AM_MIRROR(0x07f8) AM_NOP ADDRESS_MAP_END @@ -421,7 +421,7 @@ static ADDRESS_MAP_START( engima2a_main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_WRITENOP AM_RANGE(0x2000, 0x3fff) AM_MIRROR(0x4000) AM_RAM AM_BASE(&enigma2_ram) AM_RANGE(0x4000, 0x4fff) AM_ROM AM_WRITENOP - AM_RANGE(0x5000, 0x57ff) AM_READWRITE(dip_switch_r, MWA8_NOP) + AM_RANGE(0x5000, 0x57ff) AM_READWRITE(dip_switch_r, SMH_NOP) AM_RANGE(0x5800, 0x5fff) AM_NOP ADDRESS_MAP_END @@ -429,11 +429,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( engima2a_main_cpu_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7) AM_RANGE(0x00, 0x00) AM_NOP - AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_0_r, MWA8_NOP) - AM_RANGE(0x02, 0x02) AM_READWRITE(input_port_1_r, MWA8_NOP) - AM_RANGE(0x03, 0x03) AM_READWRITE(MRA8_NOP, sound_data_w) + AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_0_r, SMH_NOP) + AM_RANGE(0x02, 0x02) AM_READWRITE(input_port_1_r, SMH_NOP) + AM_RANGE(0x03, 0x03) AM_READWRITE(SMH_NOP, sound_data_w) AM_RANGE(0x04, 0x04) AM_NOP - AM_RANGE(0x05, 0x05) AM_READWRITE(MRA8_NOP, enigma2_flip_screen_w) + AM_RANGE(0x05, 0x05) AM_READWRITE(SMH_NOP, enigma2_flip_screen_w) AM_RANGE(0x06, 0x07) AM_NOP ADDRESS_MAP_END diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c index 496cf6f6c97..3c5e6528bfb 100644 --- a/src/mame/drivers/epos.c +++ b/src/mame/drivers/epos.c @@ -60,27 +60,27 @@ static WRITE8_HANDLER( dealer_decrypt_rom ) *************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( dealer_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x6fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x7000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x6fff) AM_READ(SMH_BANK1) + AM_RANGE(0x7000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( dealer_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x6fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x0000, 0x6fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END /************************************* diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c index 8f385316643..044c4dd9b19 100644 --- a/src/mame/drivers/eprom.c +++ b/src/mame/drivers/eprom.c @@ -177,7 +177,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x360010, 0x360011) AM_WRITE(eprom_latch_w) AM_RANGE(0x360020, 0x360021) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0x360030, 0x360031) AM_WRITE(atarigen_sound_w) - AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(MRA16_RAM, paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(SMH_RAM, paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x3f0000, 0x3f1fff) AM_WRITE(atarigen_playfield_w) AM_BASE(&atarigen_playfield) AM_RANGE(0x3f2000, 0x3f3fff) AM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3f4000, 0x3f4f7f) AM_WRITE(atarigen_alpha_w) AM_BASE(&atarigen_alpha) @@ -202,7 +202,7 @@ static ADDRESS_MAP_START( guts_map, ADDRESS_SPACE_PROGRAM, 16 ) // AM_RANGE(0x360010, 0x360011) AM_WRITE(eprom_latch_w) AM_RANGE(0x360020, 0x360021) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0x360030, 0x360031) AM_WRITE(atarigen_sound_w) - AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(MRA16_RAM, paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(SMH_RAM, paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xff0000, 0xff1fff) AM_WRITE(atarigen_playfield_upper_w) AM_BASE(&atarigen_playfield_upper) AM_RANGE(0xff8000, 0xff9fff) AM_WRITE(atarigen_playfield_w) AM_BASE(&atarigen_playfield) AM_RANGE(0xffa000, 0xffbfff) AM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index 0dadc4cefbe..33bb478b394 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -162,17 +162,17 @@ static ADDRESS_MAP_START( equites_s_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc080, 0xc08d) AM_WRITE(equites_5232_w) AM_RANGE(0xc0a0, 0xc0a0) AM_WRITE(equites_8910data_w) AM_RANGE(0xc0a1, 0xc0a1) AM_WRITE(equites_8910control_w) - AM_RANGE(0xc0b0, 0xc0b0) AM_WRITE(MWA8_NOP) // INTR: sync with main melody - AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(MWA8_NOP) // INTR: sync with specific beats + AM_RANGE(0xc0b0, 0xc0b0) AM_WRITE(SMH_NOP) // INTR: sync with main melody + AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(SMH_NOP) // INTR: sync with specific beats AM_RANGE(0xc0d0, 0xc0d0) AM_WRITE(equites_dac0_w) AM_RANGE(0xc0e0, 0xc0e0) AM_WRITE(equites_dac1_w) - AM_RANGE(0xc0f8, 0xc0fe) AM_WRITE(MWA8_NOP) // soundboard I/O, ignored + AM_RANGE(0xc0f8, 0xc0fe) AM_WRITE(SMH_NOP) // soundboard I/O, ignored AM_RANGE(0xc0ff, 0xc0ff) AM_WRITE(soundlatch_clear_w) AM_RANGE(0xe000, 0xe0ff) AM_RAM ADDRESS_MAP_END static ADDRESS_MAP_START( equites_s_portmap, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00e0, 0x00e5) AM_WRITE(MWA8_NOP) // soundboard I/O, ignored + AM_RANGE(0x00e0, 0x00e5) AM_WRITE(SMH_NOP) // soundboard I/O, ignored ADDRESS_MAP_END static MACHINE_DRIVER_START( equites_sound ) @@ -331,20 +331,20 @@ static WRITE16_HANDLER(log16_w) static ADDRESS_MAP_START( equites_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_WRITENOP // ROM area is written several times (dev system?) AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE(&equites_workram) - AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, equites_charram_w) AM_BASE(&videoram16) + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(SMH_RAM, equites_charram_w) AM_BASE(&videoram16) AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM AM_BASE(&spriteram16_2) - AM_RANGE(0x100000, 0x100fff) AM_READWRITE(equites_spriteram_r, MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x140000, 0x1407ff) AM_READWRITE(equites_8404_r, MWA16_RAM) AM_BASE(&equites_8404ram) + AM_RANGE(0x100000, 0x100fff) AM_READWRITE(equites_spriteram_r, SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x140000, 0x1407ff) AM_READWRITE(equites_8404_r, SMH_RAM) AM_BASE(&equites_8404ram) AM_RANGE(0x180000, 0x180001) AM_READWRITE(input_port_1_word_r, soundlatch_word_w) // LSB: sound latch AM_RANGE(0x184000, 0x184001) AM_WRITE(equites_flip0_w) // [MMLL] MM: normal screen, LL: use joystick 1 only - AM_RANGE(0x188000, 0x188001) AM_WRITE(MWA16_NOP) // 8404 control port1 - AM_RANGE(0x18c000, 0x18c001) AM_WRITE(MWA16_NOP) // 8404 control port2 + AM_RANGE(0x188000, 0x188001) AM_WRITE(SMH_NOP) // 8404 control port1 + AM_RANGE(0x18c000, 0x18c001) AM_WRITE(SMH_NOP) // 8404 control port2 AM_RANGE(0x1a4000, 0x1a4001) AM_WRITE(equites_flip1_w) // [MMLL] MM: flip screen, LL: use both joysticks - AM_RANGE(0x1a8000, 0x1a8001) AM_WRITE(MWA16_NOP) // 8404 control port3 - AM_RANGE(0x1ac000, 0x1ac001) AM_WRITE(MWA16_NOP) // 8404 control port4 + AM_RANGE(0x1a8000, 0x1a8001) AM_WRITE(SMH_NOP) // 8404 control port3 + AM_RANGE(0x1ac000, 0x1ac001) AM_WRITE(SMH_NOP) // 8404 control port4 AM_RANGE(0x1c0000, 0x1c0001) AM_READWRITE(equites_joyport_r, equites_scrollreg_w) // scroll register[XXYY] AM_RANGE(0x380000, 0x380001) AM_WRITE(equites_bgcolor_w) // bg color register[CC--] - AM_RANGE(0x780000, 0x780001) AM_WRITE(MWA16_NOP) // watchdog + AM_RANGE(0x780000, 0x780001) AM_WRITE(SMH_NOP) // watchdog ADDRESS_MAP_END // Splendor Blast Hardware @@ -353,20 +353,20 @@ static ADDRESS_MAP_START( splndrbt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE(&equites_workram) // work RAM AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) // joyport [2211] AM_RANGE(0x0c0000, 0x0c0001) AM_READWRITE(input_port_1_word_r, splndrbt_flip0_w) // [MMLL] MM: bg color register, LL: normal screen - AM_RANGE(0x0c4000, 0x0c4001) AM_WRITE(MWA16_NOP) // 8404 control port1 - AM_RANGE(0x0c8000, 0x0c8001) AM_WRITE(MWA16_NOP) // 8404 control port2 + AM_RANGE(0x0c4000, 0x0c4001) AM_WRITE(SMH_NOP) // 8404 control port1 + AM_RANGE(0x0c8000, 0x0c8001) AM_WRITE(SMH_NOP) // 8404 control port2 AM_RANGE(0x0cc000, 0x0cc001) AM_WRITE(splndrbt_selchar0_w) // select active char map AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE(splndrbt_flip1_w) // [MMLL] MM: not used, LL: flip screen - AM_RANGE(0x0e4000, 0x0e4001) AM_WRITE(MWA16_NOP) // 8404 control port3 - AM_RANGE(0x0e8000, 0x0e8001) AM_WRITE(MWA16_NOP) // 8404 control port4 + AM_RANGE(0x0e4000, 0x0e4001) AM_WRITE(SMH_NOP) // 8404 control port3 + AM_RANGE(0x0e8000, 0x0e8001) AM_WRITE(SMH_NOP) // 8404 control port4 AM_RANGE(0x0ec000, 0x0ec001) AM_WRITE(splndrbt_selchar1_w) // select active char map AM_RANGE(0x100000, 0x100001) AM_RAM AM_BASE(&splndrbt_scrollx) // scrollx AM_RANGE(0x140000, 0x140001) AM_WRITE(soundlatch_word_w) // LSB: sound command AM_RANGE(0x1c0000, 0x1c0001) AM_RAM AM_BASE(&splndrbt_scrolly) // scrolly - AM_RANGE(0x180000, 0x1807ff) AM_READWRITE(equites_8404_r, MWA16_RAM) AM_BASE(&equites_8404ram) // 8404 RAM - AM_RANGE(0x200000, 0x200fff) AM_READWRITE(MRA16_RAM, splndrbt_charram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) // char RAM page 0 + AM_RANGE(0x180000, 0x1807ff) AM_READWRITE(equites_8404_r, SMH_RAM) AM_BASE(&equites_8404ram) // 8404 RAM + AM_RANGE(0x200000, 0x200fff) AM_READWRITE(SMH_RAM, splndrbt_charram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) // char RAM page 0 AM_RANGE(0x201000, 0x201fff) AM_READWRITE(splndrbt_bankedchar_r, splndrbt_bankedchar_w) // banked char RAM page 1,2 - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, splndrbt_scrollram_w) AM_BASE(&spriteram16_2) // scroll RAM 0,1 + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, splndrbt_scrollram_w) AM_BASE(&spriteram16_2) // scroll RAM 0,1 AM_RANGE(0x600000, 0x6001ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // sprite RAM 0,1,2 ADDRESS_MAP_END diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index ea22bb9ec52..f9d887e8bcc 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -83,37 +83,37 @@ static WRITE16_HANDLER( esd16_sound_command_w ) */ static ADDRESS_MAP_START( multchmp_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x200000, 0x2005ff) AM_READ(MRA16_RAM ) // Palette -/**/AM_RANGE(0x300000, 0x3007ff) AM_READ(MRA16_RAM ) // Sprites -/**/AM_RANGE(0x400000, 0x403fff) AM_READ(MRA16_RAM ) // Layers -/**/AM_RANGE(0x420000, 0x423fff) AM_READ(MRA16_RAM ) // -/**/AM_RANGE(0x500000, 0x500003) AM_READ(MRA16_RAM ) // Scroll -/**/AM_RANGE(0x500004, 0x500007) AM_READ(MRA16_RAM ) // -/**/AM_RANGE(0x500008, 0x50000b) AM_READ(MRA16_RAM ) // -/**/AM_RANGE(0x50000c, 0x50000f) AM_READ(MRA16_RAM ) // + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x200000, 0x2005ff) AM_READ(SMH_RAM ) // Palette +/**/AM_RANGE(0x300000, 0x3007ff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0x400000, 0x403fff) AM_READ(SMH_RAM ) // Layers +/**/AM_RANGE(0x420000, 0x423fff) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x500000, 0x500003) AM_READ(SMH_RAM ) // Scroll +/**/AM_RANGE(0x500004, 0x500007) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x500008, 0x50000b) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x50000c, 0x50000f) AM_READ(SMH_RAM ) // AM_RANGE(0x600002, 0x600003) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x600004, 0x600005) AM_READ(input_port_1_word_r ) // AM_RANGE(0x600006, 0x600007) AM_READ(input_port_2_word_r ) // - AM_RANGE(0x700008, 0x70000b) AM_READ(MRA16_NOP ) // ? Only read once + AM_RANGE(0x700008, 0x70000b) AM_READ(SMH_NOP ) // ? Only read once ADDRESS_MAP_END static ADDRESS_MAP_START( multchmp_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x200000, 0x2005ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x300000, 0x3007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x300000, 0x3007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x300800, 0x300807) AM_WRITE(esd16_spriteram_w ) // Sprites (Mirrored) AM_RANGE(0x400000, 0x403fff) AM_WRITE(esd16_vram_0_w) AM_BASE(&esd16_vram_0 ) // Layers AM_RANGE(0x420000, 0x423fff) AM_WRITE(esd16_vram_1_w) AM_BASE(&esd16_vram_1 ) // Scroll - AM_RANGE(0x500000, 0x500003) AM_WRITE(MWA16_RAM) AM_BASE(&esd16_scroll_0 ) // - AM_RANGE(0x500004, 0x500007) AM_WRITE(MWA16_RAM) AM_BASE(&esd16_scroll_1 ) // - AM_RANGE(0x500008, 0x50000b) AM_WRITE(MWA16_RAM ) // ? 0 - AM_RANGE(0x50000c, 0x50000f) AM_WRITE(MWA16_RAM ) // ? 0 - AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_NOP ) // IRQ Ack + AM_RANGE(0x500000, 0x500003) AM_WRITE(SMH_RAM) AM_BASE(&esd16_scroll_0 ) // + AM_RANGE(0x500004, 0x500007) AM_WRITE(SMH_RAM) AM_BASE(&esd16_scroll_1 ) // + AM_RANGE(0x500008, 0x50000b) AM_WRITE(SMH_RAM ) // ? 0 + AM_RANGE(0x50000c, 0x50000f) AM_WRITE(SMH_RAM ) // ? 0 + AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_NOP ) // IRQ Ack AM_RANGE(0x600008, 0x600009) AM_WRITE(esd16_tilemap0_color_w ) // Flip Screen + Tileamp0 palette banking - AM_RANGE(0x60000a, 0x60000b) AM_WRITE(MWA16_NOP ) // ? 2 + AM_RANGE(0x60000a, 0x60000b) AM_WRITE(SMH_NOP ) // ? 2 AM_RANGE(0x60000c, 0x60000d) AM_WRITE(esd16_sound_command_w ) // To Sound CPU ADDRESS_MAP_END @@ -156,32 +156,32 @@ static WRITE16_HANDLER( esd_eeprom_w ) } static ADDRESS_MAP_START( hedpanic_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x800000, 0x800fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x800000, 0x800fff) AM_READ(SMH_RAM) AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_1_word_r ) // AM_RANGE(0xc00006, 0xc00007) AM_READ(esd_eeprom_r ) ADDRESS_MAP_END static ADDRESS_MAP_START( hedpanic_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x800000, 0x800fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x900000, 0x9007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x900000, 0x9007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x900800, 0x900807) AM_WRITE(esd16_spriteram_w ) // Sprites (Mirrored) AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(esd16_vram_0_w) AM_BASE(&esd16_vram_0 ) // Layers AM_RANGE(0xa20000, 0xa23fff) AM_WRITE(esd16_vram_1_w) AM_BASE(&esd16_vram_1 ) // AM_RANGE(0xa24000, 0xa27fff) AM_WRITE(esd16_vram_1_w) AM_BASE(&esd16_vram_1 ) // mirror? - AM_RANGE(0xb00000, 0xb00003) AM_WRITE(MWA16_RAM) AM_BASE(&esd16_scroll_0 ) // Scroll - AM_RANGE(0xb00004, 0xb00007) AM_WRITE(MWA16_RAM) AM_BASE(&esd16_scroll_1 ) // - AM_RANGE(0xb00008, 0xb00009) AM_WRITE(MWA16_RAM) AM_BASE(&headpanic_platform_x) - AM_RANGE(0xb0000a, 0xb0000b) AM_WRITE(MWA16_RAM) AM_BASE(&headpanic_platform_y) - AM_RANGE(0xb0000c, 0xb0000d) AM_WRITE(MWA16_NOP) // ?? - AM_RANGE(0xb0000e, 0xb0000f) AM_WRITE(MWA16_RAM) AM_BASE(&head_layersize) // ?? - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_NOP) // IRQ Ack + AM_RANGE(0xb00000, 0xb00003) AM_WRITE(SMH_RAM) AM_BASE(&esd16_scroll_0 ) // Scroll + AM_RANGE(0xb00004, 0xb00007) AM_WRITE(SMH_RAM) AM_BASE(&esd16_scroll_1 ) // + AM_RANGE(0xb00008, 0xb00009) AM_WRITE(SMH_RAM) AM_BASE(&headpanic_platform_x) + AM_RANGE(0xb0000a, 0xb0000b) AM_WRITE(SMH_RAM) AM_BASE(&headpanic_platform_y) + AM_RANGE(0xb0000c, 0xb0000d) AM_WRITE(SMH_NOP) // ?? + AM_RANGE(0xb0000e, 0xb0000f) AM_WRITE(SMH_RAM) AM_BASE(&head_layersize) // ?? + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_NOP) // IRQ Ack AM_RANGE(0xc00008, 0xc00009) AM_WRITE(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking - AM_RANGE(0xc0000a, 0xc0000b) AM_WRITE(MWA16_NOP) // ? 2 not checked + AM_RANGE(0xc0000a, 0xc0000b) AM_WRITE(SMH_NOP) // ? 2 not checked AM_RANGE(0xc0000c, 0xc0000d) AM_WRITE(esd16_sound_command_w ) // To Sound CPU // ok AM_RANGE(0xc0000e, 0xc0000f) AM_WRITE(esd_eeprom_w) AM_RANGE(0xd00008, 0xd00009) AM_WRITE(hedpanic_platform_w) @@ -190,69 +190,69 @@ ADDRESS_MAP_END /* Multi Champ Deluxe, like Head Panic but different addresses */ static ADDRESS_MAP_START( mchampdx_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x400000, 0x400fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) + AM_RANGE(0x400000, 0x400fff) AM_READ(SMH_RAM) AM_RANGE(0x500002, 0x500003) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x500004, 0x500005) AM_READ(input_port_1_word_r ) // AM_RANGE(0x500006, 0x500007) AM_READ(esd_eeprom_r ) ADDRESS_MAP_END static ADDRESS_MAP_START( mchampdx_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x303fff) AM_WRITE(esd16_vram_0_w) AM_BASE(&esd16_vram_0 ) // Layers AM_RANGE(0x320000, 0x323fff) AM_WRITE(esd16_vram_1_w) AM_BASE(&esd16_vram_1 ) // AM_RANGE(0x324000, 0x327fff) AM_WRITE(esd16_vram_1_w) AM_BASE(&esd16_vram_1 ) // mirror? AM_RANGE(0x400000, 0x400fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP) // IRQ Ack + AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP) // IRQ Ack AM_RANGE(0x500008, 0x500009) AM_WRITE(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking - AM_RANGE(0x50000a, 0x50000b) AM_WRITE(MWA16_NOP) // ? 2 not checked + AM_RANGE(0x50000a, 0x50000b) AM_WRITE(SMH_NOP) // ? 2 not checked AM_RANGE(0x50000c, 0x50000d) AM_WRITE(esd16_sound_command_w ) // To Sound CPU // ok AM_RANGE(0x50000e, 0x50000f) AM_WRITE(esd_eeprom_w) - AM_RANGE(0x600000, 0x6007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x600000, 0x6007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x600800, 0x600807) AM_WRITE(esd16_spriteram_w ) // Sprites (Mirrored) - AM_RANGE(0x700000, 0x700003) AM_WRITE(MWA16_RAM) AM_BASE(&esd16_scroll_0 ) // Scroll - AM_RANGE(0x700004, 0x700007) AM_WRITE(MWA16_RAM) AM_BASE(&esd16_scroll_1 ) // - AM_RANGE(0x700008, 0x700009) AM_WRITE(MWA16_RAM) AM_BASE(&headpanic_platform_x) // not used in mchampdx? - AM_RANGE(0x70000a, 0x70000b) AM_WRITE(MWA16_RAM) AM_BASE(&headpanic_platform_y) // not used in mchampdx? - AM_RANGE(0x70000c, 0x70000d) AM_WRITE(MWA16_NOP) // ?? - AM_RANGE(0x70000e, 0x70000f) AM_WRITE(MWA16_RAM) AM_BASE(&head_layersize) // ?? + AM_RANGE(0x700000, 0x700003) AM_WRITE(SMH_RAM) AM_BASE(&esd16_scroll_0 ) // Scroll + AM_RANGE(0x700004, 0x700007) AM_WRITE(SMH_RAM) AM_BASE(&esd16_scroll_1 ) // + AM_RANGE(0x700008, 0x700009) AM_WRITE(SMH_RAM) AM_BASE(&headpanic_platform_x) // not used in mchampdx? + AM_RANGE(0x70000a, 0x70000b) AM_WRITE(SMH_RAM) AM_BASE(&headpanic_platform_y) // not used in mchampdx? + AM_RANGE(0x70000c, 0x70000d) AM_WRITE(SMH_NOP) // ?? + AM_RANGE(0x70000e, 0x70000f) AM_WRITE(SMH_RAM) AM_BASE(&head_layersize) // ?? AM_RANGE(0xd00008, 0xd00009) AM_WRITE(hedpanic_platform_w) // not used in mchampdx? ADDRESS_MAP_END /* Tang Tang - like the others but again with different addresses */ static ADDRESS_MAP_START( tangtang_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) AM_RANGE(0x500002, 0x500003) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x500004, 0x500005) AM_READ(input_port_1_word_r ) // AM_RANGE(0x500006, 0x500007) AM_READ(esd_eeprom_r ) - AM_RANGE(0x700000, 0x70ffff) AM_READ(MRA16_RAM) // main ram + AM_RANGE(0x700000, 0x70ffff) AM_READ(SMH_RAM) // main ram ADDRESS_MAP_END static ADDRESS_MAP_START( tangtang_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x100fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x200000, 0x2007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x200000, 0x2007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x200800, 0x200807) AM_WRITE(esd16_spriteram_w ) // Sprites (Mirrored) AM_RANGE(0x300000, 0x303fff) AM_WRITE(esd16_vram_0_w) AM_BASE(&esd16_vram_0 ) // Layers AM_RANGE(0x320000, 0x323fff) AM_WRITE(esd16_vram_1_w) AM_BASE(&esd16_vram_1 ) // AM_RANGE(0x324000, 0x327fff) AM_WRITE(esd16_vram_1_w) AM_BASE(&esd16_vram_1 ) // mirror? - AM_RANGE(0x400000, 0x400003) AM_WRITE(MWA16_RAM) AM_BASE(&esd16_scroll_0 ) // Scroll - AM_RANGE(0x400004, 0x400007) AM_WRITE(MWA16_RAM) AM_BASE(&esd16_scroll_1 ) // - AM_RANGE(0x400008, 0x400009) AM_WRITE(MWA16_RAM) AM_BASE(&headpanic_platform_x) // not used in mchampdx? - AM_RANGE(0x40000a, 0x40000b) AM_WRITE(MWA16_RAM) AM_BASE(&headpanic_platform_y) // not used in mchampdx? - AM_RANGE(0x40000c, 0x40000d) AM_WRITE(MWA16_NOP) // ?? - AM_RANGE(0x40000e, 0x40000f) AM_WRITE(MWA16_RAM) AM_BASE(&head_layersize) // ?? - AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP) // IRQ Ack + AM_RANGE(0x400000, 0x400003) AM_WRITE(SMH_RAM) AM_BASE(&esd16_scroll_0 ) // Scroll + AM_RANGE(0x400004, 0x400007) AM_WRITE(SMH_RAM) AM_BASE(&esd16_scroll_1 ) // + AM_RANGE(0x400008, 0x400009) AM_WRITE(SMH_RAM) AM_BASE(&headpanic_platform_x) // not used in mchampdx? + AM_RANGE(0x40000a, 0x40000b) AM_WRITE(SMH_RAM) AM_BASE(&headpanic_platform_y) // not used in mchampdx? + AM_RANGE(0x40000c, 0x40000d) AM_WRITE(SMH_NOP) // ?? + AM_RANGE(0x40000e, 0x40000f) AM_WRITE(SMH_RAM) AM_BASE(&head_layersize) // ?? + AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP) // IRQ Ack AM_RANGE(0x500008, 0x500009) AM_WRITE(esd16_tilemap0_color_w) // Flip Screen + Tileamp0 palette banking - AM_RANGE(0x50000a, 0x50000b) AM_WRITE(MWA16_NOP) // ? 2 not checked + AM_RANGE(0x50000a, 0x50000b) AM_WRITE(SMH_NOP) // ? 2 not checked AM_RANGE(0x50000c, 0x50000d) AM_WRITE(esd16_sound_command_w ) // To Sound CPU // ok AM_RANGE(0x50000e, 0x50000f) AM_WRITE(esd_eeprom_w) AM_RANGE(0x600008, 0x600009) AM_WRITE(hedpanic_platform_w) - AM_RANGE(0x700000, 0x70ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x700000, 0x70ffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /*************************************************************************** @@ -272,15 +272,15 @@ static WRITE8_HANDLER( esd16_sound_rombank_w ) } static ADDRESS_MAP_START( multchmp_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( multchmp_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // Banked ROM - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // Banked ROM + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END static READ8_HANDLER( esd16_sound_command_r ) @@ -294,7 +294,7 @@ static ADDRESS_MAP_START( multchmp_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x02, 0x02) AM_READ(OKIM6295_status_0_r ) // M6295 AM_RANGE(0x03, 0x03) AM_READ(esd16_sound_command_r ) // From Main CPU - AM_RANGE(0x06, 0x06) AM_READ(MRA8_NOP ) // ? At the start + AM_RANGE(0x06, 0x06) AM_READ(SMH_NOP ) // ? At the start ADDRESS_MAP_END static ADDRESS_MAP_START( multchmp_sound_writeport, ADDRESS_SPACE_IO, 8 ) @@ -302,9 +302,9 @@ static ADDRESS_MAP_START( multchmp_sound_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(YM3812_control_port_0_w ) // YM3812 AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w ) AM_RANGE(0x02, 0x02) AM_WRITE(OKIM6295_data_0_w ) // M6295 - AM_RANGE(0x04, 0x04) AM_WRITE(MWA8_NOP ) // ? $00, $30 + AM_RANGE(0x04, 0x04) AM_WRITE(SMH_NOP ) // ? $00, $30 AM_RANGE(0x05, 0x05) AM_WRITE(esd16_sound_rombank_w ) // ROM Bank - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP ) // ? 1 (End of NMI routine) + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP ) // ? 1 (End of NMI routine) ADDRESS_MAP_END diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c index 8e1aefd4b34..4263aa2f8e7 100644 --- a/src/mame/drivers/espial.c +++ b/src/mame/drivers/espial.c @@ -67,79 +67,79 @@ WRITE8_HANDLER( zodiac_master_soundlatch_w ) static ADDRESS_MAP_START( espial_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x4fff) AM_READ(MRA8_ROM) - AM_RANGE(0x5800, 0x5fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x4fff) AM_READ(SMH_ROM) + AM_RANGE(0x5800, 0x5fff) AM_READ(SMH_RAM) AM_RANGE(0x6081, 0x6081) AM_READ(input_port_0_r) AM_RANGE(0x6082, 0x6082) AM_READ(input_port_1_r) AM_RANGE(0x6083, 0x6083) AM_READ(input_port_2_r) AM_RANGE(0x6084, 0x6084) AM_READ(input_port_3_r) AM_RANGE(0x6090, 0x6090) AM_READ(soundlatch_r) /* the main CPU reads the command back from the slave */ AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r) - AM_RANGE(0x8000, 0x803f) AM_READ(MRA8_RAM) - AM_RANGE(0x8400, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8c00, 0x903f) AM_READ(MRA8_RAM) - AM_RANGE(0x9400, 0x97ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0x803f) AM_READ(SMH_RAM) + AM_RANGE(0x8400, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x8c00, 0x903f) AM_READ(SMH_RAM) + AM_RANGE(0x9400, 0x97ff) AM_READ(SMH_RAM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( espial_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x4fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x5800, 0x5fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x4fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x5800, 0x5fff) AM_WRITE(SMH_RAM) AM_RANGE(0x6090, 0x6090) AM_WRITE(zodiac_master_soundlatch_w) AM_RANGE(0x7000, 0x7000) AM_WRITE(watchdog_reset_w) AM_RANGE(0x7100, 0x7100) AM_WRITE(zodiac_master_interrupt_enable_w) AM_RANGE(0x7200, 0x7200) AM_WRITE(espial_flipscreen_w) - AM_RANGE(0x8000, 0x801f) AM_WRITE(MWA8_RAM) AM_BASE(&espial_spriteram_1) + AM_RANGE(0x8000, 0x801f) AM_WRITE(SMH_RAM) AM_BASE(&espial_spriteram_1) AM_RANGE(0x8400, 0x87ff) AM_WRITE(espial_videoram_w) AM_BASE(&espial_videoram) - AM_RANGE(0x8800, 0x880f) AM_WRITE(MWA8_RAM) AM_BASE(&espial_spriteram_3) + AM_RANGE(0x8800, 0x880f) AM_WRITE(SMH_RAM) AM_BASE(&espial_spriteram_3) AM_RANGE(0x8c00, 0x8fff) AM_WRITE(espial_attributeram_w) AM_BASE(&espial_attributeram) - AM_RANGE(0x9000, 0x901f) AM_WRITE(MWA8_RAM) AM_BASE(&espial_spriteram_2) + AM_RANGE(0x9000, 0x901f) AM_WRITE(SMH_RAM) AM_BASE(&espial_spriteram_2) AM_RANGE(0x9020, 0x903f) AM_WRITE(espial_scrollram_w) AM_BASE(&espial_scrollram) AM_RANGE(0x9400, 0x97ff) AM_WRITE(espial_colorram_w) AM_BASE(&espial_colorram) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /* there are a lot of unmapped reads from all over memory as the code uses POP instructions in a delay loop */ static ADDRESS_MAP_START( netwars_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x5800, 0x5fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x5800, 0x5fff) AM_READ(SMH_RAM) AM_RANGE(0x6081, 0x6081) AM_READ(input_port_0_r) AM_RANGE(0x6082, 0x6082) AM_READ(input_port_1_r) AM_RANGE(0x6083, 0x6083) AM_READ(input_port_2_r) AM_RANGE(0x6084, 0x6084) AM_READ(input_port_3_r) AM_RANGE(0x6090, 0x6090) AM_READ(soundlatch_r) /* the main CPU reads the command back from the slave */ AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r) - AM_RANGE(0x8000, 0x97ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x97ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( netwars_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x5800, 0x5fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x5800, 0x5fff) AM_WRITE(SMH_RAM) AM_RANGE(0x6090, 0x6090) AM_WRITE(zodiac_master_soundlatch_w) AM_RANGE(0x7000, 0x7000) AM_WRITE(watchdog_reset_w) AM_RANGE(0x7100, 0x7100) AM_WRITE(zodiac_master_interrupt_enable_w) AM_RANGE(0x7200, 0x7200) AM_WRITE(espial_flipscreen_w) - AM_RANGE(0x8000, 0x801f) AM_WRITE(MWA8_RAM) AM_BASE(&espial_spriteram_1) + AM_RANGE(0x8000, 0x801f) AM_WRITE(SMH_RAM) AM_BASE(&espial_spriteram_1) AM_RANGE(0x8000, 0x87ff) AM_WRITE(espial_videoram_w) AM_BASE(&espial_videoram) - AM_RANGE(0x8800, 0x880f) AM_WRITE(MWA8_RAM) AM_BASE(&espial_spriteram_3) + AM_RANGE(0x8800, 0x880f) AM_WRITE(SMH_RAM) AM_BASE(&espial_spriteram_3) AM_RANGE(0x8800, 0x8fff) AM_WRITE(espial_attributeram_w) AM_BASE(&espial_attributeram) - AM_RANGE(0x9000, 0x901f) AM_WRITE(MWA8_RAM) AM_BASE(&espial_spriteram_2) + AM_RANGE(0x9000, 0x901f) AM_WRITE(SMH_RAM) AM_BASE(&espial_spriteram_2) AM_RANGE(0x9020, 0x903f) AM_WRITE(espial_scrollram_w) AM_BASE(&espial_scrollram) AM_RANGE(0x9000, 0x97ff) AM_WRITE(espial_colorram_w) AM_BASE(&espial_colorram) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4000, 0x4000) AM_WRITE(espial_sound_nmi_enable_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(soundlatch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/exctsccr.c b/src/mame/drivers/exctsccr.c index ee3f2acd1f4..43b9d433b03 100644 --- a/src/mame/drivers/exctsccr.c +++ b/src/mame/drivers/exctsccr.c @@ -143,22 +143,22 @@ static WRITE8_HANDLER( cexctsccr_mcu_halt_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM #if MCU_HACK - AM_RANGE(0x6000, 0x63ff) AM_WRITE(exctsccr_mcu_w) AM_READ(MRA8_RAM) AM_BASE(&exctsccr_mcu_ram) /* Alpha mcu (protection) */ + AM_RANGE(0x6000, 0x63ff) AM_WRITE(exctsccr_mcu_w) AM_READ(SMH_RAM) AM_BASE(&exctsccr_mcu_ram) /* Alpha mcu (protection) */ #else AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE(1) AM_BASE(&mcu_shared_ram) #endif AM_RANGE(0x7c00, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0x83ff) AM_WRITE(exctsccr_videoram_w) AM_READ(MRA8_RAM) AM_BASE(&videoram) - AM_RANGE(0x8400, 0x87ff) AM_WRITE(exctsccr_colorram_w) AM_READ(MRA8_RAM) AM_BASE(&colorram) - AM_RANGE(0x8800, 0x8bff) AM_WRITE(MWA8_RAM) AM_READ(MRA8_RAM) AM_BASE(&spriteram_2) /* ??? */ - AM_RANGE(0xa000, 0xa000) AM_WRITE(MWA8_NOP) AM_READ(input_port_0_r) - AM_RANGE(0xa001, 0xa001) AM_WRITE(MWA8_NOP) /* ??? */ + AM_RANGE(0x8000, 0x83ff) AM_WRITE(exctsccr_videoram_w) AM_READ(SMH_RAM) AM_BASE(&videoram) + AM_RANGE(0x8400, 0x87ff) AM_WRITE(exctsccr_colorram_w) AM_READ(SMH_RAM) AM_BASE(&colorram) + AM_RANGE(0x8800, 0x8bff) AM_WRITE(SMH_RAM) AM_READ(SMH_RAM) AM_BASE(&spriteram_2) /* ??? */ + AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_NOP) AM_READ(input_port_0_r) + AM_RANGE(0xa001, 0xa001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xa002, 0xa002) AM_WRITE(exctsccr_gfx_bank_w) AM_RANGE(0xa003, 0xa003) AM_WRITE(exctsccr_flipscreen_w) /* Cocktail mode ( 0xff = flip screen, 0x00 = normal ) */ /* 0xa006 MCU control */ AM_RANGE(0xa006, 0xa006) AM_WRITE(cexctsccr_mcu_halt_w) - AM_RANGE(0xa007, 0xa007) AM_WRITE(MWA8_NOP) /* This is also MCU control, but i dont need it */ - AM_RANGE(0xa040, 0xa06f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) /* Sprite pos */ + AM_RANGE(0xa007, 0xa007) AM_WRITE(SMH_NOP) /* This is also MCU control, but i dont need it */ + AM_RANGE(0xa040, 0xa06f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) /* Sprite pos */ AM_RANGE(0xa080, 0xa080) AM_WRITE(soundlatch_w) AM_RANGE(0xa0c0, 0xa0c0) AM_WRITE(watchdog_reset_w) @@ -173,7 +173,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc008, 0xc009) AM_WRITE(exctsccr_DAC_data_w) AM_RANGE(0xc00c, 0xc00c) AM_WRITE(soundlatch_w) /* used to clear the latch */ AM_RANGE(0xc00d, 0xc00d) AM_READ(soundlatch_r) - AM_RANGE(0xc00f, 0xc00f) AM_WRITE(MWA8_NOP) /* ??? */ + AM_RANGE(0xc00f, 0xc00f) AM_WRITE(SMH_NOP) /* ??? */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) @@ -190,10 +190,10 @@ ADDRESS_MAP_END /* Bootleg */ static ADDRESS_MAP_START( bl_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8400, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8800, 0x8fff) AM_READ(MRA8_RAM) /* ??? */ + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) + AM_RANGE(0x8400, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x8800, 0x8fff) AM_READ(SMH_RAM) /* ??? */ AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa040, 0xa040) AM_READ(input_port_1_r) AM_RANGE(0xa080, 0xa080) AM_READ(input_port_3_r) @@ -201,35 +201,35 @@ static ADDRESS_MAP_START( bl_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bl_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x7001, 0x7001) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x8000, 0x83ff) AM_WRITE(exctsccr_videoram_w) AM_BASE(&videoram) AM_RANGE(0x8400, 0x87ff) AM_WRITE(exctsccr_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x8800, 0x8fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) /* ??? */ - AM_RANGE(0xa000, 0xa000) AM_WRITE(MWA8_NOP) /* ??? */ - AM_RANGE(0xa001, 0xa001) AM_WRITE(MWA8_NOP) /* ??? */ + AM_RANGE(0x8800, 0x8fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) /* ??? */ + AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0xa001, 0xa001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xa002, 0xa002) AM_WRITE(exctsccr_gfx_bank_w) /* ??? */ AM_RANGE(0xa003, 0xa003) AM_WRITE(exctsccr_flipscreen_w) /* Cocktail mode ( 0xff = flip screen, 0x00 = normal ) */ - AM_RANGE(0xa006, 0xa006) AM_WRITE(MWA8_NOP) /* no MCU, but some leftover code still writes here */ - AM_RANGE(0xa007, 0xa007) AM_WRITE(MWA8_NOP) /* no MCU, but some leftover code still writes here */ - AM_RANGE(0xa040, 0xa06f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) /* Sprite Pos */ + AM_RANGE(0xa006, 0xa006) AM_WRITE(SMH_NOP) /* no MCU, but some leftover code still writes here */ + AM_RANGE(0xa007, 0xa007) AM_WRITE(SMH_NOP) /* no MCU, but some leftover code still writes here */ + AM_RANGE(0xa040, 0xa06f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) /* Sprite Pos */ AM_RANGE(0xa080, 0xa080) AM_WRITE(soundlatch_w) AM_RANGE(0xa0c0, 0xa0c0) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END static ADDRESS_MAP_START( bl_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xe3ff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xe3ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( bl_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8000) AM_WRITE(MWA8_NOP) /* 0 = DAC sound off, 1 = DAC sound on */ + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_NOP) /* 0 = DAC sound off, 1 = DAC sound on */ AM_RANGE(0xa000, 0xa000) AM_WRITE(soundlatch_w) /* used to clear the latch */ AM_RANGE(0xc000, 0xc000) AM_WRITE(exctsccr_DAC_data_w) - AM_RANGE(0xe000, 0xe3ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xe3ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index bbc0c5b5c7d..d7d4b5f3c37 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -42,43 +42,43 @@ static INTERRUPT_GEN( exedexes_interrupt ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r) AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r) AM_RANGE(0xc004, 0xc004) AM_READ(input_port_4_r) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) /* Work RAM */ - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) /* Sprite RAM */ + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) /* Work RAM */ + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) /* Sprite RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w) AM_RANGE(0xc804, 0xc804) AM_WRITE(exedexes_c804_w) /* coin counters + text layer enable */ - AM_RANGE(0xc806, 0xc806) AM_WRITE(MWA8_NOP) /* Watchdog ?? */ + AM_RANGE(0xc806, 0xc806) AM_WRITE(SMH_NOP) /* Watchdog ?? */ AM_RANGE(0xd000, 0xd3ff) AM_WRITE(exedexes_videoram_w) AM_BASE(&videoram) AM_RANGE(0xd400, 0xd7ff) AM_WRITE(exedexes_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xd800, 0xd801) AM_WRITE(MWA8_RAM) AM_BASE(&exedexes_nbg_yscroll) - AM_RANGE(0xd802, 0xd803) AM_WRITE(MWA8_RAM) AM_BASE(&exedexes_nbg_xscroll) - AM_RANGE(0xd804, 0xd805) AM_WRITE(MWA8_RAM) AM_BASE(&exedexes_bg_scroll) + AM_RANGE(0xd800, 0xd801) AM_WRITE(SMH_RAM) AM_BASE(&exedexes_nbg_yscroll) + AM_RANGE(0xd802, 0xd803) AM_WRITE(SMH_RAM) AM_BASE(&exedexes_nbg_xscroll) + AM_RANGE(0xd804, 0xd805) AM_WRITE(SMH_RAM) AM_BASE(&exedexes_bg_scroll) AM_RANGE(0xd807, 0xd807) AM_WRITE(exedexes_gfxctrl_w) /* layer enables */ - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x8002, 0x8002) AM_WRITE(SN76496_0_w) diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c index 70ab46d0bb0..68a8ff510d9 100644 --- a/src/mame/drivers/exidy.c +++ b/src/mame/drivers/exidy.c @@ -197,16 +197,16 @@ static WRITE8_HANDLER( fax_bank_select_w ) static ADDRESS_MAP_START( exidy_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM AM_BASE(&exidy_videoram) - AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x003f) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_sprite1_xpos) - AM_RANGE(0x5040, 0x5040) AM_MIRROR(0x003f) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_sprite1_ypos) - AM_RANGE(0x5080, 0x5080) AM_MIRROR(0x003f) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_sprite2_xpos) - AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0x003f) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_sprite2_ypos) + AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x003f) AM_WRITE(SMH_RAM) AM_BASE(&exidy_sprite1_xpos) + AM_RANGE(0x5040, 0x5040) AM_MIRROR(0x003f) AM_WRITE(SMH_RAM) AM_BASE(&exidy_sprite1_ypos) + AM_RANGE(0x5080, 0x5080) AM_MIRROR(0x003f) AM_WRITE(SMH_RAM) AM_BASE(&exidy_sprite2_xpos) + AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0x003f) AM_WRITE(SMH_RAM) AM_BASE(&exidy_sprite2_ypos) AM_RANGE(0x5100, 0x5100) AM_MIRROR(0x00fc) AM_READ_PORT("DSW") - AM_RANGE(0x5100, 0x5100) AM_MIRROR(0x00fc) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_spriteno) + AM_RANGE(0x5100, 0x5100) AM_MIRROR(0x00fc) AM_WRITE(SMH_RAM) AM_BASE(&exidy_spriteno) AM_RANGE(0x5101, 0x5101) AM_MIRROR(0x00fc) AM_READ_PORT("IN0") - AM_RANGE(0x5101, 0x5101) AM_MIRROR(0x00fc) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_sprite_enable) + AM_RANGE(0x5101, 0x5101) AM_MIRROR(0x00fc) AM_WRITE(SMH_RAM) AM_BASE(&exidy_sprite_enable) AM_RANGE(0x5103, 0x5103) AM_MIRROR(0x00fc) AM_READ(exidy_interrupt_r) - AM_RANGE(0x5210, 0x5212) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_color_latch) + AM_RANGE(0x5210, 0x5212) AM_WRITE(SMH_RAM) AM_BASE(&exidy_color_latch) AM_RANGE(0x5213, 0x5213) AM_READ_PORT("IN2") ADDRESS_MAP_END @@ -243,19 +243,19 @@ static ADDRESS_MAP_START( rallys_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM AM_BASE(&exidy_videoram) AM_RANGE(0x4800, 0x4fff) AM_RAM AM_BASE(&exidy_characterram) - AM_RANGE(0x5000, 0x5000) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_sprite1_xpos) - AM_RANGE(0x5001, 0x5001) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_sprite1_ypos) + AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_RAM) AM_BASE(&exidy_sprite1_xpos) + AM_RANGE(0x5001, 0x5001) AM_WRITE(SMH_RAM) AM_BASE(&exidy_sprite1_ypos) AM_RANGE(0x5100, 0x5100) AM_MIRROR(0x00fc) AM_READ_PORT("DSW") - AM_RANGE(0x5100, 0x5100) AM_MIRROR(0x00fc) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_spriteno) + AM_RANGE(0x5100, 0x5100) AM_MIRROR(0x00fc) AM_WRITE(SMH_RAM) AM_BASE(&exidy_spriteno) AM_RANGE(0x5101, 0x5101) AM_MIRROR(0x00fc) AM_READ_PORT("IN0") - AM_RANGE(0x5101, 0x5101) AM_MIRROR(0x00fc) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_sprite_enable) + AM_RANGE(0x5101, 0x5101) AM_MIRROR(0x00fc) AM_WRITE(SMH_RAM) AM_BASE(&exidy_sprite_enable) AM_RANGE(0x5103, 0x5103) AM_MIRROR(0x00fc) AM_READ(exidy_interrupt_r) AM_RANGE(0x5200, 0x5200) AM_WRITE(targ_audio_1_w) AM_RANGE(0x5201, 0x5201) AM_WRITE(spectar_audio_2_w) - AM_RANGE(0x5210, 0x5212) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_color_latch) + AM_RANGE(0x5210, 0x5212) AM_WRITE(SMH_RAM) AM_BASE(&exidy_color_latch) AM_RANGE(0x5213, 0x5213) AM_READ_PORT("IN2") - AM_RANGE(0x5300, 0x5300) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_sprite2_xpos) - AM_RANGE(0x5301, 0x5301) AM_WRITE(MWA8_RAM) AM_BASE(&exidy_sprite2_ypos) + AM_RANGE(0x5300, 0x5300) AM_WRITE(SMH_RAM) AM_BASE(&exidy_sprite2_xpos) + AM_RANGE(0x5301, 0x5301) AM_WRITE(SMH_RAM) AM_BASE(&exidy_sprite2_ypos) AM_RANGE(0xff00, 0xffff) AM_ROM AM_REGION(REGION_CPU1, 0x3f00) ADDRESS_MAP_END @@ -282,7 +282,7 @@ static ADDRESS_MAP_START( fax_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_WRITE(fax_bank_select_w) AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(1) AM_RANGE(0x5200, 0x520f) AM_READWRITE(pia_0_r, pia_0_w) - AM_RANGE(0x5213, 0x5217) AM_WRITE(MWA8_NOP) /* empty control lines on color/sound board */ + AM_RANGE(0x5213, 0x5217) AM_WRITE(SMH_NOP) /* empty control lines on color/sound board */ AM_RANGE(0x6000, 0x6fff) AM_RAM AM_BASE(&exidy_characterram) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -1379,7 +1379,7 @@ static DRIVER_INIT( phantoma ) exidy_color_latch[0] = 0x09; /* the ROM is actually mapped high */ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xf800, 0xffff, 0, 0, MRA8_BANK1); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xf800, 0xffff, 0, 0, SMH_BANK1); memory_set_bankptr(1, memory_region(REGION_CPU1) + 0xf800); } diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c index 308c93c5d5a..2fe08cc75b3 100644 --- a/src/mame/drivers/exidy440.c +++ b/src/mame/drivers/exidy440.c @@ -311,7 +311,7 @@ void exidy440_bank_select(UINT8 bank) if (bank == 0 && exidy440_bank != 0) memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, showdown_bank0_r); else if (bank != 0 && exidy440_bank == 0) - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, MRA8_BANK1); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, SMH_BANK1); } /* select the bank and update the bank pointer */ @@ -468,7 +468,7 @@ static MACHINE_RESET( exidy440 ) static ADDRESS_MAP_START( exidy440_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&exidy440_imageram) - AM_RANGE(0x2000, 0x209f) AM_READWRITE(MRA8_RAM, exidy440_spriteram_w) AM_BASE(&spriteram) + AM_RANGE(0x2000, 0x209f) AM_READWRITE(SMH_RAM, exidy440_spriteram_w) AM_BASE(&spriteram) AM_RANGE(0x20a0, 0x29ff) AM_RAM AM_RANGE(0x2a00, 0x2aff) AM_READWRITE(exidy440_videoram_r, exidy440_videoram_w) AM_RANGE(0x2b00, 0x2b00) AM_READ(exidy440_vertical_pos_r) @@ -476,15 +476,15 @@ static ADDRESS_MAP_START( exidy440_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2b02, 0x2b02) AM_RAM AM_BASE(&exidy440_scanline) AM_RANGE(0x2b03, 0x2b03) AM_READWRITE(input_port_0_r, exidy440_control_w) AM_RANGE(0x2c00, 0x2dff) AM_READWRITE(exidy440_paletteram_r, exidy440_paletteram_w) - AM_RANGE(0x2e00, 0x2e1f) AM_READWRITE(MRA8_RAM, sound_command_w) AM_BASE(&exidy440_sound_command) + AM_RANGE(0x2e00, 0x2e1f) AM_READWRITE(SMH_RAM, sound_command_w) AM_BASE(&exidy440_sound_command) AM_RANGE(0x2e20, 0x2e3f) AM_READWRITE(exidy440_input_port_3_r, exidy440_input_port_3_w) - AM_RANGE(0x2e40, 0x2e5f) AM_READWRITE(MRA8_NOP, exidy440_coin_counter_w) /* read: clear coin counters I/O2 */ - AM_RANGE(0x2e60, 0x2e7f) AM_READWRITE(input_port_1_r, MWA8_NOP) - AM_RANGE(0x2e80, 0x2e9f) AM_READWRITE(input_port_2_r, MWA8_NOP) - AM_RANGE(0x2ea0, 0x2ebf) AM_READWRITE(sound_command_ack_r, MWA8_NOP) + AM_RANGE(0x2e40, 0x2e5f) AM_READWRITE(SMH_NOP, exidy440_coin_counter_w) /* read: clear coin counters I/O2 */ + AM_RANGE(0x2e60, 0x2e7f) AM_READWRITE(input_port_1_r, SMH_NOP) + AM_RANGE(0x2e80, 0x2e9f) AM_READWRITE(input_port_2_r, SMH_NOP) + 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(MRA8_BANK1, bankram_w) + AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK1, bankram_w) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index 8f08e025938..75e119a8e47 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -245,18 +245,18 @@ static ADDRESS_MAP_START( galsnew, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE(&galsnew_bg_pixram) AM_RANGE(0x520000, 0x53ffff) AM_RAM AM_BASE(&galsnew_fg_pixram) - AM_RANGE(0x580000, 0x580fff) AM_READWRITE(MRA16_RAM,kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 - AM_RANGE(0x581000, 0x581fff) AM_READWRITE(MRA16_RAM,kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // + AM_RANGE(0x580000, 0x580fff) AM_READWRITE(SMH_RAM,kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 + AM_RANGE(0x581000, 0x581fff) AM_READWRITE(SMH_RAM,kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(&kaneko16_vscroll_1) // AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(&kaneko16_vscroll_0) // - AM_RANGE(0x600000, 0x600fff) AM_READWRITE(MRA16_RAM,galsnew_paletteram_w) AM_BASE(&paletteram16) // palette? + AM_RANGE(0x600000, 0x600fff) AM_READWRITE(SMH_RAM,galsnew_paletteram_w) AM_BASE(&paletteram16) // palette? - AM_RANGE(0x680000, 0x68001f) AM_READWRITE(MRA16_RAM,kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // sprite regs? tileregs? + AM_RANGE(0x680000, 0x68001f) AM_READWRITE(SMH_RAM,kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // sprite regs? tileregs? AM_RANGE(0x700000, 0x700fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // sprites? 0x72f words tested - AM_RANGE(0x780000, 0x78001f) AM_READWRITE(MRA16_RAM,kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs ) // sprite regs? tileregs? + AM_RANGE(0x780000, 0x78001f) AM_READWRITE(SMH_RAM,kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs ) // sprite regs? tileregs? AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r) AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r) @@ -264,15 +264,15 @@ static ADDRESS_MAP_START( galsnew, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x900000, 0x900001) AM_WRITE(galsnew_6295_bankswitch_w) - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xc80000, 0xc8ffff) AM_RAM - AM_RANGE(0xd80000, 0xd80001) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0xd80000, 0xd80001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xe00000, 0xe00015) AM_READWRITE(galpanib_calc_r,galpanib_calc_w) /* CALC1 MCU interaction (simulated) */ - AM_RANGE(0xe80000, 0xe80001) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0xe80000, 0xe80001) AM_WRITE(SMH_NOP) /* ??? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c index 7e08b1aa9af..828882c24c8 100644 --- a/src/mame/drivers/exprraid.c +++ b/src/mame/drivers/exprraid.c @@ -20,7 +20,7 @@ Main CPU: ( 6502 ) 2100-2100 Sound latch write 2800-2801 Protection 3800-3800 VBblank ( bootleg 1 only ) -4000-ffff MRA8_ROM +4000-ffff SMH_ROM Sound Cpu: ( 6809 ) 0000-1fff RAM diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c index ccb3dda7492..b4384a66e94 100644 --- a/src/mame/drivers/exterm.c +++ b/src/mame/drivers/exterm.c @@ -325,7 +325,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x01500000, 0x0153ffff) AM_MIRROR(0xfc000000) AM_WRITE(exterm_output_port_0_w) AM_RANGE(0x01580000, 0x015bffff) AM_MIRROR(0xfc000000) AM_WRITE(sound_latch_w) AM_RANGE(0x015c0000, 0x015fffff) AM_MIRROR(0xfc000000) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x01800000, 0x01807fff) AM_MIRROR(0xfc7f8000) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x01800000, 0x01807fff) AM_MIRROR(0xfc7f8000) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x02800000, 0x02807fff) AM_MIRROR(0xfc7f8000) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x03000000, 0x03ffffff) AM_MIRROR(0xfc000000) AM_ROM AM_REGION(REGION_USER1, 0) ADDRESS_MAP_END diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c index 5edbd02cb69..d45389925ec 100644 --- a/src/mame/drivers/exzisus.c +++ b/src/mame/drivers/exzisus.c @@ -158,8 +158,8 @@ static DRIVER_INIT( exzisus ) **************************************************************************/ static ADDRESS_MAP_START( cpua_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK2) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2) AM_RANGE(0xc000, 0xc5ff) AM_READ(exzisus_objectram_1_r) AM_RANGE(0xc600, 0xdfff) AM_READ(exzisus_videoram_1_r) AM_RANGE(0xe000, 0xefff) AM_READ(exzisus_sharedram_ac_r) @@ -167,7 +167,7 @@ static ADDRESS_MAP_START( cpua_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cpua_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc5ff) AM_WRITE(exzisus_objectram_1_w) AM_BASE(&exzisus_objectram1) AM_SIZE(&exzisus_objectram_size1) AM_RANGE(0xc600, 0xdfff) AM_WRITE(exzisus_videoram_1_w) AM_BASE(&exzisus_videoram1) AM_RANGE(0xe000, 0xefff) AM_WRITE(exzisus_sharedram_ac_w) AM_BASE(&exzisus_sharedram_ac) @@ -177,12 +177,12 @@ static ADDRESS_MAP_START( cpua_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cpub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xc5ff) AM_READ(exzisus_objectram_0_r) AM_RANGE(0xc600, 0xdfff) AM_READ(exzisus_videoram_0_r) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf000) AM_READ(MRA8_NOP) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf000) AM_READ(SMH_NOP) AM_RANGE(0xf001, 0xf001) AM_READ(taitosound_comm_r) AM_RANGE(0xf400, 0xf400) AM_READ(input_port_0_r) AM_RANGE(0xf401, 0xf401) AM_READ(input_port_1_r) @@ -193,46 +193,46 @@ static ADDRESS_MAP_START( cpub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cpub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc5ff) AM_WRITE(exzisus_objectram_0_w) AM_BASE(&exzisus_objectram0) AM_SIZE(&exzisus_objectram_size0) AM_RANGE(0xc600, 0xdfff) AM_WRITE(exzisus_videoram_0_w) AM_BASE(&exzisus_videoram0) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(taitosound_port_w) AM_RANGE(0xf001, 0xf001) AM_WRITE(taitosound_comm_w) AM_RANGE(0xf400, 0xf400) AM_WRITE(exzisus_cpub_bankswitch_w) AM_RANGE(0xf402, 0xf402) AM_WRITE(exzisus_coincounter_w) - AM_RANGE(0xf404, 0xf404) AM_WRITE(MWA8_NOP) // ?? + AM_RANGE(0xf404, 0xf404) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0xf800, 0xffff) AM_WRITE(exzisus_sharedram_ab_w) ADDRESS_MAP_END static ADDRESS_MAP_START( cpuc_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x85ff) AM_READ(exzisus_objectram_1_r) AM_RANGE(0x8600, 0x9fff) AM_READ(exzisus_videoram_1_r) AM_RANGE(0xa000, 0xafff) AM_READ(exzisus_sharedram_ac_r) - AM_RANGE(0xb000, 0xbfff) AM_READ(MRA8_RAM) + AM_RANGE(0xb000, 0xbfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( cpuc_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x85ff) AM_WRITE(exzisus_objectram_1_w) AM_RANGE(0x8600, 0x9fff) AM_WRITE(exzisus_videoram_1_w) AM_RANGE(0xa000, 0xafff) AM_WRITE(exzisus_sharedram_ac_w) - AM_RANGE(0xb000, 0xbfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xb000, 0xbfff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x9000) AM_READ(MRA8_NOP) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x9000) AM_READ(SMH_NOP) AM_RANGE(0x9001, 0x9001) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0xa000, 0xa000) AM_READ(MRA8_NOP) + AM_RANGE(0xa000, 0xa000) AM_READ(SMH_NOP) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index c4ab5c29947..687875ec0fa 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -90,7 +90,7 @@ static WRITE8_HANDLER( pending_command_clear_w ) static ADDRESS_MAP_START( f1gp_readmem1, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x2fffff) AM_READ(extrarom_r) AM_RANGE(0xa00000, 0xbfffff) AM_READ(extrarom2_r) AM_RANGE(0xc00000, 0xc3ffff) AM_READ(f1gp_zoomdata_r) @@ -98,14 +98,14 @@ static ADDRESS_MAP_START( f1gp_readmem1, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd02000, 0xd03fff) AM_READ(f1gp_rozvideoram_r) /* mirror */ AM_RANGE(0xd04000, 0xd05fff) AM_READ(f1gp_rozvideoram_r) /* mirror */ AM_RANGE(0xd06000, 0xd07fff) AM_READ(f1gp_rozvideoram_r) /* mirror */ - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM) - AM_RANGE(0xe04000, 0xe07fff) AM_READ(MRA16_RAM) - AM_RANGE(0xf00000, 0xf003ff) AM_READ(MRA16_RAM) - AM_RANGE(0xf10000, 0xf103ff) AM_READ(MRA16_RAM) - AM_RANGE(0xff8000, 0xffbfff) AM_READ(MRA16_RAM) + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM) + AM_RANGE(0xe04000, 0xe07fff) AM_READ(SMH_RAM) + AM_RANGE(0xf00000, 0xf003ff) AM_READ(SMH_RAM) + AM_RANGE(0xf10000, 0xf103ff) AM_READ(SMH_RAM) + AM_RANGE(0xff8000, 0xffbfff) AM_READ(SMH_RAM) AM_RANGE(0xffc000, 0xffcfff) AM_READ(sharedram_r) - AM_RANGE(0xffd000, 0xffdfff) AM_READ(MRA16_RAM) - AM_RANGE(0xffe000, 0xffefff) AM_READ(MRA16_RAM) + AM_RANGE(0xffd000, 0xffdfff) AM_READ(SMH_RAM) + AM_RANGE(0xffe000, 0xffefff) AM_READ(SMH_RAM) AM_RANGE(0xfff000, 0xfff001) AM_READ(input_port_0_word_r) // AM_RANGE(0xfff002, 0xfff003) analog wheel? AM_RANGE(0xfff004, 0xfff005) AM_READ(input_port_1_word_r) @@ -115,36 +115,36 @@ static ADDRESS_MAP_START( f1gp_readmem1, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( f1gp_writemem1, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0xc00000, 0xc3ffff) AM_WRITE(f1gp_zoomdata_w) AM_RANGE(0xd00000, 0xd01fff) AM_WRITE(f1gp_rozvideoram_w) AM_BASE(&f1gp_rozvideoram) // BACK VRAM AM_RANGE(0xd02000, 0xd03fff) AM_WRITE(f1gp_rozvideoram_w) /* mirror */ AM_RANGE(0xd04000, 0xd05fff) AM_WRITE(f1gp_rozvideoram_w) /* mirror */ AM_RANGE(0xd06000, 0xd07fff) AM_WRITE(f1gp_rozvideoram_w) /* mirror */ - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&f1gp_spr1cgram) AM_SIZE(&f1gp_spr1cgram_size) // SPR-1 CG RAM - AM_RANGE(0xe04000, 0xe07fff) AM_WRITE(MWA16_RAM) AM_BASE(&f1gp_spr2cgram) AM_SIZE(&f1gp_spr2cgram_size) // SPR-2 CG RAM - AM_RANGE(0xf00000, 0xf003ff) AM_WRITE(MWA16_RAM) AM_BASE(&f1gp_spr1vram) // SPR-1 VRAM - AM_RANGE(0xf10000, 0xf103ff) AM_WRITE(MWA16_RAM) AM_BASE(&f1gp_spr2vram) // SPR-2 VRAM - AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(MWA16_RAM) // WORK RAM-1 + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&f1gp_spr1cgram) AM_SIZE(&f1gp_spr1cgram_size) // SPR-1 CG RAM + AM_RANGE(0xe04000, 0xe07fff) AM_WRITE(SMH_RAM) AM_BASE(&f1gp_spr2cgram) AM_SIZE(&f1gp_spr2cgram_size) // SPR-2 CG RAM + AM_RANGE(0xf00000, 0xf003ff) AM_WRITE(SMH_RAM) AM_BASE(&f1gp_spr1vram) // SPR-1 VRAM + AM_RANGE(0xf10000, 0xf103ff) AM_WRITE(SMH_RAM) AM_BASE(&f1gp_spr2vram) // SPR-2 VRAM + AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(SMH_RAM) // WORK RAM-1 AM_RANGE(0xffc000, 0xffcfff) AM_WRITE(sharedram_w) AM_BASE(&sharedram) // DUAL RAM AM_RANGE(0xffd000, 0xffdfff) AM_WRITE(f1gp_fgvideoram_w) AM_BASE(&f1gp_fgvideoram) // CHARACTER AM_RANGE(0xffe000, 0xffefff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // PALETTE AM_RANGE(0xfff000, 0xfff001) AM_WRITE(f1gp_gfxctrl_w) AM_RANGE(0xfff002, 0xfff005) AM_WRITE(f1gp_fgscroll_w) AM_RANGE(0xfff008, 0xfff009) AM_WRITE(sound_command_w) - AM_RANGE(0xfff040, 0xfff05f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) + AM_RANGE(0xfff040, 0xfff05f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) ADDRESS_MAP_END static ADDRESS_MAP_START( f1gp2_readmem1, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x2fffff) AM_READ(extrarom_r) - AM_RANGE(0xa00000, 0xa07fff) AM_READ(MRA16_RAM) + AM_RANGE(0xa00000, 0xa07fff) AM_READ(SMH_RAM) AM_RANGE(0xd00000, 0xd01fff) AM_READ(f1gp_rozvideoram_r) - AM_RANGE(0xe00000, 0xe00fff) AM_READ(MRA16_RAM) - AM_RANGE(0xff8000, 0xffbfff) AM_READ(MRA16_RAM) + AM_RANGE(0xe00000, 0xe00fff) AM_READ(SMH_RAM) + AM_RANGE(0xff8000, 0xffbfff) AM_READ(SMH_RAM) AM_RANGE(0xffc000, 0xffcfff) AM_READ(sharedram_r) - AM_RANGE(0xffd000, 0xffdfff) AM_READ(MRA16_RAM) - AM_RANGE(0xffe000, 0xffefff) AM_READ(MRA16_RAM) + AM_RANGE(0xffd000, 0xffdfff) AM_READ(SMH_RAM) + AM_RANGE(0xffe000, 0xffefff) AM_READ(SMH_RAM) AM_RANGE(0xfff000, 0xfff001) AM_READ(input_port_0_word_r) // AM_RANGE(0xfff002, 0xfff003) analog wheel? AM_RANGE(0xfff004, 0xfff005) AM_READ(input_port_1_word_r) @@ -154,42 +154,42 @@ static ADDRESS_MAP_START( f1gp2_readmem1, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( f1gp2_writemem1, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0xa00000, 0xa07fff) AM_WRITE(MWA16_RAM) AM_BASE(&f1gp2_sprcgram) // SPR-1 CG RAM + SPR-2 CG RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xa00000, 0xa07fff) AM_WRITE(SMH_RAM) AM_BASE(&f1gp2_sprcgram) // SPR-1 CG RAM + SPR-2 CG RAM AM_RANGE(0xd00000, 0xd01fff) AM_WRITE(f1gp_rozvideoram_w) AM_BASE(&f1gp_rozvideoram) // BACK VRAM - AM_RANGE(0xe00000, 0xe00fff) AM_WRITE(MWA16_RAM) AM_BASE(&f1gp2_spritelist) // not checked + SPR-1 VRAM + SPR-2 VRAM - AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(MWA16_RAM) // WORK RAM-1 + AM_RANGE(0xe00000, 0xe00fff) AM_WRITE(SMH_RAM) AM_BASE(&f1gp2_spritelist) // not checked + SPR-1 VRAM + SPR-2 VRAM + AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(SMH_RAM) // WORK RAM-1 AM_RANGE(0xffc000, 0xffcfff) AM_WRITE(sharedram_w) AM_BASE(&sharedram) // DUAL RAM AM_RANGE(0xffd000, 0xffdfff) AM_WRITE(f1gp_fgvideoram_w) AM_BASE(&f1gp_fgvideoram) // CHARACTER AM_RANGE(0xffe000, 0xffefff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // PALETTE AM_RANGE(0xfff000, 0xfff001) AM_WRITE(f1gp2_gfxctrl_w) AM_RANGE(0xfff008, 0xfff009) AM_WRITE(sound_command_w) - AM_RANGE(0xfff020, 0xfff02f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) + AM_RANGE(0xfff020, 0xfff02f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) AM_RANGE(0xfff044, 0xfff047) AM_WRITE(f1gp_fgscroll_w) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) - AM_RANGE(0xff8000, 0xffbfff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) + AM_RANGE(0xff8000, 0xffbfff) AM_READ(SMH_RAM) AM_RANGE(0xffc000, 0xffcfff) AM_READ(sharedram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(SMH_RAM) AM_RANGE(0xffc000, 0xffcfff) AM_WRITE(sharedram_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index f1b585b9278..ac68e67236d 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -120,7 +120,7 @@ static ADDRESS_MAP_START( fantland_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x00000, 0x07fff ) AM_RAM AM_RANGE( 0x08000, 0x7ffff ) AM_ROM - AM_RANGE( 0xa2000, 0xa21ff ) AM_READWRITE( MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w ) AM_BASE( &paletteram16 ) + AM_RANGE( 0xa2000, 0xa21ff ) AM_READWRITE( SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w ) AM_BASE( &paletteram16 ) AM_RANGE( 0xa3000, 0xa3001 ) AM_READWRITE( input_port_0_word_r, fantland_nmi_enable_16_w ) AM_RANGE( 0xa3002, 0xa3003 ) AM_READWRITE( input_port_1_word_r, fantland_soundlatch_16_w ) @@ -140,7 +140,7 @@ static ADDRESS_MAP_START( galaxygn_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x00000, 0x07fff ) AM_RAM AM_RANGE( 0x10000, 0x2ffff ) AM_ROM - AM_RANGE( 0x52000, 0x521ff ) AM_READWRITE( MRA8_RAM, paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_BASE( &paletteram ) + AM_RANGE( 0x52000, 0x521ff ) AM_READWRITE( SMH_RAM, paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_BASE( &paletteram ) AM_RANGE( 0x53000, 0x53000 ) AM_READWRITE( input_port_0_r, fantland_nmi_enable_w ) AM_RANGE( 0x53001, 0x53001 ) AM_READ( input_port_1_r ) @@ -219,7 +219,7 @@ static ADDRESS_MAP_START( borntofi_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x00000, 0x07fff ) AM_RAM AM_RANGE( 0x10000, 0x2ffff ) AM_ROM - AM_RANGE( 0x52000, 0x521ff ) AM_READWRITE( MRA8_RAM, paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_BASE( &paletteram ) + AM_RANGE( 0x52000, 0x521ff ) AM_READWRITE( SMH_RAM, paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_BASE( &paletteram ) AM_RANGE( 0x53000, 0x53001 ) AM_READWRITE( borntofi_inputs_r, borntofi_nmi_enable_w ) AM_RANGE( 0x53002, 0x53002 ) AM_READWRITE( input_port_6_r, fantland_soundlatch_w ) AM_RANGE( 0x53003, 0x53003 ) AM_READ( input_port_7_r ) @@ -248,12 +248,12 @@ static ADDRESS_MAP_START( wheelrun_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x30000, 0x3ffff) AM_ROM AM_RANGE(0x70000, 0x7ffff) AM_ROM - AM_RANGE(0x52000, 0x521ff) AM_READWRITE(MRA8_RAM, paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_BASE(&paletteram ) + AM_RANGE(0x52000, 0x521ff) AM_READWRITE(SMH_RAM, paletteram_xRRRRRGGGGGBBBBB_le_w ) AM_BASE(&paletteram ) AM_RANGE(0x53000, 0x53000) AM_READWRITE( input_port_0_r, borntofi_nmi_enable_w ) AM_RANGE(0x53001, 0x53001) AM_READ( input_port_1_r ) AM_RANGE(0x53002, 0x53002) AM_READWRITE( input_port_2_r, fantland_soundlatch_w ) - AM_RANGE(0x53003, 0x53003) AM_READWRITE( input_port_3_r, MWA8_NOP) + AM_RANGE(0x53003, 0x53003) AM_READWRITE( input_port_3_r, SMH_NOP) AM_RANGE(0x54000, 0x567ff) AM_RAM AM_BASE(&spriteram ) AM_RANGE(0x60000, 0x6ffff) AM_RAM AM_BASE(&spriteram_2 ) @@ -387,8 +387,8 @@ static ADDRESS_MAP_START( wheelrun_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xa000) AM_READWRITE( YM3526_status_port_0_r, YM3526_control_port_0_w ) AM_RANGE(0xa001, 0xa001) AM_WRITE( YM3526_write_port_0_w ) - AM_RANGE(0xb000, 0xb000) AM_WRITE( MWA8_NOP ) // on a car crash / hit - AM_RANGE(0xc000, 0xc000) AM_WRITE( MWA8_NOP ) // "" + AM_RANGE(0xb000, 0xb000) AM_WRITE( SMH_NOP ) // on a car crash / hit + AM_RANGE(0xc000, 0xc000) AM_WRITE( SMH_NOP ) // "" AM_RANGE(0xd000, 0xd000) AM_READ( soundlatch_r ) // during NMI ADDRESS_MAP_END diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c index e9ffd31bb86..6adb06187cf 100644 --- a/src/mame/drivers/fastfred.c +++ b/src/mame/drivers/fastfred.c @@ -113,13 +113,13 @@ static READ8_HANDLER( jumpcoas_custom_io_r ) static ADDRESS_MAP_START( fastfred_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xd000, 0xd3ff) AM_MIRROR(0x400) AM_READWRITE(MRA8_RAM, fastfred_videoram_w) AM_BASE(&fastfred_videoram) - AM_RANGE(0xd800, 0xd83f) AM_READWRITE(MRA8_RAM, fastfred_attributes_w) AM_BASE(&fastfred_attributesram) + AM_RANGE(0xd000, 0xd3ff) AM_MIRROR(0x400) AM_READWRITE(SMH_RAM, fastfred_videoram_w) AM_BASE(&fastfred_videoram) + AM_RANGE(0xd800, 0xd83f) AM_READWRITE(SMH_RAM, fastfred_attributes_w) AM_BASE(&fastfred_attributesram) AM_RANGE(0xd840, 0xd85f) AM_RAM AM_BASE(&fastfred_spriteram) AM_SIZE(&fastfred_spriteram_size) AM_RANGE(0xd860, 0xdbff) AM_RAM // Unused, but initialized - AM_RANGE(0xe000, 0xe000) AM_READWRITE(input_port_0_r, MWA8_RAM) AM_BASE(&fastfred_background_color) + AM_RANGE(0xe000, 0xe000) AM_READWRITE(input_port_0_r, SMH_RAM) AM_BASE(&fastfred_background_color) AM_RANGE(0xe800, 0xe800) AM_READ(input_port_1_r) - AM_RANGE(0xf000, 0xf000) AM_READWRITE(input_port_2_r, MWA8_NOP) + AM_RANGE(0xf000, 0xf000) AM_READWRITE(input_port_2_r, SMH_NOP) AM_RANGE(0xf001, 0xf001) AM_WRITE(interrupt_enable_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(fastfred_colorbank1_w) AM_RANGE(0xf003, 0xf003) AM_WRITE(fastfred_colorbank2_w) @@ -136,16 +136,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jumpcoas_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xd000, 0xd03f) AM_READWRITE(MRA8_RAM, fastfred_attributes_w) AM_BASE(&fastfred_attributesram) + AM_RANGE(0xd000, 0xd03f) AM_READWRITE(SMH_RAM, fastfred_attributes_w) AM_BASE(&fastfred_attributesram) AM_RANGE(0xd040, 0xd05f) AM_RAM AM_BASE(&fastfred_spriteram) AM_SIZE(&fastfred_spriteram_size) AM_RANGE(0xd060, 0xd3ff) AM_RAM - AM_RANGE(0xd800, 0xdbff) AM_MIRROR(0x400) AM_READWRITE(MRA8_RAM, fastfred_videoram_w) AM_BASE(&fastfred_videoram) - AM_RANGE(0xe000, 0xe000) AM_WRITE(MWA8_RAM) AM_BASE(&fastfred_background_color) + AM_RANGE(0xd800, 0xdbff) AM_MIRROR(0x400) AM_READWRITE(SMH_RAM, fastfred_videoram_w) AM_BASE(&fastfred_videoram) + AM_RANGE(0xe000, 0xe000) AM_WRITE(SMH_RAM) AM_BASE(&fastfred_background_color) AM_RANGE(0xe800, 0xe800) AM_READ(input_port_0_r) AM_RANGE(0xe801, 0xe801) AM_READ(input_port_1_r) AM_RANGE(0xe802, 0xe802) AM_READ(input_port_2_r) AM_RANGE(0xe803, 0xe803) AM_READ(input_port_3_r) - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) // Unused, but initialized + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) // Unused, but initialized AM_RANGE(0xf001, 0xf001) AM_WRITE(interrupt_enable_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(fastfred_colorbank1_w) AM_RANGE(0xf003, 0xf003) AM_WRITE(fastfred_colorbank2_w) @@ -156,7 +156,7 @@ static ADDRESS_MAP_START( jumpcoas_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf116, 0xf116) AM_WRITE(fastfred_flip_screen_x_w) AM_RANGE(0xf117, 0xf117) AM_WRITE(fastfred_flip_screen_y_w) //AM_RANGE(0xf800, 0xf800) AM_READ(watchdog_reset_r) // Why doesn't this work??? - AM_RANGE(0xf800, 0xf800) AM_READWRITE(MRA8_NOP, AY8910_control_port_0_w) + AM_RANGE(0xf800, 0xf800) AM_READWRITE(SMH_NOP, AY8910_control_port_0_w) AM_RANGE(0xf801, 0xf801) AM_WRITE(AY8910_write_port_0_w) ADDRESS_MAP_END @@ -166,34 +166,34 @@ static ADDRESS_MAP_START( imago_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x6fff) AM_ROM AM_RANGE(0xb000, 0xb3ff) AM_RAM AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xc800, 0xcbff) AM_READWRITE(MRA8_RAM, imago_fg_videoram_w) AM_BASE(&imago_fg_videoram) - AM_RANGE(0xd000, 0xd3ff) AM_READWRITE(MRA8_RAM, fastfred_videoram_w) AM_BASE(&fastfred_videoram) - AM_RANGE(0xd800, 0xd83f) AM_READWRITE(MRA8_RAM, fastfred_attributes_w) AM_BASE(&fastfred_attributesram) + AM_RANGE(0xc800, 0xcbff) AM_READWRITE(SMH_RAM, imago_fg_videoram_w) AM_BASE(&imago_fg_videoram) + AM_RANGE(0xd000, 0xd3ff) AM_READWRITE(SMH_RAM, fastfred_videoram_w) AM_BASE(&fastfred_videoram) + AM_RANGE(0xd800, 0xd83f) AM_READWRITE(SMH_RAM, fastfred_attributes_w) AM_BASE(&fastfred_attributesram) AM_RANGE(0xd840, 0xd85f) AM_RAM AM_BASE(&fastfred_spriteram) AM_SIZE(&fastfred_spriteram_size) AM_RANGE(0xd860, 0xd8ff) AM_RAM // Unused, but initialized AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) AM_RANGE(0xe800, 0xe800) AM_READ(input_port_1_r) - AM_RANGE(0xf000, 0xf000) AM_READWRITE(input_port_2_r, MWA8_NOP) // writes 1 when level starts, 0 when game over + AM_RANGE(0xf000, 0xf000) AM_READWRITE(input_port_2_r, SMH_NOP) // writes 1 when level starts, 0 when game over AM_RANGE(0xf001, 0xf001) AM_WRITE(interrupt_enable_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(fastfred_colorbank1_w) AM_RANGE(0xf003, 0xf003) AM_WRITE(fastfred_colorbank2_w) - AM_RANGE(0xf004, 0xf004) AM_WRITE(MWA8_NOP) // initialized with 0 then when written always 1 + AM_RANGE(0xf004, 0xf004) AM_WRITE(SMH_NOP) // initialized with 0 then when written always 1 AM_RANGE(0xf005, 0xf005) AM_WRITE(imago_charbank_w) AM_RANGE(0xf006, 0xf006) AM_WRITE(fastfred_flip_screen_x_w) // always 0 AM_RANGE(0xf007, 0xf007) AM_WRITE(fastfred_flip_screen_y_w) // always 0 - AM_RANGE(0xf800, 0xf800) AM_READWRITE(MRA8_NOP, soundlatch_w) + AM_RANGE(0xf800, 0xf800) AM_READWRITE(SMH_NOP, soundlatch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x23ff) AM_RAM AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r, interrupt_enable_w) - AM_RANGE(0x4000, 0x4000) AM_WRITE(MWA8_RAM) // Reset PSG's + AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_RAM) // Reset PSG's AM_RANGE(0x5000, 0x5000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x5001, 0x5001) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x6001, 0x6001) AM_WRITE(AY8910_write_port_1_w) - AM_RANGE(0x7000, 0x7000) AM_READ(MRA8_NOP) // only for Imago, read but not used + AM_RANGE(0x7000, 0x7000) AM_READ(SMH_NOP) // only for Imago, read but not used ADDRESS_MAP_END @@ -873,21 +873,21 @@ static DRIVER_INIT( flyboyb ) static DRIVER_INIT( fastfred ) { - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc800, 0xcfff, 0, 0, MWA8_NOP ); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc800, 0xcfff, 0, 0, SMH_NOP ); memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc800, 0xcfff, 0, 0, fastfred_custom_io_r); fastfred_hardware_type = 1; } static DRIVER_INIT( jumpcoas ) { - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc800, 0xcfff, 0, 0, MWA8_NOP ); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc800, 0xcfff, 0, 0, SMH_NOP ); memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc800, 0xcfff, 0, 0, jumpcoas_custom_io_r); fastfred_hardware_type = 0; } static DRIVER_INIT( boggy84 ) { - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc800, 0xcfff, 0, 0, MWA8_NOP ); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc800, 0xcfff, 0, 0, SMH_NOP ); memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc800, 0xcfff, 0, 0, jumpcoas_custom_io_r); fastfred_hardware_type = 2; } diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c index e62531371d0..3049dd0fda3 100644 --- a/src/mame/drivers/fastlane.c +++ b/src/mame/drivers/fastlane.c @@ -89,7 +89,7 @@ static WRITE8_HANDLER( fastlane_K007232_write_port_1_w ) static ADDRESS_MAP_START( fastlane_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x005f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x005f) AM_READ(SMH_RAM) AM_RANGE(0x0800, 0x0800) AM_READ(input_port_2_r) /* DIPSW #3 */ AM_RANGE(0x0801, 0x0801) AM_READ(input_port_5_r) /* 2P inputs */ AM_RANGE(0x0802, 0x0802) AM_READ(input_port_4_r) /* 1P inputs */ @@ -99,10 +99,10 @@ static ADDRESS_MAP_START( fastlane_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0d00, 0x0d0d) AM_READ(fastlane_K007232_read_port_0_r)/* 007232 registers (chip 1) */ AM_RANGE(0x0e00, 0x0e0d) AM_READ(fastlane_K007232_read_port_1_r)/* 007232 registers (chip 2) */ AM_RANGE(0x0f00, 0x0f1f) AM_READ(K051733_r) /* 051733 (protection) */ - AM_RANGE(0x1000, 0x1fff) AM_READ(MRA8_RAM) /* Palette RAM/Work RAM */ - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM) /* Video RAM + Sprite RAM */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x1000, 0x1fff) AM_READ(SMH_RAM) /* Palette RAM/Work RAM */ + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_RAM) /* Video RAM + Sprite RAM */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( fastlane_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -112,12 +112,12 @@ static ADDRESS_MAP_START( fastlane_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0d00, 0x0d0d) AM_WRITE(fastlane_K007232_write_port_0_w) /* 007232 registers (chip 1) */ AM_RANGE(0x0e00, 0x0e0d) AM_WRITE(fastlane_K007232_write_port_1_w) /* 007232 registers (chip 2) */ AM_RANGE(0x0f00, 0x0f1f) AM_WRITE(K051733_w) /* 051733 (protection) */ - AM_RANGE(0x1000, 0x17ff) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram)/* palette RAM */ - AM_RANGE(0x1800, 0x1fff) AM_WRITE(MWA8_RAM) /* Work RAM */ + AM_RANGE(0x1000, 0x17ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram)/* palette RAM */ + AM_RANGE(0x1800, 0x1fff) AM_WRITE(SMH_RAM) /* Work RAM */ AM_RANGE(0x2000, 0x27ff) AM_WRITE(fastlane_vram1_w) AM_BASE(&fastlane_videoram1) AM_RANGE(0x2800, 0x2fff) AM_WRITE(fastlane_vram2_w) AM_BASE(&fastlane_videoram2) - AM_RANGE(0x3000, 0x3fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) /* Sprite RAM */ - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM/banked ROM */ + AM_RANGE(0x3000, 0x3fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) /* Sprite RAM */ + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) /* ROM/banked ROM */ ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index 532d4c083f1..bd353c2ab85 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -194,23 +194,23 @@ static VIDEO_UPDATE( fcrash ) static ADDRESS_MAP_START( fcrash_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) /* 68000 ROM */ + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) /* 68000 ROM */ AM_RANGE(0x880000, 0x880001) AM_READ(cps1_in1_r) /* Player input ports */ AM_RANGE(0x880008, 0x880009) AM_READ(cps1_in0_r) /* System input ports */ AM_RANGE(0x88000a, 0x88000f) AM_READ(cps1_dsw_r) /* Dip Switches */ AM_RANGE(0x800100, 0x8001ff) AM_READ(cps1_output_r) /* Output ports */ - AM_RANGE(0x900000, 0x92ffff) AM_READ(MRA16_RAM) /* SF2CE executes code from here */ + AM_RANGE(0x900000, 0x92ffff) AM_READ(SMH_RAM) /* SF2CE executes code from here */ AM_RANGE(0xf1c000, 0xf1c001) AM_READ(cps1_in2_r) AM_RANGE(0xf1c002, 0xf1c003) AM_READ(cps1_in3_r) - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( fcrash_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x800030, 0x800031) AM_WRITE(cps1_coinctrl_w) AM_RANGE(0x800100, 0x8001ff) AM_WRITE(cps1_output_w) AM_BASE(&cps1_output) AM_SIZE(&cps1_output_size) /* Output ports */ AM_RANGE(0x900000, 0x92ffff) AM_WRITE(cps1_gfxram_w) AM_BASE(&cps1_gfxram) AM_SIZE(&cps1_gfxram_size) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) /* RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) /* RAM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/filetto.c b/src/mame/drivers/filetto.c index 6de02343b42..a5dd41d6ca2 100644 --- a/src/mame/drivers/filetto.c +++ b/src/mame/drivers/filetto.c @@ -538,8 +538,8 @@ 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, 0xb7fff) AM_RAM //VGA RAM - AM_RANGE(0xa0000, 0xbffff) AM_READWRITE(MRA8_RAM,vga_vram_w) AM_BASE(&vga_vram)//VGA RAM - AM_RANGE(0xc0000, 0xcffff) AM_READ(MRA8_BANK1) + AM_RANGE(0xa0000, 0xbffff) AM_READWRITE(SMH_RAM,vga_vram_w) AM_BASE(&vga_vram)//VGA RAM + AM_RANGE(0xc0000, 0xcffff) AM_READ(SMH_BANK1) AM_RANGE(0xf0000, 0xfffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c index 57d2ac466c2..060ec8a90ca 100644 --- a/src/mame/drivers/finalizr.c +++ b/src/mame/drivers/finalizr.c @@ -107,39 +107,39 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0811, 0x0811) AM_READ(input_port_1_r) AM_RANGE(0x0812, 0x0812) AM_READ(input_port_2_r) AM_RANGE(0x0813, 0x0813) AM_READ(input_port_3_r) - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0001, 0x0001) AM_WRITE(MWA8_RAM) AM_BASE(&finalizr_scroll) + AM_RANGE(0x0001, 0x0001) AM_WRITE(SMH_RAM) AM_BASE(&finalizr_scroll) AM_RANGE(0x0003, 0x0003) AM_WRITE(finalizr_videoctrl_w) - AM_RANGE(0x0004, 0x0004) AM_WRITE(MWA8_RAM) AM_BASE(&finalizr_interrupt_enable) -// AM_RANGE(0x0020, 0x003f) AM_WRITE(MWA8_RAM) AM_BASE(&finalizr_scroll) + AM_RANGE(0x0004, 0x0004) AM_WRITE(SMH_RAM) AM_BASE(&finalizr_interrupt_enable) +// AM_RANGE(0x0020, 0x003f) AM_WRITE(SMH_RAM) AM_BASE(&finalizr_scroll) AM_RANGE(0x0818, 0x0818) AM_WRITE(watchdog_reset_w) AM_RANGE(0x0819, 0x0819) AM_WRITE(finalizr_coin_w) AM_RANGE(0x081a, 0x081a) AM_WRITE(SN76496_0_w) /* This address triggers the SN chip to read the data port. */ - AM_RANGE(0x081b, 0x081b) AM_WRITE(MWA8_NOP) /* Loads the snd command into the snd latch */ + AM_RANGE(0x081b, 0x081b) AM_WRITE(SMH_NOP) /* Loads the snd command into the snd latch */ AM_RANGE(0x081c, 0x081c) AM_WRITE(finalizr_i8039_irq_w) /* custom sound chip */ AM_RANGE(0x081d, 0x081d) AM_WRITE(soundlatch_w) /* custom sound chip */ - AM_RANGE(0x2000, 0x23ff) AM_WRITE(MWA8_RAM) AM_BASE(&colorram) - AM_RANGE(0x2400, 0x27ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2800, 0x2bff) AM_WRITE(MWA8_RAM) AM_BASE(&finalizr_colorram2) - AM_RANGE(0x2c00, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&finalizr_videoram2) - AM_RANGE(0x3000, 0x31ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x3200, 0x37ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x3800, 0x39ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x3a00, 0x3fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM) AM_BASE(&colorram) + AM_RANGE(0x2400, 0x27ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x2800, 0x2bff) AM_WRITE(SMH_RAM) AM_BASE(&finalizr_colorram2) + AM_RANGE(0x2c00, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&finalizr_videoram2) + AM_RANGE(0x3000, 0x31ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3200, 0x37ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x3800, 0x39ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x3a00, 0x3fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c index 5fdcf61075d..aacca076e25 100644 --- a/src/mame/drivers/findout.c +++ b/src/mame/drivers/findout.c @@ -181,19 +181,19 @@ static WRITE8_HANDLER( signature_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0x4800, 0x4803) AM_READ(ppi8255_0_r) AM_RANGE(0x5000, 0x5003) AM_READ(ppi8255_1_r) AM_RANGE(0x6400, 0x6400) AM_READ(signature_r) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) AM_RANGE(0x0000, 0xffff) AM_READ(catchall) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x4800, 0x4803) AM_WRITE(ppi8255_0_w) AM_RANGE(0x5000, 0x5003) AM_WRITE(ppi8255_1_w) /* banked ROMs are enabled by low 6 bits of the address */ @@ -204,10 +204,10 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x602f, 0x602f) AM_WRITE(banksel_5_w) AM_RANGE(0x601f, 0x601f) AM_WRITE(banksel_main_w) AM_RANGE(0x6200, 0x6200) AM_WRITE(signature_w) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_ROM) /* space for diagnostic ROM? */ + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_ROM) /* space for diagnostic ROM? */ AM_RANGE(0x8000, 0x8002) AM_WRITE(findout_drawctrl_w) AM_RANGE(0xc000, 0xffff) AM_WRITE(findout_bitmap_w) AM_BASE(&videoram) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* overlapped by the above */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* overlapped by the above */ ADDRESS_MAP_END diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index b660cf9fae0..eb801190803 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -244,9 +244,9 @@ static WRITE8_HANDLER( flip_screen_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xe97f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xe97f) AM_READ(SMH_RAM) AM_RANGE(0xf010, 0xf010) AM_READ(input_port_0_r) AM_RANGE(0xf011, 0xf011) AM_READ(input_port_1_r) AM_RANGE(0xf012, 0xf012) AM_READ(input_port_2_r) @@ -256,13 +256,13 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(firetrap_bg1videoram_w) AM_BASE(&firetrap_bg1videoram) AM_RANGE(0xd800, 0xdfff) AM_WRITE(firetrap_bg2videoram_w) AM_BASE(&firetrap_bg2videoram) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(firetrap_fgvideoram_w) AM_BASE(&firetrap_fgvideoram) - AM_RANGE(0xe800, 0xe97f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* IRQ acknowledge */ + AM_RANGE(0xe800, 0xe97f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* IRQ acknowledge */ AM_RANGE(0xf001, 0xf001) AM_WRITE(firetrap_sound_command_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(firetrap_bankselect_w) AM_RANGE(0xf003, 0xf003) AM_WRITE(flip_screen_w) @@ -275,53 +275,53 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_bootleg, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xe97f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xe97f) AM_READ(SMH_RAM) AM_RANGE(0xf010, 0xf010) AM_READ(input_port_0_r) AM_RANGE(0xf011, 0xf011) AM_READ(input_port_1_r) AM_RANGE(0xf012, 0xf012) AM_READ(input_port_2_r) AM_RANGE(0xf013, 0xf013) AM_READ(input_port_3_r) AM_RANGE(0xf014, 0xf014) AM_READ(input_port_4_r) AM_RANGE(0xf016, 0xf016) AM_READ(firetrap_8751_bootleg_r) - AM_RANGE(0xf800, 0xf8ff) AM_READ(MRA8_ROM) /* extra ROM in the bootleg with unprotection code */ + AM_RANGE(0xf800, 0xf8ff) AM_READ(SMH_ROM) /* extra ROM in the bootleg with unprotection code */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_bootleg, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(firetrap_bg1videoram_w) AM_BASE(&firetrap_bg1videoram) AM_RANGE(0xd800, 0xdfff) AM_WRITE(firetrap_bg2videoram_w) AM_BASE(&firetrap_bg2videoram) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(firetrap_fgvideoram_w) AM_BASE(&firetrap_fgvideoram) - AM_RANGE(0xe800, 0xe97f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* IRQ acknowledge */ + AM_RANGE(0xe800, 0xe97f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* IRQ acknowledge */ AM_RANGE(0xf001, 0xf001) AM_WRITE(firetrap_sound_command_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(firetrap_bankselect_w) AM_RANGE(0xf003, 0xf003) AM_WRITE(flip_screen_w) AM_RANGE(0xf004, 0xf004) AM_WRITE(firetrap_nmi_disable_w) - AM_RANGE(0xf005, 0xf005) AM_WRITE(MWA8_NOP) + AM_RANGE(0xf005, 0xf005) AM_WRITE(SMH_NOP) AM_RANGE(0xf008, 0xf009) AM_WRITE(firetrap_bg1_scrollx_w) AM_RANGE(0xf00a, 0xf00b) AM_WRITE(firetrap_bg1_scrolly_w) AM_RANGE(0xf00c, 0xf00d) AM_WRITE(firetrap_bg2_scrollx_w) AM_RANGE(0xf00e, 0xf00f) AM_WRITE(firetrap_bg2_scrolly_w) - AM_RANGE(0xf800, 0xf8ff) AM_WRITE(MWA8_ROM) /* extra ROM in the bootleg with unprotection code */ + AM_RANGE(0xf800, 0xf8ff) AM_WRITE(SMH_ROM) /* extra ROM in the bootleg with unprotection code */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x3400, 0x3400) AM_READ(soundlatch_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK2) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3526_control_port_0_w) AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3526_write_port_0_w) AM_RANGE(0x2000, 0x2000) AM_WRITE(firetrap_adpcm_data_w) /* ADPCM data for the MSM5205 chip */ AM_RANGE(0x2400, 0x2400) AM_WRITE(firetrap_sound_2400_w) AM_RANGE(0x2800, 0x2800) AM_WRITE(firetrap_sound_bankselect_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c index 8f675ae5397..5a67d90e1ae 100644 --- a/src/mame/drivers/firetrk.c +++ b/src/mame/drivers/firetrk.c @@ -317,23 +317,23 @@ static ADDRESS_MAP_START( firetrk_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM AM_BASE(&firetrk_alpha_num_ram) AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0700) AM_RAM AM_BASE(&firetrk_playfield_ram) - AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_scroll_y) - AM_RANGE(0x1020, 0x1020) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_scroll_x) + AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_scroll_y) + AM_RANGE(0x1020, 0x1020) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_scroll_x) AM_RANGE(0x1040, 0x1040) AM_MIRROR(0x001f) AM_WRITE(crash_reset_w) AM_RANGE(0x1060, 0x1060) AM_MIRROR(0x001f) AM_WRITE(firetrk_skid_reset_w) - AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_car_rot) + AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_car_rot) AM_RANGE(0x10a0, 0x10a0) AM_MIRROR(0x001f) AM_WRITE(steer_reset_w) AM_RANGE(0x10c0, 0x10c0) AM_MIRROR(0x001f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x10e0, 0x10e0) AM_MIRROR(0x001f) AM_WRITE(blink_on_w) AM_BASE(&firetrk_blink) AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x001f) AM_WRITE(firetrk_motor_snd_w) AM_RANGE(0x1420, 0x1420) AM_MIRROR(0x001f) AM_WRITE(firetrk_crash_snd_w) AM_RANGE(0x1440, 0x1440) AM_MIRROR(0x001f) AM_WRITE(firetrk_skid_snd_w) - AM_RANGE(0x1460, 0x1460) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_drone_x) - AM_RANGE(0x1480, 0x1480) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_drone_y) - AM_RANGE(0x14a0, 0x14a0) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_drone_rot) + AM_RANGE(0x1460, 0x1460) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_drone_x) + AM_RANGE(0x1480, 0x1480) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_drone_y) + AM_RANGE(0x14a0, 0x14a0) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_drone_rot) AM_RANGE(0x14c0, 0x14c0) AM_MIRROR(0x001f) AM_WRITE(firetrk_output_w) AM_RANGE(0x14e0, 0x14e0) AM_MIRROR(0x001f) AM_WRITE(firetrk_xtndply_w) - AM_RANGE(0x1800, 0x1807) AM_MIRROR(0x03f8) AM_READWRITE(firetrk_input_r, MWA8_NOP) + AM_RANGE(0x1800, 0x1807) AM_MIRROR(0x03f8) AM_READWRITE(firetrk_input_r, SMH_NOP) AM_RANGE(0x1c00, 0x1c03) AM_MIRROR(0x03fc) AM_READ(firetrk_dip_r) AM_RANGE(0x2000, 0x3fff) AM_ROM ADDRESS_MAP_END @@ -342,11 +342,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( superbug_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x1fff) AM_RANGE(0x0000, 0x00ff) AM_RAM - AM_RANGE(0x0100, 0x0100) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_scroll_y) - AM_RANGE(0x0120, 0x0120) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_scroll_x) + AM_RANGE(0x0100, 0x0100) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_scroll_y) + AM_RANGE(0x0120, 0x0120) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_scroll_x) AM_RANGE(0x0140, 0x0140) AM_MIRROR(0x001f) AM_WRITE(crash_reset_w) AM_RANGE(0x0160, 0x0160) AM_MIRROR(0x001f) AM_WRITE(firetrk_skid_reset_w) - AM_RANGE(0x0180, 0x0180) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_car_rot) + AM_RANGE(0x0180, 0x0180) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_car_rot) AM_RANGE(0x01a0, 0x01a0) AM_MIRROR(0x001f) AM_WRITE(steer_reset_w) AM_RANGE(0x01c0, 0x01c0) AM_MIRROR(0x001f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x01e0, 0x01e0) AM_MIRROR(0x001f) AM_WRITE(blink_on_w) AM_BASE(&firetrk_blink) @@ -367,23 +367,23 @@ static ADDRESS_MAP_START( montecar_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM AM_BASE(&firetrk_alpha_num_ram) AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0700) AM_RAM AM_BASE(&firetrk_playfield_ram) - AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_scroll_y) - AM_RANGE(0x1020, 0x1020) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_scroll_x) + AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_scroll_y) + AM_RANGE(0x1020, 0x1020) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_scroll_x) AM_RANGE(0x1040, 0x1040) AM_MIRROR(0x001f) AM_WRITE(montecar_drone_reset_w) AM_RANGE(0x1060, 0x1060) AM_MIRROR(0x001f) AM_WRITE(montecar_car_reset_w) - AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_car_rot) + AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_car_rot) AM_RANGE(0x10a0, 0x10a0) AM_MIRROR(0x001f) AM_WRITE(steer_reset_w) AM_RANGE(0x10c0, 0x10c0) AM_MIRROR(0x001f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x10e0, 0x10e0) AM_MIRROR(0x001f) AM_WRITE(montecar_skid_reset_w) AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x001f) AM_WRITE(firetrk_motor_snd_w) AM_RANGE(0x1420, 0x1420) AM_MIRROR(0x001f) AM_WRITE(firetrk_crash_snd_w) AM_RANGE(0x1440, 0x1440) AM_MIRROR(0x001f) AM_WRITE(firetrk_skid_snd_w) - AM_RANGE(0x1460, 0x1460) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_drone_x) - AM_RANGE(0x1480, 0x1480) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_drone_y) - AM_RANGE(0x14a0, 0x14a0) AM_MIRROR(0x001f) AM_WRITE(MWA8_RAM) AM_BASE(&firetrk_drone_rot) + AM_RANGE(0x1460, 0x1460) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_drone_x) + AM_RANGE(0x1480, 0x1480) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_drone_y) + AM_RANGE(0x14a0, 0x14a0) AM_MIRROR(0x001f) AM_WRITE(SMH_RAM) AM_BASE(&firetrk_drone_rot) AM_RANGE(0x14c0, 0x14c0) AM_MIRROR(0x001f) AM_WRITE(montecar_output_1_w) AM_RANGE(0x14e0, 0x14e0) AM_MIRROR(0x001f) AM_WRITE(montecar_output_2_w) - AM_RANGE(0x1800, 0x1807) AM_MIRROR(0x03f8) AM_READWRITE(montecar_input_r, MWA8_NOP) + AM_RANGE(0x1800, 0x1807) AM_MIRROR(0x03f8) AM_READWRITE(montecar_input_r, SMH_NOP) AM_RANGE(0x1c00, 0x1c03) AM_MIRROR(0x03fc) AM_READ(montecar_dip_r) AM_RANGE(0x2000, 0x3fff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c index acce64b4971..ccdfd8dcc11 100644 --- a/src/mame/drivers/fitfight.c +++ b/src/mame/drivers/fitfight.c @@ -141,7 +141,7 @@ static WRITE16_HANDLER(fitfight_700000_w) static ADDRESS_MAP_START( fitfight_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA16_RAM) AM_BASE(&fof_100000) + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_RAM) AM_BASE(&fof_100000) //written at scanline 5, allways 1. Used by histryma/fitfight @0x0000ec2c/@0x0000f076 AM_RANGE(0x200000, 0x200001) AM_READ(input_port_0_word_r) @@ -149,7 +149,7 @@ static ADDRESS_MAP_START( fitfight_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400001) AM_READ(input_port_2_word_r) AM_RANGE(0x500000, 0x500001) AM_READ(input_port_3_word_r) - AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_RAM) AM_BASE(&fof_600000) + AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_RAM) AM_BASE(&fof_600000) // Is 0x600000 controlling the slave audio CPU? data is 0x1111000zzzzzzzzz (9 sign. bits) // Used by histryma/fitfight: // @0x000031ae/0x00002b3a: 0xF000, once, during POST @@ -163,27 +163,27 @@ static ADDRESS_MAP_START( fitfight_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700000, 0x700001) AM_WRITE(fitfight_700000_w) AM_BASE(&fof_700000) // kept at 0xe07900/0xe04c56 - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_RAM) AM_BASE(&fof_800000) + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_RAM) AM_BASE(&fof_800000) //written at scanline 1, allways 0. Used by histryma/fitfight @0x00001d76/@0x00000f6a - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_RAM) AM_BASE(&fof_900000) //mid tilemap scroll + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_RAM) AM_BASE(&fof_900000) //mid tilemap scroll // fitfigth: @0x00002b42,@0x00000f76 // histryma: @0x000031b6,@0x00001d82 - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_RAM) AM_BASE(&fof_a00000) //bak tilemap scroll + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_RAM) AM_BASE(&fof_a00000) //bak tilemap scroll // fitfight: @0x00002b4a,@0x00000f82 // histryma: @0x000031be,@0x00001d8e AM_RANGE(0xb00000, 0xb03fff) AM_WRITENOP /* unused layer? */ - AM_RANGE(0xb04000, 0xb07fff) AM_READWRITE(MRA16_RAM,fof_bak_tileram_w) AM_BASE(&fof_bak_tileram) - AM_RANGE(0xb08000, 0xb0bfff) AM_READWRITE(MRA16_RAM,fof_mid_tileram_w) AM_BASE(&fof_mid_tileram) - AM_RANGE(0xb0c000, 0xb0ffff) AM_READWRITE(MRA16_RAM,fof_txt_tileram_w) AM_BASE(&fof_txt_tileram) + AM_RANGE(0xb04000, 0xb07fff) AM_READWRITE(SMH_RAM,fof_bak_tileram_w) AM_BASE(&fof_bak_tileram) + AM_RANGE(0xb08000, 0xb0bfff) AM_READWRITE(SMH_RAM,fof_mid_tileram_w) AM_BASE(&fof_mid_tileram) + AM_RANGE(0xb0c000, 0xb0ffff) AM_READWRITE(SMH_RAM,fof_txt_tileram_w) AM_BASE(&fof_txt_tileram) AM_RANGE(0xb10000, 0xb13fff) AM_WRITENOP //used by histryma @0x0000b25a AM_RANGE(0xb14000, 0xb17fff) AM_WRITENOP //used by histryma @0x0000b25a,b270 AM_RANGE(0xb18000, 0xb1bfff) AM_WRITENOP //used by histryma @0x0000b25a,b270,b286 - AM_RANGE(0xc00000, 0xc00fff) AM_READWRITE(MRA16_RAM,paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xc00000, 0xc00fff) AM_READWRITE(SMH_RAM,paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xd00000, 0xd007ff) AM_RAM AM_BASE(&fitfight_spriteram) @@ -193,27 +193,27 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bbprot_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA16_RAM) AM_BASE(&fof_100000) + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_RAM) AM_BASE(&fof_100000) AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r) AM_RANGE(0x380000, 0x380001) AM_READ(input_port_1_word_r) AM_RANGE(0x400000, 0x400001) AM_READ(input_port_2_word_r) AM_RANGE(0x480000, 0x480001) AM_READ(input_port_3_word_r) - AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_RAM) AM_BASE(&fof_600000) + AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_RAM) AM_BASE(&fof_600000) AM_RANGE(0x700000, 0x700001) AM_READWRITE(bbprot_700000_r,fitfight_700000_w) AM_BASE(&fof_700000) - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_RAM) AM_BASE(&fof_800000) - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_RAM) AM_BASE(&fof_900000) - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_RAM) AM_BASE(&fof_a00000) + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_RAM) AM_BASE(&fof_800000) + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_RAM) AM_BASE(&fof_900000) + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_RAM) AM_BASE(&fof_a00000) AM_RANGE(0xb00000, 0xb03fff) AM_WRITENOP /* unused layer? */ - AM_RANGE(0xb04000, 0xb07fff) AM_READWRITE(MRA16_RAM,fof_bak_tileram_w) AM_BASE(&fof_bak_tileram) - AM_RANGE(0xb08000, 0xb0bfff) AM_READWRITE(MRA16_RAM,fof_mid_tileram_w) AM_BASE(&fof_mid_tileram) - AM_RANGE(0xb0c000, 0xb0ffff) AM_READWRITE(MRA16_RAM,fof_txt_tileram_w) AM_BASE(&fof_txt_tileram) + AM_RANGE(0xb04000, 0xb07fff) AM_READWRITE(SMH_RAM,fof_bak_tileram_w) AM_BASE(&fof_bak_tileram) + AM_RANGE(0xb08000, 0xb0bfff) AM_READWRITE(SMH_RAM,fof_mid_tileram_w) AM_BASE(&fof_mid_tileram) + AM_RANGE(0xb0c000, 0xb0ffff) AM_READWRITE(SMH_RAM,fof_txt_tileram_w) AM_BASE(&fof_txt_tileram) - AM_RANGE(0xc00000, 0xc00fff) AM_READ(MRA16_RAM) + AM_RANGE(0xc00000, 0xc00fff) AM_READ(SMH_RAM) AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xd00000, 0xd007ff) AM_RAM AM_BASE(&fitfight_spriteram) @@ -226,7 +226,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_READ(MRA8_BANK1) /* ??? External ROM */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_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 2786537d104..10ccf85edc5 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -93,43 +93,43 @@ static WRITE8_HANDLER( flkatck_ls138_w ) } static ADDRESS_MAP_START( flkatck_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_RAM) AM_RANGE(0x0400, 0x041f) AM_READ(flkatck_ls138_r) /* inputs + DIPS */ - AM_RANGE(0x0800, 0x0bff) AM_READ(MRA8_RAM) /* palette */ - AM_RANGE(0x1000, 0x1fff) AM_READ(MRA8_RAM) /* RAM */ - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM) /* Video RAM (007121) */ - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_BANK1) /* banked ROM */ - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x0800, 0x0bff) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0x1000, 0x1fff) AM_READ(SMH_RAM) /* RAM */ + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_RAM) /* Video RAM (007121) */ + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_BANK1) /* banked ROM */ + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( flkatck_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0007) AM_WRITE(flkatck_k007121_regs_w) /* 007121 registers */ - AM_RANGE(0x0000, 0x03ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0400, 0x041f) AM_WRITE(flkatck_ls138_w) /* bankswitch + counters + sound command */ AM_RANGE(0x0800, 0x0bff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_le_w) AM_BASE(&paletteram)/* palette */ - AM_RANGE(0x1000, 0x1fff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x1000, 0x1fff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x2000, 0x3fff) AM_WRITE(flkatck_k007121_w) AM_BASE(&k007121_ram) /* Video RAM (007121) */ - AM_RANGE(0x4000, 0x5fff) AM_WRITE(MWA8_BANK1) /* banked ROM */ - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_BANK1) /* banked ROM */ + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( flkatck_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* RAM */ - AM_RANGE(0x9000, 0x9000) AM_READ(MRA8_RAM) /* ??? */ - AM_RANGE(0x9001, 0x9001) AM_READ(MRA8_RAM) /* ??? */ - AM_RANGE(0x9004, 0x9004) AM_READ(MRA8_RAM) /* ??? */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ + AM_RANGE(0x9000, 0x9000) AM_READ(SMH_RAM) /* ??? */ + AM_RANGE(0x9001, 0x9001) AM_READ(SMH_RAM) /* ??? */ + AM_RANGE(0x9004, 0x9004) AM_READ(SMH_RAM) /* ??? */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) /* 007232 registers */ AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) /* YM2151 */ ADDRESS_MAP_END static ADDRESS_MAP_START( flkatck_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* RAM */ - AM_RANGE(0x9000, 0x9000) AM_WRITE(MWA8_RAM) /* ??? */ - AM_RANGE(0x9001, 0x9001) AM_WRITE(MWA8_RAM) /* ??? */ - AM_RANGE(0x9006, 0x9006) AM_WRITE(MWA8_RAM) /* ??? */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ + AM_RANGE(0x9000, 0x9000) AM_WRITE(SMH_RAM) /* ??? */ + AM_RANGE(0x9001, 0x9001) AM_WRITE(SMH_RAM) /* ??? */ + AM_RANGE(0x9006, 0x9006) AM_WRITE(SMH_RAM) /* ??? */ AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) /* 007232 registers */ AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) /* YM2151 */ AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) /* YM2151 */ diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c index ada3446a9ea..2e80424cd6f 100644 --- a/src/mame/drivers/flower.c +++ b/src/mame/drivers/flower.c @@ -95,11 +95,11 @@ static ADDRESS_MAP_START( flower_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa103, 0xa103) AM_READ(input_port_1_r) AM_RANGE(0xc000, 0xddff) AM_RAM AM_SHARE(1) AM_RANGE(0xde00, 0xdfff) AM_RAM AM_SHARE(2) AM_BASE(&spriteram) - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, flower_textram_w) AM_SHARE(3) AM_BASE(&flower_textram) + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(SMH_RAM, flower_textram_w) AM_SHARE(3) AM_BASE(&flower_textram) AM_RANGE(0xe000, 0xefff) AM_RAM //only cleared? - AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(MRA8_RAM, flower_bg0ram_w) AM_SHARE(4) AM_BASE(&flower_bg0ram) + AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(SMH_RAM, flower_bg0ram_w) AM_SHARE(4) AM_BASE(&flower_bg0ram) AM_RANGE(0xf200, 0xf200) AM_RAM AM_SHARE(5) AM_BASE(&flower_bg0_scroll) - AM_RANGE(0xf800, 0xf9ff) AM_READWRITE(MRA8_RAM, flower_bg1ram_w) AM_SHARE(6) AM_BASE(&flower_bg1ram) + AM_RANGE(0xf800, 0xf9ff) AM_READWRITE(SMH_RAM, flower_bg1ram_w) AM_SHARE(6) AM_BASE(&flower_bg1ram) AM_RANGE(0xfa00, 0xfa00) AM_RAM AM_SHARE(7) AM_BASE(&flower_bg1_scroll) ADDRESS_MAP_END @@ -112,10 +112,10 @@ static ADDRESS_MAP_START( flower_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa400, 0xa400) AM_WRITE(sound_command_w) AM_RANGE(0xc000, 0xddff) AM_RAM AM_SHARE(1) AM_RANGE(0xde00, 0xdfff) AM_RAM AM_SHARE(2) - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, flower_textram_w) AM_SHARE(3) - AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(MRA8_RAM, flower_bg0ram_w) AM_SHARE(4) + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(SMH_RAM, flower_textram_w) AM_SHARE(3) + AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(SMH_RAM, flower_bg0ram_w) AM_SHARE(4) AM_RANGE(0xf200, 0xf200) AM_RAM AM_SHARE(5) - AM_RANGE(0xf800, 0xf9ff) AM_READWRITE(MRA8_RAM, flower_bg1ram_w) AM_SHARE(6) + AM_RANGE(0xf800, 0xf9ff) AM_READWRITE(SMH_RAM, flower_bg1ram_w) AM_SHARE(6) AM_RANGE(0xfa00, 0xfa00) AM_RAM AM_SHARE(7) ADDRESS_MAP_END diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index 6b1a4603375..c90b33748e6 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -126,7 +126,7 @@ static ADDRESS_MAP_START( flstory_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r) AM_RANGE(0xd805, 0xd805) AM_READ(flstory_mcu_status_r) AM_RANGE(0xd806, 0xd806) AM_READ(input_port_5_r) -// AM_RANGE(0xda00, 0xda00) AM_WRITE(MWA8_RAM) +// AM_RANGE(0xda00, 0xda00) AM_WRITE(SMH_RAM) AM_RANGE(0xdc00, 0xdc9f) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xdca0, 0xdcbf) AM_RAM AM_WRITE(flstory_scrlram_w) AM_BASE(&flstory_scrlram) AM_RANGE(0xdcc0, 0xdcff) AM_RAM /* unknown */ @@ -152,7 +152,7 @@ static ADDRESS_MAP_START( onna34ro_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r) AM_RANGE(0xd805, 0xd805) AM_READ(onna34ro_mcu_status_r) AM_RANGE(0xd806, 0xd806) AM_READ(input_port_5_r) -// AM_RANGE(0xda00, 0xda00) AM_WRITE(MWA8_RAM) +// AM_RANGE(0xda00, 0xda00) AM_WRITE(SMH_RAM) AM_RANGE(0xdc00, 0xdc9f) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xdca0, 0xdcbf) AM_RAM AM_WRITE(flstory_scrlram_w) AM_BASE(&flstory_scrlram) AM_RANGE(0xdcc0, 0xdcff) AM_RAM /* unknown */ @@ -172,7 +172,7 @@ static ADDRESS_MAP_START( victnine_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc800, 0xcfff) AM_RAM /* unknown */ AM_RANGE(0xd000, 0xd000) AM_READWRITE(victnine_mcu_r, victnine_mcu_w) AM_RANGE(0xd001, 0xd001) AM_WRITENOP /* watchdog? */ - AM_RANGE(0xd002, 0xd002) AM_READWRITE(MRA8_NOP, MWA8_NOP) /* unknown read & coin lock out? */ + AM_RANGE(0xd002, 0xd002) AM_READWRITE(SMH_NOP, SMH_NOP) /* unknown read & coin lock out? */ AM_RANGE(0xd400, 0xd400) AM_READWRITE(from_snd_r, sound_command_w) AM_RANGE(0xd401, 0xd401) AM_READ(snd_flag_r) AM_RANGE(0xd403, 0xd403) AM_READNOP /* unknown */ @@ -184,7 +184,7 @@ static ADDRESS_MAP_START( victnine_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd805, 0xd805) AM_READ(victnine_port_5_r) AM_RANGE(0xd806, 0xd806) AM_READ(input_port_6_r) AM_RANGE(0xd807, 0xd807) AM_READ(input_port_7_r) -// AM_RANGE(0xda00, 0xda00) AM_WRITE(MWA8_RAM) +// AM_RANGE(0xda00, 0xda00) AM_WRITE(SMH_RAM) AM_RANGE(0xdc00, 0xdc9f) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xdca0, 0xdcbf) AM_RAM AM_WRITE(flstory_scrlram_w) AM_BASE(&flstory_scrlram) AM_RANGE(0xdce0, 0xdce0) AM_READWRITE(victnine_gfxctrl_r, victnine_gfxctrl_w) @@ -267,9 +267,9 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xcc00, 0xcc00) AM_WRITE(sound_control_0_w) AM_RANGE(0xce00, 0xce00) AM_WRITE(sound_control_1_w) AM_RANGE(0xd800, 0xd800) AM_READWRITE(soundlatch_r, to_main_w) - AM_RANGE(0xda00, 0xda00) AM_READWRITE(MRA8_NOP, nmi_enable_w) /* unknown read*/ + AM_RANGE(0xda00, 0xda00) AM_READWRITE(SMH_NOP, nmi_enable_w) /* unknown read*/ AM_RANGE(0xdc00, 0xdc00) AM_WRITE(nmi_disable_w) - AM_RANGE(0xde00, 0xde00) AM_READWRITE(MRA8_NOP, DAC_0_signed_data_w) /* signed 8-bit DAC & unknown read */ + AM_RANGE(0xde00, 0xde00) AM_READWRITE(SMH_NOP, DAC_0_signed_data_w) /* signed 8-bit DAC & unknown read */ AM_RANGE(0xe000, 0xefff) AM_ROM /* space for diagnostics ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 83c3aaf7d76..3f3ef6fcf52 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -164,7 +164,7 @@ static ADDRESS_MAP_START( flyball_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0900, 0x0900) AM_WRITE(flyball_potmask_w) AM_RANGE(0x0a00, 0x0a07) AM_WRITE(flyball_misc_w) AM_RANGE(0x0b00, 0x0b00) AM_READ(flyball_input_r) - AM_RANGE(0x0d00, 0x0eff) AM_WRITE(MWA8_RAM) AM_BASE(&flyball_playfield_ram) + AM_RANGE(0x0d00, 0x0eff) AM_WRITE(SMH_RAM) AM_BASE(&flyball_playfield_ram) AM_RANGE(0x1000, 0x1fff) AM_ROM AM_BASE(&rombase) /* program */ ADDRESS_MAP_END diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c index f3c72a6c20e..039b0a7e7e1 100644 --- a/src/mame/drivers/foodf.c +++ b/src/mame/drivers/foodf.c @@ -240,8 +240,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x014000, 0x014fff) AM_MIRROR(0x3e3000) AM_RAM AM_RANGE(0x018000, 0x018fff) AM_MIRROR(0x3e3000) AM_RAM AM_RANGE(0x01c000, 0x01c0ff) AM_MIRROR(0x3e3f00) AM_RAM AM_BASE(&spriteram16) - AM_RANGE(0x800000, 0x8007ff) AM_MIRROR(0x03f800) AM_READWRITE(MRA16_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0x900000, 0x9001ff) AM_MIRROR(0x03fe00) AM_READWRITE(nvram_r, MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x800000, 0x8007ff) AM_MIRROR(0x03f800) AM_READWRITE(SMH_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0x900000, 0x9001ff) AM_MIRROR(0x03fe00) AM_READWRITE(nvram_r, SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x940000, 0x940007) AM_MIRROR(0x023ff8) AM_READ(analog_r) AM_RANGE(0x944000, 0x944007) AM_MIRROR(0x023ff8) AM_WRITE(analog_w) AM_RANGE(0x948000, 0x948001) AM_MIRROR(0x023ffe) AM_READWRITE(input_port_4_word_r, digital_w) diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index a06ef68b7e8..a54fcd78544 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -25,7 +25,7 @@ static UINT8 *fortecar_ram; static ADDRESS_MAP_START( fortecar_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xc7ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xc7ff) AM_READ(SMH_ROM) AM_RANGE(0xd000, 0xd1ff) AM_RAM AM_RANGE(0xd800, 0xffff) AM_RAM AM_BASE(&fortecar_ram) @@ -40,8 +40,8 @@ READ8_HANDLER( fortecar_read62 ) static ADDRESS_MAP_START( fortecar_ports, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_WRITE(MWA8_NOP) - AM_RANGE(0x41, 0x41) AM_WRITE(MWA8_NOP) + AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP) + AM_RANGE(0x41, 0x41) AM_WRITE(SMH_NOP) // AM_RANGE(0x62, 0x62) AM_READ(fortecar_read62) // nvram eeprom? ADDRESS_MAP_END diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index 741f9fece03..37e4676a568 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -191,9 +191,9 @@ static WRITE8_HANDLER (freekick_ff_w) *************************************/ static ADDRESS_MAP_START( pbillrd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) AM_RANGE(0xe800, 0xe800) AM_READ(input_port_1_r) AM_RANGE(0xf000, 0xf000) AM_READ(input_port_2_r) @@ -201,11 +201,11 @@ static ADDRESS_MAP_START( pbillrd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( pbillrd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(freek_videoram_w) AM_BASE(&freek_videoram) - AM_RANGE(0xd800, 0xd8ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd900, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd800, 0xd8ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd900, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe001) AM_WRITE(flipscreen_w) AM_RANGE(0xe002, 0xe003) AM_WRITE(coin_w) AM_RANGE(0xe004, 0xe004) AM_WRITE(nmi_enable_w) @@ -217,23 +217,23 @@ static ADDRESS_MAP_START( pbillrd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( freekckb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xcfff) AM_READ(MRA8_ROM) - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) // tilemap - AM_RANGE(0xe800, 0xe8ff) AM_READ(MRA8_RAM) // sprites + AM_RANGE(0x0000, 0xcfff) AM_READ(SMH_ROM) + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) // tilemap + AM_RANGE(0xe800, 0xe8ff) AM_READ(SMH_RAM) // sprites AM_RANGE(0xec00, 0xec03) AM_READ(ppi8255_0_r) AM_RANGE(0xf000, 0xf003) AM_READ(ppi8255_1_r) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_3_r) AM_RANGE(0xf801, 0xf801) AM_READ(input_port_4_r) - AM_RANGE(0xf802, 0xf802) AM_READ(MRA8_NOP) //MUST return bit 0 = 0, otherwise game resets + AM_RANGE(0xf802, 0xf802) AM_READ(SMH_NOP) //MUST return bit 0 = 0, otherwise game resets AM_RANGE(0xf803, 0xf803) AM_READ(spinner_r) ADDRESS_MAP_END static ADDRESS_MAP_START( freekckb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xcfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xcfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(freek_videoram_w) AM_BASE(&freek_videoram) - AM_RANGE(0xe800, 0xe8ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe800, 0xe8ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xec00, 0xec03) AM_WRITE(ppi8255_0_w) AM_RANGE(0xf000, 0xf003) AM_WRITE(ppi8255_1_w) AM_RANGE(0xf800, 0xf801) AM_WRITE(flipscreen_w) @@ -247,9 +247,9 @@ static ADDRESS_MAP_START( freekckb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( gigas_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_2_r) AM_RANGE(0xe800, 0xe800) AM_READ(input_port_3_r) AM_RANGE(0xf000, 0xf000) AM_READ(input_port_4_r) @@ -257,16 +257,16 @@ static ADDRESS_MAP_START( gigas_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( gigas_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(freek_videoram_w) AM_BASE(&freek_videoram) - AM_RANGE(0xd800, 0xd8ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd900, 0xdfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe000, 0xe001) AM_WRITE(MWA8_NOP)// probably not flipscreen + AM_RANGE(0xd800, 0xd8ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd900, 0xdfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xe000, 0xe001) AM_WRITE(SMH_NOP)// probably not flipscreen AM_RANGE(0xe002, 0xe003) AM_WRITE(coin_w) AM_RANGE(0xe004, 0xe004) AM_WRITE(nmi_enable_w) - AM_RANGE(0xe005, 0xe005) AM_WRITE(MWA8_NOP) - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) //bankswitch ? + AM_RANGE(0xe005, 0xe005) AM_WRITE(SMH_NOP) + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) //bankswitch ? AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SN76496_0_w) AM_RANGE(0xfc01, 0xfc01) AM_WRITE(SN76496_1_w) AM_RANGE(0xfc02, 0xfc02) AM_WRITE(SN76496_2_w) @@ -276,7 +276,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gigas_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(gigas_spinner_r) - AM_RANGE(0x01, 0x01) AM_READ(MRA8_NOP) //unused dip 3 + AM_RANGE(0x01, 0x01) AM_READ(SMH_NOP) //unused dip 3 ADDRESS_MAP_END static ADDRESS_MAP_START( gigas_writeport, ADDRESS_SPACE_IO, 8 ) @@ -287,7 +287,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( oigas_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(gigas_spinner_r) - AM_RANGE(0x01, 0x01) AM_READ(MRA8_NOP) //unused dip 3 + AM_RANGE(0x01, 0x01) AM_READ(SMH_NOP) //unused dip 3 AM_RANGE(0x02, 0x02) AM_READ(oigas_2_r) AM_RANGE(0x03, 0x03) AM_READ(oigas_3_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/frogger.c b/src/mame/drivers/frogger.c index 39e911c5bf8..d2feac675ed 100644 --- a/src/mame/drivers/frogger.c +++ b/src/mame/drivers/frogger.c @@ -63,22 +63,22 @@ static WRITE8_HANDLER(frogger_ppi8255_1_w) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_READ(watchdog_reset_r) - AM_RANGE(0xa800, 0xabff) AM_READ(MRA8_RAM) - AM_RANGE(0xb000, 0xb0ff) AM_READ(MRA8_RAM) + AM_RANGE(0xa800, 0xabff) AM_READ(SMH_RAM) + AM_RANGE(0xb000, 0xb0ff) AM_READ(SMH_RAM) AM_RANGE(0xd000, 0xd007) AM_READ(frogger_ppi8255_1_r) AM_RANGE(0xe000, 0xe007) AM_READ(frogger_ppi8255_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa800, 0xabff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0xb000, 0xb03f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0xb040, 0xb05f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0xb060, 0xb0ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xb040, 0xb05f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0xb060, 0xb0ff) AM_WRITE(SMH_RAM) AM_RANGE(0xb808, 0xb808) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0xb80c, 0xb80c) AM_WRITE(galaxian_flip_screen_y_w) AM_RANGE(0xb810, 0xb810) AM_WRITE(galaxian_flip_screen_x_w) @@ -90,11 +90,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( froggrmc_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) AM_RANGE(0x9400, 0x97ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) @@ -103,12 +103,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( froggrmc_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa800, 0xa800) AM_WRITE(soundlatch_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(froggrmc_sh_irqtrigger_w) @@ -118,13 +118,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( frogger_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( frogger_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6000, 0x6fff) AM_WRITE(frogger_filter_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index 9db1695ae29..98f59d5dcb7 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -310,9 +310,9 @@ static WRITE8_HANDLER( fromanc2_subcpu_rombank_w ) // ---------------------------------------------------------------------------- static ADDRESS_MAP_START( fromanc2_readmem_main, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) // MAIN ROM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) // MAIN ROM - AM_RANGE(0x802000, 0x802fff) AM_READ(MRA16_NOP) // ??? + AM_RANGE(0x802000, 0x802fff) AM_READ(SMH_NOP) // ??? AM_RANGE(0xa00000, 0xa00fff) AM_READ(fromanc2_paletteram_0_r)// PALETTE (1P) AM_RANGE(0xa80000, 0xa80fff) AM_READ(fromanc2_paletteram_1_r)// PALETTE (2P) @@ -321,11 +321,11 @@ static ADDRESS_MAP_START( fromanc2_readmem_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd01300, 0xd01301) AM_READ(fromanc2_subcpu_r ) // SUB CPU READ AM_RANGE(0xd01800, 0xd01801) AM_READ(fromanc2_keymatrix_r) // INPUT KEY MATRIX - AM_RANGE(0xd80000, 0xd8ffff) AM_READ(MRA16_RAM) // WORK RAM + AM_RANGE(0xd80000, 0xd8ffff) AM_READ(SMH_RAM) // WORK RAM ADDRESS_MAP_END static ADDRESS_MAP_START( fromanc2_writemem_main, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) // MAIN ROM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) // MAIN ROM AM_RANGE(0x800000, 0x803fff) AM_WRITE(fromanc2_videoram_0_w) // VRAM 0, 1 (1P) AM_RANGE(0x880000, 0x883fff) AM_WRITE(fromanc2_videoram_1_w) // VRAM 2, 3 (1P) @@ -340,8 +340,8 @@ static ADDRESS_MAP_START( fromanc2_writemem_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd00200, 0xd00223) AM_WRITE(fromanc2_gfxreg_1_w) // SCROLL REG (1P/2P) AM_RANGE(0xd00300, 0xd00323) AM_WRITE(fromanc2_gfxreg_3_w) // SCROLL REG (1P/2P) - AM_RANGE(0xd00400, 0xd00413) AM_WRITE(MWA16_NOP) // ??? - AM_RANGE(0xd00500, 0xd00513) AM_WRITE(MWA16_NOP) // ??? + AM_RANGE(0xd00400, 0xd00413) AM_WRITE(SMH_NOP) // ??? + AM_RANGE(0xd00500, 0xd00513) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0xd01000, 0xd01001) AM_WRITE(fromanc2_sndcmd_w) // SOUND REQ (1P/2P) AM_RANGE(0xd01200, 0xd01201) AM_WRITE(fromanc2_subcpu_w) // SUB CPU WRITE @@ -350,11 +350,11 @@ static ADDRESS_MAP_START( fromanc2_writemem_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd01600, 0xd01601) AM_WRITE(fromanc2_eeprom_w) // EEPROM DATA AM_RANGE(0xd01a00, 0xd01a01) AM_WRITE(fromanc2_portselect_w) // PORT SELECT (1P/2P) - AM_RANGE(0xd80000, 0xd8ffff) AM_WRITE(MWA16_RAM) // WORK RAM + AM_RANGE(0xd80000, 0xd8ffff) AM_WRITE(SMH_RAM) // WORK RAM ADDRESS_MAP_END static ADDRESS_MAP_START( fromancr_readmem_main, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) // MAIN ROM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) // MAIN ROM AM_RANGE(0xa00000, 0xa00fff) AM_READ(fromancr_paletteram_0_r)// PALETTE (1P) AM_RANGE(0xa80000, 0xa80fff) AM_READ(fromancr_paletteram_1_r)// PALETTE (2P) @@ -363,16 +363,16 @@ static ADDRESS_MAP_START( fromancr_readmem_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd01300, 0xd01301) AM_READ(fromanc2_subcpu_r) // SUB CPU READ AM_RANGE(0xd01800, 0xd01801) AM_READ(fromanc2_keymatrix_r) // INPUT KEY MATRIX - AM_RANGE(0xd80000, 0xd8ffff) AM_READ(MRA16_RAM) // WORK RAM + AM_RANGE(0xd80000, 0xd8ffff) AM_READ(SMH_RAM) // WORK RAM ADDRESS_MAP_END static ADDRESS_MAP_START( fromancr_writemem_main, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) // MAIN ROM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) // MAIN ROM AM_RANGE(0x800000, 0x803fff) AM_WRITE(fromancr_videoram_0_w) // VRAM BG (1P/2P) AM_RANGE(0x880000, 0x883fff) AM_WRITE(fromancr_videoram_1_w) // VRAM FG (1P/2P) AM_RANGE(0x900000, 0x903fff) AM_WRITE(fromancr_videoram_2_w) // VRAM TEXT (1P/2P) - AM_RANGE(0x980000, 0x983fff) AM_WRITE(MWA16_NOP) // VRAM Unused ? + AM_RANGE(0x980000, 0x983fff) AM_WRITE(SMH_NOP) // VRAM Unused ? AM_RANGE(0xa00000, 0xa00fff) AM_WRITE(fromancr_paletteram_0_w)// PALETTE (1P) AM_RANGE(0xa80000, 0xa80fff) AM_WRITE(fromancr_paletteram_1_w)// PALETTE (2P) @@ -380,25 +380,25 @@ static ADDRESS_MAP_START( fromancr_writemem_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd00000, 0xd00023) AM_WRITE(fromancr_gfxreg_1_w) // SCROLL REG (1P/2P) AM_RANGE(0xd00100, 0xd00123) AM_WRITE(fromancr_gfxreg_0_w) // SCROLL REG (1P/2P) - AM_RANGE(0xd00200, 0xd002ff) AM_WRITE(MWA16_NOP) // ? + AM_RANGE(0xd00200, 0xd002ff) AM_WRITE(SMH_NOP) // ? - AM_RANGE(0xd00400, 0xd00413) AM_WRITE(MWA16_NOP) // ??? - AM_RANGE(0xd00500, 0xd00513) AM_WRITE(MWA16_NOP) // ??? + AM_RANGE(0xd00400, 0xd00413) AM_WRITE(SMH_NOP) // ??? + AM_RANGE(0xd00500, 0xd00513) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0xd01000, 0xd01001) AM_WRITE(fromanc2_sndcmd_w) // SOUND REQ (1P/2P) AM_RANGE(0xd01200, 0xd01201) AM_WRITE(fromanc2_subcpu_w) // SUB CPU WRITE - AM_RANGE(0xd01400, 0xd01401) AM_WRITE(MWA16_NOP) // COIN COUNTER ? + AM_RANGE(0xd01400, 0xd01401) AM_WRITE(SMH_NOP) // COIN COUNTER ? AM_RANGE(0xd01600, 0xd01601) AM_WRITE(fromancr_eeprom_w) // EEPROM DATA, GFXBANK (1P/2P) AM_RANGE(0xd01a00, 0xd01a01) AM_WRITE(fromanc2_portselect_w) // PORT SELECT (1P/2P) - AM_RANGE(0xd80000, 0xd8ffff) AM_WRITE(MWA16_RAM) // WORK RAM + AM_RANGE(0xd80000, 0xd8ffff) AM_WRITE(SMH_RAM) // WORK RAM ADDRESS_MAP_END static ADDRESS_MAP_START( fromanc4_readmem_main, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) // MAIN ROM - AM_RANGE(0x400000, 0x7fffff) AM_READ(MRA16_ROM) // DATA ROM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) // MAIN ROM + AM_RANGE(0x400000, 0x7fffff) AM_READ(SMH_ROM) // DATA ROM - AM_RANGE(0x800000, 0x81ffff) AM_READ(MRA16_RAM) // WORK RAM + AM_RANGE(0x800000, 0x81ffff) AM_READ(SMH_RAM) // WORK RAM AM_RANGE(0xdb0000, 0xdb0fff) AM_READ(fromanc4_paletteram_0_r)// PALETTE (1P) AM_RANGE(0xdc0000, 0xdc0fff) AM_READ(fromanc4_paletteram_1_r)// PALETTE (2P) @@ -406,19 +406,19 @@ static ADDRESS_MAP_START( fromanc4_readmem_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd10000, 0xd10001) AM_READ(fromanc2_keymatrix_r) // INPUT KEY MATRIX AM_RANGE(0xd20000, 0xd20001) AM_READ(fromanc4_input_r) // INPUT COMMON, EEPROM DATA - AM_RANGE(0xe5000c, 0xe5000d) AM_READ(MRA16_NOP) // EXT-COMM PORT ? + AM_RANGE(0xe5000c, 0xe5000d) AM_READ(SMH_NOP) // EXT-COMM PORT ? ADDRESS_MAP_END static ADDRESS_MAP_START( fromanc4_writemem_main, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) // MAIN ROM - AM_RANGE(0x400000, 0x7fffff) AM_WRITE(MWA16_ROM) // DATA ROM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) // MAIN ROM + AM_RANGE(0x400000, 0x7fffff) AM_WRITE(SMH_ROM) // DATA ROM - AM_RANGE(0x800000, 0x81ffff) AM_WRITE(MWA16_RAM) // WORK RAM + AM_RANGE(0x800000, 0x81ffff) AM_WRITE(SMH_RAM) // WORK RAM AM_RANGE(0xd00000, 0xd00001) AM_WRITE(fromanc2_portselect_w) // PORT SELECT (1P/2P) - AM_RANGE(0xd10000, 0xd10001) AM_WRITE(MWA16_NOP) // ? - AM_RANGE(0xd30000, 0xd30001) AM_WRITE(MWA16_NOP) // ? + AM_RANGE(0xd10000, 0xd10001) AM_WRITE(SMH_NOP) // ? + AM_RANGE(0xd30000, 0xd30001) AM_WRITE(SMH_NOP) // ? AM_RANGE(0xd50000, 0xd50001) AM_WRITE(fromanc4_eeprom_w) // EEPROM DATA AM_RANGE(0xd70000, 0xd70001) AM_WRITE(fromanc2_sndcmd_w) // SOUND REQ (1P/2P) @@ -434,10 +434,10 @@ static ADDRESS_MAP_START( fromanc4_writemem_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xe10000, 0xe1001d) AM_WRITE(fromanc4_gfxreg_1_w) // SCROLL, GFXBANK (1P/2P) AM_RANGE(0xe20000, 0xe2001d) AM_WRITE(fromanc4_gfxreg_2_w) // SCROLL, GFXBANK (1P/2P) - AM_RANGE(0xe30000, 0xe30013) AM_WRITE(MWA16_NOP) // ??? - AM_RANGE(0xe40000, 0xe40013) AM_WRITE(MWA16_NOP) // ??? + AM_RANGE(0xe30000, 0xe30013) AM_WRITE(SMH_NOP) // ??? + AM_RANGE(0xe40000, 0xe40013) AM_WRITE(SMH_NOP) // ??? - AM_RANGE(0xe50000, 0xe50009) AM_WRITE(MWA16_NOP) // EXT-COMM PORT ? + AM_RANGE(0xe50000, 0xe50009) AM_WRITE(SMH_NOP) // EXT-COMM PORT ? ADDRESS_MAP_END @@ -446,17 +446,17 @@ ADDRESS_MAP_END // ---------------------------------------------------------------------------- static ADDRESS_MAP_START( fromanc2_readmem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) // ROM - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) // ROM(BANK) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_RAM) // RAM(WORK) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_BANK2) // RAM(BANK) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) // ROM + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) // ROM(BANK) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_RAM) // RAM(WORK) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_BANK2) // RAM(BANK) ADDRESS_MAP_END static ADDRESS_MAP_START( fromanc2_writemem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) // ROM - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_BANK1) // ROM(BANK) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_RAM) // RAM(WORK) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_BANK2) // RAM(BANK) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) // ROM + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_BANK1) // ROM(BANK) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_RAM) // RAM(WORK) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_BANK2) // RAM(BANK) ADDRESS_MAP_END static ADDRESS_MAP_START( fromanc2_readport_sub, ADDRESS_SPACE_IO, 8 ) @@ -479,20 +479,20 @@ ADDRESS_MAP_END // ---------------------------------------------------------------------------- static ADDRESS_MAP_START( fromanc2_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( fromanc2_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( fromanc2_readport_sound, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) // snd cmd (1P) AM_RANGE(0x04, 0x04) AM_READ(soundlatch2_r) // snd cmd (2P) - AM_RANGE(0x09, 0x09) AM_READ(MRA8_NOP) // ? + AM_RANGE(0x09, 0x09) AM_READ(SMH_NOP) // ? AM_RANGE(0x08, 0x08) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0x0a, 0x0a) AM_READ(YM2610_status_port_0_B_r) AM_RANGE(0x0c, 0x0c) AM_READ(fromanc2_sndcpu_nmi_clr) @@ -500,7 +500,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fromanc2_writeport_sound, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) // ? + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) // ? AM_RANGE(0x08, 0x08) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0x09, 0x09) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0x0a, 0x0a) AM_WRITE(YM2610_control_port_0_B_w) diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index d5a3a07784e..88d131f57fc 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -238,8 +238,8 @@ static WRITE8_HANDLER( fromance_coinctr_w ) *************************************/ static ADDRESS_MAP_START( nekkyoku_readmem_main, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_READ(input_port_0_r) AM_RANGE(0xf001, 0xf001) AM_READ(fromance_keymatrix_r) AM_RANGE(0xf002, 0xf002) AM_READ(input_port_1_r) @@ -249,19 +249,19 @@ static ADDRESS_MAP_START( nekkyoku_readmem_main, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( nekkyoku_writemem_main, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(fromance_portselect_w) - AM_RANGE(0xf001, 0xf001) AM_WRITE(MWA8_NOP) + AM_RANGE(0xf001, 0xf001) AM_WRITE(SMH_NOP) AM_RANGE(0xf002, 0xf002) AM_WRITE(fromance_coinctr_w) AM_RANGE(0xf003, 0xf003) AM_WRITE(fromance_commanddata_w) ADDRESS_MAP_END static ADDRESS_MAP_START( fromance_readmem_main, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0x9e89, 0x9e89) AM_READ(MRA8_NOP) // unknown (idolmj) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0x9e89, 0x9e89) AM_READ(SMH_NOP) // unknown (idolmj) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) AM_RANGE(0xe001, 0xe001) AM_READ(fromance_keymatrix_r) AM_RANGE(0xe002, 0xe002) AM_READ(input_port_1_r) @@ -271,8 +271,8 @@ static ADDRESS_MAP_START( fromance_readmem_main, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( fromance_writemem_main, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(fromance_portselect_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(fromance_coinctr_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(fromance_commanddata_w) @@ -287,34 +287,34 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( nekkyoku_readmem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xefff) AM_READ(fromance_videoram_r) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xffff) AM_READ(fromance_paletteram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( nekkyoku_writemem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xefff) AM_WRITE(fromance_videoram_w) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf800, 0xffff) AM_WRITE(fromance_paletteram_w) ADDRESS_MAP_END static ADDRESS_MAP_START( fromance_readmem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc800, 0xcfff) AM_READ(fromance_paletteram_r) AM_RANGE(0xd000, 0xffff) AM_READ(fromance_videoram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( fromance_writemem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc800, 0xcfff) AM_WRITE(fromance_paletteram_w) AM_RANGE(0xd000, 0xffff) AM_WRITE(fromance_videoram_w) ADDRESS_MAP_END @@ -329,7 +329,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( nekkyoku_readport_sub, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x12, 0x12) AM_READ(MRA8_NOP) // unknown + AM_RANGE(0x12, 0x12) AM_READ(SMH_NOP) // unknown AM_RANGE(0xe1, 0xe1) AM_READ(fromance_busycheck_sub_r) AM_RANGE(0xe6, 0xe6) AM_READ(fromance_commanddata_r) ADDRESS_MAP_END @@ -350,7 +350,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fromance_readport_sub, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x12, 0x12) AM_READ(MRA8_NOP) // unknown + AM_RANGE(0x12, 0x12) AM_READ(SMH_NOP) // unknown AM_RANGE(0x21, 0x21) AM_READ(fromance_busycheck_sub_r) AM_RANGE(0x26, 0x26) AM_READ(fromance_commanddata_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c index cb06116edb9..e968ee13c47 100644 --- a/src/mame/drivers/funkybee.c +++ b/src/mame/drivers/funkybee.c @@ -103,18 +103,18 @@ static WRITE8_HANDLER( funkybee_coin_counter_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x4fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf000) AM_READ(MRA8_NOP) /* IRQ Ack */ + AM_RANGE(0x0000, 0x4fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf000) AM_READ(SMH_NOP) /* IRQ Ack */ AM_RANGE(0xf800, 0xf800) AM_READ(funkybee_input_port_0_r) AM_RANGE(0xf801, 0xf801) AM_READ(input_port_1_r) AM_RANGE(0xf802, 0xf802) AM_READ(input_port_2_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x4fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x4fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xbfff) AM_WRITE(funkybee_videoram_w) AM_BASE(&videoram) AM_RANGE(0xc000, 0xdfff) AM_WRITE(funkybee_colorram_w) AM_BASE(&colorram) AM_RANGE(0xe000, 0xe000) AM_WRITE(funkybee_scroll_w) diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index 030d3b49e81..dbf9d48af1e 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -103,52 +103,52 @@ VIDEO_UPDATE( funkyjet ); /******************************************************************************/ static ADDRESS_MAP_START( funkyjet_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x143fff) AM_READ(MRA16_RAM) - AM_RANGE(0x160000, 0x1607ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x143fff) AM_READ(SMH_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x1807ff) AM_READ(deco16_146_funkyjet_prot_r) - AM_RANGE(0x320000, 0x321fff) AM_READ(MRA16_RAM) - AM_RANGE(0x322000, 0x323fff) AM_READ(MRA16_RAM) - AM_RANGE(0x340000, 0x340bff) AM_READ(MRA16_RAM) - AM_RANGE(0x342000, 0x342bff) AM_READ(MRA16_RAM) + AM_RANGE(0x320000, 0x321fff) AM_READ(SMH_RAM) + AM_RANGE(0x322000, 0x323fff) AM_READ(SMH_RAM) + AM_RANGE(0x340000, 0x340bff) AM_READ(SMH_RAM) + AM_RANGE(0x342000, 0x342bff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( funkyjet_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x120000, 0x1207ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x140000, 0x143fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x160000, 0x1607ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x140000, 0x143fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0x180000, 0x1807ff) AM_WRITE(deco16_146_funkyjet_prot_w) AM_BASE(&deco16_prot_ram) - AM_RANGE(0x184000, 0x184001) AM_WRITE(MWA16_NOP) - AM_RANGE(0x188000, 0x188001) AM_WRITE(MWA16_NOP) - AM_RANGE(0x300000, 0x30000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x184000, 0x184001) AM_WRITE(SMH_NOP) + AM_RANGE(0x188000, 0x188001) AM_WRITE(SMH_NOP) + AM_RANGE(0x300000, 0x30000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x320000, 0x321fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x322000, 0x323fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x340000, 0x340bff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x342000, 0x342bff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x340000, 0x340bff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x342000, 0x342bff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) ADDRESS_MAP_END /******************************************************************************/ /* Physical memory map (21 bits) */ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_READ(MRA8_NOP) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) - AM_RANGE(0x130000, 0x130001) AM_READ(MRA8_NOP) /* This board only has 1 oki chip */ + AM_RANGE(0x130000, 0x130001) AM_READ(SMH_NOP) /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA8_NOP) /* YM2203 - this board doesn't have one */ + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) /* YM2203 - this board doesn't have one */ AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) - AM_RANGE(0x130000, 0x130001) AM_WRITE(MWA8_NOP) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x130000, 0x130001) AM_WRITE(SMH_NOP) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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 72ebf9a7d2c..712fabf0b0d 100644 --- a/src/mame/drivers/funybubl.c +++ b/src/mame/drivers/funybubl.c @@ -91,20 +91,20 @@ static WRITE8_HANDLER( funybubl_oki_bank_sw ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK2) // banked port 1? - AM_RANGE(0xc400, 0xc7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_BANK1) // banked port 0? - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2) // banked port 1? + AM_RANGE(0xc400, 0xc7ff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_BANK1) // banked port 0? + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc400, 0xcfff) AM_WRITE(funybubl_paldatawrite) AM_BASE(&funybubl_paletteram) // palette - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_BANK1) // banked port 0? - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_BANK1) // banked port 0? + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) @@ -113,7 +113,7 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r) AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r) AM_RANGE(0x03, 0x03) AM_READ(input_port_3_r) - AM_RANGE(0x06, 0x06) AM_READ(MRA8_NOP) /* Nothing is done with the data read */ + AM_RANGE(0x06, 0x06) AM_READ(SMH_NOP) /* Nothing is done with the data read */ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) @@ -121,23 +121,23 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(funybubl_vidram_bank_w) // vidram bank AM_RANGE(0x01, 0x01) AM_WRITE(funybubl_cpurombank_w) // rom bank? AM_RANGE(0x03, 0x03) AM_WRITE(funybubl_soundcommand_w) - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP) /* Written directly after IO port 0 */ - AM_RANGE(0x07, 0x07) AM_WRITE(MWA8_NOP) /* Reset something on startup - Sound CPU ?? */ + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) /* Written directly after IO port 0 */ + AM_RANGE(0x07, 0x07) AM_WRITE(SMH_NOP) /* Reset something on startup - Sound CPU ?? */ ADDRESS_MAP_END /* Sound CPU */ static ADDRESS_MAP_START( soundreadmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( soundwritemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(funybubl_oki_bank_sw) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c index 6d9da3b27f0..58f63cad475 100644 --- a/src/mame/drivers/fuukifg2.c +++ b/src/mame/drivers/fuukifg2.c @@ -86,33 +86,33 @@ static WRITE16_HANDLER( fuuki16_sound_command_w ) } static ADDRESS_MAP_START( fuuki16_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x500000, 0x507fff) AM_READ(MRA16_RAM ) // Layers - AM_RANGE(0x600000, 0x601fff) AM_MIRROR(0x008000) AM_READ(MRA16_RAM ) // Sprites, mirrored? - AM_RANGE(0x700000, 0x703fff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x500000, 0x507fff) AM_READ(SMH_RAM ) // Layers + AM_RANGE(0x600000, 0x601fff) AM_MIRROR(0x008000) AM_READ(SMH_RAM ) // Sprites, mirrored? + AM_RANGE(0x700000, 0x703fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r ) // Buttons (Inputs) AM_RANGE(0x810000, 0x810001) AM_READ(input_port_1_word_r ) // P1 + P2 AM_RANGE(0x880000, 0x880001) AM_READ(input_port_2_word_r ) // 2 x DSW - AM_RANGE(0x8c0000, 0x8c001f) AM_READ(MRA16_RAM ) // Video Registers -/**/AM_RANGE(0x8d0000, 0x8d0003) AM_READ(MRA16_RAM ) // -/**/AM_RANGE(0x8e0000, 0x8e0001) AM_READ(MRA16_RAM ) // + AM_RANGE(0x8c0000, 0x8c001f) AM_READ(SMH_RAM ) // Video Registers +/**/AM_RANGE(0x8d0000, 0x8d0003) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x8e0000, 0x8e0001) AM_READ(SMH_RAM ) // ADDRESS_MAP_END static ADDRESS_MAP_START( fuuki16_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x400000, 0x40ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x500000, 0x501fff) AM_WRITE(fuuki16_vram_0_w) AM_BASE(&fuuki16_vram_0 ) // Layers AM_RANGE(0x502000, 0x503fff) AM_WRITE(fuuki16_vram_1_w) AM_BASE(&fuuki16_vram_1 ) // AM_RANGE(0x504000, 0x505fff) AM_WRITE(fuuki16_vram_2_w) AM_BASE(&fuuki16_vram_2 ) // AM_RANGE(0x506000, 0x507fff) AM_WRITE(fuuki16_vram_3_w) AM_BASE(&fuuki16_vram_3 ) // - AM_RANGE(0x506000, 0x507fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x600000, 0x601fff) AM_MIRROR(0x008000) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites, mirrored? + AM_RANGE(0x506000, 0x507fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x600000, 0x601fff) AM_MIRROR(0x008000) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites, mirrored? AM_RANGE(0x700000, 0x703fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0x8c0000, 0x8c001f) AM_WRITE(fuuki16_vregs_w) AM_BASE(&fuuki16_vregs ) // Video Registers AM_RANGE(0x8a0000, 0x8a0001) AM_WRITE(fuuki16_sound_command_w ) // To Sound CPU - AM_RANGE(0x8d0000, 0x8d0003) AM_WRITE(MWA16_RAM) AM_BASE(&fuuki16_unknown ) // - AM_RANGE(0x8e0000, 0x8e0001) AM_WRITE(MWA16_RAM) AM_BASE(&fuuki16_priority ) // + AM_RANGE(0x8d0000, 0x8d0003) AM_WRITE(SMH_RAM) AM_BASE(&fuuki16_unknown ) // + AM_RANGE(0x8e0000, 0x8e0001) AM_WRITE(SMH_RAM) AM_BASE(&fuuki16_priority ) // ADDRESS_MAP_END @@ -143,15 +143,15 @@ static WRITE8_HANDLER( fuuki16_oki_banking_w ) } static ADDRESS_MAP_START( fuuki16_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1 ) // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( fuuki16_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM ) // Banked ROM + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM ) // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( fuuki16_sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -164,9 +164,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fuuki16_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(fuuki16_sound_rombank_w ) // ROM Bank - AM_RANGE(0x11, 0x11) AM_WRITE(MWA8_NOP ) // ? To Main CPU + AM_RANGE(0x11, 0x11) AM_WRITE(SMH_NOP ) // ? To Main CPU AM_RANGE(0x20, 0x20) AM_WRITE(fuuki16_oki_banking_w ) // Oki Banking - AM_RANGE(0x30, 0x30) AM_WRITE(MWA8_NOP ) // ? In the NMI routine + AM_RANGE(0x30, 0x30) AM_WRITE(SMH_NOP ) // ? In the NMI routine AM_RANGE(0x40, 0x40) AM_WRITE(YM2203_control_port_0_w ) // YM2203 AM_RANGE(0x41, 0x41) AM_WRITE(YM2203_write_port_0_w ) AM_RANGE(0x50, 0x50) AM_WRITE(YM3812_control_port_0_w ) // YM3812 diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index 1fb8de454d8..4c8263229e4 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -267,57 +267,57 @@ static WRITE32_HANDLER( fuuki32_vregs_w ) // Lines with empty comment are for debug only static ADDRESS_MAP_START( fuuki32_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA32_RAM) // Work RAM - AM_RANGE(0x410000, 0x41ffff) AM_READ(MRA32_RAM) // Work RAM (used by asurabus) - AM_RANGE(0x500000, 0x501fff) AM_READ(MRA32_RAM) // Tilemap 1 - AM_RANGE(0x502000, 0x503fff) AM_READ(MRA32_RAM) // Tilemap 2 - AM_RANGE(0x504000, 0x505fff) AM_READ(MRA32_RAM) // Tilemap bg - AM_RANGE(0x506000, 0x507fff) AM_READ(MRA32_RAM) // Tilemap bg2 - AM_RANGE(0x508000, 0x517fff) AM_READ(MRA32_RAM) // More tilemap, or linescroll? Seems to be empty all of the time - AM_RANGE(0x600000, 0x601fff) AM_READ(MRA32_RAM) // Sprites + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM) // Work RAM + AM_RANGE(0x410000, 0x41ffff) AM_READ(SMH_RAM) // Work RAM (used by asurabus) + AM_RANGE(0x500000, 0x501fff) AM_READ(SMH_RAM) // Tilemap 1 + AM_RANGE(0x502000, 0x503fff) AM_READ(SMH_RAM) // Tilemap 2 + AM_RANGE(0x504000, 0x505fff) AM_READ(SMH_RAM) // Tilemap bg + AM_RANGE(0x506000, 0x507fff) AM_READ(SMH_RAM) // Tilemap bg2 + AM_RANGE(0x508000, 0x517fff) AM_READ(SMH_RAM) // More tilemap, or linescroll? Seems to be empty all of the time + AM_RANGE(0x600000, 0x601fff) AM_READ(SMH_RAM) // Sprites - AM_RANGE(0x700000, 0x703fff) AM_READ(MRA32_RAM) // Palette + AM_RANGE(0x700000, 0x703fff) AM_READ(SMH_RAM) // Palette AM_RANGE(0x800000, 0x800003) AM_READ(io32_0_r) // Coin AM_RANGE(0x810000, 0x810003) AM_READ(io32_1_r) // Player Inputs AM_RANGE(0x880000, 0x880003) AM_READ(io32_2_r) // Service + DIPS AM_RANGE(0x890000, 0x890003) AM_READ(io32_3_r) // More DIPS - AM_RANGE(0x8c0000, 0x8c001f) AM_READ(MRA32_RAM)// Video Registers + AM_RANGE(0x8c0000, 0x8c001f) AM_READ(SMH_RAM)// Video Registers -/**/AM_RANGE(0x8d0000, 0x8d0003) AM_READ(MRA32_RAM) // Flipscreen Related -/**/AM_RANGE(0x8e0000, 0x8e0003) AM_READ(MRA32_RAM) // Controls layer order +/**/AM_RANGE(0x8d0000, 0x8d0003) AM_READ(SMH_RAM) // Flipscreen Related +/**/AM_RANGE(0x8e0000, 0x8e0003) AM_READ(SMH_RAM) // Controls layer order AM_RANGE(0x903fe0, 0x903fff) AM_READ(snd_020_r) // Shared with Z80 // AM_RANGE(0x903fe0, 0x903fe3) AM_READ(fuuki32_sound_command_r) // Shared with Z80 -// AM_RANGE(0x903fe4, 0x903fff) AM_READ(MRA32_RAM) // ?? +// AM_RANGE(0x903fe4, 0x903fff) AM_READ(SMH_RAM) // ?? ADDRESS_MAP_END static ADDRESS_MAP_START( fuuki32_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x400000, 0x40ffff) AM_WRITE(MWA32_RAM) // Work RAM - AM_RANGE(0x410000, 0x41ffff) AM_WRITE(MWA32_RAM) // Work RAM + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SMH_RAM) // Work RAM + AM_RANGE(0x410000, 0x41ffff) AM_WRITE(SMH_RAM) // Work RAM AM_RANGE(0x500000, 0x501fff) AM_WRITE(fuuki32_vram_0_w) AM_BASE(&fuuki32_vram_0) // Tilemap 1 AM_RANGE(0x502000, 0x503fff) AM_WRITE(fuuki32_vram_1_w) AM_BASE(&fuuki32_vram_1) // Tilemap 2 AM_RANGE(0x504000, 0x505fff) AM_WRITE(fuuki32_vram_2_w) AM_BASE(&fuuki32_vram_2) // Tilemap bg AM_RANGE(0x506000, 0x507fff) AM_WRITE(fuuki32_vram_3_w) AM_BASE(&fuuki32_vram_3) // Tilemap bg2 - AM_RANGE(0x508000, 0x517fff) AM_WRITE(MWA32_RAM) // More tilemap, or linescroll? Seems to be empty all of the time + AM_RANGE(0x508000, 0x517fff) AM_WRITE(SMH_RAM) // More tilemap, or linescroll? Seems to be empty all of the time - AM_RANGE(0x600000, 0x601fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x600000, 0x601fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x700000, 0x703fff) AM_WRITE(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_BASE(&paletteram32) // Palette - AM_RANGE(0x800000, 0x800003) AM_WRITE(MWA32_NOP) // Clear buffered inputs - AM_RANGE(0x810000, 0x810003) AM_WRITE(MWA32_NOP) // Clear buffered inputs + AM_RANGE(0x800000, 0x800003) AM_WRITE(SMH_NOP) // Clear buffered inputs + AM_RANGE(0x810000, 0x810003) AM_WRITE(SMH_NOP) // Clear buffered inputs AM_RANGE(0x8c0000, 0x8c001f) AM_WRITE(fuuki32_vregs_w) AM_BASE(&fuuki32_vregs) // Video Registers - AM_RANGE(0x8d0000, 0x8d0003) AM_WRITE(MWA32_RAM) // Flipscreen Related - AM_RANGE(0x8e0000, 0x8e0003) AM_WRITE(MWA32_RAM) AM_BASE(&fuuki32_priority) // Controls layer order + AM_RANGE(0x8d0000, 0x8d0003) AM_WRITE(SMH_RAM) // Flipscreen Related + AM_RANGE(0x8e0000, 0x8e0003) AM_WRITE(SMH_RAM) AM_BASE(&fuuki32_priority) // Controls layer order AM_RANGE(0x903fe0, 0x903fff) AM_WRITE(snd_020_w) // z80 comms - AM_RANGE(0xa00000, 0xa00003) AM_WRITE(MWA32_RAM) AM_BASE(&fuuki32_tilebank) + AM_RANGE(0xa00000, 0xa00003) AM_WRITE(SMH_RAM) AM_BASE(&fuuki32_tilebank) ADDRESS_MAP_END @@ -346,17 +346,17 @@ static WRITE8_HANDLER( snd_z80_w ) } static ADDRESS_MAP_START( fuuki32_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x7ff0, 0x7fff) AM_READ(snd_z80_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1 ) // ROM + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1 ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( fuuki32_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x7ff0, 0x7fff) AM_WRITE(snd_z80_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( fuuki32_sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -367,7 +367,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fuuki32_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(fuuki32_sound_bw_w) - AM_RANGE(0x30, 0x30) AM_WRITE(MWA8_NOP) + AM_RANGE(0x30, 0x30) AM_WRITE(SMH_NOP) AM_RANGE(0x40, 0x40) AM_WRITE(YMF262_register_A_0_w) AM_RANGE(0x41, 0x41) AM_WRITE(YMF262_data_A_0_w) AM_RANGE(0x42, 0x42) AM_WRITE(YMF262_register_B_0_w) diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index ce3c029794f..3439137bd07 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -61,17 +61,17 @@ VIDEO_UPDATE( bigkarnk ); static ADDRESS_MAP_START( bigkarnk_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) /* ROM */ - AM_RANGE(0x100000, 0x101fff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x102000, 0x103fff) AM_READ(MRA16_RAM) /* Screen RAM */ - AM_RANGE(0x200000, 0x2007ff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_READ(MRA16_RAM) /* Sprite RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x100000, 0x101fff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x102000, 0x103fff) AM_READ(SMH_RAM) /* Screen RAM */ + AM_RANGE(0x200000, 0x2007ff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x440000, 0x440fff) AM_READ(SMH_RAM) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r)/* DIPSW #1 */ AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r)/* DIPSW #2 */ AM_RANGE(0x700004, 0x700005) AM_READ(input_port_2_word_r)/* INPUT #1 */ AM_RANGE(0x700006, 0x700007) AM_READ(input_port_3_word_r)/* INPUT #2 */ AM_RANGE(0x700008, 0x700009) AM_READ(input_port_4_word_r)/* Service + Test */ - AM_RANGE(0xff8000, 0xffffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0xff8000, 0xffffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static WRITE16_HANDLER( bigkarnk_sound_command_w ) @@ -99,34 +99,34 @@ static WRITE16_HANDLER( bigkarnk_coin_w ) } static ADDRESS_MAP_START( bigkarnk_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x100000, 0x101fff) AM_WRITE(gaelco_vram_w) AM_BASE(&gaelco_videoram) /* Video RAM */ - AM_RANGE(0x102000, 0x103fff) AM_WRITE(MWA16_RAM) /* Screen RAM */ - AM_RANGE(0x108000, 0x108007) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ + AM_RANGE(0x102000, 0x103fff) AM_WRITE(SMH_RAM) /* Screen RAM */ + AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ // AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco_spriteram) /* Sprite RAM */ + AM_RANGE(0x440000, 0x440fff) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_spriteram) /* Sprite RAM */ AM_RANGE(0x70000e, 0x70000f) AM_WRITE(bigkarnk_sound_command_w) /* Triggers a FIRQ on the sound CPU */ AM_RANGE(0x70000a, 0x70003b) AM_WRITE(bigkarnk_coin_w) /* Coin Counters + Coin Lockout */ - AM_RANGE(0xff8000, 0xffffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0xff8000, 0xffffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( bigkarnk_readmem_snd, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0x0800, 0x0801) AM_READ(OKIM6295_status_0_r) /* OKI6295 */ AM_RANGE(0x0a00, 0x0a00) AM_READ(YM3812_status_port_0_r) /* YM3812 */ AM_RANGE(0x0b00, 0x0b00) AM_READ(soundlatch_r) /* Sound latch */ - AM_RANGE(0x0c00, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x0c00, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( bigkarnk_writemem_snd, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x0800, 0x0800) AM_WRITE(OKIM6295_data_0_w) /* OKI6295 */ -// AM_RANGE(0x0900, 0x0900) AM_WRITE(MWA8_NOP) /* enable sound output? */ +// AM_RANGE(0x0900, 0x0900) AM_WRITE(SMH_NOP) /* enable sound output? */ AM_RANGE(0x0a00, 0x0a00) AM_WRITE(YM3812_control_port_0_w)/* YM3812 */ AM_RANGE(0x0a01, 0x0a01) AM_WRITE(YM3812_write_port_0_w) /* YM3812 */ - AM_RANGE(0x0c00, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x0c00, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static INPUT_PORTS_START( bigkarnk ) @@ -285,17 +285,17 @@ VIDEO_UPDATE( maniacsq ); static ADDRESS_MAP_START( maniacsq_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* ROM */ - AM_RANGE(0x100000, 0x101fff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x102000, 0x103fff) AM_READ(MRA16_RAM) /* Screen RAM */ - AM_RANGE(0x200000, 0x2007ff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_READ(MRA16_RAM) /* Sprite RAM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x100000, 0x101fff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x102000, 0x103fff) AM_READ(SMH_RAM) /* Screen RAM */ + AM_RANGE(0x200000, 0x2007ff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x440000, 0x440fff) AM_READ(SMH_RAM) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r)/* DIPSW #2 */ AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r)/* DIPSW #1 */ AM_RANGE(0x700004, 0x700005) AM_READ(input_port_2_word_r)/* INPUT #1 */ AM_RANGE(0x700006, 0x700007) AM_READ(input_port_3_word_r)/* INPUT #2 */ AM_RANGE(0x70000e, 0x70000f) AM_READ(OKIM6295_status_0_lsb_r)/* OKI6295 status register */ - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static WRITE16_HANDLER( OKIM6295_bankswitch_w ) @@ -308,16 +308,16 @@ static WRITE16_HANDLER( OKIM6295_bankswitch_w ) } static ADDRESS_MAP_START( maniacsq_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x100000, 0x101fff) AM_WRITE(gaelco_vram_w) AM_BASE(&gaelco_videoram) /* Video RAM */ - AM_RANGE(0x102000, 0x103fff) AM_WRITE(MWA16_RAM) /* Screen RAM */ - AM_RANGE(0x108000, 0x108007) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ + AM_RANGE(0x102000, 0x103fff) AM_WRITE(SMH_RAM) /* Screen RAM */ + AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ // AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco_spriteram) /* Sprite RAM */ + AM_RANGE(0x440000, 0x440fff) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_spriteram) /* Sprite RAM */ AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */ AM_RANGE(0x70000e, 0x70000f) AM_WRITE(OKIM6295_data_0_lsb_w) /* OKI6295 data register */ - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -1079,30 +1079,30 @@ static WRITE16_HANDLER(thoop_encrypted_w) static ADDRESS_MAP_START( squash_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* ROM */ - AM_RANGE(0x100000, 0x101fff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x102000, 0x103fff) AM_READ(MRA16_RAM) /* Screen RAM */ - AM_RANGE(0x200000, 0x2007ff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_READ(MRA16_RAM) /* Sprite RAM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x100000, 0x101fff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x102000, 0x103fff) AM_READ(SMH_RAM) /* Screen RAM */ + AM_RANGE(0x200000, 0x2007ff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x440000, 0x440fff) AM_READ(SMH_RAM) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r)/* DIPSW #2 */ AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r)/* DIPSW #1 */ AM_RANGE(0x700004, 0x700005) AM_READ(input_port_2_word_r)/* INPUT #1 */ AM_RANGE(0x700006, 0x700007) AM_READ(input_port_3_word_r)/* INPUT #2 */ AM_RANGE(0x70000e, 0x70000f) AM_READ(OKIM6295_status_0_lsb_r)/* OKI6295 status register */ - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( squash_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x100000, 0x101fff) AM_WRITE(gaelco_vram_encrypted_w) AM_BASE(&gaelco_videoram) /* Video RAM */ AM_RANGE(0x102000, 0x103fff) AM_WRITE(gaelco_encrypted_w) AM_BASE(&gaelco_screen) /* Screen RAM */ - AM_RANGE(0x108000, 0x108007) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ + AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ // AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco_spriteram) /* Sprite RAM */ + AM_RANGE(0x440000, 0x440fff) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_spriteram) /* Sprite RAM */ AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */ AM_RANGE(0x70000e, 0x70000f) AM_WRITE(OKIM6295_data_0_lsb_w) /* OKI6295 data register */ - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static MACHINE_DRIVER_START( squash ) @@ -1261,16 +1261,16 @@ INPUT_PORTS_END static ADDRESS_MAP_START( thoop_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x100000, 0x101fff) AM_WRITE(thoop_vram_encrypted_w) AM_BASE(&gaelco_videoram) /* Video RAM */ AM_RANGE(0x102000, 0x103fff) AM_WRITE(thoop_encrypted_w) AM_BASE(&gaelco_screen) /* Screen RAM */ - AM_RANGE(0x108000, 0x108007) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ + AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ // AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco_spriteram) /* Sprite RAM */ + AM_RANGE(0x440000, 0x440fff) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_spriteram) /* Sprite RAM */ AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */ AM_RANGE(0x70000e, 0x70000f) AM_WRITE(OKIM6295_data_0_lsb_w) /* OKI6295 data register */ - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static MACHINE_DRIVER_START( thoop ) diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c index 7d1913af910..ef84387f368 100644 --- a/src/mame/drivers/gaelco2.c +++ b/src/mame/drivers/gaelco2.c @@ -82,26 +82,26 @@ GFXDECODEINFO(0x0400000, 128) ============================================================================*/ static ADDRESS_MAP_START( maniacsq_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_READ(gaelcosnd_r) /* Sound Registers */ - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x210000, 0x211fff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x218004, 0x218009) AM_READ(MRA16_RAM) /* Video Registers */ + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x210000, 0x211fff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x218004, 0x218009) AM_READ(SMH_RAM) /* Video Registers */ AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r)/* DSW #1 + Input 1P */ AM_RANGE(0x300002, 0x300003) AM_READ(input_port_1_word_r)/* DSW #2 + Input 2P */ AM_RANGE(0x320000, 0x320001) AM_READ(input_port_2_word_r)/* COINSW + SERVICESW */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( maniacsq_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_WRITE(gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ AM_RANGE(0x200000, 0x20ffff) AM_WRITE(gaelco2_vram_w) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Video RAM */ AM_RANGE(0x210000, 0x211fff) AM_WRITE(gaelco2_palette_w) AM_BASE(&paletteram16) /* Palette */ - AM_RANGE(0x218004, 0x218009) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ - AM_RANGE(0x30004a, 0x30004b) AM_WRITE(MWA16_NOP) /* Sound muting? */ + AM_RANGE(0x218004, 0x218009) AM_WRITE(SMH_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ + AM_RANGE(0x30004a, 0x30004b) AM_WRITE(SMH_NOP) /* Sound muting? */ AM_RANGE(0x500000, 0x500001) AM_WRITE(gaelco2_coin_w) /* Coin lockout + counters */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -275,35 +275,35 @@ static READ16_HANDLER(p2_gun_x) {return (readinputport(4)*320/0x100)+1;} static READ16_HANDLER(p2_gun_y) {return (readinputport(6)*240/0x100)-4;} static ADDRESS_MAP_START( bang_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_READ(gaelcosnd_r) /* Sound Registers */ - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x210000, 0x211fff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x218004, 0x218009) AM_READ(MRA16_RAM) /* Video Registers */ + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x210000, 0x211fff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x218004, 0x218009) AM_READ(SMH_RAM) /* Video Registers */ AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r)/* 1P Input */ - AM_RANGE(0x300002, 0x300003) AM_READ(MRA16_NOP) /* Random number generator? */ + AM_RANGE(0x300002, 0x300003) AM_READ(SMH_NOP) /* Random number generator? */ AM_RANGE(0x300010, 0x300011) AM_READ(input_port_1_word_r)/* 2P Input */ AM_RANGE(0x300020, 0x300021) AM_READ(gaelco2_eeprom_r) /* EEPROM status + read */ AM_RANGE(0x310000, 0x310001) AM_READ(p1_gun_x)/* Gun 1P X */ AM_RANGE(0x310002, 0x310003) AM_READ(p2_gun_x)/* Gun 2P X */ AM_RANGE(0x310004, 0x310005) AM_READ(p1_gun_y)/* Gun 1P Y */ AM_RANGE(0x310006, 0x310007) AM_READ(p2_gun_y)/* Gun 2P Y */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( bang_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_WRITE(gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ AM_RANGE(0x200000, 0x20ffff) AM_WRITE(gaelco2_vram_w) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Video RAM */ AM_RANGE(0x210000, 0x211fff) AM_WRITE(gaelco2_palette_w) AM_BASE(&paletteram16) /* Palette */ - AM_RANGE(0x218004, 0x218007) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ - AM_RANGE(0x218008, 0x218009) AM_WRITE(MWA16_NOP) /* CLR INT Video */ + AM_RANGE(0x218004, 0x218007) AM_WRITE(SMH_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ + AM_RANGE(0x218008, 0x218009) AM_WRITE(SMH_NOP) /* CLR INT Video */ AM_RANGE(0x300000, 0x300003) AM_WRITE(gaelco2_coin2_w) /* Coin Counters */ AM_RANGE(0x300008, 0x300009) AM_WRITE(gaelco2_eeprom_data_w) /* EEPROM data */ AM_RANGE(0x30000a, 0x30000b) AM_WRITE(gaelco2_eeprom_sk_w) /* EEPROM serial clock */ AM_RANGE(0x30000c, 0x30000d) AM_WRITE(gaelco2_eeprom_cs_w) /* EEPROM chip select */ AM_RANGE(0x310000, 0x310001) AM_WRITE(clr_gun_int_w) /* CLR INT Gun */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -440,26 +440,26 @@ ROM_END static ADDRESS_MAP_START( alighunt_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_READ(gaelcosnd_r) /* Sound Registers */ - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x210000, 0x211fff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x218004, 0x218009) AM_READ(MRA16_RAM) /* Video Registers */ + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x210000, 0x211fff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x218004, 0x218009) AM_READ(SMH_RAM) /* Video Registers */ AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r)/* DSW #1 + Input 1P */ AM_RANGE(0x300002, 0x300003) AM_READ(input_port_1_word_r)/* DSW #2 + Input 2P */ AM_RANGE(0x320000, 0x320001) AM_READ(input_port_2_word_r)/* COINSW + Service */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( alighunt_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_WRITE(gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ AM_RANGE(0x200000, 0x20ffff) AM_WRITE(gaelco2_vram_w) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Video RAM */ AM_RANGE(0x210000, 0x211fff) AM_WRITE(gaelco2_palette_w) AM_BASE(&paletteram16) /* Palette */ - AM_RANGE(0x218004, 0x218009) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ + AM_RANGE(0x218004, 0x218009) AM_WRITE(SMH_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ AM_RANGE(0x500000, 0x500001) AM_WRITE(gaelco2_coin_w) /* Coin lockout + counters */ - AM_RANGE(0x500006, 0x500007) AM_WRITE(MWA16_NOP) /* ??? */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0x500006, 0x500007) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -672,27 +672,27 @@ static READ16_HANDLER ( dallas_kludge_r ) } static ADDRESS_MAP_START( touchgo_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_READ(gaelcosnd_r) /* Sound Registers */ - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x210000, 0x211fff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x218004, 0x218009) AM_READ(MRA16_RAM) /* Video Registers */ + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x210000, 0x211fff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x218004, 0x218009) AM_READ(SMH_RAM) /* Video Registers */ AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r)/* DSW #2 + Input 1P */ AM_RANGE(0x300002, 0x300003) AM_READ(input_port_1_word_r)/* DSW #1 + Input 2P */ AM_RANGE(0x300004, 0x300005) AM_READ(input_port_2_word_r)/* COINSW + Input 3P */ AM_RANGE(0x300006, 0x300007) AM_READ(input_port_3_word_r)/* SERVICESW + Input 4P */ AM_RANGE(0xfefffa, 0xfefffb) AM_READ(dallas_kludge_r) /* DS5002FP related patch */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( touchgo_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_WRITE(gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ AM_RANGE(0x200000, 0x20ffff) AM_WRITE(gaelco2_vram_w) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Video RAM */ AM_RANGE(0x210000, 0x211fff) AM_WRITE(gaelco2_palette_w) AM_BASE(&paletteram16) /* Palette */ - AM_RANGE(0x218004, 0x218009) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ + AM_RANGE(0x218004, 0x218009) AM_WRITE(SMH_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ AM_RANGE(0x500000, 0x50001f) AM_WRITE(touchgo_coin_w) /* Coin counters */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -947,32 +947,32 @@ ROM_END ============================================================================*/ static ADDRESS_MAP_START( snowboar_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_READ(gaelcosnd_r) /* Sound Registers */ - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x210000, 0x211fff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x212000, 0x213fff) AM_READ(MRA16_RAM) /* Extra RAM */ - AM_RANGE(0x218004, 0x218009) AM_READ(MRA16_RAM) /* Video Registers */ + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x210000, 0x211fff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x212000, 0x213fff) AM_READ(SMH_RAM) /* Extra RAM */ + AM_RANGE(0x218004, 0x218009) AM_READ(SMH_RAM) /* Video Registers */ AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r)/* Input 1P */ AM_RANGE(0x300010, 0x300011) AM_READ(input_port_1_word_r)/* Input 2P */ AM_RANGE(0x300020, 0x300021) AM_READ(gaelco2_eeprom_r) /* EEPROM status + read */ AM_RANGE(0x310000, 0x31ffff) AM_READ(snowboar_protection_r)/* Protection */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( snowboar_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_WRITE(gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ AM_RANGE(0x200000, 0x20ffff) AM_WRITE(gaelco2_vram_w) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Video RAM */ AM_RANGE(0x210000, 0x211fff) AM_WRITE(gaelco2_palette_w) AM_BASE(&paletteram16) /* Palette */ - AM_RANGE(0x212000, 0x213fff) AM_WRITE(MWA16_RAM) /* Extra RAM */ - AM_RANGE(0x218004, 0x218009) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ + AM_RANGE(0x212000, 0x213fff) AM_WRITE(SMH_RAM) /* Extra RAM */ + AM_RANGE(0x218004, 0x218009) AM_WRITE(SMH_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ AM_RANGE(0x300000, 0x300003) AM_WRITE(gaelco2_coin2_w) /* Coin Counters */ AM_RANGE(0x300008, 0x300009) AM_WRITE(gaelco2_eeprom_data_w) /* EEPROM data */ AM_RANGE(0x30000a, 0x30000b) AM_WRITE(gaelco2_eeprom_sk_w) /* EEPROM serial clock */ AM_RANGE(0x30000c, 0x30000d) AM_WRITE(gaelco2_eeprom_cs_w) /* EEPROM chip select */ AM_RANGE(0x310000, 0x31ffff) AM_WRITE(snowboar_protection_w) AM_BASE(&snowboar_protection)/* Protection */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -1143,29 +1143,29 @@ ROM_END ============================================================================*/ static ADDRESS_MAP_START( wrally2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_READ(gaelcosnd_r) /* Sound Registers */ - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x210000, 0x211fff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x212000, 0x213fff) AM_READ(MRA16_RAM) /* Extra RAM */ - AM_RANGE(0x218004, 0x218009) AM_READ(MRA16_RAM) /* Video Registers */ + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x210000, 0x211fff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x212000, 0x213fff) AM_READ(SMH_RAM) /* Extra RAM */ + AM_RANGE(0x218004, 0x218009) AM_READ(SMH_RAM) /* Video Registers */ AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r)/* DIPSW #2 + Inputs 1P */ AM_RANGE(0x300002, 0x300003) AM_READ(input_port_1_word_r)/* DIPSW #1 */ AM_RANGE(0x300004, 0x300005) AM_READ(input_port_2_word_r)/* Inputs 2P + COINSW */ AM_RANGE(0x300006, 0x300007) AM_READ(input_port_3_word_r)/* SERVICESW */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( wrally2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x202890, 0x2028ff) AM_WRITE(gaelcosnd_w) AM_BASE(&gaelco_sndregs) /* Sound Registers */ AM_RANGE(0x200000, 0x20ffff) AM_WRITE(gaelco2_vram_w) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Video RAM */ AM_RANGE(0x210000, 0x211fff) AM_WRITE(gaelco2_palette_w) AM_BASE(&paletteram16) /* Palette */ - AM_RANGE(0x212000, 0x213fff) AM_WRITE(MWA16_RAM) /* Extra RAM */ - AM_RANGE(0x218004, 0x218009) AM_WRITE(MWA16_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ + AM_RANGE(0x212000, 0x213fff) AM_WRITE(SMH_RAM) /* Extra RAM */ + AM_RANGE(0x218004, 0x218009) AM_WRITE(SMH_RAM) AM_BASE(&gaelco2_vregs) /* Video Registers */ AM_RANGE(0x400000, 0x400011) AM_WRITE(wrally2_coin_w) /* Coin Counters */ - AM_RANGE(0x400028, 0x400031) AM_WRITE(MWA16_NOP) /* Pot Wheel input bit select */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0x400028, 0x400031) AM_WRITE(SMH_NOP) /* Pot Wheel input bit select */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index 7da11123f64..3a281eebc3a 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -730,7 +730,7 @@ static WRITE32_HANDLER( led_1_020_w ) { if ((mem_mask & 0xffff) != 0xffff) led_1 static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000000, 0x1fffff) AM_ROM - AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(MRA16_RAM, gaelco3d_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(SMH_RAM, gaelco3d_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x51000c, 0x51000d) AM_READ(input_port_0_word_r) AM_RANGE(0x51001c, 0x51001d) AM_READ(input_port_1_word_r) AM_RANGE(0x51002c, 0x51002d) AM_READ(input_port_2_word_r) @@ -757,7 +757,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main020_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM - AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(MRA32_RAM, gaelco3d_paletteram_020_w) AM_BASE(&paletteram32) + AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(SMH_RAM, gaelco3d_paletteram_020_w) AM_BASE(&paletteram32) AM_RANGE(0x51000c, 0x51000f) AM_READ(input_port_0_020_r) AM_RANGE(0x51001c, 0x51001f) AM_READ(input_port_1_020_r) AM_RANGE(0x51002c, 0x51002f) AM_READ(input_port_2_020_r) diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index 8f62cc2e87d..d64c056045f 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -378,26 +378,26 @@ static READ16_HANDLER( raiga_protection_r ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) - AM_RANGE(0x070000, 0x070fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x060000, 0x063fff) AM_READ(SMH_RAM) + AM_RANGE(0x070000, 0x070fff) AM_READ(SMH_RAM) AM_RANGE(0x072000, 0x073fff) AM_READ(gaiden_videoram2_r) AM_RANGE(0x074000, 0x075fff) AM_READ(gaiden_videoram3_r) - AM_RANGE(0x076000, 0x077fff) AM_READ(MRA16_RAM) - AM_RANGE(0x078000, 0x0787ff) AM_READ(MRA16_RAM) - AM_RANGE(0x078800, 0x079fff) AM_READ(MRA16_NOP) /* extra portion of palette RAM, not really used */ + AM_RANGE(0x076000, 0x077fff) AM_READ(SMH_RAM) + AM_RANGE(0x078000, 0x0787ff) AM_READ(SMH_RAM) + AM_RANGE(0x078800, 0x079fff) AM_READ(SMH_NOP) /* extra portion of palette RAM, not really used */ AM_RANGE(0x07a000, 0x07a001) AM_READ(input_port_0_word_r) AM_RANGE(0x07a002, 0x07a003) AM_READ(input_port_1_word_r) AM_RANGE(0x07a004, 0x07a005) AM_READ(input_port_2_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x060000, 0x063fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x060000, 0x063fff) AM_WRITE(SMH_RAM) AM_RANGE(0x070000, 0x070fff) AM_WRITE(gaiden_videoram_w) AM_BASE(&gaiden_videoram) AM_RANGE(0x072000, 0x073fff) AM_WRITE(gaiden_videoram2_w) AM_BASE(&gaiden_videoram2) AM_RANGE(0x074000, 0x075fff) AM_WRITE(gaiden_videoram3_w) AM_BASE(&gaiden_videoram3) - AM_RANGE(0x076000, 0x077fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x076000, 0x077fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x078000, 0x079fff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x07a104, 0x07a105) AM_WRITE(gaiden_txscrolly_w) AM_RANGE(0x07a10c, 0x07a10d) AM_WRITE(gaiden_txscrollx_w) @@ -407,18 +407,18 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x07a30c, 0x07a30d) AM_WRITE(gaiden_bgscrollx_w) AM_RANGE(0x07a800, 0x07a801) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x07a802, 0x07a803) AM_WRITE(gaiden_sound_command_w) - AM_RANGE(0x07a806, 0x07a807) AM_WRITE(MWA16_NOP) + AM_RANGE(0x07a806, 0x07a807) AM_WRITE(SMH_NOP) AM_RANGE(0x07a808, 0x07a809) AM_WRITE(gaiden_flip_w) ADDRESS_MAP_END static ADDRESS_MAP_START( drgnbowl_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x060000, 0x063fff) AM_RAM - AM_RANGE(0x070000, 0x070fff) AM_READWRITE(MRA16_RAM, gaiden_videoram_w) AM_BASE(&gaiden_videoram) - AM_RANGE(0x072000, 0x073fff) AM_READWRITE(MRA16_RAM, gaiden_videoram2_w) AM_BASE(&gaiden_videoram2) - AM_RANGE(0x074000, 0x075fff) AM_READWRITE(MRA16_RAM, gaiden_videoram3_w) AM_BASE(&gaiden_videoram3) + AM_RANGE(0x070000, 0x070fff) AM_READWRITE(SMH_RAM, gaiden_videoram_w) AM_BASE(&gaiden_videoram) + AM_RANGE(0x072000, 0x073fff) AM_READWRITE(SMH_RAM, gaiden_videoram2_w) AM_BASE(&gaiden_videoram2) + AM_RANGE(0x074000, 0x075fff) AM_READWRITE(SMH_RAM, gaiden_videoram3_w) AM_BASE(&gaiden_videoram3) AM_RANGE(0x076000, 0x077fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x078000, 0x079fff) AM_READWRITE(MRA16_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x078000, 0x079fff) AM_READWRITE(SMH_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x07a000, 0x07a001) AM_READ(input_port_0_word_r) AM_RANGE(0x07a002, 0x07a003) AM_READ(input_port_1_word_r) AM_RANGE(0x07a004, 0x07a005) AM_READ(input_port_2_word_r) @@ -431,24 +431,24 @@ static ADDRESS_MAP_START( drgnbowl_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_ROM) /* raiga only */ - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) /* raiga only */ + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(OKIM6295_status_0_r) - AM_RANGE(0xfc00, 0xfc00) AM_READ(MRA8_NOP) /* ?? */ + AM_RANGE(0xfc00, 0xfc00) AM_READ(SMH_NOP) /* ?? */ AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_ROM) /* raiga only */ - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_ROM) /* raiga only */ + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0xf810, 0xf810) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xf811, 0xf811) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xf820, 0xf820) AM_WRITE(YM2203_control_port_1_w) AM_RANGE(0xf821, 0xf821) AM_WRITE(YM2203_write_port_1_w) - AM_RANGE(0xfc00, 0xfc00) AM_WRITE(MWA8_NOP) /* ?? */ + AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_NOP) /* ?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( drgnbowl_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index b35f5eda24d..2df3e540382 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -927,7 +927,7 @@ static ADDRESS_MAP_START( bosco_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8fff) AM_READWRITE(bosco_videoram_r, bosco_videoram_w) AM_BASE(&bosco_videoram) /* + sprite registers */ AM_RANGE(0x9000, 0x90ff) AM_READWRITE(namco_06xx_1_data_r, namco_06xx_1_data_w) AM_RANGE(0x9100, 0x9100) AM_READWRITE(namco_06xx_1_ctrl_r, namco_06xx_1_ctrl_w) - AM_RANGE(0x9800, 0x980f) AM_WRITE(MWA8_RAM) AM_SHARE(2) AM_BASE(&bosco_radarattr) + AM_RANGE(0x9800, 0x980f) AM_WRITE(SMH_RAM) AM_SHARE(2) AM_BASE(&bosco_radarattr) AM_RANGE(0x9810, 0x9810) AM_WRITE(bosco_scrollx_w) AM_RANGE(0x9820, 0x9820) AM_WRITE(bosco_scrolly_w) AM_RANGE(0x9830, 0x9830) AM_WRITE(bosco_starcontrol_w) @@ -996,43 +996,43 @@ ADDRESS_MAP_END /* bootleg 4th CPU replacing the 5xXX chips */ static ADDRESS_MAP_START( readmem4_galaga, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) - AM_RANGE(0x1000, 0x107f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) + AM_RANGE(0x1000, 0x107f) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem4_galaga, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x1000, 0x107f) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x1000, 0x107f) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem4_battles, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x4003) AM_READ(battles_input_port_r) AM_RANGE(0x6000, 0x6000) AM_READ(battles_customio3_r) AM_RANGE(0x7000, 0x7000) AM_READ(battles_customio_data3_r) - AM_RANGE(0x8000, 0x80ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x80ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem4_battles, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4001, 0x4001) AM_WRITE(battles_CPU4_coin_w) AM_RANGE(0x5000, 0x5000) AM_WRITE(battles_noise_sound_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(battles_customio3_w) AM_RANGE(0x7000, 0x7000) AM_WRITE(battles_customio_data3_w) - AM_RANGE(0x8000, 0x80ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x8000, 0x80ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem4_dzigzag, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) - AM_RANGE(0x1000, 0x107f) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0x4007) AM_READ(MRA8_RAM) // dip switches? bits 0 & 1 used + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) + AM_RANGE(0x1000, 0x107f) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0x4007) AM_READ(SMH_RAM) // dip switches? bits 0 & 1 used ADDRESS_MAP_END static ADDRESS_MAP_START( writemem4_dzigzag, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x1000, 0x107f) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x1000, 0x107f) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c index a8741674b7e..3e5d831bdbd 100644 --- a/src/mame/drivers/galaxia.c +++ b/src/mame/drivers/galaxia.c @@ -55,25 +55,25 @@ static VIDEO_UPDATE( galaxia ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x13ff) AM_READ(MRA8_ROM) - AM_RANGE(0x1400, 0x1fff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x6fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x13ff) AM_READ(SMH_ROM) + AM_RANGE(0x1400, 0x1fff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x6fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x13ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x1400, 0x14ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1500, 0x15ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1600, 0x16ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1700, 0x17ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1800, 0x18ff) AM_WRITE(MWA8_RAM) AM_BASE(&galaxia_video) - AM_RANGE(0x1900, 0x19ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1a00, 0x1aff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1b00, 0x1bff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1c00, 0x1cff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1d00, 0x1dff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1e00, 0x1eff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1f00, 0x1fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x13ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x1400, 0x14ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1500, 0x15ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1600, 0x16ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1700, 0x17ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1800, 0x18ff) AM_WRITE(SMH_RAM) AM_BASE(&galaxia_video) + AM_RANGE(0x1900, 0x19ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1a00, 0x1aff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1b00, 0x1bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1c00, 0x1cff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1d00, 0x1dff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1e00, 0x1eff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1f00, 0x1fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index f0f3077c8f3..f50dbbb2d96 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -408,26 +408,26 @@ static READ8_HANDLER( drivfrcg_port0_r ) static ADDRESS_MAP_START( galaxian_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x53ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x53ff) AM_READ(SMH_RAM) AM_RANGE(0x5400, 0x57ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x5800, 0x58ff) AM_READ(MRA8_RAM) + AM_RANGE(0x5800, 0x58ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(input_port_0_r) AM_RANGE(0x6800, 0x6800) AM_READ(input_port_1_r) AM_RANGE(0x7000, 0x7000) AM_READ(input_port_2_r) AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r) - AM_RANGE(0xfffc, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xfffc, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( galaxian_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x5000, 0x53ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x5800, 0x583f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5840, 0x585f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5860, 0x587f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5880, 0x58ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5840, 0x585f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5860, 0x587f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5880, 0x58ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6000, 0x6001) AM_WRITE(galaxian_leds_w) AM_RANGE(0x6002, 0x6002) AM_WRITE(galaxian_coin_lockout_w) AM_RANGE(0x6003, 0x6003) AM_WRITE(galaxian_coin_counter_w) @@ -441,16 +441,16 @@ static ADDRESS_MAP_START( galaxian_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7006, 0x7006) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0x7007, 0x7007) AM_WRITE(galaxian_flip_screen_y_w) AM_RANGE(0x7800, 0x7800) AM_WRITE(galaxian_pitch_w) - AM_RANGE(0xfffc, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xfffc, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( gmgalax_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_BANK1) /* banked code */ - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x53ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_BANK1) /* banked code */ + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x53ff) AM_READ(SMH_RAM) AM_RANGE(0x5400, 0x57ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x5800, 0x58ff) AM_READ(MRA8_RAM) + AM_RANGE(0x5800, 0x58ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(gmgalax_input_port_0_r) AM_RANGE(0x6800, 0x6800) AM_READ(gmgalax_input_port_1_r) AM_RANGE(0x7000, 0x7000) AM_READ(gmgalax_input_port_2_r) @@ -459,11 +459,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mooncrst_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) AM_RANGE(0x9400, 0x97ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) @@ -471,13 +471,13 @@ static ADDRESS_MAP_START( mooncrst_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mooncrst_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0xa004, 0xa007) AM_WRITE(galaxian_lfo_freq_w) AM_RANGE(0xa800, 0xa802) AM_WRITE(galaxian_background_enable_w) @@ -492,15 +492,15 @@ static ADDRESS_MAP_START( mooncrst_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( rockclim_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x47ff) AM_READ(rockclim_videoram_r) - AM_RANGE(0x5000, 0x53ff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x5000, 0x53ff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_READ(input_port_3_r) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) AM_RANGE(0x9400, 0x97ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) @@ -508,17 +508,17 @@ static ADDRESS_MAP_START( rockclim_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( rockclim_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x47ff) AM_WRITE(rockclim_videoram_w) AM_BASE(&rockclim_videoram)//4800 - 4803 = bg scroll ? AM_RANGE(0x4800, 0x4803) AM_WRITE(rockclim_scroll_w) - AM_RANGE(0x5000, 0x53ff) AM_WRITE(MWA8_RAM)//? - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5000, 0x53ff) AM_WRITE(SMH_RAM)//? + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa002) AM_WRITE(galaxian_gfxbank_w)// a002 - sprite bank AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0xa004, 0xa007) AM_WRITE(galaxian_lfo_freq_w) @@ -534,13 +534,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mshuttle_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x4fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x4fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0xa002, 0xa002) AM_WRITE(galaxian_flip_screen_y_w) @@ -562,13 +562,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( skybase_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa002, 0xa002) AM_WRITE(galaxian_gfxbank_w) AM_RANGE(0xa004, 0xa007) AM_WRITE(galaxian_lfo_freq_w) AM_RANGE(0xa800, 0xa802) AM_WRITE(galaxian_background_enable_w) @@ -584,9 +584,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( scramblb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4bff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x50ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4bff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(input_port_0_r) AM_RANGE(0x6800, 0x6800) AM_READ(input_port_1_r) AM_RANGE(0x7000, 0x7000) AM_READ(input_port_2_r) @@ -596,14 +596,14 @@ static ADDRESS_MAP_START( scramblb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( scramblb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6000, 0x6001) AM_WRITE(MWA8_NOP) /* sound triggers */ + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x6000, 0x6001) AM_WRITE(SMH_NOP) /* sound triggers */ AM_RANGE(0x6003, 0x6003) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0x6004, 0x6007) AM_WRITE(galaxian_lfo_freq_w) AM_RANGE(0x6800, 0x6802) AM_WRITE(galaxian_background_enable_w) @@ -627,9 +627,9 @@ static READ8_HANDLER( scramb2_port1_r ) { return (readinputport(1)>>offset)&0x1; static READ8_HANDLER( scramb2_port2_r ) { return (readinputport(2)>>offset)&0x1; } static ADDRESS_MAP_START( scramb2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4bff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x50ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4bff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) AM_RANGE(0x5800, 0x5fff) AM_READ(scramb2_protection_r) // must return 0x25 AM_RANGE(0x6000, 0x6007) AM_READ(scramb2_port0_r) // reads from 8 addresses, 1 bit per address AM_RANGE(0x6800, 0x6807) AM_READ(scramb2_port1_r) // reads from 8 addresses, 1 bit per address @@ -638,47 +638,47 @@ static ADDRESS_MAP_START( scramb2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( scramb2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x4c00, 0x4fff) AM_WRITE(galaxian_videoram_w) // mirror AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0x6804, 0x6804) AM_WRITE(galaxian_stars_enable_w) AM_RANGE(0x6806, 0x6806) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0x6807, 0x6807) AM_WRITE(galaxian_flip_screen_y_w) - AM_RANGE(0x7006, 0x7006) AM_WRITE(MWA8_NOP) - AM_RANGE(0x7007, 0x7007) AM_WRITE(MWA8_NOP) + AM_RANGE(0x7006, 0x7006) AM_WRITE(SMH_NOP) + AM_RANGE(0x7007, 0x7007) AM_WRITE(SMH_NOP) AM_RANGE(0x7800, 0x7800) AM_WRITE(galaxian_pitch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( jumpbug_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4bff) AM_READ(SMH_RAM) AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x5000, 0x50ff) AM_READ(MRA8_RAM) + AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(input_port_0_r) AM_RANGE(0x6800, 0x6800) AM_READ(input_port_1_r) AM_RANGE(0x7000, 0x7000) AM_READ(input_port_2_r) - AM_RANGE(0x8000, 0xafff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xafff) AM_READ(SMH_ROM) AM_RANGE(0xb000, 0xbfff) AM_READ(jumpbug_protection_r) ADDRESS_MAP_END static ADDRESS_MAP_START( jumpbug_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x4c00, 0x4fff) AM_WRITE(galaxian_videoram_w) AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) AM_RANGE(0x5800, 0x5800) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x5900, 0x5900) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x6002, 0x6006) AM_WRITE(galaxian_gfxbank_w) @@ -687,18 +687,18 @@ static ADDRESS_MAP_START( jumpbug_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7004, 0x7004) AM_WRITE(galaxian_stars_enable_w) AM_RANGE(0x7006, 0x7006) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0x7007, 0x7007) AM_WRITE(galaxian_flip_screen_y_w) - AM_RANGE(0x8000, 0xafff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xafff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( checkman_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa004, 0xa007) AM_WRITE(galaxian_lfo_freq_w) AM_RANGE(0xa800, 0xa802) AM_WRITE(galaxian_background_enable_w) AM_RANGE(0xa803, 0xa803) AM_WRITE(galaxian_noise_enable_w) @@ -712,13 +712,13 @@ static ADDRESS_MAP_START( checkman_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( checkmaj_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x5000, 0x53ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x5800, 0x583f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5840, 0x585f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5860, 0x587f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5880, 0x58ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5840, 0x585f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5860, 0x587f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5880, 0x58ff) AM_WRITE(SMH_RAM) AM_RANGE(0x7001, 0x7001) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0x7006, 0x7006) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0x7007, 0x7007) AM_WRITE(galaxian_flip_screen_y_w) @@ -733,13 +733,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( checkman_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( checkman_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -757,27 +757,27 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( checkmaj_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) AM_RANGE(0xa002, 0xa002) AM_READ(AY8910_read_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( checkmaj_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(AY8910_write_port_0_w) ADDRESS_MAP_END static ADDRESS_MAP_START( kingball_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa001) AM_WRITE(galaxian_leds_w) AM_RANGE(0xa002, 0xa002) AM_WRITE(galaxian_coin_lockout_w) AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxian_coin_counter_w) @@ -790,18 +790,18 @@ static ADDRESS_MAP_START( kingball_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb001, 0xb001) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0xb002, 0xb002) AM_WRITE(kingball_sound2_w) AM_RANGE(0xb003, 0xb003) AM_WRITE(kingball_speech_dip_w) - AM_RANGE(0xb004, 0xb004) AM_WRITE(MWA8_NOP) /* noise generator enable */ + AM_RANGE(0xb004, 0xb004) AM_WRITE(SMH_NOP) /* noise generator enable */ AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0xb007, 0xb007) AM_WRITE(galaxian_flip_screen_y_w) AM_RANGE(0xb800, 0xb800) AM_WRITE(galaxian_pitch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( kingball_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( kingball_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( kingball_sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -816,26 +816,26 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( _4in1_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_BANK1) /* banked game code */ - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x53ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_BANK1) /* banked game code */ + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x53ff) AM_READ(SMH_RAM) AM_RANGE(0x5400, 0x57ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x5800, 0x58ff) AM_READ(MRA8_RAM) + AM_RANGE(0x5800, 0x58ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(input_port_0_r) AM_RANGE(0x6800, 0x6800) AM_READ(_4in1_input_port_1_r) AM_RANGE(0x7000, 0x7000) AM_READ(_4in1_input_port_2_r) AM_RANGE(0x7800, 0x78ff) AM_READ(watchdog_reset_r) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_ROM) /* fixed menu code */ + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_ROM) /* fixed menu code */ ADDRESS_MAP_END static ADDRESS_MAP_START( _4in1_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) /* banked game code */ - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) /* banked game code */ + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x5000, 0x53ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x5800, 0x583f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5840, 0x585f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5860, 0x587f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5880, 0x58ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5840, 0x585f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5860, 0x587f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5880, 0x58ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6000, 0x6001) AM_WRITE(galaxian_leds_w) // AM_RANGE(0x6002, 0x6002) AM_WRITE(galaxian_coin_lockout_w) AM_RANGE(0x6003, 0x6003) AM_WRITE(galaxian_coin_counter_w) @@ -850,16 +850,16 @@ static ADDRESS_MAP_START( _4in1_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7007, 0x7007) AM_WRITE(galaxian_flip_screen_y_w) AM_RANGE(0x7800, 0x7800) AM_WRITE(galaxian_pitch_w) AM_RANGE(0x8000, 0x8000) AM_WRITE(_4in1_bank_w) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_ROM) /* Fixed Menu Code */ + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_ROM) /* Fixed Menu Code */ ADDRESS_MAP_END static ADDRESS_MAP_START( bagmanmc_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x67ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) AM_RANGE(0x9400, 0x97ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) @@ -867,13 +867,13 @@ static ADDRESS_MAP_START( bagmanmc_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bagmanmc_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x67ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x67ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0xa803, 0xa803) AM_WRITE(galaxian_noise_enable_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(galaxian_nmi_enable_w) @@ -900,12 +900,12 @@ static WRITE8_HANDLER( zigzag_8910_control_trigger_w ) } static ADDRESS_MAP_START( zigzag_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x3000, 0x3fff) AM_READ(MRA8_BANK2) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x53ff) AM_READ(MRA8_RAM) - AM_RANGE(0x5800, 0x58ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_BANK1) + AM_RANGE(0x3000, 0x3fff) AM_READ(SMH_BANK2) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x53ff) AM_READ(SMH_RAM) + AM_RANGE(0x5800, 0x58ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(input_port_0_r) AM_RANGE(0x6800, 0x6800) AM_READ(input_port_1_r) AM_RANGE(0x7000, 0x7000) AM_READ(input_port_2_r) @@ -913,17 +913,17 @@ static ADDRESS_MAP_START( zigzag_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( zigzag_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x4800, 0x4800) AM_WRITE(MWA8_NOP) /* part of the 8910 interface */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x4800, 0x4800) AM_WRITE(SMH_NOP) /* part of the 8910 interface */ AM_RANGE(0x4801, 0x4801) AM_WRITE(zigzag_8910_data_trigger_w) AM_RANGE(0x4803, 0x4803) AM_WRITE(zigzag_8910_control_trigger_w) AM_RANGE(0x4900, 0x49ff) AM_WRITE(zigzag_8910_latch_w) - AM_RANGE(0x4a00, 0x4a00) AM_WRITE(MWA8_NOP) /* part of the 8910 interface */ + AM_RANGE(0x4a00, 0x4a00) AM_WRITE(SMH_NOP) /* part of the 8910 interface */ AM_RANGE(0x5000, 0x53ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x5800, 0x583f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5840, 0x587f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) /* no bulletsram, all sprites */ - AM_RANGE(0x5880, 0x58ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5840, 0x587f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) /* no bulletsram, all sprites */ + AM_RANGE(0x5880, 0x58ff) AM_WRITE(SMH_RAM) AM_RANGE(0x7001, 0x7001) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0x7002, 0x7002) AM_WRITE(zigzag_sillyprotection_w) AM_RANGE(0x7006, 0x7006) AM_WRITE(galaxian_flip_screen_x_w) @@ -932,12 +932,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( scorpnmc_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x67ff) AM_READ(MRA8_ROM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x67ff) AM_READ(SMH_ROM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) AM_RANGE(0x9400, 0x97ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb001, 0xb001) AM_READ(input_port_2_r) @@ -946,14 +946,14 @@ static ADDRESS_MAP_START( scorpnmc_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( scorpnmc_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x5000, 0x67ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x5000, 0x67ff) AM_WRITE(SMH_ROM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0xa004, 0xa007) AM_WRITE(galaxian_lfo_freq_w) AM_RANGE(0xa800, 0xa802) AM_WRITE(galaxian_background_enable_w) @@ -969,10 +969,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dkongjrm_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM) - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM) + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa0ff) AM_READ(input_port_0_r) AM_RANGE(0xa800, 0xa8ff) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb0ff) AM_READ(input_port_2_r) @@ -980,13 +980,13 @@ static ADDRESS_MAP_START( dkongjrm_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dkongjrm_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x98c0, 0x98ff) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram2) AM_SIZE(&galaxian_spriteram2_size) + AM_RANGE(0x9840, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x98c0, 0x98ff) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram2) AM_SIZE(&galaxian_spriteram2_size) AM_RANGE(0xa003, 0xa003) AM_WRITE(galaxian_coin_counter_w) //AM_RANGE(0xa004, 0xa007) AM_WRITE(galaxian_lfo_freq_w) AM_RANGE(0xa800, 0xa802) AM_WRITE(galaxian_background_enable_w) @@ -1003,30 +1003,30 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ozon1_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4200) AM_READ(MRA8_RAM) - AM_RANGE(0x4300, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4200) AM_READ(SMH_RAM) + AM_RANGE(0x4300, 0x43ff) AM_READ(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x5000, 0x503f) AM_READ(MRA8_RAM) - AM_RANGE(0x5040, 0x505f) AM_READ(MRA8_RAM) + AM_RANGE(0x5000, 0x503f) AM_READ(SMH_RAM) + AM_RANGE(0x5040, 0x505f) AM_READ(SMH_RAM) AM_RANGE(0x8100, 0x8100) AM_READ(input_port_0_r) AM_RANGE(0x8101, 0x8101) AM_READ(input_port_1_r) AM_RANGE(0x8102, 0x8102) AM_READ(input_port_2_r) ADDRESS_MAP_END static ADDRESS_MAP_START( ozon1_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x4200) AM_WRITE(MWA8_RAM) - AM_RANGE(0x4300, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x4200) AM_WRITE(SMH_RAM) + AM_RANGE(0x4300, 0x43ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x4c00, 0x4fff) AM_WRITE(galaxian_videoram_w) AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x6801, 0x6801) AM_WRITE(MWA8_NOP) //continuosly 0 and 1 + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x6801, 0x6801) AM_WRITE(SMH_NOP) //continuosly 0 and 1 AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxian_coin_counter_w) - AM_RANGE(0x6806, 0x6806) AM_WRITE(MWA8_NOP) //only one 0 at reset - AM_RANGE(0x6807, 0x6807) AM_WRITE(MWA8_NOP) //only one 0 at reset - AM_RANGE(0x8103, 0x8103) AM_WRITE(MWA8_NOP) //only one 9b at reset + AM_RANGE(0x6806, 0x6806) AM_WRITE(SMH_NOP) //only one 0 at reset + AM_RANGE(0x6807, 0x6807) AM_WRITE(SMH_NOP) //only one 0 at reset + AM_RANGE(0x8103, 0x8103) AM_WRITE(SMH_NOP) //only one 9b at reset ADDRESS_MAP_END static ADDRESS_MAP_START( ozon1_writeport, ADDRESS_SPACE_IO, 8 ) @@ -1038,17 +1038,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( drivfrcg, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x1480, 0x14bf) AM_MIRROR(0x6000) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0x6000) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0x6000) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) AM_RANGE(0x1500, 0x1500) AM_MIRROR(0x6000) AM_READ(input_port_0_r) AM_RANGE(0x1503, 0x1503) AM_MIRROR(0x6000) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0x1580, 0x1580) AM_MIRROR(0x6000) AM_READ(input_port_1_r) AM_RANGE(0x1580, 0x1582) AM_MIRROR(0x6000) AM_WRITE(galaxian_background_enable_w) - AM_RANGE(0x1583, 0x1583) AM_MIRROR(0x6000) AM_WRITE(MWA8_NOP) - AM_RANGE(0x1585, 0x1585) AM_MIRROR(0x6000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x1583, 0x1583) AM_MIRROR(0x6000) AM_WRITE(SMH_NOP) + AM_RANGE(0x1585, 0x1585) AM_MIRROR(0x6000) AM_WRITE(SMH_NOP) AM_RANGE(0x1586, 0x1587) AM_MIRROR(0x6000) AM_WRITE(galaxian_lfo_freq_w) AM_RANGE(0x1600, 0x1600) AM_MIRROR(0x6000) AM_READWRITE(input_port_2_r, galaxian_pitch_w) - AM_RANGE(0x1700, 0x1700) AM_MIRROR(0x6000) AM_READWRITE(input_port_3_r, MWA8_NOP) - AM_RANGE(0x1701, 0x1701) AM_MIRROR(0x6000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x1700, 0x1700) AM_MIRROR(0x6000) AM_READWRITE(input_port_3_r, SMH_NOP) + AM_RANGE(0x1701, 0x1701) AM_MIRROR(0x6000) AM_WRITE(SMH_NOP) AM_RANGE(0x1704, 0x1707) AM_MIRROR(0x6000) AM_WRITE(galaxian_vol_w) AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x6000) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x1c00, 0x1fff) AM_MIRROR(0x6000) AM_RAM @@ -1059,16 +1059,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( drivfrcg_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READ(drivfrcg_port0_r) - AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READWRITE(input_port_4_r, MWA8_NOP) + AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READWRITE(input_port_4_r, SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( bongo, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x8000, 0x83ff) AM_RAM - AM_RANGE(0x8400, 0x87ff) AM_WRITE(MWA8_NOP) // not used - AM_RANGE(0x9000, 0x93ff) AM_READWRITE(MRA8_RAM, galaxian_videoram_w) AM_BASE(&galaxian_videoram) - AM_RANGE(0x9400, 0x97ff) AM_WRITE(MWA8_NOP) // not used - AM_RANGE(0x9800, 0x983f) AM_READWRITE(MRA8_RAM, galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) + AM_RANGE(0x8400, 0x87ff) AM_WRITE(SMH_NOP) // not used + AM_RANGE(0x9000, 0x93ff) AM_READWRITE(SMH_RAM, galaxian_videoram_w) AM_BASE(&galaxian_videoram) + AM_RANGE(0x9400, 0x97ff) AM_WRITE(SMH_NOP) // not used + AM_RANGE(0x9800, 0x983f) AM_READWRITE(SMH_RAM, galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) AM_RANGE(0x9860, 0x987f) AM_RAM AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) @@ -1078,7 +1078,7 @@ static ADDRESS_MAP_START( bongo, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb004, 0xb004) AM_WRITE(galaxian_stars_enable_w) AM_RANGE(0xb006, 0xb006) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0xb007, 0xb007) AM_WRITE(galaxian_flip_screen_y_w) - AM_RANGE(0xb800, 0xb800) AM_READWRITE(watchdog_reset_r, MWA8_NOP) + AM_RANGE(0xb800, 0xb800) AM_READWRITE(watchdog_reset_r, SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( bongo_io, ADDRESS_SPACE_IO, 8 ) @@ -1091,20 +1091,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hunchbkg, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM - AM_RANGE(0x1480, 0x14bf) AM_MIRROR(0x6000) AM_READWRITE(MRA8_RAM, galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0x6000) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x1480, 0x14bf) AM_MIRROR(0x6000) AM_READWRITE(SMH_RAM, galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) + AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0x6000) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) AM_RANGE(0x1500, 0x1500) AM_MIRROR(0x6000) AM_READ(input_port_0_r) AM_RANGE(0x1503, 0x1503) AM_MIRROR(0x6000) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0x1580, 0x1580) AM_MIRROR(0x6000) AM_READ(input_port_1_r) AM_RANGE(0x1580, 0x1582) AM_MIRROR(0x6000) AM_WRITE(galaxian_background_enable_w) - AM_RANGE(0x1583, 0x1583) AM_MIRROR(0x6000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x1583, 0x1583) AM_MIRROR(0x6000) AM_WRITE(SMH_NOP) AM_RANGE(0x1584, 0x1587) AM_MIRROR(0x6000) AM_WRITE(galaxian_lfo_freq_w) AM_RANGE(0x1600, 0x1600) AM_MIRROR(0x6000) AM_READ(input_port_2_r) - AM_RANGE(0x1600, 0x1601) AM_MIRROR(0x6000) AM_WRITE(MWA8_NOP) - AM_RANGE(0x1604, 0x1604) AM_MIRROR(0x6000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x1600, 0x1601) AM_MIRROR(0x6000) AM_WRITE(SMH_NOP) + AM_RANGE(0x1604, 0x1604) AM_MIRROR(0x6000) AM_WRITE(SMH_NOP) AM_RANGE(0x1606, 0x1606) AM_MIRROR(0x6000) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0x1607, 0x1607) AM_MIRROR(0x6000) AM_WRITE(galaxian_flip_screen_y_w) - AM_RANGE(0x1680, 0x1680) AM_MIRROR(0x6000) AM_READWRITE(MRA8_NOP, galaxian_pitch_w) + AM_RANGE(0x1680, 0x1680) AM_MIRROR(0x6000) AM_READWRITE(SMH_NOP, galaxian_pitch_w) AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x6000) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x1c00, 0x1fff) AM_MIRROR(0x6000) AM_RAM AM_RANGE(0x2000, 0x2fff) AM_ROM @@ -1113,7 +1113,7 @@ static ADDRESS_MAP_START( hunchbkg, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( hunchbkg_io, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(MRA8_NOP) // not used + AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(SMH_NOP) // not used AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(input_port_3_r) ADDRESS_MAP_END @@ -1123,7 +1123,7 @@ static ADDRESS_MAP_START( harem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x4800, 0x4fff) AM_READWRITE(galaxian_videoram_r, galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x5000, 0x5000) AM_WRITENOP - AM_RANGE(0x5800, 0x5800) AM_READWRITE(MRA8_NOP, interrupt_enable_w) + AM_RANGE(0x5800, 0x5800) AM_READWRITE(SMH_NOP, interrupt_enable_w) AM_RANGE(0x5801, 0x5807) AM_WRITENOP AM_RANGE(0x6101, 0x6101) AM_READ(input_port_0_r) AM_RANGE(0x6102, 0x6102) AM_READ(input_port_1_r) @@ -1154,11 +1154,11 @@ static ADDRESS_MAP_START( tazzmang, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x7000, 0x7000) AM_READ(input_port_2_r) /* mirror */ AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x883f) AM_READWRITE(MRA8_RAM, galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) + AM_RANGE(0x8800, 0x883f) AM_READWRITE(SMH_RAM, galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) AM_RANGE(0x8840, 0x885f) AM_RAM AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) AM_RANGE(0x8860, 0x887f) AM_RAM AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) AM_RANGE(0x8880, 0x8bff) AM_WRITENOP - AM_RANGE(0x9000, 0x93ff) AM_READWRITE(MRA8_RAM, galaxian_videoram_w) AM_BASE(&galaxian_videoram) + AM_RANGE(0x9000, 0x93ff) AM_READWRITE(SMH_RAM, galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x9800) AM_READ(watchdog_reset_r) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa7ff, 0xa7ff) AM_READ(input_port_0_r) /* mirror */ @@ -1176,7 +1176,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( racknrol, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM - AM_RANGE(0x1400, 0x143f) AM_MIRROR(0x6000) AM_READWRITE(MRA8_RAM, galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) + AM_RANGE(0x1400, 0x143f) AM_MIRROR(0x6000) AM_READWRITE(SMH_RAM, galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) AM_RANGE(0x1440, 0x14bf) AM_MIRROR(0x6000) AM_RAM AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0x6000) AM_RAM AM_RANGE(0x1500, 0x1500) AM_MIRROR(0x6000) AM_READ(input_port_0_r) @@ -1205,10 +1205,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ckongg_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r) AM_RANGE(0xc400, 0xc400) AM_READ(input_port_1_r) AM_RANGE(0xc800, 0xc800) AM_READ(input_port_2_r) @@ -1217,13 +1217,13 @@ static ADDRESS_MAP_START( ckongg_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ckongg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc000, 0xc001) AM_WRITE(galaxian_leds_w) AM_RANGE(0xc002, 0xc002) AM_WRITE(galaxian_coin_lockout_w) AM_RANGE(0xc003, 0xc003) AM_WRITE(galaxian_coin_counter_w) @@ -1233,7 +1233,7 @@ static ADDRESS_MAP_START( ckongg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc405, 0xc405) AM_WRITE(galaxian_shoot_enable_w) AM_RANGE(0xc406, 0xc407) AM_WRITE(galaxian_vol_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(galaxian_nmi_enable_w) - AM_RANGE(0xc804, 0xc804) AM_WRITE(MWA8_NOP) // link cut + AM_RANGE(0xc804, 0xc804) AM_WRITE(SMH_NOP) // link cut AM_RANGE(0xc806, 0xc806) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0xc807, 0xc807) AM_WRITE(galaxian_flip_screen_y_w) AM_RANGE(0xcc00, 0xcc00) AM_WRITE(galaxian_pitch_w) @@ -1241,10 +1241,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kkgalax_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) @@ -1253,13 +1253,13 @@ static ADDRESS_MAP_START( kkgalax_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( kkgalax_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_NOP) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_NOP) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) // AM_RANGE(0xc000, 0xc001) AM_WRITE(galaxian_leds_w) // AM_RANGE(0xc002, 0xc002) AM_WRITE(galaxian_coin_lockout_w) // AM_RANGE(0xc003, 0xc003) AM_WRITE(galaxian_coin_counter_w) @@ -1269,7 +1269,7 @@ static ADDRESS_MAP_START( kkgalax_writemem, ADDRESS_SPACE_PROGRAM, 8 ) // AM_RANGE(0xc405, 0xc405) AM_WRITE(galaxian_shoot_enable_w) // AM_RANGE(0xc406, 0xc407) AM_WRITE(galaxian_vol_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(galaxian_nmi_enable_w) -// AM_RANGE(0xc804, 0xc804) AM_WRITE(MWA8_NOP) // link cut +// AM_RANGE(0xc804, 0xc804) AM_WRITE(SMH_NOP) // link cut // AM_RANGE(0xc806, 0xc806) AM_WRITE(galaxian_flip_screen_x_w) // AM_RANGE(0xc807, 0xc807) AM_WRITE(galaxian_flip_screen_y_w) // AM_RANGE(0xcc00, 0xcc00) AM_WRITE(galaxian_pitch_w) diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index 295b09e1839..36a9d7e8ff4 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -102,26 +102,26 @@ static WRITE8_HANDLER( ninjemak_videoreg_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_BANK1) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xd800, 0xdbff) AM_WRITE(galivan_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xdc00, 0xdfff) AM_WRITE(galivan_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe000, 0xe0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xe100, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xe0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe100, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ninjemak_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xd800, 0xd81f) AM_WRITE(ninjemak_videoreg_w) AM_RANGE(0xd800, 0xdbff) AM_WRITE(galivan_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xdc00, 0xdfff) AM_WRITE(galivan_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe000, 0xe1ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xe200, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xe1ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe200, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -141,8 +141,8 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x41, 0x42) AM_WRITE(galivan_scrollx_w) AM_RANGE(0x43, 0x44) AM_WRITE(galivan_scrolly_w) AM_RANGE(0x45, 0x45) AM_WRITE(galivan_sound_command_w) -/* AM_RANGE(0x46, 0x46) AM_WRITE(MWA8_NOP) */ -/* AM_RANGE(0x47, 0x47) AM_WRITE(MWA8_NOP) */ +/* AM_RANGE(0x46, 0x46) AM_WRITE(SMH_NOP) */ +/* AM_RANGE(0x47, 0x47) AM_WRITE(SMH_NOP) */ ADDRESS_MAP_END static ADDRESS_MAP_START( ninjemak_readport, ADDRESS_SPACE_IO, 8 ) @@ -159,25 +159,25 @@ static ADDRESS_MAP_START( ninjemak_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x80, 0x80) AM_WRITE(ninjemak_gfxbank_w) AM_RANGE(0x85, 0x85) AM_WRITE(galivan_sound_command_w) -// AM_RANGE(0x86, 0x86) AM_WRITE(MWA8_NOP) // ?? -// AM_RANGE(0x87, 0x87) AM_WRITE(MWA8_NOP) // ?? +// AM_RANGE(0x86, 0x86) AM_WRITE(SMH_NOP) // ?? +// AM_RANGE(0x87, 0x87) AM_WRITE(SMH_NOP) // ?? ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) -/* AM_RANGE(0x04, 0x04) AM_READ(MRA8_NOP) value read and *discarded* */ +/* AM_RANGE(0x04, 0x04) AM_READ(SMH_NOP) value read and *discarded* */ AM_RANGE(0x06, 0x06) AM_READ(galivan_sound_command_r) ADDRESS_MAP_END @@ -1039,13 +1039,13 @@ static WRITE8_HANDLER( youmab_84_w ) static DRIVER_INIT( youmab ) { memory_install_write8_handler(0, 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(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xbfff, 0, 0, MRA8_BANK2); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xbfff, 0, 0, SMH_BANK2); memory_set_bankptr( 2, memory_region(REGION_USER2) ); memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x81, 0x81, 0, 0, youmab_81_w); // ?? often, alternating values memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x84, 0x84, 0, 0, youmab_84_w); // ?? often, sequence.. - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xd800, 0xd81f, 0, 0, MWA8_NOP); // scrolling isn't here.. + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xd800, 0xd81f, 0, 0, SMH_NOP); // scrolling isn't here.. memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x8a, 0x8a, 0, 0, youmab_8a_r); // ??? diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index a21a8105473..dedb863abf6 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -223,24 +223,24 @@ static ADDRESS_MAP_START( galpani2_mem1, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE(&galpani2_ram ) // Work RAM AM_RANGE(0x300000, 0x301fff) AM_RAM // ? AM_RANGE(0x302000, 0x303fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x304000, 0x30401f) AM_READWRITE(MRA16_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs ) // Sprites Regs -// AM_RANGE(0x308000, 0x308001) AM_WRITE(MWA16_NOP ) // ? 0 at startup - AM_RANGE(0x30c000, 0x30c001) AM_WRITE(MWA16_NOP ) // ? hblank effect ? - AM_RANGE(0x310000, 0x3101ff) AM_READWRITE(MRA16_RAM, galpani2_palette_0_w) AM_BASE(&galpani2_palette_0 ) // ? - AM_RANGE(0x314000, 0x314001) AM_WRITE(MWA16_NOP ) // ? flip backgrounds ? + AM_RANGE(0x304000, 0x30401f) AM_READWRITE(SMH_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs ) // Sprites Regs +// AM_RANGE(0x308000, 0x308001) AM_WRITE(SMH_NOP ) // ? 0 at startup + AM_RANGE(0x30c000, 0x30c001) AM_WRITE(SMH_NOP ) // ? hblank effect ? + AM_RANGE(0x310000, 0x3101ff) AM_READWRITE(SMH_RAM, galpani2_palette_0_w) AM_BASE(&galpani2_palette_0 ) // ? + AM_RANGE(0x314000, 0x314001) AM_WRITE(SMH_NOP ) // ? flip backgrounds ? AM_RANGE(0x318000, 0x318001) AM_READWRITE(galpani2_eeprom_r, galpani2_eeprom_w ) // EEPROM AM_RANGE(0x380000, 0x387fff) AM_RAM // Palette? - AM_RANGE(0x388000, 0x38ffff) AM_READWRITE(MRA16_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x400000, 0x43ffff) AM_READWRITE(MRA16_RAM, galpani2_bg8_0_w) AM_BASE(&galpani2_bg8_0 ) // Background 0 + AM_RANGE(0x388000, 0x38ffff) AM_READWRITE(SMH_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette + AM_RANGE(0x400000, 0x43ffff) AM_READWRITE(SMH_RAM, galpani2_bg8_0_w) AM_BASE(&galpani2_bg8_0 ) // Background 0 AM_RANGE(0x440000, 0x440001) AM_RAM AM_BASE(&galpani2_bg8_0_scrollx ) // Background 0 Scroll X AM_RANGE(0x480000, 0x480001) AM_RAM AM_BASE(&galpani2_bg8_0_scrolly ) // Background 0 Scroll Y - AM_RANGE(0x4c0000, 0x4c0001) AM_WRITE(MWA16_NOP ) // ? 0 at startup only - AM_RANGE(0x500000, 0x53ffff) AM_READWRITE(MRA16_RAM, galpani2_bg8_1_w) AM_BASE(&galpani2_bg8_1 ) // Background 1 + AM_RANGE(0x4c0000, 0x4c0001) AM_WRITE(SMH_NOP ) // ? 0 at startup only + AM_RANGE(0x500000, 0x53ffff) AM_READWRITE(SMH_RAM, galpani2_bg8_1_w) AM_BASE(&galpani2_bg8_1 ) // Background 1 AM_RANGE(0x540000, 0x540001) AM_RAM AM_BASE(&galpani2_bg8_1_scrollx ) // Background 1 Scroll X AM_RANGE(0x580000, 0x580001) AM_RAM AM_BASE(&galpani2_bg8_1_scrolly ) // Background 1 Scroll Y - AM_RANGE(0x5c0000, 0x5c0001) AM_WRITE(MWA16_NOP ) // ? 0 at startup only - AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_NOP ) // Watchdog -// AM_RANGE(0x640000, 0x640001) AM_WRITE(MWA16_NOP ) // ? 0 before resetting and at startup + AM_RANGE(0x5c0000, 0x5c0001) AM_WRITE(SMH_NOP ) // ? 0 at startup only + AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_NOP ) // Watchdog +// AM_RANGE(0x640000, 0x640001) AM_WRITE(SMH_NOP ) // ? 0 before resetting and at startup AM_RANGE(0x680000, 0x680001) AM_WRITE(galpani2_mcu_nmi_w ) // ? 0 -> 1 -> 0 (lev 5) / 0 -> $10 -> 0 AM_RANGE(0x6c0000, 0x6c0001) AM_WRITE(galpani2_coin_lockout_w ) // Coin + Card Lockout AM_RANGE(0x780000, 0x780001) AM_READ(input_port_0_word_r ) // Input Ports @@ -278,15 +278,15 @@ static READ16_HANDLER( galpani2_bankedrom_r ) static ADDRESS_MAP_START( galpani2_mem2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM AM_RANGE(0x100000, 0x13ffff) AM_RAM AM_BASE(&galpani2_ram2) // Work RAM - AM_RANGE(0x400000, 0x4fffff) AM_READWRITE(MRA16_RAM, galpani2_bg15_w) AM_BASE(&galpani2_bg15) // bg15 + AM_RANGE(0x400000, 0x4fffff) AM_READWRITE(SMH_RAM, galpani2_bg15_w) AM_BASE(&galpani2_bg15) // bg15 AM_RANGE(0x500000, 0x5fffff) AM_RAM // bg15 - AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_NOP ) // ? 0 at startup only - AM_RANGE(0x640000, 0x640001) AM_WRITE(MWA16_NOP ) // ? 0 at startup only - AM_RANGE(0x680000, 0x680001) AM_WRITE(MWA16_NOP ) // ? 0 at startup only - AM_RANGE(0x6c0000, 0x6c0001) AM_WRITE(MWA16_NOP ) // ? 0 at startup only - AM_RANGE(0x700000, 0x700001) AM_WRITE(MWA16_NOP ) // Watchdog - AM_RANGE(0x780000, 0x780001) AM_WRITE(MWA16_NOP ) // ? 0 -> 1 -> 0 (lev 5) - AM_RANGE(0x7c0000, 0x7c0001) AM_WRITE(MWA16_RAM) AM_BASE(&galpani2_rombank ) // Rom Bank + AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_NOP ) // ? 0 at startup only + AM_RANGE(0x640000, 0x640001) AM_WRITE(SMH_NOP ) // ? 0 at startup only + AM_RANGE(0x680000, 0x680001) AM_WRITE(SMH_NOP ) // ? 0 at startup only + AM_RANGE(0x6c0000, 0x6c0001) AM_WRITE(SMH_NOP ) // ? 0 at startup only + AM_RANGE(0x700000, 0x700001) AM_WRITE(SMH_NOP ) // Watchdog + AM_RANGE(0x780000, 0x780001) AM_WRITE(SMH_NOP ) // ? 0 -> 1 -> 0 (lev 5) + AM_RANGE(0x7c0000, 0x7c0001) AM_WRITE(SMH_RAM) AM_BASE(&galpani2_rombank ) // Rom Bank AM_RANGE(0x800000, 0xffffff) AM_READ(galpani2_bankedrom_r ) // Banked ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c index fd1b5916b7a..e403f3c4618 100644 --- a/src/mame/drivers/galpanic.c +++ b/src/mame/drivers/galpanic.c @@ -220,8 +220,8 @@ static ADDRESS_MAP_START( galpanic, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x3fffff) AM_ROM AM_RANGE(0x400000, 0x400001) AM_READWRITE(OKIM6295_status_0_lsb_r,OKIM6295_data_0_lsb_w) AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) - AM_RANGE(0x520000, 0x53ffff) AM_READWRITE(MRA16_RAM,galpanic_bgvideoram_w) AM_BASE(&galpanic_bgvideoram) /* + work RAM */ - AM_RANGE(0x600000, 0x6007ff) AM_READWRITE(MRA16_RAM,galpanic_paletteram_w) AM_BASE(&paletteram16) /* 1024 colors, but only 512 seem to be used */ + AM_RANGE(0x520000, 0x53ffff) AM_READWRITE(SMH_RAM,galpanic_bgvideoram_w) AM_BASE(&galpanic_bgvideoram) /* + work RAM */ + AM_RANGE(0x600000, 0x6007ff) AM_READWRITE(SMH_RAM,galpanic_paletteram_w) AM_BASE(&paletteram16) /* 1024 colors, but only 512 seem to be used */ AM_RANGE(0x700000, 0x701fff) AM_READWRITE(pandora_spriteram_LSB_r, pandora_spriteram_LSB_w ) AM_RANGE(0x702000, 0x704fff) AM_RAM AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r) @@ -229,9 +229,9 @@ static ADDRESS_MAP_START( galpanic, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800004, 0x800005) AM_READ(input_port_2_word_r) AM_RANGE(0x900000, 0x900001) AM_WRITE(galpanic_6295_bankswitch_w) AM_RANGE(0xa00000, 0xa00001) AM_WRITE(galpanic_coin_w) /* coin counters */ - AM_RANGE(0xb00000, 0xb00001) AM_WRITE(MWA16_NOP) /* ??? */ - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_NOP) /* ??? */ - AM_RANGE(0xd00000, 0xd00001) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0xb00000, 0xb00001) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0xd00000, 0xd00001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xe00000, 0xe00015) AM_READWRITE(galpanib_calc_r,galpanib_calc_w) /* CALC1 MCU interaction (simulated) */ ADDRESS_MAP_END @@ -252,94 +252,94 @@ static READ16_HANDLER( comad_OKIM6295_status_0_msb_r ) } static ADDRESS_MAP_START( comad_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x4fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x500000, 0x51ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x520000, 0x53ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x6007ff) AM_READ(MRA16_RAM) - AM_RANGE(0x700000, 0x700fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x4fffff) AM_READ(SMH_ROM) + AM_RANGE(0x500000, 0x51ffff) AM_READ(SMH_RAM) + AM_RANGE(0x520000, 0x53ffff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x6007ff) AM_READ(SMH_RAM) + AM_RANGE(0x700000, 0x700fff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r) AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r) AM_RANGE(0x800004, 0x800005) AM_READ(input_port_2_word_r) // AM_RANGE(0x800006, 0x800007) ?? AM_RANGE(0x80000a, 0x80000b) AM_READ(kludge) /* bits 8-a = timer? palette update code waits for them to be 111 */ AM_RANGE(0x80000c, 0x80000d) AM_READ(kludge) /* missw96 bits 8-a = timer? palette update code waits for them to be 111 */ - AM_RANGE(0xc00000, 0xc0ffff) AM_READ(MRA16_RAM) /* missw96 */ - AM_RANGE(0xc80000, 0xc8ffff) AM_READ(MRA16_RAM) /* fantasia, newfant */ + AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM) /* missw96 */ + AM_RANGE(0xc80000, 0xc8ffff) AM_READ(SMH_RAM) /* fantasia, newfant */ AM_RANGE(0xf00000, 0xf00001) AM_READ(comad_OKIM6295_status_0_msb_r) /* fantasia, missw96 */ AM_RANGE(0xf80000, 0xf80001) AM_READ(comad_OKIM6295_status_0_msb_r) /* newfant */ ADDRESS_MAP_END static ADDRESS_MAP_START( comad_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x4fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x500000, 0x51ffff) AM_WRITE(MWA16_RAM) AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) + AM_RANGE(0x000000, 0x4fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x500000, 0x51ffff) AM_WRITE(SMH_RAM) AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) AM_RANGE(0x520000, 0x53ffff) AM_WRITE(galpanic_bgvideoram_w) AM_BASE(&galpanic_bgvideoram) /* + work RAM */ AM_RANGE(0x600000, 0x6007ff) AM_WRITE(galpanic_paletteram_w) AM_BASE(&paletteram16) /* 1024 colors, but only 512 seem to be used */ - AM_RANGE(0x700000, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x700000, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x900000, 0x900001) AM_WRITE(galpania_6295_bankswitch_w) /* not sure */ - AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(MWA16_RAM) /* missw96 */ - AM_RANGE(0xc80000, 0xc8ffff) AM_WRITE(MWA16_RAM) /* fantasia, newfant */ + AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(SMH_RAM) /* missw96 */ + AM_RANGE(0xc80000, 0xc8ffff) AM_WRITE(SMH_RAM) /* fantasia, newfant */ AM_RANGE(0xf00000, 0xf00001) AM_WRITE(OKIM6295_data_0_msb_w) /* fantasia, missw96 */ AM_RANGE(0xf80000, 0xf80001) AM_WRITE(OKIM6295_data_0_msb_w) /* newfant */ ADDRESS_MAP_END static ADDRESS_MAP_START( fantsia2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x4fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x500000, 0x51ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x520000, 0x53ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x6007ff) AM_READ(MRA16_RAM) - AM_RANGE(0x700000, 0x700fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x4fffff) AM_READ(SMH_ROM) + AM_RANGE(0x500000, 0x51ffff) AM_READ(SMH_RAM) + AM_RANGE(0x520000, 0x53ffff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x6007ff) AM_READ(SMH_RAM) + AM_RANGE(0x700000, 0x700fff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r) AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r) AM_RANGE(0x800004, 0x800005) AM_READ(input_port_2_word_r) // AM_RANGE(0x800006, 0x800007) ?? AM_RANGE(0x800008, 0x800009) AM_READ(kludge) /* bits 8-a = timer? palette update code waits for them to be 111 */ - AM_RANGE(0xf80000, 0xf8ffff) AM_READ(MRA16_RAM) + AM_RANGE(0xf80000, 0xf8ffff) AM_READ(SMH_RAM) AM_RANGE(0xc80000, 0xc80001) AM_READ(comad_OKIM6295_status_0_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( fantsia2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x4fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x500000, 0x51ffff) AM_WRITE(MWA16_RAM) AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) + AM_RANGE(0x000000, 0x4fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x500000, 0x51ffff) AM_WRITE(SMH_RAM) AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) AM_RANGE(0x520000, 0x53ffff) AM_WRITE(galpanic_bgvideoram_w) AM_BASE(&galpanic_bgvideoram) /* + work RAM */ AM_RANGE(0x600000, 0x6007ff) AM_WRITE(galpanic_paletteram_w) AM_BASE(&paletteram16) /* 1024 colors, but only 512 seem to be used */ - AM_RANGE(0x700000, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x700000, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x900000, 0x900001) AM_WRITE(galpania_6295_bankswitch_w) /* not sure */ - AM_RANGE(0xf80000, 0xf8ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) /* coin counters, + ? */ + AM_RANGE(0xf80000, 0xf8ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* coin counters, + ? */ AM_RANGE(0xc80000, 0xc80001) AM_WRITE(OKIM6295_data_0_msb_w) ADDRESS_MAP_END static ADDRESS_MAP_START( galhustl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x500000, 0x51ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x580000, 0x583fff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x6007ff) AM_READ(MRA16_RAM) - AM_RANGE(0x600800, 0x600fff) AM_READ(MRA16_RAM) - AM_RANGE(0x680000, 0x68001f) AM_READ(MRA16_RAM) - AM_RANGE(0x700000, 0x700fff) AM_READ(MRA16_RAM) - AM_RANGE(0x780000, 0x78001f) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x500000, 0x51ffff) AM_READ(SMH_RAM) + AM_RANGE(0x580000, 0x583fff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x6007ff) AM_READ(SMH_RAM) + AM_RANGE(0x600800, 0x600fff) AM_READ(SMH_RAM) + AM_RANGE(0x680000, 0x68001f) AM_READ(SMH_RAM) + AM_RANGE(0x700000, 0x700fff) AM_READ(SMH_RAM) + AM_RANGE(0x780000, 0x78001f) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r) AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r) AM_RANGE(0x800004, 0x800005) AM_READ(input_port_2_word_r) AM_RANGE(0xd00000, 0xd00001) AM_READ(OKIM6295_status_0_msb_r) - AM_RANGE(0xe80000, 0xe8ffff) AM_READ(MRA16_RAM) + AM_RANGE(0xe80000, 0xe8ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( galhustl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x500000, 0x51ffff) AM_WRITE(MWA16_RAM) AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x500000, 0x51ffff) AM_WRITE(SMH_RAM) AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) AM_RANGE(0x520000, 0x53ffff) AM_WRITE(galpanic_bgvideoram_w) AM_BASE(&galpanic_bgvideoram) AM_RANGE(0x580000, 0x583fff) AM_WRITE(galpanic_bgvideoram_mirror_w) AM_RANGE(0x600000, 0x6007ff) AM_WRITE(galpanic_paletteram_w) AM_BASE(&paletteram16) /* 1024 colors, but only 512 seem to be used */ - AM_RANGE(0x600800, 0x600fff) AM_WRITE(MWA16_RAM) // writes only 1? - AM_RANGE(0x680000, 0x68001f) AM_WRITE(MWA16_RAM) // regs? - AM_RANGE(0x700000, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x780000, 0x78001f) AM_WRITE(MWA16_RAM) // regs? - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) // ? + AM_RANGE(0x600800, 0x600fff) AM_WRITE(SMH_RAM) // writes only 1? + AM_RANGE(0x680000, 0x68001f) AM_WRITE(SMH_RAM) // regs? + AM_RANGE(0x700000, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x780000, 0x78001f) AM_WRITE(SMH_RAM) // regs? + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) // ? AM_RANGE(0x900000, 0x900001) AM_WRITE(galpania_6295_bankswitch_w) AM_RANGE(0xd00000, 0xd00001) AM_WRITE(OKIM6295_data_0_msb_w) - AM_RANGE(0xe80000, 0xe8ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xe80000, 0xe8ffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /* @@ -349,71 +349,71 @@ READ16_HANDLER( zipzap_random_read ) } */ static ADDRESS_MAP_START( zipzap_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x4fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x500000, 0x51ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x520000, 0x53ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x580000, 0x583fff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x600fff) AM_READ(MRA16_RAM) - AM_RANGE(0x680000, 0x68001f) AM_READ(MRA16_RAM) - AM_RANGE(0x700000, 0x71ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x780000, 0x78001f) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x4fffff) AM_READ(SMH_ROM) + AM_RANGE(0x500000, 0x51ffff) AM_READ(SMH_RAM) + AM_RANGE(0x520000, 0x53ffff) AM_READ(SMH_RAM) + AM_RANGE(0x580000, 0x583fff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x600fff) AM_READ(SMH_RAM) + AM_RANGE(0x680000, 0x68001f) AM_READ(SMH_RAM) + AM_RANGE(0x700000, 0x71ffff) AM_READ(SMH_RAM) + AM_RANGE(0x780000, 0x78001f) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r) AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r) AM_RANGE(0x800004, 0x800005) AM_READ(input_port_2_word_r) AM_RANGE(0xc00000, 0xc00001) AM_READ(comad_OKIM6295_status_0_msb_r) - AM_RANGE(0xc80000, 0xc8ffff) AM_READ(MRA16_RAM) + AM_RANGE(0xc80000, 0xc8ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( zipzap_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x4fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x500000, 0x51ffff) AM_WRITE(MWA16_RAM) AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) + AM_RANGE(0x000000, 0x4fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x500000, 0x51ffff) AM_WRITE(SMH_RAM) AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) AM_RANGE(0x520000, 0x53ffff) AM_WRITE(galpanic_bgvideoram_w) AM_BASE(&galpanic_bgvideoram) AM_RANGE(0x580000, 0x583fff) AM_WRITE(galpanic_bgvideoram_mirror_w) AM_RANGE(0x600000, 0x600fff) AM_WRITE(galpanic_paletteram_w) AM_BASE(&paletteram16) /* 1024 colors, but only 512 seem to be used */ - AM_RANGE(0x680000, 0x68001f) AM_WRITE(MWA16_RAM) - AM_RANGE(0x700000, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x701000, 0x71ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x780000, 0x78001f) AM_WRITE(MWA16_RAM) + AM_RANGE(0x680000, 0x68001f) AM_WRITE(SMH_RAM) + AM_RANGE(0x700000, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x701000, 0x71ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x780000, 0x78001f) AM_WRITE(SMH_RAM) AM_RANGE(0x900000, 0x900001) AM_WRITE(galpania_6295_bankswitch_w) AM_RANGE(0xc00000, 0xc00001) AM_WRITE(OKIM6295_data_0_msb_w) - AM_RANGE(0xc80000, 0xc8ffff) AM_WRITE(MWA16_RAM) // main ram + AM_RANGE(0xc80000, 0xc8ffff) AM_WRITE(SMH_RAM) // main ram ADDRESS_MAP_END static ADDRESS_MAP_START( supmodel_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x4fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x500000, 0x51ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x520000, 0x53ffff) AM_READ(MRA16_RAM) -// AM_RANGE(0x580000, 0x583fff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x600fff) AM_READ(MRA16_RAM) - AM_RANGE(0x680000, 0x68001f) AM_READ(MRA16_RAM) - AM_RANGE(0x700000, 0x700fff) AM_READ(MRA16_RAM) - AM_RANGE(0x780000, 0x78001f) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x4fffff) AM_READ(SMH_ROM) + AM_RANGE(0x500000, 0x51ffff) AM_READ(SMH_RAM) + AM_RANGE(0x520000, 0x53ffff) AM_READ(SMH_RAM) +// AM_RANGE(0x580000, 0x583fff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x600fff) AM_READ(SMH_RAM) + AM_RANGE(0x680000, 0x68001f) AM_READ(SMH_RAM) + AM_RANGE(0x700000, 0x700fff) AM_READ(SMH_RAM) + AM_RANGE(0x780000, 0x78001f) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r) AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r) AM_RANGE(0x800004, 0x800005) AM_READ(input_port_2_word_r) AM_RANGE(0x800006, 0x800007) AM_READ(kludge) AM_RANGE(0x800008, 0x800009) AM_READ(kludge) - AM_RANGE(0xc80000, 0xc8ffff) AM_READ(MRA16_RAM) + AM_RANGE(0xc80000, 0xc8ffff) AM_READ(SMH_RAM) AM_RANGE(0xf80000, 0xf80001) AM_READ(comad_OKIM6295_status_0_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( supmodel_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x4fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x500000, 0x51ffff) AM_WRITE(MWA16_RAM) AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) + AM_RANGE(0x000000, 0x4fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x500000, 0x51ffff) AM_WRITE(SMH_RAM) AM_BASE(&galpanic_fgvideoram) AM_SIZE(&galpanic_fgvideoram_size) AM_RANGE(0x520000, 0x53ffff) AM_WRITE(galpanic_bgvideoram_w) AM_BASE(&galpanic_bgvideoram) // AM_RANGE(0x580000, 0x583fff) AM_WRITE(galpanic_bgvideoram_mirror_w) // can't be right, causes half the display to vanish at times! AM_RANGE(0x600000, 0x600fff) AM_WRITE(galpanic_paletteram_w) AM_BASE(&paletteram16) /* 1024 colors, but only 512 seem to be used */ - AM_RANGE(0x680000, 0x68001f) AM_WRITE(MWA16_RAM) - AM_RANGE(0x700000, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x780000, 0x78001f) AM_WRITE(MWA16_RAM) + AM_RANGE(0x680000, 0x68001f) AM_WRITE(SMH_RAM) + AM_RANGE(0x700000, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x780000, 0x78001f) AM_WRITE(SMH_RAM) AM_RANGE(0x900000, 0x900001) AM_WRITE(galpania_6295_bankswitch_w) /* not sure */ - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) - AM_RANGE(0xc80000, 0xc8ffff) AM_WRITE(MWA16_RAM) // main ram - AM_RANGE(0xd80000, 0xd80001) AM_WRITE(MWA16_NOP) - AM_RANGE(0xe00012, 0xe00013) AM_WRITE(MWA16_NOP) - AM_RANGE(0xe80000, 0xe80001) AM_WRITE(MWA16_NOP) + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) + AM_RANGE(0xc80000, 0xc8ffff) AM_WRITE(SMH_RAM) // main ram + AM_RANGE(0xd80000, 0xd80001) AM_WRITE(SMH_NOP) + AM_RANGE(0xe00012, 0xe00013) AM_WRITE(SMH_NOP) + AM_RANGE(0xe80000, 0xe80001) AM_WRITE(SMH_NOP) AM_RANGE(0xf80000, 0xf80001) AM_WRITE(OKIM6295_data_0_msb_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index 3abe3526c15..a9a3a85c0e0 100644 --- a/src/mame/drivers/galspnbl.c +++ b/src/mame/drivers/galspnbl.c @@ -51,21 +51,21 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x803fff) AM_RAM /* hotpinbl work RAM */ AM_RANGE(0x808000, 0x80ffff) AM_RAM /* hotpinbl work RAM, bitmaps are decompressed here */ AM_RANGE(0x880000, 0x880fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x8ff400, 0x8fffff) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0x8ff400, 0x8fffff) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x900000, 0x900fff) AM_RAM AM_BASE(&galspnbl_colorram) - AM_RANGE(0x901000, 0x903fff) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0x901000, 0x903fff) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x904000, 0x904fff) AM_RAM AM_BASE(&galspnbl_videoram) - AM_RANGE(0x905000, 0x907fff) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0x905000, 0x907fff) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x980000, 0x9bffff) AM_RAM AM_BASE(&galspnbl_bgvideoram) - AM_RANGE(0xa00000, 0xa00fff) AM_WRITE(MWA16_NOP) /* more palette ? */ + AM_RANGE(0xa00000, 0xa00fff) AM_WRITE(SMH_NOP) /* more palette ? */ AM_RANGE(0xa01000, 0xa017ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xa01800, 0xa027ff) AM_WRITE(MWA16_NOP) /* more palette ? */ + AM_RANGE(0xa01800, 0xa027ff) AM_WRITE(SMH_NOP) /* more palette ? */ AM_RANGE(0xa80000, 0xa80001) AM_READ(input_port_0_word_r) AM_RANGE(0xa80010, 0xa80011) AM_READWRITE(input_port_1_word_r, soundcommand_w) - AM_RANGE(0xa80020, 0xa80021) AM_READWRITE(input_port_2_word_r, MWA16_NOP) /* w - could be watchdog, but causes resets when picture is shown */ - AM_RANGE(0xa80030, 0xa80031) AM_READWRITE(input_port_3_word_r, MWA16_NOP) /* w - irq ack? */ + AM_RANGE(0xa80020, 0xa80021) AM_READWRITE(input_port_2_word_r, SMH_NOP) /* w - could be watchdog, but causes resets when picture is shown */ + AM_RANGE(0xa80030, 0xa80031) AM_READWRITE(input_port_3_word_r, SMH_NOP) /* w - irq ack? */ AM_RANGE(0xa80040, 0xa80041) AM_READ(input_port_4_word_r) - AM_RANGE(0xa80050, 0xa80051) AM_WRITE(MWA16_RAM) AM_BASE(&galspnbl_scroll) /* ??? */ + AM_RANGE(0xa80050, 0xa80051) AM_WRITE(SMH_RAM) AM_BASE(&galspnbl_scroll) /* ??? */ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -74,7 +74,7 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf800, 0xf800) AM_READWRITE(OKIM6295_status_0_r, OKIM6295_data_0_w) AM_RANGE(0xf810, 0xf810) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0xf811, 0xf811) AM_WRITE(YM3812_write_port_0_w) - AM_RANGE(0xfc00, 0xfc00) AM_READWRITE(MRA8_NOP, MWA8_NOP) /* irq ack ?? */ + AM_RANGE(0xfc00, 0xfc00) AM_READWRITE(SMH_NOP, SMH_NOP) /* irq ack ?? */ AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index 3dcd1bd9ba8..c8595d76296 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -334,7 +334,7 @@ static ADDRESS_MAP_START( readmem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6820, 0x682f) AM_READ(gaplus_customio_3_r) /* custom I/O chip #3 interface */ AM_RANGE(0x6800, 0x6bff) AM_READ(namcoio_r) /* custom I/O chips interface */ AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r) /* watchdog */ - AM_RANGE(0xa000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) @@ -347,27 +347,27 @@ static ADDRESS_MAP_START( writemem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8fff) AM_WRITE(gaplus_sreset_w) /* reset CPU #2 & #3, enable sound */ AM_RANGE(0x9000, 0x9fff) AM_WRITE(gaplus_freset_w) /* reset I/O chips */ AM_RANGE(0xa000, 0xa7ff) AM_WRITE(gaplus_starfield_control_w) /* starfield control */ - AM_RANGE(0xa000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0xa000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(gaplus_videoram_r) /* tilemap RAM (shared with CPU #1) */ AM_RANGE(0x0800, 0x1fff) AM_READ(gaplus_spriteram_r) /* shared RAM with CPU #1 & spriteram */ - AM_RANGE(0xa000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(gaplus_videoram_w) /* tilemap RAM (shared with CPU #1) */ AM_RANGE(0x0800, 0x1fff) AM_WRITE(gaplus_spriteram_w) /* shared RAM with CPU #1 */ -// AM_RANGE(0x500f, 0x500f) AM_WRITE(MWA8_NOP) /* ??? written 256 times on startup */ +// AM_RANGE(0x500f, 0x500f) AM_WRITE(SMH_NOP) /* ??? written 256 times on startup */ AM_RANGE(0x6000, 0x6fff) AM_WRITE(gaplus_irq_2_ctrl_w) /* IRQ 2 control */ - AM_RANGE(0xa000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0xa000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_cpu3, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_READ(gaplus_snd_sharedram_r) /* shared RAM with CPU #1 */ AM_RANGE(0x2000, 0x3fff) AM_READ(watchdog_reset_r) /* watchdog? */ - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END /* CPU 3 (SOUND CPU) write addresses */ @@ -375,7 +375,7 @@ static ADDRESS_MAP_START( writemem_cpu3, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_WRITE(gaplus_snd_sharedram_w) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU + sound registers */ AM_RANGE(0x2000, 0x3fff) AM_WRITE(watchdog_reset_w) /* watchdog? */ AM_RANGE(0x4000, 0x7fff) AM_WRITE(gaplus_irq_3_ctrl_w) /* interrupt enable/disable */ - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index 9bb2ab699b0..04fcdbd0ec8 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -333,13 +333,13 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x803170, 0x803171) AM_MIRROR(0x2fce8e) AM_WRITE(atarigen_sound_w) /* VBUS */ - AM_RANGE(0x900000, 0x901fff) AM_MIRROR(0x2c8000) AM_READWRITE(MRA16_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0x902000, 0x903fff) AM_MIRROR(0x2c8000) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0x900000, 0x901fff) AM_MIRROR(0x2c8000) AM_READWRITE(SMH_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0x902000, 0x903fff) AM_MIRROR(0x2c8000) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x904000, 0x904fff) AM_MIRROR(0x2c8000) AM_RAM - AM_RANGE(0x905f6e, 0x905f6f) AM_MIRROR(0x2c8000) AM_READWRITE(MRA16_RAM, gauntlet_yscroll_w) AM_BASE(&atarigen_yscroll) - AM_RANGE(0x905000, 0x905f7f) AM_MIRROR(0x2c8000) AM_READWRITE(MRA16_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) - AM_RANGE(0x905f80, 0x905fff) AM_MIRROR(0x2c8000) AM_READWRITE(MRA16_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) - AM_RANGE(0x910000, 0x9107ff) AM_MIRROR(0x2cf800) AM_READWRITE(MRA16_RAM, paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x905f6e, 0x905f6f) AM_MIRROR(0x2c8000) AM_READWRITE(SMH_RAM, gauntlet_yscroll_w) AM_BASE(&atarigen_yscroll) + AM_RANGE(0x905000, 0x905f7f) AM_MIRROR(0x2c8000) AM_READWRITE(SMH_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) + AM_RANGE(0x905f80, 0x905fff) AM_MIRROR(0x2c8000) AM_READWRITE(SMH_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) + AM_RANGE(0x910000, 0x9107ff) AM_MIRROR(0x2cf800) AM_READWRITE(SMH_RAM, paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x930000, 0x930001) AM_MIRROR(0x2cfffe) AM_WRITE(gauntlet_xscroll_w) AM_BASE(&atarigen_xscroll) ADDRESS_MAP_END diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index d1d7208011b..a8b567739ca 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -127,10 +127,10 @@ static ADDRESS_MAP_START( gbusters_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1f94, 0x1f94) AM_READ(input_port_0_r) /* DIPSW #1 */ AM_RANGE(0x1f95, 0x1f95) AM_READ(input_port_1_r) /* DIPSW #2 */ AM_RANGE(0x0000, 0x3fff) AM_READ(K052109_051960_r) /* tiles + sprites (RAM H21, G21 & H6) */ - AM_RANGE(0x4000, 0x57ff) AM_READ(MRA8_RAM) /* RAM I12 */ + AM_RANGE(0x4000, 0x57ff) AM_READ(SMH_RAM) /* RAM I12 */ AM_RANGE(0x5800, 0x5fff) AM_READ(bankedram_r) /* palette + work RAM (RAM D16 & C16) */ - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM 878n02.rom */ + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM 878n02.rom */ ADDRESS_MAP_END static ADDRESS_MAP_START( gbusters_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -141,23 +141,23 @@ static ADDRESS_MAP_START( gbusters_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1f98, 0x1f98) AM_WRITE(gbusters_1f98_w) /* enable gfx ROM read through VRAM */ AM_RANGE(0x1f9c, 0x1f9c) AM_WRITE(gbusters_unknown_w) /* ??? */ AM_RANGE(0x0000, 0x3fff) AM_WRITE(K052109_051960_w) /* tiles + sprites (RAM H21, G21 & H6) */ - AM_RANGE(0x4000, 0x57ff) AM_WRITE(MWA8_RAM) /* RAM I12 */ + AM_RANGE(0x4000, 0x57ff) AM_WRITE(SMH_RAM) /* RAM I12 */ AM_RANGE(0x5800, 0x5fff) AM_WRITE(bankedram_w) AM_BASE(&ram) /* palette + work RAM (RAM D16 & C16) */ - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_ROM) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM 878n02.rom */ + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_ROM) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM 878n02.rom */ ADDRESS_MAP_END static ADDRESS_MAP_START( gbusters_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* ROM 878h01.rom */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM 878h01.rom */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) /* 007232 registers */ AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) /* YM 2151 */ ADDRESS_MAP_END static ADDRESS_MAP_START( gbusters_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* ROM 878h01.rom */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM 878h01.rom */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) /* 007232 registers */ AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) /* YM 2151 */ AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) /* YM 2151 */ diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index 2504001e65b..8d757db535b 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -207,21 +207,21 @@ static WRITE16_HANDLER( ioc_w ) ***********************************************************/ static ADDRESS_MAP_START( gcpinbal_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) AM_RANGE(0xc00000, 0xc03fff) AM_READ(gcpinbal_tilemaps_word_r) - AM_RANGE(0xc80000, 0xc80fff) AM_READ(MRA16_RAM) /* sprite ram */ - AM_RANGE(0xd00000, 0xd00fff) AM_READ(MRA16_RAM) + AM_RANGE(0xc80000, 0xc80fff) AM_READ(SMH_RAM) /* sprite ram */ + AM_RANGE(0xd00000, 0xd00fff) AM_READ(SMH_RAM) AM_RANGE(0xd80000, 0xd800ff) AM_READ(ioc_r) - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( gcpinbal_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(gcpinbal_tilemaps_word_w) AM_BASE(&gcpinbal_tilemapram) - AM_RANGE(0xc80000, 0xc80fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xc80000, 0xc80fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xd00000, 0xd00fff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0xd80000, 0xd800ff) AM_WRITE(ioc_w) AM_BASE(&gcpinbal_ioc_ram) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c index f0c839fd786..9e75d112348 100644 --- a/src/mame/drivers/genesis.c +++ b/src/mame/drivers/genesis.c @@ -622,23 +622,23 @@ WRITE16_HANDLER ( genesis_io_w ) #if 0 static ADDRESS_MAP_START( genesis_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x3fffff) AM_READ(MRA16_ROM) /* Cartridge Program Rom */ + AM_RANGE(0x000000, 0x3fffff) AM_READ(SMH_ROM) /* Cartridge Program Rom */ AM_RANGE(0xa10000, 0xa1001f) AM_READ(genesis_io_r) /* Genesis Input */ AM_RANGE(0xa00000, 0xa0ffff) AM_READ(genesis_68k_to_z80_r) AM_RANGE(0xc00000, 0xc0001f) AM_READ(genesis_vdp_r) /* VDP Access */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_BANK3) /* Main Ram */ - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* Main Ram */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_BANK3) /* Main Ram */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* Main Ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( genesis_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x3fffff) AM_WRITE(MWA16_ROM) /* Cartridge Program Rom */ + AM_RANGE(0x000000, 0x3fffff) AM_WRITE(SMH_ROM) /* Cartridge Program Rom */ AM_RANGE(0xa10000, 0xa1001f) AM_WRITE(genesis_io_w) AM_BASE(&genesis_io_ram) /* Genesis Input */ AM_RANGE(0xa11000, 0xa11203) AM_WRITE(genesis_ctrl_w) AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(genesis_68k_to_z80_w) AM_RANGE(0xc00000, 0xc0001f) AM_WRITE(genesis_vdp_w) /* VDP Access */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_BANK3) /* Main Ram */ - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&genesis_68k_ram)/* Main Ram */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_BANK3) /* Main Ram */ + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&genesis_68k_ram)/* Main Ram */ ADDRESS_MAP_END #endif @@ -765,15 +765,15 @@ READ8_HANDLER ( genesis_z80_bank_r ) #if 0 static ADDRESS_MAP_START( genesis_z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_BANK2) /* mirror */ + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_BANK1) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_BANK2) /* mirror */ AM_RANGE(0x4000, 0x7fff) AM_READ(genesis_z80_r) AM_RANGE(0x8000, 0xffff) AM_READ(genesis_z80_bank_r) ADDRESS_MAP_END static ADDRESS_MAP_START( genesis_z80_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_BANK1) AM_BASE(&genesis_z80_ram) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_BANK2) /* mirror */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_BANK1) AM_BASE(&genesis_z80_ram) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_BANK2) /* mirror */ AM_RANGE(0x4000, 0x7fff) AM_WRITE(genesis_z80_w) // AM_RANGE(0x8000, 0xffff) AM_WRITE(genesis_z80_bank_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c index c966efa2358..5124065cf48 100644 --- a/src/mame/drivers/getrivia.c +++ b/src/mame/drivers/getrivia.c @@ -245,10 +245,10 @@ static ADDRESS_MAP_START( getrivia_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x609b, 0x609b) AM_WRITE(banksel_3_2_w) AM_RANGE(0x609d, 0x609d) AM_WRITE(banksel_2_2_w) AM_RANGE(0x609e, 0x609e) AM_WRITE(banksel_1_2_w) - AM_RANGE(0x8000, 0x8002) AM_WRITE(MWA8_RAM) AM_BASE(&drawctrl) + AM_RANGE(0x8000, 0x8002) AM_WRITE(SMH_RAM) AM_BASE(&drawctrl) AM_RANGE(0x8000, 0x9fff) AM_ROM /* space for diagnostic ROM? */ AM_RANGE(0xa000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xffff) AM_READWRITE(MRA8_RAM, getrivia_bitmap_w) AM_BASE(&videoram) + AM_RANGE(0xc000, 0xffff) AM_READWRITE(SMH_RAM, getrivia_bitmap_w) AM_BASE(&videoram) ADDRESS_MAP_END static ADDRESS_MAP_START( gselect_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -261,8 +261,8 @@ static ADDRESS_MAP_START( gselect_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4403, 0x4403) AM_WRITE(banksel_2_2_w) AM_RANGE(0x4800, 0x4803) AM_READWRITE(ppi8255_0_r, ppi8255_0_w) AM_RANGE(0x5000, 0x5003) AM_READWRITE(ppi8255_1_r, ppi8255_1_w) - AM_RANGE(0x8000, 0x8002) AM_WRITE(MWA8_RAM) AM_BASE(&drawctrl) - AM_RANGE(0xc000, 0xffff) AM_READWRITE(MRA8_RAM, getrivia_bitmap_w) AM_BASE(&videoram) + AM_RANGE(0x8000, 0x8002) AM_WRITE(SMH_RAM) AM_BASE(&drawctrl) + AM_RANGE(0xc000, 0xffff) AM_READWRITE(SMH_RAM, getrivia_bitmap_w) AM_BASE(&videoram) ADDRESS_MAP_END // TODO: where are mapped the lower 0x2000 bytes of the banks? @@ -277,9 +277,9 @@ static ADDRESS_MAP_START( amuse_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x607b, 0x607b) AM_WRITE(banksel_3_1_w) AM_RANGE(0x607d, 0x607d) AM_WRITE(banksel_2_1_w) AM_RANGE(0x607e, 0x607e) AM_WRITE(banksel_1_1_w) - AM_RANGE(0x8000, 0x8002) AM_WRITE(MWA8_RAM) AM_BASE(&drawctrl) + AM_RANGE(0x8000, 0x8002) AM_WRITE(SMH_RAM) AM_BASE(&drawctrl) AM_RANGE(0x8000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xffff) AM_READWRITE(MRA8_RAM, getrivia_bitmap_w) AM_BASE(&videoram) + AM_RANGE(0xc000, 0xffff) AM_READWRITE(SMH_RAM, getrivia_bitmap_w) AM_BASE(&videoram) ADDRESS_MAP_END static ADDRESS_MAP_START( gepoker_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -293,10 +293,10 @@ static ADDRESS_MAP_START( gepoker_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x60fb, 0x60fb) AM_WRITE(banksel_2_1_w) AM_RANGE(0x60fd, 0x60fd) AM_WRITE(banksel_1_2_w) AM_RANGE(0x60fe, 0x60fe) AM_WRITE(banksel_1_1_w) - AM_RANGE(0x8000, 0x8002) AM_WRITE(MWA8_RAM) AM_BASE(&drawctrl) + AM_RANGE(0x8000, 0x8002) AM_WRITE(SMH_RAM) AM_BASE(&drawctrl) AM_RANGE(0x8000, 0xbfff) AM_ROM /* space for diagnostic ROM? */ AM_RANGE(0xe000, 0xffff) AM_ROM - AM_RANGE(0xc000, 0xffff) AM_READWRITE(MRA8_RAM, getrivia_bitmap_w) AM_BASE(&videoram) + AM_RANGE(0xc000, 0xffff) AM_READWRITE(SMH_RAM, getrivia_bitmap_w) AM_BASE(&videoram) ADDRESS_MAP_END diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index d75a377d5db..cd7063462d4 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -213,15 +213,15 @@ static MACHINE_START( gijoe ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) // Sprites + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) // Sprites AM_RANGE(0x120000, 0x121fff) AM_READ(K056832_ram_word_r) // Graphic planes AM_RANGE(0x122000, 0x123fff) AM_READ(K056832_ram_word_r) // Graphic planes mirror read AM_RANGE(0x130000, 0x131fff) AM_READ(K056832_rom_word_r) // Passthrough to tile roms - AM_RANGE(0x180000, 0x18ffff) AM_READ(MRA16_RAM) // Main RAM. Spec. 180000-1803ff, 180400-187fff - AM_RANGE(0x190000, 0x190fff) AM_READ(MRA16_RAM) + AM_RANGE(0x180000, 0x18ffff) AM_READ(SMH_RAM) // Main RAM. Spec. 180000-1803ff, 180400-187fff + AM_RANGE(0x190000, 0x190fff) AM_READ(SMH_RAM) AM_RANGE(0x1c0014, 0x1c0015) AM_READ(sound_status_r) - AM_RANGE(0x1c0000, 0x1c001f) AM_READ(MRA16_RAM) // sound regs read fall through + AM_RANGE(0x1c0000, 0x1c001f) AM_READ(SMH_RAM) // sound regs read fall through AM_RANGE(0x1e0000, 0x1e0001) AM_READ(input_port_2_word_r) AM_RANGE(0x1e0002, 0x1e0003) AM_READ(input_port_3_word_r) AM_RANGE(0x1e4000, 0x1e4001) AM_READ(input_port_1_word_r) @@ -237,34 +237,34 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x100fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x100fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0x110000, 0x110007) AM_WRITE(K053246_word_w) AM_RANGE(0x120000, 0x121fff) AM_WRITE(K056832_ram_word_w) AM_RANGE(0x122000, 0x123fff) AM_WRITE(K056832_ram_word_w) - AM_RANGE(0x130000, 0x131fff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x130000, 0x131fff) AM_WRITE(SMH_ROM) AM_RANGE(0x160000, 0x160007) AM_WRITE(K056832_b_word_w) // VSCCS (board dependent) - AM_RANGE(0x170000, 0x170001) AM_WRITE(MWA16_NOP) // Watchdog - AM_RANGE(0x180000, 0x18ffff) AM_WRITE(MWA16_RAM) AM_BASE(&gijoe_workram) + AM_RANGE(0x170000, 0x170001) AM_WRITE(SMH_NOP) // Watchdog + AM_RANGE(0x180000, 0x18ffff) AM_WRITE(SMH_RAM) AM_BASE(&gijoe_workram) AM_RANGE(0x190000, 0x190fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(K053251_lsb_w) AM_RANGE(0x1b0000, 0x1b003f) AM_WRITE(K056832_word_w) AM_RANGE(0x1c000c, 0x1c000d) AM_WRITE(sound_cmd_w) - AM_RANGE(0x1c0000, 0x1c001f) AM_WRITE(MWA16_RAM) // sound regs write fall through + AM_RANGE(0x1c0000, 0x1c001f) AM_WRITE(SMH_RAM) // sound regs write fall through AM_RANGE(0x1d0000, 0x1d0001) AM_WRITE(sound_irq_w) AM_RANGE(0x1e8000, 0x1e8001) AM_WRITE(control2_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xebff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xebff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xfa2f) AM_READ(K054539_0_r) AM_RANGE(0xfc02, 0xfc02) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xebff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xebff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf800, 0xfa2f) AM_WRITE(K054539_0_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(soundlatch2_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c index e731f3b3de2..41d21abe17a 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -74,22 +74,22 @@ VIDEO_UPDATE( ginganin ); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x020000, 0x023fff) AM_READ(MRA16_RAM) - AM_RANGE(0x030000, 0x0307ff) AM_READ(MRA16_RAM) - AM_RANGE(0x040000, 0x0407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x050000, 0x0507ff) AM_READ(MRA16_RAM) - AM_RANGE(0x060000, 0x06000f) AM_READ(MRA16_RAM) - AM_RANGE(0x068000, 0x06bfff) AM_READ(MRA16_RAM) /* bg lives in ROM */ + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) + AM_RANGE(0x020000, 0x023fff) AM_READ(SMH_RAM) + AM_RANGE(0x030000, 0x0307ff) AM_READ(SMH_RAM) + AM_RANGE(0x040000, 0x0407ff) AM_READ(SMH_RAM) + AM_RANGE(0x050000, 0x0507ff) AM_READ(SMH_RAM) + AM_RANGE(0x060000, 0x06000f) AM_READ(SMH_RAM) + AM_RANGE(0x068000, 0x06bfff) AM_READ(SMH_RAM) /* bg lives in ROM */ AM_RANGE(0x070000, 0x070001) AM_READ(input_port_0_word_r) /* controls */ AM_RANGE(0x070002, 0x070003) AM_READ(input_port_1_word_r) /* DSWs */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) /* The ROM area: 10000-13fff is written with: 0000 0000 0000 0001, at startup only. Why? */ - AM_RANGE(0x020000, 0x023fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x020000, 0x023fff) AM_WRITE(SMH_RAM) AM_RANGE(0x030000, 0x0307ff) AM_WRITE(ginganin_txtram16_w) AM_BASE(&ginganin_txtram16) - AM_RANGE(0x040000, 0x0407ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x040000, 0x0407ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x050000, 0x0507ff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x060000, 0x06000f) AM_WRITE(ginganin_vregs16_w) AM_BASE(&ginganin_vregs16) AM_RANGE(0x068000, 0x06bfff) AM_WRITE(ginganin_fgram16_w) AM_BASE(&ginganin_fgram16) @@ -167,14 +167,14 @@ static WRITE8_HANDLER( MC6840_write_port_1_w ) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x1800, 0x1800) AM_READ(soundlatch_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0800) AM_WRITE(MC6840_control_port_0_w) /* Takahiro Nogi. 1999/09/27 */ AM_RANGE(0x0801, 0x0801) AM_WRITE(MC6840_control_port_1_w) /* Takahiro Nogi. 1999/09/27 */ AM_RANGE(0x0802, 0x0802) AM_WRITE(MC6840_write_port_0_w) /* Takahiro Nogi. 1999/09/27 */ diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index d12b66a7491..d0416921cbb 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -386,10 +386,10 @@ static ADDRESS_MAP_START( ppking_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xcbff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0xcc00, 0xcfff) AM_WRITE(ppking_video_registers_w) - AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(MRA8_RAM, gladiatr_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0xd800, 0xdfff) AM_READWRITE(MRA8_RAM, gladiatr_videoram_w) AM_BASE(&gladiatr_videoram) - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, gladiatr_colorram_w) AM_BASE(&gladiatr_colorram) - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, gladiatr_textram_w) AM_BASE(&gladiatr_textram) + AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(SMH_RAM, gladiatr_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0xd800, 0xdfff) AM_READWRITE(SMH_RAM, gladiatr_videoram_w) AM_BASE(&gladiatr_videoram) + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(SMH_RAM, gladiatr_colorram_w) AM_BASE(&gladiatr_colorram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, gladiatr_textram_w) AM_BASE(&gladiatr_textram) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */ ADDRESS_MAP_END @@ -412,7 +412,7 @@ static ADDRESS_MAP_START( ppking_cpu2_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READ(YM2203_status_port_0_r) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x01, 0x01) AM_READ(YM2203_read_port_0_r) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x20, 0x21) AM_READ(qx1_r) AM_WRITE(qx1_w) - AM_RANGE(0x40, 0x40) AM_READ(MRA8_NOP) + AM_RANGE(0x40, 0x40) AM_READ(SMH_NOP) AM_RANGE(0x60, 0x61) AM_READ(qx2_r) AM_WRITE(qx2_w) AM_RANGE(0x80, 0x81) AM_READ(qx3_r) AM_WRITE(qx3_w) ADDRESS_MAP_END @@ -425,10 +425,10 @@ static ADDRESS_MAP_START( gladiatr_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0xbfff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xcbff) AM_RAM AM_BASE(&spriteram) AM_RANGE(0xcc00, 0xcfff) AM_WRITE(gladiatr_video_registers_w) - AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(MRA8_RAM, gladiatr_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0xd800, 0xdfff) AM_READWRITE(MRA8_RAM, gladiatr_videoram_w) AM_BASE(&gladiatr_videoram) - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, gladiatr_colorram_w) AM_BASE(&gladiatr_colorram) - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, gladiatr_textram_w) AM_BASE(&gladiatr_textram) + AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(SMH_RAM, gladiatr_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0xd800, 0xdfff) AM_READWRITE(SMH_RAM, gladiatr_videoram_w) AM_BASE(&gladiatr_videoram) + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(SMH_RAM, gladiatr_colorram_w) AM_BASE(&gladiatr_colorram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, gladiatr_textram_w) AM_BASE(&gladiatr_textram) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* battery backed RAM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c index 5e71d015263..bab2864e6da 100644 --- a/src/mame/drivers/glass.c +++ b/src/mame/drivers/glass.c @@ -69,17 +69,17 @@ GFXDECODE_END static ADDRESS_MAP_START( glass_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) /* ROM */ - AM_RANGE(0x100000, 0x101fff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x102000, 0x102fff) AM_READ(MRA16_RAM) /* Extra Video RAM */ - AM_RANGE(0x200000, 0x2007ff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_READ(MRA16_RAM) /* Sprite RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x100000, 0x101fff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM) /* Extra Video RAM */ + AM_RANGE(0x200000, 0x2007ff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x440000, 0x440fff) AM_READ(SMH_RAM) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r) /* DIPSW #2 */ AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r) /* DIPSW #1 */ AM_RANGE(0x700004, 0x700005) AM_READ(input_port_2_word_r) /* 1P Inputs */ AM_RANGE(0x700006, 0x700007) AM_READ(input_port_3_word_r) /* 2P Inputs + Button 3 */ AM_RANGE(0x70000e, 0x70000f) AM_READ(OKIM6295_status_0_lsb_r)/* OKI6295 status register */ - AM_RANGE(0xfec000, 0xfeffff) AM_READ(MRA16_RAM) /* Work RAM (partially shared with DS5002FP) */ + AM_RANGE(0xfec000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END @@ -109,18 +109,18 @@ static WRITE16_HANDLER( glass_coin_w ) } static ADDRESS_MAP_START( glass_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x100000, 0x101fff) AM_WRITE(glass_vram_w) AM_BASE(&glass_videoram) /* Video RAM */ - AM_RANGE(0x102000, 0x102fff) AM_WRITE(MWA16_RAM) /* Extra Video RAM */ - AM_RANGE(0x108000, 0x108007) AM_WRITE(MWA16_RAM) AM_BASE(&glass_vregs) /* Video Registers */ + AM_RANGE(0x102000, 0x102fff) AM_WRITE(SMH_RAM) /* Extra Video RAM */ + AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&glass_vregs) /* Video Registers */ AM_RANGE(0x108008, 0x108009) AM_WRITE(clr_int_w) /* CLR INT Video */ AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_WRITE(MWA16_RAM) AM_BASE(&glass_spriteram) /* Sprite RAM */ + AM_RANGE(0x440000, 0x440fff) AM_WRITE(SMH_RAM) AM_BASE(&glass_spriteram) /* Sprite RAM */ AM_RANGE(0x700008, 0x700009) AM_WRITE(glass_blitter_w) /* serial blitter */ AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */ AM_RANGE(0x70000e, 0x70000f) AM_WRITE(OKIM6295_data_0_lsb_w) /* OKI6295 data register */ AM_RANGE(0x70000a, 0x70004b) AM_WRITE(glass_coin_w) /* Coin Counters/Lockout */ - AM_RANGE(0xfec000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Work RAM (partially shared with DS5002FP) */ + AM_RANGE(0xfec000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c index 967693d63ae..0380934c6eb 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -66,20 +66,20 @@ static MACHINE_START( gng ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r) AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r) AM_RANGE(0x3002, 0x3002) AM_READ(input_port_2_r) AM_RANGE(0x3003, 0x3003) AM_READ(input_port_3_r) AM_RANGE(0x3004, 0x3004) AM_READ(input_port_4_r) - AM_RANGE(0x3c00, 0x3c00) AM_READ(MRA8_NOP) /* watchdog? */ - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x3c00, 0x3c00) AM_READ(SMH_NOP) /* watchdog? */ + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_BANK1) + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1dff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1e00, 0x1fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x1dff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1e00, 0x1fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x2000, 0x27ff) AM_WRITE(gng_fgvideoram_w) AM_BASE(&gng_fgvideoram) AM_RANGE(0x2800, 0x2fff) AM_WRITE(gng_bgvideoram_w) AM_BASE(&gng_bgvideoram) AM_RANGE(0x3800, 0x38ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_BASE(&paletteram_2) @@ -87,29 +87,29 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3a00, 0x3a00) AM_WRITE(soundlatch_w) AM_RANGE(0x3b08, 0x3b09) AM_WRITE(gng_bgscrollx_w) AM_RANGE(0x3b0a, 0x3b0b) AM_WRITE(gng_bgscrolly_w) - AM_RANGE(0x3c00, 0x3c00) AM_WRITE(MWA8_NOP) /* watchdog? */ + AM_RANGE(0x3c00, 0x3c00) AM_WRITE(SMH_NOP) /* watchdog? */ AM_RANGE(0x3d00, 0x3d00) AM_WRITE(gng_flipscreen_w) // { 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, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2203_control_port_1_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2203_write_port_1_w) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END #define GNG_COMMON \ diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 33563115916..eef2c9a9dc9 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -25,22 +25,22 @@ static UINT16* go2000_video2; static ADDRESS_MAP_START( go2000_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x203fff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x610000, 0x61ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x800000, 0x800fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x203fff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM) + AM_RANGE(0x610000, 0x61ffff) AM_READ(SMH_RAM) + AM_RANGE(0x800000, 0x800fff) AM_READ(SMH_RAM) AM_RANGE(0xa00000, 0xa00001) AM_READ(input_port_0_word_r) AM_RANGE(0xa00002, 0xa00003) AM_READ(input_port_1_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( go2000_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x203fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x600000, 0x603fff) AM_WRITE(MWA16_RAM) AM_BASE(&go2000_video) - AM_RANGE(0x604000, 0x60ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x610000, 0x613fff) AM_WRITE(MWA16_RAM) AM_BASE(&go2000_video2) - AM_RANGE(0x614000, 0x61ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x203fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x600000, 0x603fff) AM_WRITE(SMH_RAM) AM_BASE(&go2000_video) + AM_RANGE(0x604000, 0x60ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x610000, 0x613fff) AM_WRITE(SMH_RAM) AM_BASE(&go2000_video2) + AM_RANGE(0x614000, 0x61ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x800000, 0x800fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) ADDRESS_MAP_END diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c index 642da763b01..d91f11e0612 100644 --- a/src/mame/drivers/goal92.c +++ b/src/mame/drivers/goal92.c @@ -59,27 +59,27 @@ static READ16_HANDLER( goal92_inputs_r ) } static ADDRESS_MAP_START( goal92_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x13ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x13ffff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(goal92_inputs_r) AM_RANGE(0x18001c, 0x18001d) AM_READ(goal92_fg_bank_r) ADDRESS_MAP_END static ADDRESS_MAP_START( goal92_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x1007ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x1007ff) AM_WRITE(SMH_RAM) AM_RANGE(0x100800, 0x100fff) AM_WRITE(goal92_background_w) AM_BASE(&goal92_back_data) AM_RANGE(0x101000, 0x1017ff) AM_WRITE(goal92_foreground_w) AM_BASE(&goal92_fore_data) - AM_RANGE(0x101800, 0x101fff) AM_WRITE(MWA16_RAM) // it has tiles for clouds, but they aren't used + AM_RANGE(0x101800, 0x101fff) AM_WRITE(SMH_RAM) // it has tiles for clouds, but they aren't used AM_RANGE(0x102000, 0x102fff) AM_WRITE(goal92_text_w) AM_BASE(&goal92_textram) AM_RANGE(0x103000, 0x103fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x104000, 0x13ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x140800, 0x140801) AM_WRITE(MWA16_NOP) - AM_RANGE(0x140802, 0x140803) AM_WRITE(MWA16_NOP) + AM_RANGE(0x104000, 0x13ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x140800, 0x140801) AM_WRITE(SMH_NOP) + AM_RANGE(0x140802, 0x140803) AM_WRITE(SMH_NOP) AM_RANGE(0x180008, 0x180009) AM_WRITE(goal92_sound_command_w) - AM_RANGE(0x18000a, 0x18000b) AM_WRITE(MWA16_NOP) - AM_RANGE(0x180010, 0x180017) AM_WRITE(MWA16_RAM) AM_BASE(&goal92_scrollram16) + AM_RANGE(0x18000a, 0x18000b) AM_WRITE(SMH_NOP) + AM_RANGE(0x180010, 0x180017) AM_WRITE(SMH_RAM) AM_BASE(&goal92_scrollram16) AM_RANGE(0x18001c, 0x18001d) AM_WRITE(goal92_fg_bank_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index 05a292c56cc..be8374efee7 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -96,32 +96,32 @@ logerror("%04x: prot_fcb0_w(%02x)\n",activecpu_get_pc(),data); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xc800) AM_READ(MRA8_NOP) // watchdog? - AM_RANGE(0xd000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xc800) AM_READ(SMH_NOP) // watchdog? + AM_RANGE(0xd000, 0xefff) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_READ(input_port_3_r) AM_RANGE(0xf422, 0xf422) AM_READ(prot_f422_r) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_4_r) AM_RANGE(0xc834, 0xc834) AM_READ(input_port_1_r) AM_RANGE(0xc820, 0xc820) AM_READ(input_port_2_r) AM_RANGE(0xc830, 0xc830) AM_READ(input_port_0_r) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) AM_BASE(&ram) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_BASE(&ram) AM_RANGE(0xc810, 0xc810) AM_WRITE(goindol_bankswitch_w) - AM_RANGE(0xc820, 0xd820) AM_WRITE(MWA8_RAM) AM_BASE(&goindol_fg_scrolly) - AM_RANGE(0xc830, 0xd830) AM_WRITE(MWA8_RAM) AM_BASE(&goindol_fg_scrollx) + AM_RANGE(0xc820, 0xd820) AM_WRITE(SMH_RAM) AM_BASE(&goindol_fg_scrolly) + AM_RANGE(0xc830, 0xd830) AM_WRITE(SMH_RAM) AM_BASE(&goindol_fg_scrollx) AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w) - AM_RANGE(0xd000, 0xd03f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd040, 0xd7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd000, 0xd03f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd040, 0xd7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xd800, 0xdfff) AM_WRITE(goindol_bg_videoram_w) AM_BASE(&goindol_bg_videoram) AM_SIZE(&goindol_bg_videoram_size) - AM_RANGE(0xe000, 0xe03f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0xe040, 0xe7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xe03f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0xe040, 0xe7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe800, 0xefff) AM_WRITE(goindol_fg_videoram_w) AM_BASE(&goindol_fg_videoram) AM_SIZE(&goindol_fg_videoram_size) AM_RANGE(0xfc44, 0xfc44) AM_WRITE(prot_fc44_w) AM_RANGE(0xfc66, 0xfc66) AM_WRITE(prot_fc66_w) @@ -130,14 +130,14 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xd800, 0xd800) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 994b0809b7d..7e17d1218ee 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -61,8 +61,8 @@ static ADDRESS_MAP_START( map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE(&colorram) AM_RANGE(0xd800, 0xd9ff) AM_RAM AM_BASE(&goldstar_video1) AM_SIZE(&goldstar_video_size) AM_RANGE(0xe000, 0xe1ff) AM_RAM AM_BASE(&goldstar_video2) - AM_RANGE(0xe800, 0xe9ff) AM_WRITE(MWA8_RAM) AM_BASE(&goldstar_video3) - AM_RANGE(0xf040, 0xf07f) AM_WRITE(MWA8_RAM) AM_BASE(&goldstar_scroll1) + AM_RANGE(0xe800, 0xe9ff) AM_WRITE(SMH_RAM) AM_BASE(&goldstar_video3) + AM_RANGE(0xf040, 0xf07f) AM_WRITE(SMH_RAM) AM_BASE(&goldstar_scroll1) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_0_r) AM_RANGE(0xf801, 0xf801) AM_READ(input_port_1_r) /* Test Mode */ AM_RANGE(0xf802, 0xf802) AM_READ(input_port_2_r) /* DSW 1 */ @@ -71,8 +71,8 @@ static ADDRESS_MAP_START( map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf805, 0xf805) AM_READ(input_port_7_r) /* DSW 4 (also appears in 8910 port) */ AM_RANGE(0xf806, 0xf806) AM_READ(input_port_9_r) /* (don't know to which one of the */ /* service mode dip switches it should map) */ - AM_RANGE(0xf080, 0xf0bf) AM_WRITE(MWA8_RAM) AM_BASE(&goldstar_scroll2) - AM_RANGE(0xf0c0, 0xf0ff) AM_WRITE(MWA8_RAM) AM_BASE(&goldstar_scroll3) + AM_RANGE(0xf080, 0xf0bf) AM_WRITE(SMH_RAM) AM_BASE(&goldstar_scroll2) + AM_RANGE(0xf0c0, 0xf0ff) AM_WRITE(SMH_RAM) AM_BASE(&goldstar_scroll3) AM_RANGE(0xf810, 0xf810) AM_READ(input_port_3_r) AM_RANGE(0xf811, 0xf811) AM_READ(input_port_4_r) AM_RANGE(0xf820, 0xf820) AM_READ(input_port_5_r) /* DSW 2 */ @@ -80,7 +80,7 @@ static ADDRESS_MAP_START( map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf840, 0xf840) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(goldstar_fa00_w) AM_RANGE(0xfb00, 0xfb00) AM_READWRITE(OKIM6295_status_0_r,OKIM6295_data_0_w) - AM_RANGE(0xfd00, 0xfdff) AM_READWRITE(MRA8_RAM,paletteram_BBGGGRRR_w) AM_BASE(&paletteram) + AM_RANGE(0xfd00, 0xfdff) AM_READWRITE(SMH_RAM,paletteram_BBGGGRRR_w) AM_BASE(&paletteram) AM_RANGE(0xfe00, 0xfe00) AM_READWRITE(protection_r,protection_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c index 0ac58a24a5d..3e75281f319 100644 --- a/src/mame/drivers/gomoku.c +++ b/src/mame/drivers/gomoku.c @@ -59,27 +59,27 @@ static READ8_HANDLER( input_port_r ) static ADDRESS_MAP_START( readmem_gomoku, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x47ff) AM_READ(MRA8_ROM) - AM_RANGE(0x4800, 0x4fff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x53ff) AM_READ(MRA8_RAM) - AM_RANGE(0x5400, 0x57ff) AM_READ(MRA8_RAM) - AM_RANGE(0x5800, 0x58ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x47ff) AM_READ(SMH_ROM) + AM_RANGE(0x4800, 0x4fff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x53ff) AM_READ(SMH_RAM) + AM_RANGE(0x5400, 0x57ff) AM_READ(SMH_RAM) + AM_RANGE(0x5800, 0x58ff) AM_READ(SMH_RAM) AM_RANGE(0x7800, 0x7807) AM_READ(input_port_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_gomoku, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x47ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4800, 0x4fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x47ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4800, 0x4fff) AM_WRITE(SMH_RAM) AM_RANGE(0x5000, 0x53ff) AM_WRITE(gomoku_videoram_w) AM_BASE(&gomoku_videoram) AM_RANGE(0x5400, 0x57ff) AM_WRITE(gomoku_colorram_w) AM_BASE(&gomoku_colorram) AM_RANGE(0x5800, 0x58ff) AM_WRITE(gomoku_bgram_w) AM_BASE(&gomoku_bgram) AM_RANGE(0x6000, 0x601f) AM_WRITE(gomoku_sound1_w) AM_BASE(&gomoku_soundregs1) AM_RANGE(0x6800, 0x681f) AM_WRITE(gomoku_sound2_w) AM_BASE(&gomoku_soundregs2) - AM_RANGE(0x7000, 0x7000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x7000, 0x7000) AM_WRITE(SMH_NOP) AM_RANGE(0x7001, 0x7001) AM_WRITE(gomoku_flipscreen_w) AM_RANGE(0x7002, 0x7002) AM_WRITE(gomoku_bg_dispsw_w) - AM_RANGE(0x7003, 0x7007) AM_WRITE(MWA8_NOP) - AM_RANGE(0x7800, 0x7800) AM_WRITE(MWA8_NOP) + AM_RANGE(0x7003, 0x7007) AM_WRITE(SMH_NOP) + AM_RANGE(0x7800, 0x7800) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index f52a3c301fe..3fab32e9a77 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -91,10 +91,10 @@ static ADDRESS_MAP_START( good_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x280002, 0x280003) AM_READ( input_port_1_word_r ) AM_RANGE(0x280004, 0x280005) AM_READ( input_port_2_word_r ) - AM_RANGE(0x800000, 0x8007ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x800000, 0x8007ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x820000, 0x820fff) AM_READWRITE(MRA16_RAM, fg_tilemapram_w) AM_BASE(&fg_tilemapram) - AM_RANGE(0x822000, 0x822fff) AM_READWRITE(MRA16_RAM, bg_tilemapram_w) AM_BASE(&bg_tilemapram) + AM_RANGE(0x820000, 0x820fff) AM_READWRITE(SMH_RAM, fg_tilemapram_w) AM_BASE(&fg_tilemapram) + AM_RANGE(0x822000, 0x822fff) AM_READWRITE(SMH_RAM, bg_tilemapram_w) AM_BASE(&bg_tilemapram) AM_RANGE(0xff0000, 0xffefff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c index b6ba4667810..9a86765d807 100644 --- a/src/mame/drivers/gotcha.c +++ b/src/mame/drivers/gotcha.c @@ -106,23 +106,23 @@ static WRITE16_HANDLER( gotcha_oki_bank_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x120000, 0x12ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1405ff) AM_READ(MRA16_RAM) - AM_RANGE(0x160000, 0x1607ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x120000, 0x12ffff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1405ff) AM_READ(SMH_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x180001) AM_READ(input_port_0_word_r) AM_RANGE(0x180002, 0x180003) AM_READ(input_port_1_word_r) AM_RANGE(0x180004, 0x180005) AM_READ(input_port_2_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(soundlatch_word_w) AM_RANGE(0x100002, 0x100003) AM_WRITE(gotcha_lamps_w) AM_RANGE(0x100004, 0x100005) AM_WRITE(gotcha_oki_bank_w) - AM_RANGE(0x120000, 0x12ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x120000, 0x12ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x140000, 0x1405ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x160000, 0x1607ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x160000, 0x1607ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x300000, 0x300001) AM_WRITE(gotcha_gfxbank_select_w) AM_RANGE(0x300002, 0x300009) AM_WRITE(gotcha_scroll_w) // { 0x30000c, 0x30000d, @@ -133,18 +133,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xc006, 0xc006) AM_READ(soundlatch_r) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xc002, 0xc003) AM_WRITE(OKIM6295_data_0_w) // TWO addresses! - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c index b4e04e41936..c5469ec783f 100644 --- a/src/mame/drivers/gottlieb.c +++ b/src/mame/drivers/gottlieb.c @@ -412,9 +412,9 @@ logerror("current frame : %d\n",current_frame); static ADDRESS_MAP_START( reactor_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xffff) AM_RANGE(0x00000, 0x01fff) AM_RAM - AM_RANGE(0x02000, 0x020ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x03000, 0x033ff) AM_MIRROR(0x0400) AM_READWRITE(MRA8_RAM, gottlieb_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x04000, 0x04fff) AM_READWRITE(MRA8_RAM, gottlieb_charram_w) AM_BASE(&gottlieb_charram) + AM_RANGE(0x02000, 0x020ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x03000, 0x033ff) AM_MIRROR(0x0400) AM_READWRITE(SMH_RAM, gottlieb_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x04000, 0x04fff) AM_READWRITE(SMH_RAM, gottlieb_charram_w) AM_BASE(&gottlieb_charram) AM_RANGE(0x06000, 0x0601f) AM_WRITE(gottlieb_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0x07000, 0x07000) AM_READWRITE(input_port_0_r, watchdog_reset_w) /* DSW */ AM_RANGE(0x07001, 0x07001) AM_READWRITE(input_port_1_r, gottlieb_track_reset_w) /* buttons */ @@ -431,8 +431,8 @@ static ADDRESS_MAP_START( gottlieb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x01000, 0x01fff) AM_RAM AM_REGION(REGION_CPU1, 0x1000) /* or ROM */ AM_RANGE(0x02000, 0x02fff) AM_RAM AM_REGION(REGION_CPU1, 0x2000) /* or ROM */ AM_RANGE(0x03000, 0x037ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) // argusg wants to check this - AM_RANGE(0x03800, 0x03bff) AM_MIRROR(0x0400) AM_READWRITE(MRA8_RAM, gottlieb_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x04000, 0x04fff) AM_READWRITE(MRA8_RAM, gottlieb_charram_w) AM_BASE(&gottlieb_charram) + AM_RANGE(0x03800, 0x03bff) AM_MIRROR(0x0400) AM_READWRITE(SMH_RAM, gottlieb_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x04000, 0x04fff) AM_READWRITE(SMH_RAM, gottlieb_charram_w) AM_BASE(&gottlieb_charram) AM_RANGE(0x05000, 0x0501f) AM_WRITE(gottlieb_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0x05800, 0x05800) AM_READWRITE(input_port_0_r, watchdog_reset_w) /* DSW */ AM_RANGE(0x05801, 0x05801) AM_READWRITE(input_port_1_r, gottlieb_track_reset_w) /* buttons */ @@ -448,7 +448,7 @@ static ADDRESS_MAP_START( gottlieb_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) /* A15 not decoded except in expansion socket */ ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0180) AM_RAM - AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x01e0) AM_READWRITE(gottlieb_riot_r, MWA8_RAM) AM_BASE(&gottlieb_riot_regs) + AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x01e0) AM_READWRITE(gottlieb_riot_r, SMH_RAM) AM_BASE(&gottlieb_riot_regs) AM_RANGE(0x1000, 0x1000) AM_WRITE(DAC_0_data_w) AM_RANGE(0x2000, 0x2000) AM_WRITE(gottlieb_speech_w) AM_RANGE(0x3000, 0x3000) AM_WRITE(gottlieb_speech_clock_DAC_w) diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c index 769e0fba751..342bd1b7171 100644 --- a/src/mame/drivers/gotya.c +++ b/src/mame/drivers/gotya.c @@ -54,25 +54,25 @@ extern WRITE8_HANDLER( gotya_soundlatch_w ); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x5000, 0x5fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x5000, 0x5fff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(input_port_0_r) AM_RANGE(0x6001, 0x6001) AM_READ(input_port_1_r) AM_RANGE(0x6002, 0x6002) AM_READ(input_port_2_r) - AM_RANGE(0xc000, 0xd3ff) AM_READ(MRA8_RAM) + AM_RANGE(0xc000, 0xd3ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x5000, 0x5fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x5000, 0x5fff) AM_WRITE(SMH_RAM) AM_RANGE(0x6004, 0x6004) AM_WRITE(gotya_video_control_w) AM_RANGE(0x6005, 0x6005) AM_WRITE(gotya_soundlatch_w) - AM_RANGE(0x6006, 0x6006) AM_WRITE(MWA8_RAM) AM_BASE(&gotya_scroll) + AM_RANGE(0x6006, 0x6006) AM_WRITE(SMH_RAM) AM_BASE(&gotya_scroll) AM_RANGE(0x6007, 0x6007) AM_WRITE(watchdog_reset_w) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(gotya_videoram_w) AM_BASE(&videoram) AM_RANGE(0xc800, 0xcfff) AM_WRITE(gotya_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xd000, 0xd3df) AM_WRITE(MWA8_RAM) AM_BASE(&gotya_videoram2) - AM_RANGE(0xd3e0, 0xd3ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) + AM_RANGE(0xd000, 0xd3df) AM_WRITE(SMH_RAM) AM_BASE(&gotya_videoram2) + AM_RANGE(0xd3e0, 0xd3ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) ADDRESS_MAP_END diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index b6bc63622d9..ffd9c472ac0 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -171,7 +171,7 @@ static WRITE8_HANDLER( sound_bank_w ) static ADDRESS_MAP_START( gradius3_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x040000, 0x043fff) AM_RAM - AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(cpuA_ctrl_w) /* halt cpu B, irq enable, priority, coin counters, other? */ AM_RANGE(0x0c8000, 0x0c8001) AM_READ(input_port_0_word_r) AM_RANGE(0x0c8002, 0x0c8003) AM_READ(input_port_1_word_r) @@ -185,7 +185,7 @@ static ADDRESS_MAP_START( gradius3_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0f0000, 0x0f0001) AM_WRITE(sound_irq_w) AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE(1) AM_RANGE(0x14c000, 0x153fff) AM_READWRITE(K052109_halfword_r, K052109_halfword_w) - AM_RANGE(0x180000, 0x19ffff) AM_READWRITE(MRA16_RAM, gradius3_gfxram_w) AM_BASE(&gradius3_gfxram) + AM_RANGE(0x180000, 0x19ffff) AM_READWRITE(SMH_RAM, gradius3_gfxram_w) AM_BASE(&gradius3_gfxram) ADDRESS_MAP_END @@ -195,7 +195,7 @@ static ADDRESS_MAP_START( gradius3_map2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x140000, 0x140001) AM_WRITE(cpuB_irqenable_w) AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE(1) AM_RANGE(0x24c000, 0x253fff) AM_READWRITE(K052109_halfword_r, K052109_halfword_w) - AM_RANGE(0x280000, 0x29ffff) AM_READWRITE(MRA16_RAM, gradius3_gfxram_w) + AM_RANGE(0x280000, 0x29ffff) AM_READWRITE(SMH_RAM, gradius3_gfxram_w) AM_RANGE(0x2c0000, 0x2c000f) AM_READWRITE(K051937_halfword_r, K051937_halfword_w) AM_RANGE(0x2c0800, 0x2c0fff) AM_READWRITE(K051960_halfword_r, K051960_halfword_w) AM_RANGE(0x400000, 0x5fffff) AM_READ(gradius3_gfxrom_r) /* gfx ROMs are mapped here, and copied to RAM */ diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c index e5115660a1e..55fe58f5cd9 100644 --- a/src/mame/drivers/grchamp.c +++ b/src/mame/drivers/grchamp.c @@ -543,9 +543,9 @@ ADDRESS_MAP_END /* complete memory map derived from schematics */ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x2000, 0x27ff) AM_READWRITE(MRA8_RAM, grchamp_left_w) AM_BASE_MEMBER(grchamp_state, leftram) - AM_RANGE(0x2800, 0x2fff) AM_READWRITE(MRA8_RAM, grchamp_right_w) AM_BASE_MEMBER(grchamp_state, rightram) - AM_RANGE(0x3000, 0x37ff) AM_READWRITE(MRA8_RAM, grchamp_center_w) AM_BASE_MEMBER(grchamp_state, centerram) + AM_RANGE(0x2000, 0x27ff) AM_READWRITE(SMH_RAM, grchamp_left_w) AM_BASE_MEMBER(grchamp_state, leftram) + AM_RANGE(0x2800, 0x2fff) AM_READWRITE(SMH_RAM, grchamp_right_w) AM_BASE_MEMBER(grchamp_state, rightram) + AM_RANGE(0x3000, 0x37ff) AM_READWRITE(SMH_RAM, grchamp_center_w) AM_BASE_MEMBER(grchamp_state, centerram) AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM AM_RANGE(0x5000, 0x6fff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c index 33524e3a90c..e926d8e5d11 100644 --- a/src/mame/drivers/gridlee.c +++ b/src/mame/drivers/gridlee.c @@ -298,20 +298,20 @@ static WRITE8_HANDLER( gridlee_coin_counter_w ) /* CPU 1 read addresses */ static ADDRESS_MAP_START( readmem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_RAM) AM_RANGE(0x9500, 0x9501) AM_READ(analog_port_r) AM_RANGE(0x9502, 0x9502) AM_READ(input_port_4_r) AM_RANGE(0x9503, 0x9503) AM_READ(input_port_5_r) AM_RANGE(0x9600, 0x9600) AM_READ(input_port_6_r) AM_RANGE(0x9700, 0x9700) AM_READ(input_port_7_r) AM_RANGE(0x9820, 0x9820) AM_READ(random_num_r) - AM_RANGE(0x9c00, 0x9cff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x9c00, 0x9cff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_RANGE(0x0800, 0x7fff) AM_WRITE(gridlee_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x9000, 0x9000) AM_WRITE(led_0_w) AM_RANGE(0x9010, 0x9010) AM_WRITE(led_1_w) @@ -320,10 +320,10 @@ static ADDRESS_MAP_START( writemem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9070, 0x9070) AM_WRITE(gridlee_cocktail_flip_w) AM_RANGE(0x9200, 0x9200) AM_WRITE(gridlee_palette_select_w) AM_RANGE(0x9380, 0x9380) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x9700, 0x9700) AM_WRITE(MWA8_NOP) + AM_RANGE(0x9700, 0x9700) AM_WRITE(SMH_NOP) AM_RANGE(0x9828, 0x993f) AM_WRITE(gridlee_sound_w) - AM_RANGE(0x9c00, 0x9cff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0xa000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x9c00, 0x9cff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0xa000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c index e46f1925ef4..5177630ff28 100644 --- a/src/mame/drivers/groundfx.c +++ b/src/mame/drivers/groundfx.c @@ -261,35 +261,35 @@ static WRITE32_HANDLER( motor_control_w ) ***********************************************************/ static ADDRESS_MAP_START( groundfx_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x200000, 0x21ffff) AM_READ(MRA32_RAM) /* main CPUA ram */ - AM_RANGE(0x300000, 0x303fff) AM_READ(MRA32_RAM) /* sprite ram */ + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x21ffff) AM_READ(SMH_RAM) /* main CPUA ram */ + AM_RANGE(0x300000, 0x303fff) AM_READ(SMH_RAM) /* sprite ram */ AM_RANGE(0x500000, 0x500007) AM_READ(groundfx_input_r) AM_RANGE(0x600000, 0x600003) AM_READ(groundfx_adc_r) - AM_RANGE(0x700000, 0x7007ff) AM_READ(MRA32_RAM) + AM_RANGE(0x700000, 0x7007ff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0480SCP_long_r) /* tilemaps */ AM_RANGE(0x830000, 0x83002f) AM_READ(TC0480SCP_ctrl_long_r) // debugging AM_RANGE(0x900000, 0x90ffff) AM_READ(TC0100SCN_long_r) /* piv tilemaps */ AM_RANGE(0x920000, 0x92000f) AM_READ(TC0100SCN_ctrl_long_r) - AM_RANGE(0xa00000, 0xa0ffff) AM_READ(MRA32_RAM) /* palette ram */ - AM_RANGE(0xb00000, 0xb003ff) AM_READ(MRA32_RAM) // ?? single bytes - AM_RANGE(0xc00000, 0xc00007) AM_READ(MRA32_NOP) /* Network? */ + AM_RANGE(0xa00000, 0xa0ffff) AM_READ(SMH_RAM) /* palette ram */ + AM_RANGE(0xb00000, 0xb003ff) AM_READ(SMH_RAM) // ?? single bytes + AM_RANGE(0xc00000, 0xc00007) AM_READ(SMH_NOP) /* Network? */ ADDRESS_MAP_END static ADDRESS_MAP_START( groundfx_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x200000, 0x21ffff) AM_WRITE(MWA32_RAM) AM_BASE(&groundfx_ram) - AM_RANGE(0x300000, 0x303fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x21ffff) AM_WRITE(SMH_RAM) AM_BASE(&groundfx_ram) + AM_RANGE(0x300000, 0x303fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x400000, 0x400003) AM_WRITE(motor_control_w) /* gun vibration */ AM_RANGE(0x500000, 0x500007) AM_WRITE(groundfx_input_w) /* eerom etc. */ AM_RANGE(0x600000, 0x600003) AM_WRITE(groundfx_adc_w) - AM_RANGE(0x700000, 0x7007ff) AM_WRITE(MWA32_RAM) AM_BASE(&f3_shared_ram) + AM_RANGE(0x700000, 0x7007ff) AM_WRITE(SMH_RAM) AM_BASE(&f3_shared_ram) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0480SCP_long_w) /* tilemaps */ AM_RANGE(0x830000, 0x83002f) AM_WRITE(TC0480SCP_ctrl_long_w) AM_RANGE(0x900000, 0x90ffff) AM_WRITE(TC0100SCN_long_w) /* piv tilemaps */ AM_RANGE(0x920000, 0x92000f) AM_WRITE(TC0100SCN_ctrl_long_w) AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(color_ram_w) AM_BASE(&paletteram32) - AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(MWA32_RAM) // single bytes, blending ?? + AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(SMH_RAM) // single bytes, blending ?? AM_RANGE(0xd00000, 0xd00003) AM_WRITE(rotate_control_w) /* perhaps port based rotate control? */ /* f00000 is seat control? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index f90e9c4d839..1db25a75e43 100644 --- a/src/mame/drivers/gstriker.c +++ b/src/mame/drivers/gstriker.c @@ -293,14 +293,14 @@ UINT16 *gstriker_lineram; static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x141fff) AM_READ(MRA16_RAM) - AM_RANGE(0x180000, 0x181fff) AM_READ(MRA16_RAM) - AM_RANGE(0x1c0000, 0x1c0fff) AM_READ(MRA16_RAM) - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x141fff) AM_READ(SMH_RAM) + AM_RANGE(0x180000, 0x181fff) AM_READ(SMH_RAM) + AM_RANGE(0x1c0000, 0x1c0fff) AM_READ(SMH_RAM) + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM) - AM_RANGE(0x200000, 0x20007f) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x20007f) AM_READ(SMH_RAM) AM_RANGE(0x200080, 0x200081) AM_READ(input_port_1_word_r) AM_RANGE(0x200082, 0x200083) AM_READ(input_port_2_word_r) AM_RANGE(0x200084, 0x200085) AM_READ(input_port_0_word_r) @@ -310,28 +310,28 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x103fff) AM_WRITE(MB60553_0_vram_w) AM_BASE(&MB60553_0_vram) - AM_RANGE(0x140000, 0x141fff) AM_WRITE(MWA16_RAM) AM_BASE(&CG10103_0_vram) + AM_RANGE(0x140000, 0x141fff) AM_WRITE(SMH_RAM) AM_BASE(&CG10103_0_vram) AM_RANGE(0x180000, 0x180fff) AM_WRITE(VS920A_0_vram_w) AM_BASE(&VS920A_0_vram) - AM_RANGE(0x181000, 0x181fff) AM_WRITE(MWA16_RAM) AM_BASE(&gstriker_lineram) + AM_RANGE(0x181000, 0x181fff) AM_WRITE(SMH_RAM) AM_BASE(&gstriker_lineram) AM_RANGE(0x1c0000, 0x1c0fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x200000, 0x20000f) AM_WRITE(MB60553_0_regs_w) - AM_RANGE(0x200040, 0x20005f) AM_WRITE(MWA16_RAM) AM_BASE(&gs_mixer_regs) + AM_RANGE(0x200040, 0x20005f) AM_WRITE(SMH_RAM) AM_BASE(&gs_mixer_regs) AM_RANGE(0x2000a0, 0x2000a1) AM_WRITE(sound_command_w) - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&work_ram) + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&work_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c index 5cc3746b1b0..bb2fe0e3b39 100644 --- a/src/mame/drivers/gsword.c +++ b/src/mame/drivers/gsword.c @@ -366,14 +366,14 @@ static ADDRESS_MAP_START( cpu1_map, 0 , 8 ) AM_RANGE(0x0000, 0x8fff) AM_ROM AM_RANGE(0x9000, 0x9fff) AM_RAM AM_RANGE(0xa000, 0xa37f) AM_RAM - AM_RANGE(0xa380, 0xa3ff) AM_WRITE(MWA8_RAM) AM_READ(MRA8_RAM) AM_BASE(&gsword_spritetile_ram) + AM_RANGE(0xa380, 0xa3ff) AM_WRITE(SMH_RAM) AM_READ(SMH_RAM) AM_BASE(&gsword_spritetile_ram) AM_RANGE(0xa400, 0xa77f) AM_RAM - AM_RANGE(0xa780, 0xa7ff) AM_WRITE(MWA8_RAM) AM_READ(MRA8_RAM) AM_BASE(&gsword_spritexy_ram) AM_SIZE(&gsword_spritexy_size) + AM_RANGE(0xa780, 0xa7ff) AM_WRITE(SMH_RAM) AM_READ(SMH_RAM) AM_BASE(&gsword_spritexy_ram) AM_SIZE(&gsword_spritexy_size) AM_RANGE(0xa980, 0xa980) AM_WRITE(gsword_charbank_w) AM_RANGE(0xaa80, 0xaa80) AM_WRITE(gsword_videoctrl_w) /* flip screen, char palette bank */ AM_RANGE(0xab00, 0xab00) AM_WRITE(gsword_scroll_w) - AM_RANGE(0xab80, 0xabff) AM_WRITE(MWA8_RAM) AM_BASE(&gsword_spriteattrib_ram) - AM_RANGE(0xb000, 0xb7ff) AM_WRITE(gsword_videoram_w) AM_READ(MRA8_RAM) AM_BASE(&videoram) + AM_RANGE(0xab80, 0xabff) AM_WRITE(SMH_RAM) AM_BASE(&gsword_spriteattrib_ram) + AM_RANGE(0xb000, 0xb7ff) AM_WRITE(gsword_videoram_w) AM_READ(SMH_RAM) AM_BASE(&videoram) ADDRESS_MAP_END static ADDRESS_MAP_START( cpu1_io_map, ADDRESS_SPACE_IO, 8 ) @@ -403,9 +403,9 @@ static ADDRESS_MAP_START( cpu2_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x80) AM_WRITE(gsword_AY8910_control_port_1_w) AM_READ(gsword_fake_1_r) AM_RANGE(0x81, 0x81) AM_WRITE(AY8910_write_port_1_w) AM_READ(AY8910_read_port_1_r) // - AM_RANGE(0xe0, 0xe0) AM_READ(MRA8_NOP) /* ?? */ - AM_RANGE(0xa0, 0xa0) AM_WRITE(MWA8_NOP) /* ?? */ - AM_RANGE(0xe0, 0xe0) AM_WRITE(MWA8_NOP) /* watch dog ?*/ + AM_RANGE(0xe0, 0xe0) AM_READ(SMH_NOP) /* ?? */ + AM_RANGE(0xa0, 0xa0) AM_WRITE(SMH_NOP) /* ?? */ + AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) /* watch dog ?*/ ADDRESS_MAP_END // diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 6eebe194aaf..886a6457120 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -459,7 +459,7 @@ WRITE32_HANDLER( lanc_ram_w ) static ADDRESS_MAP_START( gticlub_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x000fffff) AM_MIRROR(0x80000000) AM_RAM AM_BASE(&work_ram) /* Work RAM */ AM_RANGE(0x74000000, 0x740000ff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_reg_r, K001604_reg_w) - AM_RANGE(0x74010000, 0x7401ffff) AM_MIRROR(0x80000000) AM_READWRITE(MRA32_RAM, paletteram32_w) AM_BASE(&paletteram32) + AM_RANGE(0x74010000, 0x7401ffff) AM_MIRROR(0x80000000) AM_READWRITE(SMH_RAM, paletteram32_w) AM_BASE(&paletteram32) AM_RANGE(0x74020000, 0x7403ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_tile_r, K001604_tile_w) AM_RANGE(0x74040000, 0x7407ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_char_r, K001604_char_w) AM_RANGE(0x78000000, 0x7800ffff) AM_MIRROR(0x80000000) AM_READWRITE(cgboard_dsp_shared_r_ppc, cgboard_dsp_shared_w_ppc) diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c index 5f2f626e708..3054ef41305 100644 --- a/src/mame/drivers/gumbo.c +++ b/src/mame/drivers/gumbo.c @@ -48,19 +48,19 @@ VIDEO_START( gumbo ); VIDEO_UPDATE( gumbo ); static ADDRESS_MAP_START( gumbo_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_READ(MRA16_RAM) - AM_RANGE(0x1b0000, 0x1b03ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM) + AM_RANGE(0x1b0000, 0x1b03ff) AM_READ(SMH_RAM) AM_RANGE(0x1c0100, 0x1c0101) AM_READ(input_port_0_word_r) AM_RANGE(0x1c0200, 0x1c0201) AM_READ(input_port_1_word_r) AM_RANGE(0x1c0300, 0x1c0301) AM_READ(OKIM6295_status_0_lsb_r) - AM_RANGE(0x1e0000, 0x1e0fff) AM_READ(MRA16_RAM) - AM_RANGE(0x1f0000, 0x1f3fff) AM_READ(MRA16_RAM) + AM_RANGE(0x1e0000, 0x1e0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1f0000, 0x1f3fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( gumbo_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_WRITE(MWA16_RAM) // main ram + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) // main ram AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x1b0000, 0x1b03ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x1e0000, 0x1e0fff) AM_WRITE(gumbo_bg_videoram_w) AM_BASE(&gumbo_bg_videoram) // bg tilemap @@ -70,19 +70,19 @@ ADDRESS_MAP_END /* Miss Puzzle has a different memory map */ static ADDRESS_MAP_START( mspuzzle_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x1a0000, 0x1a03ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x1a0000, 0x1a03ff) AM_READ(SMH_RAM) AM_RANGE(0x1b0100, 0x1b0101) AM_READ(input_port_0_word_r) AM_RANGE(0x1b0200, 0x1b0201) AM_READ(input_port_1_word_r) AM_RANGE(0x1b0300, 0x1b0301) AM_READ(OKIM6295_status_0_lsb_r) - AM_RANGE(0x190000, 0x197fff) AM_READ(MRA16_RAM) - AM_RANGE(0x1c0000, 0x1c1fff) AM_READ(MRA16_RAM) + AM_RANGE(0x190000, 0x197fff) AM_READ(SMH_RAM) + AM_RANGE(0x1c0000, 0x1c1fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( mspuzzle_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) // main ram + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) // main ram AM_RANGE(0x1b0300, 0x1b0301) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x1a0000, 0x1a03ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x190000, 0x197fff) AM_WRITE(gumbo_fg_videoram_w) AM_BASE(&gumbo_fg_videoram) // fg tilemap @@ -90,18 +90,18 @@ static ADDRESS_MAP_START( mspuzzle_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dblpoint_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM) AM_RANGE(0x1c0100, 0x1c0101) AM_READ(input_port_0_word_r) AM_RANGE(0x1c0200, 0x1c0201) AM_READ(input_port_1_word_r) AM_RANGE(0x1c0300, 0x1c0301) AM_READ(OKIM6295_status_0_lsb_r) - AM_RANGE(0x1e0000, 0x1e3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x1f0000, 0x1f0fff) AM_READ(MRA16_RAM) + AM_RANGE(0x1e0000, 0x1e3fff) AM_READ(SMH_RAM) + AM_RANGE(0x1f0000, 0x1f0fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( dblpoint_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_WRITE(MWA16_RAM) // main ram + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) // main ram AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x1b0000, 0x1b03ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x1e0000, 0x1e3fff) AM_WRITE(gumbo_fg_videoram_w) AM_BASE(&gumbo_fg_videoram) // fg tilemap diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c index de0b466b279..e7cdb66a4ec 100644 --- a/src/mame/drivers/gunbustr.c +++ b/src/mame/drivers/gunbustr.c @@ -191,30 +191,30 @@ static WRITE32_HANDLER( gunbustr_gun_w ) ***********************************************************/ static ADDRESS_MAP_START( gunbustr_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x200000, 0x21ffff) AM_READ(MRA32_RAM) /* main CPUA ram */ - AM_RANGE(0x300000, 0x301fff) AM_READ(MRA32_RAM) /* Sprite ram */ - AM_RANGE(0x390000, 0x3907ff) AM_READ(MRA32_RAM) /* Sound shared ram */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x21ffff) AM_READ(SMH_RAM) /* main CPUA ram */ + AM_RANGE(0x300000, 0x301fff) AM_READ(SMH_RAM) /* Sprite ram */ + AM_RANGE(0x390000, 0x3907ff) AM_READ(SMH_RAM) /* Sound shared ram */ AM_RANGE(0x400000, 0x400007) AM_READ(gunbustr_input_r) AM_RANGE(0x500000, 0x500003) AM_READ(gunbustr_gun_r) /* gun coord read */ AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0480SCP_long_r) AM_RANGE(0x830000, 0x83002f) AM_READ(TC0480SCP_ctrl_long_r) - AM_RANGE(0x900000, 0x901fff) AM_READ(MRA32_RAM) /* Palette ram */ - AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA32_RAM) /* network ram ?? */ + AM_RANGE(0x900000, 0x901fff) AM_READ(SMH_RAM) /* Palette ram */ + AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM) /* network ram ?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( gunbustr_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x200000, 0x21ffff) AM_WRITE(MWA32_RAM) AM_BASE(&gunbustr_ram) - AM_RANGE(0x300000, 0x301fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x21ffff) AM_WRITE(SMH_RAM) AM_BASE(&gunbustr_ram) + AM_RANGE(0x300000, 0x301fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x380000, 0x380003) AM_WRITE(motor_control_w) /* motor, lamps etc. */ - AM_RANGE(0x390000, 0x3907ff) AM_WRITE(MWA32_RAM) AM_BASE(&f3_shared_ram) + AM_RANGE(0x390000, 0x3907ff) AM_WRITE(SMH_RAM) AM_BASE(&f3_shared_ram) AM_RANGE(0x400000, 0x400007) AM_WRITE(gunbustr_input_w) /* eerom etc. */ AM_RANGE(0x500000, 0x500003) AM_WRITE(gunbustr_gun_w) /* gun int request */ AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0480SCP_long_w) AM_RANGE(0x830000, 0x83002f) AM_WRITE(TC0480SCP_ctrl_long_w) AM_RANGE(0x900000, 0x901fff) AM_WRITE(gunbustr_palette_w) AM_BASE(&paletteram32) - AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(MWA32_RAM) /* network ram ?? */ + AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(SMH_RAM) /* network ram ?? */ ADDRESS_MAP_END /*********************************************************** diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index 5a6bdc193ce..6a2404967d1 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -167,9 +167,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc014, 0xc014) AM_WRITE(gundealr_flipscreen_w) AM_RANGE(0xc016, 0xc016) AM_WRITE(yamyam_bankswitch_w) AM_RANGE(0xc020, 0xc023) AM_WRITE(gundealr_fg_scroll_w) /* Gun Dealer only */ - AM_RANGE(0xc400, 0xc7ff) AM_READWRITE(MRA8_RAM, gundealr_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0xc800, 0xcfff) AM_READWRITE(MRA8_RAM, gundealr_bg_videoram_w) AM_BASE(&gundealr_bg_videoram) - AM_RANGE(0xd000, 0xdfff) AM_READWRITE(MRA8_RAM, gundealr_fg_videoram_w) AM_BASE(&gundealr_fg_videoram) + AM_RANGE(0xc400, 0xc7ff) AM_READWRITE(SMH_RAM, gundealr_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0xc800, 0xcfff) AM_READWRITE(SMH_RAM, gundealr_bg_videoram_w) AM_BASE(&gundealr_bg_videoram) + AM_RANGE(0xd000, 0xdfff) AM_READWRITE(SMH_RAM, gundealr_fg_videoram_w) AM_BASE(&gundealr_fg_videoram) AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE(&rambase) ADDRESS_MAP_END diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c index 1192c55e6cc..0faced63b08 100644 --- a/src/mame/drivers/gyruss.c +++ b/src/mame/drivers/gyruss.c @@ -86,21 +86,21 @@ static ADDRESS_MAP_START( main_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8400, 0x87ff) AM_RAM AM_BASE(&gyruss_videoram) AM_RANGE(0x9000, 0x9fff) AM_RAM AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE(1) - AM_RANGE(0xc000, 0xc000) AM_READWRITE(input_port_4_r, MWA8_NOP) /* watchdog reset */ + AM_RANGE(0xc000, 0xc000) AM_READWRITE(input_port_4_r, SMH_NOP) /* watchdog reset */ AM_RANGE(0xc080, 0xc080) AM_READWRITE(input_port_0_r, gyruss_sh_irqtrigger_w) AM_RANGE(0xc0a0, 0xc0a0) AM_READ(input_port_1_r) AM_RANGE(0xc0c0, 0xc0c0) AM_READ(input_port_2_r) AM_RANGE(0xc0e0, 0xc0e0) AM_READ(input_port_3_r) AM_RANGE(0xc100, 0xc100) AM_READWRITE(input_port_5_r, soundlatch_w) AM_RANGE(0xc180, 0xc180) AM_WRITE(interrupt_enable_w) - AM_RANGE(0xc185, 0xc185) AM_WRITE(MWA8_RAM) AM_BASE(&gyruss_flipscreen) + AM_RANGE(0xc185, 0xc185) AM_WRITE(SMH_RAM) AM_BASE(&gyruss_flipscreen) ADDRESS_MAP_END static ADDRESS_MAP_START( main_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(gyruss_scanline_r) AM_RANGE(0x2000, 0x2000) AM_WRITE(interrupt_enable_w) AM_RANGE(0x4000, 0x403f) AM_RAM - AM_RANGE(0x4040, 0x40ff) AM_READWRITE(MRA8_RAM, gyruss_spriteram_w) AM_BASE(&gyruss_spriteram) + AM_RANGE(0x4040, 0x40ff) AM_READWRITE(SMH_RAM, gyruss_spriteram_w) AM_BASE(&gyruss_spriteram) AM_RANGE(0x4100, 0x47ff) AM_RAM AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE(1) AM_RANGE(0xe000, 0xffff) AM_ROM @@ -140,7 +140,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( audio_cpu2_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0xff) AM_READ(soundlatch2_r) AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(DAC_0_data_w) - AM_RANGE(I8039_p2, I8039_p2) AM_WRITE(MWA8_NOP) + AM_RANGE(I8039_p2, I8039_p2) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index 95427f0e09a..981160e059d 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -1614,8 +1614,8 @@ static READ8_HANDLER( io_mirror_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(blitter_r) - AM_RANGE(0x1000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xfeff) AM_READ(MRA8_RAM) // work ram + AM_RANGE(0x1000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xfeff) AM_READ(SMH_RAM) // work ram AM_RANGE(0xff66, 0xff66) AM_READ(collision_id_r) // HACK: collision detection bypass(Halley's Comet only) AM_RANGE(0xff71, 0xff71) AM_READ(blitter_status_r) @@ -1628,9 +1628,9 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xff95, 0xff95) AM_READ(input_port_0_r) // dipswitch 4 AM_RANGE(0xff96, 0xff96) AM_READ(input_port_1_r) // dipswitch 3 AM_RANGE(0xff97, 0xff97) AM_READ(input_port_2_r) // dipswitch 2 - AM_RANGE(0xff00, 0xffbf) AM_READ(MRA8_RAM) // I/O read fall-through + AM_RANGE(0xff00, 0xffbf) AM_READ(SMH_RAM) // I/O read fall-through - AM_RANGE(0xffc0, 0xffdf) AM_READ(MRA8_RAM) // palette read + AM_RANGE(0xffc0, 0xffdf) AM_READ(SMH_RAM) // palette read AM_RANGE(0xffe0, 0xffff) AM_READ(vector_r) ADDRESS_MAP_END @@ -1638,39 +1638,39 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_WRITE(blitter_w) AM_BASE(&blitter_ram) AM_SIZE(&blitter_ramsize) AM_RANGE(0x1f00, 0x1fff) AM_WRITE(bgtile_w) // background tiles?(Ben Bero Beh only) - AM_RANGE(0x1000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xfeff) AM_WRITE(MWA8_RAM) // work ram + AM_RANGE(0x1000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xfeff) AM_WRITE(SMH_RAM) // work ram AM_RANGE(0xff8a, 0xff8a) AM_WRITE(soundcommand_w) AM_RANGE(0xff9c, 0xff9c) AM_WRITE(firq_ack_w) - AM_RANGE(0xff00, 0xffbf) AM_WRITE(MWA8_RAM) AM_BASE(&io_ram) AM_SIZE(&io_ramsize) // I/O write fall-through + AM_RANGE(0xff00, 0xffbf) AM_WRITE(SMH_RAM) AM_BASE(&io_ram) AM_SIZE(&io_ramsize) // I/O write fall-through AM_RANGE(0xffc0, 0xffdf) AM_WRITE(halleys_paletteram_IIRRGGBB_w) AM_BASE(&paletteram) - AM_RANGE(0xffe0, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xffe0, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0x4801, 0x4801) AM_READ(AY8910_read_port_1_r) AM_RANGE(0x4803, 0x4803) AM_READ(AY8910_read_port_2_r) AM_RANGE(0x4805, 0x4805) AM_READ(AY8910_read_port_3_r) AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_ROM) // space for diagnostic ROM + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) // space for diagnostic ROM ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4800) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x4801, 0x4801) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x4802, 0x4802) AM_WRITE(AY8910_control_port_2_w) AM_RANGE(0x4803, 0x4803) AM_WRITE(AY8910_write_port_2_w) AM_RANGE(0x4804, 0x4804) AM_WRITE(AY8910_control_port_3_w) AM_RANGE(0x4805, 0x4805) AM_WRITE(AY8910_write_port_3_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c index 99fbb45928b..7e17bf8d9bd 100644 --- a/src/mame/drivers/hanaawas.c +++ b/src/mame/drivers/hanaawas.c @@ -78,19 +78,19 @@ static WRITE8_HANDLER( hanaawas_inputs_mux_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8bff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x4fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x83ff) AM_WRITE(hanaawas_videoram_w) AM_BASE(&videoram) AM_RANGE(0x8400, 0x87ff) AM_WRITE(hanaawas_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x8800, 0x8bff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x8800, 0x8bff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c index 079e5bd909d..41fc6e654fc 100644 --- a/src/mame/drivers/hanaroku.c +++ b/src/mame/drivers/hanaroku.c @@ -118,12 +118,12 @@ static WRITE8_HANDLER( hanaroku_out_2_w ) /* main cpu */ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x97ff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xa1ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc000, 0xc3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc400, 0xc4ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x97ff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xa1ff) AM_READ(SMH_RAM) + AM_RANGE(0xc000, 0xc3ff) AM_READ(SMH_RAM) + AM_RANGE(0xc400, 0xc4ff) AM_READ(SMH_RAM) AM_RANGE(0xd000, 0xd000) AM_READ(AY8910_read_port_0_r) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) AM_RANGE(0xe001, 0xe001) AM_READ(input_port_1_r) @@ -132,15 +132,15 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) AM_BASE(&hanaroku_spriteram1) - AM_RANGE(0x9000, 0x97ff) AM_WRITE(MWA8_RAM) AM_BASE(&hanaroku_spriteram2) - AM_RANGE(0xa000, 0xa1ff) AM_WRITE(MWA8_RAM) AM_BASE(&hanaroku_spriteram3) - AM_RANGE(0xa200, 0xa2ff) AM_WRITE(MWA8_NOP) // ??? written once during P.O.S.T. - AM_RANGE(0xa300, 0xa304) AM_WRITE(MWA8_NOP) // ??? - AM_RANGE(0xc000, 0xc3ff) AM_WRITE(MWA8_RAM) // main ram - AM_RANGE(0xc400, 0xc4ff) AM_WRITE(MWA8_RAM) // ??? - AM_RANGE(0xb000, 0xb000) AM_WRITE(MWA8_NOP) // ??? always 0x40 + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&hanaroku_spriteram1) + AM_RANGE(0x9000, 0x97ff) AM_WRITE(SMH_RAM) AM_BASE(&hanaroku_spriteram2) + AM_RANGE(0xa000, 0xa1ff) AM_WRITE(SMH_RAM) AM_BASE(&hanaroku_spriteram3) + AM_RANGE(0xa200, 0xa2ff) AM_WRITE(SMH_NOP) // ??? written once during P.O.S.T. + AM_RANGE(0xa300, 0xa304) AM_WRITE(SMH_NOP) // ??? + AM_RANGE(0xc000, 0xc3ff) AM_WRITE(SMH_RAM) // main ram + AM_RANGE(0xc400, 0xc4ff) AM_WRITE(SMH_RAM) // ??? + AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP) // ??? always 0x40 AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(hanaroku_out_0_w) diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index 4925c600d31..f21208b640b 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -50,8 +50,8 @@ static WRITE8_HANDLER( hcastle_coin_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0020, 0x003f) AM_READ(MRA8_RAM) - AM_RANGE(0x0220, 0x023f) AM_READ(MRA8_RAM) + AM_RANGE(0x0020, 0x003f) AM_READ(SMH_RAM) + AM_RANGE(0x0220, 0x023f) AM_READ(SMH_RAM) AM_RANGE(0x0410, 0x0410) AM_READ(input_port_0_r) AM_RANGE(0x0411, 0x0411) AM_READ(input_port_1_r) AM_RANGE(0x0412, 0x0412) AM_READ(input_port_2_r) @@ -59,30 +59,30 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0414, 0x0414) AM_READ(input_port_4_r) /* Dip 2 */ AM_RANGE(0x0415, 0x0415) AM_READ(input_port_3_r) /* Dip 1 */ AM_RANGE(0x0418, 0x0418) AM_READ(hcastle_gfxbank_r) - AM_RANGE(0x0600, 0x06ff) AM_READ(MRA8_RAM) - AM_RANGE(0x0700, 0x5fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0600, 0x06ff) AM_READ(SMH_RAM) + AM_RANGE(0x0700, 0x5fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0007) AM_WRITE(hcastle_pf1_control_w) - AM_RANGE(0x0020, 0x003f) AM_WRITE(MWA8_RAM) /* rowscroll? */ + AM_RANGE(0x0020, 0x003f) AM_WRITE(SMH_RAM) /* rowscroll? */ AM_RANGE(0x0200, 0x0207) AM_WRITE(hcastle_pf2_control_w) - AM_RANGE(0x0220, 0x023f) AM_WRITE(MWA8_RAM) /* rowscroll? */ + AM_RANGE(0x0220, 0x023f) AM_WRITE(SMH_RAM) /* rowscroll? */ AM_RANGE(0x0400, 0x0400) AM_WRITE(hcastle_bankswitch_w) AM_RANGE(0x0404, 0x0404) AM_WRITE(soundlatch_w) AM_RANGE(0x0408, 0x0408) AM_WRITE(hcastle_soundirq_w) AM_RANGE(0x040c, 0x040c) AM_WRITE(watchdog_reset_w) AM_RANGE(0x0410, 0x0410) AM_WRITE(hcastle_coin_w) AM_RANGE(0x0418, 0x0418) AM_WRITE(hcastle_gfxbank_w) - AM_RANGE(0x0600, 0x06ff) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) - AM_RANGE(0x0700, 0x1fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0600, 0x06ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) + AM_RANGE(0x0700, 0x1fff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2fff) AM_WRITE(hcastle_pf1_video_w) AM_BASE(&hcastle_pf1_videoram) - AM_RANGE(0x3000, 0x3fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3000, 0x3fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x4000, 0x4fff) AM_WRITE(hcastle_pf2_video_w) AM_BASE(&hcastle_pf2_videoram) - AM_RANGE(0x5000, 0x5fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_2_size) - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x5000, 0x5fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /*****************************************************************************/ @@ -95,16 +95,16 @@ static WRITE8_HANDLER( sound_bank_w ) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(YM3812_status_port_0_r) AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9800, 0x987f) AM_WRITE(K051649_waveform_w) AM_RANGE(0x9880, 0x9889) AM_WRITE(K051649_frequency_w) AM_RANGE(0x988a, 0x988e) AM_WRITE(K051649_volume_w) diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c index 888c6bbe515..9442eed144d 100644 --- a/src/mame/drivers/hexa.c +++ b/src/mame/drivers/hexa.c @@ -45,16 +45,16 @@ WRITE8_HANDLER( hexa_d008_w ); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xd001, 0xd001) AM_READ(AY8910_read_port_0_r) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0xd008, 0xd008) AM_WRITE(hexa_d008_w) diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c index fe8c6234cfa..81108649b68 100644 --- a/src/mame/drivers/hexion.c +++ b/src/mame/drivers/hexion.c @@ -113,9 +113,9 @@ if ((data & 0xdc) != 0x10) popmessage("coincntr %02x",data); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK1) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK1) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xdffe) AM_READ(hexion_bankedram_r) AM_RANGE(0xf400, 0xf400) AM_READ(input_port_0_r) AM_RANGE(0xf401, 0xf401) AM_READ(input_port_1_r) @@ -127,15 +127,15 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_RAM) AM_RANGE(0xc000, 0xdffe) AM_WRITE(hexion_bankedram_w) AM_RANGE(0xdfff, 0xdfff) AM_WRITE(hexion_bankctrl_w) AM_RANGE(0xe800, 0xe87f) AM_WRITE(K051649_waveform_w) AM_RANGE(0xe880, 0xe889) AM_WRITE(K051649_frequency_w) AM_RANGE(0xe88a, 0xe88e) AM_WRITE(K051649_volume_w) AM_RANGE(0xe88f, 0xe88f) AM_WRITE(K051649_keyonoff_w) - AM_RANGE(0xf000, 0xf00f) AM_WRITE(MWA8_NOP) /* 053252? f00e = IRQ ack, f00f = NMI ack */ + AM_RANGE(0xf000, 0xf00f) AM_WRITE(SMH_NOP) /* 053252? f00e = IRQ ack, f00f = NMI ack */ AM_RANGE(0xf200, 0xf200) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0xf480, 0xf480) AM_WRITE(hexion_bankswitch_w) AM_RANGE(0xf4c0, 0xf4c0) AM_WRITE(coincntr_w) diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c index 59998dfff03..d609a994cb8 100644 --- a/src/mame/drivers/higemaru.c +++ b/src/mame/drivers/higemaru.c @@ -30,18 +30,18 @@ static INTERRUPT_GEN( higemaru_interrupt ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r) AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r) AM_RANGE(0xc004, 0xc004) AM_READ(input_port_4_r) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc800, 0xc800) AM_WRITE(higemaru_c800_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xc802, 0xc802) AM_WRITE(AY8910_write_port_0_w) @@ -49,8 +49,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc804, 0xc804) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0xd000, 0xd3ff) AM_WRITE(higemaru_videoram_w) AM_BASE(&videoram) AM_RANGE(0xd400, 0xd7ff) AM_WRITE(higemaru_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xd880, 0xd9ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd880, 0xd9ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index 614c7050471..3290785d3d4 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -217,7 +217,7 @@ static WRITE8_HANDLER( output_port_1_w ) static ADDRESS_MAP_START( hitme_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x1fff) AM_RANGE(0x0000, 0x07ff) AM_ROM - AM_RANGE(0x0c00, 0x0eff) AM_READWRITE(MRA8_RAM, hitme_vidram_w) AM_BASE(&hitme_vidram) + AM_RANGE(0x0c00, 0x0eff) AM_READWRITE(SMH_RAM, hitme_vidram_w) AM_BASE(&hitme_vidram) AM_RANGE(0x1000, 0x10ff) AM_MIRROR(0x300) AM_RAM AM_RANGE(0x1400, 0x14ff) AM_READ(hitme_port_0_r) AM_RANGE(0x1500, 0x15ff) AM_READ(hitme_port_1_r) diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index 25d612d21c1..c00bd19d02d 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -102,15 +102,15 @@ static MACHINE_RESET( hnayayoi ) static ADDRESS_MAP_START( hnayayoi_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( hnayayoi_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -129,8 +129,8 @@ static ADDRESS_MAP_START( hnayayoi_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x06, 0x06) AM_WRITE(adpcm_data_w) -// AM_RANGE(0x08, 0x08) AM_WRITE(MWA8_NOP) // CRT Controller -// AM_RANGE(0x09, 0x09) AM_WRITE(MWA8_NOP) // CRT Controller +// AM_RANGE(0x08, 0x08) AM_WRITE(SMH_NOP) // CRT Controller +// AM_RANGE(0x09, 0x09) AM_WRITE(SMH_NOP) // CRT Controller AM_RANGE(0x0a, 0x0a) AM_WRITE(dynax_blitter_rev1_start_w) AM_RANGE(0x0c, 0x0c) AM_WRITE(dynax_blitter_rev1_clear_w) AM_RANGE(0x23, 0x23) AM_WRITE(adpcm_vclk_w) @@ -142,9 +142,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hnfubuki_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xfeff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xfeff) AM_READ(SMH_ROM) AM_RANGE(0xff02, 0xff02) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xff03, 0xff03) AM_READ(YM2203_read_port_0_r) AM_RANGE(0xff04, 0xff04) AM_READ(input_port_2_r) @@ -154,14 +154,14 @@ static ADDRESS_MAP_START( hnfubuki_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( hnfubuki_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x8000, 0xfeff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x8000, 0xfeff) AM_WRITE(SMH_ROM) AM_RANGE(0xff00, 0xff00) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xff01, 0xff01) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xff06, 0xff06) AM_WRITE(adpcm_data_w) -// AM_RANGE(0xff08, 0xff08) AM_WRITE(MWA8_NOP) // CRT Controller -// AM_RANGE(0xff09, 0xff09) AM_WRITE(MWA8_NOP) // CRT Controller +// AM_RANGE(0xff08, 0xff08) AM_WRITE(SMH_NOP) // CRT Controller +// AM_RANGE(0xff09, 0xff09) AM_WRITE(SMH_NOP) // CRT Controller AM_RANGE(0xff0a, 0xff0a) AM_WRITE(dynax_blitter_rev1_start_w) AM_RANGE(0xff0c, 0xff0c) AM_WRITE(dynax_blitter_rev1_clear_w) AM_RANGE(0xff23, 0xff23) AM_WRITE(adpcm_vclk_w) @@ -182,15 +182,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( untoucha_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( untoucha_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -208,8 +208,8 @@ static ADDRESS_MAP_START( untoucha_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x10) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x50, 0x50) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x13, 0x13) AM_WRITE(adpcm_data_w) -// AM_RANGE(0x12, 0x12) AM_WRITE(MWA8_NOP) // CRT Controller -// AM_RANGE(0x52, 0x52) AM_WRITE(MWA8_NOP) // CRT Controller +// AM_RANGE(0x12, 0x12) AM_WRITE(SMH_NOP) // CRT Controller +// AM_RANGE(0x52, 0x52) AM_WRITE(SMH_NOP) // CRT Controller AM_RANGE(0x28, 0x28) AM_WRITE(dynax_blitter_rev1_start_w) AM_RANGE(0x20, 0x20) AM_WRITE(dynax_blitter_rev1_clear_w) AM_RANGE(0x31, 0x31) AM_WRITE(adpcm_vclk_w) diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index e7b4337ef45..12cdf0fa78e 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -904,17 +904,17 @@ static ADDRESS_MAP_START( hng_map, ADDRESS_SPACE_PROGRAM, 32 ) // Ports AM_RANGE(0x1F700000, 0x1F702fff) AM_READ(hng64_port_read) -// AM_RANGE(0x1F70100C, 0x1F70100F) AM_WRITE(MWA32_NOP) // ?? often -// AM_RANGE(0x1F70101C, 0x1F70101F) AM_WRITE(MWA32_NOP) // ?? often -// AM_RANGE(0x1F70106C, 0x1F70106F) AM_WRITE(MWA32_NOP) // fatfur,strange +// AM_RANGE(0x1F70100C, 0x1F70100F) AM_WRITE(SMH_NOP) // ?? often +// AM_RANGE(0x1F70101C, 0x1F70101F) AM_WRITE(SMH_NOP) // ?? often +// AM_RANGE(0x1F70106C, 0x1F70106F) AM_WRITE(SMH_NOP) // fatfur,strange // AM_RANGE(0x1F701084, 0x1F701087) AM_RAM -// AM_RANGE(0x1F70111C, 0x1F70111F) AM_WRITE(MWA32_NOP) // irq ack +// AM_RANGE(0x1F70111C, 0x1F70111F) AM_WRITE(SMH_NOP) // irq ack AM_RANGE(0x1F701204, 0x1F701207) AM_WRITE(hng_dma_start_w) AM_RANGE(0x1F701214, 0x1F701217) AM_WRITE(hng_dma_dst_w) AM_RANGE(0x1F701224, 0x1F701227) AM_WRITE(hng_dma_len_w) -// AM_RANGE(0x1F70124C, 0x1F70124F) AM_WRITE(MWA32_NOP) // dma related? -// AM_RANGE(0x1F70125C, 0x1F70125F) AM_WRITE(MWA32_NOP) // dma related? -// AM_RANGE(0x1F7021C4, 0x1F7021C7) AM_WRITE(MWA32_NOP) // ?? often +// AM_RANGE(0x1F70124C, 0x1F70124F) AM_WRITE(SMH_NOP) // dma related? +// AM_RANGE(0x1F70125C, 0x1F70125F) AM_WRITE(SMH_NOP) // dma related? +// AM_RANGE(0x1F7021C4, 0x1F7021C7) AM_WRITE(SMH_NOP) // ?? often // SRAM. Coin data, Player Statistics, etc. AM_RANGE(0x1F800000, 0x1F803fff) AM_READWRITE(hng64_sram_r, hng64_sram_w) AM_BASE(&hng64_sram) @@ -928,9 +928,9 @@ static ADDRESS_MAP_START( hng_map, ADDRESS_SPACE_PROGRAM, 32 ) // Video AM_RANGE(0x20000000, 0x2000bfff) AM_RAM AM_BASE(&hng64_spriteram) // Sprites AM_RANGE(0x20010000, 0x20010013) AM_READ(hng64_random_read) - AM_RANGE(0x20100000, 0x2017ffff) AM_READWRITE(MRA32_RAM, hng64_videoram_w) AM_BASE(&hng64_videoram) // Tilemap + AM_RANGE(0x20100000, 0x2017ffff) AM_READWRITE(SMH_RAM, hng64_videoram_w) AM_BASE(&hng64_videoram) // Tilemap AM_RANGE(0x20190000, 0x20190037) AM_RAM AM_BASE(&hng64_videoregs) // Video Registers - AM_RANGE(0x20200000, 0x20203fff) AM_READWRITE(MRA32_RAM,hng64_pal_w) AM_BASE(&paletteram32) // Palette + AM_RANGE(0x20200000, 0x20203fff) AM_READWRITE(SMH_RAM,hng64_pal_w) AM_BASE(&paletteram32) // Palette AM_RANGE(0x20208000, 0x2020805f) AM_READWRITE(tcram_r, tcram_w) AM_BASE(&hng64_tcram) // Transition Control AM_RANGE(0x20300000, 0x2030ffff) AM_READWRITE(dl_r, dl_w) AM_BASE(&hng64_dl) // 3d Display List @@ -944,9 +944,9 @@ static ADDRESS_MAP_START( hng_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x60200000, 0x603fffff) AM_READWRITE(hng64_soundram_r, hng64_soundram_w) // uploads the v53 sound program here, elsewhere on ss64-2 */ // ? -// AM_RANGE(0x68000000, 0x68000003) AM_WRITE(MWA32_NOP) // ?? -// AM_RANGE(0x68000004, 0x68000007) AM_READ(MWA32_NOP) // ?? -// AM_RANGE(0x68000008, 0x6800000b) AM_WRITE(MWA32_NOP) // ?? +// AM_RANGE(0x68000000, 0x68000003) AM_WRITE(SMH_NOP) // ?? +// AM_RANGE(0x68000004, 0x68000007) AM_READ(SMH_NOP) // ?? +// AM_RANGE(0x68000008, 0x6800000b) AM_WRITE(SMH_NOP) // ?? // Communications AM_RANGE(0xc0000000, 0xc0000fff) AM_READWRITE(hng64_com_r, hng64_com_w) AM_BASE(&hng64_com_ram) @@ -1241,8 +1241,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hng_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_READ(MRA16_BANK2) - AM_RANGE(0xe0000, 0xfffff) AM_READ(MRA16_BANK1) + AM_RANGE(0x00000, 0x3ffff) AM_READ(SMH_BANK2) + AM_RANGE(0xe0000, 0xfffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c index a71f4bb2a61..5bb6177bc95 100644 --- a/src/mame/drivers/holeland.c +++ b/src/mame/drivers/holeland.c @@ -27,35 +27,35 @@ WRITE8_HANDLER( holeland_scroll_w ); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf3ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf3ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc001) AM_WRITE(holeland_pal_offs_w) AM_RANGE(0xc006, 0xc007) AM_WRITE(holeland_flipscreen_w) AM_RANGE(0xe000, 0xe3ff) AM_WRITE(holeland_colorram_w) AM_BASE(&colorram) AM_RANGE(0xe400, 0xe7ff) AM_WRITE(holeland_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xf000, 0xf3ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf000, 0xf3ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( crzrally_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe800, 0xebff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe800, 0xebff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( crzrally_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe3ff) AM_WRITE(holeland_colorram_w) AM_BASE(&colorram) AM_RANGE(0xe400, 0xe7ff) AM_WRITE(holeland_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xe800, 0xebff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe800, 0xebff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xf000, 0xf000) AM_WRITE(holeland_scroll_w) AM_RANGE(0xf800, 0xf801) AM_WRITE(holeland_pal_offs_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index 385f916381a..cfc38274fef 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -566,42 +566,42 @@ static WRITE8_HANDLER( bankswitch_w ) static ADDRESS_MAP_START( mrokumei_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_RAM) /* videoram */ - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM) /* work ram */ - AM_RANGE(0x7000, 0x77ff) AM_READ(MRA8_RAM) /* hourouki expects this to act as RAM */ - AM_RANGE(0x7800, 0x7800) AM_READ(MRA8_RAM) /* only used to store the result of the ROM check */ + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_RAM) /* videoram */ + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM) /* work ram */ + AM_RANGE(0x7000, 0x77ff) AM_READ(SMH_RAM) /* hourouki expects this to act as RAM */ + AM_RANGE(0x7800, 0x7800) AM_READ(SMH_RAM) /* only used to store the result of the ROM check */ AM_RANGE(0x7801, 0x7802) AM_READ(mrokumei_keyboard_r) // also vblank and active page AM_RANGE(0x7803, 0x7803) AM_READ(input_port_2_r) // coin, service AM_RANGE(0x7804, 0x7804) AM_READ(input_port_0_r) // DSW1 AM_RANGE(0x7805, 0x7805) AM_READ(input_port_1_r) // DSW2 - AM_RANGE(0x7ffe, 0x7ffe) AM_READ(MRA8_NOP) // ??? read every vblank, value discarded - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x7ffe, 0x7ffe) AM_READ(SMH_NOP) // ??? read every vblank, value discarded + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mrokumei_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(mrokumei_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x4000, 0x5fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x7000, 0x77ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x7800, 0x7800) AM_WRITE(MWA8_RAM) /* only used to store the result of the ROM check */ - AM_RANGE(0x7ff0, 0x7ffd) AM_WRITE(MWA8_RAM) AM_BASE(&homedata_vreg) + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x7000, 0x77ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x7800, 0x7800) AM_WRITE(SMH_RAM) /* only used to store the result of the ROM check */ + AM_RANGE(0x7ff0, 0x7ffd) AM_WRITE(SMH_RAM) AM_BASE(&homedata_vreg) AM_RANGE(0x8000, 0x8000) AM_WRITE(mrokumei_blitter_start_w) // in some games also ROM bank switch to access service ROM AM_RANGE(0x8001, 0x8001) AM_WRITE(mrokumei_keyboard_select_w) AM_RANGE(0x8002, 0x8002) AM_WRITE(mrokumei_sound_cmd_w) AM_RANGE(0x8003, 0x8003) AM_WRITE(SN76496_0_w) AM_RANGE(0x8006, 0x8006) AM_WRITE(homedata_blitter_param_w) AM_RANGE(0x8007, 0x8007) AM_WRITE(mrokumei_blitter_bank_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mrokumei_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mrokumei_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xfffc, 0xfffd) AM_WRITE(MWA8_NOP) /* stack writes happen here, but there's no RAM */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xfffc, 0xfffd) AM_WRITE(SMH_NOP) /* stack writes happen here, but there's no RAM */ AM_RANGE(0x8080, 0x8080) AM_WRITE(mrokumei_sound_bank_w) ADDRESS_MAP_END @@ -616,40 +616,40 @@ ADDRESS_MAP_END /********************************************************************************/ static ADDRESS_MAP_START( reikaids_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_RAM) /* videoram */ - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM) /* work ram */ - AM_RANGE(0x7800, 0x7800) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_RAM) /* videoram */ + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM) /* work ram */ + AM_RANGE(0x7800, 0x7800) AM_READ(SMH_RAM) AM_RANGE(0x7801, 0x7801) AM_READ(input_port_0_r) AM_RANGE(0x7802, 0x7802) AM_READ(input_port_1_r) AM_RANGE(0x7803, 0x7803) AM_READ(reikaids_io_r) // coin, blitter, upd7807 - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( reikaids_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(reikaids_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x4000, 0x5fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x7800, 0x7800) AM_WRITE(MWA8_RAM) /* behaves as normal RAM */ - AM_RANGE(0x7ff0, 0x7ffd) AM_WRITE(MWA8_RAM) AM_BASE(&homedata_vreg) + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x7800, 0x7800) AM_WRITE(SMH_RAM) /* behaves as normal RAM */ + AM_RANGE(0x7ff0, 0x7ffd) AM_WRITE(SMH_RAM) AM_BASE(&homedata_vreg) AM_RANGE(0x7ffe, 0x7ffe) AM_WRITE(reikaids_blitter_bank_w) AM_RANGE(0x7fff, 0x7fff) AM_WRITE(reikaids_blitter_start_w) AM_RANGE(0x8000, 0x8000) AM_WRITE(bankswitch_w) 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, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( reikaids_upd7807_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xfeff) AM_READ(MRA8_BANK2) /* External ROM (Banked) */ - AM_RANGE(0xff00, 0xffff) AM_READ(MRA8_RAM) /* Internal RAM */ + AM_RANGE(0x0000, 0xfeff) AM_READ(SMH_BANK2) /* External ROM (Banked) */ + AM_RANGE(0xff00, 0xffff) AM_READ(SMH_RAM) /* Internal RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( reikaids_upd7807_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xfeff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xff00, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xfeff) AM_WRITE(SMH_ROM) + AM_RANGE(0xff00, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( reikaids_upd7807_readport, ADDRESS_SPACE_IO, 8 ) @@ -668,41 +668,41 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pteacher_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_RAM) /* work ram */ - AM_RANGE(0x7800, 0x7800) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM) /* work ram */ + AM_RANGE(0x7800, 0x7800) AM_READ(SMH_RAM) AM_RANGE(0x7801, 0x7801) AM_READ(pteacher_io_r) // vblank, visible page AM_RANGE(0x7ff2, 0x7ff2) AM_READ(pteacher_snd_r) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( pteacher_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_WRITE(pteacher_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x4000, 0x5eff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x5f00, 0x5fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x7800, 0x7800) AM_WRITE(MWA8_RAM) /* behaves as normal RAM */ - AM_RANGE(0x7ff0, 0x7ffd) AM_WRITE(MWA8_RAM) AM_BASE(&homedata_vreg) + AM_RANGE(0x4000, 0x5eff) AM_WRITE(SMH_RAM) + AM_RANGE(0x5f00, 0x5fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x7800, 0x7800) AM_WRITE(SMH_RAM) /* behaves as normal RAM */ + AM_RANGE(0x7ff0, 0x7ffd) AM_WRITE(SMH_RAM) AM_BASE(&homedata_vreg) AM_RANGE(0x7fff, 0x7fff) AM_WRITE(pteacher_blitter_start_w) AM_RANGE(0x8000, 0x8000) AM_WRITE(bankswitch_w) AM_RANGE(0x8002, 0x8002) AM_WRITE(pteacher_snd_command_w) 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, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( pteacher_upd7807_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xfeff) AM_READ(MRA8_BANK2) /* External ROM (Banked) */ - AM_RANGE(0xff00, 0xffff) AM_READ(MRA8_RAM) /* Internal RAM */ + AM_RANGE(0x0000, 0xfeff) AM_READ(SMH_BANK2) /* External ROM (Banked) */ + AM_RANGE(0xff00, 0xffff) AM_READ(SMH_RAM) /* Internal RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( pteacher_upd7807_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITE(pteacher_snd_answer_w) - AM_RANGE(0x0000, 0xfeff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xff00, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xfeff) AM_WRITE(SMH_ROM) + AM_RANGE(0xff00, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( pteacher_upd7807_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c index e16cb6ce779..8d9731fa324 100644 --- a/src/mame/drivers/homerun.c +++ b/src/mame/drivers/homerun.c @@ -82,7 +82,7 @@ GFXDECODE_END static ADDRESS_MAP_START( homerun_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0x9fff) AM_RAM AM_WRITE(homerun_videoram_w) AM_BASE(&homerun_videoram) AM_RANGE(0xa000, 0xa0ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xb000, 0xb0ff) AM_WRITE(homerun_color_w) @@ -99,8 +99,8 @@ static READ8_HANDLER(homerun_40_r) static ADDRESS_MAP_START( homerun_iomap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x10) AM_WRITE(MWA8_NOP) /* ?? */ - AM_RANGE(0x20, 0x20) AM_WRITE(MWA8_NOP) /* ?? */ + AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP) /* ?? */ + AM_RANGE(0x20, 0x20) AM_WRITE(SMH_NOP) /* ?? */ AM_RANGE(0x30, 0x33) AM_READWRITE(ppi8255_0_r, ppi8255_0_w) AM_RANGE(0x40, 0x40) AM_READ(homerun_40_r) AM_RANGE(0x50, 0x50) AM_READ(input_port_2_r) diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c index 7aa96c74576..e7e0a5fd78c 100644 --- a/src/mame/drivers/hshavoc.c +++ b/src/mame/drivers/hshavoc.c @@ -94,38 +94,38 @@ static INPUT_PORTS_START( hshavoc ) INPUT_PORTS_END static ADDRESS_MAP_START( topshoot_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* Cartridge Program Rom */ - AM_RANGE(0x202000, 0x2023ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* Cartridge Program Rom */ + AM_RANGE(0x202000, 0x2023ff) AM_READ(SMH_RAM) AM_RANGE(0xa00000, 0xa0ffff) AM_READ(genesis_68k_to_z80_r) AM_RANGE(0xc00000, 0xc0001f) AM_READ(genesis_vdp_r) /* VDP Access */ - AM_RANGE(0xe00000, 0xe1ffff) AM_READ(MRA16_BANK3) - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_BANK4) - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* Main Ram */ + AM_RANGE(0xe00000, 0xe1ffff) AM_READ(SMH_BANK3) + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_BANK4) + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* Main Ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( topshoot_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* Cartridge Program Rom */ -// AM_RANGE(0x200000, 0x20007f) AM_WRITE(MWA16_RAM) - AM_RANGE(0x200000, 0x2023ff) AM_WRITE(MWA16_RAM) // tested + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* Cartridge Program Rom */ +// AM_RANGE(0x200000, 0x20007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x200000, 0x2023ff) AM_WRITE(SMH_RAM) // tested AM_RANGE(0xa10000, 0xa1001f) AM_WRITE(genesis_io_w) AM_BASE(&genesis_io_ram) /* Genesis Input */ AM_RANGE(0xa11000, 0xa11203) AM_WRITE(genesis_ctrl_w) AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(genesis_68k_to_z80_w) AM_RANGE(0xc00000, 0xc0001f) AM_WRITE(genesis_vdp_w) /* VDP Access */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_BANK4) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&genesis_68k_ram)/* Main Ram */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_BANK4) + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&genesis_68k_ram)/* Main Ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( genesis_z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_BANK2) /* mirror */ + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_BANK1) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_BANK2) /* mirror */ AM_RANGE(0x4000, 0x7fff) AM_READ(genesis_z80_r) AM_RANGE(0x8000, 0xffff) AM_READ(genesis_z80_bank_r) ADDRESS_MAP_END static ADDRESS_MAP_START( genesis_z80_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_BANK1) AM_BASE(&genesis_z80_ram) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_BANK2) /* mirror */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_BANK1) AM_BASE(&genesis_z80_ram) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_BANK2) /* mirror */ AM_RANGE(0x4000, 0x7fff) AM_WRITE(genesis_z80_w) // AM_RANGE(0x8000, 0xffff) AM_WRITE(genesis_z80_bank_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c index b3e2015d081..451a56be1c3 100644 --- a/src/mame/drivers/hyhoo.c +++ b/src/mame/drivers/hyhoo.c @@ -55,13 +55,13 @@ static DRIVER_INIT( hyhoo2 ) static ADDRESS_MAP_START( readmem_hyhoo, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_hyhoo, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END @@ -72,7 +72,7 @@ static ADDRESS_MAP_START( readport_hyhoo, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r) AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r) - AM_RANGE(0xd0, 0xd0) AM_READ(MRA8_NOP) // unknown + AM_RANGE(0xd0, 0xd0) AM_READ(SMH_NOP) // unknown AM_RANGE(0xe0, 0xe1) AM_READ(nb1413m3_gfxrom_r) AM_RANGE(0xf0, 0xf0) AM_READ(nb1413m3_dipsw1_r) AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r) @@ -86,10 +86,10 @@ static ADDRESS_MAP_START( writeport_hyhoo, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x90, 0x97) AM_WRITE(hyhoo_blitter_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) - AM_RANGE(0xc0, 0xcf) AM_WRITE(MWA8_RAM) AM_BASE(&hyhoo_clut) + AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_RAM) AM_BASE(&hyhoo_clut) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(hyhoo_romsel_w) -// AM_RANGE(0xf0, 0xf0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index a66f730cd9a..6b2e89a8064 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -133,31 +133,31 @@ static NVRAM_HANDLER( hyperspt ) static ADDRESS_MAP_START( hyperspt_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x1000, 0x10ff) AM_READ(MRA8_RAM) + AM_RANGE(0x1000, 0x10ff) AM_READ(SMH_RAM) AM_RANGE(0x1600, 0x1600) AM_READ(input_port_4_r) /* DIP 2 */ AM_RANGE(0x1680, 0x1680) AM_READ(input_port_0_r) /* IO Coin */ // AM_RANGE(0x1681, 0x1681) AM_READ(input_port_1_r) /* P1 IO */ AM_RANGE(0x1681, 0x1681) AM_READ(konami_IN1_r) /* P1 IO and handle fake button for cheating */ AM_RANGE(0x1682, 0x1682) AM_READ(input_port_2_r) /* P2 IO */ AM_RANGE(0x1683, 0x1683) AM_READ(input_port_3_r) /* DIP 1 */ - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( roadf_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x1000, 0x10ff) AM_READ(MRA8_RAM) + AM_RANGE(0x1000, 0x10ff) AM_READ(SMH_RAM) AM_RANGE(0x1600, 0x1600) AM_READ(input_port_4_r) /* DIP 2 */ AM_RANGE(0x1680, 0x1680) AM_READ(input_port_0_r) /* IO Coin */ AM_RANGE(0x1681, 0x1681) AM_READ(input_port_1_r) /* P1 IO */ AM_RANGE(0x1682, 0x1682) AM_READ(input_port_2_r) /* P2 IO */ AM_RANGE(0x1683, 0x1683) AM_READ(input_port_3_r) /* DIP 1 */ - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x1000, 0x10bf) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x10C0, 0x10ff) AM_WRITE(MWA8_RAM) AM_BASE(&hyperspt_scroll) /* Scroll amount */ + AM_RANGE(0x1000, 0x10bf) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x10C0, 0x10ff) AM_WRITE(SMH_RAM) AM_BASE(&hyperspt_scroll) /* Scroll amount */ AM_RANGE(0x1400, 0x1400) AM_WRITE(watchdog_reset_w) AM_RANGE(0x1480, 0x1480) AM_WRITE(hyperspt_flipscreen_w) AM_RANGE(0x1481, 0x1481) AM_WRITE(konami_sh_irqtrigger_w) /* cause interrupt on audio CPU */ @@ -166,21 +166,21 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1500, 0x1500) AM_WRITE(soundlatch_w) AM_RANGE(0x2000, 0x27ff) AM_WRITE(hyperspt_videoram_w) AM_BASE(&videoram) AM_RANGE(0x2800, 0x2fff) AM_WRITE(hyperspt_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x3800, 0x3fff) AM_WRITE(MWA8_RAM) AM_BASE(&nvram) AM_SIZE(&nvram_size) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x3800, 0x3fff) AM_WRITE(SMH_RAM) AM_BASE(&nvram) AM_SIZE(&nvram_size) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4fff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0x8000) AM_READ(hyperspt_sh_timer_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x4fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(VLM5030_data_w) /* speech data */ AM_RANGE(0xc000, 0xdfff) AM_WRITE(hyperspt_sound_w) /* speech and output control */ AM_RANGE(0xe000, 0xe000) AM_WRITE(DAC_0_data_w) diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index 903a49167be..403b9761d2f 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -450,137 +450,137 @@ static WRITE16_HANDLER( hyprduel_blitter_w ) ***************************************************************************/ static ADDRESS_MAP_START( hyprduel_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x400000, 0x41ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x420000, 0x43ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x440000, 0x45ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x400000, 0x41ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x420000, 0x43ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x440000, 0x45ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x460000, 0x46ffff) AM_READ(hyprduel_bankedrom_r ) // Banked ROM - AM_RANGE(0x470000, 0x473fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x474000, 0x474fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x475000, 0x477fff) AM_READ(MRA16_RAM ) // (only used memory test) - AM_RANGE(0x478000, 0x4787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x470000, 0x473fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x474000, 0x474fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x475000, 0x477fff) AM_READ(SMH_RAM ) // (only used memory test) + AM_RANGE(0x478000, 0x4787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x4788a2, 0x4788a3) AM_READ(hyprduel_irq_cause_r ) // IRQ Cause - AM_RANGE(0xc00000, 0xc07fff) AM_READ(MRA16_RAM ) // (sound driver controls) + AM_RANGE(0xc00000, 0xc07fff) AM_READ(SMH_RAM ) // (sound driver controls) AM_RANGE(0xe00000, 0xe00001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xe00002, 0xe00003) AM_READ(input_port_1_word_r ) // AM_RANGE(0xe00004, 0xe00005) AM_READ(input_port_2_word_r ) // AM_RANGE(0xe00006, 0xe00007) AM_READ(input_port_3_word_r ) // - AM_RANGE(0xfe0000, 0xffffff) AM_READ(MRA16_RAM ) + AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM ) ADDRESS_MAP_END static ADDRESS_MAP_START( hyprduel_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) AM_RANGE(0x400000, 0x41ffff) AM_WRITE(hyprduel_vram_0_w) AM_BASE(&hyprduel_vram_0 ) // Layer 0 AM_RANGE(0x420000, 0x43ffff) AM_WRITE(hyprduel_vram_1_w) AM_BASE(&hyprduel_vram_1 ) // Layer 1 AM_RANGE(0x440000, 0x45ffff) AM_WRITE(hyprduel_vram_2_w) AM_BASE(&hyprduel_vram_2 ) // Layer 2 AM_RANGE(0x470000, 0x473fff) AM_WRITE(hyprduel_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x474000, 0x474fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x475000, 0x477fff) AM_WRITE(MWA16_RAM ) - AM_RANGE(0x478000, 0x4787ff) AM_WRITE(MWA16_RAM) AM_BASE(&hyprduel_tiletable) AM_SIZE(&hyprduel_tiletable_size ) // Tiles Set + AM_RANGE(0x474000, 0x474fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x475000, 0x477fff) AM_WRITE(SMH_RAM ) + AM_RANGE(0x478000, 0x4787ff) AM_WRITE(SMH_RAM) AM_BASE(&hyprduel_tiletable) AM_SIZE(&hyprduel_tiletable_size ) // Tiles Set AM_RANGE(0x478840, 0x47884d) AM_WRITE(hyprduel_blitter_w) AM_BASE(&hyprduel_blitter_regs ) // Tiles Blitter AM_RANGE(0x478860, 0x47886b) AM_WRITE(hyprduel_window_w) AM_BASE(&hyprduel_window ) // Tilemap Window AM_RANGE(0x478870, 0x47887b) AM_WRITE(hypr_scrollreg_w ) // Scroll Regs AM_RANGE(0x47887c, 0x47887d) AM_WRITE(hypr_scrollreg_init_w ) // scroll regs all sets - AM_RANGE(0x478880, 0x478881) AM_WRITE(MWA16_NOP ) - AM_RANGE(0x478890, 0x478891) AM_WRITE(MWA16_NOP ) - AM_RANGE(0x4788a0, 0x4788a1) AM_WRITE(MWA16_NOP ) + AM_RANGE(0x478880, 0x478881) AM_WRITE(SMH_NOP ) + AM_RANGE(0x478890, 0x478891) AM_WRITE(SMH_NOP ) + AM_RANGE(0x4788a0, 0x4788a1) AM_WRITE(SMH_NOP ) AM_RANGE(0x4788a2, 0x4788a3) AM_WRITE(hyprduel_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x4788a4, 0x4788a5) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_irq_enable ) // IRQ Enable - AM_RANGE(0x4788aa, 0x4788ab) AM_WRITE(MWA16_RAM) AM_BASE(&hyprduel_rombank ) // Rom Bank - AM_RANGE(0x4788ac, 0x4788ad) AM_WRITE(MWA16_RAM) AM_BASE(&hyprduel_screenctrl ) // Screen Control - AM_RANGE(0x479700, 0x479713) AM_WRITE(MWA16_RAM) AM_BASE(&hyprduel_videoregs ) // Video Registers + AM_RANGE(0x4788a4, 0x4788a5) AM_WRITE(SMH_RAM) AM_BASE(&hypr_irq_enable ) // IRQ Enable + AM_RANGE(0x4788aa, 0x4788ab) AM_WRITE(SMH_RAM) AM_BASE(&hyprduel_rombank ) // Rom Bank + AM_RANGE(0x4788ac, 0x4788ad) AM_WRITE(SMH_RAM) AM_BASE(&hyprduel_screenctrl ) // Screen Control + AM_RANGE(0x479700, 0x479713) AM_WRITE(SMH_RAM) AM_BASE(&hyprduel_videoregs ) // Video Registers AM_RANGE(0x800000, 0x800001) AM_WRITE(hypr_subcpu_control_w ) - AM_RANGE(0xc00000, 0xc07fff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sharedram1 ) - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP ) - AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sharedram2 ) + AM_RANGE(0xc00000, 0xc07fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sharedram1 ) + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP ) + AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sharedram2 ) ADDRESS_MAP_END static ADDRESS_MAP_START( hyprduel_readmem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x003fff) AM_READ(MRA16_RAM ) - AM_RANGE(0x004000, 0x007fff) AM_READ(MRA16_RAM ) + AM_RANGE(0x000000, 0x003fff) AM_READ(SMH_RAM ) + AM_RANGE(0x004000, 0x007fff) AM_READ(SMH_RAM ) AM_RANGE(0x400002, 0x400003) AM_READ(YM2151_status_port_0_lsb_r ) AM_RANGE(0x400004, 0x400005) AM_READ(OKIM6295_status_0_lsb_r ) - AM_RANGE(0xc00000, 0xc07fff) AM_READ(MRA16_RAM ) - AM_RANGE(0xfe0000, 0xffffff) AM_READ(MRA16_RAM ) + AM_RANGE(0xc00000, 0xc07fff) AM_READ(SMH_RAM ) + AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM ) ADDRESS_MAP_END static ADDRESS_MAP_START( hyprduel_writemem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x003fff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sub_sharedram1_2 ) // shadow ($c00000 - $c03fff : vector, write ok) - AM_RANGE(0x004000, 0x007fff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sub_sharedram2_2 ) // shadow ($fe4000 - $fe7fff : read only) + AM_RANGE(0x000000, 0x003fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram1_2 ) // shadow ($c00000 - $c03fff : vector, write ok) + AM_RANGE(0x004000, 0x007fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram2_2 ) // shadow ($fe4000 - $fe7fff : read only) AM_RANGE(0x400000, 0x400001) AM_WRITE(YM2151_register_port_0_lsb_w ) AM_RANGE(0x400002, 0x400003) AM_WRITE(YM2151_data_port_0_lsb_w ) AM_RANGE(0x400004, 0x400005) AM_WRITE(OKIM6295_data_0_lsb_w ) - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_NOP ) - AM_RANGE(0xc00000, 0xc07fff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sub_sharedram1_1 ) // (sound driver) - AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sub_sharedram2_1 ) + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP ) + AM_RANGE(0xc00000, 0xc07fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram1_1 ) // (sound driver) + AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram2_1 ) ADDRESS_MAP_END /* Magical Error - video is at 8x now */ static ADDRESS_MAP_START( magerror_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x800000, 0x81ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x820000, 0x83ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x840000, 0x85ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x800000, 0x81ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x820000, 0x83ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x840000, 0x85ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x860000, 0x86ffff) AM_READ(hyprduel_bankedrom_r ) // Banked ROM - AM_RANGE(0x870000, 0x873fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x875000, 0x877fff) AM_READ(MRA16_RAM ) // (only used memory test) - AM_RANGE(0x878000, 0x8787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x870000, 0x873fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x874000, 0x874fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x875000, 0x877fff) AM_READ(SMH_RAM ) // (only used memory test) + AM_RANGE(0x878000, 0x8787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x8788a2, 0x8788a3) AM_READ(hyprduel_irq_cause_r ) // IRQ Cause - AM_RANGE(0xc00000, 0xc1ffff) AM_READ(MRA16_RAM ) // (sound driver controls) ? + AM_RANGE(0xc00000, 0xc1ffff) AM_READ(SMH_RAM ) // (sound driver controls) ? AM_RANGE(0xe00000, 0xe00001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xe00002, 0xe00003) AM_READ(input_port_1_word_r ) // AM_RANGE(0xe00004, 0xe00005) AM_READ(input_port_2_word_r ) // AM_RANGE(0xe00006, 0xe00007) AM_READ(input_port_3_word_r ) // - AM_RANGE(0xfe0000, 0xffffff) AM_READ(MRA16_RAM ) + AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM ) ADDRESS_MAP_END static ADDRESS_MAP_START( magerror_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) AM_RANGE(0x800000, 0x81ffff) AM_WRITE(hyprduel_vram_0_w) AM_BASE(&hyprduel_vram_0 ) // Layer 0 AM_RANGE(0x820000, 0x83ffff) AM_WRITE(hyprduel_vram_1_w) AM_BASE(&hyprduel_vram_1 ) // Layer 1 AM_RANGE(0x840000, 0x85ffff) AM_WRITE(hyprduel_vram_2_w) AM_BASE(&hyprduel_vram_2 ) // Layer 2 AM_RANGE(0x870000, 0x873fff) AM_WRITE(hyprduel_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x875000, 0x877fff) AM_WRITE(MWA16_RAM ) - AM_RANGE(0x878000, 0x8787ff) AM_WRITE(MWA16_RAM) AM_BASE(&hyprduel_tiletable) AM_SIZE(&hyprduel_tiletable_size ) // Tiles Set + AM_RANGE(0x874000, 0x874fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x875000, 0x877fff) AM_WRITE(SMH_RAM ) + AM_RANGE(0x878000, 0x8787ff) AM_WRITE(SMH_RAM) AM_BASE(&hyprduel_tiletable) AM_SIZE(&hyprduel_tiletable_size ) // Tiles Set AM_RANGE(0x878840, 0x87884d) AM_WRITE(hyprduel_blitter_w) AM_BASE(&hyprduel_blitter_regs ) // Tiles Blitter AM_RANGE(0x878860, 0x87886b) AM_WRITE(hyprduel_window_w) AM_BASE(&hyprduel_window ) // Tilemap Window AM_RANGE(0x878870, 0x87887b) AM_WRITE(hypr_scrollreg_w ) // Scroll Regs AM_RANGE(0x87887c, 0x87887d) AM_WRITE(hypr_scrollreg_init_w ) // scroll regs all sets - AM_RANGE(0x878880, 0x878881) AM_WRITE(MWA16_NOP ) - AM_RANGE(0x878890, 0x878891) AM_WRITE(MWA16_NOP ) - AM_RANGE(0x8788a0, 0x8788a1) AM_WRITE(MWA16_NOP ) + AM_RANGE(0x878880, 0x878881) AM_WRITE(SMH_NOP ) + AM_RANGE(0x878890, 0x878891) AM_WRITE(SMH_NOP ) + AM_RANGE(0x8788a0, 0x8788a1) AM_WRITE(SMH_NOP ) AM_RANGE(0x8788a2, 0x8788a3) AM_WRITE(hyprduel_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_irq_enable ) // IRQ Enable - AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(MWA16_RAM) AM_BASE(&hyprduel_rombank ) // Rom Bank - AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(MWA16_RAM) AM_BASE(&hyprduel_screenctrl ) // Screen Control - AM_RANGE(0x879700, 0x879713) AM_WRITE(MWA16_RAM) AM_BASE(&hyprduel_videoregs ) // Video Registers + AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(SMH_RAM) AM_BASE(&hypr_irq_enable ) // IRQ Enable + AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(SMH_RAM) AM_BASE(&hyprduel_rombank ) // Rom Bank + AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(SMH_RAM) AM_BASE(&hyprduel_screenctrl ) // Screen Control + AM_RANGE(0x879700, 0x879713) AM_WRITE(SMH_RAM) AM_BASE(&hyprduel_videoregs ) // Video Registers AM_RANGE(0x400000, 0x400001) AM_WRITE(hypr_subcpu_control_w ) - AM_RANGE(0xc00000, 0xc1ffff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sharedram1 ) //? - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP ) - AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sharedram2 ) + AM_RANGE(0xc00000, 0xc1ffff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sharedram1 ) //? + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP ) + AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sharedram2 ) ADDRESS_MAP_END static ADDRESS_MAP_START( magerror_readmem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x003fff) AM_READ(MRA16_RAM ) - AM_RANGE(0x004000, 0x007fff) AM_READ(MRA16_RAM ) + AM_RANGE(0x000000, 0x003fff) AM_READ(SMH_RAM ) + AM_RANGE(0x004000, 0x007fff) AM_READ(SMH_RAM ) // AM_RANGE(0x400002, 0x400003) AM_READ(YM2151_status_port_0_lsb_r ) AM_RANGE(0x400004, 0x400005) AM_READ(OKIM6295_status_0_lsb_r ) - AM_RANGE(0xc00000, 0xc07fff) AM_READ(MRA16_RAM ) - AM_RANGE(0xfe0000, 0xffffff) AM_READ(MRA16_RAM ) + AM_RANGE(0xc00000, 0xc07fff) AM_READ(SMH_RAM ) + AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM ) ADDRESS_MAP_END static ADDRESS_MAP_START( magerror_writemem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x003fff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sub_sharedram1_2 ) // shadow ($c00000 - $c03fff : vector, write ok) - AM_RANGE(0x004000, 0x007fff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sub_sharedram2_2 ) // shadow ($fe4000 - $fe7fff : read only) + AM_RANGE(0x000000, 0x003fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram1_2 ) // shadow ($c00000 - $c03fff : vector, write ok) + AM_RANGE(0x004000, 0x007fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram2_2 ) // shadow ($fe4000 - $fe7fff : read only) AM_RANGE(0x400000, 0x400001) AM_WRITE(YM2413_register_port_0_lsb_w ) AM_RANGE(0x400002, 0x400003) AM_WRITE(YM2413_data_port_0_lsb_w ) AM_RANGE(0x400004, 0x400005) AM_WRITE(OKIM6295_data_0_lsb_w ) - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_NOP ) - AM_RANGE(0xc00000, 0xc07fff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sub_sharedram1_1 ) // (sound driver) - AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&hypr_sub_sharedram2_1 ) + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP ) + AM_RANGE(0xc00000, 0xc07fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram1_1 ) // (sound driver) + AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram2_1 ) ADDRESS_MAP_END diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c index 9f81cba8bb4..c8c8a2285ff 100644 --- a/src/mame/drivers/igs_blit.c +++ b/src/mame/drivers/igs_blit.c @@ -1023,18 +1023,18 @@ static WRITE16_HANDLER( igs_YM3812_write_port_0_w ) } static ADDRESS_MAP_START( chindrag_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM) AM_RANGE(0x500000, 0x500001) AM_READ(input_port_3_word_r) AM_RANGE(0x600000, 0x600001) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0x800002, 0x800003) AM_READ(chindrag_magic_r) AM_RANGE(0xa88000, 0xa88001) AM_READ(igs_3_input_r) ADDRESS_MAP_END static ADDRESS_MAP_START( chindrag_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x200000, 0x200fff) AM_WRITE(MWA16_RAM) AM_BASE(&igs_priority_ram) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x200000, 0x200fff) AM_WRITE(SMH_RAM) AM_BASE(&igs_priority_ram) AM_RANGE(0x400000, 0x401fff) AM_WRITE(igs_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x600000, 0x600001) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x700000, 0x700001) AM_WRITE(igs_YM3812_control_port_0_w) @@ -1056,22 +1056,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( chmplst2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0x208002, 0x208003) AM_READ(chmplst2_magic_r) - AM_RANGE(0x20c000, 0x20cfff) AM_READ(MRA16_RAM) - AM_RANGE(0x210000, 0x211fff) AM_READ(MRA16_RAM) + AM_RANGE(0x20c000, 0x20cfff) AM_READ(SMH_RAM) + AM_RANGE(0x210000, 0x211fff) AM_READ(SMH_RAM) AM_RANGE(0x214000, 0x214001) AM_READ(input_port_3_word_r) AM_RANGE(0xa88000, 0xa88001) AM_READ(igs_3_input_r) ADDRESS_MAP_END static ADDRESS_MAP_START( chmplst2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x200000, 0x200001) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x204000, 0x204001) AM_WRITE(YM2413_register_port_0_lsb_w ) AM_RANGE(0x204002, 0x204003) AM_WRITE(YM2413_data_port_0_lsb_w ) AM_RANGE(0x208000, 0x208003) AM_WRITE(chmplst2_magic_w) - AM_RANGE(0x20c000, 0x20cfff) AM_WRITE(MWA16_RAM) AM_BASE(&igs_priority_ram) + AM_RANGE(0x20c000, 0x20cfff) AM_WRITE(SMH_RAM) AM_BASE(&igs_priority_ram) AM_RANGE(0x210000, 0x211fff) AM_WRITE(igs_palette_w) AM_BASE(&paletteram16) AM_RANGE(0xa20000, 0xa20001) AM_WRITE(igs_priority_w) AM_RANGE(0xa40000, 0xa40001) AM_WRITE(igs_3_input_w) @@ -1089,18 +1089,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( grtwall_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM) AM_RANGE(0x520000, 0x520001) AM_READ(input_port_4_word_r) AM_RANGE(0x600000, 0x600001) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0x800002, 0x800003) AM_READ(grtwall_magic_r) AM_RANGE(0xa88000, 0xa88001) AM_READ(igs_4_input_r) ADDRESS_MAP_END static ADDRESS_MAP_START( grtwall_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x200000, 0x200fff) AM_WRITE(MWA16_RAM) AM_BASE(&igs_priority_ram) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x200000, 0x200fff) AM_WRITE(SMH_RAM) AM_BASE(&igs_priority_ram) AM_RANGE(0x400000, 0x401fff) AM_WRITE(igs_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x600000, 0x600001) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x800000, 0x800003) AM_WRITE(grtwall_magic_w) @@ -1120,11 +1120,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lhb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x3fffff) AM_READ(igs_layers_r) - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA16_RAM) + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM) AM_RANGE(0x600000, 0x600001) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0x700000, 0x700001) AM_READ(input_port_5_word_r) AM_RANGE(0x700002, 0x700005) AM_READ(lhb_input2_r) @@ -1132,8 +1132,8 @@ static ADDRESS_MAP_START( lhb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( lhb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x010000, 0x010001) AM_WRITE(lhb_okibank_w) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x200000, 0x200fff) AM_WRITE(MWA16_RAM) AM_BASE(&igs_priority_ram) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x200000, 0x200fff) AM_WRITE(SMH_RAM) AM_BASE(&igs_priority_ram) AM_RANGE(0x300000, 0x3fffff) AM_WRITE(igs_layers_w) AM_RANGE(0x400000, 0x401fff) AM_WRITE(igs_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x600000, 0x600001) AM_WRITE(OKIM6295_data_0_lsb_w) @@ -1214,14 +1214,14 @@ static WRITE16_HANDLER( vbowl_link_2_w ) { } static WRITE16_HANDLER( vbowl_link_3_w ) { } static ADDRESS_MAP_START( vbowl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x3fffff) AM_READ(igs_layers_r) - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA16_RAM) + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM) AM_RANGE(0x520000, 0x520001) AM_READ(input_port_4_word_r) AM_RANGE(0x600000, 0x600007) AM_READ(ics2115_0_word_r) - AM_RANGE(0x700000, 0x700003) AM_READ(MRA16_RAM) + AM_RANGE(0x700000, 0x700003) AM_READ(SMH_RAM) AM_RANGE(0x800002, 0x800003) AM_READ(vbowl_magic_r) AM_RANGE(0xa88000, 0xa88001) AM_READ(igs_4_input_r) @@ -1231,12 +1231,12 @@ static ADDRESS_MAP_START( vbowl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( vbowl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x200000, 0x200fff) AM_WRITE(MWA16_RAM) AM_BASE(&igs_priority_ram) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x200000, 0x200fff) AM_WRITE(SMH_RAM) AM_BASE(&igs_priority_ram) AM_RANGE(0x300000, 0x3fffff) AM_WRITE(igs_layers_w) AM_RANGE(0x400000, 0x401fff) AM_WRITE(igs_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x600000, 0x600007) AM_WRITE(ics2115_0_word_w) - AM_RANGE(0x700000, 0x700003) AM_WRITE(MWA16_RAM) AM_BASE(&vbowl_trackball) + AM_RANGE(0x700000, 0x700003) AM_WRITE(SMH_RAM) AM_BASE(&vbowl_trackball) AM_RANGE(0x700004, 0x700005) AM_WRITE(vbowl_pen_hi_w) AM_RANGE(0x800000, 0x800003) AM_WRITE(vbowl_magic_w) @@ -1261,19 +1261,19 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( xymg_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM) AM_RANGE(0x600000, 0x600001) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0x700002, 0x700003) AM_READ(xymg_magic_r) AM_RANGE(0x888000, 0x888001) AM_READ(igs_3_input_r) - AM_RANGE(0x1f0000, 0x1f3fff) AM_READ(MRA16_RAM) + AM_RANGE(0x1f0000, 0x1f3fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( xymg_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x010000, 0x010001) AM_WRITE(lhb_okibank_w) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x200000, 0x200fff) AM_WRITE(MWA16_RAM) AM_BASE(&igs_priority_ram) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x200000, 0x200fff) AM_WRITE(SMH_RAM) AM_BASE(&igs_priority_ram) AM_RANGE(0x400000, 0x401fff) AM_WRITE(igs_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x600000, 0x600001) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x700000, 0x700003) AM_WRITE(xymg_magic_w) @@ -1288,7 +1288,7 @@ static ADDRESS_MAP_START( xymg_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x85b000, 0x85b001) AM_WRITE(igs_blit_flags_w) AM_RANGE(0x85b800, 0x85b801) AM_WRITE(igs_blit_pen_w) AM_RANGE(0x85c000, 0x85c001) AM_WRITE(igs_blit_depth_w) - AM_RANGE(0x1f0000, 0x1f3fff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) // extra ram + AM_RANGE(0x1f0000, 0x1f3fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) // extra ram ADDRESS_MAP_END diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index 4d632408c8c..85cb9b419ec 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -173,11 +173,11 @@ static ADDRESS_MAP_START( igs_majhong_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x10000000, 0x100003ff) AM_RAM AM_BASE(&igs_mainram)// main ram for asic? AM_RANGE(0x18000000, 0x18007fff) AM_RAM - AM_RANGE(0x38001000, 0x380017ff) AM_READWRITE(MRA32_RAM, igs_cg_videoram_w) AM_BASE(&igs_cg_videoram) //0x200 * 1 CG PALLETE? - AM_RANGE(0x38001800, 0x38001fff) AM_READWRITE(MRA32_RAM, igs_pallete32_w) AM_BASE(&igs_pallete32) //0x200 * 1 + AM_RANGE(0x38001000, 0x380017ff) AM_READWRITE(SMH_RAM, igs_cg_videoram_w) AM_BASE(&igs_cg_videoram) //0x200 * 1 CG PALLETE? + AM_RANGE(0x38001800, 0x38001fff) AM_READWRITE(SMH_RAM, igs_pallete32_w) AM_BASE(&igs_pallete32) //0x200 * 1 - AM_RANGE(0x38004000, 0x38005FFF) AM_READWRITE(MRA32_RAM, igs_tx_videoram_w) AM_BASE(&igs_tx_videoram) /* Text Layer */ - AM_RANGE(0x38006000, 0x38007FFF) AM_READWRITE(MRA32_RAM, igs_bg_videoram_w) AM_BASE(&igs_bg_videoram) /* CG Layer */ + AM_RANGE(0x38004000, 0x38005FFF) AM_READWRITE(SMH_RAM, igs_tx_videoram_w) AM_BASE(&igs_tx_videoram) /* Text Layer */ + AM_RANGE(0x38006000, 0x38007FFF) AM_READWRITE(SMH_RAM, igs_bg_videoram_w) AM_BASE(&igs_bg_videoram) /* CG Layer */ AM_RANGE(0x38002010, 0x38002017) AM_RAM //?????????????? diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c index 59ba30eff8c..d5a04f2ebb9 100644 --- a/src/mame/drivers/ikki.c +++ b/src/mame/drivers/ikki.c @@ -54,7 +54,7 @@ static ADDRESS_MAP_START( ikki_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe005, 0xe005) AM_READ(input_port_3_r) /* player2 */ AM_RANGE(0xe008, 0xe008) AM_WRITE(ikki_scrn_ctrl_w) AM_RANGE(0xe009, 0xe009) AM_WRITE(ikki_coin_counters) - AM_RANGE(0xe00a, 0xe00b) AM_WRITE(MWA8_RAM) AM_BASE(&ikki_scroll) + AM_RANGE(0xe00a, 0xe00b) AM_WRITE(SMH_RAM) AM_BASE(&ikki_scroll) ADDRESS_MAP_END static ADDRESS_MAP_START( ikki_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index c07a3b2b550..7aeb6df836d 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -321,10 +321,10 @@ static ADDRESS_MAP_START( readport_master, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( imolagp_master, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_RANGE(0x2800, 0x2800) AM_READ(input_port_2_r) /* gas */ - AM_RANGE(0x2802, 0x2802) AM_READ(steerlatch_r) AM_WRITE(MWA8_NOP) + AM_RANGE(0x2802, 0x2802) AM_READ(steerlatch_r) AM_WRITE(SMH_NOP) /* AM_RANGE(0x2803, 0x2803) ? */ AM_RANGE(0x3000, 0x3000) AM_WRITE(vreg_control_w) AM_RANGE(0x37f0, 0x37f0) AM_WRITE(AY8910_control_port_0_w) @@ -346,11 +346,11 @@ static ADDRESS_MAP_START( readport_slave, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( imolagp_slave, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READ(MRA8_ROM) - AM_RANGE(0x0800, 0x0bff) AM_READ(MRA8_ROM) - AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_ROM) - AM_RANGE(0x1c00, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) AM_BASE(&slave_workram) + AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_ROM) + AM_RANGE(0x0800, 0x0bff) AM_READ(SMH_ROM) + AM_RANGE(0x1000, 0x13ff) AM_READ(SMH_ROM) + AM_RANGE(0x1c00, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&slave_workram) AM_RANGE(0x9fff, 0xa000) AM_READ(receive_data_r) AM_RANGE(0xc000, 0xffff) AM_WRITE(screenram_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c index c1c3d7bc4a4..0517502b409 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -22,17 +22,17 @@ static READ8_HANDLER( unk_r ) static UINT8 *intrscti_ram; static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x67ff) AM_READ(MRA8_RAM) - AM_RANGE(0x7000, 0x77ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM) + AM_RANGE(0x7000, 0x77ff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x67ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x7000, 0x77ff) AM_WRITE(MWA8_RAM) AM_BASE(&intrscti_ram) // video ram - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x67ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x7000, 0x77ff) AM_WRITE(SMH_RAM) AM_BASE(&intrscti_ram) // video ram + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index ecbddf2ba10..85686301844 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -184,7 +184,7 @@ static WRITE16_HANDLER( inufuku_eeprom_w ) ******************************************************************************/ static ADDRESS_MAP_START( inufuku_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) // main rom + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) // main rom AM_RANGE(0x180000, 0x180001) AM_READ(input_port_0_word_r) AM_RANGE(0x180002, 0x180003) AM_READ(input_port_1_word_r) @@ -193,36 +193,36 @@ static ADDRESS_MAP_START( inufuku_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x180008, 0x180009) AM_READ(inufuku_eeprom_r) // eeprom + input_port_4_word_r AM_RANGE(0x18000a, 0x18000b) AM_READ(input_port_5_word_r) - AM_RANGE(0x300000, 0x301fff) AM_READ(MRA16_RAM) // palette ram + AM_RANGE(0x300000, 0x301fff) AM_READ(SMH_RAM) // palette ram AM_RANGE(0x400000, 0x401fff) AM_READ(inufuku_bg_videoram_r) // bg ram AM_RANGE(0x402000, 0x403fff) AM_READ(inufuku_text_videoram_r)// text ram - AM_RANGE(0x580000, 0x580fff) AM_READ(MRA16_RAM) // sprite table + sprite attribute - AM_RANGE(0x600000, 0x61ffff) AM_READ(MRA16_RAM) // cell table + AM_RANGE(0x580000, 0x580fff) AM_READ(SMH_RAM) // sprite table + sprite attribute + AM_RANGE(0x600000, 0x61ffff) AM_READ(SMH_RAM) // cell table - AM_RANGE(0x800000, 0xbfffff) AM_READ(MRA16_ROM) // data rom - AM_RANGE(0xfd0000, 0xfdffff) AM_READ(MRA16_RAM) // work ram + AM_RANGE(0x800000, 0xbfffff) AM_READ(SMH_ROM) // data rom + AM_RANGE(0xfd0000, 0xfdffff) AM_READ(SMH_RAM) // work ram ADDRESS_MAP_END static ADDRESS_MAP_START( inufuku_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) // main rom + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) // main rom - AM_RANGE(0x100000, 0x100007) AM_WRITE(MWA16_NOP) // ? + AM_RANGE(0x100000, 0x100007) AM_WRITE(SMH_NOP) // ? AM_RANGE(0x200000, 0x200001) AM_WRITE(inufuku_eeprom_w) // eeprom AM_RANGE(0x280000, 0x280001) AM_WRITE(inufuku_soundcommand_w) // sound command AM_RANGE(0x300000, 0x301fff) AM_WRITE(paletteram16_xGGGGGBBBBBRRRRR_word_w) AM_BASE(&paletteram16) // palette ram - AM_RANGE(0x380000, 0x3801ff) AM_WRITE(MWA16_RAM) AM_BASE(&inufuku_bg_rasterram) // bg raster ram + AM_RANGE(0x380000, 0x3801ff) AM_WRITE(SMH_RAM) AM_BASE(&inufuku_bg_rasterram) // bg raster ram AM_RANGE(0x400000, 0x401fff) AM_WRITE(inufuku_bg_videoram_w) AM_BASE(&inufuku_bg_videoram) // bg ram AM_RANGE(0x402000, 0x403fff) AM_WRITE(inufuku_text_videoram_w) AM_BASE(&inufuku_text_videoram) // text ram - AM_RANGE(0x580000, 0x580fff) AM_WRITE(MWA16_RAM) AM_BASE(&inufuku_spriteram1) AM_SIZE(&inufuku_spriteram1_size) // sprite table + sprite attribute - AM_RANGE(0x600000, 0x61ffff) AM_WRITE(MWA16_RAM) AM_BASE(&inufuku_spriteram2) // cell table + AM_RANGE(0x580000, 0x580fff) AM_WRITE(SMH_RAM) AM_BASE(&inufuku_spriteram1) AM_SIZE(&inufuku_spriteram1_size) // sprite table + sprite attribute + AM_RANGE(0x600000, 0x61ffff) AM_WRITE(SMH_RAM) AM_BASE(&inufuku_spriteram2) // cell table AM_RANGE(0x780000, 0x780013) AM_WRITE(inufuku_palettereg_w) // bg & text palettebank register AM_RANGE(0x7a0000, 0x7a0023) AM_WRITE(inufuku_scrollreg_w) // bg & text scroll register - AM_RANGE(0x7e0000, 0x7e0001) AM_WRITE(MWA16_NOP) // ? + AM_RANGE(0x7e0000, 0x7e0001) AM_WRITE(SMH_NOP) // ? - AM_RANGE(0x800000, 0xbfffff) AM_WRITE(MWA16_ROM) // data rom - AM_RANGE(0xfd0000, 0xfdffff) AM_WRITE(MWA16_RAM) // work ram + AM_RANGE(0x800000, 0xbfffff) AM_WRITE(SMH_ROM) // data rom + AM_RANGE(0xfd0000, 0xfdffff) AM_WRITE(SMH_RAM) // work ram ADDRESS_MAP_END @@ -233,15 +233,15 @@ ADDRESS_MAP_END ******************************************************************************/ static ADDRESS_MAP_START( inufuku_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( inufuku_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( inufuku_readport_sound, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c index 435b13dbc7a..dc485542aff 100644 --- a/src/mame/drivers/irobot.c +++ b/src/mame/drivers/irobot.c @@ -121,25 +121,25 @@ static WRITE8_HANDLER( irobot_clearfirq_w ) *************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) - AM_RANGE(0x0800, 0x0fff) AM_READ(MRA8_BANK2) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) + AM_RANGE(0x0800, 0x0fff) AM_READ(SMH_BANK2) AM_RANGE(0x1000, 0x103f) AM_READ(input_port_0_r) AM_RANGE(0x1040, 0x1040) AM_READ(input_port_1_r) AM_RANGE(0x1080, 0x1080) AM_READ(irobot_status_r) AM_RANGE(0x10c0, 0x10c0) AM_READ(input_port_3_r) - AM_RANGE(0x1200, 0x12ff) AM_READ(MRA8_RAM) + AM_RANGE(0x1200, 0x12ff) AM_READ(SMH_RAM) AM_RANGE(0x1300, 0x13ff) AM_READ(irobot_control_r) AM_RANGE(0x1400, 0x143f) AM_READ(quad_pokey_r) - AM_RANGE(0x1c00, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x1c00, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x3fff) AM_READ(irobot_sharedmem_r) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_BANK1) + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0800, 0x0fff) AM_WRITE(MWA8_BANK2) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x0800, 0x0fff) AM_WRITE(SMH_BANK2) AM_RANGE(0x1100, 0x1100) AM_WRITE(irobot_clearirq_w) AM_RANGE(0x1140, 0x1140) AM_WRITE(irobot_statwr_w) AM_RANGE(0x1180, 0x1180) AM_WRITE(irobot_out0_w) @@ -147,12 +147,12 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1200, 0x12ff) AM_WRITE(irobot_nvram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x1400, 0x143f) AM_WRITE(quad_pokey_w) AM_RANGE(0x1800, 0x18ff) AM_WRITE(irobot_paletteram_w) - AM_RANGE(0x1900, 0x19ff) AM_WRITE(MWA8_RAM) /* Watchdog reset */ + AM_RANGE(0x1900, 0x19ff) AM_WRITE(SMH_RAM) /* Watchdog reset */ AM_RANGE(0x1a00, 0x1a00) AM_WRITE(irobot_clearfirq_w) AM_RANGE(0x1b00, 0x1bff) AM_WRITE(irobot_control_w) - AM_RANGE(0x1c00, 0x1fff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x1c00, 0x1fff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x2000, 0x3fff) AM_WRITE(irobot_sharedmem_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index 83cc79be2d7..9db6072bd62 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -858,7 +858,7 @@ static ADDRESS_MAP_START( timekill_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x078000, 0x078001) AM_WRITE(sound_data_w) AM_RANGE(0x080000, 0x08007f) AM_READWRITE(itech32_video_r, itech32_video_w) AM_BASE(&itech32_video) AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(int1_ack_w) - AM_RANGE(0x0c0000, 0x0c7fff) AM_READWRITE(MRA16_RAM, timekill_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x0c0000, 0x0c7fff) AM_READWRITE(SMH_RAM, timekill_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x100000, 0x17ffff) AM_ROM AM_REGION(REGION_USER1, 0) AM_BASE(&main_rom) ADDRESS_MAP_END @@ -876,7 +876,7 @@ static ADDRESS_MAP_START( bloodstm_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x480000, 0x480001) AM_WRITE(sound_data_w) AM_RANGE(0x500000, 0x5000ff) AM_READWRITE(bloodstm_video_r, bloodstm_video_w) AM_BASE(&itech32_video) - AM_RANGE(0x580000, 0x59ffff) AM_READWRITE(MRA16_RAM, bloodstm_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x580000, 0x59ffff) AM_READWRITE(SMH_RAM, bloodstm_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x700000, 0x700001) AM_WRITE(bloodstm_plane_w) AM_RANGE(0x780000, 0x780001) AM_READ(input_port_5_word_r) AM_RANGE(0x800000, 0x87ffff) AM_MIRROR(0x780000) AM_ROM AM_REGION(REGION_USER1, 0) AM_BASE(&main_rom) @@ -936,31 +936,31 @@ AM_RANGE(0x000c00, 0x007fff) AM_MIRROR(0x40000) AM_READWRITE(test2_r, test2_w) AM_RANGE(0x084000, 0x084003) AM_READWRITE(sound_data32_r, sound_data32_w) // AM_RANGE(0x086000, 0x08623f) AM_RAM -- networking -- first 0x40 bytes = our data, next 0x40*8 bytes = their data, r/w on IRQ2 AM_RANGE(0x088000, 0x088003) AM_READ(drivedge_steering_r) - AM_RANGE(0x08a000, 0x08a003) AM_READWRITE(drivedge_gas_r, MWA32_NOP) - AM_RANGE(0x08c000, 0x08c003) AM_READWRITE(input_port_0_msw_r, MWA32_NOP) - AM_RANGE(0x08e000, 0x08e003) AM_READWRITE(input_port_1_msw_r, MWA32_NOP) + AM_RANGE(0x08a000, 0x08a003) AM_READWRITE(drivedge_gas_r, SMH_NOP) + AM_RANGE(0x08c000, 0x08c003) AM_READWRITE(input_port_0_msw_r, SMH_NOP) + AM_RANGE(0x08e000, 0x08e003) AM_READWRITE(input_port_1_msw_r, SMH_NOP) AM_RANGE(0x100000, 0x10000f) AM_WRITE(drivedge_zbuf_control_w) AM_BASE(&drivedge_zbuf_control) AM_RANGE(0x180000, 0x180003) AM_WRITE(drivedge_color0_w) - AM_RANGE(0x1a0000, 0x1bffff) AM_READWRITE(MRA32_RAM, drivedge_paletteram_w) AM_BASE(&paletteram32) + AM_RANGE(0x1a0000, 0x1bffff) AM_READWRITE(SMH_RAM, drivedge_paletteram_w) AM_BASE(&paletteram32) AM_RANGE(0x1c0000, 0x1c0003) AM_WRITENOP AM_RANGE(0x1e0000, 0x1e0113) AM_READWRITE(itech020_video_r, itech020_video_w) AM_BASE((UINT32 **)&itech32_video) AM_RANGE(0x1e4000, 0x1e4003) AM_WRITE(tms_reset_assert_w) AM_RANGE(0x1ec000, 0x1ec003) AM_WRITE(tms_reset_clear_w) AM_RANGE(0x200000, 0x200003) AM_READ(input_port_2_msw_r) - AM_RANGE(0x280000, 0x280fff) AM_READWRITE(MRA32_RAM, tms1_68k_ram_w) AM_SHARE(1) - AM_RANGE(0x300000, 0x300fff) AM_READWRITE(MRA32_RAM, tms2_68k_ram_w) AM_SHARE(2) + AM_RANGE(0x280000, 0x280fff) AM_READWRITE(SMH_RAM, tms1_68k_ram_w) AM_SHARE(1) + AM_RANGE(0x300000, 0x300fff) AM_READWRITE(SMH_RAM, tms2_68k_ram_w) AM_SHARE(2) AM_RANGE(0x380000, 0x380003) AM_WRITENOP // AM_WRITE(watchdog_reset16_w) AM_RANGE(0x600000, 0x607fff) AM_ROM AM_REGION(REGION_USER1, 0) AM_BASE((UINT32 **)&main_rom) ADDRESS_MAP_END static ADDRESS_MAP_START( drivedge_tms1_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x001fff) AM_RAM AM_BASE(&tms1_boot) - AM_RANGE(0x008000, 0x0083ff) AM_MIRROR(0x400) AM_READWRITE(MRA32_RAM, tms1_trigger_w) AM_SHARE(1) AM_BASE(&tms1_ram) + AM_RANGE(0x008000, 0x0083ff) AM_MIRROR(0x400) AM_READWRITE(SMH_RAM, tms1_trigger_w) AM_SHARE(1) AM_BASE(&tms1_ram) AM_RANGE(0x080000, 0x0bffff) AM_RAM ADDRESS_MAP_END static ADDRESS_MAP_START( drivedge_tms2_map, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x008000, 0x0083ff) AM_MIRROR(0x8400) AM_READWRITE(MRA32_RAM, tms2_trigger_w) AM_SHARE(2) AM_BASE(&tms2_ram) + AM_RANGE(0x008000, 0x0083ff) AM_MIRROR(0x8400) AM_READWRITE(SMH_RAM, tms2_trigger_w) AM_SHARE(2) AM_BASE(&tms2_ram) AM_RANGE(0x080000, 0x08ffff) AM_RAM ADDRESS_MAP_END @@ -979,11 +979,11 @@ static ADDRESS_MAP_START( itech020_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x480000, 0x480003) AM_WRITE(sound_data32_w) AM_RANGE(0x500000, 0x5000ff) AM_READWRITE(itech020_video_r, itech020_video_w) AM_BASE((UINT32 **)&itech32_video) AM_RANGE(0x578000, 0x57ffff) AM_READNOP /* touched by protection */ - AM_RANGE(0x580000, 0x59ffff) AM_READWRITE(MRA32_RAM, itech020_paletteram_w) AM_BASE(&paletteram32) + AM_RANGE(0x580000, 0x59ffff) AM_READWRITE(SMH_RAM, itech020_paletteram_w) AM_BASE(&paletteram32) AM_RANGE(0x600000, 0x603fff) AM_RAM AM_BASE(&nvram) AM_SIZE(&nvram_size) /* ? */ AM_RANGE(0x61ff00, 0x61ffff) AM_WRITENOP /* Unknown Writes */ - AM_RANGE(0x680000, 0x680003) AM_READWRITE(itech020_prot_result_r, MWA32_NOP) -/* ! */ AM_RANGE(0x680800, 0x68083f) AM_READWRITE(MRA32_RAM, MWA32_NOP) /* Serial DUART Channel A/B & Top LED sign - To Do! */ + AM_RANGE(0x680000, 0x680003) AM_READWRITE(itech020_prot_result_r, SMH_NOP) +/* ! */ AM_RANGE(0x680800, 0x68083f) AM_READWRITE(SMH_RAM, SMH_NOP) /* Serial DUART Channel A/B & Top LED sign - To Do! */ AM_RANGE(0x700000, 0x700003) AM_WRITE(itech020_plane_w) AM_RANGE(0x800000, 0xbfffff) AM_ROM AM_REGION(REGION_USER1, 0) AM_BASE((UINT32 **)&main_rom) ADDRESS_MAP_END @@ -1017,7 +1017,7 @@ static ADDRESS_MAP_START( sound_020_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_READWRITE(ES5506_data_0_r, ES5506_data_0_w) AM_RANGE(0x0c00, 0x0c00) AM_WRITE(sound_bank_w) AM_RANGE(0x1400, 0x1400) AM_WRITE(firq_clear_w) - AM_RANGE(0x1800, 0x1800) AM_READWRITE(sound_data_buffer_r, MWA8_NOP) + 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(0x8000, 0xffff) AM_ROM @@ -3742,9 +3742,9 @@ static DRIVER_INIT( wcbowl ) memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x680000, 0x680001, 0, 0, trackball_r); - memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x578000, 0x57ffff, 0, 0, MRA16_NOP); + memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x578000, 0x57ffff, 0, 0, SMH_NOP); memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x680080, 0x680081, 0, 0, wcbowl_prot_result_r); - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x680080, 0x680081, 0, 0, MWA16_NOP); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x680080, 0x680081, 0, 0, SMH_NOP); } diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index dc9bff954a8..05b2a409bdd 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -933,7 +933,7 @@ static ADDRESS_MAP_START( tmslo_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READWRITE(itech8_tms34061_r, itech8_tms34061_w) AM_RANGE(0x1100, 0x1100) AM_WRITENOP AM_RANGE(0x1120, 0x1120) AM_WRITE(sound_data_w) - AM_RANGE(0x1140, 0x1140) AM_READWRITE(special_port0_r, MWA8_RAM) AM_BASE(&itech8_grom_bank) + AM_RANGE(0x1140, 0x1140) AM_READWRITE(special_port0_r, SMH_RAM) AM_BASE(&itech8_grom_bank) AM_RANGE(0x1160, 0x1160) AM_READWRITE(input_port_1_r, itech8_page_w) AM_RANGE(0x1180, 0x1180) AM_READWRITE(input_port_2_r, tms34061_latch_w) AM_RANGE(0x11a0, 0x11a0) AM_WRITE(itech8_nmi_ack_w) @@ -949,7 +949,7 @@ static ADDRESS_MAP_START( tmshi_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1fff) AM_READWRITE(itech8_tms34061_r, itech8_tms34061_w) AM_RANGE(0x0100, 0x0100) AM_WRITENOP AM_RANGE(0x0120, 0x0120) AM_WRITE(sound_data_w) - AM_RANGE(0x0140, 0x0140) AM_READWRITE(special_port0_r, MWA8_RAM) AM_BASE(&itech8_grom_bank) + AM_RANGE(0x0140, 0x0140) AM_READWRITE(special_port0_r, SMH_RAM) AM_BASE(&itech8_grom_bank) AM_RANGE(0x0160, 0x0160) AM_READWRITE(input_port_1_r, itech8_page_w) AM_RANGE(0x0180, 0x0180) AM_READWRITE(input_port_2_r, tms34061_latch_w) AM_RANGE(0x01a0, 0x01a0) AM_WRITE(itech8_nmi_ack_w) @@ -966,7 +966,7 @@ static ADDRESS_MAP_START( gtg2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0120, 0x0120) AM_READWRITE(input_port_1_r, itech8_page_w) AM_RANGE(0x0140, 0x015f) AM_WRITE(itech8_palette_w) AM_RANGE(0x0140, 0x0140) AM_READ(input_port_2_r) - AM_RANGE(0x0160, 0x0160) AM_WRITE(MWA8_RAM) AM_BASE(&itech8_grom_bank) + AM_RANGE(0x0160, 0x0160) AM_WRITE(SMH_RAM) AM_BASE(&itech8_grom_bank) AM_RANGE(0x0180, 0x019f) AM_READWRITE(itech8_blitter_r, blitter_w) AM_RANGE(0x01c0, 0x01c0) AM_WRITE(gtg2_sound_data_w) AM_RANGE(0x01e0, 0x01e0) AM_WRITE(tms34061_latch_w) @@ -985,7 +985,7 @@ static ADDRESS_MAP_START( ninclown_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100100, 0x100101) AM_READWRITE(input_port_0_word_r, grom_bank16_w) AM_BASE((void *)&itech8_grom_bank) AM_RANGE(0x100180, 0x100181) AM_READWRITE(input_port_1_word_r, display_page16_w) AM_RANGE(0x100240, 0x100241) AM_WRITE(tms34061_latch16_w) - AM_RANGE(0x100280, 0x100281) AM_READWRITE(input_port_2_word_r, MWA16_NOP) + AM_RANGE(0x100280, 0x100281) AM_READWRITE(input_port_2_word_r, SMH_NOP) AM_RANGE(0x100300, 0x10031f) AM_READWRITE(blitter16_r, blitter16_w) AM_RANGE(0x100380, 0x1003ff) AM_WRITE(palette16_w) AM_RANGE(0x110000, 0x110fff) AM_READWRITE(tms34061_16_r, tms34061_16_w) diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index 519b4be61c9..750697f8ffe 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -139,9 +139,9 @@ static READ8_HANDLER( striv_question_r ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) - AM_RANGE(0xb000, 0xb07f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) + AM_RANGE(0xb000, 0xb07f) AM_READ(SMH_RAM) AM_RANGE(0xb500, 0xb500) AM_READ(input_port_0_r) AM_RANGE(0xb501, 0xb501) AM_READ(input_port_1_r) AM_RANGE(0xb502, 0xb502) AM_READ(input_port_2_r) @@ -149,20 +149,20 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb504, 0xb504) AM_READ(input_port_4_r) AM_RANGE(0xb505, 0xb505) AM_READ(input_port_5_r) AM_RANGE(0xb506, 0xb507) AM_READ(jack_flipscreen_r) - AM_RANGE(0xb800, 0xbfff) AM_READ(MRA8_RAM) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xb800, 0xbfff) AM_READ(SMH_RAM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x5fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xb000, 0xb07f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_RAM) + AM_RANGE(0xb000, 0xb07f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xb400, 0xb400) AM_WRITE(jack_sh_command_w) AM_RANGE(0xb506, 0xb507) AM_WRITE(jack_flipscreen_w) AM_RANGE(0xb600, 0xb61f) AM_WRITE(jack_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xb800, 0xbbff) AM_WRITE(jack_videoram_w) AM_BASE(&videoram) AM_RANGE(0xbc00, 0xbfff) AM_WRITE(jack_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( joinem_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -183,14 +183,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_NOP) /* R/C filter ??? */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_NOP) /* R/C filter ??? */ ADDRESS_MAP_END @@ -1458,7 +1458,7 @@ static DRIVER_INIT( striv ) memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, striv_question_r); // Nop out unused sprites writes - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb000, 0xb0ff, 0, 0, MWA8_NOP); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb000, 0xb0ff, 0, 0, SMH_NOP); timer_rate = 128; } diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index ae82dfffecd..040a5bd60e4 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -85,7 +85,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x2001, 0x2001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) - AM_RANGE(0x4000, 0x43ff) AM_RAM AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) // self test only checks 0x4000-0x423f) + AM_RANGE(0x4000, 0x43ff) AM_RAM AM_WRITE(SMH_RAM) AM_BASE(&paletteram) // self test only checks 0x4000-0x423f) AM_RANGE(0x6000, 0x605f) AM_RAM // SOUND RAM (Self test check 0x6000-605f, 0x7c00-0x7fff) AM_RANGE(0x6060, 0x7fff) AM_RAM AM_SHARE(1) AM_RANGE(0x8000, 0xffff) AM_ROM diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index ed7436a9b20..7e3e16d2a43 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -80,14 +80,14 @@ static READ16_HANDLER( jackpool_io_r ) } static ADDRESS_MAP_START( jackpool_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) - AM_RANGE(0x120000, 0x1200ff) AM_READ(MRA16_RAM) // maybe nvram? + AM_RANGE(0x120000, 0x1200ff) AM_READ(SMH_RAM) // maybe nvram? - AM_RANGE(0x340000, 0x34ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x360000, 0x3603ff) AM_READ(MRA16_RAM) - AM_RANGE(0x380000, 0x38005f) AM_READ(MRA16_RAM) + AM_RANGE(0x340000, 0x34ffff) AM_READ(SMH_RAM) + AM_RANGE(0x360000, 0x3603ff) AM_READ(SMH_RAM) + AM_RANGE(0x380000, 0x38005f) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x80000f) AM_READ(jackpool_io_r) @@ -95,23 +95,23 @@ static ADDRESS_MAP_START( jackpool_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( jackpool_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) - AM_RANGE(0x120000, 0x1200ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x120000, 0x1200ff) AM_WRITE(SMH_RAM) AM_RANGE(0x340000, 0x341fff) AM_WRITE(jackpool_layer0_videoram_w) AM_BASE(&jackpool_layer0_videoram) AM_RANGE(0x342000, 0x343fff) AM_WRITE(jackpool_layer1_videoram_w) AM_BASE(&jackpool_layer1_videoram) AM_RANGE(0x344000, 0x345fff) AM_WRITE(jackpool_layer2_videoram_w) AM_BASE(&jackpool_layer2_videoram) // is this the same screen? /* are the ones below used? */ - AM_RANGE(0x346000, 0x347fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x348000, 0x349fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x34a000, 0x34bfff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x34c000, 0x34dfff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x34e000, 0x34ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x346000, 0x347fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x348000, 0x349fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x34a000, 0x34bfff) AM_WRITE(SMH_RAM) + AM_RANGE(0x34c000, 0x34dfff) AM_WRITE(SMH_RAM) + AM_RANGE(0x34e000, 0x34ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x360000, 0x3603ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x380000, 0x38005f) AM_WRITE(MWA16_RAM) + AM_RANGE(0x380000, 0x38005f) AM_WRITE(SMH_RAM) ADDRESS_MAP_END #if 0 diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index eb1cfe11a0c..38a0460ed90 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -529,19 +529,19 @@ static ADDRESS_MAP_START( jalmah, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080010, 0x080011) AM_WRITE(jalmah_flip_screen_w) // 0x080012, 0x080013 MCU write related,same for each game // 0x080014, 0x080015 MCU write related,same for each game -/**/AM_RANGE(0x080016, 0x080017) AM_READ(MRA16_RAM) AM_WRITE(jalmah_tilebank_w) +/**/AM_RANGE(0x080016, 0x080017) AM_READ(SMH_RAM) AM_WRITE(jalmah_tilebank_w) AM_RANGE(0x080018, 0x080019) AM_WRITE(jalmah_okibank_w) AM_RANGE(0x08001a, 0x08001b) AM_WRITE(jalmah_okirom_w) // 0x08001c, 0x08001d write 1 by urashima (?) -/**/AM_RANGE(0x080020, 0x08003f) AM_READ(MRA16_RAM) AM_WRITE(jalmah_scroll_w) +/**/AM_RANGE(0x080020, 0x08003f) AM_READ(SMH_RAM) AM_WRITE(jalmah_scroll_w) AM_RANGE(0x080040, 0x080041) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) // 0x084000, 0x084001 ? - AM_RANGE(0x088000, 0x0887ff) AM_READWRITE(MRA16_RAM, paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) /* Palette RAM */ - AM_RANGE(0x090000, 0x093fff) AM_READWRITE(MRA16_RAM, sc0_vram_w) AM_BASE(&sc0_vram) - AM_RANGE(0x094000, 0x097fff) AM_READWRITE(MRA16_RAM, sc1_vram_w) AM_BASE(&sc1_vram) - AM_RANGE(0x098000, 0x09bfff) AM_READWRITE(MRA16_RAM, sc2_vram_w) AM_BASE(&sc2_vram) - AM_RANGE(0x09c000, 0x09ffff) AM_READWRITE(MRA16_RAM, sc3_vram_w) AM_BASE(&sc3_vram) - AM_RANGE(0x0a0000, 0x0a3fff) AM_READWRITE(MRA16_RAM, sc3_vram_w) /*urashima mirror*/ + AM_RANGE(0x088000, 0x0887ff) AM_READWRITE(SMH_RAM, paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) /* Palette RAM */ + AM_RANGE(0x090000, 0x093fff) AM_READWRITE(SMH_RAM, sc0_vram_w) AM_BASE(&sc0_vram) + AM_RANGE(0x094000, 0x097fff) AM_READWRITE(SMH_RAM, sc1_vram_w) AM_BASE(&sc1_vram) + AM_RANGE(0x098000, 0x09bfff) AM_READWRITE(SMH_RAM, sc2_vram_w) AM_BASE(&sc2_vram) + AM_RANGE(0x09c000, 0x09ffff) AM_READWRITE(SMH_RAM, sc3_vram_w) AM_BASE(&sc3_vram) + AM_RANGE(0x0a0000, 0x0a3fff) AM_READWRITE(SMH_RAM, sc3_vram_w) /*urashima mirror*/ AM_RANGE(0x0f0000, 0x0f0fff) AM_RAM AM_BASE(&jm_regs)/*shared with MCU*/ AM_RANGE(0x0f1000, 0x0fffff) AM_RAM AM_BASE(&jm_ram) AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE(&jm_mcu_code)/*extra RAM for MCU code prg (NOT ON REAL HW!!!)*/ @@ -1887,11 +1887,11 @@ static DRIVER_INIT( urashima ) { memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x80004, 0x80005, 0, 0, urashima_mcu_r ); memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x80012, 0x80013, 0, 0, urashima_mcu_w ); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0320, 0xf0321, 0, 0, MRA16_BANK1, MWA16_BANK1 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0320, 0xf0321, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0xf0322 - 0xf0320)); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf03c0, 0xf03c5, 0, 0, MRA16_BANK2, MWA16_BANK2 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf03c0, 0xf03c5, 0, 0, SMH_BANK2, SMH_BANK2 ); memory_set_bankptr(2, auto_malloc(0xf03c6 - 0xf03c0)); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf03c6, 0xf03e5, 0, 0, MRA16_BANK3, MWA16_BANK3 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf03c6, 0xf03e5, 0, 0, SMH_BANK3, SMH_BANK3 ); memory_set_bankptr(3, auto_malloc(0xf03e6 - 0xf03c6)); mcu_prg = 0x12; } @@ -1900,13 +1900,13 @@ static DRIVER_INIT( daireika ) { memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x80004, 0x80005, 0, 0, daireika_mcu_r ); memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x80012, 0x80013, 0, 0, daireika_mcu_w ); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0140, 0xf0141, 0, 0, MRA16_BANK1, MWA16_BANK1 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0140, 0xf0141, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0xf0142 - 0xf0140)); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0020, 0xf0025, 0, 0, MRA16_BANK2, MWA16_BANK2 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0020, 0xf0025, 0, 0, SMH_BANK2, SMH_BANK2 ); memory_set_bankptr(2, auto_malloc(0xf0026 - 0xf0020)); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf00c0, 0xf00d5, 0, 0, MRA16_BANK3, MWA16_BANK3 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf00c0, 0xf00d5, 0, 0, SMH_BANK3, SMH_BANK3 ); memory_set_bankptr(3, auto_malloc(0xf00d6 - 0xf00c0)); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0100, 0xf0130, 0, 0, MRA16_BANK4, MWA16_BANK4 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0100, 0xf0130, 0, 0, SMH_BANK4, SMH_BANK4 ); memory_set_bankptr(4, auto_malloc(0xf0130 - 0xf0100)); mcu_prg = 0x11; } @@ -1915,11 +1915,11 @@ static DRIVER_INIT( mjzoomin ) { memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x80004, 0x80005, 0, 0, mjzoomin_mcu_r ); memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x80012, 0x80013, 0, 0, mjzoomin_mcu_w ); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf00c0, 0xf00c5, 0, 0, MRA16_BANK1, MWA16_BANK1 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf00c0, 0xf00c5, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0xf00c6 - 0xf00c0)); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf00c6, 0xf00d1, 0, 0, MRA16_BANK2, MWA16_BANK2 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf00c6, 0xf00d1, 0, 0, SMH_BANK2, SMH_BANK2 ); memory_set_bankptr(2, auto_malloc(0xf00d2 - 0xf00c6)); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0020, 0xf002f, 0, 0, MRA16_BANK3, MWA16_BANK3 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf0020, 0xf002f, 0, 0, SMH_BANK3, SMH_BANK3 ); memory_set_bankptr(3, auto_malloc(0xf0030 - 0xf0020)); mcu_prg = 0x13; } diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index 8c70623d52a..b487ce02573 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -594,11 +594,11 @@ static ADDRESS_MAP_START( jchan_sub, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400002, 0x403fff) AM_RAM /* VIEW2 Tilemap - [D] grid tested, cleared ($1d84), also cleared at startup ($810-$826) */ - AM_RANGE(0x500000, 0x500fff) AM_RAM // AM_READWRITE(MRA16_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 - AM_RANGE(0x501000, 0x501fff) AM_RAM // AM_READWRITE(MRA16_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // + AM_RANGE(0x500000, 0x500fff) AM_RAM // AM_READWRITE(SMH_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 + AM_RANGE(0x501000, 0x501fff) AM_RAM // AM_READWRITE(SMH_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // AM_RANGE(0x502000, 0x502fff) AM_RAM // AM_RAM AM_BASE(&kaneko16_vscroll_1) // AM_RANGE(0x503000, 0x503fff) AM_RAM // AM_RAM AM_BASE(&kaneko16_vscroll_0) // - AM_RANGE(0x600000, 0x60001f) AM_RAM // AM_READWRITE(MRA16_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs + AM_RANGE(0x600000, 0x60001f) AM_RAM // AM_READWRITE(SMH_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs /* 2nd sprite layer? - [C] grid tested, cleared ($1e2a), also cleared at startup ($7dc-$80a) */ AM_RANGE(0x700000, 0x703fff) AM_RAM // AM_BASE(&jchan_spriteram) AM_WRITE(jchan_suprnova_sprite32_w) diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c index 7fcee0172cd..ceb11e58f51 100644 --- a/src/mame/drivers/jcross.c +++ b/src/mame/drivers/jcross.c @@ -116,8 +116,8 @@ static ADDRESS_MAP_START( cpuA_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd600, 0xd600) AM_WRITE(jcross_vregs3_w) AM_RANGE(0xd700, 0xd700) AM_WRITE(jcross_vregs4_w) AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE(1) AM_BASE(&spriteram) - AM_RANGE(0xe000, 0xefff) AM_READWRITE(MRA8_RAM, jcross_background_ram_w) AM_SHARE(2) AM_BASE(&videoram) - AM_RANGE(0xf000, 0xf3ff) AM_READWRITE(MRA8_RAM, jcross_text_ram_w) AM_BASE(&jcr_textram) + AM_RANGE(0xe000, 0xefff) AM_READWRITE(SMH_RAM, jcross_background_ram_w) AM_SHARE(2) AM_BASE(&videoram) + AM_RANGE(0xf000, 0xf3ff) AM_READWRITE(SMH_RAM, jcross_text_ram_w) AM_BASE(&jcr_textram) AM_RANGE(0xf400, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c index c8bed6a1c2a..253758cd37b 100644 --- a/src/mame/drivers/jedi.c +++ b/src/mame/drivers/jedi.c @@ -270,33 +270,33 @@ static WRITE8_HANDLER( nvram_enable_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0300) AM_READWRITE(MRA8_RAM, nvram_data_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x0c00, 0x0c00) AM_MIRROR(0x03fe) AM_READWRITE(input_port_0_r, MWA8_NOP) - AM_RANGE(0x0c01, 0x0c01) AM_MIRROR(0x03fe) AM_READWRITE(input_port_1_r, MWA8_NOP) + AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0300) AM_READWRITE(SMH_RAM, nvram_data_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x0c00, 0x0c00) AM_MIRROR(0x03fe) AM_READWRITE(input_port_0_r, SMH_NOP) + AM_RANGE(0x0c01, 0x0c01) AM_MIRROR(0x03fe) AM_READWRITE(input_port_1_r, SMH_NOP) AM_RANGE(0x1000, 0x13ff) AM_NOP - AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x03ff) AM_READWRITE(jedi_audio_ack_latch_r, MWA8_NOP) - AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x03ff) AM_READWRITE(a2d_data_r, MWA8_NOP) - AM_RANGE(0x1c00, 0x1c01) AM_MIRROR(0x007f) AM_READWRITE(MRA8_NOP, nvram_enable_w) - AM_RANGE(0x1c80, 0x1c82) AM_MIRROR(0x0078) AM_READWRITE(MRA8_NOP, a2d_select_w) + AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x03ff) AM_READWRITE(jedi_audio_ack_latch_r, SMH_NOP) + AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x03ff) AM_READWRITE(a2d_data_r, SMH_NOP) + AM_RANGE(0x1c00, 0x1c01) AM_MIRROR(0x007f) AM_READWRITE(SMH_NOP, nvram_enable_w) + AM_RANGE(0x1c80, 0x1c82) AM_MIRROR(0x0078) AM_READWRITE(SMH_NOP, a2d_select_w) AM_RANGE(0x1c83, 0x1c87) AM_MIRROR(0x0078) AM_NOP - AM_RANGE(0x1d00, 0x1d00) AM_MIRROR(0x007f) AM_READWRITE(MRA8_NOP, MWA8_NOP) /* write: NVRAM store */ - AM_RANGE(0x1d80, 0x1d80) AM_MIRROR(0x007f) AM_READWRITE(MRA8_NOP, watchdog_reset_w) - AM_RANGE(0x1e00, 0x1e00) AM_MIRROR(0x007f) AM_READWRITE(MRA8_NOP, main_irq_ack_w) - AM_RANGE(0x1e80, 0x1e81) AM_MIRROR(0x0078) AM_READWRITE(MRA8_NOP, jedi_coin_counter_w) - AM_RANGE(0x1e82, 0x1e83) AM_MIRROR(0x0078) AM_READWRITE(MRA8_NOP, MWA8_NOP) /* write: LED control - not used */ - AM_RANGE(0x1e84, 0x1e84) AM_MIRROR(0x0078) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE_MEMBER(jedi_state, foreground_bank) + AM_RANGE(0x1d00, 0x1d00) AM_MIRROR(0x007f) AM_READWRITE(SMH_NOP, SMH_NOP) /* write: NVRAM store */ + AM_RANGE(0x1d80, 0x1d80) AM_MIRROR(0x007f) AM_READWRITE(SMH_NOP, watchdog_reset_w) + AM_RANGE(0x1e00, 0x1e00) AM_MIRROR(0x007f) AM_READWRITE(SMH_NOP, main_irq_ack_w) + AM_RANGE(0x1e80, 0x1e81) AM_MIRROR(0x0078) AM_READWRITE(SMH_NOP, jedi_coin_counter_w) + AM_RANGE(0x1e82, 0x1e83) AM_MIRROR(0x0078) AM_READWRITE(SMH_NOP, SMH_NOP) /* write: LED control - not used */ + AM_RANGE(0x1e84, 0x1e84) AM_MIRROR(0x0078) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE_MEMBER(jedi_state, foreground_bank) AM_RANGE(0x1e85, 0x1e85) AM_MIRROR(0x0078) AM_NOP - AM_RANGE(0x1e86, 0x1e86) AM_MIRROR(0x0078) AM_READWRITE(MRA8_NOP, jedi_audio_reset_w) - AM_RANGE(0x1e87, 0x1e87) AM_MIRROR(0x0078) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE_MEMBER(jedi_state, video_off) - AM_RANGE(0x1f00, 0x1f00) AM_MIRROR(0x007f) AM_READWRITE(MRA8_NOP, jedi_audio_latch_w) - AM_RANGE(0x1f80, 0x1f80) AM_MIRROR(0x007f) AM_READWRITE(MRA8_NOP, rom_banksel_w) + AM_RANGE(0x1e86, 0x1e86) AM_MIRROR(0x0078) AM_READWRITE(SMH_NOP, jedi_audio_reset_w) + AM_RANGE(0x1e87, 0x1e87) AM_MIRROR(0x0078) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE_MEMBER(jedi_state, video_off) + AM_RANGE(0x1f00, 0x1f00) AM_MIRROR(0x007f) AM_READWRITE(SMH_NOP, jedi_audio_latch_w) + AM_RANGE(0x1f80, 0x1f80) AM_MIRROR(0x007f) AM_READWRITE(SMH_NOP, rom_banksel_w) AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE_MEMBER(jedi_state, backgroundram) AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE_MEMBER(jedi_state, paletteram) AM_RANGE(0x3000, 0x37bf) AM_RAM AM_BASE_MEMBER(jedi_state, foregroundram) AM_RANGE(0x37c0, 0x3bff) AM_RAM AM_BASE_MEMBER(jedi_state, spriteram) - AM_RANGE(0x3c00, 0x3c01) AM_MIRROR(0x00fe) AM_READWRITE(MRA8_NOP, jedi_vscroll_w) - AM_RANGE(0x3d00, 0x3d01) AM_MIRROR(0x00fe) AM_READWRITE(MRA8_NOP, jedi_hscroll_w) - AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x01ff) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(jedi_state, smoothing_table) + 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(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index bfebfaa68fd..27125c7288c 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -171,9 +171,9 @@ static WRITE8_HANDLER( videoram2_w ) } static ADDRESS_MAP_START( jongkyo_memmap, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) AM_WRITE(videoram2_w) // wrong, this doesn't seem to be video ram on write.. - AM_RANGE(0x4000, 0x6bff) AM_READ(MRA8_ROM) // fixed rom - AM_RANGE(0x6c00, 0x6fff) AM_READ(MRA8_BANK1) // banked (8 banks) + 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_BANK1) // banked (8 banks) AM_RANGE(0x7000, 0x77ff) AM_RAM AM_RANGE(0x8000, 0xffff) AM_RAM AM_BASE(&videoram) ADDRESS_MAP_END diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c index abe029f776a..8ff8854aa6e 100644 --- a/src/mame/drivers/jrpacman.c +++ b/src/mame/drivers/jrpacman.c @@ -120,7 +120,7 @@ static WRITE8_HANDLER( jrpacman_interrupt_vector_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x47ff) AM_READWRITE(MRA8_RAM, jrpacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4000, 0x47ff) AM_READWRITE(SMH_RAM, jrpacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x4800, 0x4fef) AM_RAM AM_RANGE(0x4ff0, 0x4fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x5000, 0x503f) AM_READ(input_port_0_r) /* IN0 */ @@ -129,7 +129,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5003, 0x5003) AM_WRITE(pacman_flipscreen_w) AM_RANGE(0x5040, 0x507f) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0x5040, 0x505f) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs) - AM_RANGE(0x5060, 0x506f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x5060, 0x506f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_RANGE(0x5070, 0x5070) AM_WRITE(pengo_palettebank_w) AM_RANGE(0x5071, 0x5071) AM_WRITE(pengo_colortablebank_w) AM_RANGE(0x5073, 0x5073) AM_WRITE(jrpacman_bgpriority_w) @@ -137,7 +137,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5075, 0x5075) AM_WRITE(jrpacman_spritebank_w) AM_RANGE(0x5080, 0x50bf) AM_READ(input_port_2_r) /* DSW1 */ AM_RANGE(0x5080, 0x5080) AM_WRITE(jrpacman_scroll_w) - AM_RANGE(0x50c0, 0x50c0) AM_WRITE(MWA8_NOP) + AM_RANGE(0x50c0, 0x50c0) AM_WRITE(SMH_NOP) AM_RANGE(0x8000, 0xdfff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index bd1b826986c..75560c1b2d5 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -191,14 +191,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x802c, 0x802c) AM_READ(input_port_4_r) /* DSW1 (inverted bits) */ AM_RANGE(0x8030, 0x8030) AM_WRITE(interrupt_enable_w) AM_RANGE(0x8031, 0x8032) AM_WRITE(junofrst_coin_counter_w) - AM_RANGE(0x8033, 0x8033) AM_WRITE(MWA8_RAM) AM_BASE(&tutankhm_scroll) /* not used in Juno */ + AM_RANGE(0x8033, 0x8033) AM_WRITE(SMH_RAM) AM_BASE(&tutankhm_scroll) /* not used in Juno */ AM_RANGE(0x8034, 0x8035) AM_WRITE(flip_screen_w) AM_RANGE(0x8040, 0x8040) AM_WRITE(junofrst_sh_irqtrigger_w) AM_RANGE(0x8050, 0x8050) AM_WRITE(soundlatch_w) 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(MRA8_BANK1) + AM_RANGE(0x9000, 0x9fff) AM_READ(SMH_BANK1) AM_RANGE(0xa000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index 636277390b5..ec8d6d05e88 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -369,11 +369,11 @@ static ADDRESS_MAP_START( berlwall, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM AM_RANGE(0x200000, 0x20ffff) AM_RAM // Work RAM AM_RANGE(0x30e000, 0x30ffff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette // AM_RANGE(0x480000, 0x480001) AM_RAM // ? AM_RANGE(0x500000, 0x500001) AM_READWRITE(kaneko16_bg15_reg_r, kaneko16_bg15_reg_w) AM_BASE(&kaneko16_bg15_reg) // High Color Background AM_RANGE(0x580000, 0x580001) AM_READWRITE(kaneko16_bg15_select_r, kaneko16_bg15_select_w) AM_BASE(&kaneko16_bg15_select) - AM_RANGE(0x600000, 0x60003f) AM_READWRITE(MRA16_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs + AM_RANGE(0x600000, 0x60003f) AM_READWRITE(SMH_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs AM_RANGE(0x680000, 0x680001) AM_READ(input_port_0_word_r) // Inputs AM_RANGE(0x680002, 0x680003) AM_READ(input_port_1_word_r) AM_RANGE(0x680004, 0x680005) AM_READ(input_port_2_word_r) @@ -384,11 +384,11 @@ static ADDRESS_MAP_START( berlwall, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800200, 0x80021f) AM_READWRITE(kaneko16_YM2149_1_r, kaneko16_YM2149_1_w) AM_RANGE(0x8003fe, 0x8003ff) AM_NOP // for OKI when accessed as .l AM_RANGE(0x800400, 0x800401) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) - AM_RANGE(0xc00000, 0xc00fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers - AM_RANGE(0xc01000, 0xc01fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // + AM_RANGE(0xc00000, 0xc00fff) AM_READWRITE(SMH_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers + AM_RANGE(0xc01000, 0xc01fff) AM_READWRITE(SMH_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // AM_RANGE(0xc02000, 0xc02fff) AM_RAM AM_BASE(&kaneko16_vscroll_1) // AM_RANGE(0xc03000, 0xc03fff) AM_RAM AM_BASE(&kaneko16_vscroll_0) // - AM_RANGE(0xd00000, 0xd0001f) AM_READWRITE(MRA16_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers Regs + AM_RANGE(0xd00000, 0xd0001f) AM_READWRITE(SMH_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers Regs ADDRESS_MAP_END @@ -416,20 +416,20 @@ static ADDRESS_MAP_START( bakubrkr, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x40001e, 0x40001f) AM_WRITE(bakubrkr_oki_bank_sw) // OKI bank Switch AM_RANGE(0x400200, 0x40021f) AM_READWRITE(kaneko16_YM2149_1_r,kaneko16_YM2149_1_w) // Sound AM_RANGE(0x400400, 0x400401) AM_READWRITE(OKIM6295_status_0_lsb_r,OKIM6295_data_0_lsb_w) // - AM_RANGE(0x500000, 0x500fff) AM_READWRITE(MRA16_RAM,kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 - AM_RANGE(0x501000, 0x501fff) AM_READWRITE(MRA16_RAM,kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // + AM_RANGE(0x500000, 0x500fff) AM_READWRITE(SMH_RAM,kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 + AM_RANGE(0x501000, 0x501fff) AM_READWRITE(SMH_RAM,kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // AM_RANGE(0x502000, 0x502fff) AM_RAM AM_BASE(&kaneko16_vscroll_1) // AM_RANGE(0x503000, 0x503fff) AM_RAM AM_BASE(&kaneko16_vscroll_0) // - AM_RANGE(0x580000, 0x580fff) AM_READWRITE(MRA16_RAM,kaneko16_vram_3_w) AM_BASE(&kaneko16_vram_3) // Layers 1 - AM_RANGE(0x581000, 0x581fff) AM_READWRITE(MRA16_RAM,kaneko16_vram_2_w) AM_BASE(&kaneko16_vram_2) // + AM_RANGE(0x580000, 0x580fff) AM_READWRITE(SMH_RAM,kaneko16_vram_3_w) AM_BASE(&kaneko16_vram_3) // Layers 1 + AM_RANGE(0x581000, 0x581fff) AM_READWRITE(SMH_RAM,kaneko16_vram_2_w) AM_BASE(&kaneko16_vram_2) // AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(&kaneko16_vscroll_3) // AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(&kaneko16_vscroll_2) // AM_RANGE(0x600000, 0x601fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites - AM_RANGE(0x700000, 0x700fff) AM_READWRITE(MRA16_RAM,paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette - AM_RANGE(0x800000, 0x80001f) AM_READWRITE(MRA16_RAM,kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs - AM_RANGE(0x900000, 0x90001f) AM_READWRITE(MRA16_RAM,kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs ) // Sprites Regs + AM_RANGE(0x700000, 0x700fff) AM_READWRITE(SMH_RAM,paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE(0x800000, 0x80001f) AM_READWRITE(SMH_RAM,kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs + AM_RANGE(0x900000, 0x90001f) AM_READWRITE(SMH_RAM,kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs ) // Sprites Regs AM_RANGE(0xa80000, 0xa80001) AM_READ(watchdog_reset16_r) // Watchdog - AM_RANGE(0xb00000, 0xb0001f) AM_READWRITE(MRA16_RAM,kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs) // Layers 1 Regs + AM_RANGE(0xb00000, 0xb0001f) AM_READWRITE(SMH_RAM,kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs) // Layers 1 Regs AM_RANGE(0xd00000, 0xd00001) AM_WRITE(kaneko16_eeprom_w) // EEPROM AM_RANGE(0xe00000, 0xe00001) AM_READ(input_port_0_word_r) // Inputs AM_RANGE(0xe00002, 0xe00003) AM_READ(input_port_1_word_r) @@ -445,24 +445,24 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( blazeon, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM AM_RANGE(0x300000, 0x30ffff) AM_RAM // Work RAM - AM_RANGE(0x500000, 0x500fff) AM_READWRITE(MRA16_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette - AM_RANGE(0x600000, 0x600fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 - AM_RANGE(0x601000, 0x601fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // + AM_RANGE(0x500000, 0x500fff) AM_READWRITE(SMH_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE(0x600000, 0x600fff) AM_READWRITE(SMH_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 + AM_RANGE(0x601000, 0x601fff) AM_READWRITE(SMH_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // AM_RANGE(0x602000, 0x602fff) AM_RAM AM_BASE(&kaneko16_vscroll_1) // AM_RANGE(0x603000, 0x603fff) AM_RAM AM_BASE(&kaneko16_vscroll_0) // AM_RANGE(0x700000, 0x700fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites - AM_RANGE(0x800000, 0x80001f) AM_READWRITE(MRA16_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs - AM_RANGE(0x900000, 0x90001f) AM_READWRITE(MRA16_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs #1 + AM_RANGE(0x800000, 0x80001f) AM_READWRITE(SMH_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs + AM_RANGE(0x900000, 0x90001f) AM_READWRITE(SMH_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs #1 AM_RANGE(0x980000, 0x98001f) AM_RAM // Sprites Regs #2 AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r) // Inputs AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r) AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_2_word_r) AM_RANGE(0xc00006, 0xc00007) AM_READ(input_port_3_word_r) AM_RANGE(0xd00000, 0xd00001) AM_WRITE(kaneko16_coin_lockout_w) // Coin Lockout - AM_RANGE(0xe00000, 0xe00001) AM_READWRITE(MRA16_NOP, kaneko16_soundlatch_w) // Read = IRQ Ack ? - AM_RANGE(0xe40000, 0xe40001) AM_READ(MRA16_NOP) // IRQ Ack ? -// AM_RANGE(0xe80000, 0xe80001) AM_READ(MRA16_NOP) // IRQ Ack ? - AM_RANGE(0xec0000, 0xec0001) AM_READ(MRA16_NOP) // Lev 4 IRQ Ack ? + AM_RANGE(0xe00000, 0xe00001) AM_READWRITE(SMH_NOP, kaneko16_soundlatch_w) // Read = IRQ Ack ? + AM_RANGE(0xe40000, 0xe40001) AM_READ(SMH_NOP) // IRQ Ack ? +// AM_RANGE(0xe80000, 0xe80001) AM_READ(SMH_NOP) // IRQ Ack ? + AM_RANGE(0xec0000, 0xec0001) AM_READ(SMH_NOP) // Lev 4 IRQ Ack ? ADDRESS_MAP_END @@ -507,19 +507,19 @@ static ADDRESS_MAP_START( bloodwar, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(toybox_mcu_com1_w) AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w) AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w) - AM_RANGE(0x300000, 0x30ffff) AM_READWRITE(MRA16_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE(0x300000, 0x30ffff) AM_READWRITE(SMH_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0x400000, 0x401fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites - AM_RANGE(0x500000, 0x500fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 - AM_RANGE(0x501000, 0x501fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // + AM_RANGE(0x500000, 0x500fff) AM_READWRITE(SMH_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 + AM_RANGE(0x501000, 0x501fff) AM_READWRITE(SMH_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // AM_RANGE(0x502000, 0x502fff) AM_RAM AM_BASE(&kaneko16_vscroll_1) // AM_RANGE(0x503000, 0x503fff) AM_RAM AM_BASE(&kaneko16_vscroll_0) // - AM_RANGE(0x580000, 0x580fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_3_w) AM_BASE(&kaneko16_vram_3) // Layers 1 - AM_RANGE(0x581000, 0x581fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_2_w) AM_BASE(&kaneko16_vram_2) // + AM_RANGE(0x580000, 0x580fff) AM_READWRITE(SMH_RAM, kaneko16_vram_3_w) AM_BASE(&kaneko16_vram_3) // Layers 1 + AM_RANGE(0x581000, 0x581fff) AM_READWRITE(SMH_RAM, kaneko16_vram_2_w) AM_BASE(&kaneko16_vram_2) // AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(&kaneko16_vscroll_3) // AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(&kaneko16_vscroll_2) // - AM_RANGE(0x600000, 0x60001f) AM_READWRITE(MRA16_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs - AM_RANGE(0x680000, 0x68001f) AM_READWRITE(MRA16_RAM, kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs) // Layers 1 Regs - AM_RANGE(0x700000, 0x70001f) AM_READWRITE(MRA16_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs + AM_RANGE(0x600000, 0x60001f) AM_READWRITE(SMH_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs + AM_RANGE(0x680000, 0x68001f) AM_READWRITE(SMH_RAM, kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs) // Layers 1 Regs + AM_RANGE(0x700000, 0x70001f) AM_READWRITE(SMH_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs AM_RANGE(0x800000, 0x800001) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) AM_RANGE(0x880000, 0x880001) AM_READWRITE(OKIM6295_status_1_lsb_r, OKIM6295_data_1_lsb_w) AM_RANGE(0x900000, 0x900039) AM_READWRITE(bloodwar_calc_r, bloodwar_calc_w) @@ -567,19 +567,19 @@ static ADDRESS_MAP_START( bonkadv, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(toybox_mcu_com1_w) AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w) AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w) - AM_RANGE(0x300000, 0x30ffff) AM_READWRITE(MRA16_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE(0x300000, 0x30ffff) AM_READWRITE(SMH_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0x400000, 0x401fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites - AM_RANGE(0x500000, 0x500fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 - AM_RANGE(0x501000, 0x501fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // + AM_RANGE(0x500000, 0x500fff) AM_READWRITE(SMH_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 + AM_RANGE(0x501000, 0x501fff) AM_READWRITE(SMH_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // AM_RANGE(0x502000, 0x502fff) AM_RAM AM_BASE(&kaneko16_vscroll_1) // AM_RANGE(0x503000, 0x503fff) AM_RAM AM_BASE(&kaneko16_vscroll_0) // - AM_RANGE(0x580000, 0x580fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_3_w) AM_BASE(&kaneko16_vram_3) // Layers 1 - AM_RANGE(0x581000, 0x581fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_2_w) AM_BASE(&kaneko16_vram_2) // + AM_RANGE(0x580000, 0x580fff) AM_READWRITE(SMH_RAM, kaneko16_vram_3_w) AM_BASE(&kaneko16_vram_3) // Layers 1 + AM_RANGE(0x581000, 0x581fff) AM_READWRITE(SMH_RAM, kaneko16_vram_2_w) AM_BASE(&kaneko16_vram_2) // AM_RANGE(0x582000, 0x582fff) AM_RAM AM_BASE(&kaneko16_vscroll_3) // AM_RANGE(0x583000, 0x583fff) AM_RAM AM_BASE(&kaneko16_vscroll_2) // - AM_RANGE(0x600000, 0x60001f) AM_READWRITE(MRA16_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs - AM_RANGE(0x680000, 0x68001f) AM_READWRITE(MRA16_RAM, kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs) // Layers 1 Regs - AM_RANGE(0x700000, 0x70001f) AM_READWRITE(MRA16_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs + AM_RANGE(0x600000, 0x60001f) AM_READWRITE(SMH_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs + AM_RANGE(0x680000, 0x68001f) AM_READWRITE(SMH_RAM, kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs) // Layers 1 Regs + AM_RANGE(0x700000, 0x70001f) AM_READWRITE(SMH_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs AM_RANGE(0x800000, 0x800001) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) AM_RANGE(0x880000, 0x880001) AM_READWRITE(OKIM6295_status_1_lsb_r, OKIM6295_data_1_lsb_w) AM_RANGE(0x900000, 0x900015) AM_READWRITE(galpanib_calc_r,galpanib_calc_w) @@ -646,17 +646,17 @@ static WRITE16_HANDLER( gtmr_oki_1_data_w ) } static ADDRESS_MAP_START( gtmr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0ffffd) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x0ffffd) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x0ffffe, 0x0fffff) AM_READ(gtmr_wheel_r ) // Wheel Value - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // Work RAM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // Shared With MCU - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x310000, 0x327fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x500000, 0x503fff) AM_READ(MRA16_RAM ) // Layers 0 - AM_RANGE(0x580000, 0x583fff) AM_READ(MRA16_RAM ) // Layers 1 - AM_RANGE(0x600000, 0x60000f) AM_READ(MRA16_RAM ) // Layers 0 Regs - AM_RANGE(0x680000, 0x68000f) AM_READ(MRA16_RAM ) // Layers 1 Regs + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // Work RAM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // Shared With MCU + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x310000, 0x327fff) AM_READ(SMH_RAM ) // + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x500000, 0x503fff) AM_READ(SMH_RAM ) // Layers 0 + AM_RANGE(0x580000, 0x583fff) AM_READ(SMH_RAM ) // Layers 1 + AM_RANGE(0x600000, 0x60000f) AM_READ(SMH_RAM ) // Layers 0 Regs + AM_RANGE(0x680000, 0x68000f) AM_READ(SMH_RAM ) // Layers 1 Regs AM_RANGE(0x700000, 0x70001f) AM_READ(kaneko16_sprites_regs_r ) // Sprites Regs AM_RANGE(0x800000, 0x800001) AM_READ(OKIM6295_status_0_lsb_r ) // Samples AM_RANGE(0x880000, 0x880001) AM_READ(OKIM6295_status_1_lsb_r ) @@ -670,24 +670,24 @@ static ADDRESS_MAP_START( gtmr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( gtmr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // Work RAM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) AM_BASE(&kaneko16_mcu_ram ) // Shared With MCU + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // Work RAM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_BASE(&kaneko16_mcu_ram ) // Shared With MCU AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(toybox_mcu_com0_w ) // To MCU ? AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(toybox_mcu_com1_w ) AM_RANGE(0x2c0000, 0x2c0001) AM_WRITE(toybox_mcu_com2_w ) AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(toybox_mcu_com3_w ) AM_RANGE(0x300000, 0x30ffff) AM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x310000, 0x327fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x400000, 0x401fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x310000, 0x327fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x400000, 0x401fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x500000, 0x500fff) AM_WRITE(kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1 ) // Layers 0 AM_RANGE(0x501000, 0x501fff) AM_WRITE(kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0 ) // - AM_RANGE(0x502000, 0x502fff) AM_WRITE(MWA16_RAM) AM_BASE(&kaneko16_vscroll_1 ) // - AM_RANGE(0x503000, 0x503fff) AM_WRITE(MWA16_RAM) AM_BASE(&kaneko16_vscroll_0 ) // + AM_RANGE(0x502000, 0x502fff) AM_WRITE(SMH_RAM) AM_BASE(&kaneko16_vscroll_1 ) // + AM_RANGE(0x503000, 0x503fff) AM_WRITE(SMH_RAM) AM_BASE(&kaneko16_vscroll_0 ) // AM_RANGE(0x580000, 0x580fff) AM_WRITE(kaneko16_vram_3_w) AM_BASE(&kaneko16_vram_3 ) // Layers 1 AM_RANGE(0x581000, 0x581fff) AM_WRITE(kaneko16_vram_2_w) AM_BASE(&kaneko16_vram_2 ) // - AM_RANGE(0x582000, 0x582fff) AM_WRITE(MWA16_RAM) AM_BASE(&kaneko16_vscroll_3 ) // - AM_RANGE(0x583000, 0x583fff) AM_WRITE(MWA16_RAM) AM_BASE(&kaneko16_vscroll_2 ) // + AM_RANGE(0x582000, 0x582fff) AM_WRITE(SMH_RAM) AM_BASE(&kaneko16_vscroll_3 ) // + AM_RANGE(0x583000, 0x583fff) AM_WRITE(SMH_RAM) AM_BASE(&kaneko16_vscroll_2 ) // AM_RANGE(0x600000, 0x60000f) AM_WRITE(kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs ) // Layers 0 Regs AM_RANGE(0x680000, 0x68000f) AM_WRITE(kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs ) // Layers 1 Regs AM_RANGE(0x700000, 0x70001f) AM_WRITE(kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs ) // Sprites Regs @@ -732,17 +732,17 @@ static READ16_HANDLER( gtmr2_IN1_r ) } static ADDRESS_MAP_START( gtmr2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0ffffd) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x0ffffd) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x0ffffe, 0x0fffff) AM_READ(gtmr2_wheel_r ) // Wheel Value - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // Work RAM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // Shared With MCU - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x310000, 0x327fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x500000, 0x503fff) AM_READ(MRA16_RAM ) // Layers 0 - AM_RANGE(0x580000, 0x583fff) AM_READ(MRA16_RAM ) // Layers 1 - AM_RANGE(0x600000, 0x60000f) AM_READ(MRA16_RAM ) // Layers 0 Regs - AM_RANGE(0x680000, 0x68000f) AM_READ(MRA16_RAM ) // Layers 1 Regs + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // Work RAM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // Shared With MCU + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x310000, 0x327fff) AM_READ(SMH_RAM ) // + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x500000, 0x503fff) AM_READ(SMH_RAM ) // Layers 0 + AM_RANGE(0x580000, 0x583fff) AM_READ(SMH_RAM ) // Layers 1 + AM_RANGE(0x600000, 0x60000f) AM_READ(SMH_RAM ) // Layers 0 Regs + AM_RANGE(0x680000, 0x68000f) AM_READ(SMH_RAM ) // Layers 1 Regs AM_RANGE(0x700000, 0x70001f) AM_READ(kaneko16_sprites_regs_r ) // Sprites Regs AM_RANGE(0x800000, 0x800001) AM_READ(OKIM6295_status_0_lsb_r ) // Samples AM_RANGE(0x880000, 0x880001) AM_READ(OKIM6295_status_1_lsb_r ) @@ -767,19 +767,19 @@ static ADDRESS_MAP_START( mgcrystl, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x40001f) AM_READWRITE(kaneko16_YM2149_0_r, kaneko16_YM2149_0_w) // Sound AM_RANGE(0x400200, 0x40021f) AM_READWRITE(kaneko16_YM2149_1_r, kaneko16_YM2149_1_w) AM_RANGE(0x400400, 0x400401) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) - AM_RANGE(0x500000, 0x500fff) AM_READWRITE(MRA16_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette - AM_RANGE(0x600000, 0x600fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 - AM_RANGE(0x601000, 0x601fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // + AM_RANGE(0x500000, 0x500fff) AM_READWRITE(SMH_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE(0x600000, 0x600fff) AM_READWRITE(SMH_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 + AM_RANGE(0x601000, 0x601fff) AM_READWRITE(SMH_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // AM_RANGE(0x602000, 0x602fff) AM_RAM AM_BASE(&kaneko16_vscroll_1) // AM_RANGE(0x603000, 0x603fff) AM_RAM AM_BASE(&kaneko16_vscroll_0) // - AM_RANGE(0x680000, 0x680fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_3_w) AM_BASE(&kaneko16_vram_3) // Layers 1 - AM_RANGE(0x681000, 0x681fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_2_w) AM_BASE(&kaneko16_vram_2) // + AM_RANGE(0x680000, 0x680fff) AM_READWRITE(SMH_RAM, kaneko16_vram_3_w) AM_BASE(&kaneko16_vram_3) // Layers 1 + AM_RANGE(0x681000, 0x681fff) AM_READWRITE(SMH_RAM, kaneko16_vram_2_w) AM_BASE(&kaneko16_vram_2) // AM_RANGE(0x682000, 0x682fff) AM_RAM AM_BASE(&kaneko16_vscroll_3) // AM_RANGE(0x683000, 0x683fff) AM_RAM AM_BASE(&kaneko16_vscroll_2) // AM_RANGE(0x700000, 0x701fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites - AM_RANGE(0x800000, 0x80001f) AM_READWRITE(MRA16_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs - AM_RANGE(0x900000, 0x90001f) AM_READWRITE(MRA16_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs - AM_RANGE(0xb00000, 0xb0001f) AM_READWRITE(MRA16_RAM, kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs) // Layers 1 Regs + AM_RANGE(0x800000, 0x80001f) AM_READWRITE(SMH_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs + AM_RANGE(0x900000, 0x90001f) AM_READWRITE(SMH_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs + AM_RANGE(0xb00000, 0xb0001f) AM_READWRITE(SMH_RAM, kaneko16_layers_1_regs_w) AM_BASE(&kaneko16_layers_1_regs) // Layers 1 Regs AM_RANGE(0xa00000, 0xa00001) AM_READ(watchdog_reset16_r) // Watchdog AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r) // Inputs AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r) // @@ -806,21 +806,21 @@ static WRITE16_HANDLER( shogwarr_oki_bank_w ) static ADDRESS_MAP_START( shogwarr, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM - AM_RANGE(0x200000, 0x20ffff) AM_READWRITE(MRA16_RAM,calc3_mcu_ram_w) AM_BASE(&kaneko16_mcu_ram) // Shared With MCU + AM_RANGE(0x200000, 0x20ffff) AM_READWRITE(SMH_RAM,calc3_mcu_ram_w) AM_BASE(&kaneko16_mcu_ram) // Shared With MCU AM_RANGE(0x280000, 0x280001) AM_WRITE(calc3_mcu_com0_w) AM_RANGE(0x290000, 0x290001) AM_WRITE(calc3_mcu_com1_w) AM_RANGE(0x2b0000, 0x2b0001) AM_WRITE(calc3_mcu_com2_w) AM_RANGE(0x2d0000, 0x2d0001) AM_WRITE(calc3_mcu_com3_w) - AM_RANGE(0x380000, 0x380fff) AM_READWRITE(MRA16_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE(0x380000, 0x380fff) AM_READWRITE(SMH_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0x400000, 0x400001) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) // Samples AM_RANGE(0x480000, 0x480001) AM_READWRITE(OKIM6295_status_1_lsb_r, OKIM6295_data_1_lsb_w) AM_RANGE(0x580000, 0x581fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites - AM_RANGE(0x600000, 0x600fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 - AM_RANGE(0x601000, 0x601fff) AM_READWRITE(MRA16_RAM,kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) + AM_RANGE(0x600000, 0x600fff) AM_READWRITE(SMH_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 + AM_RANGE(0x601000, 0x601fff) AM_READWRITE(SMH_RAM,kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) AM_RANGE(0x602000, 0x602fff) AM_RAM AM_BASE(&kaneko16_vscroll_1) AM_RANGE(0x603000, 0x603fff) AM_RAM AM_BASE(&kaneko16_vscroll_0) - AM_RANGE(0x800000, 0x80000f) AM_READWRITE(MRA16_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs - AM_RANGE(0x900000, 0x90001f) AM_READWRITE(MRA16_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs + AM_RANGE(0x800000, 0x80000f) AM_READWRITE(SMH_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs + AM_RANGE(0x900000, 0x90001f) AM_READWRITE(SMH_RAM, kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs) // Sprites Regs AM_RANGE(0xa00014, 0xa00015) AM_READ(kaneko16_rnd_r) // Random Number ? AM_RANGE(0xa80000, 0xa80001) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) // Watchdog AM_RANGE(0xb80000, 0xb80001) AM_READ(input_port_0_word_r) // Inputs diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index 3fc199b60d0..5df6258db1b 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -341,17 +341,17 @@ static READ16_HANDLER( karnov_control_r ) /******************************************************************************/ static ADDRESS_MAP_START( karnov_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a0000, 0x0a07ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) + AM_RANGE(0x060000, 0x063fff) AM_READ(SMH_RAM) + AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) + AM_RANGE(0x0a0000, 0x0a07ff) AM_READ(SMH_RAM) AM_RANGE(0x0c0000, 0x0c0007) AM_READ(karnov_control_r) ADDRESS_MAP_END static ADDRESS_MAP_START( karnov_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x060000, 0x063fff) AM_WRITE(MWA16_RAM) AM_BASE(&karnov_ram) - AM_RANGE(0x080000, 0x080fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x060000, 0x063fff) AM_WRITE(SMH_RAM) AM_BASE(&karnov_ram) + AM_RANGE(0x080000, 0x080fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x0a0000, 0x0a07ff) AM_WRITE(karnov_videoram_w) AM_BASE(&videoram16) AM_RANGE(0x0a0800, 0x0a0fff) AM_WRITE(karnov_videoram_w) /* Wndrplnt Mirror */ AM_RANGE(0x0a1000, 0x0a1fff) AM_WRITE(karnov_playfield_w) AM_BASE(&karnov_pf_data) @@ -361,18 +361,18 @@ ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( karnov_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x05ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x05ff) AM_READ(SMH_RAM) AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( karnov_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x05ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_WRITE(YM2203_control_port_0_w) /* OPN */ AM_RANGE(0x1001, 0x1001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x1800, 0x1800) AM_WRITE(YM3526_control_port_0_w) /* OPL */ AM_RANGE(0x1801, 0x1801) AM_WRITE(YM3526_write_port_0_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c index 2e39385112d..7006c33e0f5 100644 --- a/src/mame/drivers/kchamp.c +++ b/src/mame/drivers/kchamp.c @@ -84,33 +84,33 @@ static int nmi_enable = 0; static int sound_nmi_enable = 0; static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd400, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xd8ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd900, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd3ff) AM_READ(SMH_RAM) + AM_RANGE(0xd400, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xd8ff) AM_READ(SMH_RAM) + AM_RANGE(0xd900, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd3ff) AM_WRITE(kchamp_videoram_w) AM_BASE(&videoram) AM_RANGE(0xd400, 0xd7ff) AM_WRITE(kchamp_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xd800, 0xd8ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd900, 0xdfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xd800, 0xd8ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd900, 0xdfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static WRITE8_HANDLER( control_w ) { @@ -176,31 +176,31 @@ ADDRESS_MAP_END ********************/ static ADDRESS_MAP_START( kc_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe400, 0xe7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xea00, 0xeaff) AM_READ(MRA8_RAM) - AM_RANGE(0xeb00, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe3ff) AM_READ(SMH_RAM) + AM_RANGE(0xe400, 0xe7ff) AM_READ(SMH_RAM) + AM_RANGE(0xea00, 0xeaff) AM_READ(SMH_RAM) + AM_RANGE(0xeb00, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( kc_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe3ff) AM_WRITE(kchamp_videoram_w) AM_BASE(&videoram) AM_RANGE(0xe400, 0xe7ff) AM_WRITE(kchamp_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xea00, 0xeaff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xeb00, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xea00, 0xeaff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xeb00, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( kc_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xe2ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xe2ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( kc_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xe2ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xe2ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static READ8_HANDLER( sound_reset_r ) { diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index 004465eb8a4..b03c0ec5bd4 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -504,13 +504,13 @@ static ADDRESS_MAP_START( kickgoal_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800004, 0x800005) AM_WRITE(actionhw_snd_w) AM_RANGE(0x900000, 0x900005) AM_WRITE(kickgoal_eeprom_w) AM_RANGE(0x900006, 0x900007) AM_READ(kickgoal_eeprom_r) - AM_RANGE(0xa00000, 0xa03fff) AM_READWRITE(MRA16_RAM, kickgoal_fgram_w) AM_BASE(&kickgoal_fgram) /* FG Layer */ - AM_RANGE(0xa04000, 0xa07fff) AM_READWRITE(MRA16_RAM, kickgoal_bgram_w) AM_BASE(&kickgoal_bgram) /* Higher BG Layer */ - AM_RANGE(0xa08000, 0xa0bfff) AM_READWRITE(MRA16_RAM, kickgoal_bg2ram_w) AM_BASE(&kickgoal_bg2ram) /* Lower BG Layer */ - AM_RANGE(0xa0c000, 0xa0ffff) AM_READWRITE(MRA16_RAM, MWA16_RAM) // more tilemap? - AM_RANGE(0xa10000, 0xa1000f) AM_WRITE(MWA16_RAM) AM_BASE(&kickgoal_scrram) /* Scroll Registers */ - AM_RANGE(0xb00000, 0xb007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Sprites */ - AM_RANGE(0xc00000, 0xc007ff) AM_READWRITE(MRA16_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) /* Palette */ // actionhw reads this + AM_RANGE(0xa00000, 0xa03fff) AM_READWRITE(SMH_RAM, kickgoal_fgram_w) AM_BASE(&kickgoal_fgram) /* FG Layer */ + AM_RANGE(0xa04000, 0xa07fff) AM_READWRITE(SMH_RAM, kickgoal_bgram_w) AM_BASE(&kickgoal_bgram) /* Higher BG Layer */ + AM_RANGE(0xa08000, 0xa0bfff) AM_READWRITE(SMH_RAM, kickgoal_bg2ram_w) AM_BASE(&kickgoal_bg2ram) /* Lower BG Layer */ + AM_RANGE(0xa0c000, 0xa0ffff) AM_READWRITE(SMH_RAM, SMH_RAM) // more tilemap? + AM_RANGE(0xa10000, 0xa1000f) AM_WRITE(SMH_RAM) AM_BASE(&kickgoal_scrram) /* Scroll Registers */ + AM_RANGE(0xb00000, 0xb007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Sprites */ + AM_RANGE(0xc00000, 0xc007ff) AM_READWRITE(SMH_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) /* Palette */ // actionhw reads this AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index 09db9f03d3a..5e9562493cf 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -80,11 +80,11 @@ static WRITE8_HANDLER( sound_command_w ) { static ADDRESS_MAP_START( main_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc3ff) AM_READ(MRA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc3ff) AM_READ(SMH_RAM) /* work ram */ AM_RANGE(0xe000, 0xe7ff) AM_READ(sprite_shared_r) AM_RANGE(0xe800, 0xefff) AM_READ(video_shared_r) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) /* ???? */ + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) /* ???? */ AM_RANGE(0xfc00, 0xfc00) AM_READ(input_port_0_r) /* DSW 0 */ AM_RANGE(0xfc01, 0xfc01) AM_READ(input_port_1_r) /* DSW 1 */ AM_RANGE(0xfc02, 0xfc02) AM_READ(input_port_2_r) /* Player 1 controls */ @@ -94,32 +94,32 @@ static ADDRESS_MAP_START( main_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( main_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc3ff) AM_WRITE(MWA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc3ff) AM_WRITE(SMH_RAM) /* work ram */ AM_RANGE(0xe000, 0xe7ff) AM_WRITE(sprite_shared_w) /* shared with sprite cpu */ AM_RANGE(0xe800, 0xefff) AM_WRITE(video_shared_w) /* shared with video cpu */ - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) /* ???? */ + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) /* ???? */ AM_RANGE(0xf800, 0xf800) AM_WRITE(kingofb_f800_w) /* NMI enable, palette bank */ - AM_RANGE(0xf801, 0xf801) AM_WRITE(MWA8_NOP) /* ???? */ - AM_RANGE(0xf802, 0xf802) AM_WRITE(MWA8_RAM) AM_BASE(&kingofb_scroll_y) + AM_RANGE(0xf801, 0xf801) AM_WRITE(SMH_NOP) /* ???? */ + AM_RANGE(0xf802, 0xf802) AM_WRITE(SMH_RAM) AM_BASE(&kingofb_scroll_y) AM_RANGE(0xf803, 0xf803) AM_WRITE(scroll_interrupt_w) AM_RANGE(0xf804, 0xf804) AM_WRITE(video_interrupt_w) AM_RANGE(0xf807, 0xf807) AM_WRITE(sound_command_w) /* sound latch */ ADDRESS_MAP_END static ADDRESS_MAP_START( video_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* work ram */ AM_RANGE(0xa000, 0xa7ff) AM_READ(video_shared_r) /* shared with main */ - AM_RANGE(0xc000, 0xc0ff) AM_READ(MRA8_RAM) /* background vram */ - AM_RANGE(0xc400, 0xc4ff) AM_READ(MRA8_RAM) /* background colorram */ - AM_RANGE(0xc800, 0xcbff) AM_READ(MRA8_RAM) /* foreground vram */ - AM_RANGE(0xcc00, 0xcfff) AM_READ(MRA8_RAM) /* foreground colorram */ + AM_RANGE(0xc000, 0xc0ff) AM_READ(SMH_RAM) /* background vram */ + AM_RANGE(0xc400, 0xc4ff) AM_READ(SMH_RAM) /* background colorram */ + AM_RANGE(0xc800, 0xcbff) AM_READ(SMH_RAM) /* foreground vram */ + AM_RANGE(0xcc00, 0xcfff) AM_READ(SMH_RAM) /* foreground colorram */ ADDRESS_MAP_END static ADDRESS_MAP_START( video_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* work ram */ AM_RANGE(0xa000, 0xa7ff) AM_WRITE(video_shared_w) AM_BASE(&video_shared) /* shared with main */ AM_RANGE(0xc000, 0xc0ff) AM_WRITE(kingofb_videoram_w) AM_BASE(&videoram) /* background vram */ AM_RANGE(0xc400, 0xc4ff) AM_WRITE(kingofb_colorram_w) AM_BASE(&colorram) /* background colorram */ @@ -128,30 +128,30 @@ static ADDRESS_MAP_START( video_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sprite_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* work ram */ AM_RANGE(0xa000, 0xa7ff) AM_READ(sprite_shared_r) /* shared with main */ - AM_RANGE(0xc000, 0xc3ff) AM_READ(MRA8_RAM) /* sprite ram */ - AM_RANGE(0xc400, 0xc43f) AM_READ(MRA8_RAM) /* something related to scroll? */ + AM_RANGE(0xc000, 0xc3ff) AM_READ(SMH_RAM) /* sprite ram */ + AM_RANGE(0xc400, 0xc43f) AM_READ(SMH_RAM) /* something related to scroll? */ ADDRESS_MAP_END static ADDRESS_MAP_START( sprite_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* work ram */ AM_RANGE(0xa000, 0xa7ff) AM_WRITE(sprite_shared_w) AM_BASE(&sprite_shared) /* shared with main */ - AM_RANGE(0xc000, 0xc3ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* sprite ram */ - AM_RANGE(0xc400, 0xc43f) AM_WRITE(MWA8_RAM) /* something related to scroll? */ + AM_RANGE(0xc000, 0xc3ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* sprite ram */ + AM_RANGE(0xc400, 0xc43f) AM_WRITE(SMH_RAM) /* something related to scroll? */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc3ff) AM_READ(MRA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc3ff) AM_READ(SMH_RAM) /* work ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x8000, 0x8000) AM_WRITE(MWA8_NOP) /* ??? */ - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc3ff) AM_WRITE(MWA8_RAM) /* work ram */ + AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc3ff) AM_WRITE(SMH_RAM) /* work ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -168,8 +168,8 @@ ADDRESS_MAP_END /* Ring King */ static ADDRESS_MAP_START( rk_main_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc3ff) AM_READ(MRA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc3ff) AM_READ(SMH_RAM) /* work ram */ AM_RANGE(0xc800, 0xcfff) AM_READ(sprite_shared_r) AM_RANGE(0xd000, 0xd7ff) AM_READ(video_shared_r) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) /* DSW 0 */ @@ -178,35 +178,35 @@ static ADDRESS_MAP_START( rk_main_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe003, 0xe003) AM_READ(input_port_3_r) /* Player 2 controls */ AM_RANGE(0xe004, 0xe004) AM_READ(input_port_4_r) /* Coin & Start */ AM_RANGE(0xe005, 0xe005) AM_READ(input_port_5_r) /* Player 1 & 2 button 3 */ - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) /* ???? */ + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) /* ???? */ ADDRESS_MAP_END static ADDRESS_MAP_START( rk_main_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc3ff) AM_WRITE(MWA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc3ff) AM_WRITE(SMH_RAM) /* work ram */ AM_RANGE(0xc800, 0xcfff) AM_WRITE(sprite_shared_w) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(video_shared_w) AM_RANGE(0xd800, 0xd800) AM_WRITE(kingofb_f800_w) AM_RANGE(0xd801, 0xd801) AM_WRITE(sprite_interrupt_w) AM_RANGE(0xd802, 0xd802) AM_WRITE(video_interrupt_w) AM_RANGE(0xd803, 0xd803) AM_WRITE(sound_command_w) - AM_RANGE(0xe800, 0xe800) AM_WRITE(MWA8_RAM) AM_BASE(&kingofb_scroll_y) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) /* ???? */ + AM_RANGE(0xe800, 0xe800) AM_WRITE(SMH_RAM) AM_BASE(&kingofb_scroll_y) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) /* ???? */ ADDRESS_MAP_END static ADDRESS_MAP_START( rk_video_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* work ram */ AM_RANGE(0xc000, 0xc7ff) AM_READ(video_shared_r) /* shared with main */ - AM_RANGE(0xa800, 0xa8ff) AM_READ(MRA8_RAM) /* background vram */ - AM_RANGE(0xac00, 0xacff) AM_READ(MRA8_RAM) /* background colorram */ - AM_RANGE(0xa000, 0xa3ff) AM_READ(MRA8_RAM) /* foreground vram */ - AM_RANGE(0xa400, 0xa7ff) AM_READ(MRA8_RAM) /* foreground colorram */ + AM_RANGE(0xa800, 0xa8ff) AM_READ(SMH_RAM) /* background vram */ + AM_RANGE(0xac00, 0xacff) AM_READ(SMH_RAM) /* background colorram */ + AM_RANGE(0xa000, 0xa3ff) AM_READ(SMH_RAM) /* foreground vram */ + AM_RANGE(0xa400, 0xa7ff) AM_READ(SMH_RAM) /* foreground colorram */ ADDRESS_MAP_END static ADDRESS_MAP_START( rk_video_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* work ram */ AM_RANGE(0xc000, 0xc7ff) AM_WRITE(video_shared_w) AM_BASE(&video_shared) /* shared with main */ AM_RANGE(0xa800, 0xa8ff) AM_WRITE(kingofb_videoram_w) AM_BASE(&videoram) /* background vram */ AM_RANGE(0xac00, 0xacff) AM_WRITE(kingofb_colorram_w) AM_BASE(&colorram) /* background colorram */ @@ -215,19 +215,19 @@ static ADDRESS_MAP_START( rk_video_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( rk_sprite_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* work ram */ AM_RANGE(0xc800, 0xcfff) AM_READ(sprite_shared_r) /* shared with main */ - AM_RANGE(0xa000, 0xa3ff) AM_READ(MRA8_RAM) /* sprite ram */ - AM_RANGE(0xa400, 0xa43f) AM_READ(MRA8_RAM) /* something related to scroll? */ + AM_RANGE(0xa000, 0xa3ff) AM_READ(SMH_RAM) /* sprite ram */ + AM_RANGE(0xa400, 0xa43f) AM_READ(SMH_RAM) /* something related to scroll? */ ADDRESS_MAP_END static ADDRESS_MAP_START( rk_sprite_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* work ram */ AM_RANGE(0xc800, 0xcfff) AM_WRITE(sprite_shared_w) AM_BASE(&sprite_shared) /* shared with main */ - AM_RANGE(0xa000, 0xa3ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* sprite ram */ - AM_RANGE(0xa400, 0xa43f) AM_WRITE(MWA8_RAM) /* something related to scroll? */ + AM_RANGE(0xa000, 0xa3ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* sprite ram */ + AM_RANGE(0xa400, 0xa43f) AM_WRITE(SMH_RAM) /* something related to scroll? */ ADDRESS_MAP_END static ADDRESS_MAP_START( rk_sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/kinstb.c b/src/mame/drivers/kinstb.c index 8b8e81faf5e..25c8036fd24 100644 --- a/src/mame/drivers/kinstb.c +++ b/src/mame/drivers/kinstb.c @@ -74,7 +74,7 @@ static WRITE8_HANDLER(sharedram_w) static ADDRESS_MAP_START( kinstb_map, ADDRESS_SPACE_PROGRAM, 8) AM_RANGE(0x000000, 0x2fffff) AM_READWRITE(snes_r_bank1, snes_w_bank1) /* I/O and ROM (repeats for each bank) */ AM_RANGE(0x300000, 0x3fffff) AM_READWRITE(snes_r_bank2, snes_w_bank2) /* I/O and ROM (repeats for each bank) */ - AM_RANGE(0x400000, 0x5fffff) AM_READWRITE(snes_r_bank3, MWA8_ROM) /* ROM (and reserved in Mode 20) */ + AM_RANGE(0x400000, 0x5fffff) AM_READWRITE(snes_r_bank3, SMH_ROM) /* ROM (and reserved in Mode 20) */ AM_RANGE(0x600000, 0x6fffff) AM_READWRITE(snes_r_bank6, snes_w_bank6) /* used by Mode 20 DSP-1 */ AM_RANGE(0x700000, 0x77ffff) AM_READWRITE(snes_r_sram, snes_w_sram) /* 256KB Mode 20 save ram + reserved from 0x8000 - 0xffff */ AM_RANGE(0x781000, 0x7810ff) AM_READWRITE(sharedram_r, sharedram_w) /*shared with some device - mcu ? */ diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c index 4955672b32d..d76ee129bf4 100644 --- a/src/mame/drivers/klax.c +++ b/src/mame/drivers/klax.c @@ -102,18 +102,18 @@ static WRITE16_HANDLER( adpcm_w ) *************************************/ static ADDRESS_MAP_START( main_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x0e0000, 0x0e0fff) AM_READ(atarigen_eeprom_r) AM_RANGE(0x260000, 0x260001) AM_READ(input_port_0_word_r) AM_RANGE(0x260002, 0x260003) AM_READ(input_port_1_word_r) AM_RANGE(0x270000, 0x270001) AM_READ(adpcm_r) - AM_RANGE(0x3e0000, 0x3e07ff) AM_READ(MRA16_RAM) - AM_RANGE(0x3f0000, 0x3f3fff) AM_READ(MRA16_RAM) + AM_RANGE(0x3e0000, 0x3e07ff) AM_READ(SMH_RAM) + AM_RANGE(0x3f0000, 0x3f3fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( main_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x0e0000, 0x0e0fff) AM_WRITE(atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x260000, 0x260001) AM_WRITE(klax_latch_w) @@ -125,7 +125,7 @@ static ADDRESS_MAP_START( main_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x3f0f80, 0x3f0fff) AM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x3f1000, 0x3f1fff) AM_WRITE(atarigen_playfield_upper_w) AM_BASE(&atarigen_playfield_upper) AM_RANGE(0x3f2000, 0x3f27ff) AM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0x3f2800, 0x3f3fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x3f2800, 0x3f3fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c index 785b2b1129e..58c098b0912 100644 --- a/src/mame/drivers/kncljoe.c +++ b/src/mame/drivers/kncljoe.c @@ -55,7 +55,7 @@ WRITE8_HANDLER( sound_cmd_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xcfff) AM_READWRITE(MRA8_RAM, kncljoe_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xc000, 0xcfff) AM_READWRITE(SMH_RAM, kncljoe_videoram_w) AM_BASE(&videoram) AM_RANGE(0xd000, 0xd001) AM_WRITE(kncljoe_scroll_w) AM_BASE(&kncljoe_scrollregs) AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r) /* IN 0 */ AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r) /* IN 1 */ @@ -66,8 +66,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd801, 0xd801) AM_WRITE(kncljoe_control_w) AM_RANGE(0xd802, 0xd802) AM_WRITE(SN76496_0_w) AM_RANGE(0xd803, 0xd803) AM_WRITE(SN76496_1_w) - AM_RANGE(0xd807, 0xd807) AM_READ(MRA8_NOP) /* unknown read */ - AM_RANGE(0xd817, 0xd817) AM_READ(MRA8_NOP) /* unknown read */ + AM_RANGE(0xd807, 0xd807) AM_READ(SMH_NOP) /* unknown read */ + AM_RANGE(0xd817, 0xd817) AM_READ(SMH_NOP) /* unknown read */ AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index 1f627c855ad..f0da5589d55 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -258,8 +258,8 @@ static WRITE16_HANDLER( sndcomm68k_w ) /* 68000 memory handling */ static ADDRESS_MAP_START( sndreadmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x2004ff) AM_READ(dual539_r) AM_RANGE(0x300000, 0x300001) AM_READ(tms57002_data_word_r) AM_RANGE(0x400010, 0x40001f) AM_READ(sndcomm68k_r) @@ -267,12 +267,12 @@ static ADDRESS_MAP_START( sndreadmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sndwritemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x2004ff) AM_WRITE(dual539_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(tms57002_data_word_w) AM_RANGE(0x400000, 0x40000f) AM_WRITE(sndcomm68k_w) AM_RANGE(0x500000, 0x500001) AM_WRITE(tms57002_control_word_w) - AM_RANGE(0x580000, 0x580001) AM_WRITE(MWA16_NOP) /* ?? */ + AM_RANGE(0x580000, 0x580001) AM_WRITE(SMH_NOP) /* ?? */ ADDRESS_MAP_END static const struct K054539interface k054539_interface = diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index 8d935d13092..48ab63fc194 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -636,7 +636,7 @@ static DRIVER_INIT( btchamp ) memory_install_read32_handler (0, ADDRESS_SPACE_PROGRAM, 0x1f680080, 0x1f68008f, 0, 0, btc_trackball_r ); memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1f680080, 0x1f68008f, 0, 0, btc_trackball_w ); - memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1f6800e0, 0x1f6800e3, 0, 0, MWA32_NOP ); + memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1f6800e0, 0x1f6800e3, 0, 0, SMH_NOP ); memory_install_read32_handler (0, ADDRESS_SPACE_PROGRAM, 0x1f380000, 0x1f3fffff, 0, 0, btcflash_r ); memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1f380000, 0x1f3fffff, 0, 0, btcflash_w ); diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index a76ea199314..f916fcd8acb 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1159,8 +1159,8 @@ static ADDRESS_MAP_START( gx_type1_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xddc000, 0xddcfff) AM_READ(adc0834_r) AM_RANGE(0xdde000, 0xdde003) AM_WRITE(type1_cablamps_w) AM_RANGE(0xe00000, 0xe0001f) AM_RAM AM_BASE((UINT32**)&K053936_1_ctrl) - AM_RANGE(0xe20000, 0xe2000f) AM_WRITE(MWA32_NOP) - AM_RANGE(0xe40000, 0xe40003) AM_WRITE(MWA32_NOP) + AM_RANGE(0xe20000, 0xe2000f) AM_WRITE(SMH_NOP) + AM_RANGE(0xe40000, 0xe40003) AM_WRITE(SMH_NOP) AM_RANGE(0xe80000, 0xe81fff) AM_RAM AM_BASE((UINT32**)&K053936_1_linectrl) // chips 21L+19L / S AM_RANGE(0xec0000, 0xedffff) AM_RAM AM_WRITE(konamigx_t1_psacmap_w) AM_BASE(&gx_psacram) // chips 20J+23J+18J / S AM_RANGE(0xf00000, 0xf3ffff) AM_READ(type1_roz_r1) // ROM readback @@ -1178,8 +1178,8 @@ static ADDRESS_MAP_START( gx_type3_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xd90000, 0xd97fff) AM_RAM AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w) AM_RANGE(0xe00000, 0xe0001f) AM_RAM AM_BASE((UINT32**)&K053936_1_ctrl) - AM_RANGE(0xe20000, 0xe20003) AM_WRITE(MWA32_NOP) - AM_RANGE(0xe40000, 0xe40003) AM_WRITE(MWA32_NOP) + AM_RANGE(0xe20000, 0xe20003) AM_WRITE(SMH_NOP) + AM_RANGE(0xe40000, 0xe40003) AM_WRITE(SMH_NOP) AM_RANGE(0xe60000, 0xe60fff) AM_RAM AM_BASE((UINT32**)&K053936_1_linectrl) AM_RANGE(0xe80000, 0xe87fff) AM_RAM AM_WRITE(konamigx_555_palette_w) AM_BASE(&paletteram32) // main monitor palette (twice as large as reality) AM_RANGE(0xea0000, 0xea3fff) AM_RAM AM_WRITE(konamigx_555_palette2_w) AM_BASE(&gx_subpaletteram32) // sub monitor palette @@ -1191,8 +1191,8 @@ static ADDRESS_MAP_START( gx_type4_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w) AM_RANGE(0xd90000, 0xd97fff) AM_RAM AM_RANGE(0xe00000, 0xe0001f) AM_RAM AM_BASE((UINT32**)&K053936_1_ctrl) - AM_RANGE(0xe20000, 0xe20003) AM_WRITE(MWA32_NOP) - AM_RANGE(0xe40000, 0xe40003) AM_WRITE(MWA32_NOP) + AM_RANGE(0xe20000, 0xe20003) AM_WRITE(SMH_NOP) + AM_RANGE(0xe40000, 0xe40003) AM_WRITE(SMH_NOP) AM_RANGE(0xe60000, 0xe60fff) AM_RAM AM_BASE((UINT32**)&K053936_1_linectrl) // 29C & 29G (PSAC2 line control) AM_RANGE(0xe80000, 0xe8ffff) AM_RAM AM_WRITE(konamigx_palette_w) AM_BASE(&paletteram32) // 11G/13G/15G (main screen palette RAM) (twice as large as reality) AM_RANGE(0xea0000, 0xea7fff) AM_RAM AM_WRITE(konamigx_palette2_w) AM_BASE(&gx_subpaletteram32) // 5G/7G/9G (sub screen palette RAM) @@ -1236,7 +1236,7 @@ static WRITE16_HANDLER( sndcomm68k_w ) /* 68000 memory handling */ static ADDRESS_MAP_START( gxsndmap, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE(&gx_sndram) AM_RANGE(0x200000, 0x2004ff) AM_READWRITE(dual539_r, dual539_w) AM_RANGE(0x300000, 0x300001) AM_READWRITE(tms57002_data_word_r, tms57002_data_word_w) diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c index 381f55d7ce2..1514d1ae825 100644 --- a/src/mame/drivers/ksayakyu.c +++ b/src/mame/drivers/ksayakyu.c @@ -106,20 +106,20 @@ 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_READWRITE(MRA8_BANK1, MWA8_NOP) + AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK1, SMH_NOP) AM_RANGE(0x8000, 0x9fff) AM_ROM AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_RANGE(0xa800, 0xa800) AM_READ(input_port_0_r) AM_RANGE(0xa801, 0xa801) AM_READ(input_port_1_r) AM_RANGE(0xa802, 0xa802) AM_READ(input_port_2_r) - AM_RANGE(0xa803, 0xa803) AM_READ(MRA8_NOP) /* watchdog ? */ + AM_RANGE(0xa803, 0xa803) AM_READ(SMH_NOP) /* watchdog ? */ AM_RANGE(0xa804, 0xa804) AM_WRITE(ksayakyu_videoctrl_w) AM_RANGE(0xa805, 0xa805) AM_WRITE(latch_w) AM_RANGE(0xa806, 0xa806) AM_READ(sound_status_r) - AM_RANGE(0xa807, 0xa807) AM_READ(MRA8_NOP) /* watchdog ? */ + AM_RANGE(0xa807, 0xa807) AM_READ(SMH_NOP) /* watchdog ? */ AM_RANGE(0xa808, 0xa808) AM_WRITE(bank_select_w) - AM_RANGE(0xb000, 0xb7ff) AM_READWRITE(MRA8_RAM, ksayakyu_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xb800, 0xbfff) AM_READWRITE(MRA8_RAM, MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xb000, 0xb7ff) AM_READWRITE(SMH_RAM, ksayakyu_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xb800, 0xbfff) AM_READWRITE(SMH_RAM, SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( soundcpu_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -130,9 +130,9 @@ static ADDRESS_MAP_START( soundcpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa003, 0xa003) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xa006, 0xa006) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0xa007, 0xa007) AM_WRITE(AY8910_control_port_1_w) - AM_RANGE(0xa008, 0xa008) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa008, 0xa008) AM_WRITE(SMH_NOP) AM_RANGE(0xa00c, 0xa00c) AM_WRITE(tomaincpu_w) - AM_RANGE(0xa010, 0xa010) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa010, 0xa010) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static INPUT_PORTS_START( ksayakyu ) diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index 3933dcdd598..27c7cd4c539 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -58,10 +58,10 @@ WRITE8_HANDLER( kyugo_sub_cpu_control_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x87ff) AM_READWRITE(MRA8_RAM, kyugo_bgvideoram_w) AM_BASE(&kyugo_bgvideoram) - AM_RANGE(0x8800, 0x8fff) AM_READWRITE(MRA8_RAM, kyugo_bgattribram_w) AM_BASE(&kyugo_bgattribram) - AM_RANGE(0x9000, 0x97ff) AM_READWRITE(MRA8_RAM, kyugo_fgvideoram_w) AM_BASE(&kyugo_fgvideoram) - AM_RANGE(0x9800, 0x9fff) AM_READWRITE(kyugo_spriteram_2_r, MWA8_RAM) AM_BASE(&kyugo_spriteram_2) + AM_RANGE(0x8000, 0x87ff) AM_READWRITE(SMH_RAM, kyugo_bgvideoram_w) AM_BASE(&kyugo_bgvideoram) + AM_RANGE(0x8800, 0x8fff) AM_READWRITE(SMH_RAM, kyugo_bgattribram_w) AM_BASE(&kyugo_bgattribram) + AM_RANGE(0x9000, 0x97ff) AM_READWRITE(SMH_RAM, kyugo_fgvideoram_w) AM_BASE(&kyugo_fgvideoram) + AM_RANGE(0x9800, 0x9fff) AM_READWRITE(kyugo_spriteram_2_r, SMH_RAM) AM_BASE(&kyugo_spriteram_2) AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE(&kyugo_spriteram_1) AM_RANGE(0xa800, 0xa800) AM_WRITE(kyugo_scroll_x_lo_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(kyugo_gfxctrl_w) @@ -1243,13 +1243,13 @@ static DRIVER_INIT( gyrodine ) static DRIVER_INIT( srdmissn ) { /* shared RAM is mapped at 0xe000 as well */ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xe000, 0xe7ff, 0, 0, MRA8_BANK1); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xe000, 0xe7ff, 0, 0, MWA8_BANK1); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xe000, 0xe7ff, 0, 0, SMH_BANK1); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xe000, 0xe7ff, 0, 0, SMH_BANK1); memory_set_bankptr(1, shared_ram); /* extra RAM on sub CPU */ - memory_install_read8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8800, 0x8fff, 0, 0, MRA8_BANK2); - memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8800, 0x8fff, 0, 0, MWA8_BANK2); + memory_install_read8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8800, 0x8fff, 0, 0, SMH_BANK2); + memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8800, 0x8fff, 0, 0, SMH_BANK2); memory_set_bankptr(2, auto_malloc(0x800)); } diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c index a67f9c22876..0e726021e1e 100644 --- a/src/mame/drivers/labyrunr.c +++ b/src/mame/drivers/labyrunr.c @@ -54,7 +54,7 @@ if (data & 0xe0) popmessage("bankswitch %02x",data); } static ADDRESS_MAP_START( labyrunr_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0020, 0x005f) AM_READ(MRA8_RAM) /* scroll registers */ + AM_RANGE(0x0020, 0x005f) AM_READ(SMH_RAM) /* scroll registers */ AM_RANGE(0x0801, 0x0801) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x0800, 0x0800) AM_READ(YM2203_read_port_0_r) AM_RANGE(0x0901, 0x0901) AM_READ(YM2203_status_port_1_r) @@ -63,16 +63,16 @@ static ADDRESS_MAP_START( labyrunr_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0a01, 0x0a01) AM_READ(input_port_4_r) AM_RANGE(0x0b00, 0x0b00) AM_READ(input_port_3_r) AM_RANGE(0x0d00, 0x0d1f) AM_READ(K051733_r) /* 051733 (protection) */ - AM_RANGE(0x1000, 0x10ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x1000, 0x10ff) AM_READ(SMH_RAM) + AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( labyrunr_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0007) AM_WRITE(K007121_ctrl_0_w) - AM_RANGE(0x0020, 0x005f) AM_WRITE(MWA8_RAM) AM_BASE(&labyrunr_scrollram) /* scroll registers */ + AM_RANGE(0x0020, 0x005f) AM_WRITE(SMH_RAM) AM_BASE(&labyrunr_scrollram) /* scroll registers */ AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x0901, 0x0901) AM_WRITE(YM2203_control_port_1_w) @@ -80,12 +80,12 @@ static ADDRESS_MAP_START( labyrunr_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0c00, 0x0c00) AM_WRITE(labyrunr_bankswitch_w) AM_RANGE(0x0d00, 0x0d1f) AM_WRITE(K051733_w) /* 051733 (protection) */ AM_RANGE(0x0e00, 0x0e00) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x1000, 0x10ff) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) - AM_RANGE(0x1800, 0x1fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x2000, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) /* Sprite RAM */ + AM_RANGE(0x1000, 0x10ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) + AM_RANGE(0x1800, 0x1fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) /* Sprite RAM */ AM_RANGE(0x3000, 0x37ff) AM_WRITE(labyrunr_vram1_w) AM_BASE(&labyrunr_videoram1) AM_RANGE(0x3800, 0x3fff) AM_WRITE(labyrunr_vram2_w) AM_BASE(&labyrunr_videoram2) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c index c1e40d3eee3..afafcc2a8c8 100644 --- a/src/mame/drivers/ladybug.c +++ b/src/mame/drivers/ladybug.c @@ -80,8 +80,8 @@ WRITE8_HANDLER( sraider_misc_w ); static ADDRESS_MAP_START( ladybug_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6fff) AM_RAM - AM_RANGE(0x7000, 0x73ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_NOP) + AM_RANGE(0x7000, 0x73ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_NOP) AM_RANGE(0x9000, 0x9000) AM_READ(input_port_0_r) AM_RANGE(0x9001, 0x9001) AM_READ(input_port_1_r) AM_RANGE(0x9002, 0x9002) AM_READ(input_port_3_r) @@ -89,8 +89,8 @@ static ADDRESS_MAP_START( ladybug_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xa000) AM_WRITE(ladybug_flipscreen_w) AM_RANGE(0xb000, 0xbfff) AM_WRITE(SN76496_0_w) AM_RANGE(0xc000, 0xcfff) AM_WRITE(SN76496_1_w) - AM_RANGE(0xd000, 0xd3ff) AM_READWRITE(MRA8_RAM, ladybug_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xd400, 0xd7ff) AM_READWRITE(MRA8_RAM, ladybug_colorram_w) AM_BASE(&colorram) + AM_RANGE(0xd000, 0xd3ff) AM_READWRITE(SMH_RAM, ladybug_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xd400, 0xd7ff) AM_READWRITE(SMH_RAM, ladybug_colorram_w) AM_BASE(&colorram) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_2_r) /* IN2 */ ADDRESS_MAP_END @@ -98,7 +98,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sraider_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6fff) AM_RAM - AM_RANGE(0x7000, 0x73ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x7000, 0x73ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x8005, 0x8005) AM_READ(sraider_8005_r) // protection check? AM_RANGE(0x8006, 0x8006) AM_WRITE(sraider_sound_low_w) AM_RANGE(0x8007, 0x8007) AM_WRITE(sraider_sound_high_w) @@ -108,7 +108,7 @@ static ADDRESS_MAP_START( sraider_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9003, 0x9003) AM_READ(input_port_3_r) AM_RANGE(0xd000, 0xd3ff) AM_WRITE(ladybug_videoram_w) AM_BASE(&videoram) AM_RANGE(0xd400, 0xd7ff) AM_WRITE(ladybug_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe000, 0xe000) AM_WRITE(MWA8_NOP) //unknown 0x10 when in attract, 0x20 when coined/playing + AM_RANGE(0xe000, 0xe000) AM_WRITE(SMH_NOP) //unknown 0x10 when in attract, 0x20 when coined/playing ADDRESS_MAP_END @@ -117,8 +117,8 @@ static ADDRESS_MAP_START( sraider_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x63ff) AM_RAM AM_RANGE(0x8000, 0x8000) AM_READ(sraider_sound_low_r) AM_RANGE(0xa000, 0xa000) AM_READ(sraider_sound_high_r) - AM_RANGE(0xc000, 0xc000) AM_READ(MRA8_NOP) //some kind of sync - AM_RANGE(0xe000, 0xe0ff) AM_WRITE(MWA8_RAM) AM_BASE(&sraider_grid_data) + AM_RANGE(0xc000, 0xc000) AM_READ(SMH_NOP) //some kind of sync + AM_RANGE(0xe000, 0xe0ff) AM_WRITE(SMH_RAM) AM_BASE(&sraider_grid_data) AM_RANGE(0xe800, 0xe800) AM_WRITE(sraider_io_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index f4e71ae1394..9ec774d0ad0 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -140,8 +140,8 @@ static READ8_HANDLER( snd_flag_r ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc07f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc07f) AM_READ(SMH_RAM) AM_RANGE(0xc080, 0xc87f) AM_READ(ladyfrog_videoram_r) AM_RANGE(0xd400, 0xd400) AM_READ(from_snd_r) AM_RANGE(0xd401, 0xd401) AM_READ(snd_flag_r) @@ -151,52 +151,52 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd806, 0xd806) AM_READ(input_port_3_r) AM_RANGE(0xdc00, 0xdc9f) AM_READ(ladyfrog_spriteram_r) AM_RANGE(0xdca0, 0xdcbf) AM_READ(ladyfrog_scrlram_r) - AM_RANGE(0xdcc0, 0xdcff) AM_READ(MRA8_RAM) + AM_RANGE(0xdcc0, 0xdcff) AM_READ(SMH_RAM) AM_RANGE(0xdd00, 0xdeff) AM_READ(ladyfrog_palette_r) - AM_RANGE(0xd0d0, 0xd0d0) AM_READ(MRA8_NOP) /* code jumps to ASCII text "Alfa tecnology" @ $b7 */ - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xd0d0, 0xd0d0) AM_READ(SMH_NOP) /* code jumps to ASCII text "Alfa tecnology" @ $b7 */ + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc07f) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc07f) AM_WRITE(SMH_RAM) AM_RANGE(0xc080, 0xc87f) AM_WRITE(ladyfrog_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xd000, 0xd000) AM_WRITE(ladyfrog_gfxctrl2_w) AM_RANGE(0xd400, 0xd400) AM_WRITE(sound_command_w) AM_RANGE(0xd403, 0xd403) AM_WRITE(sound_cpu_reset_w) AM_RANGE(0xdc00, 0xdc9f) AM_WRITE(ladyfrog_spriteram_w) AM_RANGE(0xdca0, 0xdcbf) AM_WRITE(ladyfrog_scrlram_w) AM_BASE(&ladyfrog_scrlram) - AM_RANGE(0xdcc0, 0xdcff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xdcc0, 0xdcff) AM_WRITE(SMH_RAM) AM_RANGE(0xdd00, 0xdeff) AM_WRITE(ladyfrog_palette_w) AM_RANGE(0xdf03, 0xdf03) AM_WRITE(ladyfrog_gfxctrl_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) - AM_RANGE(0xd200, 0xd200) AM_READ(MRA8_NOP) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_NOP) + AM_RANGE(0xd200, 0xd200) AM_READ(SMH_NOP) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xc800, 0xc801) AM_WRITE(MWA8_NOP) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xc800, 0xc801) AM_WRITE(SMH_NOP) AM_RANGE(0xc802, 0xc802) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xc803, 0xc803) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0xc900, 0xc90d) AM_WRITE(MSM5232_0_w) - AM_RANGE(0xca00, 0xca00) AM_WRITE(MWA8_NOP) - AM_RANGE(0xcb00, 0xcb00) AM_WRITE(MWA8_NOP) - AM_RANGE(0xcc00, 0xcc00) AM_WRITE(MWA8_NOP) + AM_RANGE(0xca00, 0xca00) AM_WRITE(SMH_NOP) + AM_RANGE(0xcb00, 0xcb00) AM_WRITE(SMH_NOP) + AM_RANGE(0xcc00, 0xcc00) AM_WRITE(SMH_NOP) AM_RANGE(0xd000, 0xd000) AM_WRITE(to_main_w) AM_RANGE(0xd200, 0xd200) AM_WRITE(nmi_enable_w) AM_RANGE(0xd400, 0xd400) AM_WRITE(nmi_disable_w) - AM_RANGE(0xd600, 0xd600) AM_WRITE(MWA8_NOP) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_NOP) + AM_RANGE(0xd600, 0xd600) AM_WRITE(SMH_NOP) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c index 68c5bae5f5e..ee7b4d785dd 100644 --- a/src/mame/drivers/lasso.c +++ b/src/mame/drivers/lasso.c @@ -80,16 +80,16 @@ static WRITE8_HANDLER( sound_select_w ) static ADDRESS_MAP_START( lasso_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x0400, 0x07ff) AM_READWRITE(MRA8_RAM, lasso_videoram_w) AM_BASE(&lasso_videoram) - AM_RANGE(0x0800, 0x0bff) AM_READWRITE(MRA8_RAM, lasso_colorram_w) AM_BASE(&lasso_colorram) + AM_RANGE(0x0400, 0x07ff) AM_READWRITE(SMH_RAM, lasso_videoram_w) AM_BASE(&lasso_videoram) + AM_RANGE(0x0800, 0x0bff) AM_READWRITE(SMH_RAM, lasso_colorram_w) AM_BASE(&lasso_colorram) AM_RANGE(0x0c00, 0x0c7f) AM_RAM AM_BASE(&lasso_spriteram) AM_SIZE(&lasso_spriteram_size) AM_RANGE(0x1000, 0x17ff) AM_RAM AM_SHARE(1) AM_RANGE(0x1800, 0x1800) AM_WRITE(sound_command_w) - AM_RANGE(0x1801, 0x1801) AM_WRITE(MWA8_RAM) AM_BASE(&lasso_back_color) + AM_RANGE(0x1801, 0x1801) AM_WRITE(SMH_RAM) AM_BASE(&lasso_back_color) AM_RANGE(0x1802, 0x1802) AM_WRITE(lasso_video_control_w) AM_RANGE(0x1804, 0x1804) AM_READ(input_port_0_r) AM_RANGE(0x1805, 0x1805) AM_READ(input_port_1_r) - AM_RANGE(0x1806, 0x1806) AM_READWRITE(input_port_2_r, MWA8_NOP) /* game uses 'lsr' to read port */ + AM_RANGE(0x1806, 0x1806) AM_READWRITE(input_port_2_r, SMH_NOP) /* game uses 'lsr' to read port */ AM_RANGE(0x1807, 0x1807) AM_READ(input_port_3_r) AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM ADDRESS_MAP_END @@ -98,7 +98,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lasso_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM AM_RANGE(0x5000, 0x7fff) AM_ROM - AM_RANGE(0xb000, 0xb000) AM_WRITE(MWA8_RAM) AM_BASE(&lasso_chip_data) + AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_RAM) AM_BASE(&lasso_chip_data) AM_RANGE(0xb001, 0xb001) AM_WRITE(sound_select_w) AM_RANGE(0xb004, 0xb004) AM_READ(sound_status_r) AM_RANGE(0xb005, 0xb005) AM_READ(soundlatch_r) @@ -115,13 +115,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( chameleo_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x0400, 0x07ff) AM_READWRITE(MRA8_RAM, lasso_videoram_w) AM_BASE(&lasso_videoram) - AM_RANGE(0x0800, 0x0bff) AM_READWRITE(MRA8_RAM, lasso_colorram_w) AM_BASE(&lasso_colorram) + AM_RANGE(0x0400, 0x07ff) AM_READWRITE(SMH_RAM, lasso_videoram_w) AM_BASE(&lasso_videoram) + AM_RANGE(0x0800, 0x0bff) AM_READWRITE(SMH_RAM, lasso_colorram_w) AM_BASE(&lasso_colorram) AM_RANGE(0x0c00, 0x0fff) AM_RAM AM_RANGE(0x1000, 0x107f) AM_RAM AM_BASE(&lasso_spriteram) AM_SIZE(&lasso_spriteram_size) AM_RANGE(0x1080, 0x10ff) AM_RAM AM_RANGE(0x1800, 0x1800) AM_WRITE(sound_command_w) - AM_RANGE(0x1801, 0x1801) AM_WRITE(MWA8_RAM) AM_BASE(&lasso_back_color) + AM_RANGE(0x1801, 0x1801) AM_WRITE(SMH_RAM) AM_BASE(&lasso_back_color) AM_RANGE(0x1802, 0x1802) AM_WRITE(lasso_video_control_w) AM_RANGE(0x1804, 0x1804) AM_READ(input_port_0_r) AM_RANGE(0x1805, 0x1805) AM_READ(input_port_1_r) @@ -136,7 +136,7 @@ static ADDRESS_MAP_START( chameleo_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM AM_RANGE(0x1000, 0x1fff) AM_ROM AM_RANGE(0x6000, 0x7fff) AM_ROM - AM_RANGE(0xb000, 0xb000) AM_WRITE(MWA8_RAM) AM_BASE(&lasso_chip_data) + AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_RAM) AM_BASE(&lasso_chip_data) AM_RANGE(0xb001, 0xb001) AM_WRITE(sound_select_w) AM_RANGE(0xb004, 0xb004) AM_READ(sound_status_r) AM_RANGE(0xb005, 0xb005) AM_READ(soundlatch_r) @@ -146,18 +146,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( wwjgtin_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x0bff) AM_READWRITE(MRA8_RAM, lasso_videoram_w) AM_BASE(&lasso_videoram) - AM_RANGE(0x0c00, 0x0fff) AM_READWRITE(MRA8_RAM, lasso_colorram_w) AM_BASE(&lasso_colorram) + AM_RANGE(0x0800, 0x0bff) AM_READWRITE(SMH_RAM, lasso_videoram_w) AM_BASE(&lasso_videoram) + AM_RANGE(0x0c00, 0x0fff) AM_READWRITE(SMH_RAM, lasso_colorram_w) AM_BASE(&lasso_colorram) AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE(&lasso_spriteram) AM_SIZE(&lasso_spriteram_size) AM_RANGE(0x1800, 0x1800) AM_WRITE(sound_command_w) - AM_RANGE(0x1801, 0x1801) AM_WRITE(MWA8_RAM) AM_BASE(&lasso_back_color) + AM_RANGE(0x1801, 0x1801) AM_WRITE(SMH_RAM) AM_BASE(&lasso_back_color) AM_RANGE(0x1802, 0x1802) AM_WRITE(wwjgtin_video_control_w ) AM_RANGE(0x1804, 0x1804) AM_READ(input_port_0_r) AM_RANGE(0x1805, 0x1805) AM_READ(input_port_1_r) AM_RANGE(0x1806, 0x1806) AM_READ(input_port_2_r) AM_RANGE(0x1807, 0x1807) AM_READ(input_port_3_r) - AM_RANGE(0x1c00, 0x1c03) AM_WRITE(MWA8_RAM) AM_BASE(&wwjgtin_last_colors) - AM_RANGE(0x1c04, 0x1c07) AM_WRITE(MWA8_RAM) AM_BASE(&wwjgtin_track_scroll) + AM_RANGE(0x1c00, 0x1c03) AM_WRITE(SMH_RAM) AM_BASE(&wwjgtin_last_colors) + AM_RANGE(0x1c04, 0x1c07) AM_WRITE(SMH_RAM) AM_BASE(&wwjgtin_track_scroll) AM_RANGE(0x4000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION(REGION_CPU1, 0x8000) ADDRESS_MAP_END @@ -166,7 +166,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( wwjgtin_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM AM_RANGE(0x4000, 0x7fff) AM_MIRROR(0x8000) AM_ROM - AM_RANGE(0xb000, 0xb000) AM_WRITE(MWA8_RAM) AM_BASE(&lasso_chip_data) + AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_RAM) AM_BASE(&lasso_chip_data) AM_RANGE(0xb001, 0xb001) AM_WRITE(sound_select_w) AM_RANGE(0xb003, 0xb003) AM_WRITE(DAC_0_data_w) AM_RANGE(0xb004, 0xb004) AM_READ(sound_status_r) @@ -176,8 +176,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pinbo_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x0400, 0x07ff) AM_READWRITE(MRA8_RAM, lasso_videoram_w) AM_BASE(&lasso_videoram) - AM_RANGE(0x0800, 0x0bff) AM_READWRITE(MRA8_RAM, lasso_colorram_w) AM_BASE(&lasso_colorram) + AM_RANGE(0x0400, 0x07ff) AM_READWRITE(SMH_RAM, lasso_videoram_w) AM_BASE(&lasso_videoram) + AM_RANGE(0x0800, 0x0bff) AM_READWRITE(SMH_RAM, lasso_colorram_w) AM_BASE(&lasso_colorram) AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE(&lasso_spriteram) AM_SIZE(&lasso_spriteram_size) AM_RANGE(0x1800, 0x1800) AM_WRITE(pinbo_sound_command_w) AM_RANGE(0x1802, 0x1802) AM_WRITE(pinbo_video_control_w) @@ -205,8 +205,8 @@ static ADDRESS_MAP_START( pinbo_audio_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x05, 0x05) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x06, 0x06) AM_READ(AY8910_read_port_1_r) - AM_RANGE(0x08, 0x08) AM_READWRITE(soundlatch_r, MWA8_NOP) /* ??? */ - AM_RANGE(0x14, 0x14) AM_WRITE(MWA8_NOP) /* ??? */ + AM_RANGE(0x08, 0x08) AM_READWRITE(soundlatch_r, SMH_NOP) /* ??? */ + AM_RANGE(0x14, 0x14) AM_WRITE(SMH_NOP) /* ??? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c index 0deb8b220fb..6885d3f1cd7 100644 --- a/src/mame/drivers/lastduel.c +++ b/src/mame/drivers/lastduel.c @@ -46,23 +46,23 @@ static WRITE16_HANDLER( lastduel_sound_w ) /******************************************************************************/ static ADDRESS_MAP_START( lastduel_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0xfc0800, 0xfc0fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) + AM_RANGE(0xfc0800, 0xfc0fff) AM_READ(SMH_RAM) AM_RANGE(0xfc4000, 0xfc4001) AM_READ(input_port_0_word_r) AM_RANGE(0xfc4002, 0xfc4003) AM_READ(input_port_1_word_r) AM_RANGE(0xfc4004, 0xfc4005) AM_READ(input_port_2_word_r) AM_RANGE(0xfc4006, 0xfc4007) AM_READ(input_port_3_word_r) - AM_RANGE(0xfcc000, 0xfcdfff) AM_READ(MRA16_RAM) - AM_RANGE(0xfd0000, 0xfd3fff) AM_READ(MRA16_RAM) - AM_RANGE(0xfd4000, 0xfd7fff) AM_READ(MRA16_RAM) - AM_RANGE(0xfd8000, 0xfd87ff) AM_READ(MRA16_RAM) - AM_RANGE(0xfe0000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xfcc000, 0xfcdfff) AM_READ(SMH_RAM) + AM_RANGE(0xfd0000, 0xfd3fff) AM_READ(SMH_RAM) + AM_RANGE(0xfd4000, 0xfd7fff) AM_READ(SMH_RAM) + AM_RANGE(0xfd8000, 0xfd87ff) AM_READ(SMH_RAM) + AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( lastduel_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0xfc0000, 0xfc0003) AM_WRITE(MWA16_NOP) /* Written rarely */ - AM_RANGE(0xfc0800, 0xfc0fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xfc0000, 0xfc0003) AM_WRITE(SMH_NOP) /* Written rarely */ + AM_RANGE(0xfc0800, 0xfc0fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xfc4000, 0xfc4001) AM_WRITE(lastduel_flip_w) AM_RANGE(0xfc4002, 0xfc4003) AM_WRITE(lastduel_sound_w) AM_RANGE(0xfc8000, 0xfc8007) AM_WRITE(lastduel_scroll_w) @@ -70,26 +70,26 @@ static ADDRESS_MAP_START( lastduel_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfd0000, 0xfd3fff) AM_WRITE(lastduel_scroll1_w) AM_BASE(&lastduel_scroll1) AM_RANGE(0xfd4000, 0xfd7fff) AM_WRITE(lastduel_scroll2_w) AM_BASE(&lastduel_scroll2) AM_RANGE(0xfd8000, 0xfd87ff) AM_WRITE(paletteram16_RRRRGGGGBBBBIIII_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( madgear_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0xfc1800, 0xfc1fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0xfc1800, 0xfc1fff) AM_READ(SMH_RAM) AM_RANGE(0xfc4000, 0xfc4001) AM_READ(input_port_0_word_r) AM_RANGE(0xfc4002, 0xfc4003) AM_READ(input_port_1_word_r) AM_RANGE(0xfc4004, 0xfc4005) AM_READ(input_port_2_word_r) AM_RANGE(0xfc4006, 0xfc4007) AM_READ(input_port_3_word_r) - AM_RANGE(0xfc8000, 0xfc9fff) AM_READ(MRA16_RAM) - AM_RANGE(0xfcc000, 0xfcc7ff) AM_READ(MRA16_RAM) - AM_RANGE(0xfd4000, 0xfd7fff) AM_READ(MRA16_RAM) - AM_RANGE(0xfd8000, 0xfdffff) AM_READ(MRA16_RAM) - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xfc8000, 0xfc9fff) AM_READ(SMH_RAM) + AM_RANGE(0xfcc000, 0xfcc7ff) AM_READ(SMH_RAM) + AM_RANGE(0xfd4000, 0xfd7fff) AM_READ(SMH_RAM) + AM_RANGE(0xfd8000, 0xfdffff) AM_READ(SMH_RAM) + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( madgear_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0xfc1800, 0xfc1fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xfc1800, 0xfc1fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xfc4000, 0xfc4001) AM_WRITE(lastduel_flip_w) AM_RANGE(0xfc4002, 0xfc4003) AM_WRITE(lastduel_sound_w) AM_RANGE(0xfc8000, 0xfc9fff) AM_WRITE(lastduel_vram_w) AM_BASE(&lastduel_vram) @@ -97,22 +97,22 @@ static ADDRESS_MAP_START( madgear_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfd0000, 0xfd0007) AM_WRITE(lastduel_scroll_w) AM_RANGE(0xfd4000, 0xfd7fff) AM_WRITE(madgear_scroll1_w) AM_BASE(&lastduel_scroll1) AM_RANGE(0xfd8000, 0xfdffff) AM_WRITE(madgear_scroll2_w) AM_BASE(&lastduel_scroll2) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) AM_RANGE(0xe800, 0xe800) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xf000, 0xf000) AM_READ(YM2203_status_port_1_r) AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe800, 0xe800) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xe801, 0xe801) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2203_control_port_1_w) @@ -129,17 +129,17 @@ static WRITE8_HANDLER( mg_bankswitch_w ) } static ADDRESS_MAP_START( mg_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xcfff) AM_READ(MRA8_BANK3) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xcfff) AM_READ(SMH_BANK3) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xf002, 0xf002) AM_READ(YM2203_status_port_1_r) AM_RANGE(0xf006, 0xf006) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( mg_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xcfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xcfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(YM2203_control_port_1_w) diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index 077f3b2fa92..2cf80060775 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -358,7 +358,7 @@ static ADDRESS_MAP_START( lastfght_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x600002, 0x600003 ) AM_READWRITE( lastfght_sound_r, lastfght_sound_w ) AM_RANGE( 0x600006, 0x600007 ) AM_WRITE( lastfght_blit_w ) AM_RANGE( 0x600008, 0x600009 ) AM_WRITE( colordac_w ) - AM_RANGE( 0x60000a, 0x60000b ) AM_WRITE( MWA16_NOP ) // colordac? + AM_RANGE( 0x60000a, 0x60000b ) AM_WRITE( SMH_NOP ) // colordac? AM_RANGE( 0x800000, 0x800001 ) AM_WRITE( lastfght_sx_w ) AM_RANGE( 0x800002, 0x800003 ) AM_WRITE( lastfght_sd_w ) diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index 5b8818a31cd..307a56d1a33 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -2287,10 +2287,10 @@ static WRITE16_HANDLER( copdx_0_w ) case (0x478/2): { /* - AM_RANGE(0x100800, 0x100fff) AM_READWRITE(MRA16_RAM,legionna_background_w) AM_BASE(&legionna_back_data) - AM_RANGE(0x101000, 0x1017ff) AM_READWRITE(MRA16_RAM,legionna_foreground_w) AM_BASE(&legionna_fore_data) - AM_RANGE(0x101800, 0x101fff) AM_READWRITE(MRA16_RAM,legionna_midground_w) AM_BASE(&legionna_mid_data) - AM_RANGE(0x102000, 0x102fff) AM_READWRITE(MRA16_RAM,legionna_text_w) AM_BASE(&legionna_textram) + AM_RANGE(0x100800, 0x100fff) AM_READWRITE(SMH_RAM,legionna_background_w) AM_BASE(&legionna_back_data) + AM_RANGE(0x101000, 0x1017ff) AM_READWRITE(SMH_RAM,legionna_foreground_w) AM_BASE(&legionna_fore_data) + AM_RANGE(0x101800, 0x101fff) AM_READWRITE(SMH_RAM,legionna_midground_w) AM_BASE(&legionna_mid_data) + AM_RANGE(0x102000, 0x102fff) AM_READWRITE(SMH_RAM,legionna_text_w) AM_BASE(&legionna_textram) */ break; } @@ -2476,10 +2476,10 @@ static WRITE16_HANDLER( copdxbl_0_w ) case (0x478/2): { /* - AM_RANGE(0x100800, 0x100fff) AM_READWRITE(MRA16_RAM,legionna_background_w) AM_BASE(&legionna_back_data) - AM_RANGE(0x101000, 0x1017ff) AM_READWRITE(MRA16_RAM,legionna_foreground_w) AM_BASE(&legionna_fore_data) - AM_RANGE(0x101800, 0x101fff) AM_READWRITE(MRA16_RAM,legionna_midground_w) AM_BASE(&legionna_mid_data) - AM_RANGE(0x102000, 0x102fff) AM_READWRITE(MRA16_RAM,legionna_text_w) AM_BASE(&legionna_textram) + AM_RANGE(0x100800, 0x100fff) AM_READWRITE(SMH_RAM,legionna_background_w) AM_BASE(&legionna_back_data) + AM_RANGE(0x101000, 0x1017ff) AM_READWRITE(SMH_RAM,legionna_foreground_w) AM_BASE(&legionna_fore_data) + AM_RANGE(0x101800, 0x101fff) AM_READWRITE(SMH_RAM,legionna_midground_w) AM_BASE(&legionna_mid_data) + AM_RANGE(0x102000, 0x102fff) AM_READWRITE(SMH_RAM,legionna_text_w) AM_BASE(&legionna_textram) */ break; } @@ -2614,28 +2614,28 @@ static WRITE16_HANDLER( copdxbl_0_w ) /*****************************************************************************/ static ADDRESS_MAP_START( legionna_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x1007ff) AM_READ(mcu_r) /* COP mcu */ - AM_RANGE(0x101000, 0x1017ff) AM_READ(MRA16_RAM) /* 32x16 bg layer, 16x16 tiles */ - AM_RANGE(0x101800, 0x101fff) AM_READ(MRA16_RAM) /* 32x16 bg layer, 16x16 tiles */ - AM_RANGE(0x102000, 0x1027ff) AM_READ(MRA16_RAM) /* 32x16 bg layer, 16x16 tiles */ - AM_RANGE(0x102800, 0x1037ff) AM_READ(MRA16_RAM) /* 64x32 text/front layer, 8x8 tiles */ + AM_RANGE(0x101000, 0x1017ff) AM_READ(SMH_RAM) /* 32x16 bg layer, 16x16 tiles */ + AM_RANGE(0x101800, 0x101fff) AM_READ(SMH_RAM) /* 32x16 bg layer, 16x16 tiles */ + AM_RANGE(0x102000, 0x1027ff) AM_READ(SMH_RAM) /* 32x16 bg layer, 16x16 tiles */ + AM_RANGE(0x102800, 0x1037ff) AM_READ(SMH_RAM) /* 64x32 text/front layer, 8x8 tiles */ /* The 4000-4fff area contains PALETTE words and may be extra paletteram? */ - AM_RANGE(0x104000, 0x104fff) AM_READ(MRA16_RAM) /* palette mirror ? */ -// AM_RANGE(0x104000, 0x10401f) AM_READ(MRA16_RAM) /* debugging... */ -// AM_RANGE(0x104200, 0x1043ff) AM_READ(MRA16_RAM) /* ??? */ -// AM_RANGE(0x104600, 0x1047ff) AM_READ(MRA16_RAM) /* ??? */ -// AM_RANGE(0x104800, 0x10481f) AM_READ(MRA16_RAM) /* ??? */ + AM_RANGE(0x104000, 0x104fff) AM_READ(SMH_RAM) /* palette mirror ? */ +// AM_RANGE(0x104000, 0x10401f) AM_READ(SMH_RAM) /* debugging... */ +// AM_RANGE(0x104200, 0x1043ff) AM_READ(SMH_RAM) /* ??? */ +// AM_RANGE(0x104600, 0x1047ff) AM_READ(SMH_RAM) /* ??? */ +// AM_RANGE(0x104800, 0x10481f) AM_READ(SMH_RAM) /* ??? */ - AM_RANGE(0x105000, 0x105fff) AM_READ(MRA16_RAM) /* spriteram */ - AM_RANGE(0x106000, 0x106fff) AM_READ(MRA16_RAM) - AM_RANGE(0x107000, 0x107fff) AM_READ(MRA16_RAM) /* palette */ - AM_RANGE(0x108000, 0x11ffff) AM_READ(MRA16_RAM) /* main ram */ + AM_RANGE(0x105000, 0x105fff) AM_READ(SMH_RAM) /* spriteram */ + AM_RANGE(0x106000, 0x106fff) AM_READ(SMH_RAM) + AM_RANGE(0x107000, 0x107fff) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0x108000, 0x11ffff) AM_READ(SMH_RAM) /* main ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( legionna_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x1007ff) AM_WRITE(mcu_w) AM_BASE(&mcu_ram) /* COP mcu */ AM_RANGE(0x101000, 0x1017ff) AM_WRITE(legionna_background_w) AM_BASE(&legionna_back_data) AM_RANGE(0x101800, 0x101fff) AM_WRITE(legionna_foreground_w) AM_BASE(&legionna_fore_data) @@ -2643,119 +2643,119 @@ static ADDRESS_MAP_START( legionna_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x102800, 0x1037ff) AM_WRITE(legionna_text_w) AM_BASE(&legionna_textram) /* The 4000-4fff area contains PALETTE words and may be extra paletteram? */ - AM_RANGE(0x104000, 0x104fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x104000, 0x104fff) AM_WRITE(SMH_RAM) // AM_RANGE(0x104000, 0x104fff) AM_WRITE(legionna_paletteram16_w) -// AM_RANGE(0x104000, 0x10401f) AM_WRITE(MWA16_RAM) -// AM_RANGE(0x104200, 0x1043ff) AM_WRITE(MWA16_RAM) -// AM_RANGE(0x104600, 0x1047ff) AM_WRITE(MWA16_RAM) -// AM_RANGE(0x104800, 0x10481f) AM_WRITE(MWA16_RAM) +// AM_RANGE(0x104000, 0x10401f) AM_WRITE(SMH_RAM) +// AM_RANGE(0x104200, 0x1043ff) AM_WRITE(SMH_RAM) +// AM_RANGE(0x104600, 0x1047ff) AM_WRITE(SMH_RAM) +// AM_RANGE(0x104800, 0x10481f) AM_WRITE(SMH_RAM) - AM_RANGE(0x105000, 0x105fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x106000, 0x106fff) AM_WRITE(MWA16_RAM) /* is this used outside inits ?? */ + AM_RANGE(0x105000, 0x105fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x106000, 0x106fff) AM_WRITE(SMH_RAM) /* is this used outside inits ?? */ AM_RANGE(0x107000, 0x107fff) AM_WRITE(legionna_paletteram16_w) AM_BASE(&paletteram16) /* palette xRRRRxGGGGxBBBBx ? */ - AM_RANGE(0x108000, 0x11ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x108000, 0x11ffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( heatbrl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x1007ff) AM_READ(cop2_mcu_r) /* COP mcu */ - AM_RANGE(0x100800, 0x100fff) AM_READ(MRA16_RAM) /* 32x16 bg layer, 16x16 tiles */ - AM_RANGE(0x101000, 0x1017ff) AM_READ(MRA16_RAM) /* 32x16 bg layer, 16x16 tiles */ - AM_RANGE(0x101800, 0x101fff) AM_READ(MRA16_RAM) /* 32x16 bg layer, 16x16 tiles */ - AM_RANGE(0x102000, 0x102fff) AM_READ(MRA16_RAM) /* 64x32 text/front layer, 8x8 tiles */ - AM_RANGE(0x103000, 0x103fff) AM_READ(MRA16_RAM) /* spriteram */ - AM_RANGE(0x104000, 0x104fff) AM_READ(MRA16_RAM) /* palette */ - AM_RANGE(0x108000, 0x11ffff) AM_READ(MRA16_RAM) /* main ram */ + AM_RANGE(0x100800, 0x100fff) AM_READ(SMH_RAM) /* 32x16 bg layer, 16x16 tiles */ + AM_RANGE(0x101000, 0x1017ff) AM_READ(SMH_RAM) /* 32x16 bg layer, 16x16 tiles */ + AM_RANGE(0x101800, 0x101fff) AM_READ(SMH_RAM) /* 32x16 bg layer, 16x16 tiles */ + AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM) /* 64x32 text/front layer, 8x8 tiles */ + AM_RANGE(0x103000, 0x103fff) AM_READ(SMH_RAM) /* spriteram */ + AM_RANGE(0x104000, 0x104fff) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0x108000, 0x11ffff) AM_READ(SMH_RAM) /* main ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( heatbrl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x1007ff) AM_WRITE(cop2_mcu_w) AM_BASE(&mcu_ram) /* COP mcu */ AM_RANGE(0x100800, 0x100fff) AM_WRITE(legionna_background_w) AM_BASE(&legionna_back_data) AM_RANGE(0x101000, 0x1017ff) AM_WRITE(legionna_foreground_w) AM_BASE(&legionna_fore_data) AM_RANGE(0x101800, 0x101fff) AM_WRITE(legionna_midground_w) AM_BASE(&legionna_mid_data) AM_RANGE(0x102000, 0x102fff) AM_WRITE(legionna_text_w) AM_BASE(&legionna_textram) - AM_RANGE(0x103000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x103000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x104000, 0x104fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x108000, 0x11ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x108000, 0x11ffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( godzilla_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x1007ff) AM_READ(godzilla_cop_mcu_r) /* COP mcu */ - AM_RANGE(0x100800, 0x100fff) AM_READ(MRA16_RAM) - AM_RANGE(0x101000, 0x101fff) AM_READ(MRA16_RAM) - AM_RANGE(0x102000, 0x102fff) AM_READ(MRA16_RAM) - AM_RANGE(0x103000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x104000, 0x104fff) AM_READ(MRA16_RAM) - AM_RANGE(0x105000, 0x106fff) AM_READ(MRA16_RAM) - AM_RANGE(0x107000, 0x107fff) AM_READ(MRA16_RAM) /*Ani-DSP ram*/ - AM_RANGE(0x108000, 0x11ffff) AM_READ(MRA16_RAM) /* main ram */ + AM_RANGE(0x100800, 0x100fff) AM_READ(SMH_RAM) + AM_RANGE(0x101000, 0x101fff) AM_READ(SMH_RAM) + AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM) + AM_RANGE(0x103000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x104000, 0x104fff) AM_READ(SMH_RAM) + AM_RANGE(0x105000, 0x106fff) AM_READ(SMH_RAM) + AM_RANGE(0x107000, 0x107fff) AM_READ(SMH_RAM) /*Ani-DSP ram*/ + AM_RANGE(0x108000, 0x11ffff) AM_READ(SMH_RAM) /* main ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( godzilla_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x1007ff) AM_WRITE(godzilla_cop_mcu_w) AM_BASE(&mcu_ram) /* COP mcu */ - AM_RANGE(0x100800, 0x100fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x100800, 0x100fff) AM_WRITE(SMH_RAM) AM_RANGE(0x101000, 0x101fff) AM_WRITE(legionna_background_w) AM_BASE(&legionna_back_data) AM_RANGE(0x102000, 0x1027ff) AM_WRITE(legionna_midground_w) AM_BASE(&legionna_mid_data) AM_RANGE(0x102800, 0x1037ff) AM_WRITE(legionna_text_w) AM_BASE(&legionna_textram) AM_RANGE(0x103800, 0x103fff) AM_WRITE(legionna_foreground_w) AM_BASE(&legionna_fore_data) AM_RANGE(0x104000, 0x104fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x105000, 0x105fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x106000, 0x1067ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x106800, 0x106fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x107000, 0x107fff) AM_WRITE(MWA16_RAM) /*Ani-DSP ram*/ - AM_RANGE(0x108000, 0x11ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x105000, 0x105fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x106000, 0x1067ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x106800, 0x106fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x107000, 0x107fff) AM_WRITE(SMH_RAM) /*Ani-DSP ram*/ + AM_RANGE(0x108000, 0x11ffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( denjinmk_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x1007ff) AM_READ(denjinmk_cop_mcu_r) /* COP mcu */ - AM_RANGE(0x100800, 0x100fff) AM_READ(MRA16_RAM) - AM_RANGE(0x101000, 0x101fff) AM_READ(MRA16_RAM) - AM_RANGE(0x102000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x104000, 0x104fff) AM_READ(MRA16_RAM) - AM_RANGE(0x105000, 0x105fff) AM_READ(MRA16_RAM) - AM_RANGE(0x106000, 0x106fff) AM_READ(MRA16_RAM) - AM_RANGE(0x107000, 0x107fff) AM_READ(MRA16_RAM) - AM_RANGE(0x108000, 0x11dfff) AM_READ(MRA16_RAM) /* main ram */ - AM_RANGE(0x11e000, 0x11efff) AM_READ(MRA16_RAM) - AM_RANGE(0x11f000, 0x11ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x100800, 0x100fff) AM_READ(SMH_RAM) + AM_RANGE(0x101000, 0x101fff) AM_READ(SMH_RAM) + AM_RANGE(0x102000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x104000, 0x104fff) AM_READ(SMH_RAM) + AM_RANGE(0x105000, 0x105fff) AM_READ(SMH_RAM) + AM_RANGE(0x106000, 0x106fff) AM_READ(SMH_RAM) + AM_RANGE(0x107000, 0x107fff) AM_READ(SMH_RAM) + AM_RANGE(0x108000, 0x11dfff) AM_READ(SMH_RAM) /* main ram */ + AM_RANGE(0x11e000, 0x11efff) AM_READ(SMH_RAM) + AM_RANGE(0x11f000, 0x11ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( denjinmk_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x1007ff) AM_WRITE(denjinmk_cop_mcu_w) AM_BASE(&mcu_ram) /* COP mcu */ - AM_RANGE(0x100800, 0x100fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x100800, 0x100fff) AM_WRITE(SMH_RAM) AM_RANGE(0x101000, 0x1017ff) AM_WRITE(legionna_background_w) AM_BASE(&legionna_back_data) AM_RANGE(0x101800, 0x101fff) AM_WRITE(legionna_foreground_w) AM_BASE(&legionna_fore_data) AM_RANGE(0x102000, 0x1027ff) AM_WRITE(legionna_midground_w) AM_BASE(&legionna_mid_data) AM_RANGE(0x102800, 0x103fff) AM_WRITE(legionna_text_w) AM_BASE(&legionna_textram) - AM_RANGE(0x104000, 0x104fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x105000, 0x105fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x106000, 0x107fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x108000, 0x11dfff) AM_WRITE(MWA16_RAM) /* main ram */ + AM_RANGE(0x104000, 0x104fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x105000, 0x105fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x106000, 0x107fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x108000, 0x11dfff) AM_WRITE(SMH_RAM) /* main ram */ AM_RANGE(0x11e000, 0x11efff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x11f000, 0x11ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x11f000, 0x11ffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sdgndmrb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x1007ff) AM_READ(sdgndmrb_cop_mcu_r) /* COP mcu */ - AM_RANGE(0x100800, 0x100fff) AM_READ(MRA16_RAM) /* 32x16 bg layer, 16x16 tiles */ - AM_RANGE(0x101000, 0x1017ff) AM_READ(MRA16_RAM) /* 32x16 bg layer, 16x16 tiles */ - AM_RANGE(0x101800, 0x101fff) AM_READ(MRA16_RAM) /* 32x16 bg layer, 16x16 tiles */ - AM_RANGE(0x102000, 0x102fff) AM_READ(MRA16_RAM) /* 64x32 text/front layer, 8x8 tiles */ - AM_RANGE(0x103000, 0x103fff) AM_READ(MRA16_RAM) /* palette */ - AM_RANGE(0x104000, 0x104fff) AM_READ(MRA16_RAM) /* palette mirror */ - AM_RANGE(0x105000, 0x105fff) AM_READ(MRA16_RAM) - AM_RANGE(0x107000, 0x107fff) AM_READ(MRA16_RAM) /* extra spriteram? */ - AM_RANGE(0x108000, 0x11ffff) AM_READ(MRA16_RAM) /* main ram */ + AM_RANGE(0x100800, 0x100fff) AM_READ(SMH_RAM) /* 32x16 bg layer, 16x16 tiles */ + AM_RANGE(0x101000, 0x1017ff) AM_READ(SMH_RAM) /* 32x16 bg layer, 16x16 tiles */ + AM_RANGE(0x101800, 0x101fff) AM_READ(SMH_RAM) /* 32x16 bg layer, 16x16 tiles */ + AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM) /* 64x32 text/front layer, 8x8 tiles */ + AM_RANGE(0x103000, 0x103fff) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0x104000, 0x104fff) AM_READ(SMH_RAM) /* palette mirror */ + AM_RANGE(0x105000, 0x105fff) AM_READ(SMH_RAM) + AM_RANGE(0x107000, 0x107fff) AM_READ(SMH_RAM) /* extra spriteram? */ + AM_RANGE(0x108000, 0x11ffff) AM_READ(SMH_RAM) /* main ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( sdgndmrb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x1007ff) AM_WRITE(sdgndmrb_cop_mcu_w) AM_BASE(&mcu_ram) /* COP mcu */ AM_RANGE(0x100800, 0x100fff) AM_WRITE(legionna_background_w) AM_BASE(&legionna_back_data) AM_RANGE(0x101000, 0x1017ff) AM_WRITE(legionna_foreground_w) AM_BASE(&legionna_fore_data) @@ -2763,21 +2763,21 @@ static ADDRESS_MAP_START( sdgndmrb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x102000, 0x102fff) AM_WRITE(legionna_text_w) AM_BASE(&legionna_textram) AM_RANGE(0x103000, 0x103fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x104000, 0x104fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) - AM_RANGE(0x105000, 0x105fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x106000, 0x106fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x107000, 0x107fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x108000, 0x11ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x105000, 0x105fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x106000, 0x106fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x107000, 0x107fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x108000, 0x11ffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( cupsoc_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x100000, 0x1007ff) AM_READWRITE(copdx_0_r,copdx_0_w) AM_BASE(&mcu_ram) - AM_RANGE(0x100800, 0x100fff) AM_READWRITE(MRA16_RAM,legionna_background_w) AM_BASE(&legionna_back_data) - AM_RANGE(0x101000, 0x1017ff) AM_READWRITE(MRA16_RAM,legionna_foreground_w) AM_BASE(&legionna_fore_data) - AM_RANGE(0x101800, 0x101fff) AM_READWRITE(MRA16_RAM,legionna_midground_w) AM_BASE(&legionna_mid_data) - AM_RANGE(0x102000, 0x102fff) AM_READWRITE(MRA16_RAM,legionna_text_w) AM_BASE(&legionna_textram) - AM_RANGE(0x103000, 0x103fff) AM_READWRITE(MRA16_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x104000, 0x104fff) AM_READWRITE(MRA16_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) /**/ + AM_RANGE(0x100800, 0x100fff) AM_READWRITE(SMH_RAM,legionna_background_w) AM_BASE(&legionna_back_data) + AM_RANGE(0x101000, 0x1017ff) AM_READWRITE(SMH_RAM,legionna_foreground_w) AM_BASE(&legionna_fore_data) + AM_RANGE(0x101800, 0x101fff) AM_READWRITE(SMH_RAM,legionna_midground_w) AM_BASE(&legionna_mid_data) + AM_RANGE(0x102000, 0x102fff) AM_READWRITE(SMH_RAM,legionna_text_w) AM_BASE(&legionna_textram) + AM_RANGE(0x103000, 0x103fff) AM_READWRITE(SMH_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x104000, 0x104fff) AM_READWRITE(SMH_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) /**/ AM_RANGE(0x105000, 0x106fff) AM_RAM AM_RANGE(0x107000, 0x1077ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x107800, 0x107fff) AM_RAM /*Ani Dsp(?) Ram*/ @@ -2790,12 +2790,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cupsocbl_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x100000, 0x1007ff) AM_READWRITE(copdxbl_0_r,copdxbl_0_w) AM_BASE(&mcu_ram) - AM_RANGE(0x100800, 0x100fff) AM_READWRITE(MRA16_RAM,legionna_background_w) AM_BASE(&legionna_back_data) - AM_RANGE(0x101000, 0x1017ff) AM_READWRITE(MRA16_RAM,legionna_foreground_w) AM_BASE(&legionna_fore_data) - AM_RANGE(0x101800, 0x101fff) AM_READWRITE(MRA16_RAM,legionna_midground_w) AM_BASE(&legionna_mid_data) - AM_RANGE(0x102000, 0x102fff) AM_READWRITE(MRA16_RAM,legionna_text_w) AM_BASE(&legionna_textram) - AM_RANGE(0x103000, 0x103fff) AM_READWRITE(MRA16_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x104000, 0x104fff) AM_READWRITE(MRA16_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) /**/ + AM_RANGE(0x100800, 0x100fff) AM_READWRITE(SMH_RAM,legionna_background_w) AM_BASE(&legionna_back_data) + AM_RANGE(0x101000, 0x1017ff) AM_READWRITE(SMH_RAM,legionna_foreground_w) AM_BASE(&legionna_fore_data) + AM_RANGE(0x101800, 0x101fff) AM_READWRITE(SMH_RAM,legionna_midground_w) AM_BASE(&legionna_mid_data) + AM_RANGE(0x102000, 0x102fff) AM_READWRITE(SMH_RAM,legionna_text_w) AM_BASE(&legionna_textram) + AM_RANGE(0x103000, 0x103fff) AM_READWRITE(SMH_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x104000, 0x104fff) AM_READWRITE(SMH_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) /**/ AM_RANGE(0x105000, 0x106fff) AM_RAM AM_RANGE(0x107000, 0x1077ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x107800, 0x107fff) AM_RAM /*Ani Dsp(?) Ram*/ diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index 83ad94bff40..a9cf6d9dca1 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -86,23 +86,23 @@ static WRITE8_HANDLER( lemmings_sound_ack_w ) /******************************************************************************/ static ADDRESS_MAP_START( lemmings_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x160000, 0x160fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) + AM_RANGE(0x160000, 0x160fff) AM_READ(SMH_RAM) AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(lemmings_prot_r) AM_RANGE(0x190000, 0x19000f) AM_READ(lemmings_trackball_r) - AM_RANGE(0x200000, 0x202fff) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x37ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x380000, 0x39ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x202fff) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x37ffff) AM_READ(SMH_RAM) + AM_RANGE(0x380000, 0x39ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( lemmings_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x120000, 0x1207ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x140000, 0x1407ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x120000, 0x1207ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x140000, 0x1407ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) AM_RANGE(0x160000, 0x160fff) AM_WRITE(lemmings_palette_24bit_w) AM_BASE(&paletteram16) AM_RANGE(0x170000, 0x17000f) AM_WRITE(lemmings_control_w) AM_BASE(&lemmings_control_data) AM_RANGE(0x1a0064, 0x1a0065) AM_WRITE(lemmings_sound_w) @@ -116,20 +116,20 @@ ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x0801, 0x0801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x1000, 0x1000) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x1800, 0x1800) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x1000, 0x1000) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x1800, 0x1800) AM_WRITE(lemmings_sound_ack_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index f142017ab76..930a254f233 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -489,11 +489,11 @@ static READ8_HANDLER(gunsaux_r) } static ADDRESS_MAP_START( le_main, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_BANK1) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_BANK1) AM_WRITE(SMH_ROM) 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) - AM_RANGE(0x4080, 0x4080) AM_READ(MRA8_NOP) // watchdog + AM_RANGE(0x4080, 0x4080) AM_READ(SMH_NOP) // watchdog AM_RANGE(0x4090, 0x4090) AM_READNOP AM_RANGE(0x40a0, 0x40a0) AM_READNOP AM_RANGE(0x40c4, 0x40c4) AM_WRITE(control2_w) @@ -505,7 +505,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(&paletteram) // bankswitched: RAM and registers - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK2) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK2) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( le_sound, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index e027ad30d57..97abed41190 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -89,40 +89,40 @@ static READ8_HANDLER( deco16_io_r ) *************************************/ static ADDRESS_MAP_START( prosport_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0200, 0x021f) AM_READ(MRA8_RAM) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x2fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0200, 0x021f) AM_READ(SMH_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x2fff) AM_READ(SMH_RAM) AM_RANGE(0x8000, 0x800f) AM_READ(deco16_io_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( prosport_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0200, 0x021f) AM_WRITE(prosport_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1200, 0x1fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1200, 0x1fff) AM_WRITE(SMH_RAM) AM_RANGE(0x3000, 0x37ff) AM_WRITE(liberate_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x3800, 0x3fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) + AM_RANGE(0x3800, 0x3fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_RANGE(0x8000, 0x800f) AM_WRITE(deco16_io_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( liberate_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x3fff) AM_READ(MRA8_ROM) /* Mirror of main rom */ + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x3fff) AM_READ(SMH_ROM) /* Mirror of main rom */ AM_RANGE(0x4000, 0x7fff) AM_READ(deco16_bank_r) AM_RANGE(0x8000, 0x800f) AM_READ(deco16_io_r) - AM_RANGE(0x6200, 0x67ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x6200, 0x67ff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( liberate_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1000, 0x3fff) AM_WRITE(MWA8_ROM) /* Mirror of main rom */ + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1000, 0x3fff) AM_WRITE(SMH_ROM) /* Mirror of main rom */ AM_RANGE(0x4000, 0x47ff) AM_WRITE(liberate_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x4800, 0x4fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) - AM_RANGE(0x6200, 0x67ff) AM_WRITE(MWA8_RAM) AM_BASE(&scratchram) + AM_RANGE(0x4800, 0x4fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) + AM_RANGE(0x6200, 0x67ff) AM_WRITE(SMH_RAM) AM_BASE(&scratchram) AM_RANGE(0x8000, 0x800f) AM_WRITE(deco16_io_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( deco16_readport, ADDRESS_SPACE_IO, 8 ) @@ -135,25 +135,25 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( liberatb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00fe, 0x00fe) AM_READ(input_port_0_r) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x3fff) AM_READ(MRA8_ROM) /* Mirror of main rom */ + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x3fff) AM_READ(SMH_ROM) /* Mirror of main rom */ AM_RANGE(0x4000, 0x7fff) AM_READ(deco16_bank_r) AM_RANGE(0xf000, 0xf000) AM_READ(input_port_1_r) AM_RANGE(0xf001, 0xf001) AM_READ(input_port_2_r) AM_RANGE(0xf002, 0xf002) AM_READ(input_port_3_r) AM_RANGE(0xf003, 0xf003) AM_READ(input_port_4_r) AM_RANGE(0xf004, 0xf004) AM_READ(input_port_5_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( liberatb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1000, 0x3fff) AM_WRITE(MWA8_ROM) /* Mirror of main rom */ + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1000, 0x3fff) AM_WRITE(SMH_ROM) /* Mirror of main rom */ AM_RANGE(0x4000, 0x47ff) AM_WRITE(liberate_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x4800, 0x4fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) - AM_RANGE(0x6200, 0x67ff) AM_WRITE(MWA8_RAM) AM_BASE(&scratchram) + AM_RANGE(0x4800, 0x4fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) + AM_RANGE(0x6200, 0x67ff) AM_WRITE(SMH_RAM) AM_BASE(&scratchram) AM_RANGE(0xf000, 0xf00f) AM_WRITE(deco16_io_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /************************************* @@ -164,34 +164,34 @@ ADDRESS_MAP_END #if 0 static ADDRESS_MAP_START( prosoccr_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( prosoccr_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_1_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END #endif static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM) AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_1_w) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /************************************* diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c index d778f0ae67d..3fec9e7f778 100644 --- a/src/mame/drivers/liberatr.c +++ b/src/mame/drivers/liberatr.c @@ -211,20 +211,20 @@ static ADDRESS_MAP_START( liberatr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_RAM AM_BASE(&liberatr_x) AM_RANGE(0x0001, 0x0001) AM_RAM AM_BASE(&liberatr_y) AM_RANGE(0x0002, 0x0002) AM_READWRITE(liberatr_bitmap_xy_r, liberatr_bitmap_xy_w) - AM_RANGE(0x0000, 0x3fff) AM_READWRITE(MRA8_RAM, liberatr_bitmap_w) AM_BASE(&liberatr_bitmapram) /* overlapping for my convenience */ + AM_RANGE(0x0000, 0x3fff) AM_READWRITE(SMH_RAM, liberatr_bitmap_w) AM_BASE(&liberatr_bitmapram) /* overlapping for my convenience */ AM_RANGE(0x4000, 0x403f) AM_READ(atari_vg_earom_r) AM_RANGE(0x5000, 0x5000) AM_READ(liberatr_input_port_0_r) AM_RANGE(0x5001, 0x5001) AM_READ(input_port_1_r) - AM_RANGE(0x6000, 0x600f) AM_WRITE(MWA8_RAM) AM_BASE(&liberatr_base_ram) - AM_RANGE(0x6200, 0x621f) AM_WRITE(MWA8_RAM) AM_BASE(&liberatr_colorram) + AM_RANGE(0x6000, 0x600f) AM_WRITE(SMH_RAM) AM_BASE(&liberatr_base_ram) + AM_RANGE(0x6200, 0x621f) AM_WRITE(SMH_RAM) AM_BASE(&liberatr_colorram) AM_RANGE(0x6400, 0x6400) AM_WRITENOP AM_RANGE(0x6600, 0x6600) AM_WRITE(atari_vg_earom_ctrl_w) - AM_RANGE(0x6800, 0x6800) AM_WRITE(MWA8_RAM) AM_BASE(&liberatr_planet_frame) + AM_RANGE(0x6800, 0x6800) AM_WRITE(SMH_RAM) AM_BASE(&liberatr_planet_frame) AM_RANGE(0x6a00, 0x6a00) AM_WRITE(watchdog_reset_w) AM_RANGE(0x6c00, 0x6c01) AM_WRITE(liberatr_led_w) AM_RANGE(0x6c04, 0x6c04) AM_WRITE(liberatr_trackball_reset_w) AM_RANGE(0x6c05, 0x6c06) AM_WRITE(liberatr_coin_counter_w) - AM_RANGE(0x6c07, 0x6c07) AM_WRITE(MWA8_RAM) AM_BASE(&liberatr_planet_select) + AM_RANGE(0x6c07, 0x6c07) AM_WRITE(SMH_RAM) AM_BASE(&liberatr_planet_select) AM_RANGE(0x6e00, 0x6e3f) AM_WRITE(atari_vg_earom_w) AM_RANGE(0x7000, 0x701f) AM_READWRITE(pokey2_r, pokey2_w) AM_RANGE(0x7800, 0x781f) AM_READWRITE(pokey1_r, pokey1_w) @@ -244,20 +244,20 @@ static ADDRESS_MAP_START( liberat2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_RAM AM_BASE(&liberatr_x) AM_RANGE(0x0001, 0x0001) AM_RAM AM_BASE(&liberatr_y) AM_RANGE(0x0002, 0x0002) AM_READWRITE(liberatr_bitmap_xy_r, liberatr_bitmap_xy_w) - AM_RANGE(0x0000, 0x3fff) AM_READWRITE(MRA8_RAM, liberatr_bitmap_w) AM_BASE(&liberatr_bitmapram) /* overlapping for my convenience */ + AM_RANGE(0x0000, 0x3fff) AM_READWRITE(SMH_RAM, liberatr_bitmap_w) AM_BASE(&liberatr_bitmapram) /* overlapping for my convenience */ AM_RANGE(0x4000, 0x4000) AM_READ(liberatr_input_port_0_r) AM_RANGE(0x4001, 0x4001) AM_READ(input_port_1_r) - AM_RANGE(0x4000, 0x400f) AM_WRITE(MWA8_RAM) AM_BASE(&liberatr_base_ram) - AM_RANGE(0x4200, 0x421f) AM_WRITE(MWA8_RAM) AM_BASE(&liberatr_colorram) + AM_RANGE(0x4000, 0x400f) AM_WRITE(SMH_RAM) AM_BASE(&liberatr_base_ram) + AM_RANGE(0x4200, 0x421f) AM_WRITE(SMH_RAM) AM_BASE(&liberatr_colorram) AM_RANGE(0x4400, 0x4400) AM_WRITENOP AM_RANGE(0x4600, 0x4600) AM_WRITE(atari_vg_earom_ctrl_w) AM_RANGE(0x4800, 0x483f) AM_READ(atari_vg_earom_r) - AM_RANGE(0x4800, 0x4800) AM_WRITE(MWA8_RAM) AM_BASE(&liberatr_planet_frame) + AM_RANGE(0x4800, 0x4800) AM_WRITE(SMH_RAM) AM_BASE(&liberatr_planet_frame) AM_RANGE(0x4a00, 0x4a00) AM_WRITE(watchdog_reset_w) AM_RANGE(0x4c00, 0x4c01) AM_WRITE(liberatr_led_w) AM_RANGE(0x4c04, 0x4c04) AM_WRITE(liberatr_trackball_reset_w) AM_RANGE(0x4c05, 0x4c06) AM_WRITE(liberatr_coin_counter_w) - AM_RANGE(0x4c07, 0x4c07) AM_WRITE(MWA8_RAM) AM_BASE(&liberatr_planet_select) + AM_RANGE(0x4c07, 0x4c07) AM_WRITE(SMH_RAM) AM_BASE(&liberatr_planet_select) AM_RANGE(0x4e00, 0x4e3f) AM_WRITE(atari_vg_earom_w) AM_RANGE(0x5000, 0x501f) AM_READWRITE(pokey2_r, pokey2_w) AM_RANGE(0x5800, 0x581f) AM_READWRITE(pokey1_r, pokey1_w) diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c index 30726f90008..1d5939f384e 100644 --- a/src/mame/drivers/littlerb.c +++ b/src/mame/drivers/littlerb.c @@ -197,7 +197,7 @@ static ADDRESS_MAP_START( littlerb_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x7e0000, 0x7e0001) AM_READ(input_port_1_word_r) AM_RANGE(0x7e0002, 0x7e0003) AM_READ(input_port_2_word_r) AM_RANGE(0x700000, 0x700007) AM_READ(littlerb_vdp_r) AM_WRITE(littlerb_vdp_w) - AM_RANGE(0x780000, 0x780001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x780000, 0x780001) AM_WRITE(SMH_NOP) /* below are fake.. just to see the data */ AM_RANGE(0xc00000, 0xc7ffff) AM_RAM AM_BASE(&littlerb_region1) diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index accaf25ef38..753b5a2e783 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -82,14 +82,14 @@ static WRITE8_HANDLER( lkage_sh_nmi_enable_w ) } static ADDRESS_MAP_START( lkage, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) /* work ram */ - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, paletteram_xxxxRRRRGGGGBBBB_le_w) AM_BASE(&paletteram) - AM_RANGE(0xf000, 0xf003) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) AM_BASE(&lkage_vreg) /* video registers */ + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* work ram */ + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, paletteram_xxxxRRRRGGGGBBBB_le_w) AM_BASE(&paletteram) + AM_RANGE(0xf000, 0xf003) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&lkage_vreg) /* video registers */ AM_RANGE(0xf060, 0xf060) AM_WRITE(lkage_sound_command_w) - AM_RANGE(0xf061, 0xf061) AM_WRITE(MWA8_NOP) + AM_RANGE(0xf061, 0xf061) AM_WRITE(SMH_NOP) AM_RANGE(0xf062, 0xf062) AM_READ(lkage_mcu_r) AM_WRITE(lkage_mcu_w) - AM_RANGE(0xf063, 0xf063) AM_WRITE(MWA8_NOP) /* pulsed; nmi on sound cpu? */ + AM_RANGE(0xf063, 0xf063) AM_WRITE(SMH_NOP) /* pulsed; nmi on sound cpu? */ AM_RANGE(0xf080, 0xf080) AM_READ(input_port_0_r) /* DSW1 */ AM_RANGE(0xf081, 0xf081) AM_READ(input_port_1_r) /* DSW2 (coinage) */ AM_RANGE(0xf082, 0xf082) AM_READ(input_port_2_r) /* DSW3 */ @@ -97,11 +97,11 @@ static ADDRESS_MAP_START( lkage, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf084, 0xf084) AM_READ(input_port_4_r) /* P1 controls */ AM_RANGE(0xf086, 0xf086) AM_READ(input_port_5_r) /* P2 controls */ AM_RANGE(0xf087, 0xf087) AM_READ(lkage_mcu_status_r) - AM_RANGE(0xf0a0, 0xf0a3) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) /* unknown */ - AM_RANGE(0xf0c0, 0xf0c5) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) AM_BASE(&lkage_scroll) - AM_RANGE(0xf0e1, 0xf0e1) AM_WRITE(MWA8_NOP) /* pulsed */ - AM_RANGE(0xf100, 0xf15f) AM_READ(MRA8_RAM) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) - AM_RANGE(0xf400, 0xffff) AM_READ(MRA8_RAM) AM_WRITE(lkage_videoram_w) AM_BASE(&videoram) /* videoram */ + AM_RANGE(0xf0a0, 0xf0a3) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* unknown */ + AM_RANGE(0xf0c0, 0xf0c5) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&lkage_scroll) + AM_RANGE(0xf0e1, 0xf0e1) AM_WRITE(SMH_NOP) /* pulsed */ + AM_RANGE(0xf100, 0xf15f) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) + AM_RANGE(0xf400, 0xffff) AM_READ(SMH_RAM) AM_WRITE(lkage_videoram_w) AM_BASE(&videoram) /* videoram */ ADDRESS_MAP_END static READ8_HANDLER( port_fetch_r ) @@ -118,8 +118,8 @@ static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(lkage_68705_portA_r) AM_RANGE(0x0001, 0x0001) AM_READ(lkage_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(lkage_68705_portC_r) - AM_RANGE(0x0010, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -130,8 +130,8 @@ static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0004, 0x0004) AM_WRITE(lkage_68705_ddrA_w) AM_RANGE(0x0005, 0x0005) AM_WRITE(lkage_68705_ddrB_w) AM_RANGE(0x0006, 0x0006) AM_WRITE(lkage_68705_ddrC_w) - AM_RANGE(0x0010, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /***************************************************************************/ @@ -139,26 +139,26 @@ ADDRESS_MAP_END /* sound section is almost identical to Bubble Bobble, YM2203 instead of YM3526 */ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) - AM_RANGE(0xb001, 0xb001) AM_READ(MRA8_NOP) /* ??? */ - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_ROM) /* space for diagnostic ROM? */ + AM_RANGE(0xb001, 0xb001) AM_READ(SMH_NOP) /* ??? */ + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) /* space for diagnostic ROM? */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_1_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_1_w) - AM_RANGE(0xb000, 0xb000) AM_WRITE(MWA8_NOP) /* ??? */ + AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xb001, 0xb001) AM_WRITE(lkage_sh_nmi_enable_w) AM_RANGE(0xb002, 0xb002) AM_WRITE(lkage_sh_nmi_disable_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_ROM) /* space for diagnostic ROM? */ + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_ROM) /* space for diagnostic ROM? */ ADDRESS_MAP_END /***************************************************************************/ diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c index f39ba4f22af..2924f20249e 100644 --- a/src/mame/drivers/lockon.c +++ b/src/mame/drivers/lockon.c @@ -178,13 +178,13 @@ static ADDRESS_MAP_START( main_v30, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x04000, 0x04003) AM_READWRITE(lockon_crtc_r, lockon_crtc_w) AM_RANGE(0x06000, 0x06001) AM_READ(input_port_0_word_r) AM_RANGE(0x08000, 0x081ff) AM_RAM AM_BASE(&lockon_hud_ram) AM_SIZE(&lockon_hudram_size) - AM_RANGE(0x09000, 0x09fff) AM_READWRITE(MRA16_RAM, lockon_char_w) AM_BASE(&lockon_char_ram) + AM_RANGE(0x09000, 0x09fff) AM_READWRITE(SMH_RAM, lockon_char_w) AM_BASE(&lockon_char_ram) AM_RANGE(0x0a000, 0x0a001) AM_WRITE(adrst_w) AM_RANGE(0x0b000, 0x0bfff) AM_WRITE(lockon_rotate_w) AM_RANGE(0x0c000, 0x0cfff) AM_WRITE(lockon_fb_clut_w) AM_RANGE(0x0e000, 0x0e001) AM_WRITE(inten_w) AM_RANGE(0x0f000, 0x0f001) AM_WRITE(emres_w) - AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(MRA16_NOP, tst_w) + AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(SMH_NOP, tst_w) AM_RANGE(0x20000, 0x2ffff) AM_READWRITE(main_z80_r, main_z80_w) AM_RANGE(0x30000, 0x3ffff) AM_READWRITE(main_gnd_r, main_gnd_w) AM_RANGE(0x40000, 0x4ffff) AM_READWRITE(main_obj_r, main_obj_w) @@ -221,7 +221,7 @@ static ADDRESS_MAP_START( sound_prg, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x6fff) AM_ROM AM_RANGE(0x7000, 0x7000) AM_WRITE(sound_vol) - AM_RANGE(0x7400, 0x7403) AM_READWRITE(adc_r, MWA8_NOP) + AM_RANGE(0x7400, 0x7403) AM_READWRITE(adc_r, SMH_NOP) AM_RANGE(0x7800, 0x7fff) AM_MIRROR(0x8000) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index 667d0a27ebe..8e65157afc9 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -461,9 +461,9 @@ static READ8_HANDLER( protection_r ) static ADDRESS_MAP_START( looping_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x9000, 0x93ff) AM_READWRITE(MRA8_RAM, looping_videoram_w) AM_BASE_MEMBER(looping_state, videoram) + AM_RANGE(0x9000, 0x93ff) AM_READWRITE(SMH_RAM, looping_videoram_w) AM_BASE_MEMBER(looping_state, videoram) - AM_RANGE(0x9800, 0x983f) AM_MIRROR(0x0700) AM_READWRITE(MRA8_RAM, looping_colorram_w) AM_BASE_MEMBER(looping_state, colorram) + AM_RANGE(0x9800, 0x983f) AM_MIRROR(0x0700) AM_READWRITE(SMH_RAM, looping_colorram_w) AM_BASE_MEMBER(looping_state, colorram) AM_RANGE(0x9840, 0x987f) AM_MIRROR(0x0700) AM_RAM AM_BASE_MEMBER(looping_state, spriteram) AM_RANGE(0x9880, 0x98ff) AM_MIRROR(0x0700) AM_RAM @@ -498,10 +498,10 @@ static ADDRESS_MAP_START( looping_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x37ff) AM_ROM AM_RANGE(0x3800, 0x3bff) AM_RAM AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x00f4) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w) - AM_RANGE(0x3c02, 0x3c02) AM_MIRROR(0x00f4) AM_READWRITE(MRA8_NOP, AY8910_write_port_0_w) + AM_RANGE(0x3c02, 0x3c02) AM_MIRROR(0x00f4) AM_READWRITE(SMH_NOP, AY8910_write_port_0_w) AM_RANGE(0x3c03, 0x3c03) AM_MIRROR(0x00f6) AM_NOP - AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x00f4) AM_READWRITE(MRA8_NOP, tms5220_data_w) - AM_RANGE(0x3e02, 0x3e02) AM_MIRROR(0x00f4) AM_READWRITE(tms5220_status_r, MWA8_NOP) + AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x00f4) AM_READWRITE(SMH_NOP, tms5220_data_w) + AM_RANGE(0x3e02, 0x3e02) AM_MIRROR(0x00f4) AM_READWRITE(tms5220_status_r, SMH_NOP) AM_RANGE(0x3e03, 0x3e03) AM_MIRROR(0x00f6) AM_NOP ADDRESS_MAP_END diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index 336ee87fa5e..18134264c46 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -176,21 +176,21 @@ static ADDRESS_MAP_START( lordgun_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_BASE(&lordgun_priority_ram) // PRIORITY - AM_RANGE(0x300000, 0x30ffff) AM_READWRITE(MRA16_RAM, lordgun_vram_0_w) AM_BASE(&lordgun_vram_0) // DISPLAY - AM_RANGE(0x310000, 0x313fff) AM_READWRITE(MRA16_RAM, lordgun_vram_1_w) AM_BASE(&lordgun_vram_1) // DISPLAY - AM_RANGE(0x314000, 0x317fff) AM_READWRITE(MRA16_RAM, lordgun_vram_2_w) AM_BASE(&lordgun_vram_2) // DISPLAY - AM_RANGE(0x318000, 0x319fff) AM_READWRITE(MRA16_RAM, lordgun_vram_3_w) AM_BASE(&lordgun_vram_3) // DISPLAY + AM_RANGE(0x300000, 0x30ffff) AM_READWRITE(SMH_RAM, lordgun_vram_0_w) AM_BASE(&lordgun_vram_0) // DISPLAY + AM_RANGE(0x310000, 0x313fff) AM_READWRITE(SMH_RAM, lordgun_vram_1_w) AM_BASE(&lordgun_vram_1) // DISPLAY + AM_RANGE(0x314000, 0x317fff) AM_READWRITE(SMH_RAM, lordgun_vram_2_w) AM_BASE(&lordgun_vram_2) // DISPLAY + AM_RANGE(0x318000, 0x319fff) AM_READWRITE(SMH_RAM, lordgun_vram_3_w) AM_BASE(&lordgun_vram_3) // DISPLAY AM_RANGE(0x31c000, 0x31c7ff) AM_RAM AM_BASE(&lordgun_scrollram) // LINE AM_RANGE(0x400000, 0x4007ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // ANIMATOR - AM_RANGE(0x500000, 0x500fff) AM_READWRITE(MRA16_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x502000, 0x502001) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_x_0) - AM_RANGE(0x502200, 0x502201) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_x_1) - AM_RANGE(0x502400, 0x502401) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_x_2) - AM_RANGE(0x502600, 0x502601) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_x_3) - AM_RANGE(0x502800, 0x502801) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_y_0) - AM_RANGE(0x502a00, 0x502a01) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_y_1) - AM_RANGE(0x502c00, 0x502c01) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_y_2) - AM_RANGE(0x502e00, 0x502e01) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_y_3) + AM_RANGE(0x500000, 0x500fff) AM_READWRITE(SMH_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x502000, 0x502001) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_x_0) + AM_RANGE(0x502200, 0x502201) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_x_1) + AM_RANGE(0x502400, 0x502401) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_x_2) + AM_RANGE(0x502600, 0x502601) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_x_3) + AM_RANGE(0x502800, 0x502801) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_y_0) + AM_RANGE(0x502a00, 0x502a01) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_y_1) + AM_RANGE(0x502c00, 0x502c01) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_y_2) + AM_RANGE(0x502e00, 0x502e01) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_y_3) AM_RANGE(0x503000, 0x503001) AM_WRITE(lordgun_priority_w) AM_RANGE(0x503800, 0x503801) AM_READ(lordgun_gun_0_x_r) AM_RANGE(0x503a00, 0x503a01) AM_READ(lordgun_gun_1_x_r) @@ -207,21 +207,21 @@ static ADDRESS_MAP_START( hfh_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_BASE(&lordgun_priority_ram) // PRIORITY - AM_RANGE(0x300000, 0x30ffff) AM_READWRITE(MRA16_RAM, lordgun_vram_0_w) AM_BASE(&lordgun_vram_0) // DISPLAY - AM_RANGE(0x310000, 0x313fff) AM_READWRITE(MRA16_RAM, lordgun_vram_1_w) AM_BASE(&lordgun_vram_1) // DISPLAY - AM_RANGE(0x314000, 0x317fff) AM_READWRITE(MRA16_RAM, lordgun_vram_2_w) AM_BASE(&lordgun_vram_2) // DISPLAY - AM_RANGE(0x318000, 0x319fff) AM_READWRITE(MRA16_RAM, lordgun_vram_3_w) AM_BASE(&lordgun_vram_3) // DISPLAY + AM_RANGE(0x300000, 0x30ffff) AM_READWRITE(SMH_RAM, lordgun_vram_0_w) AM_BASE(&lordgun_vram_0) // DISPLAY + AM_RANGE(0x310000, 0x313fff) AM_READWRITE(SMH_RAM, lordgun_vram_1_w) AM_BASE(&lordgun_vram_1) // DISPLAY + AM_RANGE(0x314000, 0x317fff) AM_READWRITE(SMH_RAM, lordgun_vram_2_w) AM_BASE(&lordgun_vram_2) // DISPLAY + AM_RANGE(0x318000, 0x319fff) AM_READWRITE(SMH_RAM, lordgun_vram_3_w) AM_BASE(&lordgun_vram_3) // DISPLAY AM_RANGE(0x31c000, 0x31c7ff) AM_RAM AM_BASE(&lordgun_scrollram) // LINE AM_RANGE(0x400000, 0x4007ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // ANIMATOR - AM_RANGE(0x500000, 0x500fff) AM_READWRITE(MRA16_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x502000, 0x502001) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_x_0) - AM_RANGE(0x502200, 0x502201) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_x_1) - AM_RANGE(0x502400, 0x502401) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_x_2) - AM_RANGE(0x502600, 0x502601) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_x_3) - AM_RANGE(0x502800, 0x502801) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_y_0) - AM_RANGE(0x502a00, 0x502a01) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_y_1) - AM_RANGE(0x502c00, 0x502c01) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_y_2) - AM_RANGE(0x502e00, 0x502e01) AM_WRITE(MWA16_RAM) AM_BASE(&lordgun_scroll_y_3) + AM_RANGE(0x500000, 0x500fff) AM_READWRITE(SMH_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x502000, 0x502001) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_x_0) + AM_RANGE(0x502200, 0x502201) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_x_1) + AM_RANGE(0x502400, 0x502401) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_x_2) + AM_RANGE(0x502600, 0x502601) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_x_3) + AM_RANGE(0x502800, 0x502801) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_y_0) + AM_RANGE(0x502a00, 0x502a01) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_y_1) + AM_RANGE(0x502c00, 0x502c01) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_y_2) + AM_RANGE(0x502e00, 0x502e01) AM_WRITE(SMH_RAM) AM_BASE(&lordgun_scroll_y_3) AM_RANGE(0x503000, 0x503001) AM_WRITE(lordgun_priority_w) AM_RANGE(0x504000, 0x504001) AM_WRITE(lordgun_soundlatch_w) AM_RANGE(0x506000, 0x506007) AM_READWRITE(lordgun_ppi8255_0_r, lordgun_ppi8255_0_w) @@ -254,7 +254,7 @@ static ADDRESS_MAP_START( lordgun_soundio_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x2000, 0x2000) AM_READWRITE( OKIM6295_status_0_r, OKIM6295_data_0_w ) AM_RANGE(0x3000, 0x3000) AM_READ( soundlatch2_r ) AM_RANGE(0x4000, 0x4000) AM_READ( soundlatch_r ) - AM_RANGE(0x5000, 0x5000) AM_READ( MRA8_NOP ) + AM_RANGE(0x5000, 0x5000) AM_READ( SMH_NOP ) AM_RANGE(0x6000, 0x6000) AM_WRITE( lordgun_okibank_w ) ADDRESS_MAP_END @@ -262,7 +262,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hfh_soundio_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x3000, 0x3000) AM_READ( soundlatch2_r ) AM_RANGE(0x4000, 0x4000) AM_READ( soundlatch_r ) - AM_RANGE(0x5000, 0x5000) AM_READ( MRA8_NOP ) + AM_RANGE(0x5000, 0x5000) AM_READ( SMH_NOP ) AM_RANGE(0x7000, 0x7000) AM_WRITE( YM3812_control_port_0_w ) AM_RANGE(0x7001, 0x7001) AM_WRITE( YM3812_write_port_0_w ) AM_RANGE(0x7400, 0x7400) AM_READWRITE( OKIM6295_status_0_r, OKIM6295_data_0_w ) diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index 7e61ae6b795..6b04737930c 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -202,9 +202,9 @@ static WRITE8_HANDLER( lsasquad_bankswitch_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK1) - AM_RANGE(0xa000, 0xe5ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK1) + AM_RANGE(0xa000, 0xe5ff) AM_READ(SMH_RAM) AM_RANGE(0xe800, 0xe800) AM_READ(input_port_0_r) /* DSWA */ AM_RANGE(0xe801, 0xe801) AM_READ(input_port_1_r) /* DSWB */ AM_RANGE(0xe802, 0xe802) AM_READ(input_port_2_r) /* DSWC */ @@ -219,29 +219,29 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_RAM) /* SRAM */ - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) /* SCREEN RAM */ - AM_RANGE(0xe000, 0xe3ff) AM_WRITE(MWA8_RAM) AM_BASE(&lsasquad_scrollram) /* SCROLL RAM */ - AM_RANGE(0xe400, 0xe5ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* OBJECT RAM */ + AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_RAM) /* SRAM */ + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) /* SCREEN RAM */ + AM_RANGE(0xe000, 0xe3ff) AM_WRITE(SMH_RAM) AM_BASE(&lsasquad_scrollram) /* SCROLL RAM */ + AM_RANGE(0xe400, 0xe5ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* OBJECT RAM */ AM_RANGE(0xea00, 0xea00) AM_WRITE(lsasquad_bankswitch_w) AM_RANGE(0xec00, 0xec00) AM_WRITE(lsasquad_sound_command_w) AM_RANGE(0xee00, 0xee00) AM_WRITE(lsasquad_mcu_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xa001, 0xa001) AM_READ(YM2203_read_port_0_r) AM_RANGE(0xd000, 0xd000) AM_READ(lsasquad_sh_sound_command_r) AM_RANGE(0xd800, 0xd800) AM_READ(lsasquad_sound_status_r) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_ROM) /* space for diagnostic ROM? */ + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) /* space for diagnostic ROM? */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(AY8910_control_port_0_w) @@ -249,7 +249,7 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xd000) AM_WRITE(lsasquad_sh_result_w) AM_RANGE(0xd400, 0xd400) AM_WRITE(lsasquad_sh_nmi_disable_w) AM_RANGE(0xd800, 0xd800) AM_WRITE(lsasquad_sh_nmi_enable_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_ROM) /* space for diagnostic ROM? */ + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_ROM) /* space for diagnostic ROM? */ ADDRESS_MAP_END static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -257,8 +257,8 @@ static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(lsasquad_68705_portA_r) AM_RANGE(0x0001, 0x0001) AM_READ(lsasquad_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(lsasquad_mcu_status_r) - AM_RANGE(0x0010, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -267,8 +267,8 @@ static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0001, 0x0001) AM_WRITE(lsasquad_68705_portB_w) AM_RANGE(0x0004, 0x0004) AM_WRITE(lsasquad_68705_ddrA_w) AM_RANGE(0x0005, 0x0005) AM_WRITE(lsasquad_68705_ddrB_w) - AM_RANGE(0x0010, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -400,7 +400,7 @@ INPUT_PORTS_END static ADDRESS_MAP_START( mem_daikaiju, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK1) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK1) AM_RANGE(0xa000, 0xbfff) AM_RAM /* SRAM */ AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&videoram) AM_SIZE(&videoram_size) /* SCREEN RAM */ AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_BASE(&lsasquad_scrollram) /* SCROLL RAM */ diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index 9761e5f15ce..0881aaaf425 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -54,13 +54,13 @@ static WRITE8_HANDLER( ltcasino_tile_atr_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xcfff) AM_READ(MRA8_ROM) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xcfff) AM_READ(SMH_ROM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe800, 0xebff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe800, 0xebff) AM_READ(SMH_RAM) AM_RANGE(0xec00, 0xec00) AM_READ(input_port_0_r) AM_RANGE(0xec01, 0xec01) AM_READ(input_port_1_r) @@ -71,25 +71,25 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xec20, 0xec20) AM_READ(AY8910_read_port_0_r) AM_RANGE(0xec21, 0xec21) AM_READ(input_port_6_r) //ltcasino -> pc: F3F3 (A in service) and F3FD (B in service) - AM_RANGE(0xec3e, 0xec3e) AM_READ(MRA8_NOP) //not used + AM_RANGE(0xec3e, 0xec3e) AM_READ(SMH_NOP) //not used - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xcfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xcfff) AM_WRITE(SMH_ROM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(ltcasino_tile_num_w) AM_BASE(<casino_tile_num_ram) - AM_RANGE(0xd800, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd800, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(ltcasino_tile_atr_w) AM_BASE(<casino_tile_atr_ram) - AM_RANGE(0xe800, 0xebff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe800, 0xebff) AM_WRITE(SMH_RAM) AM_RANGE(0xec20, 0xec20) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0xec21, 0xec21) AM_WRITE(AY8910_control_port_0_w) - AM_RANGE(0xec30, 0xec3f) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xec30, 0xec3f) AM_WRITE(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c index 39ee826f028..b601af767ef 100644 --- a/src/mame/drivers/lwings.c +++ b/src/mame/drivers/lwings.c @@ -268,9 +268,9 @@ static WRITE8_HANDLER( msm5205_w ) } static ADDRESS_MAP_START( avengers_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf808, 0xf808) AM_READ(input_port_0_r) AM_RANGE(0xf809, 0xf809) AM_READ(input_port_1_r) AM_RANGE(0xf80a, 0xf80a) AM_READ(input_port_2_r) @@ -280,10 +280,10 @@ static ADDRESS_MAP_START( avengers_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( avengers_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xddff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xde00, 0xdf7f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xdf80, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xddff) AM_WRITE(SMH_RAM) + AM_RANGE(0xde00, 0xdf7f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xdf80, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(lwings_fgvideoram_w) AM_BASE(&lwings_fgvideoram) AM_RANGE(0xe800, 0xefff) AM_WRITE(lwings_bg1videoram_w) AM_BASE(&lwings_bg1videoram) AM_RANGE(0xf000, 0xf3ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_BASE(&paletteram_2) @@ -292,7 +292,7 @@ static ADDRESS_MAP_START( avengers_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf802, 0xf803) AM_WRITE(lwings_bg1_scrolly_w) AM_RANGE(0xf804, 0xf804) AM_WRITE(trojan_bg2_scrollx_w) AM_RANGE(0xf805, 0xf805) AM_WRITE(trojan_bg2_image_w) - AM_RANGE(0xf808, 0xf808) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xf808, 0xf808) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf809, 0xf809) AM_WRITE(avengers_protection_w) AM_RANGE(0xf80c, 0xf80c) AM_WRITE(avengers_prot_bank_w) AM_RANGE(0xf80d, 0xf80d) AM_WRITE(avengers_adpcm_w) @@ -300,9 +300,9 @@ static ADDRESS_MAP_START( avengers_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) /* common to trojan and lwings */ - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf808, 0xf808) AM_READ(input_port_0_r) AM_RANGE(0xf809, 0xf809) AM_READ(input_port_1_r) AM_RANGE(0xf80a, 0xf80a) AM_READ(input_port_2_r) @@ -311,9 +311,9 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) /* common to troja ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) /* lwings */ - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xddff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xde00, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xddff) AM_WRITE(SMH_RAM) + AM_RANGE(0xde00, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(lwings_fgvideoram_w) AM_BASE(&lwings_fgvideoram) AM_RANGE(0xe800, 0xefff) AM_WRITE(lwings_bg1videoram_w) AM_BASE(&lwings_bg1videoram) AM_RANGE(0xf000, 0xf3ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_BASE(&paletteram_2) @@ -326,10 +326,10 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) /* lwings */ ADDRESS_MAP_END static ADDRESS_MAP_START( trojan_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xddff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xde00, 0xdf7f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xdf80, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xddff) AM_WRITE(SMH_RAM) + AM_RANGE(0xde00, 0xdf7f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xdf80, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(lwings_fgvideoram_w) AM_BASE(&lwings_fgvideoram) AM_RANGE(0xe800, 0xefff) AM_WRITE(lwings_bg1videoram_w) AM_BASE(&lwings_bg1videoram) AM_RANGE(0xf000, 0xf3ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_split2_w) AM_BASE(&paletteram_2) @@ -344,30 +344,30 @@ static ADDRESS_MAP_START( trojan_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r) AM_RANGE(0xe006, 0xe006) AM_READ(avengers_soundlatch2_r) //AT: (avengers061gre) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2203_control_port_1_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2203_write_port_1_w) - AM_RANGE(0xe006, 0xe006) AM_WRITE(MWA8_RAM) AM_BASE(&avengers_soundlatch2) + AM_RANGE(0xe006, 0xe006) AM_WRITE(SMH_RAM) AM_BASE(&avengers_soundlatch2) ADDRESS_MAP_END static ADDRESS_MAP_START( adpcm_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END /* Yes, _no_ ram */ static ADDRESS_MAP_START( adpcm_writemem, ADDRESS_SPACE_PROGRAM, 8 ) -/* AM_RANGE(0x0000, 0xffff) AM_WRITE(MWA8_ROM) avoid cluttering up error.log */ - AM_RANGE(0x0000, 0xffff) AM_WRITE(MWA8_NOP) +/* AM_RANGE(0x0000, 0xffff) AM_WRITE(SMH_ROM) avoid cluttering up error.log */ + AM_RANGE(0x0000, 0xffff) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( avengers_adpcm_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c index 19187609b3d..08cf3c80ef6 100644 --- a/src/mame/drivers/m10.c +++ b/src/mame/drivers/m10.c @@ -476,44 +476,44 @@ static INTERRUPT_GEN( m15_interrupt ) static ADDRESS_MAP_START( m10_main, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x02ff) AM_RAM AM_BASE_MEMBER(m10_state, memory) /* scratch ram */ - AM_RANGE(0x1000, 0x2fff) AM_READ(MRA8_ROM) AM_BASE_MEMBER(m10_state, rom) + AM_RANGE(0x1000, 0x2fff) AM_READ(SMH_ROM) AM_BASE_MEMBER(m10_state, rom) AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4800, 0x4bff) AM_READWRITE(MRA8_RAM, m10_colorram_w) AM_BASE(&colorram) /* foreground colour */ + AM_RANGE(0x4800, 0x4bff) AM_READWRITE(SMH_RAM, m10_colorram_w) AM_BASE(&colorram) /* foreground colour */ AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE_MEMBER(m10_state, chargen) /* background ????? */ AM_RANGE(0xa200, 0xa200) AM_READ(input_port_1_r) AM_RANGE(0xa300, 0xa300) AM_READ(input_port_0_r) AM_RANGE(0xa400, 0xa400) AM_WRITE(m10_ctrl_w) /* line at bottom of screen?, sound, flip screen */ AM_RANGE(0xa500, 0xa500) AM_WRITE(m10_a500_w) /* ??? */ AM_RANGE(0xa700, 0xa700) AM_READ(m10_a700_r) - AM_RANGE(0xfc00, 0xffff) AM_READ(MRA8_ROM) /* for the reset / interrupt vectors */ + AM_RANGE(0xfc00, 0xffff) AM_READ(SMH_ROM) /* for the reset / interrupt vectors */ ADDRESS_MAP_END static ADDRESS_MAP_START( m11_main, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x02ff) AM_RAM AM_BASE_MEMBER(m10_state, memory) /* scratch ram */ - AM_RANGE(0x1000, 0x2fff) AM_READ(MRA8_ROM) AM_BASE_MEMBER(m10_state, rom) + AM_RANGE(0x1000, 0x2fff) AM_READ(SMH_ROM) AM_BASE_MEMBER(m10_state, rom) AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4800, 0x4bff) AM_READWRITE(MRA8_RAM, m10_colorram_w) AM_BASE(&colorram) /* foreground colour */ + AM_RANGE(0x4800, 0x4bff) AM_READWRITE(SMH_RAM, m10_colorram_w) AM_BASE(&colorram) /* foreground colour */ AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE_MEMBER(m10_state, chargen) /* background ????? */ AM_RANGE(0xa100, 0xa100) AM_WRITE(m11_a100_w) /* sound writes ???? */ AM_RANGE(0xa200, 0xa200) AM_READ(input_port_1_r) AM_RANGE(0xa300, 0xa300) AM_READ(input_port_0_r) AM_RANGE(0xa400, 0xa400) AM_WRITE(m11_ctrl_w) /* line at bottom of screen?, sound, flip screen */ AM_RANGE(0xa700, 0xa700) AM_READ(m11_a700_r) - AM_RANGE(0xfc00, 0xffff) AM_READ(MRA8_ROM) /* for the reset / interrupt vectors */ + AM_RANGE(0xfc00, 0xffff) AM_READ(SMH_ROM) /* for the reset / interrupt vectors */ ADDRESS_MAP_END static ADDRESS_MAP_START( m15_main, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x02ff) AM_RAM AM_BASE_MEMBER(m10_state, memory) /* scratch ram */ - AM_RANGE(0x1000, 0x33ff) AM_READ(MRA8_ROM) AM_BASE_MEMBER(m10_state, rom) + AM_RANGE(0x1000, 0x33ff) AM_READ(SMH_ROM) AM_BASE_MEMBER(m10_state, rom) AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4800, 0x4bff) AM_READWRITE(MRA8_RAM, m10_colorram_w) AM_BASE(&colorram) /* foreground colour */ - AM_RANGE(0x5000, 0x57ff) AM_READWRITE(MRA8_RAM, m15_chargen_w) AM_BASE_MEMBER(m10_state, chargen) /* background ????? */ + AM_RANGE(0x4800, 0x4bff) AM_READWRITE(SMH_RAM, m10_colorram_w) AM_BASE(&colorram) /* foreground colour */ + AM_RANGE(0x5000, 0x57ff) AM_READWRITE(SMH_RAM, m15_chargen_w) AM_BASE_MEMBER(m10_state, chargen) /* background ????? */ AM_RANGE(0xa000, 0xa000) AM_READ(input_port_3_r) AM_RANGE(0xa100, 0xa100) AM_WRITE(m15_a100_w) /* sound writes ???? */ AM_RANGE(0xa200, 0xa200) AM_READ(input_port_1_r) AM_RANGE(0xa300, 0xa300) AM_READ(input_port_0_r) AM_RANGE(0xa400, 0xa400) AM_WRITE(m15_ctrl_w) /* sound, flip screen */ - AM_RANGE(0xfc00, 0xffff) AM_READ(MRA8_ROM) /* for the reset / interrupt vectors */ + AM_RANGE(0xfc00, 0xffff) AM_READ(SMH_ROM) /* for the reset / interrupt vectors */ ADDRESS_MAP_END /************************************* diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c index 4c5b418067f..83ae5be8ed2 100644 --- a/src/mame/drivers/m107.c +++ b/src/mame/drivers/m107.c @@ -154,10 +154,10 @@ 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(0xd0000, 0xdffff) AM_READWRITE(MRA16_RAM, m107_vram_w) AM_BASE(&m107_vram_data) + AM_RANGE(0xd0000, 0xdffff) AM_READWRITE(SMH_RAM, m107_vram_w) AM_BASE(&m107_vram_data) AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */ AM_RANGE(0xf8000, 0xf8fff) AM_RAM AM_BASE(&spriteram16) - AM_RANGE(0xf9000, 0xf9fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xf9000, 0xf9fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0xffff0, 0xfffff) AM_ROM ADDRESS_MAP_END @@ -169,19 +169,19 @@ static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x08, 0x09) AM_READ(m107_sound_status_r) /* answer from sound CPU */ AM_RANGE(0x00, 0x01) AM_WRITE(m107_soundlatch_w) AM_RANGE(0x02, 0x03) AM_WRITE(m107_coincounter_w) - AM_RANGE(0x04, 0x05) AM_WRITE(MWA16_NOP) /* ??? 0008 */ + AM_RANGE(0x04, 0x05) AM_WRITE(SMH_NOP) /* ??? 0008 */ AM_RANGE(0x06, 0x07) AM_WRITE(bankswitch_w) AM_RANGE(0x80, 0x9f) AM_WRITE(m107_control_w) - AM_RANGE(0xa0, 0xaf) AM_WRITE(MWA16_NOP) /* Written with 0's in interrupt */ + AM_RANGE(0xa0, 0xaf) AM_WRITE(SMH_NOP) /* Written with 0's in interrupt */ AM_RANGE(0xb0, 0xb1) AM_WRITE(m107_spritebuffer_w) - AM_RANGE(0xc0, 0xc3) AM_READ(MRA16_NOP) /* Only wpksoc: ticket related? */ + AM_RANGE(0xc0, 0xc3) AM_READ(SMH_NOP) /* Only wpksoc: ticket related? */ ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x1ffff) AM_ROM - AM_RANGE(0x9ff00, 0x9ffff) AM_WRITE(MWA16_NOP) /* Irq controller? */ + AM_RANGE(0x9ff00, 0x9ffff) AM_WRITE(SMH_NOP) /* Irq controller? */ AM_RANGE(0xa0000, 0xa3fff) AM_RAM AM_RANGE(0xa8000, 0xa803f) AM_READWRITE(IremGA20_r, IremGA20_w) AM_RANGE(0xa8040, 0xa8041) AM_WRITE(YM2151_register_port_0_lsb_w) diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c index 3acd474972e..22d539fa2d7 100644 --- a/src/mame/drivers/m52.c +++ b/src/mame/drivers/m52.c @@ -60,10 +60,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x8000, 0x83ff) AM_READWRITE(MRA8_RAM, m52_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x8400, 0x87ff) AM_READWRITE(MRA8_RAM, m52_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x8000, 0x83ff) AM_READWRITE(SMH_RAM, m52_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x8400, 0x87ff) AM_READWRITE(SMH_RAM, m52_colorram_w) AM_BASE(&colorram) AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x07ff) AM_READ(m52_protection_r) - AM_RANGE(0xc800, 0xcbff) AM_MIRROR(0x0400) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc800, 0xcbff) AM_MIRROR(0x0400) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xd000) AM_MIRROR(0x07fc) AM_WRITE(irem_sound_cmd_w) AM_RANGE(0xd001, 0xd001) AM_MIRROR(0x07fc) AM_WRITE(m52_flipscreen_w) /* + coin counters */ AM_RANGE(0xd000, 0xd000) AM_MIRROR(0x07f8) AM_READ_PORT("IN0") @@ -77,9 +77,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( alpha1v_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x6fff) AM_ROM - AM_RANGE(0x8000, 0x83ff) AM_READWRITE(MRA8_RAM, m52_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x8400, 0x87ff) AM_READWRITE(MRA8_RAM, m52_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xc800, 0xc9ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_SHARE(1) // bigger or mirrored? + AM_RANGE(0x8000, 0x83ff) AM_READWRITE(SMH_RAM, m52_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x8400, 0x87ff) AM_READWRITE(SMH_RAM, m52_colorram_w) AM_BASE(&colorram) + AM_RANGE(0xc800, 0xc9ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_SHARE(1) // bigger or mirrored? AM_RANGE(0xd000, 0xd000) AM_READ_PORT("IN0") AM_WRITE(irem_sound_cmd_w) AM_RANGE(0xd001, 0xd001) AM_READ_PORT("IN1") AM_WRITE(alpha1v_flipscreen_w) AM_RANGE(0xd002, 0xd002) AM_READ_PORT("IN2") diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c index 9bb15de232c..e96ef846a78 100644 --- a/src/mame/drivers/m57.c +++ b/src/mame/drivers/m57.c @@ -65,9 +65,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x87ff) AM_READWRITE(MRA8_RAM, m57_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x8000, 0x87ff) AM_READWRITE(SMH_RAM, m57_videoram_w) AM_BASE(&videoram) AM_RANGE(0x9000, 0x91ff) AM_RAM AM_BASE(&m57_scroll) - AM_RANGE(0xc820, 0xc8ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc820, 0xc8ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xd000) AM_WRITE(irem_sound_cmd_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(m57_flipscreen_w) /* + coin counters */ AM_RANGE(0xd000, 0xd000) AM_READ_PORT("IN0") diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c index 06e93391531..4a38a58396e 100644 --- a/src/mame/drivers/m62.c +++ b/src/mame/drivers/m62.c @@ -161,19 +161,19 @@ static WRITE8_HANDLER( youjyudn_bankswitch_w ) static ADDRESS_MAP_START( kungfum_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xd000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xd000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( kungfum_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xa000, 0xa000) AM_WRITE(m62_hscroll_low_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(m62_hscroll_high_w) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* Kung Fu Master is the only game in this driver to have separated (but */ /* contiguous) videoram and colorram. They are interleaved in all the others. */ AM_RANGE(0xd000, 0xdfff) AM_WRITE(kungfum_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( kungfum_readport, ADDRESS_SPACE_IO, 8 ) @@ -193,17 +193,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( battroad_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc800, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc800, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( battroad_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc800, 0xcfff) AM_WRITE(m62_textram_w) AM_BASE(&m62_textram) AM_RANGE(0xd000, 0xdfff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( battroad_writeport, ADDRESS_SPACE_IO, 8 ) @@ -218,29 +218,29 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xd000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xd000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xdfff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK1) - AM_RANGE(0xd000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK1) + AM_RANGE(0xd000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xdfff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun2_readport, ADDRESS_SPACE_IO, 8 ) @@ -262,18 +262,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun3_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) AM_RANGE(0xc800, 0xc800) AM_READ(ldrun3_prot_5_r) AM_RANGE(0xcc00, 0xcc00) AM_READ(ldrun3_prot_7_r) AM_RANGE(0xcfff, 0xcfff) AM_READ(ldrun3_prot_7_r) - AM_RANGE(0xd000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xdfff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun3_writeport, ADDRESS_SPACE_IO, 8 ) @@ -286,17 +286,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun4_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xd000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xd000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun4_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc800, 0xc800) AM_WRITE(ldrun4_bankswitch_w) AM_RANGE(0xd000, 0xdfff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ldrun4_writeport, ADDRESS_SPACE_IO, 8 ) @@ -309,33 +309,33 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lotlot_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xa000, 0xafff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xa000, 0xafff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( lotlot_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xa000, 0xafff) AM_WRITE(m62_textram_w) AM_BASE(&m62_textram) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xdfff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( kidniki_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK1) - AM_RANGE(0xa000, 0xafff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK1) + AM_RANGE(0xa000, 0xafff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( kidniki_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) AM_RANGE(0xa000, 0xafff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xdfff) AM_WRITE(m62_textram_w) AM_BASE(&m62_textram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( kidniki_writeport, ADDRESS_SPACE_IO, 8 ) @@ -352,17 +352,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spelunkr_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK1) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK1) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( spelunkr_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) AM_RANGE(0xa000, 0xbfff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc800, 0xcfff) AM_WRITE(m62_textram_w) AM_BASE(&m62_textram) AM_RANGE(0xd000, 0xd000) AM_WRITE(m62_vscroll_low_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(m62_vscroll_high_w) @@ -370,46 +370,46 @@ static ADDRESS_MAP_START( spelunkr_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd003, 0xd003) AM_WRITE(m62_hscroll_high_w) AM_RANGE(0xd004, 0xd004) AM_WRITE(spelunkr_bankswitch_w) AM_RANGE(0xd005, 0xd005) AM_WRITE(spelunkr_palbank_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( spelunk2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x9000, 0x9fff) AM_READ(MRA8_BANK2) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_BANK1) + AM_RANGE(0x9000, 0x9fff) AM_READ(SMH_BANK2) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( spelunk2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) AM_RANGE(0xa000, 0xbfff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc800, 0xcfff) AM_WRITE(m62_textram_w) AM_BASE(&m62_textram) AM_RANGE(0xd000, 0xd000) AM_WRITE(m62_vscroll_low_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(m62_hscroll_low_w) AM_RANGE(0xd002, 0xd002) AM_WRITE(spelunk2_gfxport_w) AM_RANGE(0xd003, 0xd003) AM_WRITE(spelunk2_bankswitch_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( youjyudn_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( youjyudn_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc800, 0xcfff) AM_WRITE(m62_textram_w) AM_BASE(&m62_textram) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( youjyudn_writeport, ADDRESS_SPACE_IO, 8 ) @@ -423,19 +423,19 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( horizon_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc1ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xc83f) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc1ff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xc83f) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( horizon_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc1ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc1ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc800, 0xc83f) AM_WRITE(horizon_scrollram_w) AM_BASE(&horizon_scrollram) AM_RANGE(0xd000, 0xdfff) AM_WRITE(m62_tileram_w) AM_BASE(&m62_tileram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index 07f24a67bca..79431582835 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -480,7 +480,7 @@ static void install_protection_handler(const UINT8 *code,const UINT8 *crc) protection_ram = auto_malloc(0x1000); protection_code = code; protection_crc = crc; - memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xb0fff, 0, 0, MRA16_BANK1); + memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xb0fff, 0, 0, SMH_BANK1); memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0ffa, 0xb0ffb, 0, 0, protection_r); memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xb0fff, 0, 0, protection_w); memory_set_bankptr(1, protection_ram); @@ -645,8 +645,8 @@ static ADDRESS_MAP_START( NAME##_map, ADDRESS_SPACE_PROGRAM, 16 ) \ AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) \ AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_BASE(&paletteram16) \ AM_RANGE(0xcc000, 0xccbff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_BASE(&paletteram16_2) \ - AM_RANGE(0xd0000, 0xd3fff) AM_READWRITE(MRA16_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) \ - AM_RANGE(0xd8000, 0xdbfff) AM_READWRITE(MRA16_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) \ + AM_RANGE(0xd0000, 0xd3fff) AM_READWRITE(SMH_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) \ + AM_RANGE(0xd8000, 0xdbfff) AM_READWRITE(SMH_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) \ AM_RANGE(0xe0000, 0xeffff) AM_READWRITE(soundram_r, soundram_w) \ AM_RANGE(0xffff0, 0xfffff) AM_ROM \ ADDRESS_MAP_END @@ -661,12 +661,12 @@ CPU1_MEMORY( dbreed72, 0x80000, 0x90000 ) static ADDRESS_MAP_START( dbreed_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x7ffff) AM_ROM AM_RANGE(0x88000, 0x8bfff) AM_RAM /* work RAM */ - AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITE(MWA16_RAM) /* leftover from protection?? */ + AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITE(SMH_RAM) /* leftover from protection?? */ AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_BASE(&paletteram16) AM_RANGE(0xcc000, 0xccbff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_BASE(&paletteram16_2) - AM_RANGE(0xd0000, 0xd3fff) AM_READWRITE(MRA16_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) - AM_RANGE(0xd8000, 0xdbfff) AM_READWRITE(MRA16_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) + AM_RANGE(0xd0000, 0xd3fff) AM_READWRITE(SMH_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) + AM_RANGE(0xd8000, 0xdbfff) AM_READWRITE(SMH_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) AM_RANGE(0xffff0, 0xfffff) AM_ROM ADDRESS_MAP_END @@ -676,8 +676,8 @@ static ADDRESS_MAP_START( rtype2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xbc000, 0xbc001) AM_WRITE(m72_dmaon_w) AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_BASE(&paletteram16) - AM_RANGE(0xd0000, 0xd3fff) AM_READWRITE(MRA16_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) - AM_RANGE(0xd4000, 0xd7fff) AM_READWRITE(MRA16_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) + AM_RANGE(0xd0000, 0xd3fff) AM_READWRITE(SMH_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) + AM_RANGE(0xd4000, 0xd7fff) AM_READWRITE(SMH_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) AM_RANGE(0xd8000, 0xd8bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_BASE(&paletteram16_2) AM_RANGE(0xe0000, 0xe3fff) AM_RAM /* work RAM */ AM_RANGE(0xffff0, 0xfffff) AM_ROM @@ -687,14 +687,14 @@ static ADDRESS_MAP_START( majtitle_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x7ffff) AM_ROM AM_RANGE(0xa0000, 0xa03ff) AM_RAM AM_BASE(&majtitle_rowscrollram) AM_RANGE(0xa4000, 0xa4bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_BASE(&paletteram16_2) - AM_RANGE(0xac000, 0xaffff) AM_READWRITE(MRA16_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) - AM_RANGE(0xb0000, 0xbffff) AM_READWRITE(MRA16_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) /* larger than the other games */ + AM_RANGE(0xac000, 0xaffff) AM_READWRITE(SMH_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) + AM_RANGE(0xb0000, 0xbffff) AM_READWRITE(SMH_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) /* larger than the other games */ AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xc8000, 0xc83ff) AM_RAM AM_BASE(&spriteram16_2) AM_RANGE(0xcc000, 0xccbff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_BASE(&paletteram16) AM_RANGE(0xd0000, 0xd3fff) AM_RAM /* work RAM */ AM_RANGE(0xe0000, 0xe0001) AM_WRITE(m72_irq_line_w) - AM_RANGE(0xe4000, 0xe4001) AM_WRITE(MWA16_RAM) /* playfield enable? 1 during screen transitions, 0 otherwise */ + AM_RANGE(0xe4000, 0xe4001) AM_WRITE(SMH_RAM) /* playfield enable? 1 during screen transitions, 0 otherwise */ AM_RANGE(0xec000, 0xec001) AM_WRITE(m72_dmaon_w) AM_RANGE(0xffff0, 0xfffff) AM_ROM ADDRESS_MAP_END @@ -702,12 +702,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hharry_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x7ffff) AM_ROM AM_RANGE(0xa0000, 0xa3fff) AM_RAM /* work RAM */ - AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITE(MWA16_RAM) /* leftover from protection?? */ + AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITE(SMH_RAM) /* leftover from protection?? */ AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xc8000, 0xc8bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_BASE(&paletteram16) AM_RANGE(0xcc000, 0xccbff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_BASE(&paletteram16_2) - AM_RANGE(0xd0000, 0xd3fff) AM_READWRITE(MRA16_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) - AM_RANGE(0xd8000, 0xdbfff) AM_READWRITE(MRA16_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) + AM_RANGE(0xd0000, 0xd3fff) AM_READWRITE(SMH_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) + AM_RANGE(0xd8000, 0xdbfff) AM_READWRITE(SMH_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) AM_RANGE(0xffff0, 0xfffff) AM_ROM ADDRESS_MAP_END @@ -717,10 +717,10 @@ static ADDRESS_MAP_START( hharryu_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa8000, 0xa8bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_BASE(&paletteram16_2) AM_RANGE(0xb0000, 0xb0001) AM_WRITE(m72_irq_line_w) AM_RANGE(0xbc000, 0xbc001) AM_WRITE(m72_dmaon_w) - AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITE(MWA16_RAM) /* leftover from protection?? */ + AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITE(SMH_RAM) /* leftover from protection?? */ AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0xd0000, 0xd3fff) AM_READWRITE(MRA16_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) - AM_RANGE(0xd4000, 0xd7fff) AM_READWRITE(MRA16_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) + AM_RANGE(0xd0000, 0xd3fff) AM_READWRITE(SMH_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) + AM_RANGE(0xd4000, 0xd7fff) AM_READWRITE(SMH_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) AM_RANGE(0xe0000, 0xe3fff) AM_RAM /* work RAM */ AM_RANGE(0xffff0, 0xfffff) AM_ROM ADDRESS_MAP_END @@ -730,11 +730,11 @@ static ADDRESS_MAP_START( kengo_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa0000, 0xa0bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_BASE(&paletteram16) AM_RANGE(0xa8000, 0xa8bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_BASE(&paletteram16_2) AM_RANGE(0xb0000, 0xb0001) AM_WRITE(m72_irq_line_w) -AM_RANGE(0xb4000, 0xb4001) AM_WRITE(MWA16_NOP) /* ??? */ +AM_RANGE(0xb4000, 0xb4001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xbc000, 0xbc001) AM_WRITE(m72_dmaon_w) AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x80000, 0x83fff) AM_READWRITE(MRA16_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) - AM_RANGE(0x84000, 0x87fff) AM_READWRITE(MRA16_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) + AM_RANGE(0x80000, 0x83fff) AM_READWRITE(SMH_RAM, m72_videoram1_w) AM_BASE(&m72_videoram1) + AM_RANGE(0x84000, 0x87fff) AM_READWRITE(SMH_RAM, m72_videoram2_w) AM_BASE(&m72_videoram2) AM_RANGE(0xe0000, 0xe3fff) AM_RAM /* work RAM */ AM_RANGE(0xffff0, 0xfffff) AM_ROM ADDRESS_MAP_END @@ -747,7 +747,7 @@ static ADDRESS_MAP_START( m72_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x02, 0x03) AM_WRITE(m72_port02_w) /* coin counters, reset sound cpu, other stuff? */ AM_RANGE(0x04, 0x05) AM_WRITE(m72_dmaon_w) AM_RANGE(0x06, 0x07) AM_WRITE(m72_irq_line_w) - AM_RANGE(0x40, 0x43) AM_WRITE(MWA16_NOP) /* Interrupt controller, only written to at bootup */ + AM_RANGE(0x40, 0x43) AM_WRITE(SMH_NOP) /* Interrupt controller, only written to at bootup */ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w) AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w) AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w) @@ -761,7 +761,7 @@ static ADDRESS_MAP_START( rtype2_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x04, 0x05) AM_READ(input_port_2_word_r) AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w) AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w) - AM_RANGE(0x40, 0x43) AM_WRITE(MWA16_NOP) /* Interrupt controller, only written to at bootup */ + AM_RANGE(0x40, 0x43) AM_WRITE(SMH_NOP) /* Interrupt controller, only written to at bootup */ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w) AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w) AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w) @@ -774,7 +774,7 @@ static ADDRESS_MAP_START( poundfor_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x08, 0x0f) AM_READ(poundfor_trackball_r) AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w) AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w) - AM_RANGE(0x40, 0x43) AM_WRITE(MWA16_NOP) /* Interrupt controller, only written to at bootup */ + AM_RANGE(0x40, 0x43) AM_WRITE(SMH_NOP) /* Interrupt controller, only written to at bootup */ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w) AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w) AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w) @@ -787,7 +787,7 @@ static ADDRESS_MAP_START( majtitle_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x04, 0x05) AM_READ(input_port_2_word_r) AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w) AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w) - AM_RANGE(0x40, 0x43) AM_WRITE(MWA16_NOP) /* Interrupt controller, only written to at bootup */ + AM_RANGE(0x40, 0x43) AM_WRITE(SMH_NOP) /* Interrupt controller, only written to at bootup */ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w) AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w) AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w) @@ -803,7 +803,7 @@ static ADDRESS_MAP_START( hharry_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w) /* coin counters, reset sound cpu, other stuff? */ AM_RANGE(0x04, 0x05) AM_WRITE(m72_dmaon_w) AM_RANGE(0x06, 0x07) AM_WRITE(m72_irq_line_w) - AM_RANGE(0x40, 0x43) AM_WRITE(MWA16_NOP) /* Interrupt controller, only written to at bootup */ + AM_RANGE(0x40, 0x43) AM_WRITE(SMH_NOP) /* Interrupt controller, only written to at bootup */ AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w) AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w) AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w) @@ -820,7 +820,7 @@ static ADDRESS_MAP_START( kengo_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x82, 0x83) AM_WRITE(m72_scrollx1_w) AM_RANGE(0x84, 0x85) AM_WRITE(m72_scrolly2_w) AM_RANGE(0x86, 0x87) AM_WRITE(m72_scrollx2_w) -//AM_RANGE(0x8c, 0x8f) AM_WRITE(MWA8_NOP) /* ??? */ +//AM_RANGE(0x8c, 0x8f) AM_WRITE(SMH_NOP) /* ??? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c index 303a1d9922d..7c5f4a44549 100644 --- a/src/mame/drivers/m79amb.c +++ b/src/mame/drivers/m79amb.c @@ -125,10 +125,10 @@ static WRITE8_HANDLER( sound_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x4000, 0x5fff) AM_READWRITE(MRA8_RAM, ramtek_videoram_w) AM_BASE(&ramtek_videoram) + AM_RANGE(0x4000, 0x5fff) AM_READWRITE(SMH_RAM, ramtek_videoram_w) AM_BASE(&ramtek_videoram) AM_RANGE(0x6000, 0x63ff) AM_RAM /* ?? */ AM_RANGE(0x8000, 0x8000) AM_READWRITE(input_port_0_r, sound_w) /* sound_w listed twice?? */ - AM_RANGE(0x8001, 0x8001) AM_WRITE(MWA8_RAM) AM_BASE(&mask) + AM_RANGE(0x8001, 0x8001) AM_WRITE(SMH_RAM) AM_BASE(&mask) AM_RANGE(0x8002, 0x8002) AM_READWRITE(input_port_1_r, sound_w) AM_RANGE(0x8003, 0x8003) AM_WRITE(sound_w) /* Manual Shows sound control at 0x8002 */ AM_RANGE(0x8004, 0x8004) AM_READ(gray5bit_controller0_r) diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c index c4cddabd8c6..1c97bd26092 100644 --- a/src/mame/drivers/m90.c +++ b/src/mame/drivers/m90.c @@ -111,13 +111,13 @@ ADDRESS_MAP_END /*****************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index e6f1fa79def..fbc0e1baea6 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -363,7 +363,7 @@ static WRITE16_HANDLER( m92_sound_status_w ) /* appears to be an earlier board */ static ADDRESS_MAP_START( lethalth_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x7ffff) AM_ROM - AM_RANGE(0x80000, 0x8ffff) AM_READWRITE(MRA16_RAM, m92_vram_w) AM_BASE(&m92_vram_data) + AM_RANGE(0x80000, 0x8ffff) AM_READWRITE(SMH_RAM, m92_vram_w) AM_BASE(&m92_vram_data) AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */ AM_RANGE(0xf8000, 0xf87ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xf8800, 0xf8fff) AM_READWRITE(m92_paletteram_r, m92_paletteram_w) @@ -376,7 +376,7 @@ 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(0xd0000, 0xdffff) AM_READWRITE(MRA16_RAM, m92_vram_w) AM_BASE(&m92_vram_data) + AM_RANGE(0xd0000, 0xdffff) AM_READWRITE(SMH_RAM, m92_vram_w) AM_BASE(&m92_vram_data) AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */ AM_RANGE(0xf8000, 0xf87ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xf8800, 0xf8fff) AM_READWRITE(m92_paletteram_r, m92_paletteram_w) @@ -394,7 +394,7 @@ static ADDRESS_MAP_START( m92_portmap, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x00, 0x01) AM_WRITE(m92_soundlatch_w) AM_RANGE(0x02, 0x03) AM_WRITE(m92_coincounter_w) AM_RANGE(0x20, 0x21) AM_WRITE(m92_bankswitch_w) - AM_RANGE(0x40, 0x43) AM_WRITE(MWA16_NOP) /* Interrupt controller, only written to at bootup */ + AM_RANGE(0x40, 0x43) AM_WRITE(SMH_NOP) /* Interrupt controller, only written to at bootup */ AM_RANGE(0x80, 0x87) AM_WRITE(m92_pf1_control_w) AM_RANGE(0x88, 0x8f) AM_WRITE(m92_pf2_control_w) AM_RANGE(0x90, 0x97) AM_WRITE(m92_pf3_control_w) @@ -406,7 +406,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x1ffff) AM_ROM - AM_RANGE(0x9ff00, 0x9ffff) AM_WRITE(MWA16_NOP) /* Irq controller? */ + AM_RANGE(0x9ff00, 0x9ffff) AM_WRITE(SMH_NOP) /* Irq controller? */ AM_RANGE(0xa0000, 0xa3fff) AM_RAM AM_RANGE(0xa8000, 0xa803f) AM_READWRITE(IremGA20_r, IremGA20_w) AM_RANGE(0xa8040, 0xa8041) AM_WRITE(YM2151_register_port_0_lsb_w) @@ -2078,7 +2078,7 @@ static DRIVER_INIT( lethalth ) m92_irq_vectorbase=0x20; /* NOP out the bankswitcher */ - memory_install_write16_handler(0, ADDRESS_SPACE_IO, 0x20, 0x21, 0, 0, MWA16_NOP); + memory_install_write16_handler(0, ADDRESS_SPACE_IO, 0x20, 0x21, 0, 0, SMH_NOP); } static DRIVER_INIT( nbbatman ) diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c index 9a21d2b1792..4ed0d321f6d 100644 --- a/src/mame/drivers/macrossp.c +++ b/src/mame/drivers/macrossp.c @@ -297,73 +297,73 @@ static READ16_HANDLER( macrossp_soundcmd_r ) /*** MEMORY MAPS *************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x3fffff) AM_READ(MRA32_ROM) + AM_RANGE(0x000000, 0x3fffff) AM_READ(SMH_ROM) - AM_RANGE(0x800000, 0x802fff) AM_READ(MRA32_RAM) + AM_RANGE(0x800000, 0x802fff) AM_READ(SMH_RAM) - AM_RANGE(0x900000, 0x903fff) AM_READ(MRA32_RAM) - AM_RANGE(0x908000, 0x90bfff) AM_READ(MRA32_RAM) - AM_RANGE(0x910000, 0x913fff) AM_READ(MRA32_RAM) - AM_RANGE(0x918000, 0x91bfff) AM_READ(MRA32_RAM) + AM_RANGE(0x900000, 0x903fff) AM_READ(SMH_RAM) + AM_RANGE(0x908000, 0x90bfff) AM_READ(SMH_RAM) + AM_RANGE(0x910000, 0x913fff) AM_READ(SMH_RAM) + AM_RANGE(0x918000, 0x91bfff) AM_READ(SMH_RAM) - AM_RANGE(0xa00000, 0xa03fff) AM_READ(MRA32_RAM) + AM_RANGE(0xa00000, 0xa03fff) AM_READ(SMH_RAM) AM_RANGE(0xb00000, 0xb00003) AM_READ(macrossp_ports1_r) AM_RANGE(0xb00004, 0xb00007) AM_READ(macrossp_soundstatus_r) AM_RANGE(0xb0000c, 0xb0000f) AM_READ(macrossp_ports2_r) - AM_RANGE(0xf00000, 0xf1ffff) AM_READ(MRA32_RAM) + AM_RANGE(0xf00000, 0xf1ffff) AM_READ(SMH_RAM) -// AM_RANGE(0xfe0000, 0xfe0003) AM_READ(MRA32_NOP) +// AM_RANGE(0xfe0000, 0xfe0003) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x3fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x800000, 0x802fff) AM_WRITE(MWA32_RAM) AM_BASE(¯ossp_spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x3fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x800000, 0x802fff) AM_WRITE(SMH_RAM) AM_BASE(¯ossp_spriteram) AM_SIZE(&spriteram_size) /* SCR A Layer */ AM_RANGE(0x900000, 0x903fff) AM_WRITE(macrossp_scra_videoram_w) AM_BASE(¯ossp_scra_videoram) - AM_RANGE(0x904200, 0x9043ff) AM_WRITE(MWA32_RAM) /* W/O? */ - AM_RANGE(0x905000, 0x90500b) AM_WRITE(MWA32_RAM) AM_BASE(¯ossp_scra_videoregs) /* W/O? */ + AM_RANGE(0x904200, 0x9043ff) AM_WRITE(SMH_RAM) /* W/O? */ + AM_RANGE(0x905000, 0x90500b) AM_WRITE(SMH_RAM) AM_BASE(¯ossp_scra_videoregs) /* W/O? */ /* SCR B Layer */ AM_RANGE(0x908000, 0x90bfff) AM_WRITE(macrossp_scrb_videoram_w) AM_BASE(¯ossp_scrb_videoram) - AM_RANGE(0x90c200, 0x90c3ff) AM_WRITE(MWA32_RAM) /* W/O? */ - AM_RANGE(0x90d000, 0x90d00b) AM_WRITE(MWA32_RAM) AM_BASE(¯ossp_scrb_videoregs) /* W/O? */ + AM_RANGE(0x90c200, 0x90c3ff) AM_WRITE(SMH_RAM) /* W/O? */ + AM_RANGE(0x90d000, 0x90d00b) AM_WRITE(SMH_RAM) AM_BASE(¯ossp_scrb_videoregs) /* W/O? */ /* SCR C Layer */ AM_RANGE(0x910000, 0x913fff) AM_WRITE(macrossp_scrc_videoram_w) AM_BASE(¯ossp_scrc_videoram) - AM_RANGE(0x914200, 0x9143ff) AM_WRITE(MWA32_RAM) /* W/O? */ - AM_RANGE(0x915000, 0x91500b) AM_WRITE(MWA32_RAM) AM_BASE(¯ossp_scrc_videoregs) /* W/O? */ + AM_RANGE(0x914200, 0x9143ff) AM_WRITE(SMH_RAM) /* W/O? */ + AM_RANGE(0x915000, 0x91500b) AM_WRITE(SMH_RAM) AM_BASE(¯ossp_scrc_videoregs) /* W/O? */ /* Text Layer */ AM_RANGE(0x918000, 0x91bfff) AM_WRITE(macrossp_text_videoram_w) AM_BASE(¯ossp_text_videoram) - AM_RANGE(0x91c200, 0x91c3ff) AM_WRITE(MWA32_RAM) /* W/O? */ - AM_RANGE(0x91d000, 0x91d00b) AM_WRITE(MWA32_RAM) AM_BASE(¯ossp_text_videoregs) /* W/O? */ + AM_RANGE(0x91c200, 0x91c3ff) AM_WRITE(SMH_RAM) /* W/O? */ + AM_RANGE(0x91d000, 0x91d00b) AM_WRITE(SMH_RAM) AM_BASE(¯ossp_text_videoregs) /* W/O? */ AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(paletteram32_macrossp_w) AM_BASE(&paletteram32) - AM_RANGE(0xb00004, 0xb00007) AM_WRITE(MWA32_NOP) // ???? - AM_RANGE(0xb00008, 0xb0000b) AM_WRITE(MWA32_NOP) // ???? -// AM_RANGE(0xb0000c, 0xb0000f) AM_WRITE(MWA32_NOP) - AM_RANGE(0xb00010, 0xb00013) AM_WRITE(MWA32_RAM) // macrossp palette fade -// AM_RANGE(0xb00020, 0xb00023) AM_WRITE(MWA32_NOP) + AM_RANGE(0xb00004, 0xb00007) AM_WRITE(SMH_NOP) // ???? + AM_RANGE(0xb00008, 0xb0000b) AM_WRITE(SMH_NOP) // ???? +// AM_RANGE(0xb0000c, 0xb0000f) AM_WRITE(SMH_NOP) + AM_RANGE(0xb00010, 0xb00013) AM_WRITE(SMH_RAM) // macrossp palette fade +// AM_RANGE(0xb00020, 0xb00023) AM_WRITE(SMH_NOP) AM_RANGE(0xc00000, 0xc00003) AM_WRITE(macrossp_soundcmd_w) - AM_RANGE(0xf00000, 0xf1ffff) AM_WRITE(MWA32_RAM) AM_BASE(¯ossp_mainram) /* Main Ram */ + AM_RANGE(0xf00000, 0xf1ffff) AM_WRITE(SMH_RAM) AM_BASE(¯ossp_mainram) /* Main Ram */ -// AM_RANGE(0xfe0000, 0xfe0003) AM_WRITE(MWA32_NOP) +// AM_RANGE(0xfe0000, 0xfe0003) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x207fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x207fff) AM_READ(SMH_RAM) AM_RANGE(0x400000, 0x40007f) AM_READ(ES5506_data_0_word_r) AM_RANGE(0x600000, 0x600001) AM_READ(macrossp_soundcmd_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x207fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x207fff) AM_WRITE(SMH_RAM) AM_RANGE(0x400000, 0x40007f) AM_WRITE(ES5506_data_0_word_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c index 3a5f8833306..eb034819c3d 100644 --- a/src/mame/drivers/madalien.c +++ b/src/mame/drivers/madalien.c @@ -89,16 +89,16 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0ff0) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) AM_RANGE(0x8001, 0x8001) AM_MIRROR(0x0ff0) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) - AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x0ff0) AM_WRITE(MWA8_RAM) AM_BASE(&madalien_video_control) + AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x0ff0) AM_WRITE(SMH_RAM) AM_BASE(&madalien_video_control) AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x0ff0) AM_WRITE(madalien_output_w) AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x0ff0) AM_READWRITE(soundlatch2_r, madalien_sound_command_w) - AM_RANGE(0x8008, 0x8008) AM_MIRROR(0x07f0) AM_READWRITE(shift_r, MWA8_RAM) AM_BASE(&shift_hi) - AM_RANGE(0x8009, 0x8009) AM_MIRROR(0x07f0) AM_READWRITE(shift_rev_r, MWA8_RAM) AM_BASE(&shift_lo) - AM_RANGE(0x800b, 0x800b) AM_MIRROR(0x07f0) AM_WRITE(MWA8_RAM) AM_BASE(&madalien_video_flags) - AM_RANGE(0x800c, 0x800c) AM_MIRROR(0x07f0) AM_WRITE(MWA8_RAM) AM_BASE(&madalien_headlight_pos) - AM_RANGE(0x800d, 0x800d) AM_MIRROR(0x07f0) AM_WRITE(MWA8_RAM) AM_BASE(&madalien_edge1_pos) - AM_RANGE(0x800e, 0x800e) AM_MIRROR(0x07f0) AM_WRITE(MWA8_RAM) AM_BASE(&madalien_edge2_pos) - AM_RANGE(0x800f, 0x800f) AM_MIRROR(0x07f0) AM_WRITE(MWA8_RAM) AM_BASE(&madalien_scroll) + AM_RANGE(0x8008, 0x8008) AM_MIRROR(0x07f0) AM_READWRITE(shift_r, SMH_RAM) AM_BASE(&shift_hi) + AM_RANGE(0x8009, 0x8009) AM_MIRROR(0x07f0) AM_READWRITE(shift_rev_r, SMH_RAM) AM_BASE(&shift_lo) + AM_RANGE(0x800b, 0x800b) AM_MIRROR(0x07f0) AM_WRITE(SMH_RAM) AM_BASE(&madalien_video_flags) + AM_RANGE(0x800c, 0x800c) AM_MIRROR(0x07f0) AM_WRITE(SMH_RAM) AM_BASE(&madalien_headlight_pos) + AM_RANGE(0x800d, 0x800d) AM_MIRROR(0x07f0) AM_WRITE(SMH_RAM) AM_BASE(&madalien_edge1_pos) + AM_RANGE(0x800e, 0x800e) AM_MIRROR(0x07f0) AM_WRITE(SMH_RAM) AM_BASE(&madalien_edge2_pos) + AM_RANGE(0x800f, 0x800f) AM_MIRROR(0x07f0) AM_WRITE(SMH_RAM) AM_BASE(&madalien_scroll) AM_RANGE(0x9000, 0x9000) AM_MIRROR(0x0ff0) AM_READ(input_port_0_r) AM_RANGE(0x9001, 0x9001) AM_MIRROR(0x0ff0) AM_READ(input_port_1_r) diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index 9f4704e1b74..c443c01195a 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -52,33 +52,33 @@ static WRITE16_HANDLER( madmotor_sound_w ) /******************************************************************************/ static ADDRESS_MAP_START( madmotor_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x184000, 0x1847ff) AM_READ(madmotor_pf1_rowscroll_r) AM_RANGE(0x188000, 0x189fff) AM_READ(madmotor_pf1_data_r) AM_RANGE(0x198000, 0x1987ff) AM_READ(madmotor_pf2_data_r) AM_RANGE(0x1a4000, 0x1a4fff) AM_READ(madmotor_pf3_data_r) - AM_RANGE(0x18c000, 0x18c001) AM_READ(MRA16_NOP) - AM_RANGE(0x19c000, 0x19c001) AM_READ(MRA16_NOP) - AM_RANGE(0x3e0000, 0x3e3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3e8000, 0x3e87ff) AM_READ(MRA16_RAM) - AM_RANGE(0x3f0000, 0x3f07ff) AM_READ(MRA16_RAM) + AM_RANGE(0x18c000, 0x18c001) AM_READ(SMH_NOP) + AM_RANGE(0x19c000, 0x19c001) AM_READ(SMH_NOP) + AM_RANGE(0x3e0000, 0x3e3fff) AM_READ(SMH_RAM) + AM_RANGE(0x3e8000, 0x3e87ff) AM_READ(SMH_RAM) + AM_RANGE(0x3f0000, 0x3f07ff) AM_READ(SMH_RAM) AM_RANGE(0x3f8002, 0x3f8003) AM_READ(input_port_0_word_r) AM_RANGE(0x3f8004, 0x3f8005) AM_READ(input_port_1_word_r) AM_RANGE(0x3f8006, 0x3f8007) AM_READ(input_port_2_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( madmotor_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x180000, 0x18001f) AM_WRITE(madmotor_pf1_control_w) AM_RANGE(0x184000, 0x1847ff) AM_WRITE(madmotor_pf1_rowscroll_w) AM_BASE(&madmotor_pf1_rowscroll) AM_RANGE(0x188000, 0x189fff) AM_WRITE(madmotor_pf1_data_w) AM_BASE(&madmotor_pf1_data) - AM_RANGE(0x18c000, 0x18c001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x18c000, 0x18c001) AM_WRITE(SMH_NOP) AM_RANGE(0x190000, 0x19001f) AM_WRITE(madmotor_pf2_control_w) AM_RANGE(0x198000, 0x1987ff) AM_WRITE(madmotor_pf2_data_w) AM_BASE(&madmotor_pf2_data) AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(madmotor_pf3_control_w) AM_RANGE(0x1a4000, 0x1a4fff) AM_WRITE(madmotor_pf3_data_w) AM_BASE(&madmotor_pf3_data) - AM_RANGE(0x3e0000, 0x3e3fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x3e8000, 0x3e87ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x3e0000, 0x3e3fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x3e8000, 0x3e87ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x3f0000, 0x3f07ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x3fc004, 0x3fc005) AM_WRITE(madmotor_sound_w) ADDRESS_MAP_END @@ -111,22 +111,22 @@ static WRITE8_HANDLER( YM2203_w ) /* Physical memory map (21 bits) */ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(YM2203_w) AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_1_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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/magmax.c b/src/mame/drivers/magmax.c index 772fce2848b..bdb3ce9a190 100644 --- a/src/mame/drivers/magmax.c +++ b/src/mame/drivers/magmax.c @@ -193,10 +193,10 @@ static WRITE16_HANDLER( magmax_vreg_w ) static ADDRESS_MAP_START( magmax_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x013fff) AM_READ(MRA16_ROM) - AM_RANGE(0x018000, 0x018fff) AM_READ(MRA16_RAM) - AM_RANGE(0x020000, 0x0207ff) AM_READ(MRA16_RAM) - AM_RANGE(0x028000, 0x0281ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x013fff) AM_READ(SMH_ROM) + AM_RANGE(0x018000, 0x018fff) AM_READ(SMH_RAM) + AM_RANGE(0x020000, 0x0207ff) AM_READ(SMH_RAM) + AM_RANGE(0x028000, 0x0281ff) AM_READ(SMH_RAM) AM_RANGE(0x030000, 0x030001) AM_READ(input_port_0_word_r) AM_RANGE(0x030002, 0x030003) AM_READ(input_port_1_word_r) AM_RANGE(0x030004, 0x030005) AM_READ(input_port_2_word_r) @@ -204,26 +204,26 @@ static ADDRESS_MAP_START( magmax_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( magmax_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x013fff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x018000, 0x018fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x020000, 0x0207ff) AM_WRITE(MWA16_RAM) AM_BASE(&videoram16) AM_SIZE(&videoram_size) - AM_RANGE(0x028000, 0x0281ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x013fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x018000, 0x018fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x020000, 0x0207ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram16) AM_SIZE(&videoram_size) + AM_RANGE(0x028000, 0x0281ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x030010, 0x030011) AM_WRITE(magmax_vreg_w) AM_BASE(&magmax_vreg) - AM_RANGE(0x030012, 0x030013) AM_WRITE(MWA16_RAM) AM_BASE(&magmax_scroll_x) - AM_RANGE(0x030014, 0x030015) AM_WRITE(MWA16_RAM) AM_BASE(&magmax_scroll_y) + AM_RANGE(0x030012, 0x030013) AM_WRITE(SMH_RAM) AM_BASE(&magmax_scroll_x) + AM_RANGE(0x030014, 0x030015) AM_WRITE(SMH_RAM) AM_BASE(&magmax_scroll_y) AM_RANGE(0x03001c, 0x03001d) AM_WRITE(magmax_sound_w) - AM_RANGE(0x03001e, 0x03001f) AM_WRITE(MWA16_NOP) /* IRQ ack */ + AM_RANGE(0x03001e, 0x03001f) AM_WRITE(SMH_NOP) /* IRQ ack */ ADDRESS_MAP_END static ADDRESS_MAP_START( magmax_soundreadmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x4000) AM_READ(magmax_sound_irq_ack) - AM_RANGE(0x6000, 0x67ff) AM_READ(MRA8_RAM) + AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( magmax_soundwritemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x67ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x67ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( magmax_soundreadport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index b075ca78de7..f3ad53572e0 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -144,22 +144,22 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1f9b, 0x1f9b) AM_READ(input_port_6_r) /* Dip 2 */ AM_RANGE(0x0000, 0x3fff) AM_READ(K052109_051960_r) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1f80, 0x1f80) AM_WRITE(mainevt_bankswitch_w) AM_RANGE(0x1f84, 0x1f84) AM_WRITE(soundlatch_w) /* probably */ AM_RANGE(0x1f88, 0x1f88) AM_WRITE(mainevt_sh_irqtrigger_w) /* probably */ - AM_RANGE(0x1f8c, 0x1f8d) AM_WRITE(MWA8_NOP) /* ??? */ + AM_RANGE(0x1f8c, 0x1f8d) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x1f90, 0x1f90) AM_WRITE(mainevt_coin_w) /* coin counters + lamps */ AM_RANGE(0x0000, 0x3fff) AM_WRITE(K052109_051960_w) - AM_RANGE(0x4000, 0x5dff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x4000, 0x5dff) AM_WRITE(SMH_RAM) AM_RANGE(0x5e00, 0x5fff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE(&paletteram) - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -173,9 +173,9 @@ static ADDRESS_MAP_START( dv_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1fa0, 0x1fbf) AM_READ(K051733_r) AM_RANGE(0x0000, 0x3fff) AM_READ(K052109_051960_r) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( dv_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -187,23 +187,23 @@ static ADDRESS_MAP_START( dv_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1fa0, 0x1fbf) AM_WRITE(K051733_w) AM_RANGE(0x0000, 0x3fff) AM_WRITE(K052109_051960_w) - AM_RANGE(0x4000, 0x5dff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x4000, 0x5dff) AM_WRITE(SMH_RAM) AM_RANGE(0x5e00, 0x5fff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE(&paletteram) - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) AM_RANGE(0xd000, 0xd000) AM_READ(upd7759_0_busy_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) AM_RANGE(0x9000, 0x9000) AM_WRITE(upd7759_0_port_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(mainevt_sh_irqcontrol_w) @@ -211,16 +211,16 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dv_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( dv_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c index efa2660fec2..89534f783e9 100644 --- a/src/mame/drivers/mainsnk.c +++ b/src/mame/drivers/mainsnk.c @@ -132,10 +132,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc500, 0xc500) AM_READ(input_port_4_r) AM_RANGE(0xc600, 0xc600) AM_WRITE(mainsnk_c600_w) AM_RANGE(0xc700, 0xc700) AM_WRITE(sound_command_w) - AM_RANGE(0xd800, 0xdbff) AM_READWRITE(MRA8_RAM, mainsnk_bgram_w) AM_BASE(&mainsnk_bgram) + AM_RANGE(0xd800, 0xdbff) AM_READWRITE(SMH_RAM, mainsnk_bgram_w) AM_BASE(&mainsnk_bgram) AM_RANGE(0xdc00, 0xe7ff) AM_RAM AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(&spriteram) - AM_RANGE(0xf000, 0xf3ff) AM_READWRITE(MRA8_RAM, mainsnk_fgram_w) AM_BASE(&mainsnk_fgram) + AM_RANGE(0xf000, 0xf3ff) AM_READWRITE(SMH_RAM, mainsnk_fgram_w) AM_BASE(&mainsnk_fgram) AM_RANGE(0xf400, 0xf7ff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c index 90aa03438da..eb83c90468e 100644 --- a/src/mame/drivers/malzak.c +++ b/src/mame/drivers/malzak.c @@ -119,87 +119,87 @@ static READ8_HANDLER( bank2_r ) } */ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0bff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x0bff) AM_READ(SMH_ROM) AM_RANGE(0x0c00, 0x0fff) AM_READ(bank_r) - AM_RANGE(0x1000, 0x10ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1100, 0x11ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1200, 0x12ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1300, 0x13ff) AM_READ(MRA8_RAM) + AM_RANGE(0x1000, 0x10ff) AM_READ(SMH_RAM) + AM_RANGE(0x1100, 0x11ff) AM_READ(SMH_RAM) + AM_RANGE(0x1200, 0x12ff) AM_READ(SMH_RAM) + AM_RANGE(0x1300, 0x13ff) AM_READ(SMH_RAM) AM_RANGE(0x14cb, 0x14cb) AM_READ(fake_VRLE_r) - AM_RANGE(0x1400, 0x14ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1500, 0x15ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1600, 0x16ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1700, 0x17ff) AM_READ(MRA8_RAM) + AM_RANGE(0x1400, 0x14ff) AM_READ(SMH_RAM) + AM_RANGE(0x1500, 0x15ff) AM_READ(SMH_RAM) + AM_RANGE(0x1600, 0x16ff) AM_READ(SMH_RAM) + AM_RANGE(0x1700, 0x17ff) AM_READ(SMH_RAM) AM_RANGE(0x1800, 0x1fff) AM_READ(saa5050_r) // SAA 5050 video RAM - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_ROM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_ROM) AM_RANGE(0x3000, 0x3fff) AM_READ(ram_mirror_r) - AM_RANGE(0x4000, 0x4fff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x4fff) AM_READ(SMH_ROM) AM_RANGE(0x5000, 0x5fff) AM_READ(ram_mirror_r) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_ROM) AM_RANGE(0x7000, 0x7fff) AM_READ(ram_mirror_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x1000, 0x10ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1100, 0x11ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1200, 0x12ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1300, 0x13ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1400, 0x14ff) AM_WRITE(MWA8_RAM) AM_BASE(&malzak_s2636_0_ram) - AM_RANGE(0x1500, 0x15ff) AM_WRITE(MWA8_RAM) AM_BASE(&malzak_s2636_1_ram) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x1000, 0x10ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1100, 0x11ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1200, 0x12ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1300, 0x13ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1400, 0x14ff) AM_WRITE(SMH_RAM) AM_BASE(&malzak_s2636_0_ram) + AM_RANGE(0x1500, 0x15ff) AM_WRITE(SMH_RAM) AM_BASE(&malzak_s2636_1_ram) AM_RANGE(0x1600, 0x16ff) AM_WRITE(playfield_w) - AM_RANGE(0x1600, 0x16ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1700, 0x17ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x1600, 0x16ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1700, 0x17ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1800, 0x1fff) AM_WRITE(saa5050_w) // SAA 5050 video RAM - AM_RANGE(0x2000, 0x2fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_ROM) AM_RANGE(0x3000, 0x3fff) AM_WRITE(ram_mirror_w) - AM_RANGE(0x4000, 0x4fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_ROM) AM_RANGE(0x5000, 0x5fff) AM_WRITE(ram_mirror_w) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_ROM) AM_RANGE(0x7000, 0x7fff) AM_WRITE(ram_mirror_w) ADDRESS_MAP_END static ADDRESS_MAP_START( malzak2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0bff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x0bff) AM_READ(SMH_ROM) AM_RANGE(0x0c00, 0x0fff) AM_READ(bank_r) - AM_RANGE(0x1000, 0x10ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1100, 0x11ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1200, 0x12ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1300, 0x13ff) AM_READ(MRA8_RAM) + AM_RANGE(0x1000, 0x10ff) AM_READ(SMH_RAM) + AM_RANGE(0x1100, 0x11ff) AM_READ(SMH_RAM) + AM_RANGE(0x1200, 0x12ff) AM_READ(SMH_RAM) + AM_RANGE(0x1300, 0x13ff) AM_READ(SMH_RAM) AM_RANGE(0x14cb, 0x14cb) AM_READ(fake_VRLE_r) AM_RANGE(0x14cc, 0x14cc) AM_READ(s2636_portA_r) - AM_RANGE(0x1400, 0x14ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1500, 0x15ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1600, 0x16ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1700, 0x17ff) AM_READ(MRA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x1400, 0x14ff) AM_READ(SMH_RAM) + AM_RANGE(0x1500, 0x15ff) AM_READ(SMH_RAM) + AM_RANGE(0x1600, 0x16ff) AM_READ(SMH_RAM) + AM_RANGE(0x1700, 0x17ff) AM_READ(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x1800, 0x1fff) AM_READ(saa5050_r) // SAA 5050 video RAM - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_ROM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_ROM) AM_RANGE(0x3000, 0x3fff) AM_READ(ram_mirror_r) - AM_RANGE(0x4000, 0x4fff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x4fff) AM_READ(SMH_ROM) AM_RANGE(0x5000, 0x5fff) AM_READ(ram_mirror_r) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_ROM) AM_RANGE(0x7000, 0x7fff) AM_READ(ram_mirror_r) ADDRESS_MAP_END static ADDRESS_MAP_START( malzak2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x1000, 0x10ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1100, 0x11ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1200, 0x12ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1300, 0x13ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1400, 0x14ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1500, 0x15ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x1000, 0x10ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1100, 0x11ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1200, 0x12ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1300, 0x13ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1400, 0x14ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1500, 0x15ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1600, 0x16ff) AM_WRITE(playfield_w) - AM_RANGE(0x1600, 0x16ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1700, 0x17ff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x1600, 0x16ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1700, 0x17ff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x1800, 0x1fff) AM_WRITE(saa5050_w) // SAA 5050 video RAM - AM_RANGE(0x2000, 0x2fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_ROM) AM_RANGE(0x3000, 0x3fff) AM_WRITE(ram_mirror_w) - AM_RANGE(0x4000, 0x4fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_ROM) AM_RANGE(0x5000, 0x5fff) AM_WRITE(ram_mirror_w) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_ROM) AM_RANGE(0x7000, 0x7fff) AM_WRITE(ram_mirror_w) ADDRESS_MAP_END @@ -257,7 +257,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x40, 0x40) AM_WRITE(port40_w) // possibly sound codes for dual SN76477s AM_RANGE(0x60, 0x60) AM_WRITE(port60_w) // possibly playfield scroll X offset - AM_RANGE(0xa0, 0xa0) AM_WRITE(MWA8_NOP) // echoes I/O port read from port 0x80 + AM_RANGE(0xa0, 0xa0) AM_WRITE(SMH_NOP) // echoes I/O port read from port 0x80 AM_RANGE(0xc0, 0xc0) AM_WRITE(portc0_w) // possibly playfield row selection for writing and/or collisions ADDRESS_MAP_END diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c index c6367c8ca88..6f8fdacd446 100644 --- a/src/mame/drivers/mappy.c +++ b/src/mame/drivers/mappy.c @@ -866,10 +866,10 @@ static INTERRUPT_GEN( mappy_interrupt_1 ) static ADDRESS_MAP_START( superpac_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READWRITE(MRA8_RAM, superpac_videoram_w) AM_BASE(&mappy_videoram) /* video RAM */ + AM_RANGE(0x0000, 0x07ff) AM_READWRITE(SMH_RAM, superpac_videoram_w) AM_BASE(&mappy_videoram) /* video RAM */ AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE(&mappy_spriteram) /* work RAM with embedded sprite RAM */ AM_RANGE(0x2000, 0x2000) AM_READWRITE(superpac_flipscreen_r, superpac_flipscreen_w) - AM_RANGE(0x4000, 0x43ff) AM_READWRITE(MRA8_RAM, mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with the sound CPU */ + AM_RANGE(0x4000, 0x43ff) AM_READWRITE(SMH_RAM, mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with the sound CPU */ AM_RANGE(0x4800, 0x4bff) AM_READWRITE(namcoio_r, namcoio_w) /* custom I/O chips interface */ AM_RANGE(0x5000, 0x500f) AM_WRITE(superpac_latch_w) /* various control bits */ AM_RANGE(0x8000, 0x8000) AM_WRITE(watchdog_reset_w) @@ -877,9 +877,9 @@ static ADDRESS_MAP_START( superpac_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( phozon_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READWRITE(MRA8_RAM, superpac_videoram_w) AM_SHARE(2) AM_BASE(&mappy_videoram) /* video RAM */ + AM_RANGE(0x0000, 0x07ff) AM_READWRITE(SMH_RAM, superpac_videoram_w) AM_SHARE(2) AM_BASE(&mappy_videoram) /* video RAM */ AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE(&mappy_spriteram) AM_SHARE(3) /* shared RAM with CPU #2/sprite RAM*/ - AM_RANGE(0x4000, 0x43ff) AM_READWRITE(MRA8_RAM, mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with the sound CPU */ + AM_RANGE(0x4000, 0x43ff) AM_READWRITE(SMH_RAM, mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with the sound CPU */ AM_RANGE(0x4800, 0x4bff) AM_READWRITE(namcoio_r, namcoio_w) /* custom I/O chips interface */ AM_RANGE(0x5000, 0x500f) AM_WRITE(phozon_latch_w) /* various control bits */ AM_RANGE(0x7000, 0x7000) AM_WRITE(watchdog_reset_w) /* watchdog reset */ @@ -887,10 +887,10 @@ static ADDRESS_MAP_START( phozon_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mappy_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READWRITE(MRA8_RAM, mappy_videoram_w) AM_BASE(&mappy_videoram) /* video RAM */ + AM_RANGE(0x0000, 0x0fff) AM_READWRITE(SMH_RAM, mappy_videoram_w) AM_BASE(&mappy_videoram) /* video RAM */ AM_RANGE(0x1000, 0x27ff) AM_RAM AM_BASE(&mappy_spriteram) /* work RAM with embedded sprite RAM */ AM_RANGE(0x3800, 0x3fff) AM_WRITE(mappy_scroll_w) /* scroll */ - AM_RANGE(0x4000, 0x43ff) AM_READWRITE(MRA8_RAM, mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with the sound CPU */ + AM_RANGE(0x4000, 0x43ff) AM_READWRITE(SMH_RAM, mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with the sound CPU */ AM_RANGE(0x4800, 0x4bff) AM_READWRITE(namcoio_r, namcoio_w) /* custom I/O chips interface */ AM_RANGE(0x5000, 0x500f) AM_WRITE(mappy_latch_w) /* various control bits */ AM_RANGE(0x8000, 0x8000) AM_WRITE(watchdog_reset_w) /* watchdog reset */ @@ -899,18 +899,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( superpac_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READWRITE(MRA8_RAM, mappy_snd_sharedram_w) AM_SHARE(1) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU (also sound registers) */ + AM_RANGE(0x0000, 0x03ff) AM_READWRITE(SMH_RAM, mappy_snd_sharedram_w) AM_SHARE(1) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU (also sound registers) */ AM_RANGE(0x2000, 0x200f) AM_WRITE(superpac_latch_w) /* various control bits */ AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( phozon_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READWRITE(MRA8_RAM, mappy_snd_sharedram_w) AM_SHARE(1) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU + sound registers */ + AM_RANGE(0x0000, 0x03ff) AM_READWRITE(SMH_RAM, mappy_snd_sharedram_w) AM_SHARE(1) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU + sound registers */ AM_RANGE(0xe000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( mappy_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READWRITE(MRA8_RAM, mappy_snd_sharedram_w) AM_SHARE(1) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU (also sound registers) */ + AM_RANGE(0x0000, 0x03ff) AM_READWRITE(SMH_RAM, mappy_snd_sharedram_w) AM_SHARE(1) AM_BASE(&namco_soundregs) /* shared RAM with the main CPU (also sound registers) */ AM_RANGE(0x2000, 0x200f) AM_WRITE(mappy_latch_w) /* various control bits */ AM_RANGE(0xe000, 0xffff) AM_ROM /* ROM code */ ADDRESS_MAP_END @@ -918,9 +918,9 @@ ADDRESS_MAP_END /* extra CPU only present in Phozon */ static ADDRESS_MAP_START( phozon_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READWRITE(MRA8_RAM, superpac_videoram_w) AM_SHARE(2) /* video RAM */ + AM_RANGE(0x0000, 0x07ff) AM_READWRITE(SMH_RAM, superpac_videoram_w) AM_SHARE(2) /* video RAM */ AM_RANGE(0x0800, 0x1fff) AM_RAM AM_SHARE(3) /* shared RAM with CPU #2/sprite RAM*/ - AM_RANGE(0x4000, 0x43ff) AM_READWRITE(MRA8_RAM, mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with CPU #2 */ + AM_RANGE(0x4000, 0x43ff) AM_READWRITE(SMH_RAM, mappy_snd_sharedram_w) AM_SHARE(1) /* shared RAM with CPU #2 */ AM_RANGE(0xa000, 0xa7ff) AM_RAM /* RAM */ AM_RANGE(0xe000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END @@ -2136,7 +2136,7 @@ static DRIVER_INIT( grobda ) static DRIVER_INIT( digdug2 ) { /* appears to not use the watchdog */ - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x8000, 0, 0, MWA8_NOP); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x8000, 0, 0, SMH_NOP); DRIVER_INIT_CALL(58_56); } diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c index 2f3ed41642f..b82399e67c3 100644 --- a/src/mame/drivers/marineb.c +++ b/src/mame/drivers/marineb.c @@ -55,9 +55,9 @@ static MACHINE_RESET( springer ) static ADDRESS_MAP_START( marineb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8bff) AM_READWRITE(MRA8_RAM, marineb_videoram_w) AM_BASE(&marineb_videoram) + AM_RANGE(0x8800, 0x8bff) AM_READWRITE(SMH_RAM, marineb_videoram_w) AM_BASE(&marineb_videoram) AM_RANGE(0x8c00, 0x8c3f) AM_RAM AM_BASE(&spriteram) /* Hoccer only */ - AM_RANGE(0x9000, 0x93ff) AM_READWRITE(MRA8_RAM, marineb_colorram_w) AM_BASE(&marineb_colorram) + AM_RANGE(0x9000, 0x93ff) AM_READWRITE(SMH_RAM, marineb_colorram_w) AM_BASE(&marineb_colorram) AM_RANGE(0x9800, 0x9800) AM_WRITE(marineb_column_scroll_w) AM_RANGE(0x9a00, 0x9a00) AM_WRITE(marineb_palette_bank_0_w) AM_RANGE(0x9c00, 0x9c00) AM_WRITE(marineb_palette_bank_1_w) @@ -66,7 +66,7 @@ static ADDRESS_MAP_START( marineb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa002, 0xa002) AM_WRITE(marineb_flipscreen_x_w) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) - AM_RANGE(0xb800, 0xb800) AM_READWRITE(input_port_3_r, MWA8_NOP) /* also watchdog */ + AM_RANGE(0xb800, 0xb800) AM_READWRITE(input_port_3_r, SMH_NOP) /* also watchdog */ ADDRESS_MAP_END diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 14e15e8d459..c09c2a1dbc7 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -115,17 +115,17 @@ static WRITE8_HANDLER( tx_tileram_w ) } static ADDRESS_MAP_START( marinedt_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x37ff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4400, 0x47ff) AM_READ(MRA8_RAM) //unused, vram mirror? - AM_RANGE(0x4000, 0x4bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x37ff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) + AM_RANGE(0x4400, 0x47ff) AM_READ(SMH_RAM) //unused, vram mirror? + AM_RANGE(0x4000, 0x4bff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( marinedt_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x37ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x37ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(tx_tileram_w) AM_BASE(&tx_tileram) - AM_RANGE(0x4c00, 0x4c00) AM_WRITE(MWA8_NOP) //?? maybe off by one error + AM_RANGE(0x4c00, 0x4c00) AM_WRITE(SMH_NOP) //?? maybe off by one error ADDRESS_MAP_END static READ8_HANDLER( marinedt_port1_r ) diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c index 0aa08dee7d1..f551c8588ef 100644 --- a/src/mame/drivers/mario.c +++ b/src/mame/drivers/mario.c @@ -153,7 +153,7 @@ static ADDRESS_MAP_START( mario_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6fff) AM_RAM AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(mario_state, spriteram) AM_SIZE_MEMBER(mario_state, spriteram_size) /* physical sprite ram */ - AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, mario_videoram_w) AM_BASE_MEMBER(mario_state, videoram) + AM_RANGE(0x7400, 0x77ff) AM_READWRITE(SMH_RAM, mario_videoram_w) AM_BASE_MEMBER(mario_state, videoram) AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_WRITE(mario_sh1_w) /* Mario run sample */ AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_WRITE(mario_sh2_w) /* Luigi run sample */ AM_RANGE(0x7d00, 0x7d00) AM_WRITE(mario_scroll_w) @@ -172,7 +172,7 @@ static ADDRESS_MAP_START( masao_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6fff) AM_RAM AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(mario_state, spriteram) AM_SIZE_MEMBER(mario_state, spriteram_size) /* physical sprite ram */ - AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, mario_videoram_w) AM_BASE_MEMBER(mario_state, videoram) + AM_RANGE(0x7400, 0x77ff) AM_READWRITE(SMH_RAM, mario_videoram_w) AM_BASE_MEMBER(mario_state, videoram) AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_RANGE(0x7d00, 0x7d00) AM_WRITE(mario_scroll_w) @@ -190,7 +190,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mario_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READWRITE(z80dma_0_r, z80dma_0_w) /* dma controller */ - //AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) /*Z80 DMA Ctrl port */ + //AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /*Z80 DMA Ctrl port */ ADDRESS_MAP_END /************************************* diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c index 65c7dba3c2d..d44dfec8814 100644 --- a/src/mame/drivers/markham.c +++ b/src/mame/drivers/markham.c @@ -29,12 +29,12 @@ static READ8_HANDLER( markham_e004_r ) /****************************************************************************/ static ADDRESS_MAP_START( readmem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) AM_SHARE(1) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) AM_SHARE(1) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_1_r) /* dsw 1 */ AM_RANGE(0xe001, 0xe001) AM_READ(input_port_0_r) /* dsw 2 */ @@ -48,35 +48,35 @@ static ADDRESS_MAP_START( readmem1, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(markham_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xd800, 0xdfff) AM_WRITE(MWA8_RAM) AM_SHARE(1) + AM_RANGE(0xd800, 0xdfff) AM_WRITE(SMH_RAM) AM_SHARE(1) - AM_RANGE(0xe008, 0xe008) AM_WRITE(MWA8_NOP) /* coin counter? */ + AM_RANGE(0xe008, 0xe008) AM_WRITE(SMH_NOP) /* coin counter? */ - AM_RANGE(0xe009, 0xe009) AM_WRITE(MWA8_NOP) /* to CPU2 busreq */ + AM_RANGE(0xe009, 0xe009) AM_WRITE(SMH_NOP) /* to CPU2 busreq */ - AM_RANGE(0xe00c, 0xe00d) AM_WRITE(MWA8_RAM) AM_BASE(&markham_xscroll) + AM_RANGE(0xe00c, 0xe00d) AM_WRITE(SMH_RAM) AM_BASE(&markham_xscroll) AM_RANGE(0xe00e, 0xe00e) AM_WRITE(markham_flipscreen_w) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) AM_SHARE(1) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_SHARE(1) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) AM_SHARE(1) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_SHARE(1) AM_RANGE(0xc000, 0xc000) AM_WRITE(SN76496_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(SN76496_1_w) - AM_RANGE(0xc002, 0xc002) AM_WRITE(MWA8_NOP) /* unknown */ - AM_RANGE(0xc003, 0xc003) AM_WRITE(MWA8_NOP) /* unknown */ + AM_RANGE(0xc002, 0xc002) AM_WRITE(SMH_NOP) /* unknown */ + AM_RANGE(0xc003, 0xc003) AM_WRITE(SMH_NOP) /* unknown */ ADDRESS_MAP_END diff --git a/src/mame/drivers/marvins.c b/src/mame/drivers/marvins.c index fcee4808a32..e4f77027a7d 100644 --- a/src/mame/drivers/marvins.c +++ b/src/mame/drivers/marvins.c @@ -170,21 +170,21 @@ static ADDRESS_MAP_START( marvins_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8300, 0x8300) AM_WRITE(sound_command_w) AM_RANGE(0x8400, 0x8400) AM_READ(input_port_3_r) /* dipswitch#1 */ AM_RANGE(0x8500, 0x8500) AM_READ(input_port_4_r) /* dipswitch#2 */ - AM_RANGE(0x8600, 0x8600) AM_WRITE(MWA8_RAM) // video attribute + AM_RANGE(0x8600, 0x8600) AM_WRITE(SMH_RAM) // video attribute AM_RANGE(0x8700, 0x8700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w) AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE(&spriteram) AM_SHARE(1) - AM_RANGE(0xd000, 0xdfff) AM_READWRITE(MRA8_RAM, marvins_background_ram_w) AM_SHARE(2) AM_BASE(&spriteram_3) - AM_RANGE(0xe000, 0xefff) AM_READWRITE(MRA8_RAM, marvins_foreground_ram_w) AM_SHARE(3) AM_BASE(&spriteram_2) - AM_RANGE(0xf000, 0xffff) AM_READWRITE(MRA8_RAM, marvins_text_ram_w) AM_SHARE(4) AM_BASE(&videoram) + AM_RANGE(0xd000, 0xdfff) AM_READWRITE(SMH_RAM, marvins_background_ram_w) AM_SHARE(2) AM_BASE(&spriteram_3) + AM_RANGE(0xe000, 0xefff) AM_READWRITE(SMH_RAM, marvins_foreground_ram_w) AM_SHARE(3) AM_BASE(&spriteram_2) + AM_RANGE(0xf000, 0xffff) AM_READWRITE(SMH_RAM, marvins_text_ram_w) AM_SHARE(4) AM_BASE(&videoram) ADDRESS_MAP_END static ADDRESS_MAP_START( marvins_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x8700, 0x8700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w) AM_RANGE(0xc000, 0xcfff) AM_RAM AM_SHARE(1) - AM_RANGE(0xd000, 0xdfff) AM_READWRITE(MRA8_RAM, marvins_background_ram_w) AM_SHARE(2) - AM_RANGE(0xe000, 0xefff) AM_READWRITE(MRA8_RAM, marvins_foreground_ram_w) AM_SHARE(3) - AM_RANGE(0xf000, 0xffff) AM_READWRITE(MRA8_RAM, marvins_text_ram_w) AM_SHARE(4) + AM_RANGE(0xd000, 0xdfff) AM_READWRITE(SMH_RAM, marvins_background_ram_w) AM_SHARE(2) + AM_RANGE(0xe000, 0xefff) AM_READWRITE(SMH_RAM, marvins_foreground_ram_w) AM_SHARE(3) + AM_RANGE(0xf000, 0xffff) AM_READWRITE(SMH_RAM, marvins_text_ram_w) AM_SHARE(4) ADDRESS_MAP_END @@ -196,24 +196,24 @@ static ADDRESS_MAP_START( madcrash_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8300, 0x8300) AM_WRITE(sound_command_w) AM_RANGE(0x8400, 0x8400) AM_READ(input_port_3_r) /* dipswitch#1 */ AM_RANGE(0x8500, 0x8500) AM_READ(input_port_4_r) /* dipswitch#2 */ - AM_RANGE(0x8600, 0x86ff) AM_WRITE(MWA8_RAM) // video attribute + AM_RANGE(0x8600, 0x86ff) AM_WRITE(SMH_RAM) // video attribute AM_RANGE(0x8700, 0x8700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w) // AM_RANGE(0xc800, 0xc800) AM_WRITE(marvins_palette_bank_w) // palette bank switch (c8f1 for Vanguard) AM_RANGE(0xc800, 0xc8ff) AM_RAM AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE(&spriteram) AM_SHARE(1) - AM_RANGE(0xd000, 0xdfff) AM_READWRITE(MRA8_RAM, marvins_background_ram_w) AM_SHARE(2) AM_BASE(&spriteram_3) - AM_RANGE(0xe000, 0xefff) AM_READWRITE(MRA8_RAM, marvins_foreground_ram_w) AM_SHARE(3) AM_BASE(&spriteram_2) - AM_RANGE(0xf000, 0xffff) AM_READWRITE(MRA8_RAM, marvins_text_ram_w) AM_SHARE(4) AM_BASE(&videoram) + AM_RANGE(0xd000, 0xdfff) AM_READWRITE(SMH_RAM, marvins_background_ram_w) AM_SHARE(2) AM_BASE(&spriteram_3) + AM_RANGE(0xe000, 0xefff) AM_READWRITE(SMH_RAM, marvins_foreground_ram_w) AM_SHARE(3) AM_BASE(&spriteram_2) + AM_RANGE(0xf000, 0xffff) AM_READWRITE(SMH_RAM, marvins_text_ram_w) AM_SHARE(4) AM_BASE(&videoram) ADDRESS_MAP_END static ADDRESS_MAP_START( madcrash_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8700, 0x8700) AM_WRITE(snk_cpuB_nmi_ack_w) /* Vangaurd II */ AM_RANGE(0x0000, 0x9fff) AM_ROM AM_RANGE(0xa000, 0xa000) AM_WRITE(snk_cpuB_nmi_ack_w) /* Mad Crasher */ - AM_RANGE(0xc000, 0xcfff) AM_READWRITE(MRA8_RAM, marvins_foreground_ram_w) AM_SHARE(3) - AM_RANGE(0xd000, 0xdfff) AM_READWRITE(MRA8_RAM, marvins_text_ram_w) AM_SHARE(4) + AM_RANGE(0xc000, 0xcfff) AM_READWRITE(SMH_RAM, marvins_foreground_ram_w) AM_SHARE(3) + AM_RANGE(0xd000, 0xdfff) AM_READWRITE(SMH_RAM, marvins_text_ram_w) AM_SHARE(4) AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE(1) - AM_RANGE(0xf000, 0xffff) AM_READWRITE(MRA8_RAM, marvins_background_ram_w) AM_SHARE(2) + AM_RANGE(0xf000, 0xffff) AM_READWRITE(SMH_RAM, marvins_background_ram_w) AM_SHARE(2) ADDRESS_MAP_END diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c index 4dccf09b959..294b6eeca97 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -670,11 +670,11 @@ static INTERRUPT_GEN( mastboy_interrupt ) /* Memory Maps */ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) // Internal ROM - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_ROM) // External ROM - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) // worl ram - AM_RANGE(0x9000, 0x9fff) AM_READ(MRA8_RAM) // tilemap ram - AM_RANGE(0xa000, 0xa1ff) AM_READ(MRA8_RAM) AM_MIRROR(0x0e00) // colour ram + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) // Internal ROM + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_ROM) // External ROM + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) // worl ram + AM_RANGE(0x9000, 0x9fff) AM_READ(SMH_RAM) // tilemap ram + AM_RANGE(0xa000, 0xa1ff) AM_READ(SMH_RAM) AM_MIRROR(0x0e00) // colour ram AM_RANGE(0xc000, 0xffff) AM_READ(banked_ram_r) // mastboy bank area read AM_RANGE(0xff000, 0xff7ff) AM_READ(mastboy_backupram_r) @@ -682,16 +682,16 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xff808, 0xff80f) AM_READ(input_port_1_r) // P2 AM_RANGE(0xff810, 0xff817) AM_READ(input_port_2_r) // DSW1 AM_RANGE(0xff818, 0xff81f) AM_READ(input_port_3_r) // DSW2 - AM_RANGE(0xffc00, 0xfffff) AM_READ(MRA8_RAM) // Internal RAM + AM_RANGE(0xffc00, 0xfffff) AM_READ(SMH_RAM) // Internal RAM ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) //ADDRESS_MAP_GLOBAL_MASK(0xffff) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) // Internal ROM - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM) // External ROM - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) AM_BASE(&mastboy_workram)// work ram - AM_RANGE(0x9000, 0x9fff) AM_WRITE(MWA8_RAM) AM_BASE(&mastboy_tileram)// tilemap ram - AM_RANGE(0xa000, 0xa1ff) AM_WRITE(MWA8_RAM) AM_BASE(&mastboy_colram) AM_MIRROR(0x0e00) // colour ram + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) // Internal ROM + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM) // External ROM + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_BASE(&mastboy_workram)// work ram + AM_RANGE(0x9000, 0x9fff) AM_WRITE(SMH_RAM) AM_BASE(&mastboy_tileram)// tilemap ram + AM_RANGE(0xa000, 0xa1ff) AM_WRITE(SMH_RAM) AM_BASE(&mastboy_colram) AM_MIRROR(0x0e00) // colour ram AM_RANGE(0xc000, 0xffff) AM_WRITE(banked_ram_w) // mastboy bank area write AM_RANGE(0xff000, 0xff7ff) AM_WRITE(mastboy_backupram_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) @@ -704,7 +704,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xff83a, 0xff83a) AM_WRITE(msm5205_mastboy_m5205_sambit1_w) AM_RANGE(0xff83b, 0xff83b) AM_WRITE(msm5205_reset_w) AM_RANGE(0xff83c, 0xff83c) AM_WRITE(backupram_enable_w) - AM_RANGE(0xffc00, 0xfffff) AM_WRITE(MWA8_RAM) // Internal RAM + AM_RANGE(0xffc00, 0xfffff) AM_WRITE(SMH_RAM) // Internal RAM ADDRESS_MAP_END /* Ports */ diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c index a24beecf7ce..8ae7791b601 100644 --- a/src/mame/drivers/matmania.c +++ b/src/mame/drivers/matmania.c @@ -79,92 +79,92 @@ static WRITE8_HANDLER( maniach_sh_command_w ) static ADDRESS_MAP_START( matmania_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x077f) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x17ff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x077f) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x17ff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r) AM_RANGE(0x3010, 0x3010) AM_READ(input_port_1_r) AM_RANGE(0x3020, 0x3020) AM_READ(input_port_2_r) AM_RANGE(0x3030, 0x3030) AM_READ(input_port_3_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( matmania_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x077f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0780, 0x07df) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x1000, 0x13ff) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_videoram2) AM_SIZE(&matmania_videoram2_size) - AM_RANGE(0x1400, 0x17ff) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_colorram2) - AM_RANGE(0x2000, 0x21ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2200, 0x23ff) AM_WRITE(MWA8_RAM) AM_BASE(&colorram) - AM_RANGE(0x2400, 0x25ff) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_videoram3) AM_SIZE(&matmania_videoram3_size) - AM_RANGE(0x2600, 0x27ff) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_colorram3) - AM_RANGE(0x3000, 0x3000) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_pageselect) + AM_RANGE(0x0000, 0x077f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0780, 0x07df) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x1000, 0x13ff) AM_WRITE(SMH_RAM) AM_BASE(&matmania_videoram2) AM_SIZE(&matmania_videoram2_size) + AM_RANGE(0x1400, 0x17ff) AM_WRITE(SMH_RAM) AM_BASE(&matmania_colorram2) + AM_RANGE(0x2000, 0x21ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x2200, 0x23ff) AM_WRITE(SMH_RAM) AM_BASE(&colorram) + AM_RANGE(0x2400, 0x25ff) AM_WRITE(SMH_RAM) AM_BASE(&matmania_videoram3) AM_SIZE(&matmania_videoram3_size) + AM_RANGE(0x2600, 0x27ff) AM_WRITE(SMH_RAM) AM_BASE(&matmania_colorram3) + AM_RANGE(0x3000, 0x3000) AM_WRITE(SMH_RAM) AM_BASE(&matmania_pageselect) AM_RANGE(0x3010, 0x3010) AM_WRITE(matmania_sh_command_w) - AM_RANGE(0x3020, 0x3020) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_scroll) -// AM_RANGE(0x3030, 0x3030) AM_WRITE(MWA8_NOP) /* ?? */ + AM_RANGE(0x3020, 0x3020) AM_WRITE(SMH_RAM) AM_BASE(&matmania_scroll) +// AM_RANGE(0x3030, 0x3030) AM_WRITE(SMH_NOP) /* ?? */ AM_RANGE(0x3050, 0x307f) AM_WRITE(matmania_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( maniach_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x077f) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x17ff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x077f) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x17ff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r) AM_RANGE(0x3010, 0x3010) AM_READ(input_port_1_r) AM_RANGE(0x3020, 0x3020) AM_READ(input_port_2_r) AM_RANGE(0x3030, 0x3030) AM_READ(input_port_3_r) AM_RANGE(0x3040, 0x3040) AM_READ(maniach_mcu_r) AM_RANGE(0x3041, 0x3041) AM_READ(maniach_mcu_status_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( maniach_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x077f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0780, 0x07df) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x1000, 0x13ff) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_videoram2) AM_SIZE(&matmania_videoram2_size) - AM_RANGE(0x1400, 0x17ff) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_colorram2) - AM_RANGE(0x2000, 0x21ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2200, 0x23ff) AM_WRITE(MWA8_RAM) AM_BASE(&colorram) - AM_RANGE(0x2400, 0x25ff) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_videoram3) AM_SIZE(&matmania_videoram3_size) - AM_RANGE(0x2600, 0x27ff) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_colorram3) - AM_RANGE(0x3000, 0x3000) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_pageselect) + AM_RANGE(0x0000, 0x077f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0780, 0x07df) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x1000, 0x13ff) AM_WRITE(SMH_RAM) AM_BASE(&matmania_videoram2) AM_SIZE(&matmania_videoram2_size) + AM_RANGE(0x1400, 0x17ff) AM_WRITE(SMH_RAM) AM_BASE(&matmania_colorram2) + AM_RANGE(0x2000, 0x21ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x2200, 0x23ff) AM_WRITE(SMH_RAM) AM_BASE(&colorram) + AM_RANGE(0x2400, 0x25ff) AM_WRITE(SMH_RAM) AM_BASE(&matmania_videoram3) AM_SIZE(&matmania_videoram3_size) + AM_RANGE(0x2600, 0x27ff) AM_WRITE(SMH_RAM) AM_BASE(&matmania_colorram3) + AM_RANGE(0x3000, 0x3000) AM_WRITE(SMH_RAM) AM_BASE(&matmania_pageselect) AM_RANGE(0x3010, 0x3010) AM_WRITE(maniach_sh_command_w) - AM_RANGE(0x3020, 0x3020) AM_WRITE(MWA8_RAM) AM_BASE(&matmania_scroll) - AM_RANGE(0x3030, 0x3030) AM_WRITE(MWA8_NOP) /* ?? */ + AM_RANGE(0x3020, 0x3020) AM_WRITE(SMH_RAM) AM_BASE(&matmania_scroll) + AM_RANGE(0x3030, 0x3030) AM_WRITE(SMH_NOP) /* ?? */ AM_RANGE(0x3040, 0x3040) AM_WRITE(maniach_mcu_w) AM_RANGE(0x3050, 0x307f) AM_WRITE(matmania_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM) AM_RANGE(0x2007, 0x2007) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x2001, 0x2001) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x2002, 0x2002) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x2003, 0x2003) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x2004, 0x2004) AM_WRITE(matmania_dac_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( maniach_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_RANGE(0x2004, 0x2004) AM_READ(soundlatch_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( maniach_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_WRITE(YM3526_control_port_0_w) AM_RANGE(0x2001, 0x2001) AM_WRITE(YM3526_write_port_0_w) AM_RANGE(0x2002, 0x2002) AM_WRITE(matmania_dac_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -172,8 +172,8 @@ static ADDRESS_MAP_START( mcu_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(maniach_68705_portA_r) AM_RANGE(0x0001, 0x0001) AM_READ(maniach_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(maniach_68705_portC_r) - AM_RANGE(0x0010, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -184,8 +184,8 @@ static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0004, 0x0004) AM_WRITE(maniach_68705_ddrA_w) AM_RANGE(0x0005, 0x0005) AM_WRITE(maniach_68705_ddrB_w) AM_RANGE(0x0006, 0x0006) AM_WRITE(maniach_68705_ddrC_w) - AM_RANGE(0x0010, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index ef143ce7993..a65d78d9836 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -69,15 +69,15 @@ static READ8_HANDLER( key_matrix_r ) /****************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xf7ff) AM_READ(mayumi_videoram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xe000, 0xf7ff) AM_WRITE(mayumi_videoram_w) ADDRESS_MAP_END @@ -92,7 +92,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x30, 0x30) AM_WRITE(bank_sel_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(input_sel_w) - AM_RANGE(0xc3, 0xc3) AM_WRITE(MWA8_NOP) // 0xc0-c3 8255ppi + AM_RANGE(0xc3, 0xc3) AM_WRITE(SMH_NOP) // 0xc0-c3 8255ppi AM_RANGE(0xd0, 0xd0) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xd1, 0xd1) AM_WRITE(YM2203_write_port_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index 32d33bdbd4b..5d521139a5b 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -486,18 +486,18 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_READ(sharedram_CFB_ZPU_r) AM_RANGE(0xd800, 0xd800) AM_READ(cfb_zpu_int_req_clr) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe800, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe800, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(sharedram_CFB_ZPU_w) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xe800, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xe800, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -524,15 +524,15 @@ static ADDRESS_MAP_START( writeport_cpu2, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) /* main RAM (stack) */ - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) /* waveform ???*/ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) /* main RAM (stack) */ + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) /* waveform ???*/ ADDRESS_MAP_END @@ -640,7 +640,7 @@ ADDRESS_MAP_END /* Great Guns has a little different banking layout */ static ADDRESS_MAP_START( writeport_cpu3_gg, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) AM_RANGE(0x01, 0x01) AM_WRITE(cfb_backgnd_color_w) AM_RANGE(0x02, 0x02) AM_WRITE(cfb_led_w) AM_RANGE(0x03, 0x03) AM_WRITE(cfb_zpu_int_req_set_w) @@ -1043,9 +1043,9 @@ UINT8 * rom = memory_region(REGION_CPU3) + (gfx_rom_bank * 0x2000) + 0x10000; } static ADDRESS_MAP_START( readmem_cpu3, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x37ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x37ff) AM_READ(SMH_ROM) AM_RANGE(0x3800, 0x3fff) AM_READ(sharedram_CFB_ZPU_r) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_BANK1) /* GFX roms */ + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_BANK1) /* GFX roms */ AM_RANGE(0x6000, 0x67ff) AM_READ(cfb_ram_r) /* RAM for VCU commands and parameters */ AM_RANGE(0xa000, 0xa7ff) AM_READ(VCU_set_cmd_param_r) /* VCU command and parameters LOAD */ @@ -1054,7 +1054,7 @@ static ADDRESS_MAP_START( readmem_cpu3, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu3, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x37ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x37ff) AM_WRITE(SMH_ROM) AM_RANGE(0x3800, 0x3fff) AM_WRITE(sharedram_CFB_ZPU_w) AM_BASE(&cfb_zpu_sharedram) AM_RANGE(0x4000, 0x4003) AM_WRITE(VCU_video_reg_w) AM_RANGE(0x6000, 0x67ff) AM_WRITE(cfb_ram_w) AM_BASE(&cfb_ram) @@ -1097,8 +1097,8 @@ static ADDRESS_MAP_START( gg_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x4c, 0x4c) AM_WRITE(main_sound_w) AM_RANGE(0x60, 0x60) AM_WRITE(zpu_bcd_decoder_w) - AM_RANGE(0x66, 0x66) AM_WRITE(MWA8_NOP) - AM_RANGE(0x68, 0x68) AM_WRITE(MWA8_NOP) + AM_RANGE(0x66, 0x66) AM_WRITE(SMH_NOP) + AM_RANGE(0x68, 0x68) AM_WRITE(SMH_NOP) AM_RANGE(0x6e, 0x6f) AM_WRITE(zpu_led_w) ADDRESS_MAP_END @@ -1128,14 +1128,14 @@ static WRITE8_HANDLER( gg_led_ctrl_w ) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) AM_RANGE(0x4000, 0x4000) AM_READ(AY8910_read_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x27ff) AM_WRITE(MWA8_RAM) /* main RAM (stack) */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x27ff) AM_WRITE(SMH_RAM) /* main RAM (stack) */ AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x4001, 0x4001) AM_WRITE(AY8910_write_port_0_w) diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index 9e127b4d2ce..0eb82fb1eae 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -186,50 +186,50 @@ static READ16_HANDLER( mcat_wd_r ) static ADDRESS_MAP_START( mcatadv_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) - AM_RANGE(0x200000, 0x200005) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x300005) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x200005) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x300005) AM_READ(SMH_RAM) -// AM_RANGE(0x180018, 0x18001f) AM_READ(MRA16_NOP) // ? +// AM_RANGE(0x180018, 0x18001f) AM_READ(SMH_NOP) // ? - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA16_RAM) // Tilemap 0 - AM_RANGE(0x500000, 0x501fff) AM_READ(MRA16_RAM) // Tilemap 1 + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM) // Tilemap 0 + AM_RANGE(0x500000, 0x501fff) AM_READ(SMH_RAM) // Tilemap 1 - AM_RANGE(0x600000, 0x601fff) AM_READ(MRA16_RAM) - AM_RANGE(0x602000, 0x602fff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x601fff) AM_READ(SMH_RAM) + AM_RANGE(0x602000, 0x602fff) AM_READ(SMH_RAM) - AM_RANGE(0x700000, 0x707fff) AM_READ(MRA16_RAM) // Sprites - AM_RANGE(0x708000, 0x70ffff) AM_READ(MRA16_RAM) // Tests more than is needed? + AM_RANGE(0x700000, 0x707fff) AM_READ(SMH_RAM) // Sprites + AM_RANGE(0x708000, 0x70ffff) AM_READ(SMH_RAM) // Tests more than is needed? AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r) // Inputs AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r) // Inputs AM_RANGE(0xa00000, 0xa00003) AM_READ(mcatadv_dsw_r) // Dip Switches - AM_RANGE(0xb00000, 0xb0000f) AM_READ(MRA16_RAM) + AM_RANGE(0xb00000, 0xb0000f) AM_READ(SMH_RAM) AM_RANGE(0xb0001e, 0xb0001f) AM_READ(mcat_wd_r) // MCAT Only AM_RANGE(0xc00000, 0xc00001) AM_READ(soundlatch2_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( mcatadv_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x200000, 0x200005) AM_WRITE(MWA16_RAM) AM_BASE(&mcatadv_scroll) - AM_RANGE(0x300000, 0x300005) AM_WRITE(MWA16_RAM) AM_BASE(&mcatadv_scroll2) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x200000, 0x200005) AM_WRITE(SMH_RAM) AM_BASE(&mcatadv_scroll) + AM_RANGE(0x300000, 0x300005) AM_WRITE(SMH_RAM) AM_BASE(&mcatadv_scroll2) AM_RANGE(0x400000, 0x401fff) AM_WRITE(mcatadv_videoram1_w) AM_BASE(&mcatadv_videoram1) // Tilemap 0 AM_RANGE(0x500000, 0x501fff) AM_WRITE(mcatadv_videoram2_w) AM_BASE(&mcatadv_videoram2) // Tilemap 1 AM_RANGE(0x600000, 0x601fff) AM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x602000, 0x602fff) AM_WRITE(MWA16_RAM) // Bigger than needs to be? + AM_RANGE(0x602000, 0x602fff) AM_WRITE(SMH_RAM) // Bigger than needs to be? - AM_RANGE(0x700000, 0x707fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites, two halves for double buffering - AM_RANGE(0x708000, 0x70ffff) AM_WRITE(MWA16_RAM) // Tests more than is needed? + AM_RANGE(0x700000, 0x707fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites, two halves for double buffering + AM_RANGE(0x708000, 0x70ffff) AM_WRITE(SMH_RAM) // Tests more than is needed? // AM_RANGE(0x900000, 0x900001) AM_WRITE(mcat_coin_w) // Lockout / Counter MCAT Only - AM_RANGE(0xb00000, 0xb0000f) AM_WRITE(MWA16_RAM) AM_BASE(&mcatadv_vidregs) + AM_RANGE(0xb00000, 0xb0000f) AM_WRITE(SMH_RAM) AM_BASE(&mcatadv_vidregs) AM_RANGE(0xb00018, 0xb00019) AM_WRITE(watchdog_reset16_w) // NOST Only AM_RANGE(0xc00000, 0xc00001) AM_WRITE(mcat_soundlatch_w) ADDRESS_MAP_END @@ -245,17 +245,17 @@ static WRITE8_HANDLER ( mcatadv_sound_bw_w ) static ADDRESS_MAP_START( mcatadv_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x4000, 0xbfff) AM_READ(MRA8_BANK1 ) // ROM - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x4000, 0xbfff) AM_READ(SMH_BANK1 ) // ROM + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r ) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r ) ADDRESS_MAP_END static ADDRESS_MAP_START( mcatadv_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x4000, 0xbfff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x4000, 0xbfff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) @@ -275,15 +275,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( nost_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // ROM - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // ROM + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( nost_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( nost_sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c index d6b7977058a..4ab441d7840 100644 --- a/src/mame/drivers/mcr.c +++ b/src/mame/drivers/mcr.c @@ -614,7 +614,7 @@ static ADDRESS_MAP_START( cpu_90009_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf000, 0xf1ff) AM_MIRROR(0x0200) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xf400, 0xf41f) AM_MIRROR(0x03e0) AM_WRITE(paletteram_xxxxRRRRBBBBGGGG_split1_w) AM_BASE(&paletteram) AM_RANGE(0xf800, 0xf81f) AM_MIRROR(0x03e0) AM_WRITE(paletteram_xxxxRRRRBBBBGGGG_split2_w) AM_BASE(&paletteram_2) - AM_RANGE(0xfc00, 0xffff) AM_READWRITE(MRA8_RAM, mcr_90009_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xfc00, 0xffff) AM_READWRITE(SMH_RAM, mcr_90009_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END /* upper I/O map determined by PAL; only SSIO ports are verified from schematics */ @@ -623,7 +623,7 @@ static ADDRESS_MAP_START( cpu_90009_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) SSIO_INPUT_PORTS AM_RANGE(0xe0, 0xe0) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xe8, 0xe8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xe8, 0xe8) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf3) AM_READWRITE(z80ctc_0_r, z80ctc_0_w) ADDRESS_MAP_END @@ -641,7 +641,7 @@ static ADDRESS_MAP_START( cpu_90010_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x1800) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xe000, 0xe1ff) AM_MIRROR(0x1600) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xe800, 0xefff) AM_MIRROR(0x1000) AM_READWRITE(MRA8_RAM, mcr_90010_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xe800, 0xefff) AM_MIRROR(0x1000) AM_READWRITE(SMH_RAM, mcr_90010_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END /* upper I/O map determined by PAL; only SSIO ports are verified from schematics */ @@ -650,7 +650,7 @@ static ADDRESS_MAP_START( cpu_90010_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) SSIO_INPUT_PORTS AM_RANGE(0xe0, 0xe0) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xe8, 0xe8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xe8, 0xe8) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf3) AM_READWRITE(z80ctc_0_r, z80ctc_0_w) ADDRESS_MAP_END @@ -668,7 +668,7 @@ static ADDRESS_MAP_START( cpu_91490_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xdfff) AM_ROM AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xe800, 0xe9ff) AM_MIRROR(0x0200) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(MRA8_RAM, mcr_91490_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_RAM, mcr_91490_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xf800, 0xf87f) AM_MIRROR(0x0780) AM_WRITE(mcr_91490_paletteram_w) AM_BASE(&paletteram) ADDRESS_MAP_END @@ -678,7 +678,7 @@ static ADDRESS_MAP_START( cpu_91490_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) SSIO_INPUT_PORTS AM_RANGE(0xe0, 0xe0) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xe8, 0xe8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xe8, 0xe8) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf3) AM_READWRITE(z80ctc_0_r, z80ctc_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c index 36c2c93e26a..4c6604c9d40 100644 --- a/src/mame/drivers/mcr3.c +++ b/src/mame/drivers/mcr3.c @@ -455,7 +455,7 @@ static ADDRESS_MAP_START( mcrmono_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe800, 0xe9ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xea00, 0xebff) AM_RAM AM_RANGE(0xec00, 0xec7f) AM_MIRROR(0x0380) AM_WRITE(mcr3_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(MRA8_RAM, mcr3_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_RAM, mcr3_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xf800, 0xffff) AM_ROM /* schematics show a 2716 @ 2B here, but nobody used it */ ADDRESS_MAP_END @@ -485,8 +485,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spyhunt_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xdfff) AM_ROM - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, spyhunt_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xe800, 0xebff) AM_MIRROR(0x0400) AM_READWRITE(MRA8_RAM, spyhunt_alpharam_w) AM_BASE(&spyhunt_alpharam) + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(SMH_RAM, spyhunt_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xe800, 0xebff) AM_MIRROR(0x0400) AM_READWRITE(SMH_RAM, spyhunt_alpharam_w) AM_BASE(&spyhunt_alpharam) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xf800, 0xf9ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xfa00, 0xfa7f) AM_MIRROR(0x0180) AM_WRITE(mcr3_paletteram_w) AM_BASE(&paletteram) @@ -499,7 +499,7 @@ static ADDRESS_MAP_START( spyhunt_portmap, ADDRESS_SPACE_IO, 8 ) SSIO_INPUT_PORTS AM_RANGE(0x84, 0x86) AM_WRITE(mcr_scroll_value_w) AM_RANGE(0xe0, 0xe0) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xe8, 0xe8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xe8, 0xe8) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf3) AM_READWRITE(z80ctc_0_r, z80ctc_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c index 9298d595ae6..33daae17fc2 100644 --- a/src/mame/drivers/mcr68.c +++ b/src/mame/drivers/mcr68.c @@ -306,7 +306,7 @@ static ADDRESS_MAP_START( mcr68_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0x1fffff) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x060000, 0x063fff) AM_RAM - AM_RANGE(0x070000, 0x070fff) AM_READWRITE(MRA16_RAM, mcr68_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) + AM_RANGE(0x070000, 0x070fff) AM_READWRITE(SMH_RAM, mcr68_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) AM_RANGE(0x071000, 0x071fff) AM_RAM AM_RANGE(0x080000, 0x080fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x090000, 0x09007f) AM_WRITE(mcr68_paletteram_w) AM_BASE(&paletteram16) @@ -334,9 +334,9 @@ static ADDRESS_MAP_START( zwackery_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x104000, 0x104007) AM_READWRITE(pia_2_msb_r, pia_2_msb_w) AM_RANGE(0x108000, 0x108007) AM_READWRITE(pia_3_lsb_r, pia_3_lsb_w) AM_RANGE(0x10c000, 0x10c007) AM_READWRITE(pia_4_lsb_r, pia_4_lsb_w) - AM_RANGE(0x800000, 0x800fff) AM_READWRITE(MRA16_RAM, zwackery_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) - AM_RANGE(0x802000, 0x803fff) AM_READWRITE(MRA16_RAM, zwackery_paletteram_w) AM_BASE(&paletteram16) - AM_RANGE(0xc00000, 0xc00fff) AM_READWRITE(MRA16_RAM, zwackery_spriteram_w) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x800000, 0x800fff) AM_READWRITE(SMH_RAM, zwackery_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) + AM_RANGE(0x802000, 0x803fff) AM_READWRITE(SMH_RAM, zwackery_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0xc00000, 0xc00fff) AM_READWRITE(SMH_RAM, zwackery_spriteram_w) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) ADDRESS_MAP_END @@ -355,7 +355,7 @@ static ADDRESS_MAP_START( pigskin_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0a0000, 0x0affff) AM_READ(pigskin_port_2_r) AM_RANGE(0x0c0000, 0x0c007f) AM_WRITE(mcr68_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x0e0000, 0x0effff) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x100000, 0x100fff) AM_READWRITE(MRA16_RAM, mcr68_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) + AM_RANGE(0x100000, 0x100fff) AM_READWRITE(SMH_RAM, mcr68_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) AM_RANGE(0x120000, 0x120001) AM_READWRITE(pigskin_protection_r, pigskin_protection_w) AM_RANGE(0x140000, 0x143fff) AM_RAM AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) @@ -381,7 +381,7 @@ static ADDRESS_MAP_START( trisport_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x120000, 0x12007f) AM_WRITE(mcr68_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x140000, 0x1407ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x160000, 0x160fff) AM_READWRITE(MRA16_RAM, mcr68_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) + AM_RANGE(0x160000, 0x160fff) AM_READWRITE(SMH_RAM, mcr68_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) AM_RANGE(0x180000, 0x18000f) AM_READWRITE(mcr68_6840_upper_r, mcr68_6840_upper_w) AM_RANGE(0x1a0000, 0x1affff) AM_WRITE(archrivl_control_w) AM_RANGE(0x1c0000, 0x1cffff) AM_WRITE(watchdog_reset16_w) diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c index 15d0d683b82..9b22f08417a 100644 --- a/src/mame/drivers/meadows.c +++ b/src/mame/drivers/meadows.c @@ -353,13 +353,13 @@ static ADDRESS_MAP_START( meadows_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0d00, 0x0d0f) AM_WRITE(meadows_spriteram_w) AM_BASE(&spriteram) AM_RANGE(0x0e00, 0x0eff) AM_RAM AM_RANGE(0x1000, 0x1bff) AM_ROM - AM_RANGE(0x1c00, 0x1fff) AM_READWRITE(MRA8_RAM, meadows_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x1c00, 0x1fff) AM_READWRITE(SMH_RAM, meadows_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( minferno_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0bff) AM_ROM - AM_RANGE(0x1c00, 0x1eff) AM_READWRITE(MRA8_RAM, meadows_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x1c00, 0x1eff) AM_READWRITE(SMH_RAM, meadows_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x1f00, 0x1f00) AM_READ(input_port_0_r) AM_RANGE(0x1f01, 0x1f01) AM_READ(input_port_1_r) AM_RANGE(0x1f02, 0x1f02) AM_READ(input_port_2_r) diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index f3c0bac0d29..77f3ad2b8a5 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -2108,7 +2108,7 @@ static WRITE16_HANDLER( megadriv_68k_io_write ) static ADDRESS_MAP_START( megadriv_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000 , 0x3fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000 , 0x3fffff) AM_READ(SMH_ROM) /* (0x000000 - 0x3fffff) == GAME ROM (4Meg Max, Some games have special banking too) */ AM_RANGE(0xa00000 , 0xa01fff) AM_READ(megadriv_68k_read_z80_ram) @@ -2122,20 +2122,20 @@ static ADDRESS_MAP_START( megadriv_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd00000 , 0xd0001f) AM_READ(megadriv_vdp_r) // the earth defend /* these are fake - remove allocs in VIDEO_START to use these to view ram instead */ -// AM_RANGE(0xb00000 , 0xb0ffff) AM_READ(MRA16_RAM) AM_BASE(&megadrive_vdp_vram) -// AM_RANGE(0xb10000 , 0xb1007f) AM_READ(MRA16_RAM) AM_BASE(&megadrive_vdp_vsram) -// AM_RANGE(0xb10100 , 0xb1017f) AM_READ(MRA16_RAM) AM_BASE(&megadrive_vdp_cram) +// AM_RANGE(0xb00000 , 0xb0ffff) AM_READ(SMH_RAM) AM_BASE(&megadrive_vdp_vram) +// AM_RANGE(0xb10000 , 0xb1007f) AM_READ(SMH_RAM) AM_BASE(&megadrive_vdp_vsram) +// AM_RANGE(0xb10100 , 0xb1017f) AM_READ(SMH_RAM) AM_BASE(&megadrive_vdp_cram) - AM_RANGE(0xe00000 , 0xe0ffff) AM_READ(MRA16_RAM) AM_MIRROR(0x1f0000) -// AM_RANGE(0xff0000 , 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xe00000 , 0xe0ffff) AM_READ(SMH_RAM) AM_MIRROR(0x1f0000) +// AM_RANGE(0xff0000 , 0xffffff) AM_READ(SMH_RAM) /* 0xe00000 - 0xffffff) == MAIN RAM (64kb, Mirrored, most games use ff0000 - ffffff) */ ADDRESS_MAP_END static ADDRESS_MAP_START( megadriv_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000 , 0x3fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000 , 0x3fffff) AM_WRITE(SMH_ROM) AM_RANGE(0xa00000 , 0xa01fff) AM_WRITE(megadriv_68k_write_z80_ram) AM_RANGE(0xa02000 , 0xa03fff) AM_WRITE(megadriv_68k_write_z80_ram) @@ -2151,7 +2151,7 @@ static ADDRESS_MAP_START( megadriv_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00000 , 0xc0001f) AM_WRITE(megadriv_vdp_w) AM_RANGE(0xd00000 , 0xd0001f) AM_WRITE(megadriv_vdp_w) // the earth defend - AM_RANGE(0xe00000 , 0xe0ffff) AM_WRITE(MWA16_RAM) AM_MIRROR(0x1f0000) AM_BASE(&megadrive_ram) + AM_RANGE(0xe00000 , 0xe0ffff) AM_WRITE(SMH_RAM) AM_MIRROR(0x1f0000) AM_BASE(&megadrive_ram) ADDRESS_MAP_END /* z80 sounds/sub CPU */ @@ -2436,7 +2436,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000 , 0x1fff) AM_READ(MRA8_BANK1) AM_MIRROR(0x2000) // RAM can be accessed by the 68k + AM_RANGE(0x0000 , 0x1fff) AM_READ(SMH_BANK1) AM_MIRROR(0x2000) // RAM can be accessed by the 68k AM_RANGE(0x4000 , 0x4003) AM_READ(megadriv_z80_YM2612_read) AM_RANGE(0x6100 , 0x7eff) AM_READ(megadriv_z80_unmapped_read) @@ -2447,7 +2447,7 @@ static ADDRESS_MAP_START( z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000 , 0x1fff) AM_WRITE(MWA8_BANK1) AM_MIRROR(0x2000) + AM_RANGE(0x0000 , 0x1fff) AM_WRITE(SMH_BANK1) AM_MIRROR(0x2000) AM_RANGE(0x4000 , 0x4003) AM_WRITE(megadriv_z80_YM2612_write) AM_RANGE(0x7f00 , 0x7fff) AM_WRITE(megadriv_z80_vdp_write) @@ -2489,10 +2489,10 @@ static WRITE16_HANDLER( _32x_68k_palette_w ) } static ADDRESS_MAP_START( _32x_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000 , 0x3fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000 , 0x3fffff) AM_READ(SMH_ROM) - AM_RANGE(0x880000 , 0x8fffff) AM_READ(MRA16_BANK2) - AM_RANGE(0x900000 , 0x9fffff) AM_READ(MRA16_BANK3) + AM_RANGE(0x880000 , 0x8fffff) AM_READ(SMH_BANK2) + AM_RANGE(0x900000 , 0x9fffff) AM_READ(SMH_BANK3) AM_RANGE(0xa00000 , 0xa01fff) AM_READ(megadriv_68k_read_z80_ram) AM_RANGE(0xa04000 , 0xa04003) AM_READ(megadriv_68k_YM2612_read) @@ -2506,14 +2506,14 @@ static ADDRESS_MAP_START( _32x_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00000 , 0xc0001f) AM_READ(megadriv_vdp_r) AM_RANGE(0xd00000 , 0xd0001f) AM_READ(megadriv_vdp_r) // the earth defend - AM_RANGE(0xe00000 , 0xe0ffff) AM_READ(MRA16_RAM) AM_MIRROR(0x1f0000) + AM_RANGE(0xe00000 , 0xe0ffff) AM_READ(SMH_RAM) AM_MIRROR(0x1f0000) ADDRESS_MAP_END static ADDRESS_MAP_START( _32x_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000 , 0x3fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000 , 0x3fffff) AM_WRITE(SMH_ROM) - AM_RANGE(0x880000, 0x8fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x900000, 0x9fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x880000, 0x8fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x900000, 0x9fffff) AM_WRITE(SMH_ROM) AM_RANGE(0xa00000 , 0xa01fff) AM_WRITE(megadriv_68k_write_z80_ram) @@ -2530,28 +2530,28 @@ static ADDRESS_MAP_START( _32x_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00000 , 0xc0001f) AM_WRITE(megadriv_vdp_w) AM_RANGE(0xd00000 , 0xd0001f) AM_WRITE(megadriv_vdp_w) - AM_RANGE(0xe00000 , 0xe0ffff) AM_WRITE(MWA16_RAM) AM_MIRROR(0x1f0000) AM_BASE(&megadrive_ram) + AM_RANGE(0xe00000 , 0xe0ffff) AM_WRITE(SMH_RAM) AM_MIRROR(0x1f0000) AM_BASE(&megadrive_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( sh2main_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x0000000 , 0x0003fff) AM_READ(MRA32_ROM) - AM_RANGE(0x2000000 , 0x23fffff) AM_READ(MRA32_BANK4) + AM_RANGE(0x0000000 , 0x0003fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000000 , 0x23fffff) AM_READ(SMH_BANK4) ADDRESS_MAP_END static ADDRESS_MAP_START( sh2main_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x0000000 , 0x0003fff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x2000000 , 0x23fffff) AM_WRITE(MWA32_ROM) + AM_RANGE(0x0000000 , 0x0003fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000000 , 0x23fffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sh2slave_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x0000000 , 0x0003fff) AM_READ(MRA32_ROM) - AM_RANGE(0x2000000 , 0x23fffff) AM_READ(MRA32_BANK4) + AM_RANGE(0x0000000 , 0x0003fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000000 , 0x23fffff) AM_READ(SMH_BANK4) ADDRESS_MAP_END static ADDRESS_MAP_START( sh2slave_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x0000000 , 0x0003fff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x2000000 , 0x23fffff) AM_WRITE(MWA32_ROM) + AM_RANGE(0x0000000 , 0x0003fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000000 , 0x23fffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -4810,18 +4810,18 @@ void megatech_set_megadrive_z80_as_megadrive_z80(void) memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x0000, 0xffff, 0, 0, z80_unmapped_w); - memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x0000, 0x1fff, 0, 0, MRA8_BANK1); - memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x0000, 0x1fff, 0, 0, MWA8_BANK1); + memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x0000, 0x1fff, 0, 0, SMH_BANK1); + memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x0000, 0x1fff, 0, 0, SMH_BANK1); memory_set_bankptr( 1, genz80.z80_prgram ); - memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x0000, 0x1fff, 0, 0, MRA8_BANK6); - memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x0000, 0x1fff, 0, 0, MWA8_BANK6); + memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x0000, 0x1fff, 0, 0, SMH_BANK6); + memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x0000, 0x1fff, 0, 0, SMH_BANK6); memory_set_bankptr( 6, genz80.z80_prgram ); // not allowed?? -// memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, MRA8_BANK1); -// memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, MWA8_BANK1); +// memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, SMH_BANK1); +// memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, SMH_BANK1); memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x4000, 0x4003, 0, 0, megadriv_z80_YM2612_read); memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x6100, 0x7eff, 0, 0, megadriv_z80_unmapped_read); diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index fa4cd23f541..a73b8d4a36d 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -561,9 +561,9 @@ static WRITE8_HANDLER( megaplay_game_w ) } static ADDRESS_MAP_START( megaplay_bios_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4fff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x5fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4fff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x5fff) AM_READ(SMH_RAM) AM_RANGE(0x6200, 0x6200) AM_READ(input_port_7_r) AM_RANGE(0x6201, 0x6201) AM_READ(input_port_8_r) AM_RANGE(0x6400, 0x6400) AM_READ(input_port_5_r) @@ -574,14 +574,14 @@ static ADDRESS_MAP_START( megaplay_bios_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6403, 0x6403) AM_READ(megaplay_bios_gamesel_r) AM_RANGE(0x6404, 0x6404) AM_READ(megaplay_bios_6404_r) AM_RANGE(0x6600, 0x6600) AM_READ(megaplay_bios_6600_r) - AM_RANGE(0x6800, 0x77ff) AM_READ(MRA8_RAM) + AM_RANGE(0x6800, 0x77ff) AM_READ(SMH_RAM) AM_RANGE(0x8000, 0xffff) AM_READ(bank_r) ADDRESS_MAP_END static ADDRESS_MAP_START( megaplay_bios_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x4fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x5000, 0x5fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x5000, 0x5fff) AM_WRITE(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_WRITE(megaplay_game_w) AM_RANGE(0x6203, 0x6203) AM_WRITE(megaplay_bios_banksel_w) AM_RANGE(0x6204, 0x6204) AM_WRITE(megaplay_bios_width_w) @@ -589,8 +589,8 @@ static ADDRESS_MAP_START( megaplay_bios_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6403, 0x6403) AM_WRITE(megaplay_bios_gamesel_w) AM_RANGE(0x6404, 0x6404) AM_WRITE(megaplay_bios_6404_w) AM_RANGE(0x6600, 0x6600) AM_WRITE(megaplay_bios_6600_w) - AM_RANGE(0x6001, 0x67ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6800, 0x77ff) AM_WRITE(MWA8_RAM) AM_BASE(&ic3_ram) + AM_RANGE(0x6001, 0x67ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x6800, 0x77ff) AM_WRITE(SMH_RAM) AM_BASE(&ic3_ram) AM_RANGE(0x8000, 0xffff) AM_WRITE(bank_w) ADDRESS_MAP_END @@ -994,8 +994,8 @@ static DRIVER_INIT (megaplay) memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xa10000, 0xa1001f, 0, 0, OLD_megaplay_genesis_io_w); /* megaplay has ram shared with the bios cpu here */ - memory_install_read8_handler(1, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, MRA8_BANK7); - memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, MWA8_BANK7); + memory_install_read8_handler(1, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, SMH_BANK7); + memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, SMH_BANK7); memory_set_bankptr(7, &ic36_ram[0]); /* instead of a RAM mirror the 68k sees the extra ram of the 2nd z80 too */ diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index 8e10a8c7f9e..e7d3d2762fc 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -199,31 +199,31 @@ static INTERRUPT_GEN( interrupt_A ) static ADDRESS_MAP_START( readmem_A, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) AM_RANGE(0x080000, 0x080001) AM_READ(coins_r) AM_RANGE(0x080002, 0x080003) AM_READ(player1_r) AM_RANGE(0x080004, 0x080005) AM_READ(player2_r) AM_RANGE(0x080006, 0x080007) AM_READ(dsw_r) AM_RANGE(0x080008, 0x080009) AM_READ(soundlatch2_word_r) /* from sound cpu */ - AM_RANGE(0x084000, 0x084fff) AM_READ(MRA16_RAM) - AM_RANGE(0x088000, 0x0887ff) AM_READ(MRA16_RAM) - AM_RANGE(0x08e000, 0x08ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x090000, 0x093fff) AM_READ(MRA16_RAM) - AM_RANGE(0x094000, 0x097fff) AM_READ(MRA16_RAM) - AM_RANGE(0x098000, 0x09bfff) AM_READ(MRA16_RAM) - AM_RANGE(0x0f0000, 0x0fffff) AM_READ(MRA16_RAM) + AM_RANGE(0x084000, 0x084fff) AM_READ(SMH_RAM) + AM_RANGE(0x088000, 0x0887ff) AM_READ(SMH_RAM) + AM_RANGE(0x08e000, 0x08ffff) AM_READ(SMH_RAM) + AM_RANGE(0x090000, 0x093fff) AM_READ(SMH_RAM) + AM_RANGE(0x094000, 0x097fff) AM_READ(SMH_RAM) + AM_RANGE(0x098000, 0x09bfff) AM_READ(SMH_RAM) + AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_A, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x084000, 0x0843ff) AM_WRITE(megasys1_vregs_A_w) AM_BASE(&megasys1_vregs) AM_RANGE(0x088000, 0x0887ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x08e000, 0x08ffff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_objectram) + AM_RANGE(0x08e000, 0x08ffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_objectram) AM_RANGE(0x090000, 0x093fff) AM_WRITE(megasys1_scrollram_0_w) AM_BASE(&megasys1_scrollram[0]) AM_RANGE(0x094000, 0x097fff) AM_WRITE(megasys1_scrollram_1_w) AM_BASE(&megasys1_scrollram[1]) AM_RANGE(0x098000, 0x09bfff) AM_WRITE(megasys1_scrollram_2_w) AM_BASE(&megasys1_scrollram[2]) - AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_ram) + AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_ram) ADDRESS_MAP_END @@ -292,29 +292,29 @@ static WRITE16_HANDLER( ip_select_w ) static ADDRESS_MAP_START( readmem_B, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x044000, 0x044fff) AM_READ(MRA16_RAM) - AM_RANGE(0x048000, 0x0487ff) AM_READ(MRA16_RAM) - AM_RANGE(0x04e000, 0x04ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x050000, 0x053fff) AM_READ(MRA16_RAM) - AM_RANGE(0x054000, 0x057fff) AM_READ(MRA16_RAM) - AM_RANGE(0x058000, 0x05bfff) AM_READ(MRA16_RAM) - AM_RANGE(0x060000, 0x07ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x080000, 0x0bffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x044000, 0x044fff) AM_READ(SMH_RAM) + AM_RANGE(0x048000, 0x0487ff) AM_READ(SMH_RAM) + AM_RANGE(0x04e000, 0x04ffff) AM_READ(SMH_RAM) + AM_RANGE(0x050000, 0x053fff) AM_READ(SMH_RAM) + AM_RANGE(0x054000, 0x057fff) AM_READ(SMH_RAM) + AM_RANGE(0x058000, 0x05bfff) AM_READ(SMH_RAM) + AM_RANGE(0x060000, 0x07ffff) AM_READ(SMH_RAM) + AM_RANGE(0x080000, 0x0bffff) AM_READ(SMH_ROM) AM_RANGE(0x0e0000, 0x0e0001) AM_READ(ip_select_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_B, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x044000, 0x0443ff) AM_WRITE(megasys1_vregs_A_w) AM_BASE(&megasys1_vregs) AM_RANGE(0x048000, 0x0487ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x04e000, 0x04ffff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_objectram) + AM_RANGE(0x04e000, 0x04ffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_objectram) AM_RANGE(0x050000, 0x053fff) AM_WRITE(megasys1_scrollram_0_w) AM_BASE(&megasys1_scrollram[0]) AM_RANGE(0x054000, 0x057fff) AM_WRITE(megasys1_scrollram_1_w) AM_BASE(&megasys1_scrollram[1]) AM_RANGE(0x058000, 0x05bfff) AM_WRITE(megasys1_scrollram_2_w) AM_BASE(&megasys1_scrollram[2]) - AM_RANGE(0x060000, 0x07ffff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_ram) - AM_RANGE(0x080000, 0x0bffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x060000, 0x07ffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_ram) + AM_RANGE(0x080000, 0x0bffff) AM_WRITE(SMH_ROM) AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE(ip_select_w) ADDRESS_MAP_END @@ -330,28 +330,28 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_C, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0x1fffff) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x0c0000, 0x0cffff) AM_READ(megasys1_vregs_C_r) - AM_RANGE(0x0d2000, 0x0d3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0e0000, 0x0e3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0e8000, 0x0ebfff) AM_READ(MRA16_RAM) - AM_RANGE(0x0f0000, 0x0f3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0f8000, 0x0f87ff) AM_READ(MRA16_RAM) + AM_RANGE(0x0d2000, 0x0d3fff) AM_READ(SMH_RAM) + AM_RANGE(0x0e0000, 0x0e3fff) AM_READ(SMH_RAM) + AM_RANGE(0x0e8000, 0x0ebfff) AM_READ(SMH_RAM) + AM_RANGE(0x0f0000, 0x0f3fff) AM_READ(SMH_RAM) + AM_RANGE(0x0f8000, 0x0f87ff) AM_READ(SMH_RAM) AM_RANGE(0x0d8000, 0x0d8001) AM_READ(ip_select_r) - AM_RANGE(0x1f0000, 0x1fffff) AM_READ(MRA16_RAM) + AM_RANGE(0x1f0000, 0x1fffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_C, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0x1fffff) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x0c0000, 0x0cffff) AM_WRITE(megasys1_vregs_C_w) AM_BASE(&megasys1_vregs) - AM_RANGE(0x0d2000, 0x0d3fff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_objectram) + AM_RANGE(0x0d2000, 0x0d3fff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_objectram) AM_RANGE(0x0e0000, 0x0e3fff) AM_WRITE(megasys1_scrollram_0_w) AM_BASE(&megasys1_scrollram[0]) AM_RANGE(0x0e8000, 0x0ebfff) AM_WRITE(megasys1_scrollram_1_w) AM_BASE(&megasys1_scrollram[1]) AM_RANGE(0x0f0000, 0x0f3fff) AM_WRITE(megasys1_scrollram_2_w) AM_BASE(&megasys1_scrollram[2]) AM_RANGE(0x0f8000, 0x0f87ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0d8000, 0x0d8001) AM_WRITE(ip_select_w) - AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_ram) + AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_ram) ADDRESS_MAP_END @@ -367,31 +367,31 @@ static INTERRUPT_GEN( interrupt_D ) } static ADDRESS_MAP_START( readmem_D, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x0c0000, 0x0c9fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0ca000, 0x0cbfff) AM_READ(MRA16_RAM) - AM_RANGE(0x0d0000, 0x0d3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0d4000, 0x0d7fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0d8000, 0x0d87ff) AM_MIRROR(0x3000) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x0c0000, 0x0c9fff) AM_READ(SMH_RAM) + AM_RANGE(0x0ca000, 0x0cbfff) AM_READ(SMH_RAM) + AM_RANGE(0x0d0000, 0x0d3fff) AM_READ(SMH_RAM) + AM_RANGE(0x0d4000, 0x0d7fff) AM_READ(SMH_RAM) + AM_RANGE(0x0d8000, 0x0d87ff) AM_MIRROR(0x3000) AM_READ(SMH_RAM) AM_RANGE(0x0e0000, 0x0e0001) AM_READ(dsw_r) - AM_RANGE(0x0e8000, 0x0ebfff) AM_READ(MRA16_RAM) + AM_RANGE(0x0e8000, 0x0ebfff) AM_READ(SMH_RAM) AM_RANGE(0x0f0000, 0x0f0001) AM_READ(coins_r) /* Coins + P1&P2 Buttons */ AM_RANGE(0x0f8000, 0x0f8001) AM_READ(OKIM6295_status_0_lsb_r) // { 0x100000, 0x100001 protection - AM_RANGE(0x1f0000, 0x1fffff) AM_READ(MRA16_RAM) + AM_RANGE(0x1f0000, 0x1fffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_D, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x0c0000, 0x0c9fff) AM_WRITE(megasys1_vregs_D_w) AM_BASE(&megasys1_vregs) - AM_RANGE(0x0ca000, 0x0cbfff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_objectram) + AM_RANGE(0x0ca000, 0x0cbfff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_objectram) AM_RANGE(0x0d0000, 0x0d3fff) AM_WRITE(megasys1_scrollram_1_w) AM_BASE(&megasys1_scrollram[1]) AM_RANGE(0x0d4000, 0x0d7fff) AM_WRITE(megasys1_scrollram_2_w) AM_BASE(&megasys1_scrollram[2]) AM_RANGE(0x0d8000, 0x0d87ff) AM_MIRROR(0x3000) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0e8000, 0x0ebfff) AM_WRITE(megasys1_scrollram_0_w) AM_BASE(&megasys1_scrollram[0]) AM_RANGE(0x0f8000, 0x0f8001) AM_WRITE(OKIM6295_data_0_lsb_w) // { 0x100000, 0x100001 protection - AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(MWA16_RAM) AM_BASE(&megasys1_ram) + AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(SMH_RAM) AM_BASE(&megasys1_ram) ADDRESS_MAP_END @@ -484,22 +484,22 @@ static READ16_HANDLER( oki_status_1_r ) static ADDRESS_MAP_START( sound_readmem_A, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) AM_RANGE(0x040000, 0x040001) AM_READ(soundlatch_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r) AM_RANGE(0x0a0000, 0x0a0001) AM_READ(oki_status_0_r) AM_RANGE(0x0c0000, 0x0c0001) AM_READ(oki_status_1_r) - AM_RANGE(0x0e0000, 0x0fffff) AM_READ(MRA16_RAM) + AM_RANGE(0x0e0000, 0x0fffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_A, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w) // to main cpu AM_RANGE(0x080000, 0x080001) AM_WRITE(YM2151_register_port_0_lsb_w) AM_RANGE(0x080002, 0x080003) AM_WRITE(YM2151_data_port_0_lsb_w) AM_RANGE(0x0a0000, 0x0a0003) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(OKIM6295_data_1_lsb_w) - AM_RANGE(0x0e0000, 0x0fffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x0e0000, 0x0fffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -513,24 +513,24 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem_B, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) AM_RANGE(0x040000, 0x040001) AM_READ(soundlatch_word_r) /* from main cpu */ AM_RANGE(0x060000, 0x060001) AM_READ(soundlatch_word_r) /* from main cpu */ AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r) AM_RANGE(0x0a0000, 0x0a0001) AM_READ(oki_status_0_r) AM_RANGE(0x0c0000, 0x0c0001) AM_READ(oki_status_1_r) - AM_RANGE(0x0e0000, 0x0effff) AM_READ(MRA16_RAM) + AM_RANGE(0x0e0000, 0x0effff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_B, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM ) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM ) AM_RANGE(0x040000, 0x040001) AM_WRITE(soundlatch2_word_w) /* to main cpu */ AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w) /* to main cpu */ AM_RANGE(0x080000, 0x080001) AM_WRITE(YM2151_register_port_0_lsb_w) AM_RANGE(0x080002, 0x080003) AM_WRITE(YM2151_data_port_0_lsb_w) AM_RANGE(0x0a0000, 0x0a0003) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(OKIM6295_data_1_lsb_w) - AM_RANGE(0x0e0000, 0x0effff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x0e0000, 0x0effff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -545,15 +545,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem_z80, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_z80, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ?? */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ?? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index 7eebb9b3777..0d319d31c9e 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -286,8 +286,8 @@ static WRITE8_HANDLER( mt_sms_standard_rom_bank_w ) { case 0: logerror("bank w %02x %02x\n", offset, data); - memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x0000, 0xbfff, 0, 0, MRA8_BANK5); - memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x0000, 0xbfff, 0, 0, MWA8_UNMAP); + memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x0000, 0xbfff, 0, 0, SMH_BANK5); + memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x0000, 0xbfff, 0, 0, SMH_UNMAP); //printf("bank ram??\n"); break; @@ -353,19 +353,19 @@ static void megatech_set_genz80_as_sms_standard_map(void) /* fixed rom bank area */ sms_rom = auto_malloc(0x400000); - memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x0000, 0xbfff, 0, 0, MRA8_BANK5); - memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x0000, 0xbfff, 0, 0, MWA8_UNMAP); + memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0x0000, 0xbfff, 0, 0, SMH_BANK5); + memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x0000, 0xbfff, 0, 0, SMH_UNMAP); memory_set_bankptr( 5, sms_rom ); memcpy(sms_rom, memory_region(REGION_CPU1), 0x400000); /* main ram area */ sms_mainram = auto_malloc(0x2000); // 8kb of main ram - memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0xc000, 0xdfff, 0, 0, MRA8_BANK6); - memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0xc000, 0xdfff, 0, 0, MWA8_BANK6); + memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0xc000, 0xdfff, 0, 0, SMH_BANK6); + memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0xc000, 0xdfff, 0, 0, SMH_BANK6); memory_set_bankptr( 6, sms_mainram ); - memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0xe000, 0xffff, 0, 0, MRA8_BANK7); - memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0xe000, 0xffff, 0, 0, MWA8_BANK7); + memory_install_read8_handler (1, ADDRESS_SPACE_PROGRAM, 0xe000, 0xffff, 0, 0, SMH_BANK7); + memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0xe000, 0xffff, 0, 0, SMH_BANK7); memory_set_bankptr( 7, sms_mainram ); memset(sms_mainram,0x00,0x2000); diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c index 3fd2957e506..bf95d700560 100644 --- a/src/mame/drivers/megazone.c +++ b/src/mame/drivers/megazone.c @@ -94,10 +94,10 @@ static WRITE8_HANDLER( megazone_coin_counter_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x33ff) AM_READ(MRA8_RAM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x33ff) AM_READ(SMH_RAM) AM_RANGE(0x3800, 0x3fff) AM_RAM AM_SHARE(1) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) /* 4000->5FFF is a debug rom */ + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) /* 4000->5FFF is a debug rom */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -105,18 +105,18 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0005, 0x0005) AM_WRITE(megazone_flipscreen_w) AM_RANGE(0x0007, 0x0007) AM_WRITE(interrupt_enable_w) AM_RANGE(0x0800, 0x0800) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x1800, 0x1800) AM_WRITE(MWA8_RAM) AM_BASE(&megazone_scrollx) - AM_RANGE(0x1000, 0x1000) AM_WRITE(MWA8_RAM) AM_BASE(&megazone_scrolly) - AM_RANGE(0x2000, 0x23ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2400, 0x27ff) AM_WRITE(MWA8_RAM) AM_BASE(&megazone_videoram2) AM_SIZE(&megazone_videoram2_size) - AM_RANGE(0x2800, 0x2bff) AM_WRITE(MWA8_RAM) AM_BASE(&colorram) - AM_RANGE(0x2c00, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&megazone_colorram2) - AM_RANGE(0x3000, 0x33ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x1800, 0x1800) AM_WRITE(SMH_RAM) AM_BASE(&megazone_scrollx) + AM_RANGE(0x1000, 0x1000) AM_WRITE(SMH_RAM) AM_BASE(&megazone_scrolly) + AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x2400, 0x27ff) AM_WRITE(SMH_RAM) AM_BASE(&megazone_videoram2) AM_SIZE(&megazone_videoram2_size) + AM_RANGE(0x2800, 0x2bff) AM_WRITE(SMH_RAM) AM_BASE(&colorram) + AM_RANGE(0x2c00, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&megazone_colorram2) + AM_RANGE(0x3000, 0x33ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0x6000, 0x6000) AM_READ(input_port_0_r) /* IO Coin */ AM_RANGE(0x6001, 0x6001) AM_READ(input_port_1_r) /* P1 IO */ AM_RANGE(0x6002, 0x6002) AM_READ(input_port_2_r) /* P2 IO */ @@ -126,11 +126,11 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x2000, 0x2000) AM_WRITE(megazone_i8039_irq_w) /* START line. Interrupts 8039 */ AM_RANGE(0x4000, 0x4000) AM_WRITE(soundlatch_w) /* CODE line. Command Interrupts 8039 */ - AM_RANGE(0xa000, 0xa000) AM_WRITE(MWA8_RAM) /* INTMAIN - Interrupts main CPU (unused) */ - AM_RANGE(0xc000, 0xc000) AM_WRITE(MWA8_RAM) /* INT (Actually is NMI) enable/disable (unused)*/ + AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_RAM) /* INTMAIN - Interrupts main CPU (unused) */ + AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_RAM) /* INT (Actually is NMI) enable/disable (unused)*/ AM_RANGE(0xc001, 0xc001) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -146,11 +146,11 @@ static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c index 0ecb4088f25..60b29e1efb1 100644 --- a/src/mame/drivers/meijinsn.c +++ b/src/mame/drivers/meijinsn.c @@ -145,7 +145,7 @@ static READ16_HANDLER( alpha_mcu_r ) static ADDRESS_MAP_START( meijinsn_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x080e00, 0x080fff) AM_READ(alpha_mcu_r) AM_WRITENOP - AM_RANGE(0x100000, 0x107fff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&videoram16) + AM_RANGE(0x100000, 0x107fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&videoram16) AM_RANGE(0x180000, 0x180dff) AM_RAM AM_RANGE(0x180e00, 0x180fff) AM_RAM AM_BASE(&shared_ram) AM_RANGE(0x181000, 0x181fff) AM_RAM @@ -163,7 +163,7 @@ static ADDRESS_MAP_START( meijinsn_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x01, 0x01) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) AM_RANGE(0x02, 0x02) AM_WRITE(soundlatch_clear_w) - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP) + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static INPUT_PORTS_START( meijinsn ) diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index 2a0ba608755..05bb9fd6986 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -183,8 +183,8 @@ static ADDRESS_MAP_START( pitboss_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa002, 0xa002) AM_NOP //dips ? // AM_RANGE(0xc000, 0xc002) AM_NOP AM_RANGE(0xe000, 0xe001) AM_WRITENOP // 6845 crt - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(MRA8_RAM, phrcraze_bg_w) AM_BASE(&videoram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) + AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_RAM, phrcraze_bg_w) AM_BASE(&videoram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(palette_w) AM_BASE(&paletteram) ADDRESS_MAP_END @@ -194,8 +194,8 @@ static ADDRESS_MAP_START( bigappg_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc004, 0xc007) AM_READWRITE(ppi8255_0_r, ppi8255_0_w) AM_RANGE(0xc008, 0xc00b) AM_READWRITE(ppi8255_1_r, ppi8255_1_w) AM_RANGE(0xe000, 0xe001) AM_WRITENOP // 6845 crt - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(MRA8_RAM, phrcraze_bg_w) AM_BASE(&videoram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) + AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_RAM, phrcraze_bg_w) AM_BASE(&videoram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(palette_w) AM_BASE(&paletteram) ADDRESS_MAP_END @@ -209,8 +209,8 @@ static ADDRESS_MAP_START( trvwhiz_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xa003) AM_READWRITE(ppi8255_0_r, ppi8255_0_w) AM_RANGE(0xc000, 0xc003) AM_READWRITE(ppi8255_1_r, ppi8255_1_w) AM_RANGE(0xe000, 0xe001) AM_WRITENOP // 6845 crt - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(MRA8_RAM, phrcraze_bg_w) AM_BASE(&videoram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) + AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_RAM, phrcraze_bg_w) AM_BASE(&videoram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(palette_w) AM_BASE(&paletteram) ADDRESS_MAP_END @@ -229,8 +229,8 @@ static ADDRESS_MAP_START( phrcraze_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd600, 0xd6ff) AM_WRITE(low_offset_w) AM_RANGE(0xda00, 0xdaff) AM_WRITE(med_offset_w) AM_RANGE(0xe000, 0xe001) AM_WRITENOP // 6845 crt - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(MRA8_RAM, phrcraze_bg_w) AM_BASE(&videoram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) + AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_RAM, phrcraze_bg_w) AM_BASE(&videoram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(palette_w) AM_BASE(&paletteram) ADDRESS_MAP_END @@ -249,8 +249,8 @@ static ADDRESS_MAP_START( tictac_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd600, 0xd6ff) AM_WRITE(low_offset_w) AM_RANGE(0xda00, 0xdaff) AM_WRITE(med_offset_w) AM_RANGE(0xe000, 0xe001) AM_WRITENOP // 6845 crt - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(MRA8_RAM, phrcraze_bg_w) AM_BASE(&videoram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) + AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_RAM, phrcraze_bg_w) AM_BASE(&videoram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(palette_w) AM_BASE(&paletteram) ADDRESS_MAP_END @@ -269,8 +269,8 @@ static ADDRESS_MAP_START( trvwhziv_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd600, 0xd6ff) AM_WRITE(low_offset_w) AM_RANGE(0xda00, 0xdaff) AM_WRITE(med_offset_w) AM_RANGE(0xe000, 0xe001) AM_WRITENOP // 6845 crt - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(MRA8_RAM, phrcraze_bg_w) AM_BASE(&videoram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, phrcraze_attr_w) AM_BASE(&phrcraze_attr) + AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_RAM, phrcraze_bg_w) AM_BASE(&videoram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(palette_w) AM_BASE(&paletteram) ADDRESS_MAP_END diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 0ffd70943f0..8fd7d423255 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -41,11 +41,11 @@ static VIDEO_UPDATE(meritm) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index 82eb6d7cf47..4a7604ba2db 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -73,26 +73,26 @@ static WRITE8_HANDLER( metlclsh_ack_nmi ) } static ADDRESS_MAP_START( metlclsh_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) AM_RANGE(0x8000, 0x9fff) AM_READ(sharedram_r ) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_ROM ) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_ROM ) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r ) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r ) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r ) AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r ) -// AM_RANGE(0xc800, 0xc82f) AM_READ(MRA8_RAM ) // not actually read -// AM_RANGE(0xcc00, 0xcc2f) AM_READ(MRA8_RAM ) // "" +// AM_RANGE(0xc800, 0xc82f) AM_READ(SMH_RAM ) // not actually read +// AM_RANGE(0xcc00, 0xcc2f) AM_READ(SMH_RAM ) // "" AM_RANGE(0xd000, 0xd000) AM_READ(YM2203_status_port_0_r ) -// AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM ) // not actually read - AM_RANGE(0xe800, 0xe9ff) AM_READ(MRA8_RAM ) - AM_RANGE(0xfff0, 0xffff) AM_READ(MRA8_ROM ) // Reset/IRQ vectors +// AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM ) // not actually read + AM_RANGE(0xe800, 0xe9ff) AM_READ(SMH_RAM ) + AM_RANGE(0xfff0, 0xffff) AM_READ(SMH_ROM ) // Reset/IRQ vectors ADDRESS_MAP_END static ADDRESS_MAP_START( metlclsh_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) AM_RANGE(0x8000, 0x9fff) AM_WRITE(sharedram_w) AM_BASE(&sharedram ) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_ROM ) - AM_RANGE(0xc080, 0xc080) AM_WRITE(MWA8_NOP ) // ? 0 + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_ROM ) + AM_RANGE(0xc080, 0xc080) AM_WRITE(SMH_NOP ) // ? 0 AM_RANGE(0xc0c2, 0xc0c2) AM_WRITE(metlclsh_cause_irq ) // cause irq on cpu #2 AM_RANGE(0xc0c3, 0xc0c3) AM_WRITE(metlclsh_ack_nmi ) // nmi ack AM_RANGE(0xc800, 0xc82f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram ) @@ -101,9 +101,9 @@ static ADDRESS_MAP_START( metlclsh_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd001, 0xd001) AM_WRITE(YM2203_write_port_0_w ) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM3526_control_port_0_w ) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM3526_write_port_0_w ) - AM_RANGE(0xe800, 0xe9ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size ) + AM_RANGE(0xe800, 0xe9ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size ) AM_RANGE(0xd800, 0xdfff) AM_WRITE(metlclsh_fgram_w) AM_BASE(&metlclsh_fgram ) - AM_RANGE(0xfff0, 0xffff) AM_WRITE(MWA8_ROM ) + AM_RANGE(0xfff0, 0xffff) AM_WRITE(SMH_ROM ) ADDRESS_MAP_END @@ -134,18 +134,18 @@ static WRITE8_HANDLER( metlclsh_flipscreen_w ) } static ADDRESS_MAP_START( metlclsh_readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) AM_RANGE(0x8000, 0x9fff) AM_READ(sharedram_r ) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r ) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r ) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r ) AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r ) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_BANK1 ) - AM_RANGE(0xfff0, 0xffff) AM_READ(MRA8_ROM ) // Reset/IRQ vectors + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_BANK1 ) + AM_RANGE(0xfff0, 0xffff) AM_READ(SMH_ROM ) // Reset/IRQ vectors ADDRESS_MAP_END static ADDRESS_MAP_START( metlclsh_writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) AM_RANGE(0x8000, 0x9fff) AM_WRITE(sharedram_w ) AM_RANGE(0xc000, 0xc000) AM_WRITE(metlclsh_gfxbank_w ) // bg tiles bank AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(metlclsh_cause_nmi2 ) // cause nmi on cpu #1 @@ -154,10 +154,10 @@ static ADDRESS_MAP_START( metlclsh_writemem2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe417, 0xe417) AM_WRITE(metlclsh_ack_nmi2 ) // nmi ack 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_WRITE(MWA8_RAM) AM_BASE(&metlclsh_scrollx ) -// AM_RANGE(0xe404, 0xe404) AM_WRITE(MWA8_NOP ) // ? 0 -// AM_RANGE(0xe410, 0xe410) AM_WRITE(MWA8_NOP ) // ? 0 on startup only - AM_RANGE(0xfff0, 0xffff) AM_WRITE(MWA8_ROM ) + AM_RANGE(0xe402, 0xe403) AM_WRITE(SMH_RAM) AM_BASE(&metlclsh_scrollx ) +// AM_RANGE(0xe404, 0xe404) AM_WRITE(SMH_NOP ) // ? 0 +// AM_RANGE(0xe410, 0xe410) AM_WRITE(SMH_NOP ) // ? 0 on startup only + AM_RANGE(0xfff0, 0xffff) AM_WRITE(SMH_ROM ) ADDRESS_MAP_END diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 294db09a256..b733ef69258 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -852,17 +852,17 @@ static WRITE16_HANDLER( metro_blitter_w ) static ADDRESS_MAP_START( metro_snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) /* External ROM */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) /* External ROM (Banked) */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* External RAM */ - AM_RANGE(0xff00, 0xffff) AM_READ(MRA8_RAM) /* Internal RAM */ + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) /* External ROM */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) /* External ROM (Banked) */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* External RAM */ + AM_RANGE(0xff00, 0xffff) AM_READ(SMH_RAM) /* Internal RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( metro_snd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) /* External ROM */ - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_BANK1) /* External ROM (Banked) */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* External RAM */ - AM_RANGE(0xff00, 0xffff) AM_WRITE(MWA8_RAM) /* Internal RAM */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) /* External ROM */ + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_BANK1) /* External ROM (Banked) */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* External RAM */ + AM_RANGE(0xff00, 0xffff) AM_WRITE(SMH_RAM) /* Internal RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( metro_snd_readport, ADDRESS_SPACE_IO, 8 ) @@ -878,17 +878,17 @@ ADDRESS_MAP_END /*****************/ static ADDRESS_MAP_START( daitorid_snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) /* External ROM */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) /* External ROM (Banked) */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* External RAM */ - AM_RANGE(0xff00, 0xffff) AM_READ(MRA8_RAM) /* Internal RAM */ + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) /* External ROM */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) /* External ROM (Banked) */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* External RAM */ + AM_RANGE(0xff00, 0xffff) AM_READ(SMH_RAM) /* Internal RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( daitorid_snd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) /* External ROM */ - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_BANK1) /* External ROM (Banked) */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* External RAM */ - AM_RANGE(0xff00, 0xffff) AM_WRITE(MWA8_RAM) /* Internal RAM */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) /* External ROM */ + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_BANK1) /* External ROM (Banked) */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* External RAM */ + AM_RANGE(0xff00, 0xffff) AM_WRITE(SMH_RAM) /* Internal RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( daitorid_snd_readport, ADDRESS_SPACE_IO, 8 ) @@ -938,44 +938,44 @@ static READ16_HANDLER( balcube_dsw_r ) static ADDRESS_MAP_START( balcube_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x300001) AM_READ(ymf278b_r ) // Sound AM_RANGE(0x400000, 0x41ffff) AM_READ(balcube_dsw_r ) // DSW x 3 - AM_RANGE(0x600000, 0x61ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x620000, 0x63ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x640000, 0x65ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x600000, 0x61ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x620000, 0x63ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x640000, 0x65ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x660000, 0x66ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x670000, 0x673fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x674000, 0x674fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x678000, 0x6787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x670000, 0x673fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x674000, 0x674fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x678000, 0x6787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x6788a2, 0x6788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // - AM_RANGE(0x500006, 0x500007) AM_READ(MRA16_NOP ) // + AM_RANGE(0x500006, 0x500007) AM_READ(SMH_NOP ) // ADDRESS_MAP_END static ADDRESS_MAP_START( balcube_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x30000b) AM_WRITE(ymf278b_w ) // Sound AM_RANGE(0x500002, 0x500009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout AM_RANGE(0x670000, 0x673fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x674000, 0x674fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x674000, 0x674fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x600000, 0x61ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x620000, 0x63ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x640000, 0x65ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 - AM_RANGE(0x678000, 0x6787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x678000, 0x6787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set AM_RANGE(0x678840, 0x67884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x678860, 0x67886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x678870, 0x67887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll - AM_RANGE(0x678880, 0x678881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0x678890, 0x678891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x678870, 0x67887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll + AM_RANGE(0x678880, 0x678881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0x678890, 0x678891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x6788a2, 0x6788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x6788a4, 0x6788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable - AM_RANGE(0x6788aa, 0x6788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x6788ac, 0x6788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x679700, 0x679713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x6788a4, 0x6788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x6788aa, 0x6788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x6788ac, 0x6788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x679700, 0x679713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers ADDRESS_MAP_END @@ -984,46 +984,46 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( bangball_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0xf10000, 0xf10fff) AM_READ(MRA16_RAM ) // RAM (bug in the ram test routine) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0xf10000, 0xf10fff) AM_READ(SMH_RAM ) // RAM (bug in the ram test routine) AM_RANGE(0xb00000, 0xb00001) AM_READ(ymf278b_r ) // Sound AM_RANGE(0xc00000, 0xc1ffff) AM_READ(balcube_dsw_r ) // DSW x 3 AM_RANGE(0xd00000, 0xd00001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xd00002, 0xd00003) AM_READ(input_port_1_word_r ) // - AM_RANGE(0xd00006, 0xd00007) AM_READ(MRA16_NOP ) // - AM_RANGE(0xe00000, 0xe1ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0xe20000, 0xe3ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0xe40000, 0xe5ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0xd00006, 0xd00007) AM_READ(SMH_NOP ) // + AM_RANGE(0xe00000, 0xe1ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0xe20000, 0xe3ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0xe40000, 0xe5ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0xe60000, 0xe6ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0xe70000, 0xe73fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xe74000, 0xe74fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xe78000, 0xe787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0xe70000, 0xe73fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xe74000, 0xe74fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xe78000, 0xe787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0xe788a2, 0xe788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause ADDRESS_MAP_END static ADDRESS_MAP_START( bangball_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0xf10000, 0xf10fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0xf10000, 0xf10fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xb00000, 0xb0000b) AM_WRITE(ymf278b_w ) // Sound AM_RANGE(0xd00002, 0xd00009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout AM_RANGE(0xe00000, 0xe1ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0xe20000, 0xe3ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0xe40000, 0xe5ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0xe70000, 0xe73fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0xe74000, 0xe74fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0xe78000, 0xe787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0xe74000, 0xe74fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xe78000, 0xe787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set AM_RANGE(0xe78840, 0xe7884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0xe78860, 0xe7886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0xe78870, 0xe7887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll - AM_RANGE(0xe78880, 0xe78881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0xe78890, 0xe78891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0xe78870, 0xe7887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll + AM_RANGE(0xe78880, 0xe78881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0xe78890, 0xe78891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0xe788a2, 0xe788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0xe788a4, 0xe788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable - AM_RANGE(0xe788aa, 0xe788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0xe788ac, 0xe788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0xe79700, 0xe79713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0xe788a4, 0xe788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0xe788aa, 0xe788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0xe788ac, 0xe788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0xe79700, 0xe79713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers ADDRESS_MAP_END /*************************************************************************** @@ -1031,14 +1031,14 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( batlbubl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x11ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x120000, 0x13ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x140000, 0x15ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x11ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x120000, 0x13ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x140000, 0x15ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x160000, 0x16ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x170000, 0x173fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x174000, 0x174fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x178000, 0x1787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x170000, 0x173fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x174000, 0x174fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x178000, 0x1787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x1788a2, 0x1788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x200000, 0x200001) AM_READ(input_port_0_word_r ) AM_RANGE(0x200002, 0x200003) AM_READ(input_port_1_word_r ) @@ -1046,32 +1046,32 @@ static ADDRESS_MAP_START( batlbubl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200006, 0x200007) AM_READ(input_port_3_word_r ) AM_RANGE(0x300000, 0x31ffff) AM_READ(balcube_dsw_r ) // read but ignored? AM_RANGE(0x400000, 0x400001) AM_READ(ymf278b_r ) // Sound - AM_RANGE(0xf00000, 0xf0ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0xf10000, 0xf10fff) AM_READ(MRA16_RAM ) // RAM (bug in the ram test routine) + AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0xf10000, 0xf10fff) AM_READ(SMH_RAM ) // RAM (bug in the ram test routine) ADDRESS_MAP_END static ADDRESS_MAP_START( batlbubl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x11ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x120000, 0x13ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x140000, 0x15ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x170000, 0x173fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x174000, 0x174fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x178000, 0x1787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x174000, 0x174fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x178000, 0x1787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set AM_RANGE(0x178840, 0x17884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x178860, 0x17886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x178870, 0x17887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll - AM_RANGE(0x178880, 0x178881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0x178890, 0x178891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x178870, 0x17887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll + AM_RANGE(0x178880, 0x178881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0x178890, 0x178891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x1788a2, 0x1788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x1788a4, 0x1788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable - AM_RANGE(0x1788aa, 0x1788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x1788ac, 0x1788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x179700, 0x179713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x1788a4, 0x1788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x1788aa, 0x1788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x1788ac, 0x1788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x179700, 0x179713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0x200002, 0x200009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout AM_RANGE(0x400000, 0x40000b) AM_WRITE(ymf278b_w ) // Sound - AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0xf10000, 0xf10fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0xf10000, 0xf10fff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -1080,15 +1080,15 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( daitorid_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x800000, 0x80ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x400000, 0x41ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x420000, 0x43ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x440000, 0x45ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x800000, 0x80ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x400000, 0x41ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x420000, 0x43ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x440000, 0x45ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x470000, 0x473fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x474000, 0x474fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x478000, 0x4787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x470000, 0x473fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x474000, 0x474fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x478000, 0x4787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x4788a2, 0x4788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0xc00000, 0xc00001) AM_READ(daitorid_soundstatus_r) // Inputs AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) // @@ -1097,25 +1097,25 @@ static ADDRESS_MAP_START( daitorid_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( daitorid_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x800000, 0x80ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x800000, 0x80ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x400000, 0x41ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x420000, 0x43ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x440000, 0x45ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x470000, 0x473fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x474000, 0x474fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x478000, 0x4787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x474000, 0x474fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x478000, 0x4787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x478860, 0x47886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x478870, 0x47887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll - AM_RANGE(0x478880, 0x478881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0x478890, 0x478891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x478870, 0x47887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll + AM_RANGE(0x478880, 0x478881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0x478890, 0x478891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x4788a2, 0x4788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x4788a4, 0x4788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x4788a4, 0x4788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x4788a8, 0x4788a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0x4788aa, 0x4788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x4788ac, 0x4788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x479700, 0x479713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x4788aa, 0x4788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x4788ac, 0x4788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x479700, 0x479713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0xc00000, 0xc00001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0xc00002, 0xc00009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout ADDRESS_MAP_END @@ -1126,15 +1126,15 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( dharma_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x800000, 0x81ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x820000, 0x83ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x840000, 0x85ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x800000, 0x81ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x820000, 0x83ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x840000, 0x85ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x870000, 0x873fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x878000, 0x8787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x870000, 0x873fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x874000, 0x874fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x878000, 0x8787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x8788a2, 0x8788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0xc00000, 0xc00001) AM_READ(daitorid_soundstatus_r) // Inputs AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) // @@ -1143,25 +1143,25 @@ static ADDRESS_MAP_START( dharma_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dharma_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x400000, 0x40ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x800000, 0x81ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x820000, 0x83ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x840000, 0x85ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x870000, 0x873fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x878000, 0x8787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x874000, 0x874fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x878000, 0x8787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x878870, 0x87887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - AM_RANGE(0x878880, 0x878881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0x878890, 0x878891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x878870, 0x87887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs + AM_RANGE(0x878880, 0x878881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0x878890, 0x878891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x8788a2, 0x8788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x8788a8, 0x8788a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x879700, 0x879713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x879700, 0x879713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0xc00000, 0xc00001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0xc00002, 0xc00009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout ADDRESS_MAP_END @@ -1192,8 +1192,8 @@ KARATOUR_VRAM( 1 ) KARATOUR_VRAM( 2 ) static ADDRESS_MAP_START( karatour_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x400000, 0x400001) AM_READ(metro_soundstatus_r ) // From Sound CPU AM_RANGE(0x400002, 0x400003) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x400004, 0x400005) AM_READ(input_port_1_word_r ) // @@ -1201,37 +1201,37 @@ static ADDRESS_MAP_START( karatour_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x40000a, 0x40000b) AM_READ(input_port_3_word_r ) // AM_RANGE(0x40000c, 0x40000d) AM_READ(input_port_4_word_r ) // AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x870000, 0x873fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_READ(MRA16_RAM ) // Sprites + AM_RANGE(0x870000, 0x873fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x874000, 0x874fff) AM_READ(SMH_RAM ) // Sprites AM_RANGE(0x875000, 0x875fff) AM_READ(karatour_vram_0_r ) // Layer 0 (Part of) AM_RANGE(0x876000, 0x876fff) AM_READ(karatour_vram_1_r ) // Layer 1 (Part of) AM_RANGE(0x877000, 0x877fff) AM_READ(karatour_vram_2_r ) // Layer 2 (Part of) - AM_RANGE(0x878000, 0x8787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x878000, 0x8787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x8788a2, 0x8788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause ADDRESS_MAP_END static ADDRESS_MAP_START( karatour_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x400000, 0x400001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0x400002, 0x400003) AM_WRITE(metro_coin_lockout_1word_w ) // Coin Lockout AM_RANGE(0x870000, 0x873fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x874000, 0x874fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x875000, 0x875fff) AM_WRITE(karatour_vram_0_w ) // Layer 0 (Part of) AM_RANGE(0x876000, 0x876fff) AM_WRITE(karatour_vram_1_w ) // Layer 1 (Part of) AM_RANGE(0x877000, 0x877fff) AM_WRITE(karatour_vram_2_w ) // Layer 2 (Part of) - AM_RANGE(0x878000, 0x8787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0x878800, 0x878813) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x878000, 0x8787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x878800, 0x878813) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x878870, 0x87887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll - AM_RANGE(0x878880, 0x878881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0x878890, 0x878891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x878870, 0x87887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll + AM_RANGE(0x878880, 0x878881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0x878890, 0x878891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x8788a2, 0x8788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x8788a8, 0x8788a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control ADDRESS_MAP_END @@ -1242,15 +1242,15 @@ ADDRESS_MAP_END /* same limited tilemap access as karatour */ static ADDRESS_MAP_START( kokushi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x7fc000, 0x7fffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x7fc000, 0x7fffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x870000, 0x873fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_READ(MRA16_RAM ) // Sprites + AM_RANGE(0x870000, 0x873fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x874000, 0x874fff) AM_READ(SMH_RAM ) // Sprites AM_RANGE(0x875000, 0x875fff) AM_READ(karatour_vram_0_r ) // Layer 0 (Part of) AM_RANGE(0x876000, 0x876fff) AM_READ(karatour_vram_1_r ) // Layer 1 (Part of) AM_RANGE(0x877000, 0x877fff) AM_READ(karatour_vram_2_r ) // Layer 2 (Part of) - AM_RANGE(0x878000, 0x8787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x878000, 0x8787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x8788a2, 0x8788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0xc00000, 0xc00001) AM_READ(daitorid_soundstatus_r) // From Sound CPU AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) // Inputs @@ -1258,25 +1258,25 @@ static ADDRESS_MAP_START( kokushi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( kokushi_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x7fc000, 0x7fffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x7fc000, 0x7fffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x870000, 0x873fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x874000, 0x874fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x875000, 0x875fff) AM_WRITE(karatour_vram_0_w ) // Layer 0 (Part of) AM_RANGE(0x876000, 0x876fff) AM_WRITE(karatour_vram_1_w ) // Layer 1 (Part of) AM_RANGE(0x877000, 0x877fff) AM_WRITE(karatour_vram_2_w ) // Layer 2 (Part of) - AM_RANGE(0x878000, 0x8787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x878000, 0x8787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x878870, 0x87887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - WRONG -// AM_RANGE(0x878880, 0x878881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0x878890, 0x878891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x878870, 0x87887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - WRONG +// AM_RANGE(0x878880, 0x878881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0x878890, 0x878891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x8788a2, 0x8788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x8788a8, 0x8788a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x879700, 0x879713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x879700, 0x879713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0xc00000, 0xc00001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0xc00002, 0xc00009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout ADDRESS_MAP_END @@ -1288,18 +1288,18 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( lastfort_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x800000, 0x81ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x820000, 0x83ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x840000, 0x85ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x800000, 0x81ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x820000, 0x83ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x840000, 0x85ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x870000, 0x873fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x878000, 0x8787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x870000, 0x873fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x874000, 0x874fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x878000, 0x8787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x8788a2, 0x8788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0xc00000, 0xc00001) AM_READ(metro_soundstatus_r ) // From Sound CPU - AM_RANGE(0xc00002, 0xc00003) AM_READ(MRA16_NOP ) // + AM_RANGE(0xc00002, 0xc00003) AM_READ(SMH_NOP ) // AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xc00006, 0xc00007) AM_READ(input_port_1_word_r ) // AM_RANGE(0xc00008, 0xc00009) AM_READ(input_port_2_word_r ) // @@ -1309,25 +1309,25 @@ static ADDRESS_MAP_START( lastfort_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( lastfort_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x400000, 0x40ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x800000, 0x81ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x820000, 0x83ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x840000, 0x85ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x870000, 0x873fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x878000, 0x8787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0x878800, 0x878813) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x874000, 0x874fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x878000, 0x8787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x878800, 0x878813) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x878870, 0x87887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll - AM_RANGE(0x878880, 0x878881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0x878890, 0x878891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x878870, 0x87887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll + AM_RANGE(0x878880, 0x878881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0x878890, 0x878891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x8788a2, 0x8788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x8788a8, 0x8788a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control AM_RANGE(0xc00000, 0xc00001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0xc00002, 0xc00003) AM_WRITE(metro_coin_lockout_1word_w ) // Coin Lockout ADDRESS_MAP_END @@ -1336,46 +1336,46 @@ ADDRESS_MAP_END /* todo: clean up input reads etc. */ static ADDRESS_MAP_START( lastforg_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x400000, 0x400001) AM_READ(metro_soundstatus_r ) // From Sound CPU AM_RANGE(0x400002, 0x400003) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x400004, 0x400005) AM_READ(input_port_1_word_r ) // AM_RANGE(0x400006, 0x400007) AM_READ(input_port_2_word_r ) // AM_RANGE(0x40000a, 0x40000b) AM_READ(input_port_3_word_r ) // AM_RANGE(0x40000c, 0x40000d) AM_READ(input_port_4_word_r ) // - AM_RANGE(0x880000, 0x89ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x8a0000, 0x8bffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x8c0000, 0x8dffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x880000, 0x89ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x8a0000, 0x8bffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x8c0000, 0x8dffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x8e0000, 0x8effff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x8f0000, 0x8f3fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x8f4000, 0x8f4fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x8f8000, 0x8f87ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x8f0000, 0x8f3fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x8f4000, 0x8f4fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x8f8000, 0x8f87ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x8f88a2, 0x8f88a3) AM_READ(metro_irq_cause_r ) // IRQ Cause - AM_RANGE(0xc00000, 0xc0ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( lastforg_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x400000, 0x400001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0x400002, 0x400003) AM_WRITE(metro_coin_lockout_1word_w ) // Coin Lockout AM_RANGE(0x880000, 0x89ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x8a0000, 0x8bffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x8c0000, 0x8dffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x8f0000, 0x8f3fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x8f4000, 0x8f4fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x8f8000, 0x8f87ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0x8f8800, 0x8f8813) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x8f4000, 0x8f4fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x8f8000, 0x8f87ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x8f8800, 0x8f8813) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0x8f8840, 0x8f884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x8f8860, 0x8f886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x8f8870, 0x8f887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll - AM_RANGE(0x8f8880, 0x8f8881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0x8f8890, 0x8f8891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x8f8870, 0x8f887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll + AM_RANGE(0x8f8880, 0x8f8881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0x8f8890, 0x8f8891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x8f88a2, 0x8f88a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x8f88a4, 0x8f88a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x8f88a4, 0x8f88a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x8f88a8, 0x8f88a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0x8f88aa, 0x8f88ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x8f88ac, 0x8f88ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x8f88aa, 0x8f88ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x8f88ac, 0x8f88ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -1444,45 +1444,45 @@ static WRITE16_HANDLER( gakusai_eeprom_w ) } static ADDRESS_MAP_START( gakusai_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x200000, 0x21ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x220000, 0x23ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x240000, 0x25ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x200000, 0x21ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x220000, 0x23ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x240000, 0x25ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x260000, 0x26ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x270000, 0x273fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x274000, 0x274fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x278000, 0x2787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x270000, 0x273fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x274000, 0x274fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x278000, 0x2787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x278832, 0x278833) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x278880, 0x278881) AM_READ(gakusai_input_r ) // Inputs AM_RANGE(0x278882, 0x278883) AM_READ(input_port_5_word_r ) // - AM_RANGE(0x27880e, 0x27880f) AM_READ(MRA16_RAM ) // Screen Control + AM_RANGE(0x27880e, 0x27880f) AM_READ(SMH_RAM ) // Screen Control AM_RANGE(0x700000, 0x700001) AM_READ(OKIM6295_status_0_lsb_r ) // Sound AM_RANGE(0xc00000, 0xc00001) AM_READ(gakusai_eeprom_r ) // EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( gakusai_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x200000, 0x21ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x220000, 0x23ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x240000, 0x25ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x270000, 0x273fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x274000, 0x274fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x278000, 0x2787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0x27880e, 0x27880f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x278810, 0x27881f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_levels ) // IRQ Levels - AM_RANGE(0x278820, 0x27882f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_vectors ) // IRQ Vectors - AM_RANGE(0x278830, 0x278831) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x274000, 0x274fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x278000, 0x2787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x27880e, 0x27880f) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x278810, 0x27881f) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_levels ) // IRQ Levels + AM_RANGE(0x278820, 0x27882f) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_vectors ) // IRQ Vectors + AM_RANGE(0x278830, 0x278831) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x278832, 0x278833) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge AM_RANGE(0x278836, 0x278837) AM_WRITE(watchdog_reset16_w ) // Watchdog AM_RANGE(0x278840, 0x27884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x278860, 0x27886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x278850, 0x27885b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - AM_RANGE(0x278870, 0x278871) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x278888, 0x278889) AM_WRITE(MWA16_RAM) AM_BASE(&gakusai_input_sel ) // Inputs - AM_RANGE(0x279700, 0x279713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP ) // ? 5 + AM_RANGE(0x278850, 0x27885b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs + AM_RANGE(0x278870, 0x278871) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x278888, 0x278889) AM_WRITE(SMH_RAM) AM_BASE(&gakusai_input_sel ) // Inputs + AM_RANGE(0x279700, 0x279713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP ) // ? 5 AM_RANGE(0x500000, 0x500001) AM_WRITE(gakusai_oki_bank_lo_w ) // Sound AM_RANGE(0x600000, 0x600001) AM_WRITE(YM2413_register_port_0_lsb_w ) AM_RANGE(0x600002, 0x600003) AM_WRITE(YM2413_data_port_0_lsb_w ) @@ -1497,47 +1497,47 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( gakusai2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x600000, 0x61ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x620000, 0x63ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x640000, 0x65ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x600000, 0x61ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x620000, 0x63ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x640000, 0x65ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x660000, 0x66ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x670000, 0x673fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x674000, 0x674fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x675000, 0x675fff) AM_READ(MRA16_RAM ) // Sprites? - AM_RANGE(0x678000, 0x6787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x670000, 0x673fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x674000, 0x674fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x675000, 0x675fff) AM_READ(SMH_RAM ) // Sprites? + AM_RANGE(0x678000, 0x6787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x678832, 0x678833) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x678880, 0x678881) AM_READ(gakusai_input_r ) // Inputs AM_RANGE(0x678882, 0x678883) AM_READ(input_port_5_word_r ) // - AM_RANGE(0x67880e, 0x67880f) AM_READ(MRA16_RAM ) // Screen Control + AM_RANGE(0x67880e, 0x67880f) AM_READ(SMH_RAM ) // Screen Control AM_RANGE(0xb00000, 0xb00001) AM_READ(OKIM6295_status_0_lsb_r ) // Sound AM_RANGE(0xe00000, 0xe00001) AM_READ(gakusai_eeprom_r ) // EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( gakusai2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x600000, 0x61ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x620000, 0x63ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x640000, 0x65ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x670000, 0x673fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x674000, 0x674fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x675000, 0x675fff) AM_WRITE(MWA16_RAM ) // Sprites? - AM_RANGE(0x678000, 0x6787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0x67880e, 0x67880f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x678810, 0x67881f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_levels ) // IRQ Levels - AM_RANGE(0x678820, 0x67882f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_vectors ) // IRQ Vectors - AM_RANGE(0x678830, 0x678831) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x674000, 0x674fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x675000, 0x675fff) AM_WRITE(SMH_RAM ) // Sprites? + AM_RANGE(0x678000, 0x6787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x67880e, 0x67880f) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x678810, 0x67881f) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_levels ) // IRQ Levels + AM_RANGE(0x678820, 0x67882f) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_vectors ) // IRQ Vectors + AM_RANGE(0x678830, 0x678831) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x678832, 0x678833) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge AM_RANGE(0x678836, 0x678837) AM_WRITE(watchdog_reset16_w ) // Watchdog AM_RANGE(0x678840, 0x67884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x678860, 0x67886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x678850, 0x67885b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - AM_RANGE(0x678870, 0x678871) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x678888, 0x678889) AM_WRITE(MWA16_RAM) AM_BASE(&gakusai_input_sel ) // Inputs - AM_RANGE(0x679700, 0x679713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_NOP ) // ? 5 + AM_RANGE(0x678850, 0x67885b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs + AM_RANGE(0x678870, 0x678871) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x678888, 0x678889) AM_WRITE(SMH_RAM) AM_BASE(&gakusai_input_sel ) // Inputs + AM_RANGE(0x679700, 0x679713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP ) // ? 5 AM_RANGE(0x900000, 0x900001) AM_WRITE(gakusai_oki_bank_lo_w ) // Sound AM_RANGE(0xa00000, 0xa00001) AM_WRITE(gakusai_oki_bank_hi_w ) AM_RANGE(0xb00000, 0xb00001) AM_WRITE(OKIM6295_data_0_lsb_w ) @@ -1583,45 +1583,45 @@ static WRITE16_HANDLER( dokyusp_eeprom_reset_w ) } static ADDRESS_MAP_START( dokyusp_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x200000, 0x21ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x220000, 0x23ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x240000, 0x25ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x200000, 0x21ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x220000, 0x23ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x240000, 0x25ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x260000, 0x26ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x270000, 0x273fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x274000, 0x274fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x278000, 0x2787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x270000, 0x273fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x274000, 0x274fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x278000, 0x2787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x278832, 0x278833) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x278880, 0x278881) AM_READ(gakusai_input_r ) // Inputs AM_RANGE(0x278882, 0x278883) AM_READ(input_port_5_word_r ) // - AM_RANGE(0x27880e, 0x27880f) AM_READ(MRA16_RAM ) // Screen Control + AM_RANGE(0x27880e, 0x27880f) AM_READ(SMH_RAM ) // Screen Control AM_RANGE(0x700000, 0x700001) AM_READ(OKIM6295_status_0_lsb_r ) // Sound AM_RANGE(0xd00000, 0xd00001) AM_READ(dokyusp_eeprom_r ) // EEPROM ADDRESS_MAP_END static ADDRESS_MAP_START( dokyusp_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x200000, 0x21ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x220000, 0x23ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x240000, 0x25ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x270000, 0x273fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x274000, 0x274fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x278000, 0x2787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0x27880e, 0x27880f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x278810, 0x27881f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_levels ) // IRQ Levels - AM_RANGE(0x278820, 0x27882f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_vectors ) // IRQ Vectors - AM_RANGE(0x278830, 0x278831) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x274000, 0x274fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x278000, 0x2787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x27880e, 0x27880f) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x278810, 0x27881f) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_levels ) // IRQ Levels + AM_RANGE(0x278820, 0x27882f) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_vectors ) // IRQ Vectors + AM_RANGE(0x278830, 0x278831) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x278832, 0x278833) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge AM_RANGE(0x278836, 0x278837) AM_WRITE(watchdog_reset16_w ) // Watchdog AM_RANGE(0x278840, 0x27884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x278860, 0x27886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x278850, 0x27885b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - AM_RANGE(0x278870, 0x278871) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x278888, 0x278889) AM_WRITE(MWA16_RAM) AM_BASE(&gakusai_input_sel ) // Inputs - AM_RANGE(0x279700, 0x279713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP ) // ? 5 + AM_RANGE(0x278850, 0x27885b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs + AM_RANGE(0x278870, 0x278871) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x278888, 0x278889) AM_WRITE(SMH_RAM) AM_BASE(&gakusai_input_sel ) // Inputs + AM_RANGE(0x279700, 0x279713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP ) // ? 5 AM_RANGE(0x500000, 0x500001) AM_WRITE(gakusai_oki_bank_lo_w ) // Sound AM_RANGE(0x600000, 0x600001) AM_WRITE(YM2413_register_port_0_lsb_w ) AM_RANGE(0x600002, 0x600003) AM_WRITE(YM2413_data_port_0_lsb_w ) @@ -1636,15 +1636,15 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( dokyusei_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x400000, 0x41ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x420000, 0x43ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x440000, 0x45ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x400000, 0x41ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x420000, 0x43ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x440000, 0x45ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x470000, 0x473fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x474000, 0x474fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x478000, 0x4787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x470000, 0x473fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x474000, 0x474fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x478000, 0x4787ff) AM_READ(SMH_RAM ) // Tiles Set // AM_RANGE(0x478832, 0x478833) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x478880, 0x478881) AM_READ(gakusai_input_r ) // Inputs AM_RANGE(0x478882, 0x478883) AM_READ(input_port_5_word_r ) // @@ -1654,29 +1654,29 @@ static ADDRESS_MAP_START( dokyusei_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dokyusei_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x400000, 0x41ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x420000, 0x43ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x440000, 0x45ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 - AM_RANGE(0x460000, 0x46ffff) AM_WRITE(MWA16_NOP ) // DSW Selection + AM_RANGE(0x460000, 0x46ffff) AM_WRITE(SMH_NOP ) // DSW Selection AM_RANGE(0x470000, 0x473fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x474000, 0x474fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x478000, 0x4787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0x47880e, 0x47880f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x478810, 0x47881f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_levels ) // IRQ Levels - AM_RANGE(0x478820, 0x47882f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_vectors ) // IRQ Vectors - AM_RANGE(0x478830, 0x478831) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x474000, 0x474fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x478000, 0x4787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x47880e, 0x47880f) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x478810, 0x47881f) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_levels ) // IRQ Levels + AM_RANGE(0x478820, 0x47882f) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_vectors ) // IRQ Vectors + AM_RANGE(0x478830, 0x478831) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x478832, 0x478833) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x478836, 0x478837) AM_WRITE(MWA16_NOP ) // ? watchdog ? + AM_RANGE(0x478836, 0x478837) AM_WRITE(SMH_NOP ) // ? watchdog ? AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x478860, 0x47886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x478850, 0x47885b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - AM_RANGE(0x478870, 0x478871) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x479700, 0x479713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers - AM_RANGE(0x478888, 0x478889) AM_WRITE(MWA16_RAM) AM_BASE(&gakusai_input_sel ) // Inputs + AM_RANGE(0x478850, 0x47885b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs + AM_RANGE(0x478870, 0x478871) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x479700, 0x479713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x478888, 0x478889) AM_WRITE(SMH_RAM) AM_BASE(&gakusai_input_sel ) // Inputs AM_RANGE(0x800000, 0x800001) AM_WRITE(gakusai_oki_bank_hi_w ) // Samples Bank? - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_NOP ) // ? 4 + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_NOP ) // ? 4 AM_RANGE(0xa00000, 0xa00001) AM_WRITE(gakusai_oki_bank_lo_w ) // Samples Bank AM_RANGE(0xc00000, 0xc00001) AM_WRITE(YM2413_register_port_0_lsb_w ) // Sound AM_RANGE(0xc00002, 0xc00003) AM_WRITE(YM2413_data_port_0_lsb_w ) // @@ -1689,18 +1689,18 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( pangpoms_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xc00000, 0xc0ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x400000, 0x41ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x420000, 0x43ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x440000, 0x45ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x400000, 0x41ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x420000, 0x43ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x440000, 0x45ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x470000, 0x473fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x474000, 0x474fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x478000, 0x4787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x470000, 0x473fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x474000, 0x474fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x478000, 0x4787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x4788a2, 0x4788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x800000, 0x800001) AM_READ(metro_soundstatus_r ) // From Sound CPU - AM_RANGE(0x800002, 0x800003) AM_READ(MRA16_NOP ) // + AM_RANGE(0x800002, 0x800003) AM_READ(SMH_NOP ) // AM_RANGE(0x800004, 0x800005) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x800006, 0x800007) AM_READ(input_port_1_word_r ) // AM_RANGE(0x800008, 0x800009) AM_READ(input_port_2_word_r ) // @@ -1710,25 +1710,25 @@ static ADDRESS_MAP_START( pangpoms_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( pangpoms_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x400000, 0x41ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x420000, 0x43ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x440000, 0x45ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x470000, 0x473fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x474000, 0x474fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x478000, 0x4787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0x478800, 0x478813) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x474000, 0x474fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x478000, 0x4787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x478800, 0x478813) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x478860, 0x47886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x478870, 0x47887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - AM_RANGE(0x478880, 0x478881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0x478890, 0x478891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x478870, 0x47887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs + AM_RANGE(0x478880, 0x478881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0x478890, 0x478891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x4788a2, 0x4788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x4788a4, 0x4788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x4788a4, 0x4788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x4788a8, 0x4788a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0x4788aa, 0x4788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x4788ac, 0x4788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x4788aa, 0x4788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x4788ac, 0x4788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control AM_RANGE(0x800000, 0x800001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0x800002, 0x800003) AM_WRITE(metro_coin_lockout_1word_w ) // Coin Lockout ADDRESS_MAP_END @@ -1739,15 +1739,15 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( poitto_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0xc00000, 0xc1ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0xc20000, 0xc3ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0xc40000, 0xc5ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0xc00000, 0xc1ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0xc20000, 0xc3ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0xc40000, 0xc5ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0xc60000, 0xc6ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0xc70000, 0xc73fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xc74000, 0xc74fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xc78000, 0xc787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0xc70000, 0xc73fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xc74000, 0xc74fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xc78000, 0xc787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0xc788a2, 0xc788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x800000, 0x800001) AM_READ(daitorid_soundstatus_r) // Inputs AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r ) // @@ -1756,25 +1756,25 @@ static ADDRESS_MAP_START( poitto_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( poitto_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x400000, 0x40ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xc00000, 0xc1ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0xc20000, 0xc3ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0xc40000, 0xc5ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0xc70000, 0xc73fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0xc74000, 0xc74fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0xc78000, 0xc787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0xc78800, 0xc78813) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0xc74000, 0xc74fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xc78000, 0xc787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0xc78800, 0xc78813) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0xc78840, 0xc7884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0xc78860, 0xc7886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0xc78870, 0xc7887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - AM_RANGE(0xc78880, 0xc78881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0xc78890, 0xc78891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0xc78870, 0xc7887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs + AM_RANGE(0xc78880, 0xc78881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0xc78890, 0xc78891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0xc788a2, 0xc788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0xc788a4, 0xc788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0xc788a4, 0xc788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0xc788a8, 0xc788a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0xc788aa, 0xc788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0xc788ac, 0xc788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0xc788aa, 0xc788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0xc788ac, 0xc788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control AM_RANGE(0x800000, 0x800001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0x800002, 0x800009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout ADDRESS_MAP_END @@ -1785,18 +1785,18 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( skyalert_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xc00000, 0xc0ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x800000, 0x81ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x820000, 0x83ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x840000, 0x85ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x800000, 0x81ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x820000, 0x83ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x840000, 0x85ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x870000, 0x873fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x878000, 0x8787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x870000, 0x873fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x874000, 0x874fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x878000, 0x8787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x8788a2, 0x8788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x400000, 0x400001) AM_READ(metro_soundstatus_r ) // From Sound CPU - AM_RANGE(0x400002, 0x400003) AM_READ(MRA16_NOP ) // + AM_RANGE(0x400002, 0x400003) AM_READ(SMH_NOP ) // AM_RANGE(0x400004, 0x400005) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x400006, 0x400007) AM_READ(input_port_1_word_r ) // AM_RANGE(0x400008, 0x400009) AM_READ(input_port_2_word_r ) // @@ -1806,25 +1806,25 @@ static ADDRESS_MAP_START( skyalert_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( skyalert_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x800000, 0x81ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x820000, 0x83ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x840000, 0x85ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x870000, 0x873fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x874000, 0x874fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x878000, 0x8787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0x878800, 0x878813) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x874000, 0x874fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x878000, 0x8787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x878800, 0x878813) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x878870, 0x87887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll - AM_RANGE(0x878880, 0x878881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0x878890, 0x878891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x878870, 0x87887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll + AM_RANGE(0x878880, 0x878881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0x878890, 0x878891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x8788a2, 0x8788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x8788a4, 0x8788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x8788a8, 0x8788a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x8788aa, 0x8788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x8788ac, 0x8788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control AM_RANGE(0x400000, 0x400001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0x400002, 0x400003) AM_WRITE(metro_coin_lockout_1word_w ) // Coin Lockout ADDRESS_MAP_END @@ -1835,15 +1835,15 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( pururun_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x800000, 0x80ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0xc00000, 0xc1ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0xc20000, 0xc3ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0xc40000, 0xc5ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x800000, 0x80ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0xc00000, 0xc1ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0xc20000, 0xc3ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0xc40000, 0xc5ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0xc60000, 0xc6ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0xc70000, 0xc73fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xc74000, 0xc74fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xc78000, 0xc787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0xc70000, 0xc73fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xc74000, 0xc74fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xc78000, 0xc787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0xc788a2, 0xc788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x400000, 0x400001) AM_READ(daitorid_soundstatus_r) // Inputs AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // @@ -1852,25 +1852,25 @@ static ADDRESS_MAP_START( pururun_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( pururun_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x800000, 0x80ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x800000, 0x80ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xc00000, 0xc1ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0xc20000, 0xc3ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0xc40000, 0xc5ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0xc70000, 0xc73fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0xc74000, 0xc74fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0xc78000, 0xc787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0xc74000, 0xc74fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xc78000, 0xc787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set AM_RANGE(0xc78840, 0xc7884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0xc78860, 0xc7886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0xc78870, 0xc7887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - AM_RANGE(0xc78880, 0xc78881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0xc78890, 0xc78891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0xc78870, 0xc7887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs + AM_RANGE(0xc78880, 0xc78881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0xc78890, 0xc78891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0xc788a2, 0xc788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0xc788a4, 0xc788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0xc788a4, 0xc788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0xc788a8, 0xc788a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0xc788aa, 0xc788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0xc788ac, 0xc788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0xc79700, 0xc79713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0xc788aa, 0xc788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0xc788ac, 0xc788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0xc79700, 0xc79713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0x400000, 0x400001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0x400002, 0x400009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout ADDRESS_MAP_END @@ -1881,15 +1881,15 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( toride2g_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x400000, 0x4cffff) AM_READ(MRA16_RAM ) // RAM (4xc000-4xffff mirrored?) - AM_RANGE(0xc00000, 0xc1ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0xc20000, 0xc3ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0xc40000, 0xc5ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x4cffff) AM_READ(SMH_RAM ) // RAM (4xc000-4xffff mirrored?) + AM_RANGE(0xc00000, 0xc1ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0xc20000, 0xc3ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0xc40000, 0xc5ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0xc60000, 0xc6ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0xc70000, 0xc73fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xc74000, 0xc74fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xc78000, 0xc787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0xc70000, 0xc73fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xc74000, 0xc74fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xc78000, 0xc787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0xc788a2, 0xc788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x800000, 0x800001) AM_READ(daitorid_soundstatus_r) // Inputs AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r ) // @@ -1898,25 +1898,25 @@ static ADDRESS_MAP_START( toride2g_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( toride2g_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x400000, 0x4cffff) AM_WRITE(MWA16_RAM ) // RAM (4xc000-4xffff mirrored?) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x400000, 0x4cffff) AM_WRITE(SMH_RAM ) // RAM (4xc000-4xffff mirrored?) AM_RANGE(0xc00000, 0xc1ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0xc20000, 0xc3ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0xc40000, 0xc5ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0xc70000, 0xc73fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0xc74000, 0xc74fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0xc78000, 0xc787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0xc74000, 0xc74fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xc78000, 0xc787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set AM_RANGE(0xc78840, 0xc7884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter AM_RANGE(0xc78860, 0xc7886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0xc78870, 0xc7887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - AM_RANGE(0xc78880, 0xc78881) AM_WRITE(MWA16_NOP ) // ? increasing - AM_RANGE(0xc78890, 0xc78891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0xc78870, 0xc7887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs + AM_RANGE(0xc78880, 0xc78881) AM_WRITE(SMH_NOP ) // ? increasing + AM_RANGE(0xc78890, 0xc78891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0xc788a2, 0xc788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0xc788a4, 0xc788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0xc788a4, 0xc788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0xc788a8, 0xc788a9) AM_WRITE(metro_soundlatch_w ) // To Sound CPU - AM_RANGE(0xc788aa, 0xc788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0xc788ac, 0xc788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0xc79700, 0xc79713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0xc788aa, 0xc788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0xc788ac, 0xc788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0xc79700, 0xc79713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0x800000, 0x800001) AM_WRITE(metro_soundstatus_w ) // To Sound CPU AM_RANGE(0x800002, 0x800009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout ADDRESS_MAP_END @@ -1954,15 +1954,15 @@ static const struct YM2610interface blzntrnd_ym2610_interface = }; static ADDRESS_MAP_START( blzntrnd_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( blzntrnd_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( blzntrnd_sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -1975,7 +1975,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( blzntrnd_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(blzntrnd_sh_bankswitch_w) - AM_RANGE(0x40, 0x40) AM_WRITE(MWA8_NOP) + AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP) AM_RANGE(0x80, 0x80) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0x81, 0x81) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0x82, 0x82) AM_WRITE(YM2610_control_port_0_B_w) @@ -1983,48 +1983,48 @@ static ADDRESS_MAP_START( blzntrnd_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( blzntrnd_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM -// AM_RANGE(0x300000, 0x300001) AM_READ(MRA16_NOP ) // Sound - AM_RANGE(0x200000, 0x21ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x220000, 0x23ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x240000, 0x25ffff) AM_READ(MRA16_RAM ) // Layer 2 + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM +// AM_RANGE(0x300000, 0x300001) AM_READ(SMH_NOP ) // Sound + AM_RANGE(0x200000, 0x21ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x220000, 0x23ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x240000, 0x25ffff) AM_READ(SMH_RAM ) // Layer 2 AM_RANGE(0x260000, 0x26ffff) AM_READ(metro_bankedrom_r ) // Banked ROM - AM_RANGE(0x270000, 0x273fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x274000, 0x274fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x278000, 0x2787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x270000, 0x273fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x274000, 0x274fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x278000, 0x2787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x2788a2, 0x2788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0xe00000, 0xe00001) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xe00002, 0xe00003) AM_READ(input_port_1_word_r ) // AM_RANGE(0xe00004, 0xe00005) AM_READ(input_port_2_word_r ) // AM_RANGE(0xe00006, 0xe00007) AM_READ(input_port_3_word_r ) // AM_RANGE(0xe00008, 0xe00009) AM_READ(input_port_4_word_r ) // - AM_RANGE(0x400000, 0x43ffff) AM_READ(MRA16_RAM ) // 053936 + AM_RANGE(0x400000, 0x43ffff) AM_READ(SMH_RAM ) // 053936 ADDRESS_MAP_END static ADDRESS_MAP_START( blzntrnd_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x21ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x220000, 0x23ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x240000, 0x25ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 - AM_RANGE(0x260000, 0x26ffff) AM_WRITE(MWA16_NOP ) // ?????? + AM_RANGE(0x260000, 0x26ffff) AM_WRITE(SMH_NOP ) // ?????? AM_RANGE(0x270000, 0x273fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x274000, 0x274fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x278000, 0x2787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x274000, 0x274fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x278000, 0x2787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set AM_RANGE(0x278860, 0x27886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x278870, 0x27887b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll - AM_RANGE(0x278890, 0x278891) AM_WRITE(MWA16_NOP ) // ? increasing + AM_RANGE(0x278870, 0x27887b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll + AM_RANGE(0x278890, 0x278891) AM_WRITE(SMH_NOP ) // ? increasing AM_RANGE(0x2788a2, 0x2788a3) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge - AM_RANGE(0x2788a4, 0x2788a5) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable - AM_RANGE(0x2788aa, 0x2788ab) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank - AM_RANGE(0x2788ac, 0x2788ad) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x279700, 0x279713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x2788a4, 0x2788a5) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x2788aa, 0x2788ab) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x2788ac, 0x2788ad) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x279700, 0x279713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0x400000, 0x43ffff) AM_WRITE(metro_K053936_w) AM_BASE(&metro_K053936_ram ) // 053936 - AM_RANGE(0x500000, 0x500fff) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_linectrl) // 053936 line control - AM_RANGE(0x600000, 0x60001f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl ) // 053936 control - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x500000, 0x500fff) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_linectrl) // 053936 line control + AM_RANGE(0x600000, 0x60001f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl ) // 053936 control + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP) AM_RANGE(0xe00002, 0xe00003) AM_WRITE(blzntrnd_sound_w) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -2039,14 +2039,14 @@ static WRITE16_HANDLER( mouja_sound_rombank_w ) } static ADDRESS_MAP_START( mouja_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x400000, 0x41ffff) AM_READ(MRA16_RAM ) // Layer 0 - AM_RANGE(0x420000, 0x43ffff) AM_READ(MRA16_RAM ) // Layer 1 - AM_RANGE(0x440000, 0x45ffff) AM_READ(MRA16_RAM ) // Layer 2 - AM_RANGE(0x470000, 0x473fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x474000, 0x474fff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x478000, 0x4787ff) AM_READ(MRA16_RAM ) // Tiles Set + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x400000, 0x41ffff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x420000, 0x43ffff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x440000, 0x45ffff) AM_READ(SMH_RAM ) // Layer 2 + AM_RANGE(0x470000, 0x473fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x474000, 0x474fff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x478000, 0x4787ff) AM_READ(SMH_RAM ) // Tiles Set AM_RANGE(0x478832, 0x478833) AM_READ(metro_irq_cause_r ) // IRQ Cause AM_RANGE(0x478880, 0x478881) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0x478882, 0x478883) AM_READ(input_port_1_word_r ) // @@ -2059,25 +2059,25 @@ static ADDRESS_MAP_START( mouja_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mouja_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x400000, 0x41ffff) AM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0 ) // Layer 0 AM_RANGE(0x420000, 0x43ffff) AM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1 ) // Layer 1 AM_RANGE(0x440000, 0x45ffff) AM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2 ) // Layer 2 AM_RANGE(0x470000, 0x473fff) AM_WRITE(metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x474000, 0x474fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0x478000, 0x4787ff) AM_WRITE(MWA16_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE(0x47880e, 0x47880f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_screenctrl ) // Screen Control - AM_RANGE(0x478810, 0x47881f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_levels ) // IRQ Levels - AM_RANGE(0x478820, 0x47882f) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_vectors ) // IRQ Vectors - AM_RANGE(0x478830, 0x478831) AM_WRITE(MWA16_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable + AM_RANGE(0x474000, 0x474fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x478000, 0x4787ff) AM_WRITE(SMH_RAM) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE(0x47880e, 0x47880f) AM_WRITE(SMH_RAM) AM_BASE(&metro_screenctrl ) // Screen Control + AM_RANGE(0x478810, 0x47881f) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_levels ) // IRQ Levels + AM_RANGE(0x478820, 0x47882f) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_vectors ) // IRQ Vectors + AM_RANGE(0x478830, 0x478831) AM_WRITE(SMH_RAM) AM_BASE(&metro_irq_enable ) // IRQ Enable AM_RANGE(0x478832, 0x478833) AM_WRITE(metro_irq_cause_w ) // IRQ Acknowledge AM_RANGE(0x478834, 0x478835) AM_WRITE(mouja_irq_timer_ctrl_w ) // IRQ set timer count AM_RANGE(0x478836, 0x478837) AM_WRITE(watchdog_reset16_w ) // Watchdog AM_RANGE(0x478860, 0x47886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window ) // Tilemap Window - AM_RANGE(0x478850, 0x47885b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_scroll ) // Scroll Regs - AM_RANGE(0x478888, 0x478889) AM_WRITE(MWA16_NOP) // ?? - AM_RANGE(0x479700, 0x479713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x478850, 0x47885b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll ) // Scroll Regs + AM_RANGE(0x478888, 0x478889) AM_WRITE(SMH_NOP) // ?? + AM_RANGE(0x479700, 0x479713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0xc00000, 0xc00001) AM_WRITE(YM2413_register_port_0_lsb_w ) AM_RANGE(0xc00002, 0xc00003) AM_WRITE(YM2413_data_port_0_lsb_w ) AM_RANGE(0x800000, 0x800001) AM_WRITE(mouja_sound_rombank_w ) @@ -2085,7 +2085,7 @@ static ADDRESS_MAP_START( mouja_writemem, ADDRESS_SPACE_PROGRAM, 16 ) #if 0 AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs ) // Tiles Blitter - AM_RANGE(0x47883a, 0x47883b) AM_WRITE(MWA16_RAM) AM_BASE(&metro_rombank ) // Rom Bank + AM_RANGE(0x47883a, 0x47883b) AM_WRITE(SMH_RAM) AM_BASE(&metro_rombank ) // Rom Bank AM_RANGE(0x800002, 0x800009) AM_WRITE(metro_coin_lockout_4words_w ) // Coin Lockout #endif ADDRESS_MAP_END @@ -2116,29 +2116,29 @@ static ADDRESS_MAP_START( puzzlet_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x580000, 0x580001 ) AM_WRITE( YM2413_register_port_0_msb_w ) AM_RANGE( 0x580002, 0x580003 ) AM_WRITE( YM2413_data_port_0_msb_w ) - AM_RANGE( 0x700000, 0x71ffff ) AM_READWRITE( MRA16_RAM, metro_vram_0_w ) AM_BASE( &metro_vram_0 ) // Layer 0 - AM_RANGE( 0x720000, 0x73ffff ) AM_READWRITE( MRA16_RAM, metro_vram_1_w ) AM_BASE( &metro_vram_1 ) // Layer 1 - AM_RANGE( 0x740000, 0x75ffff ) AM_READWRITE( MRA16_RAM, metro_vram_2_w ) AM_BASE( &metro_vram_2 ) // Layer 2 + AM_RANGE( 0x700000, 0x71ffff ) AM_READWRITE( SMH_RAM, metro_vram_0_w ) AM_BASE( &metro_vram_0 ) // Layer 0 + AM_RANGE( 0x720000, 0x73ffff ) AM_READWRITE( SMH_RAM, metro_vram_1_w ) AM_BASE( &metro_vram_1 ) // Layer 1 + AM_RANGE( 0x740000, 0x75ffff ) AM_READWRITE( SMH_RAM, metro_vram_2_w ) AM_BASE( &metro_vram_2 ) // Layer 2 AM_RANGE( 0x774000, 0x774fff ) AM_RAM AM_BASE( &spriteram16 ) AM_SIZE( &spriteram_size ) // Sprites AM_RANGE( 0x760000, 0x76ffff ) AM_READ( metro_bankedrom_r ) // Banked ROM // AM_RANGE( 0x772000, 0x773fff ) AM_RAM - AM_RANGE( 0x770000, 0x773fff ) AM_READWRITE( MRA16_RAM, metro_paletteram_w ) AM_BASE( &paletteram16 ) // Palette + AM_RANGE( 0x770000, 0x773fff ) AM_READWRITE( SMH_RAM, metro_paletteram_w ) AM_BASE( &paletteram16 ) // Palette AM_RANGE( 0x775000, 0x777fff ) AM_RAM - AM_RANGE( 0x778000, 0x7787ff ) AM_READWRITE( MRA16_RAM, MWA16_RAM ) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set - AM_RANGE( 0x778800, 0x778813 ) AM_WRITE( MWA16_RAM ) AM_BASE( &metro_videoregs ) // Video Registers + AM_RANGE( 0x778000, 0x7787ff ) AM_READWRITE( SMH_RAM, SMH_RAM ) AM_BASE(&metro_tiletable) AM_SIZE(&metro_tiletable_size ) // Tiles Set + AM_RANGE( 0x778800, 0x778813 ) AM_WRITE( SMH_RAM ) AM_BASE( &metro_videoregs ) // Video Registers AM_RANGE( 0x778840, 0x77884f ) AM_WRITE( metro_blitter_w ) AM_BASE( &metro_blitter_regs ) // Tiles Blitter AM_RANGE( 0x778860, 0x77886b ) AM_WRITE( metro_window_w ) AM_BASE( &metro_window ) // Tilemap Window - AM_RANGE( 0x778870, 0x77887b ) AM_WRITE( MWA16_RAM ) AM_BASE( &metro_scroll ) // Scroll - AM_RANGE( 0x778890, 0x778891 ) AM_WRITE( MWA16_NOP ) // ? increasing + AM_RANGE( 0x778870, 0x77887b ) AM_WRITE( SMH_RAM ) AM_BASE( &metro_scroll ) // Scroll + AM_RANGE( 0x778890, 0x778891 ) AM_WRITE( SMH_NOP ) // ? increasing AM_RANGE( 0x7788a2, 0x7788a3 ) AM_WRITE( metro_irq_cause_w ) // IRQ Cause AM_RANGE( 0x7788a4, 0x7788a5 ) AM_WRITE( puzzlet_irq_enable_w ) AM_BASE( &metro_irq_enable ) // IRQ Enable - AM_RANGE( 0x7788aa, 0x7788ab ) AM_WRITE( MWA16_RAM ) AM_BASE( &metro_rombank ) // Rom Bank - AM_RANGE( 0x7788ac, 0x7788ad ) AM_WRITE( MWA16_RAM ) AM_BASE( &metro_screenctrl ) // Screen Control + AM_RANGE( 0x7788aa, 0x7788ab ) AM_WRITE( SMH_RAM ) AM_BASE( &metro_rombank ) // Rom Bank + AM_RANGE( 0x7788ac, 0x7788ad ) AM_WRITE( SMH_RAM ) AM_BASE( &metro_screenctrl ) // Screen Control AM_RANGE( 0x7f2000, 0x7f3fff ) AM_RAM diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c index de9bc169e9b..6c79340595d 100644 --- a/src/mame/drivers/mexico86.c +++ b/src/mame/drivers/mexico86.c @@ -91,40 +91,40 @@ static WRITE8_HANDLER( shared_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) /* banked roms */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) /* banked roms */ AM_RANGE(0xc000, 0xe7ff) AM_READ(shared_r) /* shared with sound cpu */ - AM_RANGE(0xe800, 0xe8ff) AM_READ(MRA8_RAM) /* protection ram */ - AM_RANGE(0xe900, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0xe800, 0xe8ff) AM_READ(SMH_RAM) /* protection ram */ + AM_RANGE(0xe900, 0xefff) AM_READ(SMH_RAM) AM_RANGE(0xf010, 0xf010) AM_READ(input_port_5_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) /* communication ram - to connect 4 players's subboard */ + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) /* communication ram - to connect 4 players's subboard */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xe7ff) AM_WRITE(shared_w) AM_BASE(&shared) /* shared with sound cpu */ - AM_RANGE(0xc000, 0xd4ff) AM_WRITE(MWA8_RAM) AM_BASE(&mexico86_videoram) //AT: corrected size - AM_RANGE(0xd500, 0xd7ff) AM_WRITE(MWA8_RAM) AM_BASE(&mexico86_objectram) AM_SIZE(&mexico86_objectram_size) - AM_RANGE(0xe800, 0xe8ff) AM_WRITE(MWA8_RAM) AM_BASE(&mexico86_protection_ram) /* shared with mcu */ - AM_RANGE(0xe900, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc000, 0xd4ff) AM_WRITE(SMH_RAM) AM_BASE(&mexico86_videoram) //AT: corrected size + AM_RANGE(0xd500, 0xd7ff) AM_WRITE(SMH_RAM) AM_BASE(&mexico86_objectram) AM_SIZE(&mexico86_objectram_size) + AM_RANGE(0xe800, 0xe8ff) AM_WRITE(SMH_RAM) AM_BASE(&mexico86_protection_ram) /* shared with mcu */ + AM_RANGE(0xe900, 0xefff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(mexico86_bankswitch_w) /* program and gfx ROM banks */ AM_RANGE(0xf008, 0xf008) AM_WRITE(mexico86_f008_w) /* cpu reset lines + other unknown stuff */ - AM_RANGE(0xf018, 0xf018) AM_WRITE(MWA8_NOP) // watchdog_reset_w }, - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) /* communication ram */ + AM_RANGE(0xf018, 0xf018) AM_WRITE(SMH_NOP) // watchdog_reset_w }, + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) /* communication ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0xa7ff) AM_READ(shared_r) - AM_RANGE(0xa800, 0xbfff) AM_READ(MRA8_RAM) + AM_RANGE(0xa800, 0xbfff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_READ(kiki_2203_r) //AT AM_RANGE(0xc001, 0xc001) AM_READ(YM2203_read_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0xa7ff) AM_WRITE(shared_w) - AM_RANGE(0xa800, 0xbfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xa800, 0xbfff) AM_WRITE(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2203_write_port_0_w) ADDRESS_MAP_END @@ -134,8 +134,8 @@ static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(mexico86_68705_portA_r) AM_RANGE(0x0001, 0x0001) AM_READ(mexico86_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(input_port_0_r) /* COIN */ - AM_RANGE(0x0010, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -144,10 +144,10 @@ static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0001, 0x0001) AM_WRITE(mexico86_68705_portB_w) AM_RANGE(0x0004, 0x0004) AM_WRITE(mexico86_68705_ddrA_w) AM_RANGE(0x0005, 0x0005) AM_WRITE(mexico86_68705_ddrB_w) - AM_RANGE(0x000a, 0x000a) AM_WRITE(MWA8_NOP) /* looks like a bug in the code, writes to */ + AM_RANGE(0x000a, 0x000a) AM_WRITE(SMH_NOP) /* looks like a bug in the code, writes to */ /* 0x0a (=10dec) instead of 0x10 */ - AM_RANGE(0x0010, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sub_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 87e4f51664b..dcde12497d0 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -188,19 +188,19 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0061, 0x0061) AM_READ(mgolf_misc_r) AM_RANGE(0x0080, 0x00ff) AM_READ(mgolf_wram_r) AM_RANGE(0x0180, 0x01ff) AM_READ(mgolf_wram_r) - AM_RANGE(0x0800, 0x0bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0800, 0x0bff) AM_READ(SMH_RAM) - AM_RANGE(0x0000, 0x0009) AM_WRITE(MWA8_NOP) - AM_RANGE(0x0024, 0x0024) AM_WRITE(MWA8_NOP) - AM_RANGE(0x0028, 0x0028) AM_WRITE(MWA8_NOP) - AM_RANGE(0x0042, 0x0042) AM_WRITE(MWA8_NOP) - AM_RANGE(0x0044, 0x0044) AM_WRITE(MWA8_NOP) /* watchdog? */ - AM_RANGE(0x0046, 0x0046) AM_WRITE(MWA8_NOP) - AM_RANGE(0x0060, 0x0060) AM_WRITE(MWA8_NOP) - AM_RANGE(0x0061, 0x0061) AM_WRITE(MWA8_NOP) - AM_RANGE(0x006a, 0x006a) AM_WRITE(MWA8_NOP) - AM_RANGE(0x006c, 0x006c) AM_WRITE(MWA8_NOP) - AM_RANGE(0x006d, 0x006d) AM_WRITE(MWA8_NOP) + AM_RANGE(0x0000, 0x0009) AM_WRITE(SMH_NOP) + AM_RANGE(0x0024, 0x0024) AM_WRITE(SMH_NOP) + AM_RANGE(0x0028, 0x0028) AM_WRITE(SMH_NOP) + AM_RANGE(0x0042, 0x0042) AM_WRITE(SMH_NOP) + AM_RANGE(0x0044, 0x0044) AM_WRITE(SMH_NOP) /* watchdog? */ + AM_RANGE(0x0046, 0x0046) AM_WRITE(SMH_NOP) + AM_RANGE(0x0060, 0x0060) AM_WRITE(SMH_NOP) + AM_RANGE(0x0061, 0x0061) AM_WRITE(SMH_NOP) + AM_RANGE(0x006a, 0x006a) AM_WRITE(SMH_NOP) + AM_RANGE(0x006c, 0x006c) AM_WRITE(SMH_NOP) + AM_RANGE(0x006d, 0x006d) AM_WRITE(SMH_NOP) AM_RANGE(0x0080, 0x00ff) AM_WRITE(mgolf_wram_w) AM_RANGE(0x0180, 0x01ff) AM_WRITE(mgolf_wram_w) AM_RANGE(0x0800, 0x0bff) AM_WRITE(mgolf_vram_w) AM_BASE(&mgolf_video_ram) diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c index 23d9f208edf..13c0aabdb41 100644 --- a/src/mame/drivers/mhavoc.c +++ b/src/mame/drivers/mhavoc.c @@ -254,7 +254,7 @@ static ADDRESS_MAP_START( alpha_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x09ff) AM_RAM AM_RANGE(0x0a00, 0x0fff) AM_RAMBANK(1) AM_BASE(&mhavoc_zram1) AM_RANGE(0x1000, 0x1000) AM_READ(mhavoc_gamma_r) /* Gamma Read Port */ - AM_RANGE(0x1200, 0x1200) AM_READWRITE(mhavoc_port_0_r, MWA8_NOP) /* Alpha Input Port 0 */ + AM_RANGE(0x1200, 0x1200) AM_READWRITE(mhavoc_port_0_r, SMH_NOP) /* Alpha Input Port 0 */ AM_RANGE(0x1400, 0x141f) AM_RAM AM_BASE(&mhavoc_colorram) /* ColorRAM */ AM_RANGE(0x1600, 0x1600) AM_WRITE(mhavoc_out_0_w) /* Control Signals */ AM_RANGE(0x1640, 0x1640) AM_WRITE(avgdvg_go_w) /* Vector Generator GO */ @@ -268,7 +268,7 @@ static ADDRESS_MAP_START( alpha_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(2) /* Paged Program ROM (32K) */ AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION(REGION_CPU1, 0x4000)/* Vector Generator RAM */ AM_RANGE(0x5000, 0x7fff) AM_ROM /* Vector ROM */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* Program ROM (32K) */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* Program ROM (32K) */ ADDRESS_MAP_END @@ -290,7 +290,7 @@ static ADDRESS_MAP_START( gamma_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4800, 0x4800) AM_WRITE(mhavoc_out_1_w) /* Coin Counters */ AM_RANGE(0x5000, 0x5000) AM_WRITE(mhavoc_alpha_w) /* Alpha Comm. Write Port */ AM_RANGE(0x6000, 0x61ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* EEROM */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* Program ROM (16K) */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* Program ROM (16K) */ ADDRESS_MAP_END @@ -308,7 +308,7 @@ static ADDRESS_MAP_START( alphaone_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x09ff) AM_RAM AM_RANGE(0x0a00, 0x0fff) AM_RAMBANK(1) AM_BASE(&mhavoc_zram1) AM_RANGE(0x1020, 0x103f) AM_READWRITE(dual_pokey_r, dual_pokey_w) - AM_RANGE(0x1040, 0x1040) AM_READWRITE(alphaone_port_0_r, MWA8_NOP) /* Alpha Input Port 0 */ + AM_RANGE(0x1040, 0x1040) AM_READWRITE(alphaone_port_0_r, SMH_NOP) /* Alpha Input Port 0 */ AM_RANGE(0x1060, 0x1060) AM_READ(input_port_1_r) /* Gamma Input Port */ AM_RANGE(0x1080, 0x1080) AM_READ(input_port_2_r) /* Roller Controller Input*/ AM_RANGE(0x10a0, 0x10a0) AM_WRITE(alphaone_out_0_w) /* Control Signals */ @@ -318,7 +318,7 @@ static ADDRESS_MAP_START( alphaone_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x10b0, 0x10b0) AM_WRITE(mhavoc_alpha_irq_ack_w) /* IRQ ack */ AM_RANGE(0x10b4, 0x10b4) AM_WRITE(mhavoc_rom_banksel_w) AM_RANGE(0x10b8, 0x10b8) AM_WRITE(mhavoc_ram_banksel_w) - AM_RANGE(0x10e0, 0x10ff) AM_WRITE(MWA8_RAM) AM_BASE(&mhavoc_colorram) /* ColorRAM */ + AM_RANGE(0x10e0, 0x10ff) AM_WRITE(SMH_RAM) AM_BASE(&mhavoc_colorram) /* ColorRAM */ AM_RANGE(0x1800, 0x18ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* EEROM */ AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(2) /* Paged Program ROM (32K) */ AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION(REGION_CPU1, 0x4000) /* Vector Generator RAM */ diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c index da1f3b168b4..ab44f899e6e 100644 --- a/src/mame/drivers/micro3d.c +++ b/src/mame/drivers/micro3d.c @@ -749,7 +749,7 @@ static ADDRESS_MAP_START( hostmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x980000, 0x980001) AM_RAM /* ADC0844 */ AM_RANGE(0x9a0000, 0x9a0007) AM_READWRITE(tms_host_r, tms_host_w) /* TMS34010 Interface */ AM_RANGE(0x9c0000, 0x9c0001) AM_RAM /* ????? Write: 80, A0 and 00 (8-bit high byte) */ - AM_RANGE(0x9e0000, 0x9e00cf) AM_READWRITE(MRA16_RAM, m68901_w) AM_BASE(&m68901_base) /* 68901 Multifunction Peripheral */ + AM_RANGE(0x9e0000, 0x9e00cf) AM_READWRITE(SMH_RAM, m68901_w) AM_BASE(&m68901_base) /* 68901 Multifunction Peripheral */ AM_RANGE(0xa00000, 0xa000cf) AM_READWRITE(m68681_r, m68681_w) AM_BASE(&m68681_base) /* 68681 UART */ AM_RANGE(0xa20000, 0xa20001) AM_RAM /* XY joystick input - sign? */ AM_RANGE(0xa40002, 0xa40003) AM_RAM /* XY joystick input - actual values */ @@ -762,7 +762,7 @@ static ADDRESS_MAP_START( vgbmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00800000, 0x00bfffff) AM_RAM /* 512kB Main DRAM */ AM_RANGE(0x00c00000, 0x00c0000f) AM_READ(input_port_2_word_r) /* TI Monitor Mode switch */ AM_RANGE(0x00e00000, 0x00e0000f) AM_RAM //WRITE(mystery2_w) /* CREGCLK ??? byte write here. */ - AM_RANGE(0x02000000, 0x0200ffff) AM_READWRITE(MRA16_RAM, paletteram16_BBBBBRRRRRGGGGGG_word_w) AM_BASE(&paletteram16) // AM_RANGE(0x02010000, 0x027fffff) AM_RAM // ??????????? Mirror of VRAM??? + AM_RANGE(0x02000000, 0x0200ffff) AM_READWRITE(SMH_RAM, paletteram16_BBBBBRRRRRGGGGGG_word_w) AM_BASE(&paletteram16) // AM_RANGE(0x02010000, 0x027fffff) AM_RAM // ??????????? Mirror of VRAM??? AM_RANGE(0x02600000, 0x0260000f) AM_RAM // XFER3dk???? 16-bit write AM_RANGE(0x02c00000, 0x02c0003f) AM_READ(ti_uart_r) /* SCN UART */ AM_RANGE(0x02e00000, 0x02e0003f) AM_WRITE(ti_uart_w) diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 67764c962a3..6b45e1f7144 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -234,7 +234,7 @@ static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x9c0000, 0x9c0005) AM_WRITE( livequiz_gfxregs_w ) AM_BASE( &livequiz_gfxregs ) - AM_RANGE(0xa00000, 0xa3ffff) AM_READWRITE( MRA16_RAM, paletteram16_xrgb_word_be_w ) AM_BASE( &paletteram16 ) + AM_RANGE(0xa00000, 0xa3ffff) AM_READWRITE( SMH_RAM, paletteram16_xrgb_word_be_w ) AM_BASE( &paletteram16 ) AM_RANGE(0xa40000, 0xa7ffff) AM_RAM AM_RANGE(0xb00000, 0xb00001) AM_READ( ret_ffff ) diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c index e28cb68ab0c..894ac9e2372 100644 --- a/src/mame/drivers/midtunit.c +++ b/src/mame/drivers/midtunit.c @@ -45,7 +45,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x01400000, 0x0141ffff) AM_READWRITE(midtunit_cmos_r, midtunit_cmos_w) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x01480000, 0x014fffff) AM_WRITE(midtunit_cmos_enable_w) AM_RANGE(0x01600000, 0x0160003f) AM_READ(midtunit_input_r) - AM_RANGE(0x01800000, 0x0187ffff) AM_READWRITE(MRA16_RAM, midtunit_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x01800000, 0x0187ffff) AM_READWRITE(SMH_RAM, midtunit_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x01a80000, 0x01a800ff) AM_READWRITE(midtunit_dma_r, midtunit_dma_w) AM_RANGE(0x01b00000, 0x01b0001f) AM_WRITE(midtunit_control_w) /* AM_RANGE(0x01c00060, 0x01c0007f) AM_WRITE(midtunit_cmos_enable_w) */ diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c index 1446a842cdc..9e530bbdef9 100644 --- a/src/mame/drivers/midvunit.c +++ b/src/mame/drivers/midvunit.c @@ -501,19 +501,19 @@ static ADDRESS_MAP_START( midvunit_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x980040, 0x980040) AM_READWRITE(midvunit_page_control_r, midvunit_page_control_w) AM_RANGE(0x980080, 0x980080) AM_NOP AM_RANGE(0x980082, 0x980083) AM_READ(midvunit_dma_trigger_r) - AM_RANGE(0x990000, 0x990000) AM_READ(MRA32_NOP) // link PAL (low 4 bits must == 4) + AM_RANGE(0x990000, 0x990000) AM_READ(SMH_NOP) // link PAL (low 4 bits must == 4) AM_RANGE(0x991030, 0x991030) AM_READ(port1_r) -// AM_RANGE(0x991050, 0x991050) AM_READ(MRA32_RAM) // seems to be another port +// AM_RANGE(0x991050, 0x991050) AM_READ(SMH_RAM) // seems to be another port AM_RANGE(0x991060, 0x991060) AM_READ(port0_r) AM_RANGE(0x992000, 0x992000) AM_READ(port2_r) AM_RANGE(0x993000, 0x993000) AM_READWRITE(midvunit_adc_r, midvunit_adc_w) AM_RANGE(0x994000, 0x994000) AM_WRITE(midvunit_control_w) - AM_RANGE(0x995000, 0x995000) AM_WRITE(MWA32_NOP) // force feedback? + AM_RANGE(0x995000, 0x995000) AM_WRITE(SMH_NOP) // force feedback? AM_RANGE(0x995020, 0x995020) AM_WRITE(midvunit_cmos_protect_w) AM_RANGE(0x997000, 0x997000) AM_NOP // communications AM_RANGE(0x9a0000, 0x9a0000) AM_WRITE(midvunit_sound_w) AM_RANGE(0x9c0000, 0x9c1fff) AM_READWRITE(midvunit_cmos_r, midvunit_cmos_w) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x9e0000, 0x9e7fff) AM_READWRITE(MRA32_RAM, midvunit_paletteram_w) AM_BASE(&paletteram32) + AM_RANGE(0x9e0000, 0x9e7fff) AM_READWRITE(SMH_RAM, midvunit_paletteram_w) AM_BASE(&paletteram32) AM_RANGE(0xa00000, 0xbfffff) AM_READWRITE(midvunit_textureram_r, midvunit_textureram_w) AM_BASE(&midvunit_textureram) AM_RANGE(0xc00000, 0xffffff) AM_ROM AM_REGION(REGION_USER1, 0) ADDRESS_MAP_END @@ -538,7 +538,7 @@ static ADDRESS_MAP_START( midvplus_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x994000, 0x994000) AM_WRITE(midvunit_control_w) AM_RANGE(0x995020, 0x995020) AM_WRITE(midvunit_cmos_protect_w) AM_RANGE(0x9a0000, 0x9a0007) AM_READWRITE(midway_ide_asic_r, midway_ide_asic_w) - AM_RANGE(0x9c0000, 0x9c7fff) AM_READWRITE(MRA32_RAM, midvunit_paletteram_w) AM_BASE(&paletteram32) + AM_RANGE(0x9c0000, 0x9c7fff) AM_READWRITE(SMH_RAM, midvunit_paletteram_w) AM_BASE(&paletteram32) AM_RANGE(0x9d0000, 0x9d000f) AM_READWRITE(midvplus_misc_r, midvplus_misc_w) AM_BASE(&midvplus_misc) AM_RANGE(0xa00000, 0xbfffff) AM_READWRITE(midvunit_textureram_r, midvunit_textureram_w) AM_BASE(&midvunit_textureram) AM_RANGE(0xc00000, 0xcfffff) AM_RAM diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c index dfff6a483a5..8657f173556 100644 --- a/src/mame/drivers/midwunit.c +++ b/src/mame/drivers/midwunit.c @@ -108,7 +108,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x01600000, 0x0160001f) AM_READWRITE(midwunit_security_r, midwunit_security_w) AM_RANGE(0x01680000, 0x0168001f) AM_READWRITE(midwunit_sound_r, midwunit_sound_w) AM_RANGE(0x01800000, 0x0187ffff) AM_READWRITE(midwunit_io_r, midwunit_io_w) - AM_RANGE(0x01880000, 0x018fffff) AM_READWRITE(MRA16_RAM, midtunit_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x01880000, 0x018fffff) AM_READWRITE(SMH_RAM, midtunit_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x01a00000, 0x01a000ff) AM_MIRROR(0x00080000) AM_READWRITE(midtunit_dma_r, midtunit_dma_w) AM_RANGE(0x01b00000, 0x01b0001f) AM_READWRITE(midwunit_control_r, midwunit_control_w) AM_RANGE(0x02000000, 0x06ffffff) AM_READ(midwunit_gfxrom_r) AM_BASE((UINT16 **)&midwunit_decode_memory) diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c index 50c03d6057a..1a3593c9268 100644 --- a/src/mame/drivers/midyunit.c +++ b/src/mame/drivers/midyunit.c @@ -196,7 +196,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000000, 0x001fffff) AM_READWRITE(midyunit_vram_r, midyunit_vram_w) AM_RANGE(0x01000000, 0x010fffff) AM_RAM AM_RANGE(0x01400000, 0x0140ffff) AM_READWRITE(midyunit_cmos_r, midyunit_cmos_w) - AM_RANGE(0x01800000, 0x0181ffff) AM_READWRITE(MRA16_RAM, midyunit_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x01800000, 0x0181ffff) AM_READWRITE(SMH_RAM, midyunit_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x01a80000, 0x01a8009f) AM_MIRROR(0x00080000) AM_READWRITE(midyunit_dma_r, midyunit_dma_w) AM_RANGE(0x01c00000, 0x01c0005f) AM_READ(midyunit_input_r) AM_RANGE(0x01c00060, 0x01c0007f) AM_READWRITE(midyunit_protection_r, midyunit_cmos_enable_w) diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c index d4fe5cb3036..f652b825d90 100644 --- a/src/mame/drivers/minivadr.c +++ b/src/mame/drivers/minivadr.c @@ -50,7 +50,7 @@ static VIDEO_UPDATE( minivadr ) static ADDRESS_MAP_START( minivadr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xe008, 0xe008) AM_READWRITE(input_port_0_r, MWA8_NOP) // W - ??? + AM_RANGE(0xe008, 0xe008) AM_READWRITE(input_port_0_r, SMH_NOP) // W - ??? ADDRESS_MAP_END diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index fb92e7885e9..745111854b8 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -148,60 +148,60 @@ static READ16_HANDLER( mirage_input_r ) } static ADDRESS_MAP_START( mirage_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) - AM_RANGE(0x100000, 0x101fff) AM_READ(MRA16_RAM) - AM_RANGE(0x102000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x100000, 0x101fff) AM_READ(SMH_RAM) + AM_RANGE(0x102000, 0x103fff) AM_READ(SMH_RAM) - AM_RANGE(0x110000, 0x110bff) AM_READ(MRA16_RAM) - AM_RANGE(0x112000, 0x112bff) AM_READ(MRA16_RAM) + AM_RANGE(0x110000, 0x110bff) AM_READ(SMH_RAM) + AM_RANGE(0x112000, 0x112bff) AM_READ(SMH_RAM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) - AM_RANGE(0x130000, 0x1307ff) AM_READ(MRA16_RAM) + AM_RANGE(0x130000, 0x1307ff) AM_READ(SMH_RAM) AM_RANGE(0x140006, 0x140007) AM_READ(random_readers) - AM_RANGE(0x150006, 0x150007) AM_READ(MRA16_NOP) + AM_RANGE(0x150006, 0x150007) AM_READ(SMH_NOP) AM_RANGE(0x16c006, 0x16c007) AM_READ(mirage_input_r) AM_RANGE(0x16e002, 0x16e003) AM_READ(mirage_controls_r) - AM_RANGE(0x170000, 0x173fff) AM_READ(MRA16_RAM) + AM_RANGE(0x170000, 0x173fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( mirage_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) /* tilemaps */ AM_RANGE(0x100000, 0x101fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) // 0x100000 - 0x101fff tested AM_RANGE(0x102000, 0x103fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) // 0x102000 - 0x102fff tested /* linescroll */ - AM_RANGE(0x110000, 0x110bff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x112000, 0x112bff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x110000, 0x110bff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x112000, 0x112bff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x120000, 0x1207ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x120000, 0x1207ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0x130000, 0x1307ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x150000, 0x150001) AM_WRITE(MWA16_NOP) - AM_RANGE(0x150002, 0x150003) AM_WRITE(MWA16_NOP) + AM_RANGE(0x150000, 0x150001) AM_WRITE(SMH_NOP) + AM_RANGE(0x150002, 0x150003) AM_WRITE(SMH_NOP) - AM_RANGE(0x160000, 0x160001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x160000, 0x160001) AM_WRITE(SMH_NOP) - AM_RANGE(0x168000, 0x16800f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x168000, 0x16800f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) - AM_RANGE(0x16a000, 0x16a001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x16a000, 0x16a001) AM_WRITE(SMH_NOP) - AM_RANGE(0x16c000, 0x16c001) AM_WRITE(MWA16_NOP) - AM_RANGE(0x16c002, 0x16c003) AM_WRITE(MWA16_NOP) // input multiplex? - AM_RANGE(0x16c004, 0x16c005) AM_WRITE(MWA16_NOP) + AM_RANGE(0x16c000, 0x16c001) AM_WRITE(SMH_NOP) + AM_RANGE(0x16c002, 0x16c003) AM_WRITE(SMH_NOP) // input multiplex? + AM_RANGE(0x16c004, 0x16c005) AM_WRITE(SMH_NOP) - AM_RANGE(0x16e000, 0x16e001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x16e000, 0x16e001) AM_WRITE(SMH_NOP) - AM_RANGE(0x170000, 0x173fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x170000, 0x173fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 9aea1419c75..f227901d186 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -352,39 +352,39 @@ logerror("PC %04x: write %02x to port 01\n",activecpu_get_pc(),data); ***************************************************************************/ static ADDRESS_MAP_START( mgakuen_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xc7ff) AM_READ(mgakuen_paletteram_r) /* palette RAM */ AM_RANGE(0xc800, 0xcfff) AM_READ(pang_colorram_r) /* Attribute RAM */ AM_RANGE(0xd000, 0xdfff) AM_READ(mgakuen_videoram_r) /* char RAM */ - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) /* Work RAM */ + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) /* Work RAM */ AM_RANGE(0xf000, 0xffff) AM_READ(mgakuen_objram_r) /* OBJ RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( mgakuen_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(mgakuen_paletteram_w) AM_RANGE(0xc800, 0xcfff) AM_WRITE(pang_colorram_w) AM_BASE(&pang_colorram) AM_RANGE(0xd000, 0xdfff) AM_WRITE(mgakuen_videoram_w) AM_BASE(&pang_videoram) AM_SIZE(&pang_videoram_size) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xffff) AM_WRITE(mgakuen_objram_w) /* OBJ RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xc7ff) AM_READ(pang_paletteram_r) /* Banked palette RAM */ AM_RANGE(0xc800, 0xcfff) AM_READ(pang_colorram_r) /* Attribute RAM */ AM_RANGE(0xd000, 0xdfff) AM_READ(pang_videoram_r) /* Banked char / OBJ RAM */ - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) /* Work RAM */ + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(pang_paletteram_w) AM_RANGE(0xc800, 0xcfff) AM_WRITE(pang_colorram_w) AM_BASE(&pang_colorram) AM_RANGE(0xd000, 0xdfff) AM_WRITE(pang_videoram_w) AM_BASE(&pang_videoram) AM_SIZE(&pang_videoram_size) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) @@ -404,7 +404,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x03, 0x03) AM_WRITE(YM2413_data_port_0_w) AM_RANGE(0x04, 0x04) AM_WRITE(YM2413_register_port_0_w) AM_RANGE(0x05, 0x05) AM_WRITE(OKIM6295_data_0_w) - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP) /* watchdog? irq ack? */ + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) /* watchdog? irq ack? */ AM_RANGE(0x07, 0x07) AM_WRITE(pang_video_bank_w) /* Video RAM bank register */ AM_RANGE(0x08, 0x08) AM_WRITE(eeprom_cs_w) AM_RANGE(0x10, 0x10) AM_WRITE(eeprom_clock_w) @@ -416,11 +416,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spangb_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(MRA8_BANK1, MWA8_NOP) + AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK1, SMH_NOP) 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 */ - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) /* Work RAM */ + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) /* Work RAM */ AM_RANGE(0xe000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -432,7 +432,7 @@ static ADDRESS_MAP_START( spangb_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x03, 0x03) AM_WRITE(YM2413_data_port_0_w) AM_RANGE(0x04, 0x04) AM_WRITE(YM2413_register_port_0_w) AM_RANGE(0x05, 0x05) AM_READ(pang_port5_r) - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP) /* watchdog? irq ack? */ + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) /* watchdog? irq ack? */ AM_RANGE(0x07, 0x07) AM_WRITE(pang_video_bank_w) /* Video RAM bank register */ AM_RANGE(0x08, 0x08) AM_WRITE(eeprom_cs_w) AM_RANGE(0x10, 0x10) AM_WRITE(eeprom_clock_w) @@ -468,15 +468,15 @@ static WRITE8_HANDLER( oki_banking_w ) } static ADDRESS_MAP_START( mstworld_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( mstworld_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(oki_banking_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) ADDRESS_MAP_END @@ -506,7 +506,7 @@ static ADDRESS_MAP_START( mstworld_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(mstworld_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */ AM_RANGE(0x02, 0x02) AM_WRITE(pang_bankswitch_w) /* Code bank register */ AM_RANGE(0x03, 0x03) AM_WRITE(mstworld_sound_w) /* write to sound cpu */ - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP) /* watchdog? irq ack? */ + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) /* watchdog? irq ack? */ AM_RANGE(0x07, 0x07) AM_WRITE(mstworld_video_bank_w) /* Video RAM bank register */ ADDRESS_MAP_END diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index 90323728999..be8923e2b2f 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -155,26 +155,26 @@ static NVRAM_HANDLER( mjkjidai ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xf7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&nvram) AM_SIZE(&nvram_size) // cleared and initialized on startup if bit 6 if port 00 is 0 - AM_RANGE(0xe000, 0xe01f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) // shared with tilemap ram - AM_RANGE(0xe800, 0xe81f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) // shared with tilemap ram - AM_RANGE(0xf000, 0xf01f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_3) // shared with tilemap ram + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&nvram) AM_SIZE(&nvram_size) // cleared and initialized on startup if bit 6 if port 00 is 0 + AM_RANGE(0xe000, 0xe01f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) // shared with tilemap ram + AM_RANGE(0xe800, 0xe81f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) // shared with tilemap ram + AM_RANGE(0xf000, 0xf01f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_3) // shared with tilemap ram AM_RANGE(0xe000, 0xf7ff) AM_WRITE(mjkjidai_videoram_w) AM_BASE(&mjkjidai_videoram) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(keyboard_r) - AM_RANGE(0x01, 0x01) AM_READ(MRA8_NOP) // ??? + AM_RANGE(0x01, 0x01) AM_READ(SMH_NOP) // ??? AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r) AM_RANGE(0x11, 0x11) AM_READ(input_port_0_r) AM_RANGE(0x12, 0x12) AM_READ(input_port_1_r) diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 4e2b6036488..1ac552a0d4f 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -150,14 +150,14 @@ static READ8_HANDLER( mjsister_keys_r ) /****************************************************************************/ static ADDRESS_MAP_START( mjsister_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( mjsister_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0xffff) AM_WRITE(mjsister_videoram_w) ADDRESS_MAP_END @@ -170,7 +170,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjsister_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_WRITE(MWA8_NOP) /* HD46505? */ + AM_RANGE(0x00, 0x01) AM_WRITE(SMH_NOP) /* HD46505? */ AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x12, 0x12) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x30, 0x30) AM_WRITE(mjsister_banksel1_w) diff --git a/src/mame/drivers/mjsiyoub.c b/src/mame/drivers/mjsiyoub.c index 90f3cbfa246..bec03c95815 100644 --- a/src/mame/drivers/mjsiyoub.c +++ b/src/mame/drivers/mjsiyoub.c @@ -45,20 +45,20 @@ static VIDEO_UPDATE(mjsiyoub) } static ADDRESS_MAP_START( readmem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static INPUT_PORTS_START( mjsiyoub ) diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index c14e99def56..502e0a44154 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -135,7 +135,7 @@ static ADDRESS_MAP_START( mlanding_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1d0000, 0x1d0001) AM_WRITENOP AM_RANGE(0x1d0002, 0x1d0003) AM_NOP //sound reset ?? - AM_RANGE(0x2d0000, 0x2d0001) AM_READ(MRA16_NOP) AM_WRITE(taitosound_port16_lsb_w) + AM_RANGE(0x2d0000, 0x2d0001) AM_READ(SMH_NOP) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x2d0002, 0x2d0003) AM_READ(taitosound_comm16_msb_r) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(&ml_unk)//AM_SHARE(2) @@ -169,11 +169,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mlanding_z80_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x9001, 0x9001) AM_READ(YM2151_status_port_0_r) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0x9002, 0x9100) AM_READ(MRA8_RAM) + AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) AM_WRITE(taitosound_slave_comm_w) diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index e9af012361f..fa40bfbabde 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -890,11 +890,11 @@ static ADDRESS_MAP_START( model1_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK(1) AM_RANGE(0x200000, 0x2fffff) AM_ROM - AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(MRA16_RAM, mr2_w) AM_BASE(&mr2) - AM_RANGE(0x500000, 0x53ffff) AM_READWRITE(MRA16_RAM, mr_w) AM_BASE(&mr) + AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(SMH_RAM, mr2_w) AM_BASE(&mr2) + AM_RANGE(0x500000, 0x53ffff) AM_READWRITE(SMH_RAM, mr_w) AM_BASE(&mr) - AM_RANGE(0x600000, 0x60ffff) AM_READWRITE(MRA16_RAM, md0_w) AM_BASE(&model1_display_list0) - AM_RANGE(0x610000, 0x61ffff) AM_READWRITE(MRA16_RAM, md1_w) AM_BASE(&model1_display_list1) + AM_RANGE(0x600000, 0x60ffff) AM_READWRITE(SMH_RAM, md0_w) AM_BASE(&model1_display_list0) + AM_RANGE(0x610000, 0x61ffff) AM_READWRITE(SMH_RAM, md1_w) AM_BASE(&model1_display_list1) AM_RANGE(0x680000, 0x680003) AM_READWRITE(model1_listctl_r, model1_listctl_w) AM_RANGE(0x700000, 0x70ffff) AM_READWRITE(sys24_tile_r, sys24_tile_w) @@ -904,7 +904,7 @@ static ADDRESS_MAP_START( model1_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x770000, 0x770001) AM_WRITENOP // Video synchronization switch AM_RANGE(0x780000, 0x7fffff) AM_READWRITE(sys24_char_r, sys24_char_w) - AM_RANGE(0x900000, 0x903fff) AM_READWRITE(MRA16_RAM, p_w) AM_BASE(&paletteram16) + AM_RANGE(0x900000, 0x903fff) AM_READWRITE(SMH_RAM, p_w) AM_BASE(&paletteram16) AM_RANGE(0x910000, 0x91bfff) AM_RAM AM_BASE(&model1_color_xlat) AM_RANGE(0xc00000, 0xc0003f) AM_READ(io_r) AM_WRITENOP @@ -938,11 +938,11 @@ static ADDRESS_MAP_START( model1_vr_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK(1) AM_RANGE(0x200000, 0x2fffff) AM_ROM - AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(MRA16_RAM, mr2_w) AM_BASE(&mr2) - AM_RANGE(0x500000, 0x53ffff) AM_READWRITE(MRA16_RAM, mr_w) AM_BASE(&mr) + AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(SMH_RAM, mr2_w) AM_BASE(&mr2) + AM_RANGE(0x500000, 0x53ffff) AM_READWRITE(SMH_RAM, mr_w) AM_BASE(&mr) - AM_RANGE(0x600000, 0x60ffff) AM_READWRITE(MRA16_RAM, md0_w) AM_BASE(&model1_display_list0) - AM_RANGE(0x610000, 0x61ffff) AM_READWRITE(MRA16_RAM, md1_w) AM_BASE(&model1_display_list1) + AM_RANGE(0x600000, 0x60ffff) AM_READWRITE(SMH_RAM, md0_w) AM_BASE(&model1_display_list0) + AM_RANGE(0x610000, 0x61ffff) AM_READWRITE(SMH_RAM, md1_w) AM_BASE(&model1_display_list1) AM_RANGE(0x680000, 0x680003) AM_READWRITE(model1_listctl_r, model1_listctl_w) AM_RANGE(0x700000, 0x70ffff) AM_READWRITE(sys24_tile_r, sys24_tile_w) @@ -952,7 +952,7 @@ static ADDRESS_MAP_START( model1_vr_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x770000, 0x770001) AM_WRITENOP // Video synchronization switch AM_RANGE(0x780000, 0x7fffff) AM_READWRITE(sys24_char_r, sys24_char_w) - AM_RANGE(0x900000, 0x903fff) AM_READWRITE(MRA16_RAM, p_w) AM_BASE(&paletteram16) + AM_RANGE(0x900000, 0x903fff) AM_READWRITE(SMH_RAM, p_w) AM_BASE(&paletteram16) AM_RANGE(0x910000, 0x91bfff) AM_RAM AM_BASE(&model1_color_xlat) AM_RANGE(0xc00000, 0xc0003f) AM_READ(io_r) AM_WRITENOP diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index cafeffa01c5..b40b3e4708c 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -1280,7 +1280,7 @@ static ADDRESS_MAP_START( model2_base_mem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x01100000, 0x0110ffff) AM_READWRITE(sys24_tile32_r, sys24_tile32_w) AM_MIRROR(0x10000) AM_RANGE(0x01180000, 0x011fffff) AM_READWRITE(sys24_char32_r, sys24_char32_w) AM_MIRROR(0x100000) - AM_RANGE(0x01800000, 0x01803fff) AM_READWRITE(MRA32_RAM, pal32_w) AM_BASE(&paletteram32) + AM_RANGE(0x01800000, 0x01803fff) AM_READWRITE(SMH_RAM, pal32_w) AM_BASE(&paletteram32) AM_RANGE(0x01810000, 0x0181bfff) AM_RAM AM_BASE(&model2_colorxlat) AM_RANGE(0x0181c000, 0x0181c003) AM_WRITE(model2_3d_zclip_w) AM_RANGE(0x01a10000, 0x01a1ffff) AM_READWRITE(network_r, network_w) @@ -1311,9 +1311,9 @@ static ADDRESS_MAP_START( model2o_mem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00980008, 0x0098000b) AM_WRITE( geo_ctl1_w ) AM_RANGE(0x009c0000, 0x009cffff) AM_READWRITE( model2_serial_r, model2o_serial_w ) - AM_RANGE(0x12000000, 0x121fffff) AM_READWRITE(MRA32_RAM, model2o_tex_w0) AM_MIRROR(0x200000) AM_BASE(&model2_textureram0) // texture RAM 0 - AM_RANGE(0x12400000, 0x125fffff) AM_READWRITE(MRA32_RAM, model2o_tex_w1) AM_MIRROR(0x200000) AM_BASE(&model2_textureram1) // texture RAM 1 - AM_RANGE(0x12800000, 0x1281ffff) AM_READWRITE(MRA32_RAM, model2o_luma_w) AM_BASE(&model2_lumaram) // polygon "luma" RAM + AM_RANGE(0x12000000, 0x121fffff) AM_READWRITE(SMH_RAM, model2o_tex_w0) AM_MIRROR(0x200000) AM_BASE(&model2_textureram0) // texture RAM 0 + AM_RANGE(0x12400000, 0x125fffff) AM_READWRITE(SMH_RAM, model2o_tex_w1) AM_MIRROR(0x200000) AM_BASE(&model2_textureram1) // texture RAM 1 + AM_RANGE(0x12800000, 0x1281ffff) AM_READWRITE(SMH_RAM, model2o_luma_w) AM_BASE(&model2_lumaram) // polygon "luma" RAM AM_RANGE(0x01c00000, 0x01c00007) AM_READ(analog_r) AM_RANGE(0x01c00010, 0x01c00013) AM_READ(ctrl10_r) @@ -1338,9 +1338,9 @@ static ADDRESS_MAP_START( model2a_crx_mem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00980008, 0x0098000b) AM_WRITE( geo_ctl1_w ) AM_RANGE(0x009c0000, 0x009cffff) AM_READWRITE( model2_serial_r, model2_serial_w ) - AM_RANGE(0x12000000, 0x121fffff) AM_READWRITE(MRA32_RAM, model2o_tex_w0) AM_MIRROR(0x200000) AM_BASE(&model2_textureram0) // texture RAM 0 - AM_RANGE(0x12400000, 0x125fffff) AM_READWRITE(MRA32_RAM, model2o_tex_w1) AM_MIRROR(0x200000) AM_BASE(&model2_textureram1) // texture RAM 1 - AM_RANGE(0x12800000, 0x1281ffff) AM_READWRITE(MRA32_RAM, model2o_luma_w) AM_BASE(&model2_lumaram) // polygon "luma" RAM + AM_RANGE(0x12000000, 0x121fffff) AM_READWRITE(SMH_RAM, model2o_tex_w0) AM_MIRROR(0x200000) AM_BASE(&model2_textureram0) // texture RAM 0 + AM_RANGE(0x12400000, 0x125fffff) AM_READWRITE(SMH_RAM, model2o_tex_w1) AM_MIRROR(0x200000) AM_BASE(&model2_textureram1) // texture RAM 1 + AM_RANGE(0x12800000, 0x1281ffff) AM_READWRITE(SMH_RAM, model2o_luma_w) AM_BASE(&model2_lumaram) // polygon "luma" RAM AM_RANGE(0x01c00000, 0x01c00003) AM_READWRITE(ctrl0_r, ctrl0_w) AM_RANGE(0x01c00004, 0x01c00007) AM_READ(ctrl1_r) @@ -1681,8 +1681,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(REGION_CPU2, 0x80000) AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION(REGION_SOUND1, 0) - AM_RANGE(0xa00000, 0xdfffff) AM_READ(MRA16_BANK4) - AM_RANGE(0xe00000, 0xffffff) AM_READ(MRA16_BANK5) + AM_RANGE(0xa00000, 0xdfffff) AM_READ(SMH_BANK4) + AM_RANGE(0xe00000, 0xffffff) AM_READ(SMH_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 6e1db5ce196..166dd0bf37e 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -4004,8 +4004,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(REGION_CPU2, 0x80000) AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION(REGION_SOUND1, 0) - AM_RANGE(0xa00000, 0xdfffff) AM_READ(MRA16_BANK4) - AM_RANGE(0xe00000, 0xffffff) AM_READ(MRA16_BANK5) + AM_RANGE(0xa00000, 0xdfffff) AM_READ(SMH_BANK4) + AM_RANGE(0xe00000, 0xffffff) AM_READ(SMH_BANK5) ADDRESS_MAP_END static int scsp_last_line = 0; @@ -4264,7 +4264,7 @@ static DRIVER_INIT( model3_10 ) memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc0000000, 0xc00000ff, 0, 0, scsi_r ); memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc0000000, 0xc00000ff, 0, 0, scsi_w ); - memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, MRA64_BANK1 ); + memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, SMH_BANK1 ); memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r ); memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_w ); @@ -4277,7 +4277,7 @@ static DRIVER_INIT( model3_10 ) static DRIVER_INIT( model3_15 ) { interleave_vroms(); - memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, MRA64_BANK1 ); + memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, SMH_BANK1 ); memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r ); memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_w ); @@ -4290,7 +4290,7 @@ static DRIVER_INIT( model3_15 ) static DRIVER_INIT( model3_20 ) { interleave_vroms(); - memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, MRA64_BANK1 ); + memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, SMH_BANK1 ); memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc2000000, 0xc20000ff, 0, 0, real3d_dma_r ); memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc2000000, 0xc20000ff, 0, 0, real3d_dma_w ); @@ -4383,7 +4383,7 @@ static DRIVER_INIT( vs215 ) rom[(0x70e710^4)/4] = 0x60000000; interleave_vroms(); - memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, MRA64_BANK1 ); + memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, SMH_BANK1 ); memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf9000000, 0xf90000ff, 0, 0, scsi_r ); memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf9000000, 0xf90000ff, 0, 0, scsi_w ); @@ -4408,7 +4408,7 @@ static DRIVER_INIT( vs29815 ) rom[(0x60290c^4)/4] = 0x60000000; interleave_vroms(); - memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, MRA64_BANK1 ); + memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, SMH_BANK1 ); memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf9000000, 0xf90000ff, 0, 0, scsi_r ); memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf9000000, 0xf90000ff, 0, 0, scsi_w ); @@ -4433,7 +4433,7 @@ static DRIVER_INIT( bass ) rom[(0x7999c8^4)/4] = 0x60000000; interleave_vroms(); - memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, MRA64_BANK1 ); + memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, SMH_BANK1 ); memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf9000000, 0xf90000ff, 0, 0, scsi_r ); memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf9000000, 0xf90000ff, 0, 0, scsi_w ); @@ -4453,7 +4453,7 @@ static DRIVER_INIT( bass ) static DRIVER_INIT( getbass ) { interleave_vroms(); - memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, MRA64_BANK1 ); + memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xff000000, 0xff7fffff, 0, 0, SMH_BANK1 ); memory_install_read64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf9000000, 0xf90000ff, 0, 0, scsi_r ); memory_install_write64_handler( 0, ADDRESS_SPACE_PROGRAM, 0xf9000000, 0xf90000ff, 0, 0, scsi_w ); diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index 0c3fce63026..b702eb1a8a9 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -106,7 +106,7 @@ static WRITE8_HANDLER(dac_w) static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) // ?? + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0x14, 0x14) AM_WRITE(dac_w) /* 4 bit DAC x 2. MSB = left, LSB = right */ ADDRESS_MAP_END @@ -122,15 +122,15 @@ static WRITE8_HANDLER ( mogura_gfxram_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) // main ram - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) // ram based characters - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) // tilemap + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) // main ram + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) // ram based characters + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) // tilemap ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_WRITE(mogura_gfxram_w) AM_BASE(&mogura_gfxram) AM_RANGE(0xf000, 0xffff) AM_WRITE(mogura_tileram_w) AM_BASE(&mogura_tileram) ADDRESS_MAP_END diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c index edffd48b091..e568af2a071 100644 --- a/src/mame/drivers/momoko.c +++ b/src/mame/drivers/momoko.c @@ -45,29 +45,29 @@ static WRITE8_HANDLER( momoko_bg_read_bank_w ) /****************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) - AM_RANGE(0xd064, 0xd0ff) AM_READ(MRA8_RAM) /* sprite ram */ + AM_RANGE(0xd064, 0xd0ff) AM_READ(SMH_RAM) /* sprite ram */ AM_RANGE(0xd400, 0xd400) AM_READ(input_port_0_r) AM_RANGE(0xd402, 0xd402) AM_READ(input_port_1_r) AM_RANGE(0xd406, 0xd406) AM_READ(input_port_2_r) AM_RANGE(0xd407, 0xd407) AM_READ(input_port_3_r) - AM_RANGE(0xd800, 0xdbff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe3ff) AM_READ(MRA8_RAM) /* text */ + AM_RANGE(0xd800, 0xdbff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe3ff) AM_READ(SMH_RAM) /* text */ - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) - AM_RANGE(0xd064, 0xd0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd064, 0xd0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd400, 0xd400) AM_WRITE(MWA8_NOP) /* interrupt ack? */ + AM_RANGE(0xd400, 0xd400) AM_WRITE(SMH_NOP) /* interrupt ack? */ AM_RANGE(0xd402, 0xd402) AM_WRITE(momoko_flipscreen_w) AM_RANGE(0xd404, 0xd404) AM_WRITE(watchdog_reset_w) AM_RANGE(0xd406, 0xd406) AM_WRITE(soundlatch_w) @@ -78,7 +78,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xdc01, 0xdc01) AM_WRITE(momoko_fg_scrollx_w) AM_RANGE(0xdc02, 0xdc02) AM_WRITE(momoko_fg_select_w) - AM_RANGE(0xe000, 0xe3ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xe000, 0xe3ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xe800, 0xe800) AM_WRITE(momoko_text_scrolly_w) AM_RANGE(0xe801, 0xe801) AM_WRITE(momoko_text_mode_w) @@ -91,8 +91,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xa001, 0xa001) AM_READ(YM2203_read_port_0_r) AM_RANGE(0xc000, 0xc000) AM_READ(YM2203_status_port_1_r) @@ -100,12 +100,12 @@ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x9000, 0x9000) AM_WRITE(MWA8_NOP) /* unknown */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x9000, 0x9000) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w) - AM_RANGE(0xb000, 0xb000) AM_WRITE(MWA8_NOP) /* unknown */ + AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2203_control_port_1_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2203_write_port_1_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 39bd4a69f6a..2733d90dae8 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -307,57 +307,57 @@ static WRITE16_HANDLER( moobl_oki_bank_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x0c4000, 0x0c4001) AM_READ(K053246_word_r) AM_RANGE(0x0d6014, 0x0d6015) AM_READ(sound_status_r) - AM_RANGE(0x0d6000, 0x0d601f) AM_READ(MRA16_RAM) /* sound regs fall through */ + AM_RANGE(0x0d6000, 0x0d601f) AM_READ(SMH_RAM) /* sound regs fall through */ AM_RANGE(0x0da000, 0x0da001) AM_READ(player1_r) AM_RANGE(0x0da002, 0x0da003) AM_READ(player2_r) AM_RANGE(0x0dc000, 0x0dc001) AM_READ(input_port_0_word_r) AM_RANGE(0x0dc002, 0x0dc003) AM_READ(control1_r) AM_RANGE(0x0de000, 0x0de001) AM_READ(control2_r) - AM_RANGE(0x100000, 0x17ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x180000, 0x18ffff) AM_READ(MRA16_RAM) /* Work RAM */ - AM_RANGE(0x190000, 0x19ffff) AM_READ(MRA16_RAM) /* Sprite RAM */ + AM_RANGE(0x100000, 0x17ffff) AM_READ(SMH_ROM) + AM_RANGE(0x180000, 0x18ffff) AM_READ(SMH_RAM) /* Work RAM */ + AM_RANGE(0x190000, 0x19ffff) AM_READ(SMH_RAM) /* Sprite RAM */ AM_RANGE(0x1a0000, 0x1a1fff) AM_READ(K056832_ram_word_r) /* Graphic planes */ AM_RANGE(0x1a2000, 0x1a3fff) AM_READ(K056832_ram_word_r) /* Graphic planes mirror */ AM_RANGE(0x1b0000, 0x1b1fff) AM_READ(K056832_rom_word_r) /* Passthrough to tile roms */ - AM_RANGE(0x1c0000, 0x1c1fff) AM_READ(MRA16_RAM) + AM_RANGE(0x1c0000, 0x1c1fff) AM_READ(SMH_RAM) #if MOO_DEBUG AM_RANGE(0x0c0000, 0x0c003f) AM_READ(K056832_word_r) AM_RANGE(0x0c2000, 0x0c2007) AM_READ(K053246_reg_word_r) AM_RANGE(0x0ca000, 0x0ca01f) AM_READ(K054338_word_r) AM_RANGE(0x0cc000, 0x0cc01f) AM_READ(K053251_lsb_r) - AM_RANGE(0x0d0000, 0x0d001f) AM_READ(MRA16_RAM) + AM_RANGE(0x0d0000, 0x0d001f) AM_READ(SMH_RAM) AM_RANGE(0x0d8000, 0x0d8007) AM_READ(K056832_b_word_r) #endif ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x0c0000, 0x0c003f) AM_WRITE(K056832_word_w) AM_RANGE(0x0c2000, 0x0c2007) AM_WRITE(K053246_word_w) AM_RANGE(0x0ca000, 0x0ca01f) AM_WRITE(K054338_word_w) /* K054338 alpha blending engine */ AM_RANGE(0x0cc000, 0x0cc01f) AM_WRITE(K053251_lsb_w) AM_RANGE(0x0ce000, 0x0ce01f) AM_WRITE(moo_prot_w) - AM_RANGE(0x0d0000, 0x0d001f) AM_WRITE(MWA16_RAM) /* CCU regs (ignored) */ + AM_RANGE(0x0d0000, 0x0d001f) AM_WRITE(SMH_RAM) /* CCU regs (ignored) */ AM_RANGE(0x0d4000, 0x0d4001) AM_WRITE(sound_irq_w) AM_RANGE(0x0d600c, 0x0d600d) AM_WRITE(sound_cmd1_w) AM_RANGE(0x0d600e, 0x0d600f) AM_WRITE(sound_cmd2_w) - AM_RANGE(0x0d6000, 0x0d601f) AM_WRITE(MWA16_RAM) /* sound regs fall through */ + AM_RANGE(0x0d6000, 0x0d601f) AM_WRITE(SMH_RAM) /* sound regs fall through */ AM_RANGE(0x0d8000, 0x0d8007) AM_WRITE(K056832_b_word_w) /* VSCCS regs */ AM_RANGE(0x0de000, 0x0de001) AM_WRITE(control2_w) - AM_RANGE(0x100000, 0x17ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x180000, 0x18ffff) AM_WRITE(MWA16_RAM) AM_BASE(&workram) - AM_RANGE(0x190000, 0x19ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x100000, 0x17ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x180000, 0x18ffff) AM_WRITE(SMH_RAM) AM_BASE(&workram) + AM_RANGE(0x190000, 0x19ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0x1a0000, 0x1a1fff) AM_WRITE(K056832_ram_word_w) /* Graphic planes */ AM_RANGE(0x1a2000, 0x1a3fff) AM_WRITE(K056832_ram_word_w) /* Graphic planes mirror */ AM_RANGE(0x1c0000, 0x1c1fff) AM_WRITE(paletteram16_xrgb_word_be_w) AM_BASE(&paletteram16) ADDRESS_MAP_END static ADDRESS_MAP_START( readmembl, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x0c2f00, 0x0c2f01) AM_READ(MRA16_NOP) /* heck if I know, but it's polled constantly */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x0c2f00, 0x0c2f01) AM_READ(SMH_NOP) /* heck if I know, but it's polled constantly */ AM_RANGE(0x0c4000, 0x0c4001) AM_READ(K053246_word_r) AM_RANGE(0x0d6ffe, 0x0d6fff) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0x0da000, 0x0da001) AM_READ(player1_r) @@ -365,43 +365,43 @@ static ADDRESS_MAP_START( readmembl, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0dc000, 0x0dc001) AM_READ(input_port_0_word_r) AM_RANGE(0x0dc002, 0x0dc003) AM_READ(control1_r) AM_RANGE(0x0de000, 0x0de001) AM_READ(control2_r) - AM_RANGE(0x100000, 0x17ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x180000, 0x18ffff) AM_READ(MRA16_RAM) /* Work RAM */ - AM_RANGE(0x190000, 0x19ffff) AM_READ(MRA16_RAM) /* Sprite RAM */ + AM_RANGE(0x100000, 0x17ffff) AM_READ(SMH_ROM) + AM_RANGE(0x180000, 0x18ffff) AM_READ(SMH_RAM) /* Work RAM */ + AM_RANGE(0x190000, 0x19ffff) AM_READ(SMH_RAM) /* Sprite RAM */ AM_RANGE(0x1a0000, 0x1a1fff) AM_READ(K056832_ram_word_r) /* Graphic planes */ AM_RANGE(0x1a2000, 0x1a3fff) AM_READ(K056832_ram_word_r) /* Graphic planes mirror */ AM_RANGE(0x1b0000, 0x1b1fff) AM_READ(K056832_rom_word_r) /* Passthrough to tile roms */ - AM_RANGE(0x1c0000, 0x1c1fff) AM_READ(MRA16_RAM) + AM_RANGE(0x1c0000, 0x1c1fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemembl, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x0c0000, 0x0c003f) AM_WRITE(K056832_word_w) AM_RANGE(0x0c2000, 0x0c2007) AM_WRITE(K053246_word_w) AM_RANGE(0x0ca000, 0x0ca01f) AM_WRITE(K054338_word_w) /* K054338 alpha blending engine */ AM_RANGE(0x0cc000, 0x0cc01f) AM_WRITE(K053251_lsb_w) - AM_RANGE(0x0d0000, 0x0d001f) AM_WRITE(MWA16_RAM) /* CCU regs (ignored) */ + AM_RANGE(0x0d0000, 0x0d001f) AM_WRITE(SMH_RAM) /* CCU regs (ignored) */ AM_RANGE(0x0d6ffc, 0x0d6ffd) AM_WRITE(moobl_oki_bank_w) AM_RANGE(0x0d6ffe, 0x0d6fff) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x0d8000, 0x0d8007) AM_WRITE(K056832_b_word_w) /* VSCCS regs */ AM_RANGE(0x0de000, 0x0de001) AM_WRITE(control2_w) - AM_RANGE(0x100000, 0x17ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x180000, 0x18ffff) AM_WRITE(MWA16_RAM) AM_BASE(&workram) - AM_RANGE(0x190000, 0x19ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x100000, 0x17ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x180000, 0x18ffff) AM_WRITE(SMH_RAM) AM_BASE(&workram) + AM_RANGE(0x190000, 0x19ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0x1a0000, 0x1a1fff) AM_WRITE(K056832_ram_word_w) /* Graphic planes */ AM_RANGE(0x1a2000, 0x1a3fff) AM_WRITE(K056832_ram_word_w) /* Graphic planes mirror */ AM_RANGE(0x1c0000, 0x1c1fff) AM_WRITE(paletteram16_xrgb_word_be_w) AM_BASE(&paletteram16) ADDRESS_MAP_END static ADDRESS_MAP_START( buckyreadmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x08ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x090000, 0x09ffff) AM_READ(MRA16_RAM) /* Sprite RAM */ - AM_RANGE(0x0a0000, 0x0affff) AM_READ(MRA16_RAM) /* extra sprite RAM? */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x08ffff) AM_READ(SMH_RAM) + AM_RANGE(0x090000, 0x09ffff) AM_READ(SMH_RAM) /* Sprite RAM */ + AM_RANGE(0x0a0000, 0x0affff) AM_READ(SMH_RAM) /* extra sprite RAM? */ AM_RANGE(0x0c4000, 0x0c4001) AM_READ(K053246_word_r) AM_RANGE(0x0d2000, 0x0d20ff) AM_READ(K054000_lsb_r) AM_RANGE(0x0d6014, 0x0d6015) AM_READ(sound_status_r) - AM_RANGE(0x0d6000, 0x0d601f) AM_READ(MRA16_RAM) /* sound regs fall through */ + AM_RANGE(0x0d6000, 0x0d601f) AM_READ(SMH_RAM) /* sound regs fall through */ AM_RANGE(0x0da000, 0x0da001) AM_READ(player1_r) AM_RANGE(0x0da002, 0x0da003) AM_READ(player2_r) AM_RANGE(0x0dc000, 0x0dc001) AM_READ(input_port_0_word_r) @@ -409,49 +409,49 @@ static ADDRESS_MAP_START( buckyreadmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0de000, 0x0de001) AM_READ(control2_r) AM_RANGE(0x180000, 0x181fff) AM_READ(K056832_ram_word_r) /* Graphic planes */ AM_RANGE(0x182000, 0x183fff) AM_READ(K056832_ram_word_r) /* Graphic planes mirror */ - AM_RANGE(0x184000, 0x187fff) AM_READ(MRA16_RAM) /* extra tile RAM? */ + AM_RANGE(0x184000, 0x187fff) AM_READ(SMH_RAM) /* extra tile RAM? */ AM_RANGE(0x190000, 0x191fff) AM_READ(K056832_rom_word_r) /* Passthrough to tile roms */ - AM_RANGE(0x1b0000, 0x1b3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x23ffff) AM_READ(MRA16_ROM) /* data */ + AM_RANGE(0x1b0000, 0x1b3fff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x23ffff) AM_READ(SMH_ROM) /* data */ #if MOO_DEBUG AM_RANGE(0x0c0000, 0x0c003f) AM_READ(K056832_word_r) AM_RANGE(0x0c2000, 0x0c2007) AM_READ(K053246_reg_word_r) AM_RANGE(0x0ca000, 0x0ca01f) AM_READ(K054338_word_r) AM_RANGE(0x0cc000, 0x0cc01f) AM_READ(K053251_lsb_r) - AM_RANGE(0x0d0000, 0x0d001f) AM_READ(MRA16_RAM) + AM_RANGE(0x0d0000, 0x0d001f) AM_READ(SMH_RAM) AM_RANGE(0x0d8000, 0x0d8007) AM_READ(K056832_b_word_r) #endif ADDRESS_MAP_END static ADDRESS_MAP_START( buckywritemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x08ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x090000, 0x09ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) /* Sprite RAM */ - AM_RANGE(0x0a0000, 0x0affff) AM_WRITE(MWA16_RAM) /* extra sprite RAM? */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x08ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x090000, 0x09ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) /* Sprite RAM */ + AM_RANGE(0x0a0000, 0x0affff) AM_WRITE(SMH_RAM) /* extra sprite RAM? */ AM_RANGE(0x0c0000, 0x0c003f) AM_WRITE(K056832_word_w) AM_RANGE(0x0c2000, 0x0c2007) AM_WRITE(K053246_word_w) AM_RANGE(0x0ca000, 0x0ca01f) AM_WRITE(K054338_word_w) /* K054338 alpha blending engine */ AM_RANGE(0x0cc000, 0x0cc01f) AM_WRITE(K053251_lsb_w) AM_RANGE(0x0ce000, 0x0ce01f) AM_WRITE(moo_prot_w) - AM_RANGE(0x0d0000, 0x0d001f) AM_WRITE(MWA16_RAM) /* CCU regs (ignored) */ + AM_RANGE(0x0d0000, 0x0d001f) AM_WRITE(SMH_RAM) /* CCU regs (ignored) */ AM_RANGE(0x0d2000, 0x0d20ff) AM_WRITE(K054000_lsb_w) AM_RANGE(0x0d4000, 0x0d4001) AM_WRITE(sound_irq_w) AM_RANGE(0x0d600c, 0x0d600d) AM_WRITE(sound_cmd1_w) AM_RANGE(0x0d600e, 0x0d600f) AM_WRITE(sound_cmd2_w) - AM_RANGE(0x0d6000, 0x0d601f) AM_WRITE(MWA16_RAM) /* sound regs fall through */ + AM_RANGE(0x0d6000, 0x0d601f) AM_WRITE(SMH_RAM) /* sound regs fall through */ AM_RANGE(0x0d8000, 0x0d8007) AM_WRITE(K056832_b_word_w) /* VSCCS regs */ AM_RANGE(0x0de000, 0x0de001) AM_WRITE(control2_w) AM_RANGE(0x180000, 0x181fff) AM_WRITE(K056832_ram_word_w) /* Graphic planes */ AM_RANGE(0x182000, 0x183fff) AM_WRITE(K056832_ram_word_w) /* Graphic planes mirror */ - AM_RANGE(0x184000, 0x187fff) AM_WRITE(MWA16_RAM) /* extra tile RAM? */ + AM_RANGE(0x184000, 0x187fff) AM_WRITE(SMH_RAM) /* extra tile RAM? */ AM_RANGE(0x1b0000, 0x1b3fff) AM_WRITE(paletteram16_xrgb_word_be_w) AM_BASE(&paletteram16) - AM_RANGE(0x200000, 0x23ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x200000, 0x23ffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK2) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe22f) AM_READ(K054539_0_r) AM_RANGE(0xec01, 0xec01) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) @@ -459,8 +459,8 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe22f) AM_WRITE(K054539_0_w) AM_RANGE(0xec00, 0xec00) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xec01, 0xec01) AM_WRITE(YM2151_data_port_0_w) diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c index d007bedd90e..69bed4db69c 100644 --- a/src/mame/drivers/mosaic.c +++ b/src/mame/drivers/mosaic.c @@ -97,30 +97,30 @@ static READ8_HANDLER( gfire2_protection_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x00000, 0x0ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x20000, 0x21fff) AM_READ(MRA8_RAM) - AM_RANGE(0x22000, 0x23fff) AM_READ(MRA8_RAM) - AM_RANGE(0x24000, 0x241ff) AM_READ(MRA8_RAM) + AM_RANGE(0x00000, 0x0ffff) AM_READ(SMH_ROM) + AM_RANGE(0x20000, 0x21fff) AM_READ(SMH_RAM) + AM_RANGE(0x22000, 0x23fff) AM_READ(SMH_RAM) + AM_RANGE(0x24000, 0x241ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x00000, 0x0ffff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x20000, 0x21fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x00000, 0x0ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x20000, 0x21fff) AM_WRITE(SMH_RAM) AM_RANGE(0x22000, 0x22fff) AM_WRITE(mosaic_bgvideoram_w) AM_BASE(&mosaic_bgvideoram) AM_RANGE(0x23000, 0x23fff) AM_WRITE(mosaic_fgvideoram_w) AM_BASE(&mosaic_fgvideoram) AM_RANGE(0x24000, 0x241ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE(&paletteram) ADDRESS_MAP_END static ADDRESS_MAP_START( gfire2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x00000, 0x0ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x10000, 0x17fff) AM_READ(MRA8_RAM) - AM_RANGE(0x22000, 0x23fff) AM_READ(MRA8_RAM) - AM_RANGE(0x24000, 0x241ff) AM_READ(MRA8_RAM) + AM_RANGE(0x00000, 0x0ffff) AM_READ(SMH_ROM) + AM_RANGE(0x10000, 0x17fff) AM_READ(SMH_RAM) + AM_RANGE(0x22000, 0x23fff) AM_READ(SMH_RAM) + AM_RANGE(0x24000, 0x241ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( gfire2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x00000, 0x0ffff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x10000, 0x17fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x00000, 0x0ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x10000, 0x17fff) AM_WRITE(SMH_RAM) AM_RANGE(0x22000, 0x22fff) AM_WRITE(mosaic_bgvideoram_w) AM_BASE(&mosaic_bgvideoram) AM_RANGE(0x23000, 0x23fff) AM_WRITE(mosaic_fgvideoram_w) AM_BASE(&mosaic_fgvideoram) AM_RANGE(0x24000, 0x241ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE(&paletteram) @@ -128,7 +128,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x30, 0x30) AM_READ(MRA8_NOP) /* Z180 internal registers */ + AM_RANGE(0x30, 0x30) AM_READ(SMH_NOP) /* Z180 internal registers */ AM_RANGE(0x70, 0x70) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x71, 0x71) AM_READ(YM2203_read_port_0_r) AM_RANGE(0x72, 0x72) AM_READ(protection_r) @@ -138,7 +138,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x3f) AM_WRITE(MWA8_NOP) /* Z180 internal registers */ + AM_RANGE(0x00, 0x3f) AM_WRITE(SMH_NOP) /* Z180 internal registers */ AM_RANGE(0x70, 0x70) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x71, 0x71) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x72, 0x72) AM_WRITE(protection_w) @@ -146,7 +146,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gfire2_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x30, 0x30) AM_READ(MRA8_NOP) /* Z180 internal registers */ + AM_RANGE(0x30, 0x30) AM_READ(SMH_NOP) /* Z180 internal registers */ AM_RANGE(0x70, 0x70) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x71, 0x71) AM_READ(YM2203_read_port_0_r) AM_RANGE(0x72, 0x72) AM_READ(gfire2_protection_r) @@ -156,7 +156,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gfire2_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x3f) AM_WRITE(MWA8_NOP) /* Z180 internal registers */ + AM_RANGE(0x00, 0x3f) AM_WRITE(SMH_NOP) /* Z180 internal registers */ AM_RANGE(0x70, 0x70) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x71, 0x71) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x72, 0x72) AM_WRITE(gfire2_protection_w) diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c index 9b45c17e105..fe541e9b761 100644 --- a/src/mame/drivers/mouser.c +++ b/src/mame/drivers/mouser.c @@ -55,9 +55,9 @@ static READ8_HANDLER( mouser_sound_byte_r ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x6bff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x6bff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) @@ -66,12 +66,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x6bff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8800, 0x88ff) AM_WRITE(MWA8_NOP) /* unknown */ - AM_RANGE(0x9000, 0x93ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x9800, 0x9cff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x9c00, 0x9fff) AM_WRITE(MWA8_RAM) AM_BASE(&colorram) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x6bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8800, 0x88ff) AM_WRITE(SMH_NOP) /* unknown */ + AM_RANGE(0x9000, 0x93ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x9800, 0x9cff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x9c00, 0x9fff) AM_WRITE(SMH_RAM) AM_BASE(&colorram) AM_RANGE(0xa000, 0xa000) AM_WRITE(mouser_nmi_enable_w) /* bit 0 = NMI Enable */ AM_RANGE(0xa001, 0xa001) AM_WRITE(mouser_flip_screen_x_w) AM_RANGE(0xa002, 0xa002) AM_WRITE(mouser_flip_screen_y_w) @@ -81,15 +81,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(mouser_sound_byte_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x4000, 0x4000) AM_WRITE(MWA8_NOP) /* watchdog? */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_NOP) /* watchdog? */ ADDRESS_MAP_END static ADDRESS_MAP_START( readport2, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index ab1ae91d843..a84a68e3af6 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -1356,7 +1356,7 @@ static ADDRESS_MAP_START( mod2_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0F00, 0x0F03) AM_WRITE(pia_5_w) // PIA6821 IC8 AM_RANGE(0x0F00, 0x0F03) AM_READ( pia_5_r) - AM_RANGE(0x1000, 0xffff) AM_READ(MRA8_BANK1) // 64k paged ROM (4 pages) + AM_RANGE(0x1000, 0xffff) AM_READ(SMH_BANK1) // 64k paged ROM (4 pages) ADDRESS_MAP_END // machine driver for barcrest mpu4 board ///////////////////////////////// diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c index 8683dacd9c5..80338b67ace 100644 --- a/src/mame/drivers/mquake.c +++ b/src/mame/drivers/mquake.c @@ -41,11 +41,11 @@ static void mquake_cia_0_porta_w(UINT8 data) /* 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(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, MWA16_BANK1); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, SMH_BANK1); else /* overlay enabled, map Amiga system ROM on 0x000000 */ - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, MWA16_UNMAP); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, SMH_UNMAP); } diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c index fe51711a636..c989c4d5ad5 100644 --- a/src/mame/drivers/mrdo.c +++ b/src/mame/drivers/mrdo.c @@ -40,25 +40,25 @@ static READ8_HANDLER( mrdo_SECRE_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) /* video and color RAM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) /* video and color RAM */ AM_RANGE(0x9803, 0x9803) AM_READ(mrdo_SECRE_r) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0xa001, 0xa001) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0xa002, 0xa002) AM_READ(input_port_2_r) /* DSW1 */ AM_RANGE(0xa003, 0xa003) AM_READ(input_port_3_r) /* DSW2 */ - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(mrdo_bgvideoram_w) AM_BASE(&mrdo_bgvideoram) AM_RANGE(0x8800, 0x8fff) AM_WRITE(mrdo_fgvideoram_w) AM_BASE(&mrdo_fgvideoram) - AM_RANGE(0x9000, 0x90ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x9000, 0x90ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x9800, 0x9800) AM_WRITE(mrdo_flipscreen_w) /* screen flip + playfield priority */ AM_RANGE(0x9801, 0x9801) AM_WRITE(SN76496_0_w) AM_RANGE(0x9802, 0x9802) AM_WRITE(SN76496_1_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(mrdo_scrollx_w) AM_RANGE(0xf800, 0xffff) AM_WRITE(mrdo_scrolly_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c index 90cd7281ca6..0972fbcde77 100644 --- a/src/mame/drivers/mrflea.c +++ b/src/mame/drivers/mrflea.c @@ -91,30 +91,30 @@ GFXDECODE_END /*******************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(mrflea_videoram_w) AM_BASE(&videoram) AM_RANGE(0xe800, 0xe83f) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_BASE(&paletteram) AM_RANGE(0xec00, 0xecff) AM_WRITE(mrflea_spriteram_w) AM_BASE(&spriteram) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_io, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x80ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x905a) AM_READ(MRA8_RAM) /* ? */ + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x80ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x905a) AM_READ(SMH_RAM) /* ? */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_io, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x80ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x9000, 0x905a) AM_WRITE(MWA8_RAM) /* ? */ + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x80ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x9000, 0x905a) AM_WRITE(SMH_RAM) /* ? */ ADDRESS_MAP_END /*******************************************************/ @@ -178,9 +178,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) /* watchdog? */ + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /* watchdog? */ AM_RANGE(0x40, 0x40) AM_WRITE(mrflea_io_w) - AM_RANGE(0x43, 0x43) AM_WRITE(MWA8_NOP) /* 0xa6,0x0d,0x05 */ + AM_RANGE(0x43, 0x43) AM_WRITE(SMH_NOP) /* 0xa6,0x0d,0x05 */ AM_RANGE(0x60, 0x60) AM_WRITE(mrflea_gfx_bank_w) ADDRESS_MAP_END @@ -257,11 +257,11 @@ static WRITE8_HANDLER( mrflea_data3_w ){ static ADDRESS_MAP_START( writeport_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) /* watchdog */ - AM_RANGE(0x10, 0x10) AM_WRITE(MWA8_NOP) /* irq ACK */ - AM_RANGE(0x11, 0x11) AM_WRITE(MWA8_NOP) /* 0x83,0x00,0xfc */ + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /* watchdog */ + AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP) /* irq ACK */ + AM_RANGE(0x11, 0x11) AM_WRITE(SMH_NOP) /* 0x83,0x00,0xfc */ AM_RANGE(0x21, 0x21) AM_WRITE(mrflea_main_w) - AM_RANGE(0x23, 0x23) AM_WRITE(MWA8_NOP) /* 0xb4,0x09,0x05 */ + AM_RANGE(0x23, 0x23) AM_WRITE(SMH_NOP) /* 0xb4,0x09,0x05 */ AM_RANGE(0x40, 0x40) AM_WRITE(mrflea_data0_w) AM_RANGE(0x41, 0x41) AM_WRITE(mrflea_select0_w) AM_RANGE(0x42, 0x42) AM_WRITE(mrflea_data1_w) diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c index 36ce7181edc..03d1cfae8f0 100644 --- a/src/mame/drivers/mrjong.c +++ b/src/mame/drivers/mrjong.c @@ -56,20 +56,20 @@ extern VIDEO_UPDATE( mrjong ); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xa7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe400, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xa7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe3ff) AM_READ(SMH_RAM) + AM_RANGE(0xe400, 0xe7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xa000, 0xa7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa000, 0xa7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe3ff) AM_WRITE(mrjong_videoram_w) AM_BASE(&videoram) AM_RANGE(0xe400, 0xe7ff) AM_WRITE(mrjong_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe000, 0xe03f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* here to initialize the pointer */ + AM_RANGE(0xe000, 0xe03f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* here to initialize the pointer */ ADDRESS_MAP_END diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c index 9a9a5288d3b..94804170e5d 100644 --- a/src/mame/drivers/ms32.c +++ b/src/mame/drivers/ms32.c @@ -322,33 +322,33 @@ support for them bad tiles appear in the bg. static ADDRESS_MAP_START( ms32_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x001fffff) AM_READ(MRA32_ROM) - AM_RANGE(0xfc000000, 0xfc007fff) AM_READ(MRA32_RAM) - AM_RANGE(0xfc800000, 0xfc800003) AM_READ(MRA32_NOP) /* sound? */ + AM_RANGE(0x00000000, 0x001fffff) AM_READ(SMH_ROM) + AM_RANGE(0xfc000000, 0xfc007fff) AM_READ(SMH_RAM) + AM_RANGE(0xfc800000, 0xfc800003) AM_READ(SMH_NOP) /* sound? */ AM_RANGE(0xfcc00004, 0xfcc00007) AM_READ(ms32_read_inputs1) AM_RANGE(0xfcc00010, 0xfcc00013) AM_READ(ms32_read_inputs2) -/**/AM_RANGE(0xfce00600, 0xfce0065f) AM_READ(MRA32_RAM) /* roz control registers */ -/**/AM_RANGE(0xfce00a00, 0xfce00a17) AM_READ(MRA32_RAM) /* tx scroll registers */ -/**/AM_RANGE(0xfce00a20, 0xfce00a37) AM_READ(MRA32_RAM) /* bg scroll registers */ +/**/AM_RANGE(0xfce00600, 0xfce0065f) AM_READ(SMH_RAM) /* roz control registers */ +/**/AM_RANGE(0xfce00a00, 0xfce00a17) AM_READ(SMH_RAM) /* tx scroll registers */ +/**/AM_RANGE(0xfce00a20, 0xfce00a37) AM_READ(SMH_RAM) /* bg scroll registers */ AM_RANGE(0xfd000000, 0xfd000003) AM_READ(ms32_sound_r) AM_RANGE(0xfd0e0000, 0xfd0e0003) AM_READ(ms32_read_inputs3) /* analog controls in f1superb? */ -///**/AM_RANGE(0xfd104000, 0xfd105fff) AM_READ(MRA32_RAM) /* f1superb */ -///**/AM_RANGE(0xfd144000, 0xfd145fff) AM_READ(MRA32_RAM) /* f1superb */ +///**/AM_RANGE(0xfd104000, 0xfd105fff) AM_READ(SMH_RAM) /* f1superb */ +///**/AM_RANGE(0xfd144000, 0xfd145fff) AM_READ(SMH_RAM) /* f1superb */ AM_RANGE(0xfd180000, 0xfd19ffff) AM_READ(ms32_priram_r) /* priority ram */ AM_RANGE(0xfd1a0000, 0xfd1bffff) AM_READ(ms32_priram_r) /* mirror only used by memory test in service mode */ - AM_RANGE(0xfd400000, 0xfd43ffff) AM_READ(MRA32_RAM) /* Palette */ -///**/AM_RANGE(0xfd440000, 0xfd47ffff) AM_READ(MRA32_RAM) /* f1superb color */ + AM_RANGE(0xfd400000, 0xfd43ffff) AM_READ(SMH_RAM) /* Palette */ +///**/AM_RANGE(0xfd440000, 0xfd47ffff) AM_READ(SMH_RAM) /* f1superb color */ -///**/AM_RANGE(0xfdc00000, 0xfdc006ff) AM_READ(MRA32_RAM) /* f1superb */ -///**/AM_RANGE(0xfde00000, 0xfde01fff) AM_READ(MRA32_RAM) /* f1superb lineram */ +///**/AM_RANGE(0xfdc00000, 0xfdc006ff) AM_READ(SMH_RAM) /* f1superb */ +///**/AM_RANGE(0xfde00000, 0xfde01fff) AM_READ(SMH_RAM) /* f1superb lineram */ AM_RANGE(0xfe000000, 0xfe01ffff) AM_READ(ms32_rozram_r) /* roz layer */ AM_RANGE(0xfe020000, 0xfe03ffff) AM_READ(ms32_rozram_r) /* mirror only used by memory test in service mode */ AM_RANGE(0xfe200000, 0xfe201fff) AM_READ(ms32_lineram_r) /* line ram for roz layer */ -///**/AM_RANGE(0xfe202000, 0xfe2fffff) AM_READ(MRA32_RAM) /* f1superb vram */ +///**/AM_RANGE(0xfe202000, 0xfe2fffff) AM_READ(SMH_RAM) /* f1superb vram */ AM_RANGE(0xfe800000, 0xfe83ffff) AM_READ(ms32_spram_r) /* sprites */ AM_RANGE(0xfe840000, 0xfe87ffff) AM_READ(ms32_spram_r) /* mirror only used by memory test in service mode */ @@ -356,8 +356,8 @@ static ADDRESS_MAP_START( ms32_readmem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xfec08000, 0xfec0ffff) AM_READ(ms32_bgram_r) /* bg layer */ AM_RANGE(0xfec10000, 0xfec17fff) AM_READ(ms32_txram_r) /* mirror only used by memory test in service mode */ AM_RANGE(0xfec18000, 0xfec1ffff) AM_READ(ms32_bgram_r) - AM_RANGE(0xfee00000, 0xfee1ffff) AM_READ(MRA32_RAM) - AM_RANGE(0xffe00000, 0xffffffff) AM_READ(MRA32_BANK1) + AM_RANGE(0xfee00000, 0xfee1ffff) AM_READ(SMH_RAM) + AM_RANGE(0xffe00000, 0xffffffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static WRITE32_HANDLER( pip_w ) @@ -367,49 +367,49 @@ static WRITE32_HANDLER( pip_w ) } static ADDRESS_MAP_START( ms32_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x001fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0xfc000000, 0xfc007fff) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_fc000000) // NVRAM? + AM_RANGE(0x00000000, 0x001fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xfc000000, 0xfc007fff) AM_WRITE(SMH_RAM) AM_BASE(&ms32_fc000000) // NVRAM? AM_RANGE(0xfc800000, 0xfc800003) AM_WRITE(ms32_sound_w) /* sound? */ AM_RANGE(0xfce00000, 0xfce00003) AM_WRITE(ms32_gfxctrl_w) /* flip screen + other unknown bits */ - AM_RANGE(0xfce00034, 0xfce00037) AM_WRITE(MWA32_NOP) // irq ack? + AM_RANGE(0xfce00034, 0xfce00037) AM_WRITE(SMH_NOP) // irq ack? AM_RANGE(0xfce00038, 0xfce0003b) AM_WRITE(reset_sub_w) - AM_RANGE(0xfce00050, 0xfce0005f) AM_WRITE(MWA32_NOP) // watchdog? I haven't investigated -// AM_RANGE(0xfce00000, 0xfce0007f) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_fce00000) /* registers not ram? */ + AM_RANGE(0xfce00050, 0xfce0005f) AM_WRITE(SMH_NOP) // watchdog? I haven't investigated +// AM_RANGE(0xfce00000, 0xfce0007f) AM_WRITE(SMH_RAM) AM_BASE(&ms32_fce00000) /* registers not ram? */ AM_RANGE(0xfce00280, 0xfce0028f) AM_WRITE(ms32_brightness_w) // global brightness control - AM_RANGE(0xfce00600, 0xfce0065f) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_roz_ctrl) /* roz control registers */ + AM_RANGE(0xfce00600, 0xfce0065f) AM_WRITE(SMH_RAM) AM_BASE(&ms32_roz_ctrl) /* roz control registers */ // { 0xfce00800, 0xfce0085f, // f1superb, roz #2 control? - AM_RANGE(0xfce00a00, 0xfce00a17) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_tx_scroll) /* tx layer scroll */ - AM_RANGE(0xfce00a20, 0xfce00a37) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_bg_scroll) /* bg layer scroll */ + AM_RANGE(0xfce00a00, 0xfce00a17) AM_WRITE(SMH_RAM) AM_BASE(&ms32_tx_scroll) /* tx layer scroll */ + AM_RANGE(0xfce00a20, 0xfce00a37) AM_WRITE(SMH_RAM) AM_BASE(&ms32_bg_scroll) /* bg layer scroll */ AM_RANGE(0xfce00a7c, 0xfce00a7f) AM_WRITE(pip_w) // ??? layer related? seems to be always 0 // AM_RANGE(0xfce00e00, 0xfce00e03) coin counters + something else -// AM_RANGE(0xfd104000, 0xfd105fff) AM_WRITE(MWA32_RAM) /* f1superb */ -// AM_RANGE(0xfd144000, 0xfd145fff) AM_WRITE(MWA32_RAM) /* f1superb */ +// AM_RANGE(0xfd104000, 0xfd105fff) AM_WRITE(SMH_RAM) /* f1superb */ +// AM_RANGE(0xfd144000, 0xfd145fff) AM_WRITE(SMH_RAM) /* f1superb */ AM_RANGE(0xfd180000, 0xfd19ffff) AM_WRITE(ms32_priram_w) AM_BASE(&ms32_priram) /* priority ram */ AM_RANGE(0xfd1a0000, 0xfd1bffff) AM_WRITE(ms32_priram_w) /* mirror only used by memory test in service mode */ - AM_RANGE(0xfd1c0000, 0xfd1c0003) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_mahjong_input_select) // ? + AM_RANGE(0xfd1c0000, 0xfd1c0003) AM_WRITE(SMH_RAM) AM_BASE(&ms32_mahjong_input_select) // ? AM_RANGE(0xfd400000, 0xfd43ffff) AM_WRITE(ms32_palram_w) AM_BASE(&ms32_palram) /* Palette */ -///**/AM_RANGE(0xfd440000, 0xfd47ffff) AM_WRITE(MWA32_RAM) /* f1superb color */ -// AM_RANGE(0xfdc00000, 0xfdc006ff) AM_WRITE(MWA32_RAM) /* f1superb */ -// AM_RANGE(0xfde00000, 0xfde01fff) AM_WRITE(MWA32_RAM) /* f1superb, lineram #2? */ +///**/AM_RANGE(0xfd440000, 0xfd47ffff) AM_WRITE(SMH_RAM) /* f1superb color */ +// AM_RANGE(0xfdc00000, 0xfdc006ff) AM_WRITE(SMH_RAM) /* f1superb */ +// AM_RANGE(0xfde00000, 0xfde01fff) AM_WRITE(SMH_RAM) /* f1superb, lineram #2? */ AM_RANGE(0xfe000000, 0xfe01ffff) AM_WRITE(ms32_rozram_w) AM_BASE(&ms32_rozram) /* roz layer */ AM_RANGE(0xfe020000, 0xfe03ffff) AM_WRITE(ms32_rozram_w) /* mirror only used by memory test in service mode */ - AM_RANGE(0xfe1ffc88, 0xfe1fffff) AM_WRITE(MWA32_NOP) /* gratia writes here before falling into lineram, could be a mirror */ + AM_RANGE(0xfe1ffc88, 0xfe1fffff) AM_WRITE(SMH_NOP) /* gratia writes here before falling into lineram, could be a mirror */ AM_RANGE(0xfe200000, 0xfe201fff) AM_WRITE(ms32_lineram_w) AM_BASE(&ms32_lineram) /* line ram for roz layer */ -///**/AM_RANGE(0xfe202000, 0xfe2fffff) AM_WRITE(MWA32_RAM) /* f1superb vram */ -///**/AM_RANGE(0xfe100000, 0xfe1fffff) AM_WRITE(MWA32_RAM) /* gratia writes here ?! */ +///**/AM_RANGE(0xfe202000, 0xfe2fffff) AM_WRITE(SMH_RAM) /* f1superb vram */ +///**/AM_RANGE(0xfe100000, 0xfe1fffff) AM_WRITE(SMH_RAM) /* gratia writes here ?! */ AM_RANGE(0xfe800000, 0xfe83ffff) AM_WRITE(ms32_spram_w) AM_BASE(&ms32_spram) /* sprites */ AM_RANGE(0xfe840000, 0xfe87ffff) AM_WRITE(ms32_spram_w) /* mirror only used by memory test in service mode */ AM_RANGE(0xfec00000, 0xfec07fff) AM_WRITE(ms32_txram_w) AM_BASE(&ms32_txram) /* tx layer */ AM_RANGE(0xfec08000, 0xfec0ffff) AM_WRITE(ms32_bgram_w) AM_BASE(&ms32_bgram) /* bg layer */ AM_RANGE(0xfec10000, 0xfec17fff) AM_WRITE(ms32_txram_w) /* mirror only used by memory test in service mode */ AM_RANGE(0xfec18000, 0xfec1ffff) AM_WRITE(ms32_bgram_w) /* mirror used by gametngk at the beginning of the game */ - AM_RANGE(0xfee00000, 0xfee1ffff) AM_WRITE(MWA32_RAM) AM_BASE(&ms32_mainram) - AM_RANGE(0xffe00000, 0xffffffff) AM_WRITE(MWA32_ROM) + AM_RANGE(0xfee00000, 0xfee1ffff) AM_WRITE(SMH_RAM) AM_BASE(&ms32_mainram) + AM_RANGE(0xffe00000, 0xffffffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /************************************* @@ -1323,25 +1323,25 @@ static WRITE8_HANDLER( to_main_w ) } static ADDRESS_MAP_START( ms32_snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3eff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x3eff) AM_READ(SMH_ROM) AM_RANGE(0x3f00, 0x3f0f) AM_READ(YMF271_0_r) AM_RANGE(0x3f10, 0x3f10) AM_READ(latch_r) - AM_RANGE(0x3f20, 0x3f20) AM_READ(MRA8_NOP) /* 2nd latch ? */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK4) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_BANK5) + AM_RANGE(0x3f20, 0x3f20) AM_READ(SMH_NOP) /* 2nd latch ? */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK4) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_BANK5) ADDRESS_MAP_END static ADDRESS_MAP_START( ms32_snd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3eff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x3eff) AM_WRITE(SMH_ROM) AM_RANGE(0x3f00, 0x3f0f) AM_WRITE(YMF271_0_w) AM_RANGE(0x3f10, 0x3f10) AM_WRITE(to_main_w) - AM_RANGE(0x3f20, 0x3f20) AM_WRITE(MWA8_NOP) /* to_main2_w ? */ - AM_RANGE(0x3f40, 0x3f40) AM_WRITE(MWA8_NOP) /* YMF271 pin 4 (bit 1) , YMF271 pin 39 (bit 4) */ - AM_RANGE(0x3f70, 0x3f70) AM_WRITE(MWA8_NOP) // watchdog? banking? very noisy + AM_RANGE(0x3f20, 0x3f20) AM_WRITE(SMH_NOP) /* to_main2_w ? */ + AM_RANGE(0x3f40, 0x3f40) AM_WRITE(SMH_NOP) /* YMF271 pin 4 (bit 1) , YMF271 pin 39 (bit 4) */ + AM_RANGE(0x3f70, 0x3f70) AM_WRITE(SMH_NOP) // watchdog? banking? very noisy AM_RANGE(0x3f80, 0x3f80) AM_WRITE(ms32_snd_bank_w) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static const struct YMF271interface ymf271_interface = diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c index 4e1e2150601..f5d9fe11282 100644 --- a/src/mame/drivers/msisaac.c +++ b/src/mame/drivers/msisaac.c @@ -218,8 +218,8 @@ static WRITE8_HANDLER( msisaac_mcu_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) AM_RANGE(0xf0e0, 0xf0e0) AM_READ(msisaac_mcu_r) AM_RANGE(0xf0e1, 0xf0e1) AM_READ(msisaac_mcu_status_r) @@ -233,8 +233,8 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe800, 0xefff) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_BASE(&paletteram) @@ -243,11 +243,11 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf0a3, 0xf0a3) AM_WRITE(ms_unknown_w) //???? written in interrupt routine AM_RANGE(0xf060, 0xf060) AM_WRITE(sound_command_w) //sound command - AM_RANGE(0xf061, 0xf061) AM_WRITE(MWA8_NOP) /*sound_reset*/ //???? + AM_RANGE(0xf061, 0xf061) AM_WRITE(SMH_NOP) /*sound_reset*/ //???? AM_RANGE(0xf000, 0xf000) AM_WRITE(msisaac_bg2_textbank_w) - AM_RANGE(0xf001, 0xf001) AM_WRITE(MWA8_RAM) //??? - AM_RANGE(0xf002, 0xf002) AM_WRITE(MWA8_RAM) //??? + AM_RANGE(0xf001, 0xf001) AM_WRITE(SMH_RAM) //??? + AM_RANGE(0xf002, 0xf002) AM_WRITE(SMH_RAM) //??? AM_RANGE(0xf0c0, 0xf0c0) AM_WRITE(msisaac_fg_scrollx_w) AM_RANGE(0xf0c1, 0xf0c1) AM_WRITE(msisaac_fg_scrolly_w) @@ -258,7 +258,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf0e0, 0xf0e0) AM_WRITE(msisaac_mcu_w) - AM_RANGE(0xf100, 0xf17f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) //sprites + AM_RANGE(0xf100, 0xf17f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) //sprites AM_RANGE(0xf400, 0xf7ff) AM_WRITE(msisaac_fg_videoram_w) AM_BASE(&videoram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(msisaac_bg2_videoram_w) AM_BASE(&msisaac_videoram2) AM_RANGE(0xfc00, 0xffff) AM_WRITE(msisaac_bg_videoram_w) AM_BASE(&msisaac_videoram) @@ -271,10 +271,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_NOP) /*space for diagnostic ROM (not dumped, not reachable) */ + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_NOP) /*space for diagnostic ROM (not dumped, not reachable) */ ADDRESS_MAP_END @@ -326,8 +326,8 @@ static WRITE8_HANDLER( sound_control_1_w ) static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_0_w) @@ -339,7 +339,7 @@ static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc001, 0xc001) AM_WRITE(nmi_enable_w) AM_RANGE(0xc002, 0xc002) AM_WRITE(nmi_disable_w) - AM_RANGE(0xc003, 0xc003) AM_WRITE(MWA8_NOP) /*???*/ /* this is NOT mixer_enable */ + AM_RANGE(0xc003, 0xc003) AM_WRITE(SMH_NOP) /*???*/ /* this is NOT mixer_enable */ ADDRESS_MAP_END @@ -350,8 +350,8 @@ static ADDRESS_MAP_START( mcu_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(buggychl_68705_portA_r) AM_RANGE(0x0001, 0x0001) AM_READ(buggychl_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(buggychl_68705_portC_r) - AM_RANGE(0x0010, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -362,8 +362,8 @@ static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0004, 0x0004) AM_WRITE(buggychl_68705_ddrA_w) AM_RANGE(0x0005, 0x0005) AM_WRITE(buggychl_68705_ddrB_w) AM_RANGE(0x0006, 0x0006) AM_WRITE(buggychl_68705_ddrC_w) - AM_RANGE(0x0010, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END #endif diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c index 06df1aade81..760a5f2e463 100644 --- a/src/mame/drivers/mugsmash.c +++ b/src/mame/drivers/mugsmash.c @@ -179,15 +179,15 @@ static READ16_HANDLER ( mugsmash_input_ports_r ) #endif static ADDRESS_MAP_START( mugsmash_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) - AM_RANGE(0x082000, 0x082fff) AM_READ(MRA16_RAM) - AM_RANGE(0x100000, 0x1001ff) AM_READ(MRA16_RAM) - AM_RANGE(0x100200, 0x1005ff) AM_READ(MRA16_RAM) - AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x1c4000, 0x1cffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) - AM_RANGE(0x202000, 0x203fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) + AM_RANGE(0x082000, 0x082fff) AM_READ(SMH_RAM) + AM_RANGE(0x100000, 0x1001ff) AM_READ(SMH_RAM) + AM_RANGE(0x100200, 0x1005ff) AM_READ(SMH_RAM) + AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(SMH_RAM) + AM_RANGE(0x1c4000, 0x1cffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) + AM_RANGE(0x202000, 0x203fff) AM_READ(SMH_RAM) #if USE_FAKE_INPUT_PORTS AM_RANGE(0x180000, 0x180007) AM_READ(mugsmash_input_ports_r) #else @@ -199,28 +199,28 @@ static ADDRESS_MAP_START( mugsmash_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mugsmash_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080000, 0x080fff) AM_WRITE(mugsmash_videoram1_w) AM_BASE(&mugsmash_videoram1) AM_RANGE(0x082000, 0x082fff) AM_WRITE(mugsmash_videoram2_w) AM_BASE(&mugsmash_videoram2) AM_RANGE(0x0C0000, 0x0C0007) AM_WRITE(mugsmash_reg_w) AM_BASE(&mugsmash_regs1) /* video registers*/ AM_RANGE(0x100000, 0x1005ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x140000, 0x140007) AM_WRITE(mugsmash_reg2_w) AM_BASE(&mugsmash_regs2) /* sound + ? */ - AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(MWA16_RAM) /* main ram? */ - AM_RANGE(0x1c4000, 0x1cffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x200000, 0x203fff) AM_WRITE(MWA16_RAM) AM_BASE(&mugs_spriteram) /* sprite ram */ + AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(SMH_RAM) /* main ram? */ + AM_RANGE(0x1c4000, 0x1cffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x200000, 0x203fff) AM_WRITE(SMH_RAM) AM_BASE(&mugs_spriteram) /* sprite ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8801, 0x8801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( snd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index 110a5981444..ab50e56db58 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -68,15 +68,15 @@ static WRITE8_HANDLER( sound_nmi_ack_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) /* working RAM */ - AM_RANGE(0xa000, 0xa3ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) /* working RAM */ + AM_RANGE(0xa000, 0xa3ff) AM_READ(SMH_RAM) AM_RANGE(0xa400, 0xa7ff) AM_READ(mnchmobl_sprite_xpos_r) /* mirrored */ - AM_RANGE(0xa800, 0xabff) AM_READ(MRA8_RAM) + AM_RANGE(0xa800, 0xabff) AM_READ(SMH_RAM) AM_RANGE(0xac00, 0xafff) AM_READ(mnchmobl_sprite_tile_r) /* mirrored */ - AM_RANGE(0xb000, 0xb3ff) AM_READ(MRA8_RAM) + AM_RANGE(0xb000, 0xb3ff) AM_READ(SMH_RAM) AM_RANGE(0xb400, 0xb7ff) AM_READ(mnchmobl_sprite_attr_r) /* mirrored */ - AM_RANGE(0xb800, 0xb8ff) AM_MIRROR(0x0100) AM_READ(MRA8_RAM) + AM_RANGE(0xb800, 0xb8ff) AM_MIRROR(0x0100) AM_READ(SMH_RAM) AM_RANGE(0xbe02, 0xbe02) AM_READ(input_port_3_r) /* DSW1 */ AM_RANGE(0xbe03, 0xbe03) AM_READ(input_port_4_r) /* DSW2 */ AM_RANGE(0xbf01, 0xbf01) AM_READ(input_port_0_r) /* coin, start */ @@ -85,43 +85,43 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) /* working RAM */ - AM_RANGE(0xa000, 0xa3ff) AM_WRITE(MWA8_RAM) AM_BASE(&mnchmobl_sprite_xpos) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) /* working RAM */ + AM_RANGE(0xa000, 0xa3ff) AM_WRITE(SMH_RAM) AM_BASE(&mnchmobl_sprite_xpos) AM_RANGE(0xa400, 0xa7ff) AM_WRITE(mnchmobl_sprite_xpos_w) - AM_RANGE(0xa800, 0xabff) AM_WRITE(MWA8_RAM) AM_BASE(&mnchmobl_sprite_tile) + AM_RANGE(0xa800, 0xabff) AM_WRITE(SMH_RAM) AM_BASE(&mnchmobl_sprite_tile) AM_RANGE(0xac00, 0xafff) AM_WRITE(mnchmobl_sprite_tile_w) - AM_RANGE(0xb000, 0xb3ff) AM_WRITE(MWA8_RAM) AM_BASE(&mnchmobl_sprite_attr) + AM_RANGE(0xb000, 0xb3ff) AM_WRITE(SMH_RAM) AM_BASE(&mnchmobl_sprite_attr) AM_RANGE(0xb400, 0xb7ff) AM_WRITE(mnchmobl_sprite_attr_w) - AM_RANGE(0xb800, 0xb8ff) AM_MIRROR(0x0100) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) - AM_RANGE(0xba00, 0xbbff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xbc00, 0xbc7f) AM_WRITE(MWA8_RAM) AM_BASE(&mnchmobl_status_vram) + AM_RANGE(0xb800, 0xb8ff) AM_MIRROR(0x0100) AM_WRITE(SMH_RAM) AM_BASE(&videoram) + AM_RANGE(0xba00, 0xbbff) AM_WRITE(SMH_RAM) + AM_RANGE(0xbc00, 0xbc7f) AM_WRITE(SMH_RAM) AM_BASE(&mnchmobl_status_vram) AM_RANGE(0xbe00, 0xbe00) AM_WRITE(mnchmobl_soundlatch_w) AM_RANGE(0xbe01, 0xbe01) AM_WRITE(mnchmobl_palette_bank_w) - AM_RANGE(0xbe11, 0xbe11) AM_WRITE(MWA8_RAM) /* ? */ - AM_RANGE(0xbe21, 0xbe21) AM_WRITE(MWA8_RAM) /* ? */ - AM_RANGE(0xbe31, 0xbe31) AM_WRITE(MWA8_RAM) /* ? */ + AM_RANGE(0xbe11, 0xbe11) AM_WRITE(SMH_RAM) /* ? */ + AM_RANGE(0xbe21, 0xbe21) AM_WRITE(SMH_RAM) /* ? */ + AM_RANGE(0xbe31, 0xbe31) AM_WRITE(SMH_RAM) /* ? */ AM_RANGE(0xbe41, 0xbe41) AM_WRITE(mnchmobl_flipscreen_w) AM_RANGE(0xbe61, 0xbe61) AM_WRITE(mnchmobl_nmi_enable_w) /* ENI 1-10C */ - AM_RANGE(0xbf00, 0xbf07) AM_WRITE(MWA8_RAM) AM_BASE(&mnchmobl_vreg) /* MY0 1-8C */ + AM_RANGE(0xbf00, 0xbf07) AM_WRITE(SMH_RAM) AM_BASE(&mnchmobl_vreg) /* MY0 1-8C */ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0x2000, 0x2000) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x5000, 0x5000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_control_port_1_w) - AM_RANGE(0x8000, 0x8000) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xa000, 0xa000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xc000, 0xc000) AM_WRITE(sound_nmi_ack_w) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static INPUT_PORTS_START( mnchmobl ) diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c index db8de534268..f15ef4ffab0 100644 --- a/src/mame/drivers/murogem.c +++ b/src/mame/drivers/murogem.c @@ -106,7 +106,7 @@ static ADDRESS_MAP_START( murogem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4001, 0x4001) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w) AM_RANGE(0x5000, 0x5000) AM_READ(input_port_0_r) AM_RANGE(0x5800, 0x5800) AM_READ(input_port_1_r) - AM_RANGE(0x7000, 0x7000) AM_WRITE(MWA8_NOP) // sound? payout? + AM_RANGE(0x7000, 0x7000) AM_WRITE(SMH_NOP) // sound? payout? AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&murogem_videoram) AM_RANGE(0xf000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c index 0494245609c..09e7263008a 100644 --- a/src/mame/drivers/mustache.c +++ b/src/mame/drivers/mustache.c @@ -62,7 +62,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_ROM - AM_RANGE(0xc000, 0xcfff) AM_READWRITE(MRA8_RAM, mustache_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xc000, 0xcfff) AM_READWRITE(SMH_RAM, mustache_videoram_w) AM_BASE(&videoram) AM_RANGE(0xd000, 0xd000) AM_WRITE(t5182_sound_irq_w) AM_RANGE(0xd001, 0xd001) AM_READ(t5182_sharedram_semaphore_snd_r) AM_RANGE(0xd002, 0xd002) AM_WRITE(t5182_sharedram_semaphore_main_acquire_w) @@ -75,7 +75,7 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r) /* DSW B */ AM_RANGE(0xd806, 0xd806) AM_WRITE(mustache_scroll_w) AM_RANGE(0xd807, 0xd807) AM_WRITE(mustache_video_control_w) - AM_RANGE(0xe800, 0xefff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe800, 0xefff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c index 5bd08ee2077..d0052cd8287 100644 --- a/src/mame/drivers/mystston.c +++ b/src/mame/drivers/mystston.c @@ -112,9 +112,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x1fff) AM_RAM AM_BASE_MEMBER(mystston_state, bg_videoram) AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x1f8f) AM_READ_PORT("IN0") AM_WRITE(mystston_video_control_w) AM_BASE_MEMBER(mystston_state, video_control) AM_RANGE(0x2010, 0x2010) AM_MIRROR(0x1f8f) AM_READ_PORT("IN1") AM_WRITE(irq_clear_w) - AM_RANGE(0x2020, 0x2020) AM_MIRROR(0x1f8f) AM_READ_PORT("DSW0") AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(mystston_state, scroll) - AM_RANGE(0x2030, 0x2030) AM_MIRROR(0x1f8f) AM_READ_PORT("DSW1") AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(mystston_state, ay8910_data) - AM_RANGE(0x2040, 0x2040) AM_MIRROR(0x1f8f) AM_READWRITE(MRA8_NOP, mystston_ay8910_select_w) AM_BASE_MEMBER(mystston_state, ay8910_select) + AM_RANGE(0x2020, 0x2020) AM_MIRROR(0x1f8f) AM_READ_PORT("DSW0") AM_WRITE(SMH_RAM) AM_BASE_MEMBER(mystston_state, scroll) + AM_RANGE(0x2030, 0x2030) AM_MIRROR(0x1f8f) AM_READ_PORT("DSW1") AM_WRITE(SMH_RAM) AM_BASE_MEMBER(mystston_state, ay8910_data) + AM_RANGE(0x2040, 0x2040) AM_MIRROR(0x1f8f) AM_READWRITE(SMH_NOP, mystston_ay8910_select_w) AM_BASE_MEMBER(mystston_state, ay8910_select) AM_RANGE(0x2050, 0x2050) AM_MIRROR(0x1f8f) AM_NOP AM_RANGE(0x2060, 0x207f) AM_MIRROR(0x1f80) AM_RAM AM_BASE_MEMBER(mystston_state, paletteram) AM_RANGE(0x4000, 0xffff) AM_ROM diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index 0f5ed749202..d86a8c5a805 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -391,8 +391,8 @@ static WRITE16_HANDLER( K053247_scattered_word_w ) /* 68000 memory handlers */ /* Mystic Warriors */ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) // main program - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) // main program + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) AM_RANGE(0x400000, 0x40ffff) AM_READ(K053247_scattered_word_r) AM_RANGE(0x482000, 0x48200f) AM_READ(K055673_rom_word_r) AM_RANGE(0x494000, 0x494001) AM_READ(player1_r) @@ -400,11 +400,11 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x496000, 0x496001) AM_READ(mmcoins_r) AM_RANGE(0x496002, 0x496003) AM_READ(mweeprom_r) AM_RANGE(0x498014, 0x498015) AM_READ(sound_status_r) - AM_RANGE(0x498000, 0x49801f) AM_READ(MRA16_RAM) + AM_RANGE(0x498000, 0x49801f) AM_READ(SMH_RAM) AM_RANGE(0x600000, 0x601fff) AM_READ(K056832_ram_word_r) AM_RANGE(0x602000, 0x603fff) AM_READ(K056832_ram_word_r) // tilemap RAM mirror read(essential) AM_RANGE(0x680000, 0x683fff) AM_READ(K056832_mw_rom_word_r) - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) #if MW_DEBUG AM_RANGE(0x480000, 0x4800ff) AM_READ(K055555_word_r) AM_RANGE(0x482010, 0x48201f) AM_READ(K053247_reg_word_r) @@ -416,7 +416,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) AM_BASE(&gx_workram) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_BASE(&gx_workram) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(K053247_scattered_word_w) AM_BASE(&spriteram16) AM_RANGE(0x480000, 0x4800ff) AM_WRITE(K055555_word_w) AM_RANGE(0x482010, 0x48201f) AM_WRITE(K053247_reg_word_w) @@ -424,10 +424,10 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x48a000, 0x48a01f) AM_WRITE(K054338_word_w) AM_RANGE(0x48c000, 0x48c03f) AM_WRITE(K056832_word_w) AM_RANGE(0x490000, 0x490001) AM_WRITE(mweeprom_w) - AM_RANGE(0x492000, 0x492001) AM_WRITE(MWA16_NOP) // watchdog + AM_RANGE(0x492000, 0x492001) AM_WRITE(SMH_NOP) // watchdog AM_RANGE(0x49800c, 0x49800d) AM_WRITE(sound_cmd1_w) AM_RANGE(0x49800e, 0x49800f) AM_WRITE(sound_cmd2_w) - AM_RANGE(0x498000, 0x49801f) AM_WRITE(MWA16_RAM) + AM_RANGE(0x498000, 0x49801f) AM_WRITE(SMH_RAM) AM_RANGE(0x49a000, 0x49a001) AM_WRITE(sound_irq_w) AM_RANGE(0x49c000, 0x49c01f) AM_WRITE(K053252_word_w) AM_RANGE(0x49e000, 0x49e007) AM_WRITE(irq_ack_w) // VSCCS (custom) @@ -438,25 +438,25 @@ ADDRESS_MAP_END /* Metamorphic Force */ static ADDRESS_MAP_START( mmreadmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) // main program - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) // main program + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) AM_RANGE(0x210000, 0x210fff) AM_READ(K053247_word_r) - AM_RANGE(0x211000, 0x21ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x211000, 0x21ffff) AM_READ(SMH_RAM) AM_RANGE(0x244000, 0x24400f) AM_READ(K055673_rom_word_r) AM_RANGE(0x24c000, 0x24ffff) AM_READ(K053250_0_ram_r) AM_RANGE(0x250000, 0x25000f) AM_READ(K053250_0_r) AM_RANGE(0x268014, 0x268015) AM_READ(sound_status_r) - AM_RANGE(0x268000, 0x26801f) AM_READ(MRA16_RAM) + AM_RANGE(0x268000, 0x26801f) AM_READ(SMH_RAM) AM_RANGE(0x274000, 0x274001) AM_READ(mmplayer1_r) AM_RANGE(0x274002, 0x274003) AM_READ(mmplayer2_r) AM_RANGE(0x278000, 0x278001) AM_READ(mmcoins_r) AM_RANGE(0x278002, 0x278003) AM_READ(vseeprom_r) - AM_RANGE(0x27c000, 0x27c001) AM_READ(MRA16_NOP) // watchdog lives here + AM_RANGE(0x27c000, 0x27c001) AM_READ(SMH_NOP) // watchdog lives here AM_RANGE(0x300000, 0x301fff) AM_READ(K056832_ram_word_r) AM_RANGE(0x302000, 0x303fff) AM_READ(K056832_ram_word_r) // tilemap RAM mirror read(essential) AM_RANGE(0x310000, 0x311fff) AM_READ(K056832_mw_rom_word_r) AM_RANGE(0x320000, 0x321fff) AM_READ(K053250_0_rom_r) - AM_RANGE(0x330000, 0x331fff) AM_READ(MRA16_RAM) + AM_RANGE(0x330000, 0x331fff) AM_READ(SMH_RAM) #if MW_DEBUG AM_RANGE(0x240000, 0x240007) AM_READ(K053246_reg_word_r) AM_RANGE(0x244010, 0x24401f) AM_READ(K053247_reg_word_r) @@ -469,9 +469,9 @@ static ADDRESS_MAP_START( mmreadmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mmwritemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) AM_BASE(&gx_workram) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_BASE(&gx_workram) AM_RANGE(0x210000, 0x210fff) AM_WRITE(K053247_word_w) - AM_RANGE(0x211000, 0x21ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x211000, 0x21ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x240000, 0x240007) AM_WRITE(K053246_word_w) AM_RANGE(0x244010, 0x24401f) AM_WRITE(K053247_reg_word_w) AM_RANGE(0x24c000, 0x24ffff) AM_WRITE(K053250_0_ram_w) // "LVC RAM" (53250_ram) @@ -482,7 +482,7 @@ static ADDRESS_MAP_START( mmwritemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x264000, 0x264001) AM_WRITE(sound_irq_w) AM_RANGE(0x26800c, 0x26800d) AM_WRITE(sound_cmd1_w) AM_RANGE(0x26800e, 0x26800f) AM_WRITE(sound_cmd2_w) - AM_RANGE(0x268000, 0x26801f) AM_WRITE(MWA16_RAM) + AM_RANGE(0x268000, 0x26801f) AM_WRITE(SMH_RAM) AM_RANGE(0x26C000, 0x26C007) AM_WRITE(K056832_b_word_w) AM_RANGE(0x270000, 0x27003f) AM_WRITE(K056832_word_w) AM_RANGE(0x27C000, 0x27C001) AM_WRITE(mmeeprom_w) @@ -493,26 +493,26 @@ ADDRESS_MAP_END /* Violent Storm */ static ADDRESS_MAP_START( vsreadmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) // main program - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) // main program + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) AM_RANGE(0x210000, 0x210fff) AM_READ(K053247_word_r) - AM_RANGE(0x211000, 0x21ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x211000, 0x21ffff) AM_READ(SMH_RAM) AM_RANGE(0x244000, 0x24400f) AM_READ(K055673_rom_word_r) - AM_RANGE(0x24c000, 0x24ffff) AM_READ(MRA16_RAM) // K053250_0_ram_r - AM_RANGE(0x250000, 0x25000f) AM_READ(MRA16_RAM) // K053250_0_r + AM_RANGE(0x24c000, 0x24ffff) AM_READ(SMH_RAM) // K053250_0_ram_r + AM_RANGE(0x250000, 0x25000f) AM_READ(SMH_RAM) // K053250_0_r AM_RANGE(0x25c000, 0x25c03f) AM_READ(K055550_word_r) AM_RANGE(0x268014, 0x268015) AM_READ(sound_status_r) - AM_RANGE(0x268000, 0x26801f) AM_READ(MRA16_RAM) + AM_RANGE(0x268000, 0x26801f) AM_READ(SMH_RAM) AM_RANGE(0x274000, 0x274001) AM_READ(mmplayer1_r) AM_RANGE(0x274002, 0x274003) AM_READ(mmplayer2_r) AM_RANGE(0x278000, 0x278001) AM_READ(mmcoins_r) AM_RANGE(0x278002, 0x278003) AM_READ(vseeprom_r) - AM_RANGE(0x27c000, 0x27c001) AM_READ(MRA16_NOP) // watchdog lives here + AM_RANGE(0x27c000, 0x27c001) AM_READ(SMH_NOP) // watchdog lives here AM_RANGE(0x300000, 0x301fff) AM_READ(K056832_ram_word_r) AM_RANGE(0x302000, 0x303fff) AM_READ(K056832_ram_word_r) // tilemap RAM mirror read(essential) - AM_RANGE(0x304000, 0x3041ff) AM_READ(MRA16_RAM) + AM_RANGE(0x304000, 0x3041ff) AM_READ(SMH_RAM) AM_RANGE(0x310000, 0x311fff) AM_READ(K056832_mw_rom_word_r) - AM_RANGE(0x330000, 0x331fff) AM_READ(MRA16_RAM) + AM_RANGE(0x330000, 0x331fff) AM_READ(SMH_RAM) #if MW_DEBUG AM_RANGE(0x240000, 0x240007) AM_READ(K053246_reg_word_r) AM_RANGE(0x244010, 0x24401f) AM_READ(K053247_reg_word_r) @@ -525,13 +525,13 @@ static ADDRESS_MAP_START( vsreadmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( vswritemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) AM_BASE(&gx_workram) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_BASE(&gx_workram) AM_RANGE(0x210000, 0x210fff) AM_WRITE(K053247_word_w) - AM_RANGE(0x211000, 0x21ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x211000, 0x21ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x240000, 0x240007) AM_WRITE(K053246_word_w) AM_RANGE(0x244010, 0x24401f) AM_WRITE(K053247_reg_word_w) - AM_RANGE(0x24c000, 0x24ffff) AM_WRITE(MWA16_RAM) // K053250_0_ram_w - AM_RANGE(0x250000, 0x25000f) AM_WRITE(MWA16_RAM) // K053250_0_w + AM_RANGE(0x24c000, 0x24ffff) AM_WRITE(SMH_RAM) // K053250_0_ram_w + AM_RANGE(0x250000, 0x25000f) AM_WRITE(SMH_RAM) // K053250_0_w AM_RANGE(0x254000, 0x25401f) AM_WRITE(K054338_word_w) AM_RANGE(0x258000, 0x2580ff) AM_WRITE(K055555_word_w) AM_RANGE(0x25c000, 0x25c03f) AM_WRITE(K055550_word_w) @@ -539,13 +539,13 @@ static ADDRESS_MAP_START( vswritemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x264000, 0x264001) AM_WRITE(sound_irq_w) AM_RANGE(0x26800c, 0x26800d) AM_WRITE(sound_cmd1_w) AM_RANGE(0x26800e, 0x26800f) AM_WRITE(sound_cmd2_w) - AM_RANGE(0x268000, 0x26801f) AM_WRITE(MWA16_RAM) + AM_RANGE(0x268000, 0x26801f) AM_WRITE(SMH_RAM) AM_RANGE(0x26C000, 0x26C007) AM_WRITE(K056832_b_word_w) AM_RANGE(0x270000, 0x27003f) AM_WRITE(K056832_word_w) AM_RANGE(0x27C000, 0x27C001) AM_WRITE(mmeeprom_w) AM_RANGE(0x300000, 0x301fff) AM_WRITE(K056832_ram_word_w) AM_RANGE(0x302000, 0x303fff) AM_WRITE(K056832_ram_word_w) // tilemap RAM mirror write(essential) - AM_RANGE(0x304000, 0x3041ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x304000, 0x3041ff) AM_WRITE(SMH_RAM) AM_RANGE(0x330000, 0x331fff) AM_WRITE(paletteram16_xrgb_word_be_w) AM_BASE(&paletteram16) ADDRESS_MAP_END @@ -601,9 +601,9 @@ static WRITE16_HANDLER( mccontrol_w ) /* Martial Champion */ static ADDRESS_MAP_START( mcreadmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) // main program - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) // work RAM - AM_RANGE(0x300000, 0x3fffff) AM_READ(MRA16_ROM) // data ROM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) // main program + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) // work RAM + AM_RANGE(0x300000, 0x3fffff) AM_READ(SMH_ROM) // data ROM AM_RANGE(0x402000, 0x40200f) AM_READ(K055673_rom_word_r) // sprite ROM readback AM_RANGE(0x412000, 0x412001) AM_READ(mccontrol_r) AM_RANGE(0x414000, 0x414001) AM_READ(player1_r) @@ -611,9 +611,9 @@ static ADDRESS_MAP_START( mcreadmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x416000, 0x416001) AM_READ(mmcoins_r) // coin AM_RANGE(0x416002, 0x416003) AM_READ(mweeprom_r) // eeprom read AM_RANGE(0x418014, 0x418015) AM_READ(sound_status_r) // z80 status - AM_RANGE(0x418000, 0x41801f) AM_READ(MRA16_RAM) // sound regs fall through + AM_RANGE(0x418000, 0x41801f) AM_READ(SMH_RAM) // sound regs fall through AM_RANGE(0x480000, 0x483fff) AM_READ(K053247_martchmp_word_r)// sprite RAM - AM_RANGE(0x600000, 0x601fff) AM_READ(MRA16_RAM) // palette RAM + AM_RANGE(0x600000, 0x601fff) AM_READ(SMH_RAM) // palette RAM AM_RANGE(0x680000, 0x681fff) AM_READ(K056832_ram_word_r) // tilemap RAM AM_RANGE(0x682000, 0x683fff) AM_READ(K056832_ram_word_r) // tilemap RAM mirror read(essential) AM_RANGE(0x700000, 0x703fff) AM_READ(K056832_mw_rom_word_r) // tile ROM readback @@ -629,7 +629,7 @@ static ADDRESS_MAP_START( mcreadmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mcwritemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) AM_BASE(&gx_workram) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_BASE(&gx_workram) AM_RANGE(0x400000, 0x4000ff) AM_WRITE(K055555_word_w) // PCU2 AM_RANGE(0x402010, 0x40201f) AM_WRITE(K053247_reg_word_w) // OBJSET2 AM_RANGE(0x404000, 0x404007) AM_WRITE(K053246_word_w) // OBJSET1 @@ -642,7 +642,7 @@ static ADDRESS_MAP_START( mcwritemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x41e000, 0x41e007) AM_WRITE(K056832_b_word_w) // VSCCS AM_RANGE(0x41800c, 0x41800d) AM_WRITE(sound_cmd1_w) AM_RANGE(0x41800e, 0x41800f) AM_WRITE(sound_cmd2_w) - AM_RANGE(0x418000, 0x41801f) AM_WRITE(MWA16_RAM) // sound regs fall through + AM_RANGE(0x418000, 0x41801f) AM_WRITE(SMH_RAM) // sound regs fall through AM_RANGE(0x41a000, 0x41a001) AM_WRITE(sound_irq_w) AM_RANGE(0x480000, 0x483fff) AM_WRITE(K053247_martchmp_word_w) AM_BASE(&spriteram16) AM_RANGE(0x600000, 0x601fff) AM_WRITE(paletteram16_xrgb_word_be_w) AM_BASE(&paletteram16) @@ -652,19 +652,19 @@ ADDRESS_MAP_END /* Ultimate Battler Dadandarn */ static ADDRESS_MAP_START( dddreadmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) // main program and data ROM + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) // main program and data ROM AM_RANGE(0x400000, 0x40ffff) AM_READ(K053247_scattered_word_r) AM_RANGE(0x410000, 0x411fff) AM_READ(K056832_ram_word_r) // tilemap RAM AM_RANGE(0x412000, 0x413fff) AM_READ(K056832_ram_word_r) // tilemap RAM mirror read(essential) - AM_RANGE(0x420000, 0x421fff) AM_READ(MRA16_RAM) + AM_RANGE(0x420000, 0x421fff) AM_READ(SMH_RAM) AM_RANGE(0x440000, 0x443fff) AM_READ(K056832_mw_rom_word_r) AM_RANGE(0x450000, 0x45000f) AM_READ(K055673_rom_word_r) - AM_RANGE(0x470000, 0x470fff) AM_READ(MRA16_RAM) + AM_RANGE(0x470000, 0x470fff) AM_READ(SMH_RAM) AM_RANGE(0x48a014, 0x48a015) AM_READ(sound_status_msb_r) - AM_RANGE(0x48a000, 0x48a01f) AM_READ(MRA16_RAM) // sound regs fall-through + AM_RANGE(0x48a000, 0x48a01f) AM_READ(SMH_RAM) // sound regs fall-through AM_RANGE(0x48e000, 0x48e001) AM_READ(dddcoins_r) // bit 3 (0x8) is test switch AM_RANGE(0x48e020, 0x48e021) AM_READ(dddeeprom_r) - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM) AM_RANGE(0x680000, 0x68003f) AM_READ(K055550_word_r) AM_RANGE(0x800000, 0x87ffff) AM_READ(ddd_053936_tilerom_0_r) // 256k tilemap readback AM_RANGE(0xa00000, 0xa7ffff) AM_READ(ddd_053936_tilerom_1_r) // 128k tilemap readback @@ -687,8 +687,8 @@ static ADDRESS_MAP_START( dddwritemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x420000, 0x421fff) AM_WRITE(paletteram16_xrgb_word_be_w) AM_BASE(&paletteram16) AM_RANGE(0x430000, 0x430007) AM_WRITE(K053246_word_w) AM_RANGE(0x450010, 0x45001f) AM_WRITE(K053247_reg_word_w) - AM_RANGE(0x460000, 0x46001f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) - AM_RANGE(0x470000, 0x470fff) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_linectrl) + AM_RANGE(0x460000, 0x46001f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) + AM_RANGE(0x470000, 0x470fff) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_linectrl) AM_RANGE(0x480000, 0x48003f) AM_WRITE(K056832_word_w) // VACSET AM_RANGE(0x482000, 0x482007) AM_WRITE(K056832_b_word_w) // VSCCS AM_RANGE(0x484000, 0x484003) AM_WRITE(ddd_053936_clip_w) @@ -696,14 +696,14 @@ static ADDRESS_MAP_START( dddwritemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x488000, 0x4880ff) AM_WRITE(K055555_word_w) AM_RANGE(0x48a00c, 0x48a00d) AM_WRITE(sound_cmd1_msb_w) AM_RANGE(0x48a00e, 0x48a00f) AM_WRITE(sound_cmd2_msb_w) - AM_RANGE(0x48a000, 0x48a01f) AM_WRITE(MWA16_RAM) // sound regs fall-through + AM_RANGE(0x48a000, 0x48a01f) AM_WRITE(SMH_RAM) // sound regs fall-through AM_RANGE(0x48c000, 0x48c01f) AM_WRITE(K054338_word_w) - AM_RANGE(0x600000, 0x60ffff) AM_WRITE(MWA16_RAM) AM_BASE(&gx_workram) + AM_RANGE(0x600000, 0x60ffff) AM_WRITE(SMH_RAM) AM_BASE(&gx_workram) AM_RANGE(0x680000, 0x68003f) AM_WRITE(K055550_word_w) AM_RANGE(0x6a0000, 0x6a0001) AM_WRITE(mmeeprom_w) AM_RANGE(0x6c0000, 0x6c0001) AM_WRITE(ddd_053936_enable_w) AM_RANGE(0x6e0000, 0x6e0001) AM_WRITE(sound_irq_w) - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP) // watchdog + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP) // watchdog ADDRESS_MAP_END /* Gaiapolis */ @@ -711,19 +711,19 @@ ADDRESS_MAP_END // 800000 = the 256k tilemap // c00000 = 936 tiles (7fffff window) static ADDRESS_MAP_START( gaiareadmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x2fffff) AM_READ(MRA16_ROM) // main program + AM_RANGE(0x000000, 0x2fffff) AM_READ(SMH_ROM) // main program AM_RANGE(0x400000, 0x40ffff) AM_READ(K053247_scattered_word_r) AM_RANGE(0x410000, 0x411fff) AM_READ(K056832_ram_word_r) // tilemap RAM AM_RANGE(0x412000, 0x413fff) AM_READ(K056832_ram_word_r) // tilemap RAM mirror read(essential) - AM_RANGE(0x420000, 0x421fff) AM_READ(MRA16_RAM) + AM_RANGE(0x420000, 0x421fff) AM_READ(SMH_RAM) AM_RANGE(0x440000, 0x441fff) AM_READ(K056832_mw_rom_word_r) AM_RANGE(0x450000, 0x45000f) AM_READ(K055673_rom_word_r) - AM_RANGE(0x470000, 0x470fff) AM_READ(MRA16_RAM) + AM_RANGE(0x470000, 0x470fff) AM_READ(SMH_RAM) AM_RANGE(0x48a014, 0x48a015) AM_READ(sound_status_msb_r) - AM_RANGE(0x48a000, 0x48a01f) AM_READ(MRA16_RAM) // sound regs fall-through + AM_RANGE(0x48a000, 0x48a01f) AM_READ(SMH_RAM) // sound regs fall-through AM_RANGE(0x48e000, 0x48e001) AM_READ(dddcoins_r) // bit 3 (0x8) is test switch AM_RANGE(0x48e020, 0x48e021) AM_READ(dddeeprom_r) - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM) AM_RANGE(0x660000, 0x6600ff) AM_READ(K054000_lsb_r) AM_RANGE(0x800000, 0x87ffff) AM_READ(gai_053936_tilerom_0_r) // 256k tilemap readback AM_RANGE(0xa00000, 0xa7ffff) AM_READ(ddd_053936_tilerom_1_r) // 128k tilemap readback @@ -743,12 +743,12 @@ static ADDRESS_MAP_START( gaiawritemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(K053247_scattered_word_w) AM_BASE(&spriteram16) AM_RANGE(0x410000, 0x411fff) AM_WRITE(K056832_ram_word_w) AM_RANGE(0x412000, 0x413fff) AM_WRITE(K056832_ram_word_w) // tilemap RAM mirror write(essential) - AM_RANGE(0x412000, 0x4120ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x412000, 0x4120ff) AM_WRITE(SMH_RAM) AM_RANGE(0x420000, 0x421fff) AM_WRITE(paletteram16_xrgb_word_be_w) AM_BASE(&paletteram16) AM_RANGE(0x430000, 0x430007) AM_WRITE(K053246_word_w) AM_RANGE(0x450010, 0x45001f) AM_WRITE(K053247_reg_word_w) - AM_RANGE(0x460000, 0x46001f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) - AM_RANGE(0x470000, 0x470fff) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_linectrl) + AM_RANGE(0x460000, 0x46001f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) + AM_RANGE(0x470000, 0x470fff) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_linectrl) AM_RANGE(0x480000, 0x48003f) AM_WRITE(K056832_word_w) // VACSET AM_RANGE(0x482000, 0x482007) AM_WRITE(K056832_b_word_w) // VSCCS AM_RANGE(0x484000, 0x484003) AM_WRITE(ddd_053936_clip_w) @@ -756,14 +756,14 @@ static ADDRESS_MAP_START( gaiawritemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x488000, 0x4880ff) AM_WRITE(K055555_word_w) AM_RANGE(0x48a00c, 0x48a00d) AM_WRITE(sound_cmd1_msb_w) AM_RANGE(0x48a00e, 0x48a00f) AM_WRITE(sound_cmd2_msb_w) - AM_RANGE(0x48a000, 0x48a01f) AM_WRITE(MWA16_RAM) // sound regs fall-through + AM_RANGE(0x48a000, 0x48a01f) AM_WRITE(SMH_RAM) // sound regs fall-through AM_RANGE(0x48c000, 0x48c01f) AM_WRITE(K054338_word_w) - AM_RANGE(0x600000, 0x60ffff) AM_WRITE(MWA16_RAM) AM_BASE(&gx_workram) + AM_RANGE(0x600000, 0x60ffff) AM_WRITE(SMH_RAM) AM_BASE(&gx_workram) AM_RANGE(0x660000, 0x6600ff) AM_WRITE(K054000_lsb_w) AM_RANGE(0x6a0000, 0x6a0001) AM_WRITE(mmeeprom_w) AM_RANGE(0x6c0000, 0x6c0001) AM_WRITE(ddd_053936_enable_w) AM_RANGE(0x6e0000, 0x6e0001) AM_WRITE(sound_irq_w) - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP) // watchdog + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP) // watchdog ADDRESS_MAP_END /**********************************************************************************/ @@ -790,27 +790,27 @@ static WRITE8_HANDLER( sound_bankswitch_w ) */ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK2) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe22f) AM_READ(K054539_0_r) - AM_RANGE(0xe230, 0xe3ff) AM_READ(MRA8_RAM) + AM_RANGE(0xe230, 0xe3ff) AM_READ(SMH_RAM) AM_RANGE(0xe400, 0xe62f) AM_READ(K054539_1_r) - AM_RANGE(0xe630, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xe630, 0xe7ff) AM_READ(SMH_RAM) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_NOP) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_NOP) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe22f) AM_WRITE(K054539_0_w) - AM_RANGE(0xe230, 0xe3ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe230, 0xe3ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe400, 0xe62f) AM_WRITE(K054539_1_w) - AM_RANGE(0xe630, 0xe7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe630, 0xe7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w) AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_bankswitch_w) - AM_RANGE(0xfff0, 0xfff3) AM_WRITE(MWA8_NOP) // unknown write + AM_RANGE(0xfff0, 0xfff3) AM_WRITE(SMH_NOP) // unknown write ADDRESS_MAP_END static const struct K054539interface k054539_interface = diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c index f40001cfafc..f083351ba17 100644 --- a/src/mame/drivers/namcofl.c +++ b/src/mame/drivers/namcofl.c @@ -189,15 +189,15 @@ static WRITE32_HANDLER( namcofl_paletteram_w ) static ADDRESS_MAP_START( namcofl_mem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x000fffff) AM_READWRITE(MRA32_BANK1, MWA32_BANK1) - AM_RANGE(0x10000000, 0x100fffff) AM_READWRITE(MRA32_BANK2, MWA32_BANK2) + AM_RANGE(0x00000000, 0x000fffff) AM_READWRITE(SMH_BANK1, SMH_BANK1) + AM_RANGE(0x10000000, 0x100fffff) AM_READWRITE(SMH_BANK2, SMH_BANK2) AM_RANGE(0x20000000, 0x201fffff) AM_ROM AM_REGION(REGION_USER1, 0) /* data */ AM_RANGE(0x30000000, 0x30001fff) AM_RAM AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) /* nvram */ AM_RANGE(0x30100000, 0x30100003) AM_WRITE(namcofl_spritebank_w) AM_RANGE(0x30284000, 0x3028bfff) AM_RAM AM_BASE(&namcofl_mcuram) /* shared RAM with C75 MCU */ AM_RANGE(0x30300000, 0x30303fff) AM_RAM /* COMRAM */ AM_RANGE(0x30380000, 0x303800ff) AM_READ( fl_network_r ) /* network registers */ - AM_RANGE(0x30400000, 0x3040ffff) AM_READWRITE(MRA32_RAM, namcofl_paletteram_w) AM_BASE(&paletteram32) + AM_RANGE(0x30400000, 0x3040ffff) AM_READWRITE(SMH_RAM, namcofl_paletteram_w) AM_BASE(&paletteram32) AM_RANGE(0x30800000, 0x3080ffff) AM_READWRITE(namco_tilemapvideoram32_le_r, namco_tilemapvideoram32_le_w ) AM_RANGE(0x30a00000, 0x30a0003f) AM_READWRITE(namco_tilemapcontrol32_le_r, namco_tilemapcontrol32_le_w ) AM_RANGE(0x30c00000, 0x30c1ffff) AM_READWRITE(namco_rozvideoram32_le_r,namco_rozvideoram32_le_w) diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index b537a1d7a57..2403f187710 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -1101,16 +1101,16 @@ static ADDRESS_MAP_START( namcona1_mcu_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf40000, 0xf7ffff) AM_READ(namcona1_gfxram_r) AM_RANGE(0xf80000, 0xfeffff) AM_READ(bogus_r) AM_RANGE(0xff0000, 0xff7fff) AM_READ(namcona1_videoram_r) - AM_RANGE(0xff8000, 0xffdfff) AM_READ(MRA16_RAM) /* spare videoram */ - AM_RANGE(0xffe000, 0xffefff) AM_READ(MRA16_RAM) /* scroll registers */ - AM_RANGE(0xfff000, 0xffffff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0xff8000, 0xffdfff) AM_READ(SMH_RAM) /* spare videoram */ + AM_RANGE(0xffe000, 0xffefff) AM_READ(SMH_RAM) /* scroll registers */ + AM_RANGE(0xfff000, 0xffffff) AM_READ(SMH_RAM) /* spriteram */ ADDRESS_MAP_END static ADDRESS_MAP_START( namcona1_mcu_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_RANGE(0x080000, 0x3f7fff) AM_WRITE(bogus_w) AM_RANGE(0x3f8000, 0x3fffff) AM_WRITE(mcu_mailbox_w_68k) - AM_RANGE(0x400000, 0xdfffff) AM_WRITE(MWA16_ROM) /* data + code */ + AM_RANGE(0x400000, 0xdfffff) AM_WRITE(SMH_ROM) /* data + code */ AM_RANGE(0xe00000, 0xe00fff) AM_WRITE(namcona1_nvram_w) AM_RANGE(0xe01000, 0xe3ffff) AM_WRITE(bogus_w) AM_RANGE(0xe40000, 0xe4000f) AM_WRITE(custom_key_w) @@ -1121,9 +1121,9 @@ static ADDRESS_MAP_START( namcona1_mcu_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf40000, 0xf7ffff) AM_WRITE(namcona1_gfxram_w) AM_RANGE(0xf80000, 0xfeffff) AM_WRITE(bogus_w) AM_RANGE(0xff0000, 0xff7fff) AM_WRITE(namcona1_videoram_w) AM_BASE(&videoram16) - AM_RANGE(0xff8000, 0xffdfff) AM_WRITE(MWA16_RAM) AM_BASE(&namcona1_sparevram) - AM_RANGE(0xffe000, 0xffefff) AM_WRITE(MWA16_RAM) AM_BASE(&namcona1_scroll) - AM_RANGE(0xfff000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0xff8000, 0xffdfff) AM_WRITE(SMH_RAM) AM_BASE(&namcona1_sparevram) + AM_RANGE(0xffe000, 0xffefff) AM_WRITE(SMH_RAM) AM_BASE(&namcona1_scroll) + AM_RANGE(0xfff000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) ADDRESS_MAP_END /* ----- NA-1 MCU handling ----------------------------------- */ @@ -1395,7 +1395,7 @@ static MACHINE_DRIVER_START( namcona1w ) MACHINE_DRIVER_END static ADDRESS_MAP_START( namcona2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_RAM) /* work RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_RAM) /* work RAM */ AM_RANGE(0x080000, 0x3fffff) AM_READ(bogus_r) AM_RANGE(0x400000, 0xbfffff) AM_ROM AM_REGION(REGION_CPU1, 0x280000) /* data */ AM_RANGE(0xc00000, 0xdfffff) AM_ROM AM_REGION(REGION_CPU1, 0x080000) /* code */ @@ -1408,18 +1408,18 @@ static ADDRESS_MAP_START( namcona2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf40000, 0xf7ffff) AM_READ(namcona1_gfxram_r) AM_RANGE(0xf80000, 0xfeffff) AM_READ(bogus_r) AM_RANGE(0xff0000, 0xff7fff) AM_READ(namcona1_videoram_r) - AM_RANGE(0xff8000, 0xffdfff) AM_READ(MRA16_RAM) /* spare videoram */ - AM_RANGE(0xffe000, 0xffefff) AM_READ(MRA16_RAM) /* scroll registers */ - AM_RANGE(0xfff000, 0xffffff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0xff8000, 0xffdfff) AM_READ(SMH_RAM) /* spare videoram */ + AM_RANGE(0xffe000, 0xffefff) AM_READ(SMH_RAM) /* scroll registers */ + AM_RANGE(0xfff000, 0xffffff) AM_READ(SMH_RAM) /* spriteram */ ADDRESS_MAP_END static ADDRESS_MAP_START( namcona2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x000fff) AM_WRITE(namcona1_mcu_w) AM_BASE(&mcu_ram) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_RAM) AM_BASE(&namcona1_workram) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_RAM) AM_BASE(&namcona1_workram) AM_RANGE(0x080000, 0x3f8007) AM_WRITE(bogus_w) AM_RANGE(0x3f8008, 0x3f8009) AM_WRITE(mcu_command_w) AM_RANGE(0x3f800a, 0x3fffff) AM_WRITE(bogus_w) - AM_RANGE(0x400000, 0xdfffff) AM_WRITE(MWA16_ROM) /* data + code */ + AM_RANGE(0x400000, 0xdfffff) AM_WRITE(SMH_ROM) /* data + code */ AM_RANGE(0xe00000, 0xe00fff) AM_WRITE(namcona1_nvram_w) AM_RANGE(0xe01000, 0xe3ffff) AM_WRITE(bogus_w) AM_RANGE(0xe40000, 0xe4000f) AM_WRITE(custom_key_w) @@ -1430,9 +1430,9 @@ static ADDRESS_MAP_START( namcona2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf40000, 0xf7ffff) AM_WRITE(namcona1_gfxram_w) AM_RANGE(0xf80000, 0xfeffff) AM_WRITE(bogus_w) AM_RANGE(0xff0000, 0xff7fff) AM_WRITE(namcona1_videoram_w) AM_BASE(&videoram16) - AM_RANGE(0xff8000, 0xffdfff) AM_WRITE(MWA16_RAM) AM_BASE(&namcona1_sparevram) - AM_RANGE(0xffe000, 0xffefff) AM_WRITE(MWA16_RAM) AM_BASE(&namcona1_scroll) - AM_RANGE(0xfff000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0xff8000, 0xffdfff) AM_WRITE(SMH_RAM) AM_BASE(&namcona1_sparevram) + AM_RANGE(0xffe000, 0xffefff) AM_WRITE(SMH_RAM) AM_BASE(&namcona1_scroll) + AM_RANGE(0xfff000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) ADDRESS_MAP_END static struct NAMCONAinterface NAMCONA_interface = diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c index 8f42068ab1d..f3b19513f51 100644 --- a/src/mame/drivers/namconb1.c +++ b/src/mame/drivers/namconb1.c @@ -705,42 +705,42 @@ static WRITE32_HANDLER( sharedram_w ) } static ADDRESS_MAP_START( namconb1_am, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) AM_WRITE(MWA32_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10001f) AM_READ(gunbulet_gun_r) - AM_RANGE(0x1c0000, 0x1cffff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) + AM_RANGE(0x1c0000, 0x1cffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_RANGE(0x1e4000, 0x1e4003) AM_READWRITE(randgen_r,srand_w) - AM_RANGE(0x200000, 0x2fffff) AM_READ(MRA32_RAM) AM_WRITE(sharedram_w) AM_BASE(&namconb1_workram32) /* shared with MCU) */ - AM_RANGE(0x400000, 0x40001f) AM_READ(MRA32_RAM) AM_WRITE(namconb_cpureg_w) AM_BASE(&namconb_cpureg32) - AM_RANGE(0x580000, 0x5807ff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&nvmem32) + AM_RANGE(0x200000, 0x2fffff) AM_READ(SMH_RAM) AM_WRITE(sharedram_w) AM_BASE(&namconb1_workram32) /* shared with MCU) */ + AM_RANGE(0x400000, 0x40001f) AM_READ(SMH_RAM) AM_WRITE(namconb_cpureg_w) AM_BASE(&namconb_cpureg32) + AM_RANGE(0x580000, 0x5807ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&nvmem32) AM_RANGE(0x600000, 0x61ffff) AM_READWRITE(namco_obj32_r,namco_obj32_w) AM_RANGE(0x620000, 0x620007) AM_READWRITE(namco_spritepos32_r,namco_spritepos32_w) AM_RANGE(0x640000, 0x64ffff) AM_READWRITE(namco_tilemapvideoram32_r,namco_tilemapvideoram32_w ) AM_RANGE(0x660000, 0x66003f) AM_READWRITE(namco_tilemapcontrol32_r,namco_tilemapcontrol32_w) - AM_RANGE(0x680000, 0x68000f) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&namconb1_spritebank32) - AM_RANGE(0x6e0000, 0x6e001f) AM_READ(custom_key_r) AM_WRITE(MWA32_NOP) - AM_RANGE(0x700000, 0x707fff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&paletteram32) + AM_RANGE(0x680000, 0x68000f) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&namconb1_spritebank32) + AM_RANGE(0x6e0000, 0x6e001f) AM_READ(custom_key_r) AM_WRITE(SMH_NOP) + AM_RANGE(0x700000, 0x707fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&paletteram32) ADDRESS_MAP_END static ADDRESS_MAP_START( namconb2_am, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) AM_WRITE(MWA32_ROM) - AM_RANGE(0x1c0000, 0x1cffff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) + AM_RANGE(0x1c0000, 0x1cffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_RANGE(0x1e4000, 0x1e4003) AM_READWRITE(randgen_r,srand_w) - AM_RANGE(0x200000, 0x2fffff) AM_READ(MRA32_RAM) AM_WRITE(sharedram_w) AM_BASE(&namconb1_workram32) /* shared with MCU */ - AM_RANGE(0x400000, 0x4fffff) AM_READ(MRA32_BANK1)/* data ROMs */ + AM_RANGE(0x200000, 0x2fffff) AM_READ(SMH_RAM) AM_WRITE(sharedram_w) AM_BASE(&namconb1_workram32) /* shared with MCU */ + AM_RANGE(0x400000, 0x4fffff) AM_READ(SMH_BANK1)/* data ROMs */ AM_RANGE(0x600000, 0x61ffff) AM_READWRITE(namco_obj32_r,namco_obj32_w) AM_RANGE(0x620000, 0x620007) AM_READWRITE(namco_spritepos32_r,namco_spritepos32_w) - AM_RANGE(0x640000, 0x64000f) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) /* unknown xy offset */ + AM_RANGE(0x640000, 0x64000f) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* unknown xy offset */ AM_RANGE(0x680000, 0x68ffff) AM_READWRITE(namco_tilemapvideoram32_r, namco_tilemapvideoram32_w ) AM_RANGE(0x6c0000, 0x6c003f) AM_READWRITE(namco_tilemapcontrol32_r, namco_tilemapcontrol32_w ) AM_RANGE(0x700000, 0x71ffff) AM_READWRITE(namco_rozvideoram32_r,namco_rozvideoram32_w) AM_RANGE(0x740000, 0x74001f) AM_READWRITE(namco_rozcontrol32_r,namco_rozcontrol32_w) - AM_RANGE(0x800000, 0x807fff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&paletteram32) - AM_RANGE(0x900008, 0x90000f) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&namconb1_spritebank32) - AM_RANGE(0x940000, 0x94000f) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&namconb1_tilebank32) + AM_RANGE(0x800000, 0x807fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&paletteram32) + AM_RANGE(0x900008, 0x90000f) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&namconb1_spritebank32) + AM_RANGE(0x940000, 0x94000f) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&namconb1_tilebank32) AM_RANGE(0x980000, 0x98000f) AM_READ(namco_rozbank32_r) AM_WRITE(namco_rozbank32_w) - AM_RANGE(0xa00000, 0xa007ff) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&nvmem32) - AM_RANGE(0xc00000, 0xc0001f) AM_READ(custom_key_r) AM_WRITE(MWA32_NOP) - AM_RANGE(0xf00000, 0xf0001f) AM_READ(MRA32_RAM) AM_WRITE(MWA32_RAM) AM_BASE(&namconb_cpureg32) + AM_RANGE(0xa00000, 0xa007ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&nvmem32) + AM_RANGE(0xc00000, 0xc0001f) AM_READ(custom_key_r) AM_WRITE(SMH_NOP) + AM_RANGE(0xf00000, 0xf0001f) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&namconb_cpureg32) ADDRESS_MAP_END /* namconb2_readmem */ #define MASTER_CLOCK_HZ 48384000 diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c index 64728bff4e2..0e79708c74e 100644 --- a/src/mame/drivers/namcond1.c +++ b/src/mame/drivers/namcond1.c @@ -248,7 +248,7 @@ static WRITE8_HANDLER( mcu_pa_write ) /* H8/3002 MCU stuff */ static ADDRESS_MAP_START( nd1h8rwmap, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x200000, 0x20ffff) AM_READWRITE( sharedram_sub_r, sharedram_sub_w ) AM_RANGE(0xa00000, 0xa07fff) AM_READWRITE( c352_0_r, c352_0_w ) AM_RANGE(0xc00000, 0xc00001) AM_READ( input_port_1_word_r ) diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index 65bd8fa2e75..4c406e055a9 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -477,7 +477,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) 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) -// AM_RANGE(0xf400, 0xf400) AM_WRITE(MWA8_NOP) // unknown +// AM_RANGE(0xf400, 0xf400) AM_WRITE(SMH_NOP) // unknown AM_RANGE(0xf600, 0xf600) AM_WRITE(irq_ack_w) AM_RANGE(0xf800, 0xf800) AM_WRITE(firq_ack_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(namcos1_sub_firq_w) // asserts FIRQ on CPU1 @@ -495,9 +495,9 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xbfff) AM_RAMBANK(14) AM_RANGE(0xc000, 0xdfff) AM_RAMBANK(15) AM_RANGE(0xe000, 0xefff) AM_WRITE(namcos1_bankswitch_w) -// AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) // IO Chip +// AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) // IO Chip AM_RANGE(0xf200, 0xf200) AM_WRITE(namcos1_watchdog_w) -// AM_RANGE(0xf400, 0xf400) AM_WRITE(MWA8_NOP) // ? +// AM_RANGE(0xf400, 0xf400) AM_WRITE(SMH_NOP) // ? 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) @@ -538,7 +538,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(HD63701_PORT1, HD63701_PORT1) AM_READ_PORT("COIN") AM_WRITE(namcos1_coin_w) - AM_RANGE(HD63701_PORT2, HD63701_PORT2) AM_READWRITE(MRA8_NOP, namcos1_dac_gain_w) + AM_RANGE(HD63701_PORT2, HD63701_PORT2) AM_READWRITE(SMH_NOP, namcos1_dac_gain_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index a1cef7c083e..61d538fbb0a 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -817,14 +817,14 @@ static DRIVER_INIT( namcos11 ) { int bank; - memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f0fffff, 0, 0, MRA32_BANK1 ); - memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f100000, 0x1f1fffff, 0, 0, MRA32_BANK2 ); - memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f200000, 0x1f2fffff, 0, 0, MRA32_BANK3 ); - memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f300000, 0x1f3fffff, 0, 0, MRA32_BANK4 ); - memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f400000, 0x1f4fffff, 0, 0, MRA32_BANK5 ); - memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f500000, 0x1f5fffff, 0, 0, MRA32_BANK6 ); - memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f600000, 0x1f6fffff, 0, 0, MRA32_BANK7 ); - memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f700000, 0x1f7fffff, 0, 0, MRA32_BANK8 ); + memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f0fffff, 0, 0, SMH_BANK1 ); + memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f100000, 0x1f1fffff, 0, 0, SMH_BANK2 ); + memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f200000, 0x1f2fffff, 0, 0, SMH_BANK3 ); + memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f300000, 0x1f3fffff, 0, 0, SMH_BANK4 ); + memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f400000, 0x1f4fffff, 0, 0, SMH_BANK5 ); + memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f500000, 0x1f5fffff, 0, 0, SMH_BANK6 ); + memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f600000, 0x1f6fffff, 0, 0, SMH_BANK7 ); + memory_install_read32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f700000, 0x1f7fffff, 0, 0, SMH_BANK8 ); for( bank = 0; bank < 8; bank++ ) { @@ -841,13 +841,13 @@ static DRIVER_INIT( namcos11 ) m_n_bankoffset = 0; memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1f080000, 0x1f080003, 0, 0, bankswitch_rom64_upper_w ); memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1fa10020, 0x1fa1002f, 0, 0, bankswitch_rom64_w ); - memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1fa10020, 0x1fa1002f, 0, 0, MRA32_NOP ); + memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1fa10020, 0x1fa1002f, 0, 0, SMH_NOP ); state_save_register_global( m_n_bankoffset ); } } else { - memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1fa10020, 0x1fa1002f, 0, 0, MWA32_NOP ); + memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1fa10020, 0x1fa1002f, 0, 0, SMH_NOP ); } break; } diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index 83916419bf0..8b20620fa17 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1089,7 +1089,7 @@ static WRITE32_HANDLER( s12_dma_bias_w ) static ADDRESS_MAP_START( namcos12_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_SHARE(1) AM_BASE(&g_p_n_psxram) AM_SIZE(&g_n_psxramsize) /* ram */ - AM_RANGE(0x1f000000, 0x1f000003) AM_READWRITE(MRA32_NOP, bankoffset_w) /* banking */ + AM_RANGE(0x1f000000, 0x1f000003) AM_READWRITE(SMH_NOP, bankoffset_w) /* banking */ AM_RANGE(0x1f080000, 0x1f083fff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(&namcos12_sharedram) /* shared ram?? */ AM_RANGE(0x1f140000, 0x1f140fff) AM_READWRITE( at28c16_32le_16lsb_0_r, at28c16_32le_16lsb_0_w ) /* eeprom */ AM_RANGE(0x1f1bff08, 0x1f1bff0f) AM_WRITENOP /* ?? */ @@ -1240,7 +1240,7 @@ 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 (0, ADDRESS_SPACE_PROGRAM, 0x1fc20280, 0x1fc2028b, 0, 0, MRA32_BANK2 ); + memory_install_read32_handler (0, ADDRESS_SPACE_PROGRAM, 0x1fc20280, 0x1fc2028b, 0, 0, SMH_BANK2 ); memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1f008000, 0x1f008003, 0, 0, kcon_w ); memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x1f018000, 0x1f018003, 0, 0, kcoff_w ); @@ -1252,7 +1252,7 @@ static MACHINE_RESET( namcos12 ) /* H8/3002 MCU stuff */ static ADDRESS_MAP_START( s12h8rwmap, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x080000, 0x08ffff) AM_READWRITE( sharedram_sub_r, sharedram_sub_w ) AM_RANGE(0x280000, 0x287fff) AM_READWRITE( c352_0_r, c352_0_w ) AM_RANGE(0x300000, 0x300001) AM_READ( input_port_1_word_r ) diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 66bdac63d48..f9a2b506ccf 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -593,13 +593,13 @@ static ADDRESS_MAP_START( common_default_am, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_default_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x13ffff) AM_READ(NAMCOS2_68K_SLAVE_RAM_R) AM_WRITE(NAMCOS2_68K_SLAVE_RAM_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_slave_C148_r) AM_WRITE(namcos2_68k_slave_C148_w) ADDRESS_MAP_END static ADDRESS_MAP_START( master_default_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(NAMCOS2_68K_MASTER_RAM_R) AM_WRITE(NAMCOS2_68K_MASTER_RAM_W) AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) @@ -613,18 +613,18 @@ static ADDRESS_MAP_START( common_finallap_am, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x80ffff) AM_READ(namcos2_sprite_ram_r) AM_WRITE(namcos2_sprite_ram_w) AM_BASE(&namcos2_sprite_ram) AM_RANGE(0x840000, 0x840001) AM_READ(namcos2_gfx_ctrl_r) AM_WRITE(namcos2_gfx_ctrl_w) AM_RANGE(0x880000, 0x89ffff) AM_READ(namco_road16_r) AM_WRITE(namco_road16_w) - AM_RANGE(0x8c0000, 0x8c0001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x8c0000, 0x8c0001) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( master_finallap_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(NAMCOS2_68K_MASTER_RAM_R) AM_WRITE(NAMCOS2_68K_MASTER_RAM_W) AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_finallap_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x13ffff) AM_READ(NAMCOS2_68K_SLAVE_RAM_R) AM_WRITE(NAMCOS2_68K_SLAVE_RAM_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_slave_C148_r) AM_WRITE(namcos2_68k_slave_C148_w) ADDRESS_MAP_END @@ -634,19 +634,19 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( common_sgunner_am, ADDRESS_SPACE_PROGRAM, 16 ) NAMCOS2_68K_DEFAULT_CPU_BOARD_AM AM_RANGE(0x800000, 0x8141ff) AM_READ(namco_obj16_r) AM_WRITE(namco_obj16_w) - AM_RANGE(0x818000, 0x818001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x818000, 0x818001) AM_WRITE(SMH_NOP) AM_RANGE(0xa00000, 0xa0000f) AM_READ(namcos2_68k_key_r) AM_WRITE(namcos2_68k_key_w) ADDRESS_MAP_END static ADDRESS_MAP_START( master_sgunner_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(NAMCOS2_68K_MASTER_RAM_R) AM_WRITE(NAMCOS2_68K_MASTER_RAM_W) AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_sgunner_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x13ffff) AM_READ(NAMCOS2_68K_SLAVE_RAM_R) AM_WRITE(NAMCOS2_68K_SLAVE_RAM_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_slave_C148_r) AM_WRITE(namcos2_68k_slave_C148_w) ADDRESS_MAP_END @@ -662,14 +662,14 @@ static ADDRESS_MAP_START( common_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( master_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(NAMCOS2_68K_MASTER_RAM_R) AM_WRITE(NAMCOS2_68K_MASTER_RAM_W) AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x13ffff) AM_READ(NAMCOS2_68K_SLAVE_RAM_R) AM_WRITE(NAMCOS2_68K_SLAVE_RAM_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_slave_C148_r) AM_WRITE(namcos2_68k_slave_C148_w) ADDRESS_MAP_END @@ -679,9 +679,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( common_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 ) NAMCOS2_68K_DEFAULT_CPU_BOARD_AM AM_RANGE(0x800000, 0x8141ff) AM_READ(namco_obj16_r) AM_WRITE(namco_obj16_w) - AM_RANGE(0x818000, 0x818001) AM_READ(MRA16_RAM) AM_WRITE(MWA16_NOP) /* enable? */ - AM_RANGE(0x81a000, 0x81a001) AM_WRITE(MWA16_NOP) /* enable? */ - AM_RANGE(0x840000, 0x840001) AM_READ(MRA16_RAM) + AM_RANGE(0x818000, 0x818001) AM_READ(SMH_RAM) AM_WRITE(SMH_NOP) /* enable? */ + AM_RANGE(0x81a000, 0x81a001) AM_WRITE(SMH_NOP) /* enable? */ + AM_RANGE(0x840000, 0x840001) AM_READ(SMH_RAM) AM_RANGE(0x900000, 0x900007) AM_READ(namco_spritepos16_r) AM_WRITE(namco_spritepos16_w) AM_RANGE(0xa00000, 0xa1ffff) AM_READ(namco_road16_r) AM_WRITE(namco_road16_w) AM_RANGE(0xc00000, 0xc0ffff) AM_READ(namco_rozvideoram16_r) AM_WRITE(namco_rozvideoram16_w) @@ -690,14 +690,14 @@ static ADDRESS_MAP_START( common_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( master_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(NAMCOS2_68K_MASTER_RAM_R) AM_WRITE(NAMCOS2_68K_MASTER_RAM_W) AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x13ffff) AM_READ(NAMCOS2_68K_SLAVE_RAM_R) AM_WRITE(NAMCOS2_68K_SLAVE_RAM_W) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_slave_C148_r) AM_WRITE(namcos2_68k_slave_C148_w) ADDRESS_MAP_END @@ -712,23 +712,23 @@ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x6fff) AM_READ(C140_r) AM_RANGE(0x7000, 0x77ff) AM_READ(namcos2_dpram_byte_r) AM_RANGE(0x7800, 0x7fff) AM_READ(namcos2_dpram_byte_r) /* mirror */ - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x4000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x4001, 0x4001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x5000, 0x6fff) AM_WRITE(C140_w) AM_RANGE(0x7000, 0x77ff) AM_WRITE(namcos2_dpram_byte_w) AM_BASE(&namcos2_dpram) AM_RANGE(0x7800, 0x7fff) AM_WRITE(namcos2_dpram_byte_w) /* mirror */ - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_NOP) /* Amplifier enable on 1st write */ + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_NOP) /* Amplifier enable on 1st write */ AM_RANGE(0xc000, 0xc001) AM_WRITE(namcos2_sound_bankselect_w) - AM_RANGE(0xd001, 0xd001) AM_WRITE(MWA8_NOP) /* Watchdog */ - AM_RANGE(0xe000, 0xe000) AM_WRITE(MWA8_NOP) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xd001, 0xd001) AM_WRITE(SMH_NOP) /* Watchdog */ + AM_RANGE(0xe000, 0xe000) AM_WRITE(SMH_NOP) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /*************************************************************/ @@ -737,35 +737,35 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_mcu, ADDRESS_SPACE_PROGRAM, 8 ) /* input ports and dips are mapped here */ - AM_RANGE(0x0000, 0x0000) AM_READ(MRA8_NOP) /* Keep logging quiet */ + AM_RANGE(0x0000, 0x0000) AM_READ(SMH_NOP) /* Keep logging quiet */ AM_RANGE(0x0001, 0x0001) AM_READ(namcos2_input_port_0_r) AM_RANGE(0x0002, 0x0002) AM_READ(input_port_1_r) AM_RANGE(0x0003, 0x0003) AM_READ(namcos2_mcu_port_d_r) AM_RANGE(0x0007, 0x0007) AM_READ(namcos2_input_port_10_r) AM_RANGE(0x0010, 0x0010) AM_READ(namcos2_mcu_analog_ctrl_r) AM_RANGE(0x0011, 0x0011) AM_READ(namcos2_mcu_analog_port_r) - AM_RANGE(0x0008, 0x003f) AM_READ(MRA8_RAM) /* Fill in register to stop logging */ - AM_RANGE(0x0040, 0x01bf) AM_READ(MRA8_RAM) - AM_RANGE(0x01c0, 0x1fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0008, 0x003f) AM_READ(SMH_RAM) /* Fill in register to stop logging */ + AM_RANGE(0x0040, 0x01bf) AM_READ(SMH_RAM) + AM_RANGE(0x01c0, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0x2000, 0x2000) AM_READ(input_port_11_r) AM_RANGE(0x3000, 0x3000) AM_READ(namcos2_input_port_12_r) AM_RANGE(0x3001, 0x3001) AM_READ(input_port_13_r) AM_RANGE(0x3002, 0x3002) AM_READ(input_port_14_r) AM_RANGE(0x3003, 0x3003) AM_READ(input_port_15_r) AM_RANGE(0x5000, 0x57ff) AM_READ(namcos2_dpram_byte_r) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_NOP) /* watchdog */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_NOP) /* watchdog */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mcu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0003, 0x0003) AM_WRITE(namcos2_mcu_port_d_w) AM_RANGE(0x0010, 0x0010) AM_WRITE(namcos2_mcu_analog_ctrl_w) AM_RANGE(0x0011, 0x0011) AM_WRITE(namcos2_mcu_analog_port_w) - AM_RANGE(0x0000, 0x003f) AM_WRITE(MWA8_RAM) /* Fill in register to stop logging */ - AM_RANGE(0x0040, 0x01bf) AM_WRITE(MWA8_RAM) - AM_RANGE(0x01c0, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x003f) AM_WRITE(SMH_RAM) /* Fill in register to stop logging */ + AM_RANGE(0x0040, 0x01bf) AM_WRITE(SMH_RAM) + AM_RANGE(0x01c0, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x5000, 0x57ff) AM_WRITE(namcos2_dpram_byte_w) AM_BASE(&namcos2_dpram) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /*************************************************************/ diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index 4af0445d5f0..d0a00b53465 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -777,8 +777,8 @@ static WRITE16_HANDLER( dsp_xf_w ) } static ADDRESS_MAP_START( master_dsp_program, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA16_ROM) /* BIOS */ - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&master_dsp_code) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) /* BIOS */ + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&master_dsp_code) ADDRESS_MAP_END static ADDRESS_MAP_START( master_dsp_data, ADDRESS_SPACE_DATA, 16 ) @@ -798,8 +798,8 @@ static ADDRESS_MAP_START( master_dsp_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x0b,0x0b) AM_READ(dsp_portb_r) AM_WRITE(dsp_portb_w) AM_RANGE(0x0c,0x0c) AM_WRITE(dsp_portc_w) AM_RANGE(0x0f,0x0f) AM_READ(dsp_portf_r) - AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ( MRA16_NOP ) - AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE( MWA16_NOP ) + AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ( SMH_NOP ) + AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE( SMH_NOP ) AM_RANGE(TMS32025_XF, TMS32025_XF) AM_WRITE( dsp_xf_w ) ADDRESS_MAP_END @@ -906,8 +906,8 @@ static READ16_HANDLER( slave_portf_r ) } static ADDRESS_MAP_START( slave_dsp_program, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA16_ROM) /* BIOS */ - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) /* BIOS */ + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_dsp_data, ADDRESS_SPACE_DATA, 16 ) @@ -919,8 +919,8 @@ static ADDRESS_MAP_START( slave_dsp_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x02,0x02) AM_READ(slave_port2_r) AM_RANGE(0x03,0x03) AM_READ(slave_port3_r) AM_WRITE(slave_port3_w) AM_RANGE(0x0f,0x0f) AM_READ(slave_portf_r) - AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ(MRA16_NOP) - AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE(MWA16_NOP) + AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ(SMH_NOP) + AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE(SMH_NOP) AM_RANGE(TMS32025_XF, TMS32025_XF) AM_WRITE(slave_XF_output_w) ADDRESS_MAP_END @@ -1085,24 +1085,24 @@ static READ16_HANDLER( NAMCO_C139_SCI_register_r ){ return 0; } /* MASTER 68000 CPU Memory declarations */ /*************************************************************/ static ADDRESS_MAP_START( namcos21_68k_master, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) /* private work RAM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* private work RAM */ AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END static ADDRESS_MAP_START( namcos21_68k_slave, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x13ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) /* private work RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x13ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* private work RAM */ AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_slave_C148_r) AM_WRITE(namcos2_68k_slave_C148_w) ADDRESS_MAP_END static ADDRESS_MAP_START( namcos21_68k_common, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x20ffff) AM_READ(dspram16_r) AM_WRITE(dspram16_w) AM_BASE(&namcos21_dspram16) - AM_RANGE(0x280000, 0x280001) AM_WRITE(MWA16_NOP) /* written once on startup */ + AM_RANGE(0x280000, 0x280001) AM_WRITE(SMH_NOP) /* written once on startup */ AM_RANGE(0x400000, 0x400001) AM_WRITE(pointram_control_w) AM_RANGE(0x440000, 0x440001) AM_READ(pointram_data_r) AM_WRITE(pointram_data_w) - AM_RANGE(0x440002, 0x47ffff) AM_WRITE(MWA16_NOP) /* (?) Air Combat */ + AM_RANGE(0x440002, 0x47ffff) AM_WRITE(SMH_NOP) /* (?) Air Combat */ AM_RANGE(0x480000, 0x4807ff) AM_WRITE(namcos21_depthcue_w) AM_READ(namcos21_depthcue_r) /* Air Combat */ AM_RANGE(0x700000, 0x71ffff) AM_READ(namco_obj16_r) AM_WRITE(namco_obj16_w) AM_RANGE(0x720000, 0x720007) AM_READ(namco_spritepos16_r) AM_WRITE(namco_spritepos16_w) @@ -1255,7 +1255,7 @@ static READ16_HANDLER( winrun_table_r ) } static ADDRESS_MAP_START( winrun_dsp_program, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA16_ROM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( winrun_dsp_data, ADDRESS_SPACE_DATA, 16 ) @@ -1267,12 +1267,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( winrun_dsp_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x08,0x09) AM_WRITE(winrun_dsp_pointrom_addr_w) AM_READ(winrun_dsp_pointrom_data_r) AM_RANGE(0x0a,0x0a) AM_WRITE(winrun_dsp_render_w) - AM_RANGE(0x0b,0x0b) AM_WRITE(MWA16_NOP) + AM_RANGE(0x0b,0x0b) AM_WRITE(SMH_NOP) AM_RANGE(0x0c,0x0c) AM_WRITE(winrun_dsp_complete_w) AM_RANGE(TMS32025_BIO, TMS32025_BIO) AM_READ( winrun_poly_reset_r ) - AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ( MRA16_NOP ) - AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE( MWA16_NOP ) - AM_RANGE(TMS32025_XF, TMS32025_XF) AM_WRITE( MWA16_NOP ) + AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ( SMH_NOP ) + AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE( SMH_NOP ) + AM_RANGE(TMS32025_XF, TMS32025_XF) AM_WRITE( SMH_NOP ) ADDRESS_MAP_END static READ16_HANDLER( gpu_data_r ) @@ -1331,12 +1331,12 @@ static WRITE16_HANDLER( winrun_dspcomram_control_w ) } static ADDRESS_MAP_START( am_master_winrun, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) /* work RAM */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* work RAM */ AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) - AM_RANGE(0x250000, 0x25ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE( &winrun_polydata ) - AM_RANGE(0x260000, 0x26ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) /* unused? */ + AM_RANGE(0x250000, 0x25ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE( &winrun_polydata ) + AM_RANGE(0x260000, 0x26ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* unused? */ AM_RANGE(0x280000, 0x281fff) AM_WRITE(winrun_dspbios_w) AM_BASE(&winrun_dspbios) AM_RANGE(0x380000, 0x38000f) AM_READ(winrun_dspcomram_control_r) AM_WRITE(winrun_dspcomram_control_w) AM_RANGE(0x3c0000, 0x3c1fff) AM_READ(winrun_68k_dspcomram_r) AM_WRITE(winrun_68k_dspcomram_w) @@ -1351,8 +1351,8 @@ static ADDRESS_MAP_START( am_master_winrun, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( am_slave_winrun, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x13ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x13ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_slave_C148_r) AM_WRITE(namcos2_68k_slave_C148_w) AM_RANGE(0x600000, 0x60ffff) AM_READ(winrun_gpucomram_r) AM_WRITE(winrun_gpucomram_w) AM_RANGE(0x800000, 0x87ffff) AM_READ(datarom_r) @@ -1363,11 +1363,11 @@ static ADDRESS_MAP_START( am_slave_winrun, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( am_gpu_winrun, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(winrun_gpu_color_r) AM_WRITE(winrun_gpu_color_w) /* ? */ - AM_RANGE(0x180000, 0x19ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) /* work RAM */ + AM_RANGE(0x180000, 0x19ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* work RAM */ AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_gpu_C148_r) AM_WRITE(namcos2_68k_gpu_C148_w) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE( &winrun_gpucomram ) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE( &winrun_gpucomram ) AM_RANGE(0x400000, 0x41ffff) AM_READ(paletteram16_r) AM_WRITE(paletteram16_w) AM_BASE( &paletteram16 ) AM_RANGE(0x600000, 0x6fffff) AM_READ(gpu_data_r) AM_RANGE(0xc00000, 0xcfffff) AM_READ(winrun_gpu_videoram_r) AM_WRITE(winrun_gpu_videoram_w) @@ -1385,23 +1385,23 @@ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x6fff) AM_READ(C140_r) AM_RANGE(0x7000, 0x77ff) AM_READ(namcos2_dualportram_byte_r) AM_RANGE(0x7800, 0x7fff) AM_READ(namcos2_dualportram_byte_r) /* mirror */ - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x3000, 0x3003) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x3000, 0x3003) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x4000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x4001, 0x4001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x5000, 0x6fff) AM_WRITE(C140_w) AM_RANGE(0x7000, 0x77ff) AM_WRITE(namcos2_dualportram_byte_w) AM_BASE(&mpDualPortRAM) AM_RANGE(0x7800, 0x7fff) AM_WRITE(namcos2_dualportram_byte_w) /* mirror */ - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_NOP) /* amplifier enable on 1st write */ + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_NOP) /* amplifier enable on 1st write */ AM_RANGE(0xc000, 0xc001) AM_WRITE(namcos2_sound_bankselect_w) - AM_RANGE(0xd001, 0xd001) AM_WRITE(MWA8_NOP) /* watchdog */ - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_NOP) /* avoid debug log noise; games write frequently to 0xe000 */ + AM_RANGE(0xd001, 0xd001) AM_WRITE(SMH_NOP) /* watchdog */ + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_NOP) /* avoid debug log noise; games write frequently to 0xe000 */ ADDRESS_MAP_END /*************************************************************/ @@ -1409,35 +1409,35 @@ ADDRESS_MAP_END /*************************************************************/ static ADDRESS_MAP_START( readmem_mcu, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0000) AM_READ(MRA8_NOP) + AM_RANGE(0x0000, 0x0000) AM_READ(SMH_NOP) AM_RANGE(0x0001, 0x0001) AM_READ(input_port_0_r) /* p1,p2 start */ AM_RANGE(0x0002, 0x0002) AM_READ(input_port_1_r) /* coins */ AM_RANGE(0x0003, 0x0003) AM_READ(namcos2_mcu_port_d_r) AM_RANGE(0x0007, 0x0007) AM_READ(input_port_10_r) /* fire buttons */ AM_RANGE(0x0010, 0x0010) AM_READ(namcos2_mcu_analog_ctrl_r) AM_RANGE(0x0011, 0x0011) AM_READ(namcos2_mcu_analog_port_r) - AM_RANGE(0x0008, 0x003f) AM_READ(MRA8_RAM) - AM_RANGE(0x0040, 0x01bf) AM_READ(MRA8_RAM) - AM_RANGE(0x01c0, 0x1fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0008, 0x003f) AM_READ(SMH_RAM) + AM_RANGE(0x0040, 0x01bf) AM_READ(SMH_RAM) + AM_RANGE(0x01c0, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0x2000, 0x2000) AM_READ(input_port_11_r) /* dipswitches */ AM_RANGE(0x3000, 0x3000) AM_READ(input_port_12_r) /* DIAL0 */ AM_RANGE(0x3001, 0x3001) AM_READ(input_port_13_r) /* DIAL1 */ AM_RANGE(0x3002, 0x3002) AM_READ(input_port_14_r) /* DIAL2 */ AM_RANGE(0x3003, 0x3003) AM_READ(input_port_15_r) /* DIAL3 */ AM_RANGE(0x5000, 0x57ff) AM_READ(namcos2_dualportram_byte_r) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_NOP) /* watchdog */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_NOP) /* watchdog */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mcu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0003, 0x0003) AM_WRITE(namcos2_mcu_port_d_w) AM_RANGE(0x0010, 0x0010) AM_WRITE(namcos2_mcu_analog_ctrl_w) AM_RANGE(0x0011, 0x0011) AM_WRITE(namcos2_mcu_analog_port_w) - AM_RANGE(0x0000, 0x003f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0040, 0x01bf) AM_WRITE(MWA8_RAM) - AM_RANGE(0x01c0, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x003f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0040, 0x01bf) AM_WRITE(SMH_RAM) + AM_RANGE(0x01c0, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x5000, 0x57ff) AM_WRITE(namcos2_dualportram_byte_w) AM_BASE(&mpDualPortRAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END //////////////////////////////////////////////////////////////////////////////// @@ -1446,20 +1446,20 @@ ADDRESS_MAP_END //////////////////////////////////////////////////////////////////////////////// static ADDRESS_MAP_START( driveyes_68k_master, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) /* private work RAM */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* private work RAM */ AM_RANGE(0x180000, 0x183fff) AM_READ(NAMCOS2_68K_EEPROM_R) AM_WRITE(NAMCOS2_68K_EEPROM_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size) AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_master_C148_r) AM_WRITE(namcos2_68k_master_C148_w) ADDRESS_MAP_END static ADDRESS_MAP_START( driveyes_68k_slave, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) /* private work RAM */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) /* private work RAM */ AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_slave_C148_r) AM_WRITE(namcos2_68k_slave_C148_w) ADDRESS_MAP_END static ADDRESS_MAP_START( driveyes_68k_common, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x250000, 0x25ffff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE( &winrun_polydata ) + AM_RANGE(0x250000, 0x25ffff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE( &winrun_polydata ) AM_RANGE(0x280000, 0x281fff) AM_WRITE(winrun_dspbios_w) AM_BASE(&winrun_dspbios) AM_RANGE(0x380000, 0x38000f) AM_READ(winrun_dspcomram_control_r) AM_WRITE(winrun_dspcomram_control_w) AM_RANGE(0x3c0000, 0x3c1fff) AM_READ(winrun_68k_dspcomram_r) AM_WRITE(winrun_68k_dspcomram_w) diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index 34034a99a0f..132a8300466 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -812,12 +812,12 @@ static WRITE16_HANDLER( master_render_device_w ) } static ADDRESS_MAP_START( master_dsp_program, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA16_ROM) /* internal ROM (4k words) */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA16_ROM) AM_BASE(&mpMasterExternalRAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) /* internal ROM (4k words) */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_ROM) AM_BASE(&mpMasterExternalRAM) ADDRESS_MAP_END static ADDRESS_MAP_START( master_dsp_data, ADDRESS_SPACE_DATA, 16 ) - AM_RANGE(0x1000, 0x3fff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1000, 0x3fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_RANGE(0x4000, 0x7fff) AM_READ(master_external_ram_r) AM_WRITE(master_external_ram_w) AM_RANGE(0x8000, 0xffff) AM_READ(namcos22_dspram16_r) AM_WRITE(namcos22_dspram16_w) ADDRESS_MAP_END @@ -827,16 +827,16 @@ static ADDRESS_MAP_START( master_dsp_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x1,0x1) AM_WRITE(point_ram_hiword_w) AM_READ(point_ram_hiword_ir) AM_RANGE(0x2,0x2) AM_WRITE(dsp_unk2_w) AM_READ(pdp_begin_r) AM_RANGE(0x3,0x3) AM_WRITE(point_ram_idx_w) AM_READ(dsp_unk_port3_r) - AM_RANGE(0x4,0x4) AM_WRITE(MWA16_NOP) /* unknown */ + AM_RANGE(0x4,0x4) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0x7,0x7) AM_WRITE(upload_code_to_slave_dsp_w) AM_RANGE(0x8,0x8) AM_WRITE(dsp_unk8_w) AM_READ(dsp_unk8_r) /* trigger irq? */ - AM_RANGE(0x9,0x9) AM_WRITE(MWA16_NOP) AM_READ(custom_ic_status_r) /* trigger irq? */ + AM_RANGE(0x9,0x9) AM_WRITE(SMH_NOP) AM_READ(custom_ic_status_r) /* trigger irq? */ AM_RANGE(0xa,0xa) AM_WRITE(dsp_unk_porta_w) - AM_RANGE(0xb,0xb) AM_WRITE(MWA16_NOP) /* RINT-related? */ + AM_RANGE(0xb,0xb) AM_WRITE(SMH_NOP) /* RINT-related? */ AM_RANGE(0xc,0xc) AM_WRITE(master_render_device_w) AM_RANGE(0xd,0xd) AM_WRITE(namcos22_dspram16_bank_w) AM_RANGE(0xe,0xe) AM_WRITE(dsp_led_w) - AM_RANGE(0xf,0xf) AM_WRITE(MWA16_NOP) AM_READ(dsp_upload_status_r) + AM_RANGE(0xf,0xf) AM_WRITE(SMH_NOP) AM_READ(dsp_upload_status_r) AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ(dsp_HOLD_signal_r) AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE(dsp_HOLD_ACK_w) AM_RANGE(TMS32025_XF, TMS32025_XF) AM_WRITE(dsp_XF_output_w) @@ -905,8 +905,8 @@ static WRITE16_HANDLER( dsp_slave_portb_w ) } static ADDRESS_MAP_START( slave_dsp_program, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA16_ROM) /* internal ROM */ - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA16_ROM) AM_BASE(&mpSlaveExternalRAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) /* internal ROM */ + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_ROM) AM_BASE(&mpSlaveExternalRAM) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_dsp_data, ADDRESS_SPACE_DATA, 16 ) @@ -919,10 +919,10 @@ static ADDRESS_MAP_START( slave_dsp_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x4,0x4) AM_READ(dsp_slave_port4_r) AM_RANGE(0x5,0x5) AM_READ(dsp_slave_port5_r) - AM_RANGE(0x6,0x6) AM_WRITE(MWA16_NOP) AM_READ(dsp_slave_port6_r) + AM_RANGE(0x6,0x6) AM_WRITE(SMH_NOP) AM_READ(dsp_slave_port6_r) /* render device state */ - AM_RANGE(0x8,0x8) AM_WRITE(MWA16_NOP) AM_READ(dsp_slave_port8_r) + AM_RANGE(0x8,0x8) AM_WRITE(SMH_NOP) AM_READ(dsp_slave_port8_r) /* render device */ AM_RANGE(0xb,0xb) AM_WRITE(dsp_slave_portb_w) AM_READ(dsp_slave_portb_r) @@ -1436,10 +1436,10 @@ static ADDRESS_MAP_START( namcos22s_am, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x200000, 0x200003) AM_READ(alpinesa_prot_r) AM_RANGE(0x300000, 0x300003) AM_WRITE(alpinesa_prot_w) AM_RANGE(0x000000, 0x3fffff) AM_ROM - AM_RANGE(0x400000, 0x40001f) AM_READ(namcos22_keycus_r) AM_WRITE(MWA32_NOP) + AM_RANGE(0x400000, 0x40001f) AM_READ(namcos22_keycus_r) AM_WRITE(SMH_NOP) AM_RANGE(0x410000, 0x413fff) AM_RAM /* C139 SCI buffer */ - AM_RANGE(0x420000, 0x42000f) AM_READ(MRA32_NOP) AM_WRITE(MWA32_NOP) /* C139 SCI registers */ - AM_RANGE(0x430000, 0x43000f) AM_READ(namcos22_gun_r) AM_WRITE(MWA32_NOP) /* LEDs? */ + AM_RANGE(0x420000, 0x42000f) AM_READ(SMH_NOP) AM_WRITE(SMH_NOP) /* C139 SCI registers */ + AM_RANGE(0x430000, 0x43000f) AM_READ(namcos22_gun_r) AM_WRITE(SMH_NOP) /* LEDs? */ AM_RANGE(0x440000, 0x440003) AM_READ(namcos22_dipswitch_r) AM_RANGE(0x450008, 0x45000b) AM_READ(namcos22_portbit_r) AM_WRITE(namcos22_portbit_w) AM_RANGE(0x460000, 0x463fff) AM_RAM AM_BASE(&namcos22_nvmem) AM_SIZE(&namcos22_nvmem_size) @@ -1451,7 +1451,7 @@ static ADDRESS_MAP_START( namcos22s_am, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x824000, 0x8243ff) AM_READ(namcos22_gamma_r) AM_WRITE(namcos22_gamma_w) AM_BASE(&namcos22_gamma) AM_RANGE(0x828000, 0x83ffff) AM_READ(namcos22_paletteram_r) AM_WRITE(namcos22_paletteram_w) AM_BASE(&paletteram32) AM_RANGE(0x860000, 0x860007) AM_READ(spotram_r) AM_WRITE(spotram_w) - AM_RANGE(0x880000, 0x89dfff) AM_READ(MRA32_RAM) AM_WRITE(namcos22_cgram_w) AM_BASE(&namcos22_cgram) + AM_RANGE(0x880000, 0x89dfff) AM_READ(SMH_RAM) AM_WRITE(namcos22_cgram_w) AM_BASE(&namcos22_cgram) AM_RANGE(0x89e000, 0x89ffff) AM_READ(namcos22_textram_r) AM_WRITE(namcos22_textram_w) AM_BASE(&namcos22_textram) AM_RANGE(0x8a0000, 0x8a000f) AM_RAM AM_BASE(&namcos22_tilemapattr) AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE(&namcos22_vics_data) @@ -1884,7 +1884,7 @@ static ADDRESS_MAP_START( namcos22_am, ADDRESS_SPACE_PROGRAM, 32 ) * C389? (Cyber Cycles) * C392? (Ace Driver Victory Lap) */ - AM_RANGE(0x20000000, 0x2000000f) AM_READ(namcos22_keycus_r) AM_WRITE(MWA32_NOP) + AM_RANGE(0x20000000, 0x2000000f) AM_READ(namcos22_keycus_r) AM_WRITE(SMH_NOP) /** * C139 SCI Buffer @@ -1927,7 +1927,7 @@ static ADDRESS_MAP_START( namcos22_am, ADDRESS_SPACE_PROGRAM, 32 ) * 2002000c 2 R/W RX FIFO Pointer (0x0000 - 0x0fff) * 2002000e 2 W TX FIFO Pointer (0x0000 - 0x1fff) */ - AM_RANGE(0x20020000, 0x2002000f) AM_READ(namcos22_C139_SCI_r) AM_WRITE(MWA32_RAM) + AM_RANGE(0x20020000, 0x2002000f) AM_READ(namcos22_C139_SCI_r) AM_WRITE(SMH_RAM) /** * System Controller: Interrupt Control, Peripheral Control @@ -1980,14 +1980,14 @@ static ADDRESS_MAP_START( namcos22_am, ADDRESS_SPACE_PROGRAM, 32 ) * zero means not-connected. * may be related to device at 0x94000000 */ - AM_RANGE(0x48000000, 0x4800003f) AM_READ(MRA32_NOP) AM_WRITE(MWA32_NOP) + AM_RANGE(0x48000000, 0x4800003f) AM_READ(SMH_NOP) AM_WRITE(SMH_NOP) /** * DIPSW * 0x50000000 - DIPSW3 * 0x50000001 - DIPSW2 */ - AM_RANGE(0x50000000, 0x50000003) AM_READ(namcos22_dipswitch_r) AM_WRITE(MWA32_NOP) + AM_RANGE(0x50000000, 0x50000003) AM_READ(namcos22_dipswitch_r) AM_WRITE(SMH_NOP) AM_RANGE(0x50000008, 0x5000000b) AM_READ(namcos22_portbit_r) AM_WRITE(namcos22_portbit_w) /** @@ -2036,7 +2036,7 @@ static ADDRESS_MAP_START( namcos22_am, ADDRESS_SPACE_PROGRAM, 32 ) * +0x0100 - 0x02ff Parameter RAM from Main MPU (for SEs) * +0x0300 - 0x03ff? Song Title (put messages here from Sound CPU) */ - AM_RANGE(0x60000000, 0x60003fff) AM_WRITE(MWA32_NOP) + AM_RANGE(0x60000000, 0x60003fff) AM_WRITE(SMH_NOP) AM_RANGE(0x60004000, 0x6000bfff) AM_READ(namcos22_mcuram_r) AM_WRITE(namcos22_mcuram_w) AM_BASE(&namcos22_shareram) /** @@ -2089,7 +2089,7 @@ static ADDRESS_MAP_START( namcos22_am, ADDRESS_SPACE_PROGRAM, 32 ) * Mounted position: VIDEO 6B, 7B, 8B (near C305) * Note: 0xff00-0xffff are for Tilemap (16 x 16) */ - AM_RANGE(0x90028000, 0x9003ffff) AM_READ(MRA32_RAM) AM_WRITE(namcos22_paletteram_w) AM_BASE(&paletteram32) + AM_RANGE(0x90028000, 0x9003ffff) AM_READ(SMH_RAM) AM_WRITE(namcos22_paletteram_w) AM_BASE(&paletteram32) /** * unknown (option) @@ -2100,7 +2100,7 @@ static ADDRESS_MAP_START( namcos22_am, ADDRESS_SPACE_PROGRAM, 32 ) /** * Tilemap PCG Memory */ - AM_RANGE(0x90080000, 0x9009dfff) AM_READ(MRA32_RAM) AM_WRITE(namcos22_cgram_w) AM_BASE(&namcos22_cgram) + AM_RANGE(0x90080000, 0x9009dfff) AM_READ(SMH_RAM) AM_WRITE(namcos22_cgram_w) AM_BASE(&namcos22_cgram) /** * Tilemap Memory (64 x 64) @@ -2108,7 +2108,7 @@ static ADDRESS_MAP_START( namcos22_am, ADDRESS_SPACE_PROGRAM, 32 ) * Known chip type: HM511664 (64k x 16bit SRAM) * Note: Self test: 90084000 - 9009ffff */ - AM_RANGE(0x9009e000, 0x9009ffff) AM_READ(MRA32_RAM) AM_WRITE(namcos22_textram_w) AM_BASE(&namcos22_textram) + AM_RANGE(0x9009e000, 0x9009ffff) AM_READ(SMH_RAM) AM_WRITE(namcos22_textram_w) AM_BASE(&namcos22_textram) /** * Tilemap Register diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 34d058c27ef..ddeb1189a95 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -653,7 +653,7 @@ static READ16_HANDLER( sharedram_sub_r ) /* H8/3002 MCU stuff */ static ADDRESS_MAP_START( s23h8rwmap, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x080000, 0x08ffff) AM_READWRITE( sharedram_sub_r, sharedram_sub_w ) AM_RANGE(0x280000, 0x287fff) AM_READWRITE( c352_0_r, c352_0_w ) AM_RANGE(0x300000, 0x300001) AM_READNOP //( input_port_1_word_r ) diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c index e3f59653e07..fa21a73faaa 100644 --- a/src/mame/drivers/namcos86.c +++ b/src/mame/drivers/namcos86.c @@ -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(MRA8_BANK1) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM & Voice expansion board - only some games have it */ @@ -387,14 +387,14 @@ 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(MRA8_BANK2) \ + AM_RANGE(ADDR_ROM+0x0000, ADDR_ROM+0x1fff) AM_READ(SMH_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) \ /* { ADDR_BANK+0x04, ADDR_BANK+0x06 } layer 3 scroll registers would be here */ \ AM_RANGE(ADDR_WDOG, ADDR_WDOG) AM_WRITE(watchdog2_w) \ AM_RANGE(ADDR_INT, ADDR_INT) AM_WRITE(int_ack2_w) /* IRQ acknowledge */ \ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) \ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) \ ADDRESS_MAP_END #define UNUSED 0x4000 @@ -424,8 +424,8 @@ static ADDRESS_MAP_START( NAME##_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) \ AM_RANGE(ADDR_LOWROM, ADDR_LOWROM+0x3fff) AM_ROM \ AM_RANGE(0x8000, 0xbfff) AM_ROM \ AM_RANGE(0xf000, 0xffff) AM_ROM \ - AM_RANGE(ADDR_UNK1, ADDR_UNK1) AM_WRITE(MWA8_NOP) /* ??? written (not always) at end of interrupt */ \ - AM_RANGE(ADDR_UNK2, ADDR_UNK2) AM_WRITE(MWA8_NOP) /* ??? written (not always) at end of interrupt */ \ + AM_RANGE(ADDR_UNK1, ADDR_UNK1) AM_WRITE(SMH_NOP) /* ??? written (not always) at end of interrupt */ \ + AM_RANGE(ADDR_UNK2, ADDR_UNK2) AM_WRITE(SMH_NOP) /* ??? written (not always) at end of interrupt */ \ ADDRESS_MAP_END #define UNUSED 0x4000 diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c index 3d6c497702c..c9747745e49 100644 --- a/src/mame/drivers/naughtyb.c +++ b/src/mame/drivers/naughtyb.c @@ -177,30 +177,30 @@ static READ8_HANDLER( popflame_protection_r ) /* Not used by bootleg/hack */ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0xb000, 0xb7ff) AM_READ(in0_port_r) // IN0 AM_RANGE(0xb800, 0xbfff) AM_READ(dsw0_port_r) // DSW0 ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x8800, 0x8fff) AM_WRITE(MWA8_RAM) AM_BASE(&naughtyb_videoram2) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x8800, 0x8fff) AM_WRITE(SMH_RAM) AM_BASE(&naughtyb_videoram2) AM_RANGE(0x9000, 0x97ff) AM_WRITE(naughtyb_videoreg_w) - AM_RANGE(0x9800, 0x9fff) AM_WRITE(MWA8_RAM) AM_BASE(&naughtyb_scrollreg) + AM_RANGE(0x9800, 0x9fff) AM_WRITE(SMH_RAM) AM_BASE(&naughtyb_scrollreg) AM_RANGE(0xa000, 0xa7ff) AM_WRITE(pleiads_sound_control_a_w) AM_RANGE(0xa800, 0xafff) AM_WRITE(pleiads_sound_control_b_w) ADDRESS_MAP_END static ADDRESS_MAP_START( popflame_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x8800, 0x8fff) AM_WRITE(MWA8_RAM) AM_BASE(&naughtyb_videoram2) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x8800, 0x8fff) AM_WRITE(SMH_RAM) AM_BASE(&naughtyb_videoram2) AM_RANGE(0x9000, 0x97ff) AM_WRITE(popflame_videoreg_w) - AM_RANGE(0x9800, 0x9fff) AM_WRITE(MWA8_RAM) AM_BASE(&naughtyb_scrollreg) + AM_RANGE(0x9800, 0x9fff) AM_WRITE(SMH_RAM) AM_BASE(&naughtyb_scrollreg) AM_RANGE(0xa000, 0xa7ff) AM_WRITE(pleiads_sound_control_a_w) AM_RANGE(0xa800, 0xafff) AM_WRITE(pleiads_sound_control_b_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c index 6a7867ebca7..f3e759e4e60 100644 --- a/src/mame/drivers/nbmj8688.c +++ b/src/mame/drivers/nbmj8688.c @@ -300,35 +300,35 @@ static DRIVER_INIT( nightlov ) static ADDRESS_MAP_START( readmem_mjsikaku, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xf7ff) AM_READ(MRA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xf7ff) AM_READ(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mjsikaku, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xf7ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0x0000, 0xf7ff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_secolove, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_secolove, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_ojousan, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x6fff) AM_READ(MRA8_ROM) - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x6fff) AM_READ(SMH_ROM) + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_ojousan, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x6fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x6fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -377,7 +377,7 @@ static ADDRESS_MAP_START( writeport_crystalg, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj8688_clut_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(crystalg_romsel_w) -// AM_RANGE(0xf0, 0xf0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c index 2ea2474f0f1..76a50c1744b 100644 --- a/src/mame/drivers/nbmj8891.c +++ b/src/mame/drivers/nbmj8891.c @@ -352,125 +352,125 @@ static DRIVER_INIT( taiwanmb ) static ADDRESS_MAP_START( readmem_gionbana, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_READ(nbmj8891_clut_r) AM_RANGE(0xf400, 0xf5ff) AM_READ(nbmj8891_palette_type1_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_gionbana, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_WRITE(nbmj8891_clut_w) AM_RANGE(0xf400, 0xf5ff) AM_WRITE(nbmj8891_palette_type1_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mgion, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(nbmj8891_palette_type1_w) AM_RANGE(0xf400, 0xf40f) AM_WRITE(nbmj8891_clut_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_omotesnd, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf400, 0xf5ff) AM_READ(nbmj8891_palette_type1_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_omotesnd, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf400, 0xf5ff) AM_WRITE(nbmj8891_palette_type1_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_hanamomo, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_READ(nbmj8891_palette_type1_r) AM_RANGE(0xf400, 0xf40f) AM_READ(nbmj8891_clut_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_hanamomo, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(nbmj8891_palette_type1_w) AM_RANGE(0xf400, 0xf40f) AM_WRITE(nbmj8891_clut_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_scandalm, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf400, 0xf5ff) AM_READ(nbmj8891_palette_type1_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_scandalm, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf400, 0xf5ff) AM_WRITE(nbmj8891_palette_type1_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_club90s, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf80f) AM_READ(nbmj8891_clut_r) AM_RANGE(0xfc00, 0xfdff) AM_READ(nbmj8891_palette_type1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_club90s, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf800, 0xf80f) AM_WRITE(nbmj8891_clut_w) AM_RANGE(0xfc00, 0xfdff) AM_WRITE(nbmj8891_palette_type1_w) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_lovehous, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_READ(nbmj8891_clut_r) AM_RANGE(0xf400, 0xf5ff) AM_READ(nbmj8891_palette_type2_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_lovehous, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_WRITE(nbmj8891_clut_w) AM_RANGE(0xf400, 0xf5ff) AM_WRITE(nbmj8891_palette_type2_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_maiko, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_READ(nbmj8891_palette_type2_r) AM_RANGE(0xf400, 0xf40f) AM_READ(nbmj8891_clut_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_maiko, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(nbmj8891_palette_type2_w) AM_RANGE(0xf400, 0xf40f) AM_WRITE(nbmj8891_clut_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mmaiko, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(nbmj8891_palette_type2_w) AM_RANGE(0xf400, 0xf40f) AM_WRITE(nbmj8891_clut_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_hanaoji, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf200, 0xf3ff) AM_READ(nbmj8891_palette_type2_r) AM_RANGE(0xf700, 0xf70f) AM_READ(nbmj8891_clut_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_hanaoji, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf200, 0xf3ff) AM_WRITE(nbmj8891_palette_type2_w) AM_RANGE(0xf700, 0xf70f) AM_WRITE(nbmj8891_clut_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END static READ8_HANDLER( taiwanmb_unk_r ) @@ -479,32 +479,32 @@ static READ8_HANDLER( taiwanmb_unk_r ) } static ADDRESS_MAP_START( readmem_taiwanmb, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xec00, 0xedff) AM_READ(nbmj8891_palette_type3_r) - AM_RANGE(0xf800, 0xfeff) AM_READ(MRA8_RAM) - AM_RANGE(0xff00, 0xff1f) AM_READ(MRA8_NOP) // ? + AM_RANGE(0xf800, 0xfeff) AM_READ(SMH_RAM) + AM_RANGE(0xff00, 0xff1f) AM_READ(SMH_NOP) // ? AM_RANGE(0xff20, 0xff20) AM_READ(taiwanmb_unk_r) // MCU or 1413M3 STATUS? (return != 0x00 then loop) - AM_RANGE(0xff21, 0xff2f) AM_READ(MRA8_NOP) // ? - AM_RANGE(0xff30, 0xffff) AM_READ(MRA8_RAM) // + AM_RANGE(0xff21, 0xff2f) AM_READ(SMH_NOP) // ? + AM_RANGE(0xff30, 0xffff) AM_READ(SMH_RAM) // ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_taiwanmb, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xec00, 0xedff) AM_WRITE(nbmj8891_palette_type3_w) - AM_RANGE(0xf800, 0xfeff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) - AM_RANGE(0xff00, 0xff1f) AM_WRITE(MWA8_NOP) // ? + AM_RANGE(0xf800, 0xfeff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0xff00, 0xff1f) AM_WRITE(SMH_NOP) // ? AM_RANGE(0xff20, 0xff20) AM_WRITE(nbmj8891_taiwanmb_mcu_w) // MCU PARAMETER? - AM_RANGE(0xff21, 0xff21) AM_WRITE(MWA8_NOP) // blitter parameter set end (write 0x01 only) + AM_RANGE(0xff21, 0xff21) AM_WRITE(SMH_NOP) // blitter parameter set end (write 0x01 only) AM_RANGE(0xff22, 0xff27) AM_WRITE(nbmj8891_taiwanmb_blitter_w) // blitter parameter AM_RANGE(0xff28, 0xff28) AM_WRITE(nbmj8891_romsel_w) // gfx rombank select AM_RANGE(0xff29, 0xff29) AM_WRITE(nbmj8891_taiwanmb_gfxflag_w) // screen flip flag? - AM_RANGE(0xff2a, 0xff2a) AM_WRITE(MWA8_NOP) // not used? + AM_RANGE(0xff2a, 0xff2a) AM_WRITE(SMH_NOP) // not used? AM_RANGE(0xff2b, 0xff2b) AM_WRITE(nbmj8891_clutsel_w) // color look up table select - AM_RANGE(0xff2c, 0xff2c) AM_WRITE(MWA8_NOP) // blitter parameter set start (write 0xff only) - AM_RANGE(0xff2d, 0xff2d) AM_WRITE(MWA8_NOP) // not used? - AM_RANGE(0xff2e, 0xff2e) AM_WRITE(MWA8_NOP) // not used? - AM_RANGE(0xff2f, 0xff2f) AM_WRITE(MWA8_NOP) // not used? - AM_RANGE(0xff30, 0xffff) AM_WRITE(MWA8_RAM) // RAM? + AM_RANGE(0xff2c, 0xff2c) AM_WRITE(SMH_NOP) // blitter parameter set start (write 0xff only) + AM_RANGE(0xff2d, 0xff2d) AM_WRITE(SMH_NOP) // not used? + AM_RANGE(0xff2e, 0xff2e) AM_WRITE(SMH_NOP) // not used? + AM_RANGE(0xff2f, 0xff2f) AM_WRITE(SMH_NOP) // not used? + AM_RANGE(0xff30, 0xffff) AM_WRITE(SMH_RAM) // RAM? ADDRESS_MAP_END @@ -530,7 +530,7 @@ static ADDRESS_MAP_START( writeport_gionbana, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) -// AM_RANGE(0xc0, 0xc0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) @@ -547,7 +547,7 @@ static ADDRESS_MAP_START( writeport_mgion, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) -// AM_RANGE(0xc0, 0xc0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) @@ -577,10 +577,10 @@ static ADDRESS_MAP_START( writeport_omotesnd, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w) - AM_RANGE(0x90, 0x90) AM_WRITE(MWA8_NOP) + AM_RANGE(0x90, 0x90) AM_WRITE(SMH_NOP) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) -AM_RANGE(0xc0, 0xc0) AM_WRITE(MWA8_NOP) +AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -596,10 +596,10 @@ static ADDRESS_MAP_START( writeport_hanamomo, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) -// AM_RANGE(0xc0, 0xc0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) -// AM_RANGE(0xe0, 0xe0) AM_WRITE(MWA8_NOP) -// AM_RANGE(0xf0, 0xf0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) +// AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_msjiken, ADDRESS_SPACE_IO, 8 ) @@ -613,10 +613,10 @@ static ADDRESS_MAP_START( writeport_msjiken, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) -// AM_RANGE(0xc0, 0xc0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) -// AM_RANGE(0xe0, 0xe0) AM_WRITE(MWA8_NOP) -// AM_RANGE(0xf0, 0xf0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) +// AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_scandal, ADDRESS_SPACE_IO, 8 ) @@ -632,8 +632,8 @@ static ADDRESS_MAP_START( writeport_scandal, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(nb1413m3_nmi_clock_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) -// AM_RANGE(0xe0, 0xe0) AM_WRITE(MWA8_NOP) -// AM_RANGE(0xf0, 0xf0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) +// AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( readport_scandalm, ADDRESS_SPACE_IO, 8 ) @@ -661,7 +661,7 @@ static ADDRESS_MAP_START( writeport_scandalm, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(nb1413m3_nmi_clock_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) -// AM_RANGE(0xe0, 0xe0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -679,7 +679,7 @@ static ADDRESS_MAP_START( writeport_bananadr, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(nb1413m3_nmi_clock_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) -// AM_RANGE(0xe0, 0xe0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -703,7 +703,7 @@ static ADDRESS_MAP_START( writeport_lovehous, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w) AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w) -// AM_RANGE(0x90, 0x90) AM_WRITE(MWA8_NOP) +// AM_RANGE(0x90, 0x90) AM_WRITE(SMH_NOP) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) @@ -733,7 +733,7 @@ static ADDRESS_MAP_START( writeport_maiko, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) -// AM_RANGE(0xc0, 0xc0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_vramsel_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) @@ -757,10 +757,10 @@ static ADDRESS_MAP_START( writeport_taiwanmb, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w) -// AM_RANGE(0x90, 0x90) AM_WRITE(MWA8_NOP) // ? +// AM_RANGE(0x90, 0x90) AM_WRITE(SMH_NOP) // ? AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) -// AM_RANGE(0xc0, 0xc0) AM_WRITE(MWA8_NOP) // ? +// AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP) // ? AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj8891_taiwanmb_gfxdraw_w) // blitter draw start AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c index 3c4284134ff..170ecf1ed53 100644 --- a/src/mame/drivers/nbmj8991.c +++ b/src/mame/drivers/nbmj8991.c @@ -202,129 +202,129 @@ static DRIVER_INIT( av2mj2rg ) static ADDRESS_MAP_START( readmem_pstadium, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_READ(nbmj8991_clut_r) - AM_RANGE(0xf200, 0xf3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf200, 0xf3ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_pstadium, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_WRITE(nbmj8991_clut_w) AM_RANGE(0xf200, 0xf3ff) AM_WRITE(nbmj8991_palette_type3_w) AM_BASE(&paletteram) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) // finalbny + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) // finalbny ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_triplew1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf1ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf1ff) AM_READ(SMH_RAM) AM_RANGE(0xf200, 0xf20f) AM_READ(nbmj8991_clut_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_triplew1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(nbmj8991_palette_type3_w) AM_BASE(&paletteram) AM_RANGE(0xf200, 0xf20f) AM_WRITE(nbmj8991_clut_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) // mjgottub + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) // mjgottub ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_triplew2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf1ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf1ff) AM_READ(SMH_RAM) AM_RANGE(0xf400, 0xf40f) AM_READ(nbmj8991_clut_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_triplew2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(nbmj8991_palette_type3_w) AM_BASE(&paletteram) AM_RANGE(0xf400, 0xf40f) AM_WRITE(nbmj8991_clut_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_mjlstory, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf200, 0xf3ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf200, 0xf3ff) AM_READ(SMH_RAM) AM_RANGE(0xf700, 0xf70f) AM_READ(nbmj8991_clut_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mjlstory, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf200, 0xf3ff) AM_WRITE(nbmj8991_palette_type3_w) AM_BASE(&paletteram) AM_RANGE(0xf700, 0xf70f) AM_WRITE(nbmj8991_clut_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_galkoku, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_READ(nbmj8991_clut_r) - AM_RANGE(0xf400, 0xf5ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf400, 0xf5ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_galkoku, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_WRITE(nbmj8991_clut_w) AM_RANGE(0xf400, 0xf5ff) AM_WRITE(nbmj8991_palette_type1_w) AM_BASE(&paletteram) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) // hyouban + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) // hyouban ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_galkaika, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_READ(nbmj8991_clut_r) - AM_RANGE(0xf400, 0xf5ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf400, 0xf5ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_galkaika, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_WRITE(nbmj8991_clut_w) AM_RANGE(0xf400, 0xf5ff) AM_WRITE(nbmj8991_palette_type2_w) AM_BASE(&paletteram) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) // tokimbsj + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) // tokimbsj ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_tokyogal, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf1ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf1ff) AM_READ(SMH_RAM) AM_RANGE(0xf400, 0xf40f) AM_READ(nbmj8991_clut_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_tokyogal, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(nbmj8991_palette_type2_w) AM_BASE(&paletteram) AM_RANGE(0xf400, 0xf40f) AM_WRITE(nbmj8991_clut_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_av2mj1bb, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf1ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf1ff) AM_READ(SMH_RAM) AM_RANGE(0xf500, 0xf50f) AM_READ(nbmj8991_clut_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_av2mj1bb, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(nbmj8991_palette_type3_w) AM_BASE(&paletteram) AM_RANGE(0xf500, 0xf50f) AM_WRITE(nbmj8991_clut_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_av2mj2rg, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_READ(nbmj8991_clut_r) - AM_RANGE(0xf200, 0xf3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf200, 0xf3ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_av2mj2rg, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf00f) AM_WRITE(nbmj8991_clut_w) AM_RANGE(0xf200, 0xf3ff) AM_WRITE(nbmj8991_palette_type3_w) AM_BASE(&paletteram) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -348,7 +348,7 @@ static ADDRESS_MAP_START( writeport_galkoku, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(nb1413m3_nmi_clock_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) -// AM_RANGE(0xe0, 0xe0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -373,7 +373,7 @@ static ADDRESS_MAP_START( writeport_hyouban, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(nb1413m3_nmi_clock_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE) -// AM_RANGE(0xe0, 0xe0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xe0, 0xe0) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -393,8 +393,8 @@ static ADDRESS_MAP_START( writeport_pstadium, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x7f) AM_WRITE(nbmj8991_blitter_w) AM_RANGE(0x80, 0x80) AM_WRITE(nbmj8991_sound_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) -// AM_RANGE(0xb0, 0xb0) AM_WRITE(MWA8_NOP) -// AM_RANGE(0xd0, 0xd0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xb0, 0xb0) AM_WRITE(SMH_NOP) +// AM_RANGE(0xd0, 0xd0) AM_WRITE(SMH_NOP) AM_RANGE(0xf0, 0xf0) AM_WRITE(nb1413m3_outcoin_w) ADDRESS_MAP_END @@ -405,21 +405,21 @@ static ADDRESS_MAP_START( writeport_av2mj1bb, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x80) AM_WRITE(nbmj8991_sound_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_vcrctrl_w) -// AM_RANGE(0xd0, 0xd0) AM_WRITE(MWA8_NOP) -// AM_RANGE(0xf0, 0xf0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xd0, 0xd0) AM_WRITE(SMH_NOP) +// AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem_nbmj8991, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_nbmj8991, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -433,7 +433,7 @@ static ADDRESS_MAP_START( sound_writeport_nbmj8991, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(DAC_0_WRITE) AM_RANGE(0x02, 0x02) AM_WRITE(DAC_1_WRITE) AM_RANGE(0x04, 0x04) AM_WRITE(nbmj8991_soundbank_w) - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP) + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c index 71d8a73fe2e..c4e424ef723 100644 --- a/src/mame/drivers/nbmj9195.c +++ b/src/mame/drivers/nbmj9195.c @@ -561,94 +561,94 @@ static DRIVER_INIT( nbmj9195 ) static ADDRESS_MAP_START( readmem_sailorws, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_READ(nbmj9195_palette_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sailorws, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf1ff) AM_WRITE(nbmj9195_palette_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&nbmj9195_nvram) AM_SIZE(&nbmj9195_nvram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&nbmj9195_nvram) AM_SIZE(&nbmj9195_nvram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_mjuraden, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf200, 0xf3ff) AM_READ(nbmj9195_palette_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mjuraden, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf200, 0xf3ff) AM_WRITE(nbmj9195_palette_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_koinomp, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) AM_RANGE(0xe000, 0xe1ff) AM_READ(nbmj9195_palette_r) - AM_RANGE(0xe800, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0xe800, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_koinomp, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) AM_RANGE(0xe000, 0xe1ff) AM_WRITE(nbmj9195_palette_w) - AM_RANGE(0xe800, 0xefff) AM_WRITE(MWA8_RAM) AM_BASE(&nbmj9195_nvram) AM_SIZE(&nbmj9195_nvram_size) + AM_RANGE(0xe800, 0xefff) AM_WRITE(SMH_RAM) AM_BASE(&nbmj9195_nvram) AM_SIZE(&nbmj9195_nvram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_ngpgal, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xcfff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xcfff) AM_READ(SMH_ROM) AM_RANGE(0xd000, 0xd1ff) AM_READ(nbmj9195_palette_r) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_ngpgal, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xcfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xcfff) AM_WRITE(SMH_ROM) AM_RANGE(0xd000, 0xd1ff) AM_WRITE(nbmj9195_palette_w) - AM_RANGE(0xd800, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd800, 0xdfff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_mscoutm, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xe5ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xe5ff) AM_READ(SMH_RAM) AM_RANGE(0xe600, 0xebff) AM_READ(nbmj9195_nb22090_palette_r) - AM_RANGE(0xec00, 0xf1ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf200, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xec00, 0xf1ff) AM_READ(SMH_RAM) + AM_RANGE(0xf200, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mscoutm, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xe5ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xe5ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe600, 0xebff) AM_WRITE(nbmj9195_nb22090_palette_w) - AM_RANGE(0xec00, 0xf1ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf200, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xec00, 0xf1ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf200, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_mjegolf, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) AM_RANGE(0xe000, 0xe5ff) AM_READ(nbmj9195_nb22090_palette_r) - AM_RANGE(0xe600, 0xebff) AM_READ(MRA8_RAM) - AM_RANGE(0xec00, 0xf1ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf200, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xe600, 0xebff) AM_READ(SMH_RAM) + AM_RANGE(0xec00, 0xf1ff) AM_READ(SMH_RAM) + AM_RANGE(0xf200, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mjegolf, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) AM_RANGE(0xe000, 0xe5ff) AM_WRITE(nbmj9195_nb22090_palette_w) - AM_RANGE(0xe600, 0xebff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xec00, 0xf1ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf200, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe600, 0xebff) AM_WRITE(SMH_RAM) + AM_RANGE(0xec00, 0xf1ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf200, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -688,8 +688,8 @@ static ADDRESS_MAP_START( writeport_mjuraden, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xb2, 0xb2) AM_WRITE(MWA8_NOP) - AM_RANGE(0xb4, 0xb4) AM_WRITE(MWA8_NOP) + AM_RANGE(0xb2, 0xb2) AM_WRITE(SMH_NOP) + AM_RANGE(0xb4, 0xb4) AM_WRITE(SMH_NOP) AM_RANGE(0xb6, 0xb6) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -733,10 +733,10 @@ static ADDRESS_MAP_START( writeport_koinomp, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xc2, 0xc2) AM_WRITE(MWA8_NOP) - AM_RANGE(0xc4, 0xc4) AM_WRITE(MWA8_NOP) + AM_RANGE(0xc2, 0xc2) AM_WRITE(SMH_NOP) + AM_RANGE(0xc4, 0xc4) AM_WRITE(SMH_NOP) AM_RANGE(0xc6, 0xc6) AM_WRITE(nbmj9195_inputportsel_w) - AM_RANGE(0xcf, 0xcf) AM_WRITE(MWA8_NOP) + AM_RANGE(0xcf, 0xcf) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -779,8 +779,8 @@ static ADDRESS_MAP_START( writeport_patimono, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xa4, 0xa4) AM_WRITE(MWA8_NOP) - AM_RANGE(0xa8, 0xa8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa4, 0xa4) AM_WRITE(SMH_NOP) + AM_RANGE(0xa8, 0xa8) AM_WRITE(SMH_NOP) AM_RANGE(0xb0, 0xb8) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -821,8 +821,8 @@ static ADDRESS_MAP_START( writeport_mmehyou, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xa4, 0xa4) AM_WRITE(MWA8_NOP) - AM_RANGE(0xa8, 0xa8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa4, 0xa4) AM_WRITE(SMH_NOP) + AM_RANGE(0xa8, 0xa8) AM_WRITE(SMH_NOP) AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -866,8 +866,8 @@ static ADDRESS_MAP_START( writeport_gal10ren, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xc8, 0xc8) AM_WRITE(MWA8_NOP) - AM_RANGE(0xd0, 0xd0) AM_WRITE(MWA8_NOP) + AM_RANGE(0xc8, 0xc8) AM_WRITE(SMH_NOP) + AM_RANGE(0xd0, 0xd0) AM_WRITE(SMH_NOP) AM_RANGE(0xd8, 0xd8) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -911,8 +911,8 @@ static ADDRESS_MAP_START( writeport_renaiclb, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xe0, 0xef) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0x20, 0x20) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0x24, 0x24) AM_WRITE(MWA8_NOP) - AM_RANGE(0x28, 0x28) AM_WRITE(MWA8_NOP) + AM_RANGE(0x24, 0x24) AM_WRITE(SMH_NOP) + AM_RANGE(0x28, 0x28) AM_WRITE(SMH_NOP) AM_RANGE(0x2c, 0x2c) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -956,8 +956,8 @@ static ADDRESS_MAP_START( writeport_mjlaman, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xe0, 0xef) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0x20, 0x20) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0x22, 0x22) AM_WRITE(MWA8_NOP) - AM_RANGE(0x24, 0x24) AM_WRITE(MWA8_NOP) + AM_RANGE(0x22, 0x22) AM_WRITE(SMH_NOP) + AM_RANGE(0x24, 0x24) AM_WRITE(SMH_NOP) AM_RANGE(0x26, 0x26) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1001,8 +1001,8 @@ static ADDRESS_MAP_START( writeport_mkeibaou, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xd8, 0xd8) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xda, 0xda) AM_WRITE(MWA8_NOP) - AM_RANGE(0xdc, 0xdc) AM_WRITE(MWA8_NOP) + AM_RANGE(0xda, 0xda) AM_WRITE(SMH_NOP) + AM_RANGE(0xdc, 0xdc) AM_WRITE(SMH_NOP) AM_RANGE(0xde, 0xde) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1046,8 +1046,8 @@ static ADDRESS_MAP_START( writeport_pachiten, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xe2, 0xe2) AM_WRITE(MWA8_NOP) - AM_RANGE(0xe4, 0xe4) AM_WRITE(MWA8_NOP) + AM_RANGE(0xe2, 0xe2) AM_WRITE(SMH_NOP) + AM_RANGE(0xe4, 0xe4) AM_WRITE(SMH_NOP) AM_RANGE(0xe6, 0xe6) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1091,8 +1091,8 @@ static ADDRESS_MAP_START( writeport_sailorws, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xf2, 0xf2) AM_WRITE(MWA8_NOP) - AM_RANGE(0xf4, 0xf4) AM_WRITE(MWA8_NOP) + AM_RANGE(0xf2, 0xf2) AM_WRITE(SMH_NOP) + AM_RANGE(0xf4, 0xf4) AM_WRITE(SMH_NOP) AM_RANGE(0xf6, 0xf6) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1136,8 +1136,8 @@ static ADDRESS_MAP_START( writeport_sailorwr, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xf8, 0xf8) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xfa, 0xfa) AM_WRITE(MWA8_NOP) - AM_RANGE(0xfc, 0xfc) AM_WRITE(MWA8_NOP) + AM_RANGE(0xfa, 0xfa) AM_WRITE(SMH_NOP) + AM_RANGE(0xfc, 0xfc) AM_WRITE(SMH_NOP) AM_RANGE(0xfe, 0xfe) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1181,8 +1181,8 @@ static ADDRESS_MAP_START( writeport_psailor1, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xf0, 0xf0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xf2, 0xf2) AM_WRITE(MWA8_NOP) - AM_RANGE(0xf4, 0xf4) AM_WRITE(MWA8_NOP) + AM_RANGE(0xf2, 0xf2) AM_WRITE(SMH_NOP) + AM_RANGE(0xf4, 0xf4) AM_WRITE(SMH_NOP) AM_RANGE(0xf6, 0xf6) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1226,8 +1226,8 @@ static ADDRESS_MAP_START( writeport_psailor2, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xe2, 0xe2) AM_WRITE(MWA8_NOP) - AM_RANGE(0xe4, 0xe4) AM_WRITE(MWA8_NOP) + AM_RANGE(0xe2, 0xe2) AM_WRITE(SMH_NOP) + AM_RANGE(0xe4, 0xe4) AM_WRITE(SMH_NOP) AM_RANGE(0xf6, 0xf6) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1271,8 +1271,8 @@ static ADDRESS_MAP_START( writeport_otatidai, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xa8, 0xa8) AM_WRITE(MWA8_NOP) - AM_RANGE(0xb0, 0xb0) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa8, 0xa8) AM_WRITE(SMH_NOP) + AM_RANGE(0xb0, 0xb0) AM_WRITE(SMH_NOP) AM_RANGE(0xb8, 0xb8) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1316,8 +1316,8 @@ static ADDRESS_MAP_START( writeport_yosimoto, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0x90, 0x90) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0x94, 0x94) AM_WRITE(MWA8_NOP) - AM_RANGE(0x98, 0x98) AM_WRITE(MWA8_NOP) + AM_RANGE(0x94, 0x94) AM_WRITE(SMH_NOP) + AM_RANGE(0x98, 0x98) AM_WRITE(SMH_NOP) AM_RANGE(0x9c, 0x9c) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1361,8 +1361,8 @@ static ADDRESS_MAP_START( writeport_jituroku, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_1_w) AM_RANGE(0xe0, 0xe0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xe8, 0xe8) AM_WRITE(MWA8_NOP) - AM_RANGE(0xf0, 0xf0) AM_WRITE(MWA8_NOP) + AM_RANGE(0xe8, 0xe8) AM_WRITE(SMH_NOP) + AM_RANGE(0xf0, 0xf0) AM_WRITE(SMH_NOP) AM_RANGE(0xf8, 0xf8) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1403,8 +1403,8 @@ static ADDRESS_MAP_START( writeport_ngpgal, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xa4, 0xa4) AM_WRITE(MWA8_NOP) - AM_RANGE(0xa8, 0xa8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa4, 0xa4) AM_WRITE(SMH_NOP) + AM_RANGE(0xa8, 0xa8) AM_WRITE(SMH_NOP) AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1445,8 +1445,8 @@ static ADDRESS_MAP_START( writeport_mjgottsu, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xa4, 0xa4) AM_WRITE(MWA8_NOP) - AM_RANGE(0xa8, 0xa8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa4, 0xa4) AM_WRITE(SMH_NOP) + AM_RANGE(0xa8, 0xa8) AM_WRITE(SMH_NOP) AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1487,9 +1487,9 @@ static ADDRESS_MAP_START( writeport_cmehyou, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xa8, 0xa8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa8, 0xa8) AM_WRITE(SMH_NOP) AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w) - AM_RANGE(0xb4, 0xb4) AM_WRITE(MWA8_NOP) + AM_RANGE(0xb4, 0xb4) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -1529,8 +1529,8 @@ static ADDRESS_MAP_START( writeport_mjkoiura, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xa4, 0xa4) AM_WRITE(MWA8_NOP) - AM_RANGE(0xa8, 0xa8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa4, 0xa4) AM_WRITE(SMH_NOP) + AM_RANGE(0xa8, 0xa8) AM_WRITE(SMH_NOP) AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1571,8 +1571,8 @@ static ADDRESS_MAP_START( writeport_mkoiuraa, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w) - AM_RANGE(0xa4, 0xa4) AM_WRITE(MWA8_NOP) - AM_RANGE(0xa8, 0xa8) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa4, 0xa4) AM_WRITE(SMH_NOP) + AM_RANGE(0xa8, 0xa8) AM_WRITE(SMH_NOP) AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w) ADDRESS_MAP_END @@ -1615,7 +1615,7 @@ static ADDRESS_MAP_START( writeport_mscoutm, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_0_w) AM_RANGE(0xf0, 0xff) AM_WRITE(nbmj9195_clut_1_w) - AM_RANGE(0xa0, 0xa6) AM_WRITE(MWA8_NOP) // nb22090 param ? + AM_RANGE(0xa0, 0xa6) AM_WRITE(SMH_NOP) // nb22090 param ? AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0xe0, 0xef) AM_WRITE(nbmj9195_blitter_1_w) @@ -1662,7 +1662,7 @@ static ADDRESS_MAP_START( writeport_imekura, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_0_w) AM_RANGE(0xf0, 0xff) AM_WRITE(nbmj9195_clut_1_w) - AM_RANGE(0xb0, 0xb6) AM_WRITE(MWA8_NOP) // nb22090 param ? + AM_RANGE(0xb0, 0xb6) AM_WRITE(SMH_NOP) // nb22090 param ? AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0xe0, 0xef) AM_WRITE(nbmj9195_blitter_1_w) @@ -1709,7 +1709,7 @@ static ADDRESS_MAP_START( writeport_mjegolf, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xb0, 0xbf) AM_WRITE(nbmj9195_clut_0_w) AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_1_w) - AM_RANGE(0x80, 0x86) AM_WRITE(MWA8_NOP) // nb22090 param ? + AM_RANGE(0x80, 0x86) AM_WRITE(SMH_NOP) // nb22090 param ? AM_RANGE(0xa0, 0xaf) AM_WRITE(nbmj9195_blitter_0_w) AM_RANGE(0xc0, 0xcf) AM_WRITE(nbmj9195_blitter_1_w) diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index 4901d0a1e56..6481e46ce6e 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -262,19 +262,19 @@ static WRITE16_HANDLER( nemesis_soundlatch_word_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x04ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x050000, 0x0503ff) AM_READ(MRA16_RAM) - AM_RANGE(0x050400, 0x0507ff) AM_READ(MRA16_RAM) - AM_RANGE(0x050800, 0x050bff) AM_READ(MRA16_RAM) - AM_RANGE(0x050c00, 0x050fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x04ffff) AM_READ(SMH_RAM) + AM_RANGE(0x050000, 0x0503ff) AM_READ(SMH_RAM) + AM_RANGE(0x050400, 0x0507ff) AM_READ(SMH_RAM) + AM_RANGE(0x050800, 0x050bff) AM_READ(SMH_RAM) + AM_RANGE(0x050c00, 0x050fff) AM_READ(SMH_RAM) - AM_RANGE(0x052000, 0x052fff) AM_READ(MRA16_RAM) - AM_RANGE(0x053000, 0x053fff) AM_READ(MRA16_RAM) - AM_RANGE(0x054000, 0x054fff) AM_READ(MRA16_RAM) - AM_RANGE(0x055000, 0x055fff) AM_READ(MRA16_RAM) - AM_RANGE(0x056000, 0x056fff) AM_READ(MRA16_RAM) - AM_RANGE(0x05a000, 0x05afff) AM_READ(MRA16_RAM) + AM_RANGE(0x052000, 0x052fff) AM_READ(SMH_RAM) + AM_RANGE(0x053000, 0x053fff) AM_READ(SMH_RAM) + AM_RANGE(0x054000, 0x054fff) AM_READ(SMH_RAM) + AM_RANGE(0x055000, 0x055fff) AM_READ(SMH_RAM) + AM_RANGE(0x056000, 0x056fff) AM_READ(SMH_RAM) + AM_RANGE(0x05a000, 0x05afff) AM_READ(SMH_RAM) AM_RANGE(0x05c400, 0x05c401) AM_READ(input_port_4_word_r) /* DSW0 */ AM_RANGE(0x05c402, 0x05c403) AM_READ(input_port_5_word_r) /* DSW1 */ @@ -284,25 +284,25 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x05cc04, 0x05cc05) AM_READ(input_port_2_word_r) /* IN2 */ AM_RANGE(0x05cc06, 0x05cc07) AM_READ(input_port_3_word_r) /* TEST */ - AM_RANGE(0x060000, 0x067fff) AM_READ(MRA16_RAM) + AM_RANGE(0x060000, 0x067fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x040000, 0x04ffff) AM_WRITE(nemesis_characterram_word_w) AM_BASE(&nemesis_characterram) AM_SIZE(&nemesis_characterram_size) - AM_RANGE(0x050000, 0x0503ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll1) - AM_RANGE(0x050400, 0x0507ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll2) - AM_RANGE(0x050800, 0x050bff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x050c00, 0x050fff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll) - AM_RANGE(0x051000, 0x051fff) AM_WRITE(MWA16_NOP) /* used, but written to with 0's */ + AM_RANGE(0x050000, 0x0503ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll1) + AM_RANGE(0x050400, 0x0507ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll2) + AM_RANGE(0x050800, 0x050bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x050c00, 0x050fff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll) + AM_RANGE(0x051000, 0x051fff) AM_WRITE(SMH_NOP) /* used, but written to with 0's */ AM_RANGE(0x052000, 0x052fff) AM_WRITE(nemesis_videoram1b_word_w) AM_BASE(&nemesis_videoram1b) /* VRAM 1 */ AM_RANGE(0x053000, 0x053fff) AM_WRITE(nemesis_videoram1f_word_w) AM_BASE(&nemesis_videoram1f) /* VRAM 1 */ AM_RANGE(0x054000, 0x054fff) AM_WRITE(nemesis_videoram2b_word_w) AM_BASE(&nemesis_videoram2b) /* VRAM 2 */ AM_RANGE(0x055000, 0x055fff) AM_WRITE(nemesis_videoram2f_word_w) AM_BASE(&nemesis_videoram2f) /* VRAM 2 */ - AM_RANGE(0x056000, 0x056fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x056000, 0x056fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x05a000, 0x05afff) AM_WRITE(nemesis_palette_word_w) AM_BASE(&paletteram16) AM_RANGE(0x05c000, 0x05c001) AM_WRITE(nemesis_soundlatch_word_w) @@ -312,7 +312,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x05e002, 0x05e003) AM_WRITE(&nemesis_irq_enable_word_w) /* Konami GT */ AM_RANGE(0x05e004, 0x05e005) AM_WRITE(nemesis_gfx_flipx_w) AM_RANGE(0x05e006, 0x05e007) AM_WRITE(nemesis_gfx_flipy_w) - AM_RANGE(0x060000, 0x067fff) AM_WRITE(MWA16_RAM) AM_BASE(&ram) /* WORK RAM */ + AM_RANGE(0x060000, 0x067fff) AM_WRITE(SMH_RAM) AM_BASE(&ram) /* WORK RAM */ ADDRESS_MAP_END static WRITE8_HANDLER( salamand_speech_start_w ) @@ -349,16 +349,16 @@ static READ8_HANDLER( nemesis_portA_r ) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0xe001, 0xe001) AM_READ(soundlatch_r) AM_RANGE(0xe086, 0xe086) AM_READ(AY8910_read_port_0_r) AM_RANGE(0xe205, 0xe205) AM_READ(AY8910_read_port_1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xafff) AM_WRITE(k005289_pitch_A_w) AM_RANGE(0xc000, 0xcfff) AM_WRITE(k005289_pitch_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(k005289_keylatch_A_w) @@ -370,19 +370,19 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( konamigt_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x04ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x050000, 0x0503ff) AM_READ(MRA16_RAM) - AM_RANGE(0x050400, 0x0507ff) AM_READ(MRA16_RAM) - AM_RANGE(0x050800, 0x050bff) AM_READ(MRA16_RAM) - AM_RANGE(0x050c00, 0x050fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x04ffff) AM_READ(SMH_RAM) + AM_RANGE(0x050000, 0x0503ff) AM_READ(SMH_RAM) + AM_RANGE(0x050400, 0x0507ff) AM_READ(SMH_RAM) + AM_RANGE(0x050800, 0x050bff) AM_READ(SMH_RAM) + AM_RANGE(0x050c00, 0x050fff) AM_READ(SMH_RAM) - AM_RANGE(0x052000, 0x052fff) AM_READ(MRA16_RAM) - AM_RANGE(0x053000, 0x053fff) AM_READ(MRA16_RAM) - AM_RANGE(0x054000, 0x054fff) AM_READ(MRA16_RAM) - AM_RANGE(0x055000, 0x055fff) AM_READ(MRA16_RAM) - AM_RANGE(0x056000, 0x056fff) AM_READ(MRA16_RAM) - AM_RANGE(0x05a000, 0x05afff) AM_READ(MRA16_RAM) + AM_RANGE(0x052000, 0x052fff) AM_READ(SMH_RAM) + AM_RANGE(0x053000, 0x053fff) AM_READ(SMH_RAM) + AM_RANGE(0x054000, 0x054fff) AM_READ(SMH_RAM) + AM_RANGE(0x055000, 0x055fff) AM_READ(SMH_RAM) + AM_RANGE(0x056000, 0x056fff) AM_READ(SMH_RAM) + AM_RANGE(0x05a000, 0x05afff) AM_READ(SMH_RAM) AM_RANGE(0x05c400, 0x05c401) AM_READ(input_port_4_word_r) /* DSW0 */ AM_RANGE(0x05c402, 0x05c403) AM_READ(input_port_5_word_r) /* DSW1 */ @@ -392,26 +392,26 @@ static ADDRESS_MAP_START( konamigt_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x05cc04, 0x05cc05) AM_READ(input_port_2_word_r) /* IN2 */ AM_RANGE(0x05cc06, 0x05cc07) AM_READ(input_port_3_word_r) /* TEST */ - AM_RANGE(0x060000, 0x067fff) AM_READ(MRA16_RAM) + AM_RANGE(0x060000, 0x067fff) AM_READ(SMH_RAM) AM_RANGE(0x070000, 0x070001) AM_READ(konamigt_input_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( konamigt_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x040000, 0x04ffff) AM_WRITE(nemesis_characterram_word_w) AM_BASE(&nemesis_characterram) AM_SIZE(&nemesis_characterram_size) - AM_RANGE(0x050000, 0x0503ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll1) - AM_RANGE(0x050400, 0x0507ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll2) - AM_RANGE(0x050800, 0x050bff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x050c00, 0x050fff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll) - AM_RANGE(0x051000, 0x051fff) AM_WRITE(MWA16_NOP) /* used, but written to with 0's */ + AM_RANGE(0x050000, 0x0503ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll1) + AM_RANGE(0x050400, 0x0507ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll2) + AM_RANGE(0x050800, 0x050bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x050c00, 0x050fff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll) + AM_RANGE(0x051000, 0x051fff) AM_WRITE(SMH_NOP) /* used, but written to with 0's */ AM_RANGE(0x052000, 0x052fff) AM_WRITE(nemesis_videoram1b_word_w) AM_BASE(&nemesis_videoram1b) /* VRAM 1 */ AM_RANGE(0x053000, 0x053fff) AM_WRITE(nemesis_videoram1f_word_w) AM_BASE(&nemesis_videoram1f) /* VRAM 1 */ AM_RANGE(0x054000, 0x054fff) AM_WRITE(nemesis_videoram2b_word_w) AM_BASE(&nemesis_videoram2b) /* VRAM 2 */ AM_RANGE(0x055000, 0x055fff) AM_WRITE(nemesis_videoram2f_word_w) AM_BASE(&nemesis_videoram2f) /* VRAM 2 */ - AM_RANGE(0x056000, 0x056fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x056000, 0x056fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x05a000, 0x05afff) AM_WRITE(nemesis_palette_word_w) AM_BASE(&paletteram16) AM_RANGE(0x05c000, 0x05c001) AM_WRITE(nemesis_soundlatch_word_w) @@ -421,52 +421,52 @@ static ADDRESS_MAP_START( konamigt_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x05e002, 0x05e003) AM_WRITE(&konamigt_irq_enable_word_w) AM_RANGE(0x05e004, 0x05e005) AM_WRITE(nemesis_gfx_flipx_w) AM_RANGE(0x05e006, 0x05e007) AM_WRITE(nemesis_gfx_flipy_w) - AM_RANGE(0x060000, 0x067fff) AM_WRITE(MWA16_RAM) AM_BASE(&ram) /* WORK RAM */ + AM_RANGE(0x060000, 0x067fff) AM_WRITE(SMH_RAM) AM_BASE(&ram) /* WORK RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( gx400_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x010000, 0x01ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x010000, 0x01ffff) AM_READ(SMH_RAM) AM_RANGE(0x020000, 0x0287ff) AM_READ(gx400_sharedram_word_r) - AM_RANGE(0x030000, 0x03ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x050000, 0x0503ff) AM_READ(MRA16_RAM) - AM_RANGE(0x050400, 0x0507ff) AM_READ(MRA16_RAM) - AM_RANGE(0x050800, 0x050bff) AM_READ(MRA16_RAM) - AM_RANGE(0x050c00, 0x050fff) AM_READ(MRA16_RAM) - AM_RANGE(0x052000, 0x052fff) AM_READ(MRA16_RAM) - AM_RANGE(0x053000, 0x053fff) AM_READ(MRA16_RAM) - AM_RANGE(0x054000, 0x054fff) AM_READ(MRA16_RAM) - AM_RANGE(0x055000, 0x055fff) AM_READ(MRA16_RAM) - AM_RANGE(0x056000, 0x056fff) AM_READ(MRA16_RAM) - AM_RANGE(0x057000, 0x057fff) AM_READ(MRA16_RAM) - AM_RANGE(0x05a000, 0x05afff) AM_READ(MRA16_RAM) + AM_RANGE(0x030000, 0x03ffff) AM_READ(SMH_RAM) + AM_RANGE(0x050000, 0x0503ff) AM_READ(SMH_RAM) + AM_RANGE(0x050400, 0x0507ff) AM_READ(SMH_RAM) + AM_RANGE(0x050800, 0x050bff) AM_READ(SMH_RAM) + AM_RANGE(0x050c00, 0x050fff) AM_READ(SMH_RAM) + AM_RANGE(0x052000, 0x052fff) AM_READ(SMH_RAM) + AM_RANGE(0x053000, 0x053fff) AM_READ(SMH_RAM) + AM_RANGE(0x054000, 0x054fff) AM_READ(SMH_RAM) + AM_RANGE(0x055000, 0x055fff) AM_READ(SMH_RAM) + AM_RANGE(0x056000, 0x056fff) AM_READ(SMH_RAM) + AM_RANGE(0x057000, 0x057fff) AM_READ(SMH_RAM) + AM_RANGE(0x05a000, 0x05afff) AM_READ(SMH_RAM) AM_RANGE(0x05c402, 0x05c403) AM_READ(input_port_4_word_r) /* DSW0 */ AM_RANGE(0x05c404, 0x05c405) AM_READ(input_port_5_word_r) /* DSW1 */ AM_RANGE(0x05c406, 0x05c407) AM_READ(input_port_3_word_r) /* TEST */ AM_RANGE(0x05cc00, 0x05cc01) AM_READ(input_port_0_word_r) /* IN0 */ AM_RANGE(0x05cc02, 0x05cc03) AM_READ(input_port_1_word_r) /* IN1 */ AM_RANGE(0x05cc04, 0x05cc05) AM_READ(input_port_2_word_r) /* IN2 */ - AM_RANGE(0x060000, 0x07ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x080000, 0x0bffff) AM_READ(MRA16_ROM) + AM_RANGE(0x060000, 0x07ffff) AM_READ(SMH_RAM) + AM_RANGE(0x080000, 0x0bffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( gx400_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x010000, 0x01ffff) AM_WRITE(MWA16_RAM) AM_BASE(&ram) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x010000, 0x01ffff) AM_WRITE(SMH_RAM) AM_BASE(&ram) AM_RANGE(0x020000, 0x0287ff) AM_WRITE(gx400_sharedram_word_w) AM_RANGE(0x030000, 0x03ffff) AM_WRITE(nemesis_characterram_word_w) AM_BASE(&nemesis_characterram) AM_SIZE(&nemesis_characterram_size) - AM_RANGE(0x050000, 0x0503ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll1) - AM_RANGE(0x050400, 0x0507ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll2) - AM_RANGE(0x050800, 0x050bff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x050c00, 0x050fff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll) - AM_RANGE(0x051000, 0x051fff) AM_WRITE(MWA16_NOP) /* used, but written to with 0's */ + AM_RANGE(0x050000, 0x0503ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll1) + AM_RANGE(0x050400, 0x0507ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll2) + AM_RANGE(0x050800, 0x050bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x050c00, 0x050fff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll) + AM_RANGE(0x051000, 0x051fff) AM_WRITE(SMH_NOP) /* used, but written to with 0's */ AM_RANGE(0x052000, 0x052fff) AM_WRITE(nemesis_videoram1b_word_w) AM_BASE(&nemesis_videoram1b) /* VRAM 1 */ AM_RANGE(0x053000, 0x053fff) AM_WRITE(nemesis_videoram1f_word_w) AM_BASE(&nemesis_videoram1f) /* VRAM 1 */ AM_RANGE(0x054000, 0x054fff) AM_WRITE(nemesis_videoram2b_word_w) AM_BASE(&nemesis_videoram2b) /* VRAM 2 */ AM_RANGE(0x055000, 0x055fff) AM_WRITE(nemesis_videoram2f_word_w) AM_BASE(&nemesis_videoram2f) /* VRAM 2 */ - AM_RANGE(0x056000, 0x056fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x057000, 0x057fff) AM_WRITE(MWA16_RAM) /* needed for twinbee */ + AM_RANGE(0x056000, 0x056fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x057000, 0x057fff) AM_WRITE(SMH_RAM) /* needed for twinbee */ AM_RANGE(0x05a000, 0x05afff) AM_WRITE(nemesis_palette_word_w) AM_BASE(&paletteram16) AM_RANGE(0x05c000, 0x05c001) AM_WRITE(nemesis_soundlatch_word_w) AM_RANGE(0x05c800, 0x05c801) AM_WRITE(watchdog_reset16_w) /* probably */ @@ -474,53 +474,53 @@ static ADDRESS_MAP_START( gx400_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x05e002, 0x05e003) AM_WRITE(&gx400_irq1_enable_word_w) /* ?? */ AM_RANGE(0x05e004, 0x05e005) AM_WRITE(nemesis_gfx_flipx_w) AM_RANGE(0x05e006, 0x05e007) AM_WRITE(nemesis_gfx_flipy_w) - AM_RANGE(0x05e008, 0x05e009) AM_WRITE(MWA16_NOP) /* IRQ acknowledge??? */ + AM_RANGE(0x05e008, 0x05e009) AM_WRITE(SMH_NOP) /* IRQ acknowledge??? */ AM_RANGE(0x05e00e, 0x05e00f) AM_WRITE(&gx400_irq4_enable_word_w) /* ?? */ - AM_RANGE(0x060000, 0x07ffff) AM_WRITE(MWA16_RAM) AM_BASE(&ram2) - AM_RANGE(0x080000, 0x0bffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x060000, 0x07ffff) AM_WRITE(SMH_RAM) AM_BASE(&ram2) + AM_RANGE(0x080000, 0x0bffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( rf2_gx400_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x010000, 0x01ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x010000, 0x01ffff) AM_READ(SMH_RAM) AM_RANGE(0x020000, 0x0287ff) AM_READ(gx400_sharedram_word_r) - AM_RANGE(0x030000, 0x03ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x050000, 0x0503ff) AM_READ(MRA16_RAM) - AM_RANGE(0x050400, 0x0507ff) AM_READ(MRA16_RAM) - AM_RANGE(0x050800, 0x050bff) AM_READ(MRA16_RAM) - AM_RANGE(0x050c00, 0x050fff) AM_READ(MRA16_RAM) - AM_RANGE(0x052000, 0x052fff) AM_READ(MRA16_RAM) - AM_RANGE(0x053000, 0x053fff) AM_READ(MRA16_RAM) - AM_RANGE(0x054000, 0x054fff) AM_READ(MRA16_RAM) - AM_RANGE(0x055000, 0x055fff) AM_READ(MRA16_RAM) - AM_RANGE(0x056000, 0x056fff) AM_READ(MRA16_RAM) - AM_RANGE(0x05a000, 0x05afff) AM_READ(MRA16_RAM) + AM_RANGE(0x030000, 0x03ffff) AM_READ(SMH_RAM) + AM_RANGE(0x050000, 0x0503ff) AM_READ(SMH_RAM) + AM_RANGE(0x050400, 0x0507ff) AM_READ(SMH_RAM) + AM_RANGE(0x050800, 0x050bff) AM_READ(SMH_RAM) + AM_RANGE(0x050c00, 0x050fff) AM_READ(SMH_RAM) + AM_RANGE(0x052000, 0x052fff) AM_READ(SMH_RAM) + AM_RANGE(0x053000, 0x053fff) AM_READ(SMH_RAM) + AM_RANGE(0x054000, 0x054fff) AM_READ(SMH_RAM) + AM_RANGE(0x055000, 0x055fff) AM_READ(SMH_RAM) + AM_RANGE(0x056000, 0x056fff) AM_READ(SMH_RAM) + AM_RANGE(0x05a000, 0x05afff) AM_READ(SMH_RAM) AM_RANGE(0x05c402, 0x05c403) AM_READ(input_port_4_word_r) /* DSW0 */ AM_RANGE(0x05c404, 0x05c405) AM_READ(input_port_5_word_r) /* DSW1 */ AM_RANGE(0x05c406, 0x05c407) AM_READ(input_port_3_word_r) /* TEST */ AM_RANGE(0x05cc00, 0x05cc01) AM_READ(input_port_0_word_r) /* IN0 */ AM_RANGE(0x05cc02, 0x05cc03) AM_READ(input_port_1_word_r) /* IN1 */ AM_RANGE(0x05cc04, 0x05cc05) AM_READ(input_port_2_word_r) /* IN2 */ - AM_RANGE(0x060000, 0x067fff) AM_READ(MRA16_RAM) + AM_RANGE(0x060000, 0x067fff) AM_READ(SMH_RAM) AM_RANGE(0x070000, 0x070001) AM_READ(konamigt_input_word_r) - AM_RANGE(0x080000, 0x0bffff) AM_READ(MRA16_ROM) + AM_RANGE(0x080000, 0x0bffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( rf2_gx400_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x010000, 0x01ffff) AM_WRITE(MWA16_RAM) AM_BASE(&ram2) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x010000, 0x01ffff) AM_WRITE(SMH_RAM) AM_BASE(&ram2) AM_RANGE(0x020000, 0x0287ff) AM_WRITE(gx400_sharedram_word_w) AM_RANGE(0x030000, 0x03ffff) AM_WRITE(nemesis_characterram_word_w) AM_BASE(&nemesis_characterram) AM_SIZE(&nemesis_characterram_size) - AM_RANGE(0x050000, 0x0503ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll1) - AM_RANGE(0x050400, 0x0507ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll2) - AM_RANGE(0x050800, 0x050bff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x050c00, 0x050fff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll) - AM_RANGE(0x051000, 0x051fff) AM_WRITE(MWA16_NOP) /* used, but written to with 0's */ + AM_RANGE(0x050000, 0x0503ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll1) + AM_RANGE(0x050400, 0x0507ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll2) + AM_RANGE(0x050800, 0x050bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x050c00, 0x050fff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll) + AM_RANGE(0x051000, 0x051fff) AM_WRITE(SMH_NOP) /* used, but written to with 0's */ AM_RANGE(0x052000, 0x052fff) AM_WRITE(nemesis_videoram1b_word_w) AM_BASE(&nemesis_videoram1b) /* VRAM 1 */ AM_RANGE(0x053000, 0x053fff) AM_WRITE(nemesis_videoram1f_word_w) AM_BASE(&nemesis_videoram1f) /* VRAM 1 */ AM_RANGE(0x054000, 0x054fff) AM_WRITE(nemesis_videoram2b_word_w) AM_BASE(&nemesis_videoram2b) /* VRAM 2 */ AM_RANGE(0x055000, 0x055fff) AM_WRITE(nemesis_videoram2f_word_w) AM_BASE(&nemesis_videoram2f) /* VRAM 2 */ - AM_RANGE(0x056000, 0x056fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x056000, 0x056fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x05a000, 0x05afff) AM_WRITE(nemesis_palette_word_w) AM_BASE(&paletteram16) AM_RANGE(0x05c000, 0x05c001) AM_WRITE(nemesis_soundlatch_word_w) AM_RANGE(0x05c800, 0x05c801) AM_WRITE(watchdog_reset16_w) /* probably */ @@ -528,23 +528,23 @@ static ADDRESS_MAP_START( rf2_gx400_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x05e002, 0x05e003) AM_WRITE(&gx400_irq1_enable_word_w) /* ?? */ AM_RANGE(0x05e004, 0x05e005) AM_WRITE(nemesis_gfx_flipx_w) AM_RANGE(0x05e006, 0x05e007) AM_WRITE(nemesis_gfx_flipy_w) - AM_RANGE(0x05e008, 0x05e009) AM_WRITE(MWA16_NOP) /* IRQ acknowledge??? */ + AM_RANGE(0x05e008, 0x05e009) AM_WRITE(SMH_NOP) /* IRQ acknowledge??? */ AM_RANGE(0x05e00e, 0x05e00f) AM_WRITE(&gx400_irq4_enable_word_w) /* ?? */ - AM_RANGE(0x060000, 0x067fff) AM_WRITE(MWA16_RAM) AM_BASE(&ram) /* WORK RAM */ - AM_RANGE(0x080000, 0x0bffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x060000, 0x067fff) AM_WRITE(SMH_RAM) AM_BASE(&ram) /* WORK RAM */ + AM_RANGE(0x080000, 0x0bffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( gx400_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xe001, 0xe001) AM_READ(soundlatch_r) AM_RANGE(0xe086, 0xe086) AM_READ(AY8910_read_port_0_r) AM_RANGE(0xe205, 0xe205) AM_READ(AY8910_read_port_1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( gx400_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x87ff) AM_WRITE(MWA8_RAM) AM_BASE(&gx400_shared_ram) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&gx400_shared_ram) AM_RANGE(0xa000, 0xafff) AM_WRITE(k005289_pitch_A_w) AM_RANGE(0xc000, 0xcfff) AM_WRITE(k005289_pitch_B_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(VLM5030_data_w) @@ -560,185 +560,185 @@ ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( salamand_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) /* ROM BIOS */ - AM_RANGE(0x080000, 0x087fff) AM_READ(MRA16_RAM) - AM_RANGE(0x090000, 0x091fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) /* ROM BIOS */ + AM_RANGE(0x080000, 0x087fff) AM_READ(SMH_RAM) + AM_RANGE(0x090000, 0x091fff) AM_READ(SMH_RAM) AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_3_word_r) /* DSW0 */ AM_RANGE(0x0c2000, 0x0c2001) AM_READ(input_port_0_word_r) /* Coins, start buttons, test mode */ AM_RANGE(0x0c2002, 0x0c2003) AM_READ(input_port_1_word_r) /* IN1 */ AM_RANGE(0x0c2004, 0x0c2005) AM_READ(input_port_2_word_r) /* IN2 */ AM_RANGE(0x0c2006, 0x0c2007) AM_READ(input_port_4_word_r) /* DSW1 */ - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) - AM_RANGE(0x101000, 0x101fff) AM_READ(MRA16_RAM) - AM_RANGE(0x102000, 0x102fff) AM_READ(MRA16_RAM) - AM_RANGE(0x103000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x12ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x180000, 0x180fff) AM_READ(MRA16_RAM) - AM_RANGE(0x190000, 0x1903ff) AM_READ(MRA16_RAM) - AM_RANGE(0x190400, 0x1907ff) AM_READ(MRA16_RAM) - AM_RANGE(0x190800, 0x190eff) AM_READ(MRA16_RAM) - AM_RANGE(0x190f00, 0x190f7f) AM_READ(MRA16_RAM) - AM_RANGE(0x190f80, 0x190fff) AM_READ(MRA16_RAM) - AM_RANGE(0x191000, 0x191fff) AM_READ(MRA16_RAM) + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) + AM_RANGE(0x101000, 0x101fff) AM_READ(SMH_RAM) + AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM) + AM_RANGE(0x103000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x12ffff) AM_READ(SMH_RAM) + AM_RANGE(0x180000, 0x180fff) AM_READ(SMH_RAM) + AM_RANGE(0x190000, 0x1903ff) AM_READ(SMH_RAM) + AM_RANGE(0x190400, 0x1907ff) AM_READ(SMH_RAM) + AM_RANGE(0x190800, 0x190eff) AM_READ(SMH_RAM) + AM_RANGE(0x190f00, 0x190f7f) AM_READ(SMH_RAM) + AM_RANGE(0x190f80, 0x190fff) AM_READ(SMH_RAM) + AM_RANGE(0x191000, 0x191fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( salamand_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x087fff) AM_WRITE(MWA16_RAM) AM_BASE(&ram) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x087fff) AM_WRITE(SMH_RAM) AM_BASE(&ram) AM_RANGE(0x090000, 0x091fff) AM_WRITE(salamander_palette_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0A0000, 0x0A0001) AM_WRITE(nemesis_irq_enable_word_w) /* irq enable */ AM_RANGE(0x0C0000, 0x0C0001) AM_WRITE(salamand_soundlatch_word_w) - AM_RANGE(0x0C0004, 0x0C0005) AM_WRITE(MWA16_NOP) /* Watchdog at $c0005 */ + AM_RANGE(0x0C0004, 0x0C0005) AM_WRITE(SMH_NOP) /* Watchdog at $c0005 */ AM_RANGE(0x100000, 0x100fff) AM_WRITE(nemesis_videoram1b_word_w) AM_BASE(&nemesis_videoram1b) /* VRAM 1 */ AM_RANGE(0x101000, 0x101fff) AM_WRITE(nemesis_videoram1f_word_w) AM_BASE(&nemesis_videoram1f) /* VRAM 1 */ AM_RANGE(0x102000, 0x102fff) AM_WRITE(nemesis_videoram2b_word_w) AM_BASE(&nemesis_videoram2b) /* VRAM 2 */ AM_RANGE(0x103000, 0x103fff) AM_WRITE(nemesis_videoram2f_word_w) AM_BASE(&nemesis_videoram2f) /* VRAM 2 */ AM_RANGE(0x120000, 0x12ffff) AM_WRITE(nemesis_characterram_word_w) AM_BASE(&nemesis_characterram) AM_SIZE(&nemesis_characterram_size) - AM_RANGE(0x180000, 0x180fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* more sprite ram ??? */ - AM_RANGE(0x190000, 0x1903ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll1) - AM_RANGE(0x190400, 0x1907ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll2) - AM_RANGE(0x190800, 0x190eff) AM_WRITE(MWA16_RAM) /* not used */ - AM_RANGE(0x190f00, 0x190f7f) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll1) - AM_RANGE(0x190f80, 0x190fff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll2) - AM_RANGE(0x191000, 0x191fff) AM_WRITE(MWA16_RAM) /* not used */ + AM_RANGE(0x180000, 0x180fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* more sprite ram ??? */ + AM_RANGE(0x190000, 0x1903ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll1) + AM_RANGE(0x190400, 0x1907ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll2) + AM_RANGE(0x190800, 0x190eff) AM_WRITE(SMH_RAM) /* not used */ + AM_RANGE(0x190f00, 0x190f7f) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll1) + AM_RANGE(0x190f80, 0x190fff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll2) + AM_RANGE(0x191000, 0x191fff) AM_WRITE(SMH_RAM) /* not used */ ADDRESS_MAP_END static ADDRESS_MAP_START( blkpnthr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) /* ROM BIOS */ - AM_RANGE(0x080000, 0x081fff) AM_READ(MRA16_RAM) - AM_RANGE(0x090000, 0x097fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) /* ROM BIOS */ + AM_RANGE(0x080000, 0x081fff) AM_READ(SMH_RAM) + AM_RANGE(0x090000, 0x097fff) AM_READ(SMH_RAM) AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_3_word_r) /* DSW0 */ AM_RANGE(0x0c2000, 0x0c2001) AM_READ(input_port_0_word_r) /* Coins, start buttons, test mode */ AM_RANGE(0x0c2002, 0x0c2003) AM_READ(input_port_1_word_r) /* IN1 */ AM_RANGE(0x0c2004, 0x0c2005) AM_READ(input_port_2_word_r) /* IN2 */ AM_RANGE(0x0c2006, 0x0c2007) AM_READ(input_port_4_word_r) /* DSW1 */ - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) - AM_RANGE(0x101000, 0x101fff) AM_READ(MRA16_RAM) - AM_RANGE(0x102000, 0x102fff) AM_READ(MRA16_RAM) - AM_RANGE(0x103000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x12ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x180000, 0x1803ff) AM_READ(MRA16_RAM) - AM_RANGE(0x180400, 0x1807ff) AM_READ(MRA16_RAM) - AM_RANGE(0x180800, 0x180eff) AM_READ(MRA16_RAM) - AM_RANGE(0x180f00, 0x180f7f) AM_READ(MRA16_RAM) - AM_RANGE(0x180f80, 0x180fff) AM_READ(MRA16_RAM) - AM_RANGE(0x181000, 0x181fff) AM_READ(MRA16_RAM) - AM_RANGE(0x190000, 0x190fff) AM_READ(MRA16_RAM) + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) + AM_RANGE(0x101000, 0x101fff) AM_READ(SMH_RAM) + AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM) + AM_RANGE(0x103000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x12ffff) AM_READ(SMH_RAM) + AM_RANGE(0x180000, 0x1803ff) AM_READ(SMH_RAM) + AM_RANGE(0x180400, 0x1807ff) AM_READ(SMH_RAM) + AM_RANGE(0x180800, 0x180eff) AM_READ(SMH_RAM) + AM_RANGE(0x180f00, 0x180f7f) AM_READ(SMH_RAM) + AM_RANGE(0x180f80, 0x180fff) AM_READ(SMH_RAM) + AM_RANGE(0x181000, 0x181fff) AM_READ(SMH_RAM) + AM_RANGE(0x190000, 0x190fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( blkpnthr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080000, 0x081fff) AM_WRITE(salamander_palette_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x090000, 0x097fff) AM_WRITE(MWA16_RAM) AM_BASE(&ram) + AM_RANGE(0x090000, 0x097fff) AM_WRITE(SMH_RAM) AM_BASE(&ram) AM_RANGE(0x0A0000, 0x0A0001) AM_WRITE(nemesis_irq_enable_word_w) /* irq enable */ AM_RANGE(0x0C0000, 0x0C0001) AM_WRITE(salamand_soundlatch_word_w) - AM_RANGE(0x0C0004, 0x0C0005) AM_WRITE(MWA16_NOP) /* Watchdog at $c0005 */ + AM_RANGE(0x0C0004, 0x0C0005) AM_WRITE(SMH_NOP) /* Watchdog at $c0005 */ AM_RANGE(0x100000, 0x100fff) AM_WRITE(nemesis_videoram2f_word_w) AM_BASE(&nemesis_videoram2f) /* VRAM 2 */ AM_RANGE(0x101000, 0x101fff) AM_WRITE(nemesis_videoram2b_word_w) AM_BASE(&nemesis_videoram2b) /* VRAM 2 */ AM_RANGE(0x102000, 0x102fff) AM_WRITE(nemesis_videoram1f_word_w) AM_BASE(&nemesis_videoram1f) /* VRAM 1 */ AM_RANGE(0x103000, 0x103fff) AM_WRITE(nemesis_videoram1b_word_w) AM_BASE(&nemesis_videoram1b) /* VRAM 1 */ AM_RANGE(0x120000, 0x12ffff) AM_WRITE(nemesis_characterram_word_w) AM_BASE(&nemesis_characterram) AM_SIZE(&nemesis_characterram_size) - AM_RANGE(0x180000, 0x1803ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll2) - AM_RANGE(0x180400, 0x1807ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll1) - AM_RANGE(0x180800, 0x180eff) AM_WRITE(MWA16_RAM) /* not used */ - AM_RANGE(0x180f00, 0x180f7f) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll2) - AM_RANGE(0x180f80, 0x180fff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll1) - AM_RANGE(0x181000, 0x181fff) AM_WRITE(MWA16_RAM) /* not used */ - AM_RANGE(0x190000, 0x190fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* more sprite ram ??? */ + AM_RANGE(0x180000, 0x1803ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll2) + AM_RANGE(0x180400, 0x1807ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll1) + AM_RANGE(0x180800, 0x180eff) AM_WRITE(SMH_RAM) /* not used */ + AM_RANGE(0x180f00, 0x180f7f) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll2) + AM_RANGE(0x180f80, 0x180fff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll1) + AM_RANGE(0x181000, 0x181fff) AM_WRITE(SMH_RAM) /* not used */ + AM_RANGE(0x190000, 0x190fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* more sprite ram ??? */ ADDRESS_MAP_END static ADDRESS_MAP_START( citybomb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) /* ROM BIOS */ - AM_RANGE(0x080000, 0x087fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0e0000, 0x0e1fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) /* ROM BIOS */ + AM_RANGE(0x080000, 0x087fff) AM_READ(SMH_RAM) + AM_RANGE(0x0e0000, 0x0e1fff) AM_READ(SMH_RAM) AM_RANGE(0x0f0000, 0x0f0001) AM_READ(input_port_4_word_r) /* DSW1 */ AM_RANGE(0x0f0002, 0x0f0003) AM_READ(input_port_2_word_r) /* IN2 */ AM_RANGE(0x0f0004, 0x0f0005) AM_READ(input_port_1_word_r) /* IN1 */ AM_RANGE(0x0f0006, 0x0f0007) AM_READ(input_port_0_word_r) /* Coins, start buttons, test mode */ AM_RANGE(0x0f0008, 0x0f0009) AM_READ(input_port_3_word_r) /* DSW0 */ - AM_RANGE(0x0f0020, 0x0f0021) AM_READ(MRA16_NOP) /* Analog device */ - AM_RANGE(0x100000, 0x1bffff) AM_READ(MRA16_ROM) /* ROM BIOS */ - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x210000, 0x210fff) AM_READ(MRA16_RAM) - AM_RANGE(0x211000, 0x211fff) AM_READ(MRA16_RAM) - AM_RANGE(0x212000, 0x212fff) AM_READ(MRA16_RAM) - AM_RANGE(0x213000, 0x213fff) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x3003ff) AM_READ(MRA16_RAM) - AM_RANGE(0x300400, 0x3007ff) AM_READ(MRA16_RAM) - AM_RANGE(0x300800, 0x300eff) AM_READ(MRA16_RAM) - AM_RANGE(0x300f00, 0x300f7f) AM_READ(MRA16_RAM) - AM_RANGE(0x300f80, 0x300fff) AM_READ(MRA16_RAM) - AM_RANGE(0x301000, 0x301fff) AM_READ(MRA16_RAM) - AM_RANGE(0x310000, 0x310fff) AM_READ(MRA16_RAM) + AM_RANGE(0x0f0020, 0x0f0021) AM_READ(SMH_NOP) /* Analog device */ + AM_RANGE(0x100000, 0x1bffff) AM_READ(SMH_ROM) /* ROM BIOS */ + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) + AM_RANGE(0x210000, 0x210fff) AM_READ(SMH_RAM) + AM_RANGE(0x211000, 0x211fff) AM_READ(SMH_RAM) + AM_RANGE(0x212000, 0x212fff) AM_READ(SMH_RAM) + AM_RANGE(0x213000, 0x213fff) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x3003ff) AM_READ(SMH_RAM) + AM_RANGE(0x300400, 0x3007ff) AM_READ(SMH_RAM) + AM_RANGE(0x300800, 0x300eff) AM_READ(SMH_RAM) + AM_RANGE(0x300f00, 0x300f7f) AM_READ(SMH_RAM) + AM_RANGE(0x300f80, 0x300fff) AM_READ(SMH_RAM) + AM_RANGE(0x301000, 0x301fff) AM_READ(SMH_RAM) + AM_RANGE(0x310000, 0x310fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( citybomb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x087fff) AM_WRITE(MWA16_RAM) AM_BASE(&ram) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x087fff) AM_WRITE(SMH_RAM) AM_BASE(&ram) AM_RANGE(0x0e0000, 0x0e1fff) AM_WRITE(salamander_palette_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0f0010, 0x0f0011) AM_WRITE(salamand_soundlatch_word_w) - AM_RANGE(0x0f0018, 0x0f0019) AM_WRITE(MWA16_NOP) /* Watchdog */ - AM_RANGE(0x0f0020, 0x0f0021) AM_WRITE(MWA16_NOP) /* Analog device */ + AM_RANGE(0x0f0018, 0x0f0019) AM_WRITE(SMH_NOP) /* Watchdog */ + AM_RANGE(0x0f0020, 0x0f0021) AM_WRITE(SMH_NOP) /* Analog device */ AM_RANGE(0x0f8000, 0x0f8001) AM_WRITE(nemesis_irq_enable_word_w) /* irq enable */ - AM_RANGE(0x100000, 0x1bffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x100000, 0x1bffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x20ffff) AM_WRITE(nemesis_characterram_word_w) AM_BASE(&nemesis_characterram) AM_SIZE(&nemesis_characterram_size) AM_RANGE(0x210000, 0x210fff) AM_WRITE(nemesis_videoram1f_word_w) AM_BASE(&nemesis_videoram1f) /* VRAM 1 */ AM_RANGE(0x211000, 0x211fff) AM_WRITE(nemesis_videoram1b_word_w) AM_BASE(&nemesis_videoram1b) /* VRAM 1 */ AM_RANGE(0x212000, 0x212fff) AM_WRITE(nemesis_videoram2f_word_w) AM_BASE(&nemesis_videoram2f) /* VRAM 2 */ AM_RANGE(0x213000, 0x213fff) AM_WRITE(nemesis_videoram2b_word_w) AM_BASE(&nemesis_videoram2b) /* VRAM 2 */ - AM_RANGE(0x300000, 0x3003ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll2) - AM_RANGE(0x300400, 0x3007ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll1) - AM_RANGE(0x300800, 0x300eff) AM_WRITE(MWA16_RAM) /* not used */ - AM_RANGE(0x300f00, 0x300f7f) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll2) - AM_RANGE(0x300f80, 0x300fff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll1) - AM_RANGE(0x301000, 0x301fff) AM_WRITE(MWA16_RAM) /* not used */ - AM_RANGE(0x310000, 0x310fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* more sprite ram ??? */ + AM_RANGE(0x300000, 0x3003ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll2) + AM_RANGE(0x300400, 0x3007ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll1) + AM_RANGE(0x300800, 0x300eff) AM_WRITE(SMH_RAM) /* not used */ + AM_RANGE(0x300f00, 0x300f7f) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll2) + AM_RANGE(0x300f80, 0x300fff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll1) + AM_RANGE(0x301000, 0x301fff) AM_WRITE(SMH_RAM) /* not used */ + AM_RANGE(0x310000, 0x310fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* more sprite ram ??? */ ADDRESS_MAP_END static ADDRESS_MAP_START( nyanpani_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) /* ROM BIOS */ - AM_RANGE(0x040000, 0x047fff) AM_READ(MRA16_RAM) - AM_RANGE(0x060000, 0x061fff) AM_READ(MRA16_RAM) - AM_RANGE(0x100000, 0x13ffff) AM_READ(MRA16_ROM) /* ROM BIOS */ + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) /* ROM BIOS */ + AM_RANGE(0x040000, 0x047fff) AM_READ(SMH_RAM) + AM_RANGE(0x060000, 0x061fff) AM_READ(SMH_RAM) + AM_RANGE(0x100000, 0x13ffff) AM_READ(SMH_ROM) /* ROM BIOS */ AM_RANGE(0x070000, 0x070001) AM_READ(input_port_4_word_r) /* DSW1 */ AM_RANGE(0x070002, 0x070003) AM_READ(input_port_2_word_r) /* IN2 */ AM_RANGE(0x070004, 0x070005) AM_READ(input_port_1_word_r) /* IN1 */ AM_RANGE(0x070006, 0x070007) AM_READ(input_port_0_word_r) /* Coins, start buttons, test mode */ AM_RANGE(0x070008, 0x070009) AM_READ(input_port_3_word_r) /* DSW0 */ - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) - AM_RANGE(0x201000, 0x201fff) AM_READ(MRA16_RAM) - AM_RANGE(0x202000, 0x202fff) AM_READ(MRA16_RAM) - AM_RANGE(0x203000, 0x203fff) AM_READ(MRA16_RAM) - AM_RANGE(0x210000, 0x21ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x300fff) AM_READ(MRA16_RAM) - AM_RANGE(0x310000, 0x3103ff) AM_READ(MRA16_RAM) - AM_RANGE(0x310400, 0x3107ff) AM_READ(MRA16_RAM) - AM_RANGE(0x310800, 0x310eff) AM_READ(MRA16_RAM) - AM_RANGE(0x310f00, 0x310f7f) AM_READ(MRA16_RAM) - AM_RANGE(0x310f80, 0x310fff) AM_READ(MRA16_RAM) - AM_RANGE(0x311000, 0x311fff) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) + AM_RANGE(0x201000, 0x201fff) AM_READ(SMH_RAM) + AM_RANGE(0x202000, 0x202fff) AM_READ(SMH_RAM) + AM_RANGE(0x203000, 0x203fff) AM_READ(SMH_RAM) + AM_RANGE(0x210000, 0x21ffff) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x300fff) AM_READ(SMH_RAM) + AM_RANGE(0x310000, 0x3103ff) AM_READ(SMH_RAM) + AM_RANGE(0x310400, 0x3107ff) AM_READ(SMH_RAM) + AM_RANGE(0x310800, 0x310eff) AM_READ(SMH_RAM) + AM_RANGE(0x310f00, 0x310f7f) AM_READ(SMH_RAM) + AM_RANGE(0x310f80, 0x310fff) AM_READ(SMH_RAM) + AM_RANGE(0x311000, 0x311fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( nyanpani_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x047fff) AM_WRITE(MWA16_RAM) AM_BASE(&ram) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x047fff) AM_WRITE(SMH_RAM) AM_BASE(&ram) AM_RANGE(0x060000, 0x061fff) AM_WRITE(salamander_palette_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x100000, 0x13ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x100000, 0x13ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x070010, 0x070011) AM_WRITE(salamand_soundlatch_word_w) - AM_RANGE(0x070018, 0x070019) AM_WRITE(MWA16_NOP) /* Watchdog */ + AM_RANGE(0x070018, 0x070019) AM_WRITE(SMH_NOP) /* Watchdog */ AM_RANGE(0x078000, 0x078001) AM_WRITE(nemesis_irq_enable_word_w) /* irq enable */ AM_RANGE(0x200000, 0x200fff) AM_WRITE(nemesis_videoram1f_word_w) AM_BASE(&nemesis_videoram1f) /* VRAM 1 */ AM_RANGE(0x201000, 0x201fff) AM_WRITE(nemesis_videoram1b_word_w) AM_BASE(&nemesis_videoram1b) /* VRAM 1 */ AM_RANGE(0x202000, 0x202fff) AM_WRITE(nemesis_videoram2f_word_w) AM_BASE(&nemesis_videoram2f) /* VRAM 2 */ AM_RANGE(0x203000, 0x203fff) AM_WRITE(nemesis_videoram2b_word_w) AM_BASE(&nemesis_videoram2b) /* VRAM 2 */ AM_RANGE(0x210000, 0x21ffff) AM_WRITE(nemesis_characterram_word_w) AM_BASE(&nemesis_characterram) AM_SIZE(&nemesis_characterram_size) - AM_RANGE(0x300000, 0x300fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* more sprite ram ??? */ - AM_RANGE(0x310000, 0x3103ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll2) - AM_RANGE(0x310400, 0x3107ff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll1) - AM_RANGE(0x310800, 0x310eff) AM_WRITE(MWA16_RAM) /* not used */ - AM_RANGE(0x310f00, 0x310f7f) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll2) - AM_RANGE(0x310f80, 0x310fff) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll1) - AM_RANGE(0x311000, 0x311fff) AM_WRITE(MWA16_RAM) /* not used */ + AM_RANGE(0x300000, 0x300fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* more sprite ram ??? */ + AM_RANGE(0x310000, 0x3103ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll2) + AM_RANGE(0x310400, 0x3107ff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll1) + AM_RANGE(0x310800, 0x310eff) AM_WRITE(SMH_RAM) /* not used */ + AM_RANGE(0x310f00, 0x310f7f) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll2) + AM_RANGE(0x310f80, 0x310fff) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll1) + AM_RANGE(0x311000, 0x311fff) AM_WRITE(SMH_RAM) /* not used */ ADDRESS_MAP_END static READ8_HANDLER( wd_r ) @@ -756,8 +756,8 @@ static WRITE8_HANDLER( city_sound_bank_w ) } static ADDRESS_MAP_START( sal_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) @@ -765,8 +765,8 @@ static ADDRESS_MAP_START( sal_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sal_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) @@ -775,16 +775,16 @@ static ADDRESS_MAP_START( sal_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( city_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(YM3812_status_port_0_r) AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( city_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9800, 0x987f) AM_WRITE(K051649_waveform_w) AM_RANGE(0x9880, 0x9889) AM_WRITE(K051649_frequency_w) AM_RANGE(0x988a, 0x988e) AM_WRITE(K051649_volume_w) @@ -815,17 +815,17 @@ static ADDRESS_MAP_START( hcrash_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c2804, 0x0c2805) AM_WRITENOP AM_RANGE(0x0c4000, 0x0c4001) AM_WRITE(selected_ip_w) AM_READ(input_port_1_word_r) AM_RANGE(0x0c4002, 0x0c4003) AM_READ(selected_ip_r) /* WEC Le Mans 24 control */ AM_WRITENOP /* latches the value read previously */ - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) AM_WRITE(nemesis_videoram1b_word_w) AM_BASE(&nemesis_videoram1b) /* VRAM 1 */ - AM_RANGE(0x101000, 0x101fff) AM_READ(MRA16_RAM) AM_WRITE(nemesis_videoram1f_word_w) AM_BASE(&nemesis_videoram1f) /* VRAM 1 */ - AM_RANGE(0x102000, 0x102fff) AM_READ(MRA16_RAM) AM_WRITE(nemesis_videoram2b_word_w) AM_BASE(&nemesis_videoram2b) /* VRAM 2 */ - AM_RANGE(0x103000, 0x103fff) AM_READ(MRA16_RAM) AM_WRITE(nemesis_videoram2f_word_w) AM_BASE(&nemesis_videoram2f) /* VRAM 2 */ - AM_RANGE(0x120000, 0x12ffff) AM_READ(MRA16_RAM) AM_WRITE(nemesis_characterram_word_w) AM_BASE(&nemesis_characterram) AM_SIZE(&nemesis_characterram_size) + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) AM_WRITE(nemesis_videoram1b_word_w) AM_BASE(&nemesis_videoram1b) /* VRAM 1 */ + AM_RANGE(0x101000, 0x101fff) AM_READ(SMH_RAM) AM_WRITE(nemesis_videoram1f_word_w) AM_BASE(&nemesis_videoram1f) /* VRAM 1 */ + AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM) AM_WRITE(nemesis_videoram2b_word_w) AM_BASE(&nemesis_videoram2b) /* VRAM 2 */ + AM_RANGE(0x103000, 0x103fff) AM_READ(SMH_RAM) AM_WRITE(nemesis_videoram2f_word_w) AM_BASE(&nemesis_videoram2f) /* VRAM 2 */ + AM_RANGE(0x120000, 0x12ffff) AM_READ(SMH_RAM) AM_WRITE(nemesis_characterram_word_w) AM_BASE(&nemesis_characterram) AM_SIZE(&nemesis_characterram_size) AM_RANGE(0x180000, 0x180fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x190000, 0x1903ff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll1) - AM_RANGE(0x190400, 0x1907ff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_xscroll2) + AM_RANGE(0x190000, 0x1903ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll1) + AM_RANGE(0x190400, 0x1907ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_xscroll2) AM_RANGE(0x190800, 0x190eff) AM_RAM /* not used */ - AM_RANGE(0x190f00, 0x190f7f) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll1) - AM_RANGE(0x190f80, 0x190fff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&nemesis_yscroll2) + AM_RANGE(0x190f00, 0x190f7f) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll1) + AM_RANGE(0x190f80, 0x190fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&nemesis_yscroll2) AM_RANGE(0x191000, 0x191fff) AM_RAM /* not used */ ADDRESS_MAP_END diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c index fc87ba516e4..f759a1ac71c 100644 --- a/src/mame/drivers/neodrvr.c +++ b/src/mame/drivers/neodrvr.c @@ -7027,7 +7027,7 @@ static DRIVER_INIT( kf2k3pcb ) neogeo_fixed_layer_bank_type = 2; DRIVER_INIT_CALL(neogeo); install_pvc_protection(); - memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xc00000, 0xc7ffff, 0, 0, MRA16_BANK6 ); // 512k bios + memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xc00000, 0xc7ffff, 0, 0, SMH_BANK6 ); // 512k bios } @@ -7091,7 +7091,7 @@ static DRIVER_INIT( jockeygp ) extra_ram = auto_malloc(0x2000); state_save_register_global_pointer(extra_ram, 0x2000 / 2); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x200000, 0x201fff, 0, 0, MRA16_BANK8, MWA16_BANK8); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x200000, 0x201fff, 0, 0, SMH_BANK8, SMH_BANK8); memory_set_bankptr(NEOGEO_BANK_EXTRA_RAM, extra_ram); // memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x280000, 0x280001, 0, 0, port_tag_to_handler16("IN5") ); @@ -7108,7 +7108,7 @@ static DRIVER_INIT( vliner ) extra_ram = auto_malloc(0x2000); state_save_register_global_pointer(extra_ram, 0x2000 / 2); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x200000, 0x201fff, 0, 0, MRA16_BANK8, MWA16_BANK8); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x200000, 0x201fff, 0, 0, SMH_BANK8, SMH_BANK8); memory_set_bankptr(NEOGEO_BANK_EXTRA_RAM, extra_ram); memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x280000, 0x280001, 0, 0, port_tag_to_handler16("IN5") ); diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 97f4ce0ff1c..bd18745e738 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -1048,7 +1048,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x401fff) AM_MIRROR(0x3fe000) AM_READWRITE(neogeo_paletteram_r, neogeo_paletteram_w) AM_RANGE(0x800000, 0x800fff) AM_READWRITE(memcard_r, memcard_w) AM_RANGE(0xc00000, 0xc1ffff) AM_MIRROR(0x0e0000) AM_ROMBANK(NEOGEO_BANK_BIOS) - AM_RANGE(0xd00000, 0xd0ffff) AM_MIRROR(0x0f0000) AM_READWRITE(MRA16_RAM, save_ram_w) AM_BASE(&save_ram) + AM_RANGE(0xd00000, 0xd0ffff) AM_MIRROR(0x0f0000) AM_READWRITE(SMH_RAM, save_ram_w) AM_BASE(&save_ram) AM_RANGE(0xe00000, 0xffffff) AM_READ(neogeo_unmapped_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c index 11b4bc17e7b..d17360086a6 100644 --- a/src/mame/drivers/news.c +++ b/src/mame/drivers/news.c @@ -19,22 +19,22 @@ driver by David Haywood static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r) AM_RANGE(0xc002, 0xc002) AM_READ(OKIM6295_status_0_r) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* 4000-7fff is written to during startup, probably leftover code */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* 4000-7fff is written to during startup, probably leftover code */ AM_RANGE(0x8000, 0x87ff) AM_WRITE(news_fgram_w) AM_BASE(&news_fgram) AM_RANGE(0x8800, 0x8fff) AM_WRITE(news_bgram_w) AM_BASE(&news_bgram) AM_RANGE(0x9000, 0x91ff) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_be_w) AM_BASE(&paletteram) AM_RANGE(0xc002, 0xc002) AM_WRITE(OKIM6295_data_0_w) /* ?? */ AM_RANGE(0xc003, 0xc003) AM_WRITE(news_bgpic_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index 91ac8930459..7fd9e1cdfd0 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -283,8 +283,8 @@ static WRITE8_HANDLER( ninjaw_pancontrol ) ***********************************************************/ static ADDRESS_MAP_START( ninjaw_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) - AM_RANGE(0x0c0000, 0x0cffff) AM_READ(MRA16_RAM) /* main ram */ + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) + AM_RANGE(0x0c0000, 0x0cffff) AM_READ(SMH_RAM) /* main ram */ AM_RANGE(0x200000, 0x200001) AM_READ(TC0220IOC_halfword_portreg_r) AM_RANGE(0x200002, 0x200003) AM_READ(TC0220IOC_halfword_port_r) AM_RANGE(0x220000, 0x220003) AM_READ(ninjaw_sound_r) @@ -300,8 +300,8 @@ static ADDRESS_MAP_START( ninjaw_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ninjaw_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x0c0000, 0x0cffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0bffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x0c0000, 0x0cffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_WRITE(TC0220IOC_halfword_portreg_w) AM_RANGE(0x200002, 0x200003) AM_WRITE(TC0220IOC_halfword_port_w) AM_RANGE(0x210000, 0x210001) AM_WRITE(cpua_ctrl_w) @@ -323,8 +323,8 @@ ADDRESS_MAP_END // palette, as our interleaving won't match the original board. static ADDRESS_MAP_START( ninjaw_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x08ffff) AM_READ(MRA16_RAM) /* main ram */ + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x08ffff) AM_READ(SMH_RAM) /* main ram */ AM_RANGE(0x200000, 0x200001) AM_READ(TC0220IOC_halfword_portreg_r) AM_RANGE(0x200002, 0x200003) AM_READ(TC0220IOC_halfword_port_r) AM_RANGE(0x280000, 0x293fff) AM_READ(TC0100SCN_word_0_r) /* tilemaps (1st screen) */ @@ -334,8 +334,8 @@ static ADDRESS_MAP_START( ninjaw_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ninjaw_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x08ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x08ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_WRITE(TC0220IOC_halfword_portreg_w) AM_RANGE(0x200002, 0x200003) AM_WRITE(TC0220IOC_halfword_port_w) AM_RANGE(0x240000, 0x24ffff) AM_RAM AM_SHARE(1) @@ -348,8 +348,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( darius2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) - AM_RANGE(0x0c0000, 0x0cffff) AM_READ(MRA16_RAM) /* main ram */ + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) + AM_RANGE(0x0c0000, 0x0cffff) AM_READ(SMH_RAM) /* main ram */ AM_RANGE(0x200000, 0x200001) AM_READ(TC0220IOC_halfword_portreg_r) AM_RANGE(0x200002, 0x200003) AM_READ(TC0220IOC_halfword_port_r) AM_RANGE(0x220000, 0x220003) AM_READ(ninjaw_sound_r) @@ -365,8 +365,8 @@ static ADDRESS_MAP_START( darius2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( darius2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x0c0000, 0x0cffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0bffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x0c0000, 0x0cffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_WRITE(TC0220IOC_halfword_portreg_w) AM_RANGE(0x200002, 0x200003) AM_WRITE(TC0220IOC_halfword_port_w) AM_RANGE(0x210000, 0x210001) AM_WRITE(cpua_ctrl_w) @@ -385,16 +385,16 @@ static ADDRESS_MAP_START( darius2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( darius2_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x08ffff) AM_READ(MRA16_RAM) /* main ram */ + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x08ffff) AM_READ(SMH_RAM) /* main ram */ AM_RANGE(0x200000, 0x200001) AM_READ(TC0220IOC_halfword_portreg_r) AM_RANGE(0x200002, 0x200003) AM_READ(TC0220IOC_halfword_port_r) AM_RANGE(0x280000, 0x293fff) AM_READ(TC0100SCN_word_0_r) /* tilemaps (1st screen) */ ADDRESS_MAP_END static ADDRESS_MAP_START( darius2_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x08ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x08ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_WRITE(TC0220IOC_halfword_portreg_w) AM_RANGE(0x200002, 0x200003) AM_WRITE(TC0220IOC_halfword_port_w) AM_RANGE(0x240000, 0x24ffff) AM_RAM AM_SHARE(1) @@ -406,20 +406,20 @@ ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK10) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) @@ -427,8 +427,8 @@ static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITE(ninjaw_pancontrol) /* pan */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c index 5d4f96f3996..c49cb3231a3 100644 --- a/src/mame/drivers/niyanpai.c +++ b/src/mame/drivers/niyanpai.c @@ -308,13 +308,13 @@ static WRITE16_HANDLER ( musobana_inputport_w ) static ADDRESS_MAP_START( niyanpai_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x040fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x040fff) AM_READ(SMH_RAM) AM_RANGE(0x0a0000, 0x0a08ff) AM_READ(niyanpai_palette_r) - AM_RANGE(0x0a0900, 0x0a11ff) AM_READ(MRA16_RAM) // palette work ram? + AM_RANGE(0x0a0900, 0x0a11ff) AM_READ(SMH_RAM) // palette work ram? - AM_RANGE(0x0bf800, 0x0bffff) AM_READ(MRA16_RAM) + AM_RANGE(0x0bf800, 0x0bffff) AM_READ(SMH_RAM) AM_RANGE(0x240400, 0x240403) AM_READ(niyanpai_blitter_0_r) AM_RANGE(0x240600, 0x240603) AM_READ(niyanpai_blitter_1_r) @@ -332,19 +332,19 @@ static ADDRESS_MAP_START( niyanpai_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( niyanpai_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x040fff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x040fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x0a0000, 0x0a08ff) AM_WRITE(niyanpai_palette_w) - AM_RANGE(0x0a0900, 0x0a11ff) AM_WRITE(MWA16_RAM) // palette work ram? + AM_RANGE(0x0a0900, 0x0a11ff) AM_WRITE(SMH_RAM) // palette work ram? - AM_RANGE(0x0bf800, 0x0bffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x0bf800, 0x0bffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_WRITE(niyanpai_sound_w) - AM_RANGE(0x200200, 0x200201) AM_WRITE(MWA16_NOP) // unknown - AM_RANGE(0x240000, 0x240009) AM_WRITE(MWA16_NOP) // unknown - AM_RANGE(0x240200, 0x2403ff) AM_WRITE(MWA16_NOP) // unknown + AM_RANGE(0x200200, 0x200201) AM_WRITE(SMH_NOP) // unknown + AM_RANGE(0x240000, 0x240009) AM_WRITE(SMH_NOP) // unknown + AM_RANGE(0x240200, 0x2403ff) AM_WRITE(SMH_NOP) // unknown AM_RANGE(0x240400, 0x24041f) AM_WRITE(niyanpai_blitter_0_w) AM_RANGE(0x240420, 0x24043f) AM_WRITE(niyanpai_clut_0_w) @@ -367,14 +367,14 @@ static ADDRESS_MAP_START( niyanpai_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( musobana_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x040fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x040fff) AM_READ(SMH_RAM) AM_RANGE(0x0a0000, 0x0a08ff) AM_READ(niyanpai_palette_r) - AM_RANGE(0x0a0900, 0x0a11ff) AM_READ(MRA16_RAM) // palette work ram? + AM_RANGE(0x0a0900, 0x0a11ff) AM_READ(SMH_RAM) // palette work ram? - AM_RANGE(0x0a8000, 0x0a87ff) AM_READ(MRA16_RAM) - AM_RANGE(0x0bf800, 0x0bffff) AM_READ(MRA16_RAM) + AM_RANGE(0x0a8000, 0x0a87ff) AM_READ(SMH_RAM) + AM_RANGE(0x0bf800, 0x0bffff) AM_READ(SMH_RAM) AM_RANGE(0x240400, 0x240403) AM_READ(niyanpai_blitter_0_r) AM_RANGE(0x240600, 0x240603) AM_READ(niyanpai_blitter_1_r) @@ -392,20 +392,20 @@ static ADDRESS_MAP_START( musobana_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( musobana_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x040fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x040fff) AM_WRITE(SMH_RAM) AM_RANGE(0x0a0000, 0x0a08ff) AM_WRITE(niyanpai_palette_w) - AM_RANGE(0x0a0900, 0x0a11ff) AM_WRITE(MWA16_RAM) // palette work ram? + AM_RANGE(0x0a0900, 0x0a11ff) AM_WRITE(SMH_RAM) // palette work ram? - AM_RANGE(0x0a8000, 0x0a87ff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x0bf800, 0x0bffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x0a8000, 0x0a87ff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x0bf800, 0x0bffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_WRITE(niyanpai_sound_w) AM_RANGE(0x200200, 0x200201) AM_WRITE(musobana_inputport_w) // inputport select - AM_RANGE(0x240000, 0x240009) AM_WRITE(MWA16_NOP) // unknown - AM_RANGE(0x240200, 0x2403ff) AM_WRITE(MWA16_NOP) // unknown + AM_RANGE(0x240000, 0x240009) AM_WRITE(SMH_NOP) // unknown + AM_RANGE(0x240200, 0x2403ff) AM_WRITE(SMH_NOP) // unknown AM_RANGE(0x240400, 0x24041f) AM_WRITE(niyanpai_blitter_0_w) AM_RANGE(0x240420, 0x24043f) AM_WRITE(niyanpai_clut_0_w) @@ -428,15 +428,15 @@ static ADDRESS_MAP_START( musobana_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mhhonban_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x040fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x040fff) AM_READ(SMH_RAM) AM_RANGE(0x060000, 0x0608ff) AM_READ(niyanpai_palette_r) - AM_RANGE(0x060900, 0x0611ff) AM_READ(MRA16_RAM) // palette work ram? - AM_RANGE(0x07f800, 0x07ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x060900, 0x0611ff) AM_READ(SMH_RAM) // palette work ram? + AM_RANGE(0x07f800, 0x07ffff) AM_READ(SMH_RAM) - AM_RANGE(0x0a8000, 0x0a87ff) AM_READ(MRA16_RAM) - AM_RANGE(0x0bf000, 0x0bffff) AM_READ(MRA16_RAM) + AM_RANGE(0x0a8000, 0x0a87ff) AM_READ(SMH_RAM) + AM_RANGE(0x0bf000, 0x0bffff) AM_READ(SMH_RAM) AM_RANGE(0x240400, 0x240403) AM_READ(niyanpai_blitter_0_r) AM_RANGE(0x240600, 0x240603) AM_READ(niyanpai_blitter_1_r) @@ -454,21 +454,21 @@ static ADDRESS_MAP_START( mhhonban_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mhhonban_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x040fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x040fff) AM_WRITE(SMH_RAM) AM_RANGE(0x060000, 0x0608ff) AM_WRITE(niyanpai_palette_w) - AM_RANGE(0x060900, 0x0611ff) AM_WRITE(MWA16_RAM) // palette work ram? - AM_RANGE(0x07f800, 0x07ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x060900, 0x0611ff) AM_WRITE(SMH_RAM) // palette work ram? + AM_RANGE(0x07f800, 0x07ffff) AM_WRITE(SMH_RAM) - AM_RANGE(0x0a8000, 0x0a87ff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x0bf000, 0x0bffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x0a8000, 0x0a87ff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x0bf000, 0x0bffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_WRITE(niyanpai_sound_w) AM_RANGE(0x200200, 0x200201) AM_WRITE(musobana_inputport_w) // inputport select - AM_RANGE(0x240000, 0x240009) AM_WRITE(MWA16_NOP) // unknown - AM_RANGE(0x240200, 0x2403ff) AM_WRITE(MWA16_NOP) // unknown + AM_RANGE(0x240000, 0x240009) AM_WRITE(SMH_NOP) // unknown + AM_RANGE(0x240200, 0x2403ff) AM_WRITE(SMH_NOP) // unknown AM_RANGE(0x240400, 0x24041f) AM_WRITE(niyanpai_blitter_0_w) AM_RANGE(0x240420, 0x24043f) AM_WRITE(niyanpai_clut_0_w) @@ -492,14 +492,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index b35eee42133..134f3c903ef 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -301,7 +301,7 @@ static ADDRESS_MAP_START( nmg5_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x18000a, 0x18000b) AM_READ(input_port_1_word_r) AM_RANGE(0x18000c, 0x18000d) AM_READ(input_port_2_word_r) AM_RANGE(0x18000e, 0x18000f) AM_WRITE(priority_reg_w) - AM_RANGE(0x300002, 0x300009) AM_WRITE(MWA16_RAM) AM_BASE(&scroll_ram) + AM_RANGE(0x300002, 0x300009) AM_WRITE(SMH_RAM) AM_BASE(&scroll_ram) AM_RANGE(0x30000a, 0x30000f) AM_WRITENOP AM_RANGE(0x320000, 0x321fff) AM_RAM AM_WRITE(bg_videoram_w) AM_BASE(&bg_videoram) AM_RANGE(0x322000, 0x323fff) AM_RAM AM_WRITE(fg_videoram_w) AM_BASE(&fg_videoram) @@ -321,7 +321,7 @@ static ADDRESS_MAP_START( pclubys_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x48000a, 0x48000b) AM_READ(input_port_1_word_r) AM_RANGE(0x48000c, 0x48000d) AM_READ(input_port_2_word_r) AM_RANGE(0x48000e, 0x48000f) AM_WRITE(priority_reg_w) - AM_RANGE(0x500002, 0x500009) AM_WRITE(MWA16_RAM) AM_BASE(&scroll_ram) + AM_RANGE(0x500002, 0x500009) AM_WRITE(SMH_RAM) AM_BASE(&scroll_ram) AM_RANGE(0x520000, 0x521fff) AM_RAM AM_WRITE(bg_videoram_w) AM_BASE(&bg_videoram) AM_RANGE(0x522000, 0x523fff) AM_RAM AM_WRITE(fg_videoram_w) AM_BASE(&fg_videoram) AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE(&nmg5_bitmap) diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 4265f7631b0..79b0b59a068 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -381,50 +381,50 @@ static WRITE16_HANDLER( afega_soundlatch_w ) /***************************************************************************/ static ADDRESS_MAP_START( vandyke_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) AM_RANGE(0x080008, 0x080009) AM_READ(input_port_2_word_r) AM_RANGE(0x08000a, 0x08000b) AM_READ(input_port_3_word_r) AM_RANGE(0x08000e, 0x08000f) AM_READ(NMK004_r) - AM_RANGE(0x088000, 0x0887ff) AM_READ(MRA16_RAM) + AM_RANGE(0x088000, 0x0887ff) AM_READ(SMH_RAM) AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r) AM_RANGE(0x09d000, 0x09d7ff) AM_READ(nmk_txvideoram_r) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(&nmk16_mainram) ADDRESS_MAP_END static ADDRESS_MAP_START( vandyke_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080016, 0x080017) AM_WRITE(MWA16_NOP) /* IRQ enable? */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080016, 0x080017) AM_WRITE(SMH_NOP) /* IRQ enable? */ AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w) AM_RANGE(0x08001e, 0x08001f) AM_WRITE(NMK004_w) AM_RANGE(0x088000, 0x0887ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x08c000, 0x08c007) AM_WRITE(vandyke_scroll_w) AM_RANGE(0x090000, 0x093fff) AM_WRITE(nmk_bgvideoram_w) AM_BASE(&nmk_bgvideoram) - AM_RANGE(0x094000, 0x097fff) AM_WRITE(MWA16_RAM) /* what is this */ + AM_RANGE(0x094000, 0x097fff) AM_WRITE(SMH_RAM) /* what is this */ AM_RANGE(0x09d000, 0x09d7ff) AM_WRITE(nmk_txvideoram_w) AM_BASE(&nmk_txvideoram) ADDRESS_MAP_END static ADDRESS_MAP_START( manybloc_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r) AM_RANGE(0x08001e, 0x08001f) AM_READ(soundlatch2_word_r) - AM_RANGE(0x088000, 0x0883ff) AM_READ(MRA16_RAM) + AM_RANGE(0x088000, 0x0883ff) AM_READ(SMH_RAM) AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r) - AM_RANGE(0x09c000, 0x09cfff) AM_READ(MRA16_RAM) + AM_RANGE(0x09c000, 0x09cfff) AM_READ(SMH_RAM) AM_RANGE(0x09d000, 0x09d7ff) AM_READ(nmk_txvideoram_r) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(&nmk16_mainram) ADDRESS_MAP_END static ADDRESS_MAP_START( manybloc_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080010, 0x080011) AM_WRITE(MWA16_NOP) /* See notes at the top of the driver */ - AM_RANGE(0x080012, 0x080013) AM_WRITE(MWA16_NOP) /* See notes at the top of the driver */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080010, 0x080011) AM_WRITE(SMH_NOP) /* See notes at the top of the driver */ + AM_RANGE(0x080012, 0x080013) AM_WRITE(SMH_NOP) /* See notes at the top of the driver */ AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) - AM_RANGE(0x08001c, 0x08001d) AM_WRITE(MWA16_NOP) /* See notes at the top of the driver */ + AM_RANGE(0x08001c, 0x08001d) AM_WRITE(SMH_NOP) /* See notes at the top of the driver */ AM_RANGE(0x08001e, 0x08001f) AM_WRITE(soundlatch_word_w) AM_RANGE(0x088000, 0x0883ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x090000, 0x093fff) AM_WRITE(nmk_bgvideoram_w) AM_BASE(&nmk_bgvideoram) @@ -433,16 +433,16 @@ static ADDRESS_MAP_START( manybloc_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( tharrier_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_READ(soundlatch_r) AM_RANGE(0xf400, 0xf400) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xf500, 0xf500) AM_READ(OKIM6295_status_1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( tharrier_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch2_w) AM_RANGE(0xf400, 0xf400) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0xf500, 0xf500) AM_WRITE(OKIM6295_data_1_w) @@ -463,30 +463,30 @@ static ADDRESS_MAP_START( tharrier_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( tharrier_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(tharrier_mcu_r) //input_port_1_word_r }, AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r) AM_RANGE(0x08000e, 0x08000f) AM_READ(soundlatch2_word_r) /* from Z80 */ AM_RANGE(0x080202, 0x080203) AM_READ(input_port_3_word_r ) - AM_RANGE(0x088000, 0x0883ff) AM_READ(MRA16_RAM) + AM_RANGE(0x088000, 0x0883ff) AM_READ(SMH_RAM) AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r) AM_RANGE(0x09d000, 0x09d7ff) AM_READ(nmk_txvideoram_r) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_WRITE(nmk16_mainram_strange_w) AM_BASE(&nmk16_mainram) ADDRESS_MAP_END static ADDRESS_MAP_START( tharrier_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080010, 0x080011) AM_WRITE(tharrier_mcu_control_w) - AM_RANGE(0x080012, 0x080013) AM_WRITE(MWA16_NOP) + AM_RANGE(0x080012, 0x080013) AM_WRITE(SMH_NOP) // AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) // AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w) AM_RANGE(0x08001e, 0x08001f) AM_WRITE(soundlatch_word_w) AM_RANGE(0x088000, 0x0883ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) // AM_RANGE(0x08c000, 0x08c007) AM_WRITE(nmk_scroll_w) AM_RANGE(0x090000, 0x093fff) AM_WRITE(nmk_bgvideoram_w) AM_BASE(&nmk_bgvideoram) - AM_RANGE(0x09c000, 0x09c7ff) AM_WRITE(MWA16_NOP) /* Unused txvideoram area? */ + AM_RANGE(0x09c000, 0x09c7ff) AM_WRITE(SMH_NOP) /* Unused txvideoram area? */ AM_RANGE(0x09d000, 0x09d7ff) AM_WRITE(nmk_txvideoram_w) AM_BASE(&nmk_txvideoram) ADDRESS_MAP_END @@ -498,13 +498,13 @@ static ADDRESS_MAP_START( mustang_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r) - AM_RANGE(0x08000e, 0x08000f) AM_READWRITE(NMK004_r, MWA16_NOP) + AM_RANGE(0x08000e, 0x08000f) AM_READWRITE(NMK004_r, SMH_NOP) AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) - AM_RANGE(0x080016, 0x080017) AM_WRITE(MWA16_NOP) // frame number? + AM_RANGE(0x080016, 0x080017) AM_WRITE(SMH_NOP) // frame number? AM_RANGE(0x08001e, 0x08001f) AM_WRITE(NMK004_w) AM_RANGE(0x088000, 0x0887ff) AM_RAM AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x08c000, 0x08c001) AM_WRITE(mustang_scroll_w) - AM_RANGE(0x08c002, 0x08c087) AM_WRITE(MWA16_NOP) // ?? + AM_RANGE(0x08c002, 0x08c087) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0x090000, 0x093fff) AM_RAM AM_WRITE(nmk_bgvideoram_w) AM_BASE(&nmk_bgvideoram) AM_RANGE(0x09c000, 0x09c7ff) AM_RAM AM_WRITE(nmk_txvideoram_w) AM_BASE(&nmk_txvideoram) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_WRITE(nmk16_mainram_strange_w) AM_BASE(&nmk16_mainram) @@ -515,13 +515,13 @@ static ADDRESS_MAP_START( mustangb_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r) - AM_RANGE(0x08000e, 0x08000f) AM_READWRITE(MRA16_NOP, MWA16_NOP) + AM_RANGE(0x08000e, 0x08000f) AM_READWRITE(SMH_NOP, SMH_NOP) AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) - AM_RANGE(0x080016, 0x080017) AM_WRITE(MWA16_NOP) // frame number? + AM_RANGE(0x080016, 0x080017) AM_WRITE(SMH_NOP) // frame number? AM_RANGE(0x08001e, 0x08001f) AM_WRITE(seibu_main_mustb_w) AM_RANGE(0x088000, 0x0887ff) AM_RAM AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x08c000, 0x08c001) AM_WRITE(mustang_scroll_w) - AM_RANGE(0x08c002, 0x08c087) AM_WRITE(MWA16_NOP) // ?? + AM_RANGE(0x08c002, 0x08c087) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0x090000, 0x093fff) AM_RAM AM_WRITE(nmk_bgvideoram_w) AM_BASE(&nmk_bgvideoram) AM_RANGE(0x09c000, 0x09c7ff) AM_RAM AM_WRITE(nmk_txvideoram_w) AM_BASE(&nmk_txvideoram) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_WRITE(nmk16_mainram_strange_w) AM_BASE(&nmk16_mainram) @@ -533,13 +533,13 @@ static ADDRESS_MAP_START( twinactn_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r) - AM_RANGE(0x08000e, 0x08000f) AM_READWRITE(MRA16_NOP, MWA16_NOP) + AM_RANGE(0x08000e, 0x08000f) AM_READWRITE(SMH_NOP, SMH_NOP) AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) - AM_RANGE(0x080016, 0x080017) AM_WRITE(MWA16_NOP) // frame number? + AM_RANGE(0x080016, 0x080017) AM_WRITE(SMH_NOP) // frame number? AM_RANGE(0x08001e, 0x08001f) AM_WRITE(afega_soundlatch_w) AM_RANGE(0x088000, 0x0887ff) AM_RAM AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x08c000, 0x08c001) AM_WRITE(mustang_scroll_w) - AM_RANGE(0x08c002, 0x08c087) AM_WRITE(MWA16_NOP) // ?? + AM_RANGE(0x08c002, 0x08c087) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0x090000, 0x093fff) AM_RAM AM_WRITE(nmk_bgvideoram_w) AM_BASE(&nmk_bgvideoram) AM_RANGE(0x09c000, 0x09c7ff) AM_RAM AM_WRITE(nmk_txvideoram_w) AM_BASE(&nmk_txvideoram) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_WRITE(nmk16_mainram_strange_w) AM_BASE(&nmk16_mainram) @@ -552,7 +552,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( acrobatm_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x00000, 0x3ffff) AM_READ(SMH_ROM) AM_RANGE(0x80000, 0x8ffff) AM_RAM AM_BASE(&nmk16_mainram) @@ -561,13 +561,13 @@ static ADDRESS_MAP_START( acrobatm_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc0008, 0xc0009) AM_READ(input_port_2_word_r) AM_RANGE(0xc000a, 0xc000b) AM_READ(input_port_3_word_r) AM_RANGE(0xc000e, 0xc000f) AM_READ(NMK004_r) - AM_RANGE(0xc4000, 0xc45ff) AM_READ(MRA16_RAM) + AM_RANGE(0xc4000, 0xc45ff) AM_READ(SMH_RAM) AM_RANGE(0xcc000, 0xcffff) AM_READ(nmk_bgvideoram_r) AM_RANGE(0xd4000, 0xd47ff) AM_READ(nmk_txvideoram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( acrobatm_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x00000, 0x3ffff) AM_WRITE(SMH_ROM) AM_RANGE(0xc0014, 0xc0015) AM_WRITE(nmk_flipscreen_w) AM_RANGE(0xc0016, 0xc0017) AM_WRITENOP AM_RANGE(0xc0018, 0xc0019) AM_WRITE(nmk_tilebank_w) @@ -579,20 +579,20 @@ static ADDRESS_MAP_START( acrobatm_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bioship_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) AM_RANGE(0x080008, 0x080009) AM_READ(input_port_2_word_r) AM_RANGE(0x08000a, 0x08000b) AM_READ(input_port_3_word_r) AM_RANGE(0x08000e, 0x08000f) AM_READ(NMK004_r) - AM_RANGE(0x088000, 0x0887ff) AM_READ(MRA16_RAM) + AM_RANGE(0x088000, 0x0887ff) AM_READ(SMH_RAM) AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r) AM_RANGE(0x09c000, 0x09c7ff) AM_READ(nmk_txvideoram_r) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(&nmk16_mainram) ADDRESS_MAP_END static ADDRESS_MAP_START( bioship_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) // AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) AM_RANGE(0x08001e, 0x08001f) AM_WRITE(NMK004_w) AM_RANGE(0x084000, 0x084001) AM_WRITE(bioship_bank_w) @@ -842,17 +842,17 @@ static WRITE16_HANDLER( tdragon_mainram_w ) static ADDRESS_MAP_START( tdragon_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x044022, 0x044023) AM_READ(MRA16_NOP) /* No Idea */ -// AM_RANGE(0x0b0000, 0x0b7fff) AM_READ(MRA16_RAM) /* Work RAM */ -// AM_RANGE(0x0b8000, 0x0b8fff) AM_READ(MRA16_RAM) /* Sprite RAM */ -// AM_RANGE(0x0b9000, 0x0bdfff) AM_READ(MRA16_RAM) /* Work RAM */ -// AM_RANGE(0x0be000, 0x0befff) AM_READ(MRA16_RAM) /* Work RAM */ -// AM_RANGE(0x0bf000, 0x0bffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x044022, 0x044023) AM_READ(SMH_NOP) /* No Idea */ +// AM_RANGE(0x0b0000, 0x0b7fff) AM_READ(SMH_RAM) /* Work RAM */ +// AM_RANGE(0x0b8000, 0x0b8fff) AM_READ(SMH_RAM) /* Sprite RAM */ +// AM_RANGE(0x0b9000, 0x0bdfff) AM_READ(SMH_RAM) /* Work RAM */ +// AM_RANGE(0x0be000, 0x0befff) AM_READ(SMH_RAM) /* Work RAM */ +// AM_RANGE(0x0bf000, 0x0bffff) AM_READ(SMH_RAM) /* Work RAM */ AM_RANGE(0x0b0000, 0x0bffff) AM_RAM AM_WRITE( tdragon_mainram_w ) AM_BASE(&nmk16_mainram) - AM_RANGE(0x0c8000, 0x0c87ff) AM_READ(MRA16_RAM) /* Palette RAM */ + AM_RANGE(0x0c8000, 0x0c87ff) AM_READ(SMH_RAM) /* Palette RAM */ AM_RANGE(0x0c0000, 0x0c0001) AM_READ(input_port_0_word_r) AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0c0008, 0x0c0009) AM_READ(input_port_2_word_r) @@ -863,12 +863,12 @@ static ADDRESS_MAP_START( tdragon_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( tdragon_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) -// AM_RANGE(0x0b0000, 0x0b7fff) AM_WRITE(MWA16_RAM) /* Work RAM */ -// AM_RANGE(0x0b8000, 0x0b8fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Sprite RAM */ -// AM_RANGE(0x0b9000, 0x0bdfff) AM_WRITE(MWA16_RAM) AM_BASE(&nmk16_mcu_work_ram) /* Work RAM */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) +// AM_RANGE(0x0b0000, 0x0b7fff) AM_WRITE(SMH_RAM) /* Work RAM */ +// AM_RANGE(0x0b8000, 0x0b8fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Sprite RAM */ +// AM_RANGE(0x0b9000, 0x0bdfff) AM_WRITE(SMH_RAM) AM_BASE(&nmk16_mcu_work_ram) /* Work RAM */ // AM_RANGE(0x0be000, 0x0befff) AM_RAM AM_READWRITE(mcu_shared_r,tdragon_mcu_shared_w) AM_BASE(&nmk16_mcu_shared_ram) /* Work RAM */ -// AM_RANGE(0x0bf000, 0x0bffff) AM_WRITE(MWA16_RAM) /* Work RAM */ +// AM_RANGE(0x0bf000, 0x0bffff) AM_WRITE(SMH_RAM) /* Work RAM */ AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(nmk_flipscreen_w) /* Maybe */ AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE(nmk_tilebank_w) /* Tile Bank ? */ AM_RANGE(0x0c001e, 0x0c001f) AM_WRITE(NMK004_w) @@ -879,7 +879,7 @@ static ADDRESS_MAP_START( tdragon_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( tdragonb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x0b0000, 0x0bffff) AM_RAM AM_BASE(&nmk16_mainram) AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(nmk_flipscreen_w) /* Maybe */ AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE(nmk_tilebank_w) /* Tile Bank ? */ @@ -891,9 +891,9 @@ static ADDRESS_MAP_START( tdragonb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ssmissin_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x0b0000, 0x0bffff) AM_RAM AM_BASE(&nmk16_mainram) - AM_RANGE(0x0c8000, 0x0c87ff) AM_READ(MRA16_RAM) /* Palette RAM */ + AM_RANGE(0x0c8000, 0x0c87ff) AM_READ(SMH_RAM) /* Palette RAM */ AM_RANGE(0x0c0000, 0x0c0001) AM_READ(input_port_0_word_r) AM_RANGE(0x0c0004, 0x0c0005) AM_READ(input_port_1_word_r) AM_RANGE(0x0c0006, 0x0c0007) AM_READ(input_port_2_word_r) @@ -905,7 +905,7 @@ static ADDRESS_MAP_START( ssmissin_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ssmissin_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(nmk_flipscreen_w) /* Maybe */ AM_RANGE(0x0c0018, 0x0c0019) AM_WRITE(nmk_tilebank_w) /* Tile Bank ? */ AM_RANGE(0x0c001e, 0x0c001f) AM_WRITE(ssmissin_sound_w) @@ -920,28 +920,28 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ssmissin_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( ssmissin_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(ssmissin_soundbank_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) ADDRESS_MAP_END static ADDRESS_MAP_START( strahl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x00000, 0x3ffff) AM_READ(SMH_ROM) AM_RANGE(0x80000, 0x80001) AM_READ(input_port_0_word_r) AM_RANGE(0x80002, 0x80003) AM_READ(input_port_1_word_r) AM_RANGE(0x80008, 0x80009) AM_READ(input_port_2_word_r) AM_RANGE(0x8000a, 0x8000b) AM_READ(input_port_3_word_r) AM_RANGE(0x8000e, 0x8000f) AM_READ(NMK004_r) - AM_RANGE(0x8c000, 0x8c7ff) AM_READ(MRA16_RAM) + AM_RANGE(0x8c000, 0x8c7ff) AM_READ(SMH_RAM) AM_RANGE(0x90000, 0x93fff) AM_READ(nmk_bgvideoram_r) AM_RANGE(0x94000, 0x97fff) AM_READ(nmk_fgvideoram_r) AM_RANGE(0x9c000, 0x9c7ff) AM_READ(nmk_txvideoram_r) @@ -949,9 +949,9 @@ static ADDRESS_MAP_START( strahl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( strahl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x00000, 0x3ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x80014, 0x80015) AM_WRITE(nmk_flipscreen_w) - AM_RANGE(0x80016, 0x80017) AM_WRITE(MWA16_NOP) /* IRQ enable? */ + AM_RANGE(0x80016, 0x80017) AM_WRITE(SMH_NOP) /* IRQ enable? */ AM_RANGE(0x8001e, 0x8001f) AM_WRITE(NMK004_w) AM_RANGE(0x84000, 0x84007) AM_WRITE(nmk_scroll_w) AM_RANGE(0x88000, 0x88007) AM_WRITE(nmk_scroll_2_w) @@ -962,22 +962,22 @@ static ADDRESS_MAP_START( strahl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( macross_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) AM_RANGE(0x080008, 0x080009) AM_READ(input_port_2_word_r) AM_RANGE(0x08000a, 0x08000b) AM_READ(input_port_3_word_r) AM_RANGE(0x08000e, 0x08000f) AM_READ(NMK004_r) - AM_RANGE(0x088000, 0x0887ff) AM_READ(MRA16_RAM) + AM_RANGE(0x088000, 0x0887ff) AM_READ(SMH_RAM) AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r) AM_RANGE(0x09c000, 0x09c7ff) AM_READ(nmk_txvideoram_r) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_WRITE(nmk16_mainram_strange_w) AM_BASE(&nmk16_mainram) ADDRESS_MAP_END static ADDRESS_MAP_START( macross_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) - AM_RANGE(0x080016, 0x080017) AM_WRITE(MWA16_NOP) /* IRQ enable? */ + AM_RANGE(0x080016, 0x080017) AM_WRITE(SMH_NOP) /* IRQ enable? */ AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w) AM_RANGE(0x08001e, 0x08001f) AM_WRITE(NMK004_w) AM_RANGE(0x088000, 0x0887ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) @@ -987,13 +987,13 @@ static ADDRESS_MAP_START( macross_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( gunnail_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) AM_RANGE(0x080008, 0x080009) AM_READ(input_port_2_word_r) AM_RANGE(0x08000a, 0x08000b) AM_READ(input_port_3_word_r) AM_RANGE(0x08000e, 0x08000f) AM_READ(NMK004_r) - AM_RANGE(0x088000, 0x0887ff) AM_READ(MRA16_RAM) /* palette ram */ + AM_RANGE(0x088000, 0x0887ff) AM_READ(SMH_RAM) /* palette ram */ AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r) AM_RANGE(0x09c000, 0x09cfff) AM_READ(nmk_txvideoram_r) AM_RANGE(0x09d000, 0x09dfff) AM_READ(nmk_txvideoram_r) /* mirror */ @@ -1001,9 +1001,9 @@ static ADDRESS_MAP_START( gunnail_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( gunnail_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) - AM_RANGE(0x080016, 0x080017) AM_WRITE(MWA16_NOP) /* IRQ enable? */ + AM_RANGE(0x080016, 0x080017) AM_WRITE(SMH_NOP) /* IRQ enable? */ AM_RANGE(0x080018, 0x080019) AM_WRITE(nmk_tilebank_w) AM_RANGE(0x08001e, 0x08001f) AM_WRITE(NMK004_w) AM_RANGE(0x088000, 0x0887ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) @@ -1016,13 +1016,13 @@ static ADDRESS_MAP_START( gunnail_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( macross2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r) AM_RANGE(0x100002, 0x100003) AM_READ(input_port_1_word_r) AM_RANGE(0x100008, 0x100009) AM_READ(input_port_2_word_r) AM_RANGE(0x10000a, 0x10000b) AM_READ(input_port_3_word_r) AM_RANGE(0x10000e, 0x10000f) AM_READ(macross2_sound_result_r) /* from Z80 */ - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) AM_RANGE(0x140000, 0x14ffff) AM_READ(nmk_bgvideoram_r) AM_RANGE(0x170000, 0x170fff) AM_READ(nmk_txvideoram_r) AM_RANGE(0x171000, 0x171fff) AM_READ(nmk_txvideoram_r) /* mirror */ @@ -1030,23 +1030,23 @@ static ADDRESS_MAP_START( macross2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( macross2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100014, 0x100015) AM_WRITE(nmk_flipscreen_w) - AM_RANGE(0x100016, 0x100017) AM_WRITE(MWA16_NOP) /* IRQ eanble? */ + AM_RANGE(0x100016, 0x100017) AM_WRITE(SMH_NOP) /* IRQ eanble? */ AM_RANGE(0x100018, 0x100019) AM_WRITE(nmk_tilebank_w) AM_RANGE(0x10001e, 0x10001f) AM_WRITE(macross2_sound_command_w) /* to Z80 */ AM_RANGE(0x120000, 0x1207ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x130000, 0x130007) AM_WRITE(nmk_scroll_w) - AM_RANGE(0x130008, 0x1307ff) AM_WRITE(MWA16_NOP) /* 0 only? */ + AM_RANGE(0x130008, 0x1307ff) AM_WRITE(SMH_NOP) /* 0 only? */ AM_RANGE(0x140000, 0x14ffff) AM_WRITE(nmk_bgvideoram_w) AM_BASE(&nmk_bgvideoram) AM_RANGE(0x170000, 0x170fff) AM_WRITE(nmk_txvideoram_w) AM_BASE(&nmk_txvideoram) AM_RANGE(0x171000, 0x171fff) AM_WRITE(nmk_txvideoram_w) /* mirror */ ADDRESS_MAP_END static ADDRESS_MAP_START( raphero_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100014, 0x100015) AM_WRITE(nmk_flipscreen_w) - AM_RANGE(0x100016, 0x100017) AM_WRITE(MWA16_NOP) /* IRQ eanble? */ + AM_RANGE(0x100016, 0x100017) AM_WRITE(SMH_NOP) /* IRQ eanble? */ AM_RANGE(0x100018, 0x100019) AM_WRITE(nmk_tilebank_w) AM_RANGE(0x10001e, 0x10001f) AM_WRITE(macross2_sound_command_w) /* to sound cpu */ AM_RANGE(0x120000, 0x1207ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) @@ -1078,7 +1078,7 @@ static WRITE8_HANDLER( raphero_sound_rombank_w ) static ADDRESS_MAP_START( raphero_sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x7fff ) AM_ROM - AM_RANGE( 0x8000, 0xbfff ) AM_READ( MRA8_BANK1 ) + AM_RANGE( 0x8000, 0xbfff ) AM_READ( SMH_BANK1 ) AM_RANGE( 0xc000, 0xc000 ) AM_READWRITE( YM2203_status_port_0_r, YM2203_control_port_0_w ) AM_RANGE( 0xc001, 0xc001 ) AM_READWRITE( YM2203_read_port_0_r, YM2203_write_port_0_w ) AM_RANGE( 0xc800, 0xc800 ) AM_READWRITE( OKIM6295_status_0_r, OKIM6295_data_0_w ) @@ -1091,16 +1091,16 @@ static ADDRESS_MAP_START( raphero_sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( macross2_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) /* banked ROM */ - AM_RANGE(0xa000, 0xa000) AM_READ(MRA8_NOP) /* IRQ ack? watchdog? */ - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) /* banked ROM */ + AM_RANGE(0xa000, 0xa000) AM_READ(SMH_NOP) /* IRQ ack? watchdog? */ + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_READ(soundlatch_r) /* from 68000 */ ADDRESS_MAP_END static ADDRESS_MAP_START( macross2_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe001, 0xe001) AM_WRITE(macross2_sound_bank_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch2_w) /* to 68000 */ ADDRESS_MAP_END @@ -1123,27 +1123,27 @@ static ADDRESS_MAP_START( macross2_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bjtwin_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) AM_RANGE(0x080008, 0x080009) AM_READ(input_port_2_word_r) AM_RANGE(0x08000a, 0x08000b) AM_READ(input_port_3_word_r) AM_RANGE(0x084000, 0x084001) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0x084010, 0x084011) AM_READ(OKIM6295_status_1_lsb_r) - AM_RANGE(0x088000, 0x0887ff) AM_READ(MRA16_RAM) + AM_RANGE(0x088000, 0x0887ff) AM_READ(SMH_RAM) AM_RANGE(0x09c000, 0x09cfff) AM_READ(nmk_bgvideoram_r) AM_RANGE(0x09d000, 0x09dfff) AM_READ(nmk_bgvideoram_r) /* mirror */ ADDRESS_MAP_END static ADDRESS_MAP_START( bjtwin_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w) AM_RANGE(0x084000, 0x084001) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x084010, 0x084011) AM_WRITE(OKIM6295_data_1_lsb_w) AM_RANGE(0x084020, 0x08402f) AM_WRITE(NMK112_okibank_lsb_w) AM_RANGE(0x088000, 0x0887ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x094000, 0x094001) AM_WRITE(nmk_tilebank_w) - AM_RANGE(0x094002, 0x094003) AM_WRITE(MWA16_NOP) /* IRQ enable? */ + AM_RANGE(0x094002, 0x094003) AM_WRITE(SMH_NOP) /* IRQ enable? */ AM_RANGE(0x09c000, 0x09cfff) AM_WRITE(nmk_bgvideoram_w) AM_BASE(&nmk_bgvideoram) AM_RANGE(0x09d000, 0x09dfff) AM_WRITE(nmk_bgvideoram_w) /* mirror */ AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE(&nmk16_mainram) @@ -4784,7 +4784,7 @@ static READ16_HANDLER( vandykeb_r ) { return 0x0000; } static DRIVER_INIT (vandykeb) { memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x08000e, 0x08000f, 0, 0, vandykeb_r ); - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x08001e, 0x08001f, 0, 0, MWA16_NOP ); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x08001e, 0x08001f, 0, 0, SMH_NOP ); } @@ -4828,19 +4828,19 @@ static ADDRESS_MAP_START( afega, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) // P1 + P2 AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r) // 2 x DSW AM_RANGE(0x080012, 0x080013) AM_READ(afega_unknown_r) - AM_RANGE(0x080000, 0x08001d) AM_WRITE(MWA16_RAM) // + AM_RANGE(0x080000, 0x08001d) AM_WRITE(SMH_RAM) // AM_RANGE(0x08001e, 0x08001f) AM_WRITE(afega_soundlatch_w) // To Sound CPU /**/AM_RANGE(0x084000, 0x084003) AM_RAM AM_WRITE(afega_scroll0_w) // Scroll on redhawkb (mirror or changed?..) /**/AM_RANGE(0x084004, 0x084007) AM_RAM AM_WRITE(afega_scroll1_w) // Scroll on redhawkb (mirror or changed?..) - AM_RANGE(0x080020, 0x087fff) AM_WRITE(MWA16_RAM) // -/**/AM_RANGE(0x088000, 0x0885ff) AM_READWRITE(MRA16_RAM, paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) // Palette - AM_RANGE(0x088600, 0x08bfff) AM_WRITE(MWA16_RAM) // + AM_RANGE(0x080020, 0x087fff) AM_WRITE(SMH_RAM) // +/**/AM_RANGE(0x088000, 0x0885ff) AM_READWRITE(SMH_RAM, paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE(0x088600, 0x08bfff) AM_WRITE(SMH_RAM) // /**/AM_RANGE(0x08c000, 0x08c003) AM_RAM AM_WRITE(afega_scroll0_w) AM_BASE(&afega_scroll_0) // Scroll /**/AM_RANGE(0x08c004, 0x08c007) AM_RAM AM_WRITE(afega_scroll1_w) AM_BASE(&afega_scroll_1) // - AM_RANGE(0x08c008, 0x08ffff) AM_WRITE(MWA16_RAM) // -/**/AM_RANGE(0x090000, 0x091fff) AM_READWRITE(MRA16_RAM, afega_vram_0_w) AM_BASE(&afega_vram_0) // Layer 0 + AM_RANGE(0x08c008, 0x08ffff) AM_WRITE(SMH_RAM) // +/**/AM_RANGE(0x090000, 0x091fff) AM_READWRITE(SMH_RAM, afega_vram_0_w) AM_BASE(&afega_vram_0) // Layer 0 /**/AM_RANGE(0x092000, 0x093fff) AM_RAM // ? -/**/AM_RANGE(0x09c000, 0x09c7ff) AM_READWRITE(MRA16_RAM, afega_vram_1_w) AM_BASE(&afega_vram_1) // Layer 1 +/**/AM_RANGE(0x09c000, 0x09c7ff) AM_READWRITE(SMH_RAM, afega_vram_1_w) AM_BASE(&afega_vram_1) // Layer 1 AM_RANGE(0x0c0000, 0x0cffff) AM_RAM AM_SHARE(1) AM_WRITE(nmk16_mainram_strange_w) AM_BASE(&nmk16_mainram) AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_SHARE(1) AM_WRITE(nmk16_mainram_strange_w) @@ -4887,8 +4887,8 @@ static WRITE8_HANDLER( spec2k_oki1_banking_w ) } static ADDRESS_MAP_START( afega_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0003, 0x0003) AM_WRITE(MWA8_NOP) // bug in sound prg? - AM_RANGE(0x0004, 0x0004) AM_WRITE(MWA8_NOP) // bug in sound prg? + AM_RANGE(0x0003, 0x0003) AM_WRITE(SMH_NOP) // bug in sound prg? + AM_RANGE(0x0004, 0x0004) AM_WRITE(SMH_NOP) // bug in sound prg? AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM // RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) // From Main CPU diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c index cb0c3d4841d..6257157de76 100644 --- a/src/mame/drivers/nova2001.c +++ b/src/mame/drivers/nova2001.c @@ -201,10 +201,10 @@ static ADDRESS_MAP_START( ninjakun_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa001, 0xa001) AM_READ(input_port_1_r) AM_RANGE(0xa002, 0xa002) AM_READWRITE(ninjakun_io_A002_r, ninjakun_cpu1_io_A002_w) AM_RANGE(0xa003, 0xa003) AM_WRITE(pkunwar_flipscreen_w) - AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(MRA8_RAM, nova2001_fg_videoram_w) AM_BASE(&nova2001_fg_videoram) AM_SHARE(1) + AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(SMH_RAM, nova2001_fg_videoram_w) AM_BASE(&nova2001_fg_videoram) AM_SHARE(1) AM_RANGE(0xc800, 0xcfff) AM_READWRITE(ninjakun_bg_videoram_r, ninjakun_bg_videoram_w) AM_BASE(&nova2001_bg_videoram) AM_SHARE(2) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE(&spriteram) AM_SHARE(3) - AM_RANGE(0xd800, 0xd9ff) AM_READWRITE(MRA8_RAM, ninjakun_paletteram_w) AM_BASE(&paletteram) AM_SHARE(4) + AM_RANGE(0xd800, 0xd9ff) AM_READWRITE(SMH_RAM, ninjakun_paletteram_w) AM_BASE(&paletteram) AM_SHARE(4) AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_SHARE(5) AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_SHARE(6) ADDRESS_MAP_END @@ -220,10 +220,10 @@ static ADDRESS_MAP_START( ninjakun_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa001, 0xa001) AM_READ(input_port_1_r) AM_RANGE(0xa002, 0xa002) AM_READWRITE(ninjakun_io_A002_r, ninjakun_cpu2_io_A002_w) AM_RANGE(0xa003, 0xa003) AM_WRITE(nova2001_flipscreen_w) - AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(MRA8_RAM, nova2001_fg_videoram_w) AM_SHARE(1) + AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(SMH_RAM, nova2001_fg_videoram_w) AM_SHARE(1) AM_RANGE(0xc800, 0xcfff) AM_READWRITE(ninjakun_bg_videoram_r, ninjakun_bg_videoram_w) AM_SHARE(2) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE(3) - AM_RANGE(0xd800, 0xd9ff) AM_READWRITE(MRA8_RAM, ninjakun_paletteram_w) AM_SHARE(4) + AM_RANGE(0xd800, 0xd9ff) AM_READWRITE(SMH_RAM, ninjakun_paletteram_w) AM_SHARE(4) AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_SHARE(6) /* swapped wrt CPU1 */ AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_SHARE(5) /* swapped wrt CPU1 */ ADDRESS_MAP_END @@ -259,7 +259,7 @@ static ADDRESS_MAP_START( raiders5_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc001, 0xc001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) AM_RANGE(0xc002, 0xc002) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0xc003, 0xc003) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w) - AM_RANGE(0xd000, 0xd1ff) AM_READWRITE(MRA8_RAM, ninjakun_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0xd000, 0xd1ff) AM_READWRITE(SMH_RAM, ninjakun_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE(1) ADDRESS_MAP_END @@ -269,18 +269,18 @@ static ADDRESS_MAP_START( raiders5_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8001, 0x8001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) AM_RANGE(0x8002, 0x8002) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x8003, 0x8003) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w) - AM_RANGE(0x9000, 0x9000) AM_READ(MRA8_NOP) /* unknown */ + AM_RANGE(0x9000, 0x9000) AM_READ(SMH_NOP) /* unknown */ AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE(1) - AM_RANGE(0xc000, 0xc000) AM_READ(MRA8_NOP) /* unknown */ - AM_RANGE(0xc800, 0xc800) AM_READ(MRA8_NOP) /* unknown */ - AM_RANGE(0xd000, 0xd000) AM_READ(MRA8_NOP) /* unknown */ + AM_RANGE(0xc000, 0xc000) AM_READ(SMH_NOP) /* unknown */ + AM_RANGE(0xc800, 0xc800) AM_READ(SMH_NOP) /* unknown */ + AM_RANGE(0xd000, 0xd000) AM_READ(SMH_NOP) /* unknown */ AM_RANGE(0xe000, 0xe000) AM_WRITE(nova2001_scroll_x_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(nova2001_scroll_y_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(pkunwar_flipscreen_w) ADDRESS_MAP_END static ADDRESS_MAP_START( raiders5_io, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00, 0x00) AM_READ(MRA8_NOP) /* unknown */ + AM_RANGE(0x00, 0x00) AM_READ(SMH_NOP) /* unknown */ ADDRESS_MAP_END diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c index 0e931219adc..81e8d1a006e 100644 --- a/src/mame/drivers/nss.c +++ b/src/mame/drivers/nss.c @@ -300,7 +300,7 @@ extern DRIVER_INIT( snes ); static ADDRESS_MAP_START( snes_map, ADDRESS_SPACE_PROGRAM, 8) AM_RANGE(0x000000, 0x2fffff) AM_READWRITE(snes_r_bank1, snes_w_bank1) /* I/O and ROM (repeats for each bank) */ AM_RANGE(0x300000, 0x3fffff) AM_READWRITE(snes_r_bank2, snes_w_bank2) /* I/O and ROM (repeats for each bank) */ - AM_RANGE(0x400000, 0x5fffff) AM_READWRITE(snes_r_bank3, MWA8_ROM) /* ROM (and reserved in Mode 20) */ + AM_RANGE(0x400000, 0x5fffff) AM_READWRITE(snes_r_bank3, SMH_ROM) /* ROM (and reserved in Mode 20) */ AM_RANGE(0x600000, 0x6fffff) AM_READWRITE(snes_r_bank6, snes_w_bank6) /* used by Mode 20 DSP-1 */ AM_RANGE(0x700000, 0x77ffff) AM_READWRITE(snes_r_sram, snes_w_sram) /* 256KB Mode 20 save ram + reserved from 0x8000 - 0xffff */ AM_RANGE(0x780000, 0x7dffff) AM_NOP /* Reserved */ diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 63a1a2565b1..5558dc25a98 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -758,7 +758,7 @@ static WRITE32_HANDLER( lanc2_w ) static ADDRESS_MAP_START( nwktr_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x003fffff) AM_MIRROR(0x80000000) AM_RAM AM_BASE(&work_ram) /* Work RAM */ AM_RANGE(0x74000000, 0x740000ff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_reg_r, K001604_reg_w) - AM_RANGE(0x74010000, 0x74017fff) AM_MIRROR(0x80000000) AM_READWRITE(MRA32_RAM, paletteram32_w) AM_BASE(&paletteram32) + AM_RANGE(0x74010000, 0x74017fff) AM_MIRROR(0x80000000) AM_READWRITE(SMH_RAM, paletteram32_w) AM_BASE(&paletteram32) AM_RANGE(0x74020000, 0x7403ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_tile_r, K001604_tile_w) AM_RANGE(0x74040000, 0x7407ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_char_r, K001604_char_w) AM_RANGE(0x78000000, 0x7800ffff) AM_MIRROR(0x80000000) AM_READWRITE(cgboard_dsp_shared_r_ppc, cgboard_dsp_shared_w_ppc) diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index b1830365646..25c91bd1e02 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -320,20 +320,20 @@ static WRITE8_HANDLER( nycaptor_generic_control_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xc7ff) AM_READ(nycaptor_videoram_r) AM_RANGE(0xd000, 0xd000) AM_READ(nycaptor_mcu_r) AM_RANGE(0xd002, 0xd002) AM_READ(nycaptor_generic_control_r) AM_RANGE(0xd400, 0xd400) AM_READ(from_snd_r) - AM_RANGE(0xd401, 0xd401) AM_READ(MRA8_NOP) + AM_RANGE(0xd401, 0xd401) AM_READ(SMH_NOP) AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r) AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r) AM_RANGE(0xd802, 0xd802) AM_READ(input_port_2_r) AM_RANGE(0xd803, 0xd803) AM_READ(input_port_3_r) AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r) AM_RANGE(0xd805, 0xd805) AM_READ(nycaptor_mcu_status_r1) - AM_RANGE(0xd806, 0xd806) AM_READ(MRA8_NOP) /* unknown ?sound? */ + AM_RANGE(0xd806, 0xd806) AM_READ(SMH_NOP) /* unknown ?sound? */ AM_RANGE(0xd807, 0xd807) AM_READ(nycaptor_mcu_status_r2) AM_RANGE(0xdc00, 0xdc9f) AM_READ(nycaptor_spriteram_r) AM_RANGE(0xdca0, 0xdcbf) AM_READ(nycaptor_scrlram_r) @@ -343,7 +343,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(nycaptor_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xd000, 0xd000) AM_WRITE(nycaptor_mcu_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(sub_cpu_halt_w) @@ -352,7 +352,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd403, 0xd403) AM_WRITE(sound_cpu_reset_w) AM_RANGE(0xdc00, 0xdc9f) AM_WRITE(nycaptor_spriteram_w) AM_RANGE(0xdca0, 0xdcbf) AM_WRITE(nycaptor_scrlram_w) AM_BASE(&nycaptor_scrlram) - AM_RANGE(0xdce1, 0xdce1) AM_WRITE(MWA8_NOP) + AM_RANGE(0xdce1, 0xdce1) AM_WRITE(SMH_NOP) AM_RANGE(0xdd00, 0xdeff) AM_WRITE(nycaptor_palette_w) AM_RANGE(0xdf03, 0xdf03) AM_WRITE(nycaptor_gfxctrl_w) AM_RANGE(0xe000, 0xffff) AM_WRITE(nycaptor_sharedram_w) AM_BASE(&nycaptor_sharedram) @@ -360,7 +360,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r) AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r) AM_RANGE(0xd802, 0xd802) AM_READ(input_port_2_r) @@ -377,39 +377,39 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(nycaptor_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xdc00, 0xdc9f) AM_WRITE(nycaptor_spriteram_w) AM_RANGE(0xdca0, 0xdcbf) AM_WRITE(nycaptor_scrlram_w) AM_BASE(&nycaptor_scrlram) AM_RANGE(0xdd00, 0xdeff) AM_WRITE(nycaptor_palette_w) - AM_RANGE(0xdf03, 0xdf03) AM_WRITE(MWA8_NOP)/* ? gfx control ? */ + AM_RANGE(0xdf03, 0xdf03) AM_WRITE(SMH_NOP)/* ? gfx control ? */ AM_RANGE(0xe000, 0xffff) AM_WRITE(nycaptor_sharedram_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) - AM_RANGE(0xd200, 0xd200) AM_READ(MRA8_NOP) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_NOP) + AM_RANGE(0xd200, 0xd200) AM_READ(SMH_NOP) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc800, 0xc800) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0xc802, 0xc802) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0xc803, 0xc803) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0xc900, 0xc90d) AM_WRITE(MSM5232_0_w) - AM_RANGE(0xca00, 0xca00) AM_WRITE(MWA8_NOP) - AM_RANGE(0xcb00, 0xcb00) AM_WRITE(MWA8_NOP) - AM_RANGE(0xcc00, 0xcc00) AM_WRITE(MWA8_NOP) + AM_RANGE(0xca00, 0xca00) AM_WRITE(SMH_NOP) + AM_RANGE(0xcb00, 0xcb00) AM_WRITE(SMH_NOP) + AM_RANGE(0xcc00, 0xcc00) AM_WRITE(SMH_NOP) AM_RANGE(0xd000, 0xd000) AM_WRITE(to_main_w) AM_RANGE(0xd200, 0xd200) AM_WRITE(nmi_enable_w) AM_RANGE(0xd400, 0xd400) AM_WRITE(nmi_disable_w) - AM_RANGE(0xd600, 0xd600) AM_WRITE(MWA8_NOP) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_NOP) + AM_RANGE(0xd600, 0xd600) AM_WRITE(SMH_NOP) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -417,8 +417,8 @@ static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(nycaptor_68705_portA_r) AM_RANGE(0x0001, 0x0001) AM_READ(nycaptor_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(nycaptor_68705_portC_r) - AM_RANGE(0x0010, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -429,8 +429,8 @@ static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0004, 0x0004) AM_WRITE(nycaptor_68705_ddrA_w) AM_RANGE(0x0005, 0x0005) AM_WRITE(nycaptor_68705_ddrB_w) AM_RANGE(0x0006, 0x0006) AM_WRITE(nycaptor_68705_ddrC_w) - AM_RANGE(0x0010, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -466,8 +466,8 @@ static WRITE8_HANDLER( cyclshtg_generic_control_w ) static ADDRESS_MAP_START( cyclshtg_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xcfff) AM_READ(nycaptor_videoram_r) AM_RANGE(0xd000, 0xd000) AM_READ(cyclshtg_mcu_r) AM_RANGE(0xd002, 0xd002) AM_READ(nycaptor_generic_control_r) @@ -478,7 +478,7 @@ static ADDRESS_MAP_START( cyclshtg_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd803, 0xd803) AM_READ(input_port_3_r) AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r) AM_RANGE(0xd805, 0xd805) AM_READ(cyclshtg_mcu_status_r) - AM_RANGE(0xd806, 0xd806) AM_READ(MRA8_NOP) + AM_RANGE(0xd806, 0xd806) AM_READ(SMH_NOP) AM_RANGE(0xd807, 0xd807) AM_READ(cyclshtg_mcu_status_r) AM_RANGE(0xdc00, 0xdc9f) AM_READ(nycaptor_spriteram_r) AM_RANGE(0xdca0, 0xdcbf) AM_READ(nycaptor_scrlram_r) @@ -488,7 +488,7 @@ static ADDRESS_MAP_START( cyclshtg_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cyclshtg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xcfff) AM_WRITE(nycaptor_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xd000, 0xd000) AM_WRITE(cyclshtg_mcu_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(sub_cpu_halt_w) @@ -497,7 +497,7 @@ static ADDRESS_MAP_START( cyclshtg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd403, 0xd403) AM_WRITE(sound_cpu_reset_w) AM_RANGE(0xdc00, 0xdc9f) AM_WRITE(nycaptor_spriteram_w) AM_RANGE(0xdca0, 0xdcbf) AM_WRITE(nycaptor_scrlram_w) AM_BASE(&nycaptor_scrlram) - AM_RANGE(0xdce1, 0xdce1) AM_WRITE(MWA8_NOP) + AM_RANGE(0xdce1, 0xdce1) AM_WRITE(SMH_NOP) AM_RANGE(0xdd00, 0xdeff) AM_WRITE(nycaptor_palette_w) AM_RANGE(0xdf03, 0xdf03) AM_WRITE(nycaptor_gfxctrl_w) AM_RANGE(0xe000, 0xffff) AM_WRITE(nycaptor_sharedram_w) AM_BASE(&nycaptor_sharedram) @@ -505,7 +505,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cyclshtg_readmem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r) AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r) AM_RANGE(0xd802, 0xd802) AM_READ(input_port_2_r) @@ -521,12 +521,12 @@ static ADDRESS_MAP_START( cyclshtg_readmem_sub, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cyclshtg_writemem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(nycaptor_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xdc00, 0xdc9f) AM_WRITE(nycaptor_spriteram_w) AM_RANGE(0xdca0, 0xdcbf) AM_WRITE(nycaptor_scrlram_w) AM_BASE(&nycaptor_scrlram) AM_RANGE(0xdd00, 0xdeff) AM_WRITE(nycaptor_palette_w) - AM_RANGE(0xdf03, 0xdf03) AM_WRITE(MWA8_NOP) + AM_RANGE(0xdf03, 0xdf03) AM_WRITE(SMH_NOP) AM_RANGE(0xe000, 0xffff) AM_WRITE(nycaptor_sharedram_w) ADDRESS_MAP_END @@ -536,8 +536,8 @@ static READ8_HANDLER(unk_r) } static ADDRESS_MAP_START( bronx_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xcfff) AM_READ(nycaptor_videoram_r) AM_RANGE(0xd000, 0xd000) AM_READ(cyclshtg_mcu_r) AM_RANGE(0xd002, 0xd002) AM_READ(nycaptor_generic_control_r) @@ -549,7 +549,7 @@ static ADDRESS_MAP_START( bronx_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd803, 0xd803) AM_READ(input_port_3_r) AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r) AM_RANGE(0xd805, 0xd805) AM_READ(cyclshtg_mcu_status_r) - AM_RANGE(0xd806, 0xd806) AM_READ(MRA8_NOP) + AM_RANGE(0xd806, 0xd806) AM_READ(SMH_NOP) AM_RANGE(0xd807, 0xd807) AM_READ(cyclshtg_mcu_status_r) AM_RANGE(0xdc00, 0xdc9f) AM_READ(nycaptor_spriteram_r) AM_RANGE(0xdca0, 0xdcbf) AM_READ(nycaptor_scrlram_r) @@ -559,7 +559,7 @@ static ADDRESS_MAP_START( bronx_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bronx_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xcfff) AM_WRITE(nycaptor_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xd000, 0xd000) AM_WRITENOP AM_RANGE(0xd001, 0xd001) AM_WRITE(sub_cpu_halt_w) @@ -578,7 +578,7 @@ static ADDRESS_MAP_START( bronx_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bronx_readmem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r) AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r) AM_RANGE(0xd802, 0xd802) AM_READ(input_port_2_r) @@ -596,7 +596,7 @@ static ADDRESS_MAP_START( bronx_readmem_sub, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bronx_writemem_sub, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(nycaptor_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xdc00, 0xdc9f) AM_WRITE(nycaptor_spriteram_w) AM_RANGE(0xdca0, 0xdcbf) AM_WRITE(nycaptor_scrlram_w) AM_BASE(&nycaptor_scrlram) diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c index 815f867c16b..307882c53cc 100644 --- a/src/mame/drivers/offtwall.c +++ b/src/mame/drivers/offtwall.c @@ -272,14 +272,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x260050, 0x260051) AM_WRITE(io_latch_w) AM_RANGE(0x260060, 0x260061) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(MRA16_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(SMH_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(atarivc_r, atarivc_w) AM_BASE(&atarivc_data) - AM_RANGE(0x3f4000, 0x3f5eff) AM_READWRITE(MRA16_RAM, atarigen_playfield_latched_msb_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0x3f4000, 0x3f5eff) AM_READWRITE(SMH_RAM, atarigen_playfield_latched_msb_w) AM_BASE(&atarigen_playfield) AM_RANGE(0x3f5f00, 0x3f5f7f) AM_RAM AM_BASE(&atarivc_eof_data) - AM_RANGE(0x3f5f80, 0x3f5fff) AM_READWRITE(MRA16_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) - AM_RANGE(0x3f6000, 0x3f7fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_upper_w) AM_BASE(&atarigen_playfield_upper) + AM_RANGE(0x3f5f80, 0x3f5fff) AM_READWRITE(SMH_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) + AM_RANGE(0x3f6000, 0x3f7fff) AM_READWRITE(SMH_RAM, atarigen_playfield_upper_w) AM_BASE(&atarigen_playfield_upper) AM_RANGE(0x3f8000, 0x3fcfff) AM_RAM - AM_RANGE(0x3fd000, 0x3fd7ff) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0x3fd000, 0x3fd7ff) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3fd800, 0x3fffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c index cf8c41fe211..1bc4774f61e 100644 --- a/src/mame/drivers/ohmygod.c +++ b/src/mame/drivers/ohmygod.c @@ -60,14 +60,14 @@ static WRITE16_HANDLER( ohmygod_ctrl_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x300000, 0x303fff) AM_READ(MRA16_RAM) - AM_RANGE(0x304000, 0x307fff) AM_READ(MRA16_RAM) - AM_RANGE(0x308000, 0x30ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x6007ff) AM_READ(MRA16_RAM) - AM_RANGE(0x700000, 0x703fff) AM_READ(MRA16_RAM) - AM_RANGE(0x704000, 0x707fff) AM_READ(MRA16_RAM) - AM_RANGE(0x708000, 0x70ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x300000, 0x303fff) AM_READ(SMH_RAM) + AM_RANGE(0x304000, 0x307fff) AM_READ(SMH_RAM) + AM_RANGE(0x308000, 0x30ffff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x6007ff) AM_READ(SMH_RAM) + AM_RANGE(0x700000, 0x703fff) AM_READ(SMH_RAM) + AM_RANGE(0x704000, 0x707fff) AM_READ(SMH_RAM) + AM_RANGE(0x708000, 0x70ffff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r) AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r) AM_RANGE(0xa00000, 0xa00001) AM_READ(input_port_2_word_r) @@ -77,16 +77,16 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x300000, 0x303fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x300000, 0x303fff) AM_WRITE(SMH_RAM) AM_RANGE(0x304000, 0x307fff) AM_WRITE(ohmygod_videoram_w) AM_BASE(&ohmygod_videoram) - AM_RANGE(0x308000, 0x30ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x308000, 0x30ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x400000, 0x400001) AM_WRITE(ohmygod_scrollx_w) AM_RANGE(0x400002, 0x400003) AM_WRITE(ohmygod_scrolly_w) AM_RANGE(0x600000, 0x6007ff) AM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x700000, 0x703fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x704000, 0x707fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x708000, 0x70ffff) AM_WRITE(MWA16_RAM) /* work RAM */ + AM_RANGE(0x700000, 0x703fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x704000, 0x707fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x708000, 0x70ffff) AM_WRITE(SMH_RAM) /* work RAM */ AM_RANGE(0x900000, 0x900001) AM_WRITE(ohmygod_ctrl_w) AM_RANGE(0xb00000, 0xb00001) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0xd00000, 0xd00001) AM_WRITE(ohmygod_spritebank_w) diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index 8c018aa3af2..434433014d9 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -230,48 +230,48 @@ static WRITE8_HANDLER( ccasino_coinctr_w ) static ADDRESS_MAP_START( readmem_ojankohs, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_READ(ojankohs_videoram_r) AM_RANGE(0x9000, 0x9fff) AM_READ(ojankohs_colorram_r) - AM_RANGE(0xa000, 0xb7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xa000, 0xb7ff) AM_READ(SMH_RAM) AM_RANGE(0xb800, 0xbfff) AM_READ(ojankohs_palette_r) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_ojankohs, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(ojankohs_videoram_w) AM_RANGE(0x9000, 0x9fff) AM_WRITE(ojankohs_colorram_w) - AM_RANGE(0xa000, 0xb7ff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0xa000, 0xb7ff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xb800, 0xbfff) AM_WRITE(ojankohs_palette_w) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_ojankoy, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x9fff) AM_READ(ojankohs_videoram_r) AM_RANGE(0xa000, 0xafff) AM_READ(ojankohs_colorram_r) - AM_RANGE(0xb000, 0xbfff) AM_READ(MRA8_RAM) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0xb000, 0xbfff) AM_READ(SMH_RAM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_ojankoy, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x9fff) AM_WRITE(ojankohs_videoram_w) AM_RANGE(0xa000, 0xafff) AM_WRITE(ojankohs_colorram_w) - AM_RANGE(0xb000, 0xbfff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xb000, 0xbfff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_ojankoc, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_ojankoc, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x8000, 0xffff) AM_WRITE(ojankoc_videoram_w) ADDRESS_MAP_END @@ -294,8 +294,8 @@ static ADDRESS_MAP_START( writeport_ojankohs, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w) AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x07, 0x07) AM_WRITE(AY8910_control_port_0_w) - AM_RANGE(0x10, 0x10) AM_WRITE(MWA8_NOP) // unknown - AM_RANGE(0x11, 0x11) AM_WRITE(MWA8_NOP) // unknown + AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP) // unknown + AM_RANGE(0x11, 0x11) AM_WRITE(SMH_NOP) // unknown ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_ojankoy, ADDRESS_SPACE_IO, 8 ) @@ -330,8 +330,8 @@ static ADDRESS_MAP_START( writeport_ccasino, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x07, 0x07) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x08, 0x0f) AM_WRITE(ccasino_palette_w) // 16bit address access - AM_RANGE(0x10, 0x10) AM_WRITE(MWA8_NOP) - AM_RANGE(0x11, 0x11) AM_WRITE(MWA8_NOP) + AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP) + AM_RANGE(0x11, 0x11) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( readport_ojankoc, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 924e1d73c6f..8faeb2a1f91 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -178,37 +178,37 @@ static WRITE8_HANDLER( sound_command_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa001, 0xa001) AM_READ(input_port_1_r) AM_RANGE(0xa002, 0xa002) AM_READ(input_port_2_r) AM_RANGE(0xa003, 0xa003) AM_READ(input_port_3_r) AM_RANGE(0xa004, 0xa004) AM_READ(input_port_4_r) AM_RANGE(0xa005, 0xa005) AM_READ(input_port_5_r) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x83ff) AM_WRITE(olibochu_videoram_w) AM_BASE(&videoram) AM_RANGE(0x8400, 0x87ff) AM_WRITE(olibochu_colorram_w) AM_BASE(&colorram) AM_RANGE(0xa800, 0xa801) AM_WRITE(sound_command_w) AM_RANGE(0xa802, 0xa802) AM_WRITE(olibochu_flipscreen_w) /* bit 6 = enable sound? */ - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf400, 0xf41f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf440, 0xf47f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf400, 0xf41f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf440, 0xf47f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_2_size) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x63ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x63ff) AM_READ(SMH_RAM) AM_RANGE(0x7000, 0x7000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x63ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x63ff) AM_WRITE(SMH_RAM) AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x7001, 0x7001) AM_WRITE(AY8910_write_port_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c index cd38201c0a3..03abb2de720 100644 --- a/src/mame/drivers/oneshot.c +++ b/src/mame/drivers/oneshot.c @@ -114,11 +114,11 @@ static WRITE16_HANDLER( soundbank_w ) static ADDRESS_MAP_START( oneshot_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x087fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0c0000, 0x0c07ff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x120fff) AM_READ(MRA16_RAM) - AM_RANGE(0x180000, 0x182fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x087fff) AM_READ(SMH_RAM) + AM_RANGE(0x0c0000, 0x0c07ff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x120fff) AM_READ(SMH_RAM) + AM_RANGE(0x180000, 0x182fff) AM_READ(SMH_RAM) AM_RANGE(0x190002, 0x190003) AM_READ(soundlatch_word_r) AM_RANGE(0x190026, 0x190027) AM_READ(oneshot_gun_x_p1_r) AM_RANGE(0x19002e, 0x19002f) AM_READ(oneshot_gun_x_p2_r) @@ -132,30 +132,30 @@ static ADDRESS_MAP_START( oneshot_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( oneshot_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x087fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x087fff) AM_WRITE(SMH_RAM) AM_RANGE(0x0c0000, 0x0c07ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x120000, 0x120fff) AM_WRITE(MWA16_RAM) AM_BASE(&oneshot_sprites) + AM_RANGE(0x120000, 0x120fff) AM_WRITE(SMH_RAM) AM_BASE(&oneshot_sprites) AM_RANGE(0x180000, 0x180fff) AM_WRITE(oneshot_mid_videoram_w) AM_BASE(&oneshot_mid_videoram) // some people , girl etc. AM_RANGE(0x181000, 0x181fff) AM_WRITE(oneshot_fg_videoram_w) AM_BASE(&oneshot_fg_videoram) // credits etc. AM_RANGE(0x182000, 0x182fff) AM_WRITE(oneshot_bg_videoram_w) AM_BASE(&oneshot_bg_videoram) // credits etc. - AM_RANGE(0x188000, 0x18800f) AM_WRITE(MWA16_RAM) AM_BASE(&oneshot_scroll) // scroll registers??? + AM_RANGE(0x188000, 0x18800f) AM_WRITE(SMH_RAM) AM_BASE(&oneshot_scroll) // scroll registers??? AM_RANGE(0x190010, 0x190011) AM_WRITE(soundlatch_word_w) AM_RANGE(0x190018, 0x190019) AM_WRITE(soundbank_w) ADDRESS_MAP_END static ADDRESS_MAP_START( snd_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r) - AM_RANGE(0x8001, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8001, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM3812_status_port_0_r) AM_RANGE(0xe010, 0xe010) AM_READ(OKIM6295_status_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( snd_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8000) AM_WRITE(soundlatch_w) - AM_RANGE(0x8001, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x8001, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xe010, 0xe010) AM_WRITE(OKIM6295_data_0_w) diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 08029fdea1a..8db2b7d9c48 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -105,9 +105,9 @@ static WRITE8_HANDLER(palette2_w) static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION(REGION_CPU1, 0x10000) AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) - AM_RANGE(0xc800, 0xc87f) AM_READWRITE(MRA8_RAM, palette1_w) AM_BASE(&paletteram) - AM_RANGE(0xc900, 0xc97f) AM_READWRITE(MRA8_RAM, palette2_w) AM_BASE(&paletteram_2) - AM_RANGE(0xd000, 0xdfff) AM_READWRITE(MRA8_RAM, onetwo_fgram_w) AM_BASE(&fgram) + AM_RANGE(0xc800, 0xc87f) AM_READWRITE(SMH_RAM, palette1_w) AM_BASE(&paletteram) + AM_RANGE(0xc900, 0xc97f) AM_READWRITE(SMH_RAM, palette2_w) AM_BASE(&paletteram_2) + AM_RANGE(0xd000, 0xdfff) AM_READWRITE(SMH_RAM, onetwo_fgram_w) AM_BASE(&fgram) AM_RANGE(0xe000, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index 9de460e40a2..a6e0b254ab1 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -191,32 +191,32 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static ADDRESS_MAP_START( opwolf_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x0f0000, 0x0f07ff) AM_MIRROR(0xf000) AM_READ(opwolf_cchip_data_r) AM_RANGE(0x0f0802, 0x0f0803) AM_MIRROR(0xf000) AM_READ(opwolf_cchip_status_r) - AM_RANGE(0x100000, 0x107fff) AM_READ(MRA16_RAM) /* RAM */ - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) + AM_RANGE(0x100000, 0x107fff) AM_READ(SMH_RAM) /* RAM */ + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) AM_RANGE(0x380000, 0x380003) AM_READ(opwolf_dsw_r) /* dip switches */ AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 */ - AM_RANGE(0x3e0000, 0x3e0001) AM_READ(MRA16_NOP) + AM_RANGE(0x3e0000, 0x3e0001) AM_READ(SMH_NOP) AM_RANGE(0x3e0002, 0x3e0003) AM_READ(taitosound_comm16_msb_r) AM_RANGE(0xc00000, 0xc0ffff) AM_READ(PC080SN_word_0_r) AM_RANGE(0xd00000, 0xd03fff) AM_READ(PC090OJ_word_0_r) /* sprite ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( opwolf_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x0ff000, 0x0ff7ff) AM_WRITE(opwolf_cchip_data_w) AM_RANGE(0x0ff802, 0x0ff803) AM_WRITE(opwolf_cchip_status_w) AM_RANGE(0x0ffc00, 0x0ffc01) AM_WRITE(opwolf_cchip_bank_w) - AM_RANGE(0x100000, 0x107fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x100000, 0x107fff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200fff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x380000, 0x380003) AM_WRITE(rainbow_spritectrl_w) // usually 0x4, changes when you fire - AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(MWA16_NOP) /* watchdog ?? */ + AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(SMH_NOP) /* watchdog ?? */ AM_RANGE(0x3e0000, 0x3e0001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x3e0002, 0x3e0003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(PC080SN_word_0_w) - AM_RANGE(0xc10000, 0xc1ffff) AM_WRITE(MWA16_RAM) /* error in init code (?) */ + AM_RANGE(0xc10000, 0xc1ffff) AM_WRITE(SMH_RAM) /* error in init code (?) */ AM_RANGE(0xc20000, 0xc20003) AM_WRITE(PC080SN_yscroll_word_0_w) AM_RANGE(0xc40000, 0xc40003) AM_WRITE(PC080SN_xscroll_word_0_w) AM_RANGE(0xc50000, 0xc50003) AM_WRITE(PC080SN_ctrl_word_0_w) @@ -225,30 +225,30 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( opwolfb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x0f0008, 0x0f000b) AM_READ(opwolf_in_r) /* coins and buttons */ AM_RANGE(0x0ff000, 0x0fffff) AM_READ(cchip_r) - AM_RANGE(0x100000, 0x107fff) AM_READ(MRA16_RAM) /* RAM */ - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) + AM_RANGE(0x100000, 0x107fff) AM_READ(SMH_RAM) /* RAM */ + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) AM_RANGE(0x380000, 0x380003) AM_READ(opwolf_dsw_r) /* dip switches */ AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 */ - AM_RANGE(0x3e0000, 0x3e0001) AM_READ(MRA16_NOP) + AM_RANGE(0x3e0000, 0x3e0001) AM_READ(SMH_NOP) AM_RANGE(0x3e0002, 0x3e0003) AM_READ(taitosound_comm16_msb_r) AM_RANGE(0xc00000, 0xc0ffff) AM_READ(PC080SN_word_0_r) AM_RANGE(0xd00000, 0xd03fff) AM_READ(PC090OJ_word_0_r) /* sprite ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( opwolfb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x0ff000, 0x0fffff) AM_WRITE(cchip_w) - AM_RANGE(0x100000, 0x107fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x100000, 0x107fff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200fff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x380000, 0x380003) AM_WRITE(rainbow_spritectrl_w) // usually 0x4, changes when you fire - AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(MWA16_NOP) /* watchdog ?? */ + AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(SMH_NOP) /* watchdog ?? */ AM_RANGE(0x3e0000, 0x3e0001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x3e0002, 0x3e0003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(PC080SN_word_0_w) - AM_RANGE(0xc10000, 0xc1ffff) AM_WRITE(MWA16_RAM) /* error in init code (?) */ + AM_RANGE(0xc10000, 0xc1ffff) AM_WRITE(SMH_RAM) /* error in init code (?) */ AM_RANGE(0xc20000, 0xc20003) AM_WRITE(PC080SN_yscroll_word_0_w) AM_RANGE(0xc40000, 0xc40003) AM_WRITE(PC080SN_xscroll_word_0_w) AM_RANGE(0xc50000, 0xc50003) AM_WRITE(PC080SN_ctrl_word_0_w) @@ -260,27 +260,27 @@ ADDRESS_MAP_END */ static ADDRESS_MAP_START( sub_z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8800, 0x8800) AM_READ(z80_input1_r) /* read at PC=$637: poked to $c004 */ AM_RANGE(0x9800, 0x9800) AM_READ(z80_input2_r) /* read at PC=$631: poked to $c005 */ - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sub_z80_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x9000, 0x9000) AM_WRITE(MWA8_NOP) /* unknown write, 0 then 1 each interrupt */ - AM_RANGE(0xa000, 0xa000) AM_WRITE(MWA8_NOP) /* IRQ acknowledge (unimplemented) */ - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) AM_BASE(&cchip_ram) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x9000, 0x9000) AM_WRITE(SMH_NOP) /* unknown write, 0 then 1 each interrupt */ + AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_NOP) /* IRQ acknowledge (unimplemented) */ + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_BASE(&cchip_ram) ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK10) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0x9001, 0x9001) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0x9002, 0x9100) AM_READ(MRA8_RAM) + AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END @@ -386,8 +386,8 @@ static WRITE8_HANDLER( opwolf_adpcm_e_w ) static ADDRESS_MAP_START( z80_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c index 03b35319ffb..05e931a82c1 100644 --- a/src/mame/drivers/orbit.c +++ b/src/mame/drivers/orbit.c @@ -86,8 +86,8 @@ static ADDRESS_MAP_START( orbit_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_2_r) AM_RANGE(0x2000, 0x2000) AM_READ(input_port_3_r) AM_RANGE(0x2800, 0x2800) AM_READ(input_port_4_r) - AM_RANGE(0x3000, 0x33bf) AM_READWRITE(MRA8_RAM, orbit_playfield_w) AM_BASE(&orbit_playfield_ram) - AM_RANGE(0x33c0, 0x33ff) AM_READWRITE(MRA8_RAM, orbit_sprite_w) AM_BASE(&orbit_sprite_ram) + AM_RANGE(0x3000, 0x33bf) AM_READWRITE(SMH_RAM, orbit_playfield_w) AM_BASE(&orbit_playfield_ram) + AM_RANGE(0x33c0, 0x33ff) AM_READWRITE(SMH_RAM, orbit_sprite_w) AM_BASE(&orbit_sprite_ram) AM_RANGE(0x3400, 0x37bf) AM_WRITE(orbit_playfield_w) AM_RANGE(0x37c0, 0x37ff) AM_WRITE(orbit_sprite_w) AM_RANGE(0x3800, 0x3800) AM_WRITE(orbit_note_w) diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c index 3497d09a4e5..969a3fe9679 100644 --- a/src/mame/drivers/othldrby.c +++ b/src/mame/drivers/othldrby.c @@ -95,12 +95,12 @@ static READ16_HANDLER( calendar_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x20000f) AM_READ(calendar_r) AM_RANGE(0x300004, 0x300007) AM_READ(othldrby_videoram_r) AM_RANGE(0x30000c, 0x30000d) AM_READ(pip) // vblank? - AM_RANGE(0x400000, 0x400fff) AM_READ(MRA16_RAM) + AM_RANGE(0x400000, 0x400fff) AM_READ(SMH_RAM) AM_RANGE(0x600000, 0x600001) AM_READ(OKIM6295_status_0_lsb_r) AM_RANGE(0x700000, 0x700001) AM_READ(pap) // scanline??? AM_RANGE(0x700004, 0x700005) AM_READ(input_port_0_word_r) @@ -111,8 +111,8 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x20000f) AM_WRITE(calendar_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(othldrby_videoram_addr_w) AM_RANGE(0x300004, 0x300007) AM_WRITE(othldrby_videoram_w) diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index 564defc3d3d..f1d071c7b1d 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -508,7 +508,7 @@ static ADDRESS_MAP_START( othunder_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x08ffff) AM_RAM AM_RANGE(0x090000, 0x09000f) AM_READWRITE(othunder_TC0220IOC_r, othunder_TC0220IOC_w) // AM_RANGE(0x090006, 0x090007) AM_WRITE(eeprom_w) -// AM_RANGE(0x09000c, 0x09000d) AM_WRITE(MWA16_NOP) /* ?? (keeps writing 0x77) */ +// AM_RANGE(0x09000c, 0x09000d) AM_WRITE(SMH_NOP) /* ?? (keeps writing 0x77) */ AM_RANGE(0x100000, 0x100007) AM_READWRITE(TC0110PCR_word_r, TC0110PCR_step1_rbswap_word_w) /* palette */ AM_RANGE(0x200000, 0x20ffff) AM_READWRITE(TC0100SCN_word_0_r, TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x220000, 0x22000f) AM_READWRITE(TC0100SCN_ctrl_word_0_r, TC0100SCN_ctrl_word_0_w) @@ -529,13 +529,13 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2610_read_port_0_r, YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) - AM_RANGE(0xe200, 0xe200) AM_READWRITE(MRA8_NOP, taitosound_slave_port_w) + AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITE(othunder_TC0310FAM_w) /* pan */ - AM_RANGE(0xe600, 0xe600) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe600, 0xe600) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xea00, 0xea00) AM_READ(input_port_9_r) /* rotary input */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index bea0ab5cac6..3e36c69c80f 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -254,9 +254,9 @@ static WRITE16_HANDLER( overdriv_cpuB_irq6_w ) static ADDRESS_MAP_START( overdriv_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_READ(MRA16_RAM) - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x043fff) AM_READ(SMH_RAM) + AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) AM_RANGE(0x0c0000, 0x0c0001) AM_READ(eeprom_r) AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_1_word_r) AM_RANGE(0x180000, 0x180001) AM_READ(input_port_2_word_r) @@ -270,11 +270,11 @@ static ADDRESS_MAP_START( overdriv_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( overdriv_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_WRITE(MWA16_RAM) /* work RAM */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x043fff) AM_WRITE(SMH_RAM) /* work RAM */ AM_RANGE(0x080000, 0x080fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE(MWA16_NOP) /* unknown (always 0x30) */ - AM_RANGE(0x100000, 0x10001f) AM_WRITE(MWA16_NOP) /* 053252? (LSB) */ + AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE(SMH_NOP) /* unknown (always 0x30) */ + AM_RANGE(0x100000, 0x10001f) AM_WRITE(SMH_NOP) /* 053252? (LSB) */ AM_RANGE(0x140000, 0x140001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x1c0000, 0x1c001f) AM_WRITE(K051316_ctrl_0_msb_w) AM_RANGE(0x1c8000, 0x1c801f) AM_WRITE(K051316_ctrl_1_msb_w) @@ -293,32 +293,32 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( overdriv_readmem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_READ(MRA16_RAM) -AM_RANGE(0x0c0000, 0x0c1fff) AM_READ(MRA16_RAM) -AM_RANGE(0x100000, 0x10000f) AM_READ(MRA16_NOP) // K053250 #0 -AM_RANGE(0x108000, 0x10800f) AM_READ(MRA16_NOP) // K053250 #1 + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM) +AM_RANGE(0x0c0000, 0x0c1fff) AM_READ(SMH_RAM) +AM_RANGE(0x100000, 0x10000f) AM_READ(SMH_NOP) // K053250 #0 +AM_RANGE(0x108000, 0x10800f) AM_READ(SMH_NOP) // K053250 #1 AM_RANGE(0x118000, 0x118fff) AM_READ(K053247_word_r) AM_RANGE(0x120000, 0x120001) AM_READ(K053246_word_r) AM_RANGE(0x128000, 0x128001) AM_READ(cpuB_ctrl_r) AM_RANGE(0x200000, 0x203fff) AM_READ(sharedram_r) -AM_RANGE(0x208000, 0x20bfff) AM_READ(MRA16_RAM) +AM_RANGE(0x208000, 0x20bfff) AM_READ(SMH_RAM) -AM_RANGE(0x218000, 0x219fff) AM_READ(MRA16_NOP) // K053250 #0 gfx ROM read (LSB) -AM_RANGE(0x220000, 0x221fff) AM_READ(MRA16_NOP) // K053250 #1 gfx ROM read (LSB) +AM_RANGE(0x218000, 0x219fff) AM_READ(SMH_NOP) // K053250 #0 gfx ROM read (LSB) +AM_RANGE(0x220000, 0x221fff) AM_READ(SMH_NOP) // K053250 #1 gfx ROM read (LSB) ADDRESS_MAP_END static ADDRESS_MAP_START( overdriv_writemem2, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_WRITE(MWA16_RAM) /* work RAM */ -AM_RANGE(0x0c0000, 0x0c1fff) AM_WRITE(MWA16_RAM) -AM_RANGE(0x100000, 0x10000f) AM_WRITE(MWA16_NOP) // K053250 #0 -AM_RANGE(0x108000, 0x10800f) AM_WRITE(MWA16_NOP) // K053250 #1 + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) /* work RAM */ +AM_RANGE(0x0c0000, 0x0c1fff) AM_WRITE(SMH_RAM) +AM_RANGE(0x100000, 0x10000f) AM_WRITE(SMH_NOP) // K053250 #0 +AM_RANGE(0x108000, 0x10800f) AM_WRITE(SMH_NOP) // K053250 #1 AM_RANGE(0x118000, 0x118fff) AM_WRITE(K053247_word_w) AM_RANGE(0x128000, 0x128001) AM_WRITE(cpuB_ctrl_w) /* enable K053247 ROM reading, plus something else */ AM_RANGE(0x130000, 0x130007) AM_WRITE(K053246_word_w) AM_RANGE(0x200000, 0x203fff) AM_WRITE(sharedram_w) -AM_RANGE(0x208000, 0x20bfff) AM_WRITE(MWA16_RAM) +AM_RANGE(0x208000, 0x20bfff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -326,8 +326,8 @@ static ADDRESS_MAP_START( overdriv_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0201, 0x0201) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x0400, 0x042f) AM_READ(K053260_0_r) AM_RANGE(0x0600, 0x062f) AM_READ(K053260_1_r) - AM_RANGE(0x0800, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0800, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( overdriv_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -335,8 +335,8 @@ static ADDRESS_MAP_START( overdriv_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0201, 0x0201) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x0400, 0x042f) AM_WRITE(K053260_0_w) AM_RANGE(0x0600, 0x062f) AM_WRITE(K053260_1_w) - AM_RANGE(0x0800, 0x0fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0800, 0x0fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c index 529eafa9524..02027407ec8 100644 --- a/src/mame/drivers/pacland.c +++ b/src/mame/drivers/pacland.c @@ -247,17 +247,17 @@ static WRITE8_HANDLER( pacland_irq_2_ctrl_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READWRITE(MRA8_RAM, pacland_videoram_w) AM_BASE(&pacland_videoram) - AM_RANGE(0x1000, 0x1fff) AM_READWRITE(MRA8_RAM, pacland_videoram2_w) AM_BASE(&pacland_videoram2) + AM_RANGE(0x0000, 0x0fff) AM_READWRITE(SMH_RAM, pacland_videoram_w) AM_BASE(&pacland_videoram) + AM_RANGE(0x1000, 0x1fff) AM_READWRITE(SMH_RAM, pacland_videoram2_w) AM_BASE(&pacland_videoram2) AM_RANGE(0x2000, 0x37ff) AM_RAM AM_BASE(&pacland_spriteram) 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(MRA8_BANK1) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_BANK1) AM_RANGE(0x6800, 0x6bff) AM_READWRITE(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) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(pacland_subreset_w) AM_RANGE(0x9000, 0x9fff) AM_WRITE(pacland_flipscreen_w) ADDRESS_MAP_END @@ -268,10 +268,10 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x13ff) AM_READWRITE(namcos1_cus30_r, namcos1_cus30_w) AM_BASE(&namco_wavedata) /* PSG device, shared RAM */ AM_RANGE(0x2000, 0x3fff) AM_WRITE(watchdog_reset_w) /* watchdog? */ AM_RANGE(0x4000, 0x7fff) AM_WRITE(pacland_irq_2_ctrl_w) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xd000, 0xd003) AM_READ(pacland_input_r) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index a6638fc9a00..f7d3abea574 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -798,22 +798,22 @@ static READ8_HANDLER( pacman_read_nop ) static ADDRESS_MAP_START( pacman_map, ADDRESS_SPACE_PROGRAM, 8 ) //A lot of games don't have an a15 at the cpu. Generally only games with a cpu daughter board can access the full 32k of romspace. AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROM - AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,MWA8_NOP) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,SMH_NOP) AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(interrupt_enable_w) AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_WRITE(pacman_sound_enable_w) - AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_leds_w) - AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_coin_lockout_global_w) + AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_leds_w) + AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_coin_lockout_global_w) AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w) AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs) - AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) + AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP) AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */ @@ -826,22 +826,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mspacman_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(1) - AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,MWA8_NOP) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,SMH_NOP) AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(interrupt_enable_w) AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_WRITE(pacman_sound_enable_w) - AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_leds_w) + AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_leds_w) AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(mspacman_activate_rom) /* Not actually, just handy */ // AM_WRITE(pacman_coin_lockout_global_w) AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w) AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs) - AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) + AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP) AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */ @@ -853,22 +853,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( woodpek_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,MWA8_NOP) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,SMH_NOP) AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(interrupt_enable_w) AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_WRITE(pacman_sound_enable_w) - AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_leds_w) - AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_coin_lockout_global_w) + AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_leds_w) + AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_coin_lockout_global_w) AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w) AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs) - AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) + AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP) AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */ @@ -880,9 +880,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( alibaba_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,MWA8_NOP) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,SMH_NOP) AM_RANGE(0x4c00, 0x4eef) AM_MIRROR(0xa000) AM_RAM AM_RANGE(0x4ef0, 0x4eff) AM_MIRROR(0xa000) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x4f00, 0x4fff) AM_MIRROR(0xa000) AM_RAM @@ -891,13 +891,13 @@ static ADDRESS_MAP_START( alibaba_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_lockout_global_w) AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w) AM_RANGE(0x5040, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(alibaba_sound_w) AM_BASE(&pacman_soundregs) /* the sound region is not contiguous */ - AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) /* actually at 5050-505f, here to point to free RAM */ - AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) /* actually at 5050-505f, here to point to free RAM */ + AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) + AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP) AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf00) AM_WRITE(pacman_sound_enable_w) AM_RANGE(0x50c1, 0x50c1) AM_MIRROR(0xaf00) AM_WRITE(pacman_flipscreen_w) AM_RANGE(0x50c2, 0x50c2) AM_MIRROR(0xaf00) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x50c3, 0x50ff) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) + AM_RANGE(0x50c3, 0x50ff) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_2_r) /* DSW1 */ @@ -912,21 +912,21 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dremshpr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) AM_RANGE(0x4800, 0x4fef) AM_MIRROR(0xa000) AM_RAM AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(interrupt_enable_w) // AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_WRITE(pacman_sound_enable_w) - AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) /* unknown */ + AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_leds_w) - AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_coin_lockout_global_w) + AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_leds_w) + AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_coin_lockout_global_w) AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w) // AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs) - AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) + AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP) AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */ @@ -938,22 +938,22 @@ 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(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,MWA8_NOP) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,SMH_NOP) AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(interrupt_enable_w) AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_WRITE(pacman_sound_enable_w) - AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_leds_w) - AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_coin_lockout_global_w) + AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_leds_w) + AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_coin_lockout_global_w) AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w) AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs) - AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) + AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP) AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */ @@ -964,21 +964,21 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vanvan_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) AM_RANGE(0x4800, 0x4fef) AM_MIRROR(0xa000) AM_RAM AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(interrupt_enable_w) AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_WRITE(vanvan_bgcolor_w) - AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x5004, 0x5004) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5005, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) /* always written together with 5001 */ + AM_RANGE(0x5004, 0x5004) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) + AM_RANGE(0x5005, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) /* always written together with 5001 */ AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w) - AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(MWA8_NOP) /* ??? toggled before reading 5000 */ + AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) + AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) + AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP) /* ??? toggled before reading 5000 */ AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */ @@ -988,25 +988,25 @@ static ADDRESS_MAP_START( vanvan_map, ADDRESS_SPACE_PROGRAM, 8 ) /* probably a leftover from development: the Sanritsu version */ /* writes the color lookup table here, while the Karateko version */ /* writes garbage. */ - AM_RANGE(0xb800, 0xb87f) AM_WRITE(MWA8_NOP) + AM_RANGE(0xb800, 0xb87f) AM_WRITE(SMH_NOP) 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(0x1000, 0x13ff) AM_MIRROR(0xe000) AM_WRITE(s2650games_colorram_w) AM_BASE(&colorram) AM_RANGE(0x1400, 0x141f) AM_MIRROR(0xe000) AM_WRITE(s2650games_scroll_w) - AM_RANGE(0x1420, 0x148f) AM_MIRROR(0xe000) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1490, 0x149f) AM_MIRROR(0xe000) AM_WRITE(MWA8_RAM) AM_BASE(&s2650games_spriteram) + AM_RANGE(0x1420, 0x148f) AM_MIRROR(0xe000) AM_WRITE(SMH_RAM) + AM_RANGE(0x1490, 0x149f) AM_MIRROR(0xe000) AM_WRITE(SMH_RAM) AM_BASE(&s2650games_spriteram) AM_RANGE(0x14a0, 0x14bf) AM_MIRROR(0xe000) AM_WRITE(s2650games_tilesbank_w) AM_BASE(&s2650games_tileram) - AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0xe000) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1500, 0x1502) AM_MIRROR(0xe000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0xe000) AM_WRITE(SMH_RAM) + AM_RANGE(0x1500, 0x1502) AM_MIRROR(0xe000) AM_WRITE(SMH_NOP) AM_RANGE(0x1503, 0x1503) AM_MIRROR(0xe000) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x1504, 0x1506) AM_MIRROR(0xe000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x1504, 0x1506) AM_MIRROR(0xe000) AM_WRITE(SMH_NOP) AM_RANGE(0x1507, 0x1507) AM_MIRROR(0xe000) AM_WRITE(pacman_coin_counter_w) - AM_RANGE(0x1508, 0x155f) AM_MIRROR(0xe000) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1560, 0x156f) AM_MIRROR(0xe000) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x1570, 0x157f) AM_MIRROR(0xe000) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1586, 0x1587) AM_MIRROR(0xe000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x1508, 0x155f) AM_MIRROR(0xe000) AM_WRITE(SMH_RAM) + AM_RANGE(0x1560, 0x156f) AM_MIRROR(0xe000) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x1570, 0x157f) AM_MIRROR(0xe000) AM_WRITE(SMH_RAM) + AM_RANGE(0x1586, 0x1587) AM_MIRROR(0xe000) AM_WRITE(SMH_NOP) AM_RANGE(0x15c0, 0x15c0) AM_MIRROR(0xe000) AM_WRITE(watchdog_reset_w) AM_RANGE(0x15c7, 0x15c7) AM_MIRROR(0xe000) AM_WRITE(porky_banking_w) AM_RANGE(0x1500, 0x1500) AM_MIRROR(0xe000) AM_READ(input_port_0_r) @@ -1014,7 +1014,7 @@ static ADDRESS_MAP_START( s2650games_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1580, 0x1580) AM_MIRROR(0xe000) AM_READ(input_port_2_r) AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0xe000) AM_WRITE(s2650games_videoram_w) AM_BASE(&videoram) AM_RANGE(0x1c00, 0x1fef) AM_MIRROR(0xe000) AM_RAM - AM_RANGE(0x1ff0, 0x1fff) AM_MIRROR(0xe000) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x1ff0, 0x1fff) AM_MIRROR(0xe000) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) 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) @@ -1023,8 +1023,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rocktrv2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x43ff) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4000, 0x43ff) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) AM_RANGE(0x4c00, 0x4fff) AM_RAM AM_RANGE(0x5000, 0x5000) AM_WRITE(interrupt_enable_w) AM_RANGE(0x5001, 0x5001) AM_WRITE(pacman_sound_enable_w) @@ -1050,20 +1050,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bigbucks_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x43ff) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4000, 0x43ff) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) AM_RANGE(0x4c00, 0x4fff) AM_RAM AM_RANGE(0x5000, 0x5000) AM_WRITE(interrupt_enable_w) AM_RANGE(0x5001, 0x5001) AM_WRITE(pacman_sound_enable_w) AM_RANGE(0x5003, 0x5003) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x5007, 0x5007) AM_WRITE(MWA8_NOP) /*?*/ + AM_RANGE(0x5007, 0x5007) AM_WRITE(SMH_NOP) /*?*/ AM_RANGE(0x5040, 0x505f) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs) AM_RANGE(0x50c0, 0x50c0) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x503f) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x5040, 0x507f) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0x5080, 0x50bf) AM_READ(input_port_2_r) /* DSW1 */ AM_RANGE(0x50c0, 0x50ff) AM_READ(input_port_3_r) /* DSW2 */ - AM_RANGE(0x5100, 0x5100) AM_WRITE(MWA8_NOP) /*?*/ + AM_RANGE(0x5100, 0x5100) AM_WRITE(SMH_NOP) /*?*/ AM_RANGE(0x6000, 0x6000) AM_WRITE(bigbucks_bank_w) AM_RANGE(0x8000, 0x9fff) AM_ROM ADDRESS_MAP_END @@ -1071,22 +1071,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mschamp_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(1) - AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,MWA8_NOP) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,SMH_NOP) AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(interrupt_enable_w) AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_WRITE(pacman_sound_enable_w) - AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_leds_w) - AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_coin_lockout_global_w) + AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_leds_w) + AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_coin_lockout_global_w) AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w) AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs) - AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) + AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP) AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */ @@ -1098,22 +1098,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( crushs_map, ADDRESS_SPACE_PROGRAM, 8 ) //A lot of games don't have an a15 at the cpu. Generally only games with a cpu daughter board can access the full 32k of romspace. AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROM - AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(MRA8_RAM,pacman_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,MWA8_NOP) + AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_READWRITE(SMH_RAM,pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READWRITE(pacman_read_nop,SMH_NOP) AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(interrupt_enable_w) AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_WRITE(pacman_sound_enable_w) - AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_leds_w) - AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(MWA8_NOP) // AM_WRITE(pacman_coin_lockout_global_w) + AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_leds_w) + AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITE(SMH_NOP) // AM_WRITE(pacman_coin_lockout_global_w) AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w) - AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) // doesn't use pacman sound hw - AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5040, 0x505f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) // doesn't use pacman sound hw + AM_RANGE(0x5060, 0x506f) AM_MIRROR(0xaf00) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP) + AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP) AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) @@ -1174,15 +1174,15 @@ static ADDRESS_MAP_START( bigbucks_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( drivfrcp_readport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00, 0x00) AM_READ(MRA8_NOP) + AM_RANGE(0x00, 0x00) AM_READ(SMH_NOP) AM_RANGE(0x01, 0x01) AM_READ(drivfrcp_port1_r) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(input_port_3_r) ADDRESS_MAP_END static ADDRESS_MAP_START( _8bpm_readport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00, 0x00) AM_READ(MRA8_NOP) + AM_RANGE(0x00, 0x00) AM_READ(SMH_NOP) AM_RANGE(0x01, 0x01) AM_READ(_8bpm_port1_r) - AM_RANGE(0xe0, 0xe0) AM_READ(MRA8_NOP) + AM_RANGE(0xe0, 0xe0) AM_READ(SMH_NOP) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(input_port_3_r) ADDRESS_MAP_END @@ -5381,7 +5381,7 @@ static READ8_HANDLER( cannonbp_protection_r ) static DRIVER_INIT( cannonbp ) { /* extra memory */ - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4800, 0x4bff, 0, 0, MRA8_BANK5, MWA8_BANK5); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4800, 0x4bff, 0, 0, SMH_BANK5, SMH_BANK5); memory_set_bankptr(5, auto_malloc(0x400)); /* protection? */ diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c index 1f5083bdde1..78de73f5e05 100644 --- a/src/mame/drivers/pandoras.c +++ b/src/mame/drivers/pandoras.c @@ -114,16 +114,16 @@ static WRITE8_HANDLER( pandoras_z80_irqtrigger_w ) static ADDRESS_MAP_START( pandoras_readmem_a, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1) /* Work RAM (Shared with CPU B) */ - AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(2) /* Color RAM (shared with CPU B) */ - AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(3) /* Video RAM (shared with CPU B) */ - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_ROM) /* space for diagnostic ROM */ - AM_RANGE(0x6000, 0x67ff) AM_READ(MRA8_RAM) AM_SHARE(4) /* Shared RAM with CPU B */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_SHARE(1) /* Work RAM (Shared with CPU B) */ + AM_RANGE(0x1000, 0x13ff) AM_READ(SMH_RAM) AM_SHARE(2) /* Color RAM (shared with CPU B) */ + AM_RANGE(0x1400, 0x17ff) AM_READ(SMH_RAM) AM_SHARE(3) /* Video RAM (shared with CPU B) */ + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_ROM) /* space for diagnostic ROM */ + AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM) AM_SHARE(4) /* Shared RAM with CPU B */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( pandoras_writemem_a, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) AM_BASE(&spriteram) /* Work RAM (Shared with CPU B) */ + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_SHARE(1) AM_BASE(&spriteram) /* Work RAM (Shared with CPU B) */ AM_RANGE(0x1000, 0x13ff) AM_WRITE(pandoras_cram_w) AM_SHARE(2) AM_BASE(&colorram) /* Color RAM (shared with CPU B) */ AM_RANGE(0x1400, 0x17ff) AM_WRITE(pandoras_vram_w) AM_SHARE(3) AM_BASE(&videoram) /* Video RAM (shared with CPU B) */ AM_RANGE(0x1800, 0x1807) AM_WRITE(pandoras_int_control_w) /* INT control */ @@ -132,47 +132,47 @@ static ADDRESS_MAP_START( pandoras_writemem_a, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1e00, 0x1e00) AM_WRITE(soundlatch_w) /* sound command to the Z80 */ AM_RANGE(0x2000, 0x2000) AM_WRITE(pandoras_cpub_irqtrigger_w) /* cause FIRQ on CPU B */ AM_RANGE(0x2001, 0x2001) AM_WRITE(watchdog_reset_w) /* watchdog reset */ - AM_RANGE(0x4000, 0x5fff) AM_WRITE(MWA8_ROM) /* see notes */ - AM_RANGE(0x6000, 0x67ff) AM_WRITE(MWA8_RAM) AM_SHARE(4) /* Shared RAM with CPU B */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_ROM) /* see notes */ + AM_RANGE(0x6000, 0x67ff) AM_WRITE(SMH_RAM) AM_SHARE(4) /* Shared RAM with CPU B */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( pandoras_readmem_b, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) AM_SHARE(1)/* Work RAM (Shared with CPU A) */ - AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) AM_SHARE(2) /* Color RAM (shared with CPU A) */ - AM_RANGE(0x1400, 0x17ff) AM_READ(MRA8_RAM) AM_SHARE(3) /* Video RAM (shared with CPU A) */ + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_SHARE(1)/* Work RAM (Shared with CPU A) */ + AM_RANGE(0x1000, 0x13ff) AM_READ(SMH_RAM) AM_SHARE(2) /* Color RAM (shared with CPU A) */ + AM_RANGE(0x1400, 0x17ff) AM_READ(SMH_RAM) AM_SHARE(3) /* Video RAM (shared with CPU A) */ AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) /* DIPSW #1 */ AM_RANGE(0x1a00, 0x1a00) AM_READ(input_port_3_r) /* COINSW */ AM_RANGE(0x1a01, 0x1a01) AM_READ(input_port_4_r) /* 1P inputs */ AM_RANGE(0x1a02, 0x1a02) AM_READ(input_port_5_r) /* 2P inputs */ AM_RANGE(0x1a03, 0x1a03) AM_READ(input_port_2_r) /* DIPSW #3 */ AM_RANGE(0x1c00, 0x1c00) AM_READ(input_port_1_r) /* DISPW #2 */ -// AM_RANGE(0x1e00, 0x1e00) AM_READ(MRA8_NOP) /* ??? seems to be important */ - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) AM_SHARE(4) /* Shared RAM with the CPU A */ - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ +// AM_RANGE(0x1e00, 0x1e00) AM_READ(SMH_NOP) /* ??? seems to be important */ + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_SHARE(4) /* Shared RAM with the CPU A */ + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( pandoras_writemem_b, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) AM_SHARE(1) /* Work RAM (Shared with CPU A) */ + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_SHARE(1) /* Work RAM (Shared with CPU A) */ AM_RANGE(0x1000, 0x13ff) AM_WRITE(pandoras_cram_w) AM_SHARE(2) /* Color RAM (shared with CPU A) */ AM_RANGE(0x1400, 0x17ff) AM_WRITE(pandoras_vram_w) AM_SHARE(3) /* Video RAM (shared with CPU A) */ AM_RANGE(0x1800, 0x1807) AM_WRITE(pandoras_int_control_w) /* INT control */ AM_RANGE(0x8000, 0x8000) AM_WRITE(watchdog_reset_w) /* watchdog reset */ AM_RANGE(0xa000, 0xa000) AM_WRITE(pandoras_cpua_irqtrigger_w)/* cause FIRQ on CPU A */ - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) AM_SHARE(4) /* Shared RAM with the CPU A */ - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_SHARE(4) /* Shared RAM with the CPU A */ + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( pandoras_readmem_snd, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) /* ROM */ - AM_RANGE(0x2000, 0x23ff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x2000, 0x23ff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0x6001, 0x6001) AM_READ(AY8910_read_port_0_r) /* AY-8910 */ ADDRESS_MAP_END static ADDRESS_MAP_START( pandoras_writemem_snd, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) /* ROM */ - AM_RANGE(0x2000, 0x23ff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_0_w)/* AY-8910 */ AM_RANGE(0x6002, 0x6002) AM_WRITE(AY8910_write_port_0_w) /* AY-8910 */ AM_RANGE(0x8000, 0x8000) AM_WRITE(pandoras_i8039_irqtrigger_w)/* cause INT on the 8039 */ @@ -180,11 +180,11 @@ static ADDRESS_MAP_START( pandoras_writemem_snd, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index 173cff20444..de96bdc36b5 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -97,7 +97,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( paradise_readport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_READ(MRA8_RAM ) // Palette + AM_RANGE(0x0000, 0x17ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x2010, 0x2010) AM_READ(OKIM6295_status_0_r ) // OKI 0 AM_RANGE(0x2030, 0x2030) AM_READ(OKIM6295_status_1_r ) // OKI 1 AM_RANGE(0x2020, 0x2020) AM_READ(input_port_0_r ) // DSW 1 @@ -105,7 +105,7 @@ static ADDRESS_MAP_START( paradise_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x2022, 0x2022) AM_READ(input_port_2_r ) // P1 AM_RANGE(0x2023, 0x2023) AM_READ(input_port_3_r ) // P2 AM_RANGE(0x2024, 0x2024) AM_READ(input_port_4_r ) // Coins - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_RAM ) // Pixmap + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_RAM ) // Pixmap ADDRESS_MAP_END static ADDRESS_MAP_START( paradise_writeport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index ef88f25cf5a..f4c945bf67d 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -130,7 +130,7 @@ static WRITE8_HANDLER( sound_arm_nmi_w ) static ADDRESS_MAP_START( parodius_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(bankedram_r) - AM_RANGE(0x0800, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0800, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x3f8c, 0x3f8c) AM_READ(input_port_0_r) AM_RANGE(0x3f8d, 0x3f8d) AM_READ(input_port_1_r) AM_RANGE(0x3f8e, 0x3f8e) AM_READ(input_port_4_r) @@ -141,13 +141,13 @@ static ADDRESS_MAP_START( parodius_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3fcc, 0x3fcd) AM_READ(parodius_sound_r) /* K053260 */ AM_RANGE(0x2000, 0x27ff) AM_READ(parodius_052109_053245_r) AM_RANGE(0x2000, 0x5fff) AM_READ(K052109_r) - AM_RANGE(0x6000, 0x9fff) AM_READ(MRA8_BANK1) /* banked ROM */ - AM_RANGE(0xa000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x6000, 0x9fff) AM_READ(SMH_BANK1) /* banked ROM */ + AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( parodius_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(bankedram_w) AM_BASE(&ram) - AM_RANGE(0x0800, 0x1fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0800, 0x1fff) AM_WRITE(SMH_RAM) AM_RANGE(0x3fa0, 0x3faf) AM_WRITE(K053244_w) AM_RANGE(0x3fb0, 0x3fbf) AM_WRITE(K053251_w) AM_RANGE(0x3fc0, 0x3fc0) AM_WRITE(parodius_3fc0_w) @@ -156,20 +156,20 @@ static ADDRESS_MAP_START( parodius_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3fcc, 0x3fcd) AM_WRITE(K053260_0_w) AM_RANGE(0x2000, 0x27ff) AM_WRITE(parodius_052109_053245_w) AM_RANGE(0x2000, 0x5fff) AM_WRITE(K052109_w) - AM_RANGE(0x6000, 0x9fff) AM_WRITE(MWA8_ROM) /* banked ROM */ - AM_RANGE(0xa000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x6000, 0x9fff) AM_WRITE(SMH_ROM) /* banked ROM */ + AM_RANGE(0xa000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( parodius_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xfc00, 0xfc2f) AM_READ(K053260_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( parodius_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w) diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c index df2e6cdac5f..ef9173b160d 100644 --- a/src/mame/drivers/pass.c +++ b/src/mame/drivers/pass.c @@ -122,18 +122,18 @@ static WRITE16_HANDLER ( pass_soundwrite ) /* todo: check all memory regions actually readable / read from */ static ADDRESS_MAP_START( pass_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) - AM_RANGE(0x210000, 0x213fff) AM_READ(MRA16_RAM) - AM_RANGE(0x220000, 0x2203ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) + AM_RANGE(0x210000, 0x213fff) AM_READ(SMH_RAM) + AM_RANGE(0x220000, 0x2203ff) AM_READ(SMH_RAM) AM_RANGE(0x230100, 0x230101) AM_READ(input_port_0_word_r) AM_RANGE(0x230200, 0x230201) AM_READ(input_port_1_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( pass_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200fff) AM_WRITE(pass_bg_videoram_w) AM_BASE(&pass_bg_videoram) // Background AM_RANGE(0x210000, 0x213fff) AM_WRITE(pass_fg_videoram_w) AM_BASE(&pass_fg_videoram) // Foreground AM_RANGE(0x220000, 0x2203ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) @@ -143,13 +143,13 @@ ADDRESS_MAP_END /* sound cpu */ static ADDRESS_MAP_START( pass_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( pass_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( pass_sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c index ee4c8c7fbc4..36b6da5f4e6 100644 --- a/src/mame/drivers/pastelg.c +++ b/src/mame/drivers/pastelg.c @@ -58,13 +58,13 @@ static READ8_HANDLER( pastelg_sndrom_r ) static ADDRESS_MAP_START( readmem_pastelg, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_pastelg, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_BASE(&nb1413m3_nvram) AM_SIZE(&nb1413m3_nvram_size) ADDRESS_MAP_END @@ -76,13 +76,13 @@ static ADDRESS_MAP_START( readport_pastelg, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r) AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r) AM_RANGE(0xc0, 0xc0) AM_READ(pastelg_sndrom_r) - AM_RANGE(0xd0, 0xd0) AM_READ(MRA8_NOP) // unknown + AM_RANGE(0xd0, 0xd0) AM_READ(SMH_NOP) // unknown AM_RANGE(0xe0, 0xe0) AM_READ(input_port_2_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_pastelg, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) -// AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) +// AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x90, 0x96) AM_WRITE(pastelg_blitter_w) diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c index 5790698b081..3bf8d4b0ed4 100644 --- a/src/mame/drivers/pbaction.c +++ b/src/mame/drivers/pbaction.c @@ -63,28 +63,28 @@ static UINT8 *work_ram; static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe07f) AM_READ(MRA8_RAM) - AM_RANGE(0xe400, 0xe5ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe07f) AM_READ(SMH_RAM) + AM_RANGE(0xe400, 0xe5ff) AM_READ(SMH_RAM) AM_RANGE(0xe600, 0xe600) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0xe601, 0xe601) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0xe602, 0xe602) AM_READ(input_port_2_r) /* IN2 */ AM_RANGE(0xe604, 0xe604) AM_READ(input_port_3_r) /* DSW1 */ AM_RANGE(0xe605, 0xe605) AM_READ(input_port_4_r) /* DSW2 */ - AM_RANGE(0xe606, 0xe606) AM_READ(MRA8_NOP) /* ??? */ + AM_RANGE(0xe606, 0xe606) AM_READ(SMH_NOP) /* ??? */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) AM_BASE(&work_ram) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_BASE(&work_ram) AM_RANGE(0xd000, 0xd3ff) AM_WRITE(pbaction_videoram2_w) AM_BASE(&pbaction_videoram2) AM_RANGE(0xd400, 0xd7ff) AM_WRITE(pbaction_colorram2_w) AM_BASE(&pbaction_colorram2) AM_RANGE(0xd800, 0xdbff) AM_WRITE(pbaction_videoram_w) AM_BASE(&videoram) AM_RANGE(0xdc00, 0xdfff) AM_WRITE(pbaction_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe000, 0xe07f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe000, 0xe07f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xe400, 0xe5ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) AM_RANGE(0xe600, 0xe600) AM_WRITE(interrupt_enable_w) AM_RANGE(0xe604, 0xe604) AM_WRITE(pbaction_flipscreen_w) @@ -93,15 +93,15 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xffff, 0xffff) AM_WRITE(MWA8_NOP) /* watchdog? */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xffff, 0xffff) AM_WRITE(SMH_NOP) /* watchdog? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c index aeb9b068ef6..09c70ebd06d 100644 --- a/src/mame/drivers/pcktgal.c +++ b/src/mame/drivers/pcktgal.c @@ -78,45 +78,45 @@ static READ8_HANDLER( pcktgal_adpcm_reset_r ) /***************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) AM_RANGE(0x1a00, 0x1a00) AM_READ(input_port_1_r) AM_RANGE(0x1c00, 0x1c00) AM_READ(input_port_2_r) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK2) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_BANK1) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK2) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0fff) AM_WRITE(pcktgal_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x1000, 0x11ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x1000, 0x11ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x1801, 0x1801) AM_WRITE(pcktgal_flipscreen_w) /* 1800 - 0x181f are unused BAC-06 registers, see video/dec0.c */ AM_RANGE(0x1a00, 0x1a00) AM_WRITE(pcktgal_sound_w) AM_RANGE(0x1c00, 0x1c00) AM_WRITE(pcktgal_bank_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) AM_RANGE(0x3400, 0x3400) AM_READ(pcktgal_adpcm_reset_r) /* ? not sure */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK3) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK3) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0x1800, 0x1800) AM_WRITE(pcktgal_adpcm_data_w) /* ADPCM data for the MSM5205 chip */ AM_RANGE(0x2000, 0x2000) AM_WRITE(pcktgal_sound_bank_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /***************************************************************************/ diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c index 8b100022d67..16bffc85d8b 100644 --- a/src/mame/drivers/pengo.c +++ b/src/mame/drivers/pengo.c @@ -97,22 +97,22 @@ static ADDRESS_MAP_START( pengo_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x83ff) AM_READWRITE(MRA8_RAM, pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) /* video and color RAM, scratchpad RAM, sprite codes */ - AM_RANGE(0x8400, 0x87ff) AM_READWRITE(MRA8_RAM, pacman_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x8000, 0x83ff) AM_READWRITE(SMH_RAM, pacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) /* video and color RAM, scratchpad RAM, sprite codes */ + AM_RANGE(0x8400, 0x87ff) AM_READWRITE(SMH_RAM, pacman_colorram_w) AM_BASE(&colorram) AM_RANGE(0x8800, 0x8fef) AM_RAM AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x9000, 0x901f) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs) - AM_RANGE(0x9020, 0x902f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x9020, 0x902f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_RANGE(0x9000, 0x903f) AM_READ(input_port_3_r) /* DSW1 */ AM_RANGE(0x9040, 0x907f) AM_READ(input_port_2_r) /* DSW0 */ AM_RANGE(0x9040, 0x9040) AM_WRITE(interrupt_enable_w) AM_RANGE(0x9041, 0x9041) AM_WRITE(pacman_sound_enable_w) AM_RANGE(0x9042, 0x9042) AM_WRITE(pengo_palettebank_w) AM_RANGE(0x9043, 0x9043) AM_WRITE(pacman_flipscreen_w) - AM_RANGE(0x9044, 0x9045) AM_WRITE(MWA8_NOP) /* coin counters */ + AM_RANGE(0x9044, 0x9045) AM_WRITE(SMH_NOP) /* coin counters */ AM_RANGE(0x9046, 0x9046) AM_WRITE(pengo_colortablebank_w) AM_RANGE(0x9047, 0x9047) AM_WRITE(pengo_gfxbank_w) - AM_RANGE(0x9070, 0x9070) AM_WRITE(MWA8_NOP) + AM_RANGE(0x9070, 0x9070) AM_WRITE(SMH_NOP) AM_RANGE(0x9080, 0x90bf) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0x90c0, 0x90ff) AM_READ(input_port_0_r) /* IN0 */ ADDRESS_MAP_END @@ -120,11 +120,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jrpacmbl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x87ff) AM_READWRITE(MRA8_RAM, jrpacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x8000, 0x87ff) AM_READWRITE(SMH_RAM, jrpacman_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x8800, 0x8fef) AM_RAM AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x9000, 0x901f) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs) - AM_RANGE(0x9020, 0x902f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x9020, 0x902f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_RANGE(0x9030, 0x9030) AM_WRITE(jrpacman_scroll_w) AM_RANGE(0x9040, 0x904f) AM_READ(input_port_2_r) /* DSW1 */ AM_RANGE(0x9040, 0x9040) AM_WRITE(interrupt_enable_w) @@ -135,7 +135,7 @@ static ADDRESS_MAP_START( jrpacmbl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9045, 0x9045) AM_WRITE(jrpacman_spritebank_w) AM_RANGE(0x9046, 0x9046) AM_WRITE(pengo_colortablebank_w) AM_RANGE(0x9047, 0x9047) AM_WRITE(jrpacman_charbank_w) - AM_RANGE(0x9070, 0x9070) AM_WRITE(MWA8_NOP) + AM_RANGE(0x9070, 0x9070) AM_WRITE(SMH_NOP) AM_RANGE(0x9080, 0x90bf) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0x90c0, 0x90ff) AM_READ(input_port_0_r) /* IN0 */ ADDRESS_MAP_END diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index ca6718f9b73..5fa4be63a20 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -571,10 +571,10 @@ static ADDRESS_MAP_START( pgm_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */ - AM_RANGE(0x900000, 0x903fff) AM_READWRITE(MRA16_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ - AM_RANGE(0x904000, 0x905fff) AM_READWRITE(MRA16_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ + AM_RANGE(0x900000, 0x903fff) AM_READWRITE(SMH_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ + AM_RANGE(0x904000, 0x905fff) AM_READWRITE(SMH_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram) - AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */ AM_RANGE(0xc00002, 0xc00003) AM_READWRITE(soundlatch_word_r, m68k_l1_w) @@ -603,10 +603,10 @@ static ADDRESS_MAP_START( killbld_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */ - AM_RANGE(0x900000, 0x903fff) AM_READWRITE(MRA16_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ - AM_RANGE(0x904000, 0x905fff) AM_READWRITE(MRA16_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ + AM_RANGE(0x900000, 0x903fff) AM_READWRITE(SMH_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ + AM_RANGE(0x904000, 0x905fff) AM_READWRITE(SMH_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram) - AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */ AM_RANGE(0xc00002, 0xc00003) AM_READWRITE(soundlatch_word_r, m68k_l1_w) @@ -635,10 +635,10 @@ static ADDRESS_MAP_START( olds_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */ - AM_RANGE(0x900000, 0x903fff) AM_READWRITE(MRA16_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ - AM_RANGE(0x904000, 0x905fff) AM_READWRITE(MRA16_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ + AM_RANGE(0x900000, 0x903fff) AM_READWRITE(SMH_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ + AM_RANGE(0x904000, 0x905fff) AM_READWRITE(SMH_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram) - AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */ AM_RANGE(0xc00002, 0xc00003) AM_READWRITE(soundlatch_word_r, m68k_l1_w) @@ -664,10 +664,10 @@ static ADDRESS_MAP_START( kov2_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */ - AM_RANGE(0x900000, 0x903fff) AM_READWRITE(MRA16_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ - AM_RANGE(0x904000, 0x905fff) AM_READWRITE(MRA16_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ + AM_RANGE(0x900000, 0x903fff) AM_READWRITE(SMH_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ + AM_RANGE(0x904000, 0x905fff) AM_READWRITE(SMH_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram) - AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */ AM_RANGE(0xc00002, 0xc00003) AM_READWRITE(soundlatch_word_r, m68k_l1_w) @@ -697,10 +697,10 @@ static ADDRESS_MAP_START( cavepgm_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */ - AM_RANGE(0x900000, 0x903fff) AM_READWRITE(MRA16_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ - AM_RANGE(0x904000, 0x905fff) AM_READWRITE(MRA16_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ + AM_RANGE(0x900000, 0x903fff) AM_READWRITE(SMH_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ + AM_RANGE(0x904000, 0x905fff) AM_READWRITE(SMH_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram) - AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */ AM_RANGE(0xc00002, 0xc00003) AM_READWRITE(soundlatch_word_r, m68k_l1_w) @@ -798,10 +798,10 @@ static ADDRESS_MAP_START( kovsh_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */ - AM_RANGE(0x900000, 0x903fff) AM_READWRITE(MRA16_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ - AM_RANGE(0x904000, 0x905fff) AM_READWRITE(MRA16_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ + AM_RANGE(0x900000, 0x903fff) AM_READWRITE(SMH_RAM, pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */ + AM_RANGE(0x904000, 0x905fff) AM_READWRITE(SMH_RAM, pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */ AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram) - AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xa00000, 0xa011ff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */ AM_RANGE(0xc00002, 0xc00003) AM_READWRITE(soundlatch_word_r, m68k_l1_w) @@ -832,7 +832,7 @@ static ADDRESS_MAP_START( kovsh_arm7_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x10000000, 0x100003ff) AM_RAM // main ram for asic? AM_RANGE(0x40000000, 0x40000003) AM_READ(kovsh_arm7_protlatch_r) AM_WRITE(kovsh_arm7_protlatch_w) - AM_RANGE(0x40000008, 0x4000000b) AM_WRITE(MWA32_NOP) // ? + AM_RANGE(0x40000008, 0x4000000b) AM_WRITE(SMH_NOP) // ? AM_RANGE(0x4000000c, 0x4000000f) AM_READ(kovsh_arm7_unk_r) AM_RANGE(0x50800000, 0x5080003f) AM_READWRITE(arm7_shareram_r, arm7_shareram_w) AM_BASE(&arm7_shareram) AM_RANGE(0x50000000, 0x500003ff) AM_RAM // uploads xor table to decrypt 68k rom here diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c index 64d52a429d5..4d689da191f 100644 --- a/src/mame/drivers/phoenix.c +++ b/src/mame/drivers/phoenix.c @@ -46,7 +46,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(MRA8_BANK1, phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */ + AM_RANGE(0x4000, 0x4fff) AM_READWRITE(SMH_BANK1, 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_WRITE(phoenix_sound_control_a_w) @@ -57,7 +57,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(MRA8_BANK1, phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */ + AM_RANGE(0x4000, 0x4fff) AM_READWRITE(SMH_BANK1, 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) @@ -68,7 +68,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(MRA8_BANK1, phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */ + AM_RANGE(0x4000, 0x4fff) AM_READWRITE(SMH_BANK1, 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_WRITE(AY8910_control_port_0_w) diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c index 24c6fdfd14f..2c760c45284 100644 --- a/src/mame/drivers/pingpong.c +++ b/src/mame/drivers/pingpong.c @@ -85,9 +85,9 @@ static INTERRUPT_GEN( pingpong_interrupt ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x97ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x97ff) AM_READ(SMH_RAM) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_0_r) AM_RANGE(0xa880, 0xa880) AM_READ(input_port_1_r) AM_RANGE(0xa900, 0xa900) AM_READ(input_port_2_r) @@ -95,14 +95,14 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x83ff) AM_WRITE(pingpong_colorram_w) AM_BASE(&colorram) AM_RANGE(0x8400, 0x87ff) AM_WRITE(pingpong_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x9000, 0x9002) AM_WRITE(MWA8_RAM) - AM_RANGE(0x9003, 0x9052) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x9053, 0x97ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9000, 0x9002) AM_WRITE(SMH_RAM) + AM_RANGE(0x9003, 0x9052) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x9053, 0x97ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(coin_w) /* coin counters + irq enables */ - AM_RANGE(0xa200, 0xa200) AM_WRITE(MWA8_NOP) /* SN76496 data latch */ + AM_RANGE(0xa200, 0xa200) AM_WRITE(SMH_NOP) /* SN76496 data latch */ AM_RANGE(0xa400, 0xa400) AM_WRITE(SN76496_0_w) /* trigger read */ AM_RANGE(0xa600, 0xa600) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -123,7 +123,7 @@ static ADDRESS_MAP_START( merlinmm_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa080, 0xa080) AM_READ(input_port_1_r) AM_RANGE(0xa100, 0xa100) AM_READ(input_port_2_r) AM_RANGE(0xa180, 0xa180) AM_READ(input_port_3_r) - AM_RANGE(0xa200, 0xa200) AM_WRITE(MWA8_NOP) /* SN76496 data latch */ + AM_RANGE(0xa200, 0xa200) AM_WRITE(SMH_NOP) /* SN76496 data latch */ AM_RANGE(0xa400, 0xa400) AM_WRITE(SN76496_0_w) /* trigger read */ AM_RANGE(0xa600, 0xa600) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -597,14 +597,14 @@ static DRIVER_INIT( cashquiz ) memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4001, 0x4001, 0, 0, cashquiz_question_bank_low_w); // 8 independents banks for questions - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5000, 0x50ff, 0, 0, MRA8_BANK1); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5100, 0x51ff, 0, 0, MRA8_BANK2); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5200, 0x52ff, 0, 0, MRA8_BANK3); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5300, 0x53ff, 0, 0, MRA8_BANK4); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5400, 0x54ff, 0, 0, MRA8_BANK5); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5500, 0x55ff, 0, 0, MRA8_BANK6); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5600, 0x56ff, 0, 0, MRA8_BANK7); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5700, 0x57ff, 0, 0, MRA8_BANK8); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5000, 0x50ff, 0, 0, SMH_BANK1); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5100, 0x51ff, 0, 0, SMH_BANK2); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5200, 0x52ff, 0, 0, SMH_BANK3); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5300, 0x53ff, 0, 0, SMH_BANK4); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5400, 0x54ff, 0, 0, SMH_BANK5); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5500, 0x55ff, 0, 0, SMH_BANK6); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5600, 0x56ff, 0, 0, SMH_BANK7); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5700, 0x57ff, 0, 0, SMH_BANK8); // setup default banks for(i = 0; i < 8; i++) diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 98ec322db81..bea2b594fbd 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -228,7 +228,7 @@ 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(0xc000, 0xcfff) AM_READWRITE(MRA8_RAM, paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE(&paletteram) + AM_RANGE(0xc000, 0xcfff) AM_READWRITE(SMH_RAM, paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE(&paletteram) AM_RANGE(0xd000, 0xffff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END @@ -744,8 +744,8 @@ static DRIVER_INIT( pipedrm ) /* sprite RAM lives at the end of palette RAM */ spriteram = &paletteram[0xc00]; spriteram_size = 0x400; - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xcc00, 0xcfff, 0, 0, MRA8_BANK3); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xcc00, 0xcfff, 0, 0, MWA8_BANK3); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xcc00, 0xcfff, 0, 0, SMH_BANK3); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xcc00, 0xcfff, 0, 0, SMH_BANK3); memory_set_bankptr(3, spriteram); } diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 469b302dddb..0f62eff8e14 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -217,8 +217,8 @@ static WRITE8_HANDLER(protection_w) static ADDRESS_MAP_START( cpu0_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x97ff) AM_READWRITE(MRA8_RAM, vram1_w) AM_BASE(&vram1) - AM_RANGE(0x9800, 0xa7ff) AM_READWRITE(MRA8_RAM, vram2_w) AM_BASE(&vram2) + AM_RANGE(0x8800, 0x97ff) AM_READWRITE(SMH_RAM, vram1_w) AM_BASE(&vram1) + AM_RANGE(0x9800, 0xa7ff) AM_READWRITE(SMH_RAM, vram2_w) AM_BASE(&vram2) AM_RANGE(0xb800, 0xb803) AM_READWRITE(ppi8255_0_r, ppi8255_0_w) AM_RANGE(0xb810, 0xb813) AM_READWRITE(ppi8255_1_r, ppi8255_1_w) AM_RANGE(0xb830, 0xb830) AM_NOP diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c index 744feff1667..9b18af25a5e 100644 --- a/src/mame/drivers/pirates.c +++ b/src/mame/drivers/pirates.c @@ -178,30 +178,30 @@ static READ16_HANDLER( pirates_in1_r ) /* Memory Maps */ static ADDRESS_MAP_START( pirates_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r) AM_RANGE(0x400000, 0x400001) AM_READ(pirates_in1_r) -// AM_RANGE(0x500000, 0x5007ff) AM_READ(MRA16_RAM) - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM) -// AM_RANGE(0x900000, 0x903fff) AM_READ(MRA16_RAM) +// AM_RANGE(0x500000, 0x5007ff) AM_READ(SMH_RAM) + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM) +// AM_RANGE(0x900000, 0x903fff) AM_READ(SMH_RAM) AM_RANGE(0xa00000, 0xa00001) AM_READ(OKIM6295_status_0_lsb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( pirates_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) // main ram - AM_RANGE(0x500000, 0x5007ff) AM_WRITE(MWA16_RAM) AM_BASE(&pirates_spriteram) -// AM_RANGE(0x500800, 0x50080f) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) // main ram + AM_RANGE(0x500000, 0x5007ff) AM_WRITE(SMH_RAM) AM_BASE(&pirates_spriteram) +// AM_RANGE(0x500800, 0x50080f) AM_WRITE(SMH_RAM) AM_RANGE(0x600000, 0x600001) AM_WRITE(pirates_out_w) - AM_RANGE(0x700000, 0x700001) AM_WRITE(MWA16_RAM) AM_BASE(&pirates_scroll) // scroll reg + AM_RANGE(0x700000, 0x700001) AM_WRITE(SMH_RAM) AM_BASE(&pirates_scroll) // scroll reg AM_RANGE(0x800000, 0x803fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x900000, 0x90017f) AM_WRITE(MWA16_RAM) // more of tilemaps ? + AM_RANGE(0x900000, 0x90017f) AM_WRITE(SMH_RAM) // more of tilemaps ? AM_RANGE(0x900180, 0x90137f) AM_WRITE(pirates_tx_tileram_w) AM_BASE(&pirates_tx_tileram) AM_RANGE(0x901380, 0x902a7f) AM_WRITE(pirates_fg_tileram_w) AM_BASE(&pirates_fg_tileram) -// AM_RANGE(0x902580, 0x902a7f) AM_WRITE(MWA16_RAM) // more of tilemaps ? +// AM_RANGE(0x902580, 0x902a7f) AM_WRITE(SMH_RAM) // more of tilemaps ? AM_RANGE(0x902a80, 0x904187) AM_WRITE(pirates_bg_tileram_w) AM_BASE(&pirates_bg_tileram) -// AM_RANGE(0x903c80, 0x904187) AM_WRITE(MWA16_RAM) // more of tilemaps ? +// AM_RANGE(0x903c80, 0x904187) AM_WRITE(SMH_RAM) // more of tilemaps ? AM_RANGE(0xa00000, 0xa00001) AM_WRITE(OKIM6295_data_0_lsb_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c index 57425523ace..15997643f11 100644 --- a/src/mame/drivers/pitnrun.c +++ b/src/mame/drivers/pitnrun.c @@ -120,11 +120,11 @@ static WRITE8_HANDLER(pitnrun_vflip_w) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8800, 0x8fff) AM_READ(pitnrun_videoram_r) AM_RANGE(0x9000, 0x9fff) AM_READ(pitnrun_videoram2_r) - AM_RANGE(0xa000, 0xa0ff) AM_READ(MRA8_RAM) + AM_RANGE(0xa000, 0xa0ff) AM_READ(SMH_RAM) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_0_r) AM_RANGE(0xb000, 0xb000) AM_READ(input_port_1_r) AM_RANGE(0xb800, 0xb800) AM_READ(input_port_2_r) @@ -134,21 +134,21 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8fff) AM_WRITE(pitnrun_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x9000, 0x9fff) AM_WRITE(pitnrun_videoram2_w) AM_BASE(&pitnrun_videoram2) - AM_RANGE(0xa000, 0xa0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xa800, 0xa807) AM_WRITE(MWA8_NOP) /* Analog Sound */ + AM_RANGE(0xa000, 0xa0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xa800, 0xa807) AM_WRITE(SMH_NOP) /* Analog Sound */ AM_RANGE(0xb000, 0xb000) AM_WRITE(nmi_enable_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(pitnrun_color_select_w) - AM_RANGE(0xb004, 0xb004) AM_WRITE(MWA8_NOP)/* COLOR SEL 2 - not used ?*/ + AM_RANGE(0xb004, 0xb004) AM_WRITE(SMH_NOP)/* COLOR SEL 2 - not used ?*/ AM_RANGE(0xb005, 0xb005) AM_WRITE(pitnrun_char_bank_select) AM_RANGE(0xb006, 0xb006) AM_WRITE(pitnrun_hflip_w) AM_RANGE(0xb007, 0xb007) AM_WRITE(pitnrun_vflip_w) AM_RANGE(0xb800, 0xb800) AM_WRITE(soundlatch_w) AM_RANGE(0xc800, 0xc801) AM_WRITE(pitnrun_scroll_w) - AM_RANGE(0xc802, 0xc802) AM_WRITE(MWA8_NOP)/* VP(VF?)MCV - not used ?*/ + AM_RANGE(0xc802, 0xc802) AM_WRITE(SMH_NOP)/* VP(VF?)MCV - not used ?*/ AM_RANGE(0xc804, 0xc804) AM_WRITE(pitnrun_mcu_data_w) AM_RANGE(0xc805, 0xc805) AM_WRITE(pitnrun_h_heed_w) AM_RANGE(0xc806, 0xc806) AM_WRITE(pitnrun_v_heed_w) @@ -162,9 +162,9 @@ static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x8d, 0x8d) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x8e, 0x8e) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x8f, 0x8f) AM_WRITE(AY8910_write_port_0_w) - AM_RANGE(0x90, 0x96) AM_WRITE(MWA8_NOP) - AM_RANGE(0x97, 0x97) AM_WRITE(MWA8_NOP) - AM_RANGE(0x98, 0x98) AM_WRITE(MWA8_NOP) + AM_RANGE(0x90, 0x96) AM_WRITE(SMH_NOP) + AM_RANGE(0x97, 0x97) AM_WRITE(SMH_NOP) + AM_RANGE(0x98, 0x98) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -174,14 +174,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_ROM) - AM_RANGE(0x3800, 0x3bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM) + AM_RANGE(0x3800, 0x3bff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x3800, 0x3bff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x3800, 0x3bff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -189,8 +189,8 @@ static ADDRESS_MAP_START( mcu_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(pitnrun_68705_portA_r) AM_RANGE(0x0001, 0x0001) AM_READ(pitnrun_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(pitnrun_68705_portC_r) - AM_RANGE(0x0003, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0003, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -198,8 +198,8 @@ static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7ff) AM_RANGE(0x0000, 0x0000) AM_WRITE(pitnrun_68705_portA_w) AM_RANGE(0x0001, 0x0001) AM_WRITE(pitnrun_68705_portB_w) - AM_RANGE(0x0003, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0003, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static INPUT_PORTS_START( pitnrun ) diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index b518dcc5159..c2766f1e507 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -82,10 +82,10 @@ static WRITE16_HANDLER(pktgaldx_oki_bank_w) static ADDRESS_MAP_START( pktgaldx_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) - AM_RANGE(0x102000, 0x102fff) AM_READ(MRA16_RAM) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x110000, 0x1107ff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x112000, 0x1127ff) AM_READ(MRA16_RAM) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) + AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) + AM_RANGE(0x110000, 0x1107ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x112000, 0x1127ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x130000, 0x130fff) AM_RAM AM_WRITE(deco16_nonbuffered_palette_w) AM_BASE(&paletteram16) @@ -95,7 +95,7 @@ static ADDRESS_MAP_START( pktgaldx_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x150000, 0x15000f) AM_WRITE(OKIM6295_data_1_lsb_w) AM_RANGE(0x150006, 0x150007) AM_READ(OKIM6295_status_1_lsb_r) - AM_RANGE(0x161800, 0x16180f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x161800, 0x16180f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x164800, 0x164801) AM_WRITE(pktgaldx_oki_bank_w) AM_RANGE(0x167800, 0x167fff) AM_READ(deco16_104_pktgaldx_prot_r) AM_WRITE(deco16_104_pktgaldx_prot_w) AM_BASE(&deco16_prot_ram) AM_RANGE(0x170000, 0x17ffff) AM_RAM @@ -138,17 +138,17 @@ static READ16_HANDLER( pckgaldx_protection_r ) static ADDRESS_MAP_START( pktgaldb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) - AM_RANGE(0x102000, 0x102fff) AM_READ(MRA16_RAM) - AM_RANGE(0x130000, 0x130fff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x123fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) + AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM) + AM_RANGE(0x130000, 0x130fff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x123fff) AM_READ(SMH_RAM) AM_RANGE(0x140006, 0x140007) AM_READ(pckgaldx_unknown_r) // sound? AM_RANGE(0x150006, 0x150007) AM_READ(pckgaldx_unknown_r) // sound? -// AM_RANGE(0x160000, 0x167fff) AM_READ(MRA16_RAM) - AM_RANGE(0x170000, 0x17ffff) AM_READ(MRA16_RAM) +// AM_RANGE(0x160000, 0x167fff) AM_READ(SMH_RAM) + AM_RANGE(0x170000, 0x17ffff) AM_READ(SMH_RAM) /* cpu #0 (PC=0000A0DE): unmapped program memory word read from 00167DB2 & FFFF @@ -173,36 +173,36 @@ cpu #0 (PC=0000923C): unmapped program memory word read from 00167DB2 & 00FF AM_RANGE(0x167d10, 0x167d11) AM_READ(pckgaldx_protection_r) // check code at 6ea AM_RANGE(0x167d1a, 0x167d1b) AM_READ(pckgaldx_protection_r) // check code at 7C4 - AM_RANGE(0x300000, 0x30000f) AM_READ(MRA16_RAM) // ?? + AM_RANGE(0x300000, 0x30000f) AM_READ(SMH_RAM) // ?? - AM_RANGE(0x330000, 0x330bff) AM_READ(MRA16_RAM) + AM_RANGE(0x330000, 0x330bff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( pktgaldb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x100fff) AM_WRITE(MWA16_RAM) AM_BASE(&pcktgaldb_fgram) // fgram on original? - AM_RANGE(0x102000, 0x102fff) AM_WRITE(MWA16_RAM) // bgram on original? - AM_RANGE(0x120000, 0x123fff) AM_WRITE(MWA16_RAM)AM_BASE(&pcktgaldb_sprites) - AM_RANGE(0x130000, 0x130fff) AM_WRITE(MWA16_RAM) // palette on original? - AM_RANGE(0x140000, 0x140003) AM_WRITE(MWA16_RAM) // sound? - AM_RANGE(0x140008, 0x140009) AM_WRITE(MWA16_RAM) // sound? - AM_RANGE(0x150000, 0x150003) AM_WRITE(MWA16_RAM) // sound? + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x100fff) AM_WRITE(SMH_RAM) AM_BASE(&pcktgaldb_fgram) // fgram on original? + AM_RANGE(0x102000, 0x102fff) AM_WRITE(SMH_RAM) // bgram on original? + AM_RANGE(0x120000, 0x123fff) AM_WRITE(SMH_RAM)AM_BASE(&pcktgaldb_sprites) + AM_RANGE(0x130000, 0x130fff) AM_WRITE(SMH_RAM) // palette on original? + AM_RANGE(0x140000, 0x140003) AM_WRITE(SMH_RAM) // sound? + AM_RANGE(0x140008, 0x140009) AM_WRITE(SMH_RAM) // sound? + AM_RANGE(0x150000, 0x150003) AM_WRITE(SMH_RAM) // sound? /* or maybe protection writes go to sound ... */ - AM_RANGE(0x160000, 0x167fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x160000, 0x167fff) AM_WRITE(SMH_RAM) //cpu #0 (PC=00009246): unmapped program memory word write to 00167942 = 0000 & FFFF //cpu #0 (PC=0000924E): unmapped program memory word write to = 0000 & FFFF - AM_RANGE(0x16500a, 0x16500b) AM_WRITE(MWA16_RAM) - AM_RANGE(0x166800, 0x166801) AM_WRITE(MWA16_RAM) - AM_RANGE(0x167942, 0x167943) AM_WRITE(MWA16_RAM) + AM_RANGE(0x16500a, 0x16500b) AM_WRITE(SMH_RAM) + AM_RANGE(0x166800, 0x166801) AM_WRITE(SMH_RAM) + AM_RANGE(0x167942, 0x167943) AM_WRITE(SMH_RAM) - AM_RANGE(0x170000, 0x17ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x170000, 0x17ffff) AM_WRITE(SMH_RAM) - AM_RANGE(0x300000, 0x30000f) AM_WRITE(MWA16_RAM) + AM_RANGE(0x300000, 0x30000f) AM_WRITE(SMH_RAM) - AM_RANGE(0x330000, 0x330bff) AM_WRITE(MWA16_RAM) AM_WRITE(paletteram16_xRGB_w) AM_BASE(&paletteram16) // extra colours? + AM_RANGE(0x330000, 0x330bff) AM_WRITE(SMH_RAM) AM_WRITE(paletteram16_xRGB_w) AM_BASE(&paletteram16) // extra colours? ADDRESS_MAP_END /**********************************************************************************/ diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index 6590771d5d1..c1eb1168bba 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -278,9 +278,9 @@ static ADDRESS_MAP_START( bigtwin_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x304000, 0x304001) AM_NOP /* watchdog? irq ack? */ AM_RANGE(0x440000, 0x4403ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x500000, 0x500fff) AM_WRITE(wbeachvl_fgvideoram_w) AM_BASE(&wbeachvl_videoram2) - AM_RANGE(0x501000, 0x501fff) AM_WRITE(MWA16_NOP) /* unused RAM? */ + AM_RANGE(0x501000, 0x501fff) AM_WRITE(SMH_NOP) /* unused RAM? */ AM_RANGE(0x502000, 0x503fff) AM_WRITE(wbeachvl_txvideoram_w) AM_BASE(&wbeachvl_videoram1) - AM_RANGE(0x504000, 0x50ffff) AM_WRITE(MWA16_NOP) /* unused RAM? */ + AM_RANGE(0x504000, 0x50ffff) AM_WRITE(SMH_NOP) /* unused RAM? */ AM_RANGE(0x510000, 0x51000b) AM_WRITE(bigtwin_scroll_w) AM_RANGE(0x51000c, 0x51000d) AM_WRITENOP /* always 3? */ AM_RANGE(0x600000, 0x67ffff) AM_RAM AM_BASE(&bigtwin_bgvideoram) @@ -299,9 +299,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( wbeachvl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x500000, 0x501fff) AM_READWRITE(MRA16_RAM, wbeachvl_bgvideoram_w) AM_BASE(&wbeachvl_videoram3) - AM_RANGE(0x504000, 0x505fff) AM_READWRITE(MRA16_RAM, wbeachvl_fgvideoram_w) AM_BASE(&wbeachvl_videoram2) - AM_RANGE(0x508000, 0x509fff) AM_READWRITE(MRA16_RAM, wbeachvl_txvideoram_w) AM_BASE(&wbeachvl_videoram1) + AM_RANGE(0x500000, 0x501fff) AM_READWRITE(SMH_RAM, wbeachvl_bgvideoram_w) AM_BASE(&wbeachvl_videoram3) + AM_RANGE(0x504000, 0x505fff) AM_READWRITE(SMH_RAM, wbeachvl_fgvideoram_w) AM_BASE(&wbeachvl_videoram2) + AM_RANGE(0x508000, 0x509fff) AM_READWRITE(SMH_RAM, wbeachvl_txvideoram_w) AM_BASE(&wbeachvl_videoram1) AM_RANGE(0x50f000, 0x50ffff) AM_RAM AM_BASE(&wbeachvl_rowscroll) AM_RANGE(0x510000, 0x51000b) AM_WRITE(wbeachvl_scroll_w) AM_RANGE(0x51000c, 0x51000d) AM_WRITENOP /* 2 and 3 */ @@ -313,7 +313,7 @@ static ADDRESS_MAP_START( wbeachvl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x710018, 0x710019) AM_READ(input_port_3_word_r) AM_RANGE(0x71001a, 0x71001b) AM_READ(input_port_4_word_r) // AM_RANGE(0x71001c, 0x71001d) AM_READ(playmark_snd_status???) -// AM_RANGE(0x71001e, 0x71001f) AM_WRITE(MWA16_NOP)//playmark_snd_command_w }, +// AM_RANGE(0x71001e, 0x71001f) AM_WRITE(SMH_NOP)//playmark_snd_command_w }, AM_RANGE(0x780000, 0x780fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -340,9 +340,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hotmind_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x103fff) AM_READWRITE(MRA16_RAM, hrdtimes_bgvideoram_w) AM_BASE(&wbeachvl_videoram3) - AM_RANGE(0x104000, 0x107fff) AM_READWRITE(MRA16_RAM, hrdtimes_fgvideoram_w) AM_BASE(&wbeachvl_videoram2) - AM_RANGE(0x108000, 0x10ffff) AM_READWRITE(MRA16_RAM, hrdtimes_txvideoram_w) AM_BASE(&wbeachvl_videoram1) + AM_RANGE(0x100000, 0x103fff) AM_READWRITE(SMH_RAM, hrdtimes_bgvideoram_w) AM_BASE(&wbeachvl_videoram3) + AM_RANGE(0x104000, 0x107fff) AM_READWRITE(SMH_RAM, hrdtimes_fgvideoram_w) AM_BASE(&wbeachvl_videoram2) + AM_RANGE(0x108000, 0x10ffff) AM_READWRITE(SMH_RAM, hrdtimes_txvideoram_w) AM_BASE(&wbeachvl_videoram1) AM_RANGE(0x110000, 0x11000d) AM_WRITE(hrdtimes_scroll_w) AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x280000, 0x2807ff) AM_RAM AM_WRITE(bigtwin_paletteram_w) AM_BASE(&paletteram16) @@ -360,9 +360,9 @@ static ADDRESS_MAP_START( hrdtimes_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x080000, 0x0bffff) AM_RAM AM_RANGE(0x0c0000, 0x0fffff) AM_ROM AM_REGION(REGION_CPU1, 0x0c0000) - AM_RANGE(0x100000, 0x103fff) AM_READWRITE(MRA16_RAM, hrdtimes_bgvideoram_w) AM_BASE(&wbeachvl_videoram3) - AM_RANGE(0x104000, 0x107fff) AM_READWRITE(MRA16_RAM, hrdtimes_fgvideoram_w) AM_BASE(&wbeachvl_videoram2) - AM_RANGE(0x108000, 0x10ffff) AM_READWRITE(MRA16_RAM, hrdtimes_txvideoram_w) AM_BASE(&wbeachvl_videoram1) + AM_RANGE(0x100000, 0x103fff) AM_READWRITE(SMH_RAM, hrdtimes_bgvideoram_w) AM_BASE(&wbeachvl_videoram3) + AM_RANGE(0x104000, 0x107fff) AM_READWRITE(SMH_RAM, hrdtimes_fgvideoram_w) AM_BASE(&wbeachvl_videoram2) + AM_RANGE(0x108000, 0x10ffff) AM_READWRITE(SMH_RAM, hrdtimes_txvideoram_w) AM_BASE(&wbeachvl_videoram1) AM_RANGE(0x110000, 0x11000d) AM_WRITE(hrdtimes_scroll_w) AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x280000, 0x2807ff) AM_RAM AM_WRITE(bigtwin_paletteram_w) AM_BASE(&paletteram16) diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index dbf92a5c65d..fc82372df1e 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -647,7 +647,7 @@ static INTERRUPT_GEN(audio_interrupt) static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK2) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_READWRITE(K054539_0_r, K054539_0_w) AM_RANGE(0xe230, 0xe3ff) AM_RAM @@ -657,7 +657,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_bankswitch_w) - AM_RANGE(0xfff1, 0xfff3) AM_WRITE(MWA8_NOP) + AM_RANGE(0xfff1, 0xfff3) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static const struct K054539interface k054539_interface = diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index f00ead68866..375ae0a1e1f 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -383,22 +383,22 @@ static READ16_HANDLER( pntnpuzl_28001a_r ) static ADDRESS_MAP_START( pntnpuzl_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x080000, 0x080001) AM_READ(MRA16_NOP) //| - AM_RANGE(0x100000, 0x100001) AM_READ(MRA16_NOP) //| irq lines clear - AM_RANGE(0x180000, 0x180001) AM_READ(MRA16_NOP) //| + AM_RANGE(0x080000, 0x080001) AM_READ(SMH_NOP) //| + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) //| irq lines clear + AM_RANGE(0x180000, 0x180001) AM_READ(SMH_NOP) //| AM_RANGE(0x200000, 0x200001) AM_WRITE(pntnpuzl_200000_w) AM_RANGE(0x280000, 0x280001) AM_READ(pntnpuzl_eeprom_r) AM_RANGE(0x280002, 0x280003) AM_READ(input_port_4_word_r) AM_RANGE(0x280000, 0x280001) AM_WRITE(pntnpuzl_eeprom_w) - AM_RANGE(0x280008, 0x280009) AM_WRITE(MWA16_NOP) - AM_RANGE(0x28000a, 0x28000b) AM_WRITE(MWA16_NOP) - AM_RANGE(0x280010, 0x280011) AM_WRITE(MWA16_NOP) - AM_RANGE(0x280012, 0x280013) AM_WRITE(MWA16_NOP) + AM_RANGE(0x280008, 0x280009) AM_WRITE(SMH_NOP) + AM_RANGE(0x28000a, 0x28000b) AM_WRITE(SMH_NOP) + AM_RANGE(0x280010, 0x280011) AM_WRITE(SMH_NOP) + AM_RANGE(0x280012, 0x280013) AM_WRITE(SMH_NOP) AM_RANGE(0x280014, 0x280015) AM_READ(pntnpuzl_280014_r) - AM_RANGE(0x280016, 0x280017) AM_WRITE(MWA16_NOP) + AM_RANGE(0x280016, 0x280017) AM_WRITE(SMH_NOP) AM_RANGE(0x280018, 0x280019) AM_WRITE(pntnpuzl_280018_w) AM_RANGE(0x28001a, 0x28001b) AM_READ(pntnpuzl_28001a_r) - AM_RANGE(0x28001a, 0x28001b) AM_WRITE(MWA16_NOP) + AM_RANGE(0x28001a, 0x28001b) AM_WRITE(SMH_NOP) /* standard VGA */ AM_RANGE(0x3a0000, 0x3affff) AM_READWRITE(pntnpuzl_vid_r, pntnpuzl_vid_w) diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c index f14821dbfc6..e75d800957f 100644 --- a/src/mame/drivers/pokechmp.c +++ b/src/mame/drivers/pokechmp.c @@ -113,25 +113,25 @@ static WRITE8_HANDLER( pokechmp_paletteram_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r) AM_RANGE(0x1a00, 0x1a00) AM_READ(input_port_1_r) AM_RANGE(0x1c00, 0x1c00) AM_READ(input_port_2_r) /* Extra on Poke Champ (not on Pocket Gal) */ - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK2) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_BANK1) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK2) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0fff) AM_WRITE(pokechmp_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x1000, 0x11ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x1000, 0x11ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x1801, 0x1801) AM_WRITE(pokechmp_flipscreen_w) - AM_RANGE(0x1802, 0x181f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x1802, 0x181f) AM_WRITE(SMH_NOP) /* 1800 - 0x181f are unused BAC-06 registers, see video/dec0.c */ AM_RANGE(0x1a00, 0x1a00) AM_WRITE(pokechmp_sound_w) AM_RANGE(0x1c00, 0x1c00) AM_WRITE(pokechmp_bank_w) @@ -139,30 +139,30 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) /* Extra on Poke Champ (not on Pocket Gal) */ AM_RANGE(0x2000, 0x27ff) AM_WRITE(pokechmp_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x2800, 0x2800) AM_READ(OKIM6295_status_0_r ) // 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_READ(MRA8_BANK3) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK3) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3812_write_port_0_w) - AM_RANGE(0x1800, 0x1800) AM_WRITE(MWA8_NOP) /* MSM5205 chip on Pocket Gal, not connected here? */ + AM_RANGE(0x1800, 0x1800) AM_WRITE(SMH_NOP) /* MSM5205 chip on Pocket Gal, not connected here? */ // AM_RANGE(0x2000, 0x2000) AM_WRITE(pokechmp_sound_bank_w)/ * might still be sound bank */ AM_RANGE(0x2800, 0x2800) AM_WRITE(OKIM6295_data_0_w) // extra - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index 26625fee369..9e865d651f3 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -444,8 +444,8 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4c00, 0x4fff) AM_READWRITE(polepos_alpha_r, polepos_alpha_w) /* Alphanumeric (char ram) */ AM_RANGE(0x5000, 0x57ff) AM_READWRITE(polepos_view_r, polepos_view_w) /* Background Memory */ - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) /* Sound Memory */ - AM_RANGE(0x8000, 0x83bf) AM_WRITE(MWA8_RAM) /* Sound Memory */ + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) /* Sound Memory */ + AM_RANGE(0x8000, 0x83bf) AM_WRITE(SMH_RAM) /* Sound Memory */ AM_RANGE(0x83c0, 0x83ff) AM_WRITE(polepos_sound_w) AM_BASE(&polepos_soundregs)/* Sound data */ AM_RANGE(0x9000, 0x90ff) AM_READWRITE(namco_06xx_0_data_r, namco_06xx_0_data_w) @@ -459,7 +459,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READWRITE(polepos_adc_r, MWA8_NOP) + AM_RANGE(0x00, 0x00) AM_READWRITE(polepos_adc_r, SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c index 178b884ef03..b5d3b4011c7 100644 --- a/src/mame/drivers/polyplay.c +++ b/src/mame/drivers/polyplay.c @@ -166,7 +166,7 @@ static ADDRESS_MAP_START( polyplay_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0c00, 0x0fff) AM_RAM AM_RANGE(0x1000, 0x8fff) AM_ROM AM_RANGE(0xe800, 0xebff) AM_ROM - AM_RANGE(0xec00, 0xf7ff) AM_READWRITE(MRA8_RAM, polyplay_characterram_w) AM_BASE(&polyplay_characterram) + AM_RANGE(0xec00, 0xf7ff) AM_READWRITE(SMH_RAM, polyplay_characterram_w) AM_BASE(&polyplay_characterram) AM_RANGE(0xf800, 0xffff) AM_RAM AM_BASE(&videoram) AM_SIZE(&videoram_size) ADDRESS_MAP_END diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c index 80cf360fb36..df5fa5a7d4e 100644 --- a/src/mame/drivers/poolshrk.c +++ b/src/mame/drivers/poolshrk.c @@ -100,9 +100,9 @@ static READ8_HANDLER( poolshrk_irq_reset_r ) static ADDRESS_MAP_START( poolshrk_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x2300) AM_RAM - AM_RANGE(0x0400, 0x07ff) AM_MIRROR(0x2000) AM_WRITE(MWA8_RAM) AM_BASE(&poolshrk_playfield_ram) - AM_RANGE(0x0800, 0x080f) AM_MIRROR(0x23f0) AM_WRITE(MWA8_RAM) AM_BASE(&poolshrk_hpos_ram) - AM_RANGE(0x0c00, 0x0c0f) AM_MIRROR(0x23f0) AM_WRITE(MWA8_RAM) AM_BASE(&poolshrk_vpos_ram) + AM_RANGE(0x0400, 0x07ff) AM_MIRROR(0x2000) AM_WRITE(SMH_RAM) AM_BASE(&poolshrk_playfield_ram) + AM_RANGE(0x0800, 0x080f) AM_MIRROR(0x23f0) AM_WRITE(SMH_RAM) AM_BASE(&poolshrk_hpos_ram) + AM_RANGE(0x0c00, 0x0c0f) AM_MIRROR(0x23f0) AM_WRITE(SMH_RAM) AM_BASE(&poolshrk_vpos_ram) AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0x2000) AM_READWRITE(poolshrk_input_r, poolshrk_watchdog_w) AM_RANGE(0x1400, 0x17ff) AM_MIRROR(0x2000) AM_WRITE(poolshrk_scratch_sound_w) AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0x2000) AM_WRITE(poolshrk_score_sound_w) diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c index 49ec46fac6d..7249c3007c9 100644 --- a/src/mame/drivers/popeye.c +++ b/src/mame/drivers/popeye.c @@ -81,20 +81,20 @@ static WRITE8_HANDLER( protection_w ) static ADDRESS_MAP_START( skyskipr_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8c00, 0x8e7f) AM_READ(MRA8_RAM) - AM_RANGE(0x8e80, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x8c00, 0x8e7f) AM_READ(SMH_RAM) + AM_RANGE(0x8e80, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe001) AM_READ(protection_r) ADDRESS_MAP_END static ADDRESS_MAP_START( skyskipr_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8c00, 0x8c02) AM_WRITE(MWA8_RAM) AM_BASE(&popeye_background_pos) - AM_RANGE(0x8c03, 0x8c03) AM_WRITE(MWA8_RAM) AM_BASE(&popeye_palettebank) - AM_RANGE(0x8c04, 0x8e7f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x8e80, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8c00, 0x8c02) AM_WRITE(SMH_RAM) AM_BASE(&popeye_background_pos) + AM_RANGE(0x8c03, 0x8c03) AM_WRITE(SMH_RAM) AM_BASE(&popeye_palettebank) + AM_RANGE(0x8c04, 0x8e7f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x8e80, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa3ff) AM_WRITE(popeye_videoram_w) AM_BASE(&videoram) AM_RANGE(0xa400, 0xa7ff) AM_WRITE(popeye_colorram_w) AM_BASE(&colorram) AM_RANGE(0xc000, 0xcfff) AM_WRITE(skyskipr_bitmap_w) @@ -102,22 +102,22 @@ static ADDRESS_MAP_START( skyskipr_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( popeye_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8800, 0x8bff) AM_READ(MRA8_RAM) - AM_RANGE(0x8c00, 0x8e7f) AM_READ(MRA8_RAM) - AM_RANGE(0x8e80, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x8800, 0x8bff) AM_READ(SMH_RAM) + AM_RANGE(0x8c00, 0x8e7f) AM_READ(SMH_RAM) + AM_RANGE(0x8e80, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe001) AM_READ(protection_r) ADDRESS_MAP_END static ADDRESS_MAP_START( popeye_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8800, 0x8bff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8c00, 0x8c02) AM_WRITE(MWA8_RAM) AM_BASE(&popeye_background_pos) - AM_RANGE(0x8c03, 0x8c03) AM_WRITE(MWA8_RAM) AM_BASE(&popeye_palettebank) - AM_RANGE(0x8c04, 0x8e7f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x8e80, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8800, 0x8bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8c00, 0x8c02) AM_WRITE(SMH_RAM) AM_BASE(&popeye_background_pos) + AM_RANGE(0x8c03, 0x8c03) AM_WRITE(SMH_RAM) AM_BASE(&popeye_palettebank) + AM_RANGE(0x8c04, 0x8e7f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x8e80, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa3ff) AM_WRITE(popeye_videoram_w) AM_BASE(&videoram) AM_RANGE(0xa400, 0xa7ff) AM_WRITE(popeye_colorram_w) AM_BASE(&colorram) AM_RANGE(0xc000, 0xdfff) AM_WRITE(popeye_bitmap_w) @@ -125,24 +125,24 @@ static ADDRESS_MAP_START( popeye_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( popeyebl_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8c00, 0x8e7f) AM_READ(MRA8_RAM) - AM_RANGE(0x8e80, 0x8fff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe01f) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x8c00, 0x8e7f) AM_READ(SMH_RAM) + AM_RANGE(0x8e80, 0x8fff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe01f) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( popeyebl_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8c00, 0x8c02) AM_WRITE(MWA8_RAM) AM_BASE(&popeye_background_pos) - AM_RANGE(0x8c03, 0x8c03) AM_WRITE(MWA8_RAM) AM_BASE(&popeye_palettebank) - AM_RANGE(0x8c04, 0x8e7f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x8e80, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8c00, 0x8c02) AM_WRITE(SMH_RAM) AM_BASE(&popeye_background_pos) + AM_RANGE(0x8c03, 0x8c03) AM_WRITE(SMH_RAM) AM_BASE(&popeye_palettebank) + AM_RANGE(0x8c04, 0x8e7f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x8e80, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa3ff) AM_WRITE(popeye_videoram_w) AM_BASE(&videoram) AM_RANGE(0xa400, 0xa7ff) AM_WRITE(popeye_colorram_w) AM_BASE(&colorram) AM_RANGE(0xc000, 0xcfff) AM_WRITE(skyskipr_bitmap_w) - AM_RANGE(0xe000, 0xe01f) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe000, 0xe01f) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c index 7ad0e102f4e..bf836bb5c80 100644 --- a/src/mame/drivers/popper.c +++ b/src/mame/drivers/popper.c @@ -160,50 +160,50 @@ static WRITE8_HANDLER( popper_sharedram_w ) } static ADDRESS_MAP_START( popper_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) //shared with sound cpu + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) //shared with sound cpu AM_RANGE(0xe000, 0xe007) AM_READ(popper_input_ports_r) AM_RANGE(0xe400, 0xe400) AM_READ(popper_soundcpu_nmi_r) - AM_RANGE(0xf800, 0xf800) AM_READ(MRA8_NOP) //?? read once at startup - AM_RANGE(0xfc00, 0xfc00) AM_READ(MRA8_NOP) //?? possibly watchdog - AM_RANGE(0xffff, 0xffff) AM_READ(MRA8_NOP) + AM_RANGE(0xf800, 0xf800) AM_READ(SMH_NOP) //?? read once at startup + AM_RANGE(0xfc00, 0xfc00) AM_READ(SMH_NOP) //?? possibly watchdog + AM_RANGE(0xffff, 0xffff) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( popper_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc1bf) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc1bf) AM_WRITE(SMH_RAM) AM_RANGE(0xc1c0, 0xc1ff) AM_WRITE(popper_ol_videoram_w) AM_BASE(&popper_ol_videoram) AM_RANGE(0xc200, 0xc61f) AM_WRITE(popper_videoram_w) AM_BASE(&popper_videoram) - AM_RANGE(0xc620, 0xc9bf) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc620, 0xc9bf) AM_WRITE(SMH_RAM) AM_RANGE(0xc9c0, 0xc9ff) AM_WRITE(popper_ol_attribram_w) AM_BASE(&popper_ol_attribram) AM_RANGE(0xca00, 0xce1f) AM_WRITE(popper_attribram_w) AM_BASE(&popper_attribram) - AM_RANGE(0xce20, 0xcfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_RAM) AM_BASE(&popper_spriteram) AM_SIZE(&popper_spriteram_size) - AM_RANGE(0xd800, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&popper_sharedram) //shared with sound cpu + AM_RANGE(0xce20, 0xcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) AM_BASE(&popper_spriteram) AM_SIZE(&popper_spriteram_size) + AM_RANGE(0xd800, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&popper_sharedram) //shared with sound cpu AM_RANGE(0xe000, 0xe000) AM_WRITE(interrupt_enable_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(popper_flipscreen_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(popper_e002_w) //?? seems to be graphic related AM_RANGE(0xe003, 0xe003) AM_WRITE(popper_gfx_bank_w) - AM_RANGE(0xe004, 0xe007) AM_WRITE(MWA8_NOP) //?? range cleared once when the SP is set + AM_RANGE(0xe004, 0xe007) AM_WRITE(SMH_NOP) //?? range cleared once when the SP is set ADDRESS_MAP_END static ADDRESS_MAP_START( popper_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8002, 0x8002) AM_READ(MRA8_NOP) //?? all read once at startup and the - AM_RANGE(0x8003, 0x8003) AM_READ(MRA8_NOP) //?? result ignored, looks like part - AM_RANGE(0xa002, 0xa002) AM_READ(MRA8_NOP) //?? of AY8910 initialisation + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) + AM_RANGE(0x8002, 0x8002) AM_READ(SMH_NOP) //?? all read once at startup and the + AM_RANGE(0x8003, 0x8003) AM_READ(SMH_NOP) //?? result ignored, looks like part + AM_RANGE(0xa002, 0xa002) AM_READ(SMH_NOP) //?? of AY8910 initialisation AM_RANGE(0xd800, 0xdfff) AM_READ(popper_sharedram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( popper_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_0_w) - AM_RANGE(0x8002, 0x8002) AM_WRITE(MWA8_NOP) //?? same writes as 0x8000 (mostly) + AM_RANGE(0x8002, 0x8002) AM_WRITE(SMH_NOP) //?? same writes as 0x8000 (mostly) AM_RANGE(0xa000, 0xa000) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(AY8910_write_port_1_w) - AM_RANGE(0xa002, 0xa002) AM_WRITE(MWA8_NOP) //?? same writes as 0xa000 + AM_RANGE(0xa002, 0xa002) AM_WRITE(SMH_NOP) //?? same writes as 0xa000 AM_RANGE(0xd800, 0xdfff) AM_WRITE(popper_sharedram_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c index f8d1e2d5a5b..a006e198946 100644 --- a/src/mame/drivers/portrait.c +++ b/src/mame/drivers/portrait.c @@ -125,8 +125,8 @@ static WRITE8_HANDLER( portrait_negative_scroll_w ) static ADDRESS_MAP_START( portrait_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x87ff) AM_READWRITE(MRA8_RAM, portrait_bgvideo_write) AM_BASE(&portrait_bgvideoram) - AM_RANGE(0x8800, 0x8fff) AM_READWRITE(MRA8_RAM, portrait_fgvideo_write) AM_BASE(&portrait_fgvideoram) + AM_RANGE(0x8000, 0x87ff) AM_READWRITE(SMH_RAM, portrait_bgvideo_write) AM_BASE(&portrait_bgvideoram) + AM_RANGE(0x8800, 0x8fff) AM_READWRITE(SMH_RAM, portrait_fgvideo_write) AM_BASE(&portrait_fgvideoram) AM_RANGE(0x9000, 0x91ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x9200, 0x97ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_WRITE(soundlatch_w) @@ -135,7 +135,7 @@ static ADDRESS_MAP_START( portrait_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa004, 0xa004) AM_READ(input_port_1_r) AM_RANGE(0xa008, 0xa008) AM_READWRITE(input_port_2_r, portrait_ctrl_w) AM_RANGE(0xa010, 0xa010) AM_READ(input_port_3_r) - AM_RANGE(0xa018, 0xa018) AM_READWRITE(MRA8_NOP, portrait_positive_scroll_w) + AM_RANGE(0xa018, 0xa018) AM_READWRITE(SMH_NOP, portrait_positive_scroll_w) AM_RANGE(0xa019, 0xa019) AM_WRITE(portrait_negative_scroll_w) AM_RANGE(0xa800, 0xa83f) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xffff, 0xffff) AM_READNOP diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index e801da93e97..e62b3249731 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -110,7 +110,7 @@ static ADDRESS_MAP_START( magicstk_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x094000, 0x094001) AM_WRITENOP AM_RANGE(0x094002, 0x094003) AM_WRITENOP AM_RANGE(0x094004, 0x094005) AM_WRITE(tile_banking_w) - AM_RANGE(0x098180, 0x09917f) AM_READWRITE(MRA16_RAM, magicstk_bgvideoram_w) AM_BASE(&magicstk_videoram) + AM_RANGE(0x098180, 0x09917f) AM_READWRITE(SMH_RAM, magicstk_bgvideoram_w) AM_BASE(&magicstk_videoram) AM_RANGE(0x0c2010, 0x0c2011) AM_READ(input_port_0_word_r) AM_RANGE(0x0c2012, 0x0c2013) AM_READ(input_port_1_word_r) AM_RANGE(0x0c2014, 0x0c2015) AM_READWRITE(magicstk_port2_r, magicstk_coin_eeprom_w) @@ -129,7 +129,7 @@ static ADDRESS_MAP_START( powerbal_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x094000, 0x094001) AM_WRITENOP AM_RANGE(0x094002, 0x094003) AM_WRITENOP AM_RANGE(0x094004, 0x094005) AM_WRITE(tile_banking_w) - AM_RANGE(0x098000, 0x098fff) AM_READWRITE(MRA16_RAM, magicstk_bgvideoram_w) AM_BASE(&magicstk_videoram) + AM_RANGE(0x098000, 0x098fff) AM_READWRITE(SMH_RAM, magicstk_bgvideoram_w) AM_BASE(&magicstk_videoram) AM_RANGE(0x099000, 0x09bfff) AM_RAM // not used AM_RANGE(0x0c2010, 0x0c2011) AM_READ(input_port_0_word_r) AM_RANGE(0x0c2012, 0x0c2013) AM_READ(input_port_1_word_r) diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c index 98ae347726b..1f7575ad2f9 100644 --- a/src/mame/drivers/powerins.c +++ b/src/mame/drivers/powerins.c @@ -87,33 +87,33 @@ static READ8_HANDLER( powerinb_fake_ym2203_r ) static ADDRESS_MAP_START( powerins_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r ) // Coins + Start Buttons AM_RANGE(0x100002, 0x100003) AM_READ(input_port_1_word_r ) // P1 + P2 AM_RANGE(0x100008, 0x100009) AM_READ(input_port_2_word_r ) // DSW 1 AM_RANGE(0x10000a, 0x10000b) AM_READ(input_port_3_word_r ) // DSW 2 AM_RANGE(0x10003e, 0x10003f) AM_READ(OKIM6295_status_0_lsb_r ) // OKI Status (used by powerina) - AM_RANGE(0x120000, 0x120fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x130000, 0x130007) AM_READ(MRA16_RAM ) // VRAM 0 Control - AM_RANGE(0x140000, 0x143fff) AM_READ(MRA16_RAM ) // VRAM 0 - AM_RANGE(0x170000, 0x170fff) AM_READ(MRA16_RAM ) // VRAM 1 - AM_RANGE(0x180000, 0x18ffff) AM_READ(MRA16_RAM ) // RAM + Sprites + AM_RANGE(0x120000, 0x120fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x130000, 0x130007) AM_READ(SMH_RAM ) // VRAM 0 Control + AM_RANGE(0x140000, 0x143fff) AM_READ(SMH_RAM ) // VRAM 0 + AM_RANGE(0x170000, 0x170fff) AM_READ(SMH_RAM ) // VRAM 1 + AM_RANGE(0x180000, 0x18ffff) AM_READ(SMH_RAM ) // RAM + Sprites ADDRESS_MAP_END static ADDRESS_MAP_START( powerins_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x100014, 0x100015) AM_WRITE(powerins_flipscreen_w ) // Flip Screen - AM_RANGE(0x100016, 0x100017) AM_WRITE(MWA16_NOP ) // ? always 1 + AM_RANGE(0x100016, 0x100017) AM_WRITE(SMH_NOP ) // ? always 1 AM_RANGE(0x100018, 0x100019) AM_WRITE(powerins_tilebank_w ) // Tiles Banking (VRAM 0) AM_RANGE(0x10001e, 0x10001f) AM_WRITE(powerins_soundlatch_w ) // Sound Latch AM_RANGE(0x100030, 0x100031) AM_WRITE(powerins_okibank_w ) // Sound AM_RANGE(0x10003e, 0x10003f) AM_WRITE(OKIM6295_data_0_lsb_w ) // used by powerina AM_RANGE(0x120000, 0x120fff) AM_WRITE(powerins_paletteram16_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x130000, 0x130007) AM_WRITE(MWA16_RAM) AM_BASE(&powerins_vctrl_0 ) // VRAM 0 Control + AM_RANGE(0x130000, 0x130007) AM_WRITE(SMH_RAM) AM_BASE(&powerins_vctrl_0 ) // VRAM 0 Control AM_RANGE(0x140000, 0x143fff) AM_WRITE(powerins_vram_0_w) AM_BASE(&powerins_vram_0 ) // VRAM 0 AM_RANGE(0x170000, 0x170fff) AM_WRITE(powerins_vram_1_w) AM_BASE(&powerins_vram_1 ) // VRAM 1 AM_RANGE(0x171000, 0x171fff) AM_WRITE(powerins_vram_1_w ) // Mirror of VRAM 1? - AM_RANGE(0x180000, 0x18ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // RAM + Sprites + AM_RANGE(0x180000, 0x18ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // RAM + Sprites ADDRESS_MAP_END /* In powerina there is a hidden test mode screen because it's a bootleg @@ -121,16 +121,16 @@ ADDRESS_MAP_END data written to $10001e "sound code". */ static ADDRESS_MAP_START( readmem_snd, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_snd, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) -// AM_RANGE(0xe000, 0xe000) AM_WRITE(MWA8_NOP) // ? written only once ? -// AM_RANGE(0xe001, 0xe001) AM_WRITE(MWA8_NOP) // ? + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) +// AM_RANGE(0xe000, 0xe000) AM_WRITE(SMH_NOP) // ? written only once ? +// AM_RANGE(0xe001, 0xe001) AM_WRITE(SMH_NOP) // ? ADDRESS_MAP_END static ADDRESS_MAP_START( powerins_io_snd, ADDRESS_SPACE_IO, 8 ) @@ -144,7 +144,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( powerinb_io_snd, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READWRITE(powerinb_fake_ym2203_r, MWA8_NOP) + AM_RANGE(0x00, 0x00) AM_READWRITE(powerinb_fake_ym2203_r, SMH_NOP) AM_RANGE(0x01, 0x01) AM_NOP AM_RANGE(0x80, 0x80) AM_READWRITE(OKIM6295_status_0_r, OKIM6295_data_0_w) AM_RANGE(0x88, 0x88) AM_READWRITE(OKIM6295_status_1_r, OKIM6295_data_1_w) diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index 2f5b336532a..5ce88b2a40e 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -159,8 +159,8 @@ static WRITE8_HANDLER( ppmast93_port4_w ) } static ADDRESS_MAP_START( ppmast93_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) AM_WRITENOP AM_REGION(REGION_CPU1, 0x10000) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_WRITENOP AM_REGION(REGION_CPU1, 0x10000) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_WRITE(ppmast93_bgram_w) AM_BASE(&ppmast93_bgram) AM_SHARE(1) AM_RANGE(0xd800, 0xdfff) AM_WRITENOP AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_WRITE(ppmast93_fgram_w) AM_BASE(&ppmast93_fgram) AM_SHARE(2) @@ -198,7 +198,7 @@ static WRITE8_HANDLER(ppmast_sound_w) } static ADDRESS_MAP_START( ppmast93_cpu2_io, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0xffff) AM_READ(MRA8_ROM) AM_WRITE(ppmast_sound_w) AM_REGION(REGION_CPU2, 0x20000) + AM_RANGE(0x0000, 0xffff) AM_READ(SMH_ROM) AM_WRITE(ppmast_sound_w) AM_REGION(REGION_CPU2, 0x20000) ADDRESS_MAP_END static INPUT_PORTS_START( ppmast93 ) diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c index 8f9a895130e..9f1d48dac8b 100644 --- a/src/mame/drivers/prehisle.c +++ b/src/mame/drivers/prehisle.c @@ -36,20 +36,20 @@ static WRITE16_HANDLER( prehisle_sound16_w ) /*******************************************************************************/ static ADDRESS_MAP_START( prehisle_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x070000, 0x073fff) AM_READ(MRA16_RAM) - AM_RANGE(0x090000, 0x0907ff) AM_READ(MRA16_RAM) - AM_RANGE(0x0a0000, 0x0a07ff) AM_READ(MRA16_RAM) - AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x0d0000, 0x0d07ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x070000, 0x073fff) AM_READ(SMH_RAM) + AM_RANGE(0x090000, 0x0907ff) AM_READ(SMH_RAM) + AM_RANGE(0x0a0000, 0x0a07ff) AM_READ(SMH_RAM) + AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(SMH_RAM) + AM_RANGE(0x0d0000, 0x0d07ff) AM_READ(SMH_RAM) AM_RANGE(0x0e0000, 0x0e00ff) AM_READ(prehisle_control16_r) ADDRESS_MAP_END static ADDRESS_MAP_START( prehisle_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x070000, 0x073fff) AM_WRITE(MWA16_RAM) AM_BASE(&prehisle_ram16) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x070000, 0x073fff) AM_WRITE(SMH_RAM) AM_BASE(&prehisle_ram16) AM_RANGE(0x090000, 0x0907ff) AM_WRITE(prehisle_fg_videoram16_w) AM_BASE(&videoram16) - AM_RANGE(0x0a0000, 0x0a07ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x0a0000, 0x0a07ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0x0b0000, 0x0b3fff) AM_WRITE(prehisle_bg_videoram16_w) AM_BASE(&prehisle_bg_videoram16) AM_RANGE(0x0d0000, 0x0d07ff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0f0070, 0x0ff071) AM_WRITE(prehisle_sound16_w) @@ -66,15 +66,15 @@ static WRITE8_HANDLER( D7759_write_port_0_w ) } static ADDRESS_MAP_START( prehisle_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( prehisle_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf800, 0xf800) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf800, 0xf800) AM_WRITE(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( prehisle_sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c index 830b25b2776..5c43ec21ee2 100644 --- a/src/mame/drivers/progolf.c +++ b/src/mame/drivers/progolf.c @@ -79,19 +79,19 @@ ADDRESS_MAP_END #if 0 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xafff) AM_READ(soundlatch_r) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2fff) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x4000, 0x4fff) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x6000, 0x6fff) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x8000, 0x8fff) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0xc000, 0xcfff) AM_WRITE(interrupt_enable_w) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END #endif diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 17c4f618d77..ded5fc5b9e9 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -53,7 +53,7 @@ The Following Section of Code in Gunbird causes reads from the 0028B6: 720FC041 moveq #$f, D1 This causes Gunbird to crash if the ROM Region Size -allocated during loading is smaller than the MRA32_ROM +allocated during loading is smaller than the SMH_ROM region as it trys to read beyond the allocated rom region This was pointed out by Bart Puype @@ -337,26 +337,26 @@ static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w ) } static ADDRESS_MAP_START( psikyo_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM ) // ROM (not all used) - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA32_RAM ) // Sprites Data - AM_RANGE(0x600000, 0x601fff) AM_READ(MRA32_RAM ) // Palette - AM_RANGE(0x800000, 0x801fff) AM_READ(MRA32_RAM ) // Layer 0 - AM_RANGE(0x802000, 0x803fff) AM_READ(MRA32_RAM ) // Layer 1 - AM_RANGE(0x804000, 0x807fff) AM_READ(MRA32_RAM ) // RAM + Vregs + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM (not all used) + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM ) // Sprites Data + AM_RANGE(0x600000, 0x601fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM ) // Layer 0 + AM_RANGE(0x802000, 0x803fff) AM_READ(SMH_RAM ) // Layer 1 + AM_RANGE(0x804000, 0x807fff) AM_READ(SMH_RAM ) // RAM + Vregs // AM_RANGE(0xc00000, 0xc0000b) AM_READ(psikyo_input_r ) Depends on board, see DRIVER_INIT - AM_RANGE(0xfe0000, 0xffffff) AM_READ(MRA32_RAM ) // RAM + AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( psikyo_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA32_ROM ) // ROM (not all used) - AM_RANGE(0x400000, 0x401fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) // Sprites, buffered by two frames (list buffered + fb buffered) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM (not all used) + AM_RANGE(0x400000, 0x401fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) // Sprites, buffered by two frames (list buffered + fb buffered) AM_RANGE(0x600000, 0x601fff) AM_WRITE(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_BASE(&paletteram32 ) // Palette AM_RANGE(0x800000, 0x801fff) AM_WRITE(psikyo_vram_0_w) AM_BASE(&psikyo_vram_0 ) // Layer 0 AM_RANGE(0x802000, 0x803fff) AM_WRITE(psikyo_vram_1_w) AM_BASE(&psikyo_vram_1 ) // Layer 1 - AM_RANGE(0x804000, 0x807fff) AM_WRITE(MWA32_RAM) AM_BASE(&psikyo_vregs ) // RAM + Vregs + AM_RANGE(0x804000, 0x807fff) AM_WRITE(SMH_RAM) AM_BASE(&psikyo_vregs ) // RAM + Vregs // AM_RANGE(0xc00004, 0xc0000b) AM_WRITE(s1945_mcu_w ) MCU on sh404, see DRIVER_INIT // AM_RANGE(0xc00010, 0xc00013) AM_WRITE(psikyo_soundlatch_w ) Depends on board, see DRIVER_INIT - AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(MWA32_RAM ) // RAM + AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -398,15 +398,15 @@ static WRITE8_HANDLER( sngkace_sound_bankswitch_w ) } static ADDRESS_MAP_START( sngkace_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1 ) // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( sngkace_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM ) // Banked ROM + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM ) // Banked ROM ADDRESS_MAP_END @@ -444,15 +444,15 @@ static WRITE8_HANDLER( gunbird_sound_bankswitch_w ) } static ADDRESS_MAP_START( gunbird_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0x81ff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0x8200, 0xffff) AM_READ(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0x81ff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x8200, 0xffff) AM_READ(SMH_BANK1 ) // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( gunbird_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0x81ff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0x8200, 0xffff) AM_WRITE(MWA8_ROM ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0x81ff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x8200, 0xffff) AM_WRITE(SMH_ROM ) // Banked ROM ADDRESS_MAP_END @@ -487,7 +487,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( s1945_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(gunbird_sound_bankswitch_w ) - AM_RANGE(0x02, 0x03) AM_WRITE(MWA8_NOP ) + AM_RANGE(0x02, 0x03) AM_WRITE(SMH_NOP ) AM_RANGE(0x08, 0x08) AM_WRITE(YMF278B_control_port_0_A_w ) AM_RANGE(0x09, 0x09) AM_WRITE(YMF278B_data_port_0_A_w ) AM_RANGE(0x0a, 0x0a) AM_WRITE(YMF278B_control_port_0_B_w ) diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 1b15997bdea..151402ae55b 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -440,28 +440,28 @@ static WRITE32_HANDLER( hotgmck_pcm_bank_w ) } static ADDRESS_MAP_START( ps4_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x000fffff) AM_READ(MRA32_ROM) // program ROM (1 meg) - AM_RANGE(0x02000000, 0x021fffff) AM_READ(MRA32_BANK1) // data ROM - AM_RANGE(0x03000000, 0x030037ff) AM_READ(MRA32_RAM) + AM_RANGE(0x00000000, 0x000fffff) AM_READ(SMH_ROM) // program ROM (1 meg) + AM_RANGE(0x02000000, 0x021fffff) AM_READ(SMH_BANK1) // data ROM + AM_RANGE(0x03000000, 0x030037ff) AM_READ(SMH_RAM) AM_RANGE(0x03003fe0, 0x03003fe3) AM_READ(ps4_eeprom_r) - AM_RANGE(0x03003fe4, 0x03003fe7) AM_READ(MRA32_NOP) // also writes to this address - might be vblank? -// AM_RANGE(0x03003fe8, 0x03003fef) AM_READ(MRA32_RAM) // vid regs? - AM_RANGE(0x03004000, 0x03005fff) AM_READ(MRA32_RAM) + AM_RANGE(0x03003fe4, 0x03003fe7) AM_READ(SMH_NOP) // also writes to this address - might be vblank? +// AM_RANGE(0x03003fe8, 0x03003fef) AM_READ(SMH_RAM) // vid regs? + AM_RANGE(0x03004000, 0x03005fff) AM_READ(SMH_RAM) AM_RANGE(0x05000000, 0x05000003) AM_READ(psh_ymf_fm_r) // read YMF status AM_RANGE(0x05800000, 0x05800007) AM_READ(ps4_io32_r) // Screen 1+2's Controls - AM_RANGE(0x06000000, 0x060fffff) AM_READ(MRA32_RAM) // main RAM (1 meg) + AM_RANGE(0x06000000, 0x060fffff) AM_READ(SMH_RAM) // main RAM (1 meg) #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_READ(MRA32_BANK2) // data for rom tests (gfx), data is controlled by vidreg + AM_RANGE(0x03006000, 0x03007fff) AM_READ(SMH_BANK2) // data for rom tests (gfx), data is controlled by vidreg #endif ADDRESS_MAP_END static ADDRESS_MAP_START( ps4_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x000fffff) AM_WRITE(MWA32_ROM) // program ROM (1 meg) - AM_RANGE(0x03000000, 0x030037ff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x00000000, 0x000fffff) AM_WRITE(SMH_ROM) // program ROM (1 meg) + AM_RANGE(0x03000000, 0x030037ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x03003fe0, 0x03003fe3) AM_WRITE(ps4_eeprom_w) -// AM_RANGE(0x03003fe4, 0x03003fe7) AM_WRITE(MWA32_NOP) // might be vblank? +// AM_RANGE(0x03003fe4, 0x03003fe7) AM_WRITE(SMH_NOP) // might be vblank? AM_RANGE(0x03003fe4, 0x03003fef) AM_WRITE(ps4_vidregs_w) AM_BASE(&psikyo4_vidregs) // vid regs? AM_RANGE(0x03003ff0, 0x03003ff3) AM_WRITE(ps4_screen1_brt_w) // screen 1 brightness AM_RANGE(0x03003ff4, 0x03003ff7) AM_WRITE(ps4_bgpen_1_dword_w) AM_BASE(&bgpen_1) // screen 1 clear colour @@ -470,8 +470,8 @@ static ADDRESS_MAP_START( ps4_writemem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x03004000, 0x03005fff) AM_WRITE(ps4_paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w) AM_BASE(&paletteram32) // palette AM_RANGE(0x05000000, 0x05000003) AM_WRITE(psh_ymf_fm_w) // first 2 OPL4 register banks AM_RANGE(0x05000004, 0x05000007) AM_WRITE(psh_ymf_pcm_w) // third OPL4 register bank - AM_RANGE(0x05800008, 0x0580000b) AM_WRITE(MWA32_RAM) AM_BASE(&ps4_io_select) // Used by Mahjong games to choose input (also maps normal loderndf inputs to offsets) - AM_RANGE(0x06000000, 0x060fffff) AM_WRITE(MWA32_RAM) AM_BASE(&ps4_ram) // work RAM + AM_RANGE(0x05800008, 0x0580000b) AM_WRITE(SMH_RAM) AM_BASE(&ps4_io_select) // Used by Mahjong games to choose input (also maps normal loderndf inputs to offsets) + AM_RANGE(0x06000000, 0x060fffff) AM_WRITE(SMH_RAM) AM_BASE(&ps4_ram) // work RAM ADDRESS_MAP_END static void irqhandler(int linestate) diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index 7051134a58d..6f8e3dff04e 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -510,74 +510,74 @@ static WRITE32_HANDLER( psh_ymf_pcm_w ) } static ADDRESS_MAP_START( ps3v1_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x000fffff) AM_READ(MRA32_ROM) // program ROM (1 meg) - AM_RANGE(0x02000000, 0x021fffff) AM_READ(MRA32_BANK1) // data ROM - AM_RANGE(0x03000000, 0x03003fff) AM_READ(MRA32_RAM) // sprites - AM_RANGE(0x03004000, 0x0300ffff) AM_READ(MRA32_RAM) - AM_RANGE(0x03040000, 0x03044fff) AM_READ(MRA32_RAM) - AM_RANGE(0x03050000, 0x030501ff) AM_READ(MRA32_RAM) - AM_RANGE(0x0305ffdc, 0x0305ffdf) AM_READ(MRA32_NOP) // also writes to this address - might be vblank reads? - AM_RANGE(0x0305ffe0, 0x0305ffff) AM_READ(MRA32_RAM) // video registers + AM_RANGE(0x00000000, 0x000fffff) AM_READ(SMH_ROM) // program ROM (1 meg) + AM_RANGE(0x02000000, 0x021fffff) AM_READ(SMH_BANK1) // data ROM + AM_RANGE(0x03000000, 0x03003fff) AM_READ(SMH_RAM) // sprites + AM_RANGE(0x03004000, 0x0300ffff) AM_READ(SMH_RAM) + AM_RANGE(0x03040000, 0x03044fff) AM_READ(SMH_RAM) + AM_RANGE(0x03050000, 0x030501ff) AM_READ(SMH_RAM) + AM_RANGE(0x0305ffdc, 0x0305ffdf) AM_READ(SMH_NOP) // also writes to this address - might be vblank reads? + AM_RANGE(0x0305ffe0, 0x0305ffff) AM_READ(SMH_RAM) // video registers AM_RANGE(0x05000000, 0x05000003) AM_READ(psh_ymf_fm_r) // read YMF status AM_RANGE(0x05800000, 0x05800003) AM_READ(io32_r) AM_RANGE(0x05800004, 0x05800007) AM_READ(psh_eeprom_r) - AM_RANGE(0x06000000, 0x060fffff) AM_READ(MRA32_RAM) // main RAM (1 meg) + AM_RANGE(0x06000000, 0x060fffff) AM_READ(SMH_RAM) // main RAM (1 meg) #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_READ(MRA32_BANK2) // data for rom tests (gfx), data is controlled by vidreg - AM_RANGE(0x04060000, 0x0407ffff) AM_READ(MRA32_BANK2) // data for rom tests (gfx) (Mirrored?) + AM_RANGE(0x03060000, 0x0307ffff) AM_READ(SMH_BANK2) // data for rom tests (gfx), data is controlled by vidreg + AM_RANGE(0x04060000, 0x0407ffff) AM_READ(SMH_BANK2) // data for rom tests (gfx) (Mirrored?) #endif ADDRESS_MAP_END static ADDRESS_MAP_START( ps3v1_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x000fffff) AM_WRITE(MWA32_ROM) // program ROM (1 meg) - AM_RANGE(0x02000000, 0x021fffff) AM_WRITE(MWA32_ROM) // data ROM - AM_RANGE(0x03000000, 0x03003fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) // sprites (might be a bit longer) - AM_RANGE(0x03004000, 0x0300ffff) AM_WRITE(MWA32_RAM) AM_BASE(&psikyosh_bgram) // backgrounds + AM_RANGE(0x00000000, 0x000fffff) AM_WRITE(SMH_ROM) // program ROM (1 meg) + AM_RANGE(0x02000000, 0x021fffff) AM_WRITE(SMH_ROM) // data ROM + AM_RANGE(0x03000000, 0x03003fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) // sprites (might be a bit longer) + AM_RANGE(0x03004000, 0x0300ffff) AM_WRITE(SMH_RAM) AM_BASE(&psikyosh_bgram) // backgrounds AM_RANGE(0x03040000, 0x03044fff) AM_WRITE(paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w) AM_BASE(&paletteram32) // palette.. - AM_RANGE(0x03050000, 0x030501ff) AM_WRITE(MWA32_RAM) AM_BASE(&psikyosh_zoomram) // a gradient sometimes ... - AM_RANGE(0x0305ffdc, 0x0305ffdf) AM_WRITE(MWA32_RAM) // also reads from this address + AM_RANGE(0x03050000, 0x030501ff) AM_WRITE(SMH_RAM) AM_BASE(&psikyosh_zoomram) // a gradient sometimes ... + AM_RANGE(0x0305ffdc, 0x0305ffdf) AM_WRITE(SMH_RAM) // also reads from this address AM_RANGE(0x0305ffe0, 0x0305ffff) AM_WRITE(psikyosh_vidregs_w) AM_BASE(&psikyosh_vidregs) // video registers AM_RANGE(0x05000000, 0x05000003) AM_WRITE(psh_ymf_fm_w) // first 2 OPL4 register banks AM_RANGE(0x05000004, 0x05000007) AM_WRITE(psh_ymf_pcm_w) // third OPL4 register bank AM_RANGE(0x05800004, 0x05800007) AM_WRITE(psh_eeprom_w) - AM_RANGE(0x06000000, 0x060fffff) AM_WRITE(MWA32_RAM) AM_BASE(&psh_ram) // work RAM + AM_RANGE(0x06000000, 0x060fffff) AM_WRITE(SMH_RAM) AM_BASE(&psh_ram) // work RAM ADDRESS_MAP_END static ADDRESS_MAP_START( ps5_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x000fffff) AM_READ(MRA32_ROM) // program ROM (1 meg) + AM_RANGE(0x00000000, 0x000fffff) AM_READ(SMH_ROM) // program ROM (1 meg) AM_RANGE(0x03000000, 0x03000003) AM_READ(io32_r) AM_RANGE(0x03000004, 0x03000007) AM_READ(psh_eeprom_r) AM_RANGE(0x03100000, 0x03100003) AM_READ(psh_ymf_fm_r) - AM_RANGE(0x04000000, 0x04003fff) AM_READ(MRA32_RAM) // sprites - AM_RANGE(0x04004000, 0x0400ffff) AM_READ(MRA32_RAM) - AM_RANGE(0x04040000, 0x04044fff) AM_READ(MRA32_RAM) - AM_RANGE(0x04050000, 0x040501ff) AM_READ(MRA32_RAM) - AM_RANGE(0x0405ffdc, 0x0405ffdf) AM_READ(MRA32_NOP) // also writes to this address - might be vblank reads? - AM_RANGE(0x0405ffe0, 0x0405ffff) AM_READ(MRA32_RAM) // video registers - AM_RANGE(0x05000000, 0x0507ffff) AM_READ(MRA32_BANK1) // data ROM - AM_RANGE(0x06000000, 0x060fffff) AM_READ(MRA32_RAM) + AM_RANGE(0x04000000, 0x04003fff) AM_READ(SMH_RAM) // sprites + AM_RANGE(0x04004000, 0x0400ffff) AM_READ(SMH_RAM) + AM_RANGE(0x04040000, 0x04044fff) AM_READ(SMH_RAM) + AM_RANGE(0x04050000, 0x040501ff) AM_READ(SMH_RAM) + AM_RANGE(0x0405ffdc, 0x0405ffdf) AM_READ(SMH_NOP) // also writes to this address - might be vblank reads? + AM_RANGE(0x0405ffe0, 0x0405ffff) AM_READ(SMH_RAM) // video registers + AM_RANGE(0x05000000, 0x0507ffff) AM_READ(SMH_BANK1) // data ROM + AM_RANGE(0x06000000, 0x060fffff) AM_READ(SMH_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_READ(MRA32_BANK2) // data for rom tests (gfx), data is controlled by vidreg + AM_RANGE(0x04060000, 0x0407ffff) AM_READ(SMH_BANK2) // data for rom tests (gfx), data is controlled by vidreg #endif ADDRESS_MAP_END static ADDRESS_MAP_START( ps5_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x000fffff) AM_WRITE(MWA32_ROM) // program ROM (1 meg) + AM_RANGE(0x00000000, 0x000fffff) AM_WRITE(SMH_ROM) // program ROM (1 meg) AM_RANGE(0x03000004, 0x03000007) AM_WRITE(psh_eeprom_w) AM_RANGE(0x03100000, 0x03100003) AM_WRITE(psh_ymf_fm_w) // first 2 OPL4 register banks AM_RANGE(0x03100004, 0x03100007) AM_WRITE(psh_ymf_pcm_w) // third OPL4 register bank - AM_RANGE(0x04000000, 0x04003fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) - AM_RANGE(0x04004000, 0x0400ffff) AM_WRITE(MWA32_RAM) AM_BASE(&psikyosh_bgram) // backgrounds + AM_RANGE(0x04000000, 0x04003fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x04004000, 0x0400ffff) AM_WRITE(SMH_RAM) AM_BASE(&psikyosh_bgram) // backgrounds AM_RANGE(0x04040000, 0x04044fff) AM_WRITE(paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w) AM_BASE(&paletteram32) - AM_RANGE(0x04050000, 0x040501ff) AM_WRITE(MWA32_RAM) AM_BASE(&psikyosh_zoomram) - AM_RANGE(0x0405ffdc, 0x0405ffdf) AM_WRITE(MWA32_RAM) // also reads from this address + AM_RANGE(0x04050000, 0x040501ff) AM_WRITE(SMH_RAM) AM_BASE(&psikyosh_zoomram) + AM_RANGE(0x0405ffdc, 0x0405ffdf) AM_WRITE(SMH_RAM) // also reads from this address AM_RANGE(0x0405ffe0, 0x0405ffff) AM_WRITE(psikyosh_vidregs_w) AM_BASE(&psikyosh_vidregs) // video registers - AM_RANGE(0x05000000, 0x0507ffff) AM_WRITE(MWA32_ROM) // data ROM - AM_RANGE(0x06000000, 0x060fffff) AM_WRITE(MWA32_RAM) AM_BASE(&psh_ram) + AM_RANGE(0x05000000, 0x0507ffff) AM_WRITE(SMH_ROM) // data ROM + AM_RANGE(0x06000000, 0x060fffff) AM_WRITE(SMH_RAM) AM_BASE(&psh_ram) ADDRESS_MAP_END static void irqhandler(int linestate) diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c index dee464db300..afe9334e1ec 100644 --- a/src/mame/drivers/psychic5.c +++ b/src/mame/drivers/psychic5.c @@ -369,46 +369,46 @@ static INTERRUPT_GEN( psychic5_interrupt ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xdfff) AM_READ(psychic5_paged_ram_r) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf000) AM_READ(MRA8_RAM) - AM_RANGE(0xf001, 0xf001) AM_READ(MRA8_NOP) // ??? + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf000) AM_READ(SMH_RAM) + AM_RANGE(0xf001, 0xf001) AM_READ(SMH_NOP) // ??? AM_RANGE(0xf002, 0xf002) AM_READ(psychic5_bankselect_r) AM_RANGE(0xf003, 0xf003) AM_READ(psychic5_vram_page_select_r) - AM_RANGE(0xf004, 0xf004) AM_READ(MRA8_NOP) // ??? - AM_RANGE(0xf005, 0xf005) AM_READ(MRA8_NOP) // ??? - AM_RANGE(0xf006, 0xf1ff) AM_READ(MRA8_NOP) - AM_RANGE(0xf200, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf004, 0xf004) AM_READ(SMH_NOP) // ??? + AM_RANGE(0xf005, 0xf005) AM_READ(SMH_NOP) // ??? + AM_RANGE(0xf006, 0xf1ff) AM_READ(SMH_NOP) + AM_RANGE(0xf200, 0xf7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_BANK1) AM_RANGE(0xc000, 0xdfff) AM_WRITE(psychic5_paged_ram_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch_w) AM_RANGE(0xf001, 0xf001) AM_WRITE(psychic5_coin_counter_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(psychic5_bankselect_w) AM_RANGE(0xf003, 0xf003) AM_WRITE(psychic5_vram_page_select_w) - AM_RANGE(0xf004, 0xf004) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0xf004, 0xf004) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0xf005, 0xf005) AM_WRITE(psychic5_title_screen_w) - AM_RANGE(0xf006, 0xf1ff) AM_WRITE(MWA8_NOP) - AM_RANGE(0xf200, 0xf7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf006, 0xf1ff) AM_WRITE(SMH_NOP) + AM_RANGE(0xf200, 0xf7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index 53db1e4e943..674908856d1 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -279,7 +279,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xdfe0, 0xdfe0) AM_NOP - AM_RANGE(0xe000, 0xe3ff) AM_READWRITE(MRA8_RAM, pturn_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xe000, 0xe3ff) AM_READWRITE(SMH_RAM, pturn_videoram_w) AM_BASE(&videoram) AM_RANGE(0xe400, 0xe400) AM_WRITE(fgpalette_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(sound_w) diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index 82c6195fff5..11fd0da0718 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -112,7 +112,7 @@ static WRITE16_HANDLER( puckpkmn_YM3438_w ) static ADDRESS_MAP_START( puckpkmn_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) /* Main 68k Program Roms */ + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) /* Main 68k Program Roms */ AM_RANGE(0x700010, 0x700011) AM_READ(input_port_0_word_r) /* Input (P2) */ AM_RANGE(0x700012, 0x700013) AM_READ(input_port_1_word_r) /* Input (P1) */ AM_RANGE(0x700014, 0x700015) AM_READ(input_port_2_word_r) /* Input (?) */ @@ -121,30 +121,30 @@ static ADDRESS_MAP_START( puckpkmn_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700022, 0x700023) AM_READ(OKIM6295_status_0_lsb_r) /* M6295 Sound Chip Status Register */ AM_RANGE(0xa04000, 0xa04001) AM_READ(puckpkmn_YM3438_r) /* Ym3438 Sound Chip Status Register */ AM_RANGE(0xc00000, 0xc0001f) AM_READ(genesis_vdp_r) /* VDP Access */ - AM_RANGE(0xe00000, 0xe1ffff) AM_READ(MRA16_BANK1) /* VDP sees the roms here */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_BANK2) /* VDP sees the ram here */ - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) /* Main Ram */ + AM_RANGE(0xe00000, 0xe1ffff) AM_READ(SMH_BANK1) /* VDP sees the roms here */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_BANK2) /* VDP sees the ram here */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) /* Main Ram */ /* Unknown reads: */ -// AM_RANGE(0xa10000, 0xa10001) AM_READ(MRA16_NOP) /* ? once */ - AM_RANGE(0xa10002, 0xa10005) AM_READ(MRA16_NOP) /* ? alternative way of reading inputs ? */ - AM_RANGE(0xa11100, 0xa11101) AM_READ(MRA16_NOP) /* ? */ +// AM_RANGE(0xa10000, 0xa10001) AM_READ(SMH_NOP) /* ? once */ + AM_RANGE(0xa10002, 0xa10005) AM_READ(SMH_NOP) /* ? alternative way of reading inputs ? */ + AM_RANGE(0xa11100, 0xa11101) AM_READ(SMH_NOP) /* ? */ ADDRESS_MAP_END static ADDRESS_MAP_START( puckpkmn_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM) /* Main 68k Program Roms */ + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) /* Main 68k Program Roms */ AM_RANGE(0x700022, 0x700023) AM_WRITE(OKIM6295_data_0_lsb_w) /* M6295 Sound Chip Writes */ AM_RANGE(0xa04000, 0xa04003) AM_WRITE(puckpkmn_YM3438_w) /* Ym3438 Sound Chip Writes */ AM_RANGE(0xc00000, 0xc0001f) AM_WRITE(genesis_vdp_w) /* VDP Access */ - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&main_ram) /* Main Ram */ + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&main_ram) /* Main Ram */ /* Unknown writes: */ - AM_RANGE(0xa00000, 0xa00551) AM_WRITE(MWA16_RAM) /* ? */ - AM_RANGE(0xa10002, 0xa10005) AM_WRITE(MWA16_NOP) /* ? alternative way of reading inputs ? */ -// AM_RANGE(0xa10008, 0xa1000d) AM_WRITE(MWA16_NOP) /* ? once */ -// AM_RANGE(0xa14000, 0xa14003) AM_WRITE(MWA16_NOP) /* ? once */ - AM_RANGE(0xa11100, 0xa11101) AM_WRITE(MWA16_NOP) /* ? */ - AM_RANGE(0xa11200, 0xa11201) AM_WRITE(MWA16_NOP) /* ? */ + AM_RANGE(0xa00000, 0xa00551) AM_WRITE(SMH_RAM) /* ? */ + AM_RANGE(0xa10002, 0xa10005) AM_WRITE(SMH_NOP) /* ? alternative way of reading inputs ? */ +// AM_RANGE(0xa10008, 0xa1000d) AM_WRITE(SMH_NOP) /* ? once */ +// AM_RANGE(0xa14000, 0xa14003) AM_WRITE(SMH_NOP) /* ? once */ + AM_RANGE(0xa11100, 0xa11101) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xa11200, 0xa11201) AM_WRITE(SMH_NOP) /* ? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c index c8b931ce916..e2acfa67d2a 100644 --- a/src/mame/drivers/punchout.c +++ b/src/mame/drivers/punchout.c @@ -399,12 +399,12 @@ static ADDRESS_MAP_START( punchout_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_RANGE(0xdff0, 0xdff7) AM_RAM AM_BASE(&punchout_bigsprite1) AM_RANGE(0xdff8, 0xdffc) AM_RAM AM_BASE(&punchout_bigsprite2) - AM_RANGE(0xdffd, 0xdffd) AM_READWRITE(MRA8_RAM, punchout_palettebank_w) AM_BASE(&punchout_palettebank) - AM_RANGE(0xd800, 0xdfff) AM_READWRITE(MRA8_RAM, punchout_topTilemap_ram_w) AM_BASE(&punchout_topTilemap_ram) - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, punchout_bigsprite1ram_w) AM_BASE(&punchout_bigsprite1ram) - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, punchout_bigsprite2ram_w) AM_BASE(&punchout_bigsprite2ram) + AM_RANGE(0xdffd, 0xdffd) AM_READWRITE(SMH_RAM, punchout_palettebank_w) AM_BASE(&punchout_palettebank) + AM_RANGE(0xd800, 0xdfff) AM_READWRITE(SMH_RAM, punchout_topTilemap_ram_w) AM_BASE(&punchout_topTilemap_ram) + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(SMH_RAM, punchout_bigsprite1ram_w) AM_BASE(&punchout_bigsprite1ram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, punchout_bigsprite2ram_w) AM_BASE(&punchout_bigsprite2ram) AM_RANGE(0xf000, 0xf03f) AM_RAM AM_BASE(&punchout_botTilemap_scroll_ram) - AM_RANGE(0xf000, 0xffff) AM_READWRITE(MRA8_RAM, punchout_botTilemap_ram_w) AM_BASE(&punchout_botTilemap_ram) + AM_RANGE(0xf000, 0xffff) AM_READWRITE(SMH_RAM, punchout_botTilemap_ram_w) AM_BASE(&punchout_botTilemap_ram) ADDRESS_MAP_END @@ -414,12 +414,12 @@ static ADDRESS_MAP_START( armwrest_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_RANGE(0xdff0, 0xdff7) AM_RAM AM_BASE(&punchout_bigsprite1) AM_RANGE(0xdff8, 0xdffc) AM_RAM AM_BASE(&punchout_bigsprite2) - AM_RANGE(0xdffd, 0xdffd) AM_READWRITE(MRA8_RAM, punchout_palettebank_w) AM_BASE(&punchout_palettebank) - AM_RANGE(0xd800, 0xdfff) AM_READWRITE(MRA8_RAM, armwrest_fgTilemap_ram_w) AM_BASE(&armwrest_fgTilemap_ram) - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, punchout_bigsprite1ram_w) AM_BASE(&punchout_bigsprite1ram) - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, punchout_bigsprite2ram_w) AM_BASE(&punchout_bigsprite2ram) - AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(MRA8_RAM, punchout_botTilemap_ram_w) AM_BASE(&punchout_botTilemap_ram) - AM_RANGE(0xf800, 0xffff) AM_READWRITE(MRA8_RAM, punchout_topTilemap_ram_w) AM_BASE(&punchout_topTilemap_ram) + AM_RANGE(0xdffd, 0xdffd) AM_READWRITE(SMH_RAM, punchout_palettebank_w) AM_BASE(&punchout_palettebank) + AM_RANGE(0xd800, 0xdfff) AM_READWRITE(SMH_RAM, armwrest_fgTilemap_ram_w) AM_BASE(&armwrest_fgTilemap_ram) + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(SMH_RAM, punchout_bigsprite1ram_w) AM_BASE(&punchout_bigsprite1ram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, punchout_bigsprite2ram_w) AM_BASE(&punchout_bigsprite2ram) + AM_RANGE(0xf000, 0xf7ff) AM_READWRITE(SMH_RAM, punchout_botTilemap_ram_w) AM_BASE(&punchout_botTilemap_ram) + AM_RANGE(0xf800, 0xffff) AM_READWRITE(SMH_RAM, punchout_topTilemap_ram_w) AM_BASE(&punchout_topTilemap_ram) ADDRESS_MAP_END @@ -446,21 +446,21 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x01) AM_WRITE(MWA8_NOP) /* the 2A03 #1 is not present */ + AM_RANGE(0x00, 0x01) AM_WRITE(SMH_NOP) /* the 2A03 #1 is not present */ AM_RANGE(0x02, 0x02) AM_WRITE(soundlatch_w) AM_RANGE(0x03, 0x03) AM_WRITE(soundlatch2_w) AM_RANGE(0x04, 0x04) AM_WRITE(VLM5030_data_w) /* VLM5030 */ - AM_RANGE(0x05, 0x05) AM_WRITE(MWA8_NOP) /* unused */ + AM_RANGE(0x05, 0x05) AM_WRITE(SMH_NOP) /* unused */ AM_RANGE(0x08, 0x08) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x09, 0x09) AM_WRITE(MWA8_NOP) /* watchdog reset, seldom used because 08 clears the watchdog as well */ - AM_RANGE(0x0a, 0x0a) AM_WRITE(MWA8_NOP) /* ?? */ + AM_RANGE(0x09, 0x09) AM_WRITE(SMH_NOP) /* watchdog reset, seldom used because 08 clears the watchdog as well */ + AM_RANGE(0x0a, 0x0a) AM_WRITE(SMH_NOP) /* ?? */ AM_RANGE(0x0b, 0x0b) AM_WRITE(punchout_2a03_reset_w) AM_RANGE(0x0c, 0x0c) AM_WRITE(punchout_speech_reset_w) /* VLM5030 */ AM_RANGE(0x0d, 0x0d) AM_WRITE(punchout_speech_st_w) /* VLM5030 */ AM_RANGE(0x0e, 0x0e) AM_WRITE(punchout_speech_vcu_w) /* VLM5030 */ - AM_RANGE(0x0f, 0x0f) AM_WRITE(MWA8_NOP) /* enable NVRAM ? */ + AM_RANGE(0x0f, 0x0f) AM_WRITE(SMH_NOP) /* enable NVRAM ? */ - AM_RANGE(0x06, 0x06) AM_WRITE(MWA8_NOP) + AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) /* protection ports */ AM_RANGE(0x07, 0x07) AM_WRITE(spunchout_prot_0_w) @@ -476,17 +476,17 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x4016, 0x4016) AM_READ(soundlatch_r) AM_RANGE(0x4017, 0x4017) AM_READ(soundlatch2_r) AM_RANGE(0x4000, 0x4017) AM_READ(NESPSG_0_r) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4000, 0x4017) AM_WRITE(NESPSG_0_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c index 4167c11d035..ccad01cefb6 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -134,50 +134,50 @@ static MACHINE_RESET( bballs ) /******************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) AM_RANGE(0x060000, 0x060007) AM_READ(pushman_68705_r) - AM_RANGE(0xfe0800, 0xfe17ff) AM_READ(MRA16_RAM) + AM_RANGE(0xfe0800, 0xfe17ff) AM_READ(SMH_RAM) AM_RANGE(0xfe4000, 0xfe4001) AM_READ(input_port_0_word_r) AM_RANGE(0xfe4002, 0xfe4003) AM_READ(input_port_1_word_r) AM_RANGE(0xfe4004, 0xfe4005) AM_READ(input_port_2_word_r) - AM_RANGE(0xfec000, 0xfec7ff) AM_READ(MRA16_RAM) - AM_RANGE(0xff8000, 0xff87ff) AM_READ(MRA16_RAM) - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xfec000, 0xfec7ff) AM_READ(SMH_RAM) + AM_RANGE(0xff8000, 0xff87ff) AM_READ(SMH_RAM) + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x060000, 0x060007) AM_WRITE(pushman_68705_w) - AM_RANGE(0xfe0800, 0xfe17ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0xfe0800, 0xfe17ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0xfe4002, 0xfe4003) AM_WRITE(pushman_control_w) AM_RANGE(0xfe8000, 0xfe8003) AM_WRITE(pushman_scroll_w) - AM_RANGE(0xfe800e, 0xfe800f) AM_WRITE(MWA16_NOP) /* ? */ + AM_RANGE(0xfe800e, 0xfe800f) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xfec000, 0xfec7ff) AM_WRITE(pushman_videoram_w) AM_BASE(&videoram16) AM_RANGE(0xff8000, 0xff87ff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0007) AM_READ(pushman_68000_r) - AM_RANGE(0x0010, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x0fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x0fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0007) AM_WRITE(pushman_68000_w) - AM_RANGE(0x0010, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x0fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x0fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) @@ -190,28 +190,28 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bballs_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x00000, 0x1ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x00000, 0x1ffff) AM_READ(SMH_ROM) AM_RANGE(0x60000, 0x60007) AM_READ(bballs_68705_r) - AM_RANGE(0xe0800, 0xe17ff) AM_READ(MRA16_RAM) + AM_RANGE(0xe0800, 0xe17ff) AM_READ(SMH_RAM) AM_RANGE(0xe4000, 0xe4001) AM_READ(input_port_0_word_r) AM_RANGE(0xe4002, 0xe4003) AM_READ(input_port_1_word_r) AM_RANGE(0xe4004, 0xe4005) AM_READ(input_port_2_word_r) - AM_RANGE(0xec000, 0xec7ff) AM_READ(MRA16_RAM) - AM_RANGE(0xf8000, 0xf87ff) AM_READ(MRA16_RAM) - AM_RANGE(0xfc000, 0xfffff) AM_READ(MRA16_RAM) + AM_RANGE(0xec000, 0xec7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf8000, 0xf87ff) AM_READ(SMH_RAM) + AM_RANGE(0xfc000, 0xfffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( bballs_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x00000, 0x1ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x00000, 0x1ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x60000, 0x60007) AM_WRITE(bballs_68705_w) - AM_RANGE(0xe0800, 0xe17ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0xe0800, 0xe17ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0xe4002, 0xe4003) AM_WRITE(pushman_control_w) AM_RANGE(0xe8000, 0xe8003) AM_WRITE(pushman_scroll_w) - AM_RANGE(0xe800e, 0xe800f) AM_WRITE(MWA16_NOP) /* ? */ + AM_RANGE(0xe800e, 0xe800f) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xec000, 0xec7ff) AM_WRITE(pushman_videoram_w) AM_BASE(&videoram16) AM_RANGE(0xf8000, 0xf87ff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xfc000, 0xfffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xfc000, 0xfffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index 080fc4f5b46..0782934142f 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -340,10 +340,10 @@ static void gp2_ide_interrupt(int state) *************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) /* work ram */ - AM_RANGE(0x180000, 0x183fff) AM_READ(MRA16_RAM) /* backup ram */ - AM_RANGE(0x280000, 0x280fff) AM_READ(MRA16_RAM) /* color ram */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) /* work ram */ + AM_RANGE(0x180000, 0x183fff) AM_READ(SMH_RAM) /* backup ram */ + AM_RANGE(0x280000, 0x280fff) AM_READ(SMH_RAM) /* color ram */ AM_RANGE(0x320000, 0x32001f) AM_READ(K053252_word_r) /* ccu */ AM_RANGE(0x330000, 0x330001) AM_READ(i_port2_r) /* battery power & service sw */ AM_RANGE(0x340000, 0x340001) AM_READ(i_port1_r) /* inputport */ @@ -357,16 +357,16 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) AM_BASE(&workram) /* work ram */ - AM_RANGE(0x180000, 0x183fff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) /* backup ram */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_BASE(&workram) /* work ram */ + AM_RANGE(0x180000, 0x183fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) /* backup ram */ AM_RANGE(0x280000, 0x280fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300000, 0x30003f) AM_WRITE(K056832_word_w) /* video reg */ AM_RANGE(0x320000, 0x32001f) AM_WRITE(K053252_word_w) /* ccu */ - AM_RANGE(0x350000, 0x350001) AM_WRITE(MWA16_NOP) /* unknown */ - AM_RANGE(0x360000, 0x360001) AM_WRITE(MWA16_NOP) /* unknown */ + AM_RANGE(0x350000, 0x350001) AM_WRITE(SMH_NOP) /* unknown */ + AM_RANGE(0x360000, 0x360001) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0x370000, 0x370001) AM_WRITE(gp_control_w) /* control reg */ - AM_RANGE(0x380000, 0x380001) AM_WRITE(MWA16_NOP) /* Watchdog */ + AM_RANGE(0x380000, 0x380001) AM_WRITE(SMH_NOP) /* Watchdog */ AM_RANGE(0x800000, 0x80045f) AM_WRITE(k054539_word_w) /* sound regs */ AM_RANGE(0x880000, 0x881fff) AM_WRITE(K056832_ram_word_w) /* vram */ AM_RANGE(0x882000, 0x883fff) AM_WRITE(K056832_ram_word_w) /* vram (mirror) */ @@ -377,10 +377,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gp2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x110fff) AM_READ(MRA16_RAM) /* work ram */ - AM_RANGE(0x180000, 0x183fff) AM_READ(MRA16_RAM) /* backup ram */ - AM_RANGE(0x280000, 0x280fff) AM_READ(MRA16_RAM) /* color ram */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x110fff) AM_READ(SMH_RAM) /* work ram */ + AM_RANGE(0x180000, 0x183fff) AM_READ(SMH_RAM) /* backup ram */ + AM_RANGE(0x280000, 0x280fff) AM_READ(SMH_RAM) /* color ram */ AM_RANGE(0x320000, 0x32001f) AM_READ(K053252_word_r) /* ccu */ AM_RANGE(0x330000, 0x330001) AM_READ(i_port2_r) /* battery power & service */ AM_RANGE(0x340000, 0x340001) AM_READ(i_port1_r) /* inputport */ @@ -394,16 +394,16 @@ static ADDRESS_MAP_START( gp2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( gp2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x110fff) AM_WRITE(MWA16_RAM) AM_BASE(&workram) /* work ram */ - AM_RANGE(0x180000, 0x183fff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) /* backup ram */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x110fff) AM_WRITE(SMH_RAM) AM_BASE(&workram) /* work ram */ + AM_RANGE(0x180000, 0x183fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) /* backup ram */ AM_RANGE(0x280000, 0x280fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300000, 0x30003f) AM_WRITE(K056832_word_w) /* video reg */ AM_RANGE(0x320000, 0x32001f) AM_WRITE(K053252_word_w) /* ccu */ - AM_RANGE(0x350000, 0x350001) AM_WRITE(MWA16_NOP) /* unknown */ - AM_RANGE(0x360000, 0x360001) AM_WRITE(MWA16_NOP) /* unknown */ + AM_RANGE(0x350000, 0x350001) AM_WRITE(SMH_NOP) /* unknown */ + AM_RANGE(0x360000, 0x360001) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0x370000, 0x370001) AM_WRITE(gp2_control_w) /* control reg */ - AM_RANGE(0x380000, 0x380001) AM_WRITE(MWA16_NOP) /* Watchdog */ + AM_RANGE(0x380000, 0x380001) AM_WRITE(SMH_NOP) /* Watchdog */ AM_RANGE(0x800000, 0x80045f) AM_WRITE(k054539_word_w) /* sound regs */ AM_RANGE(0x880000, 0x881fff) AM_WRITE(gp2_vram_w) /* vram */ AM_RANGE(0x89f000, 0x8a0fff) AM_WRITE(gp2_vram_mirror_w) /* vram (mirror) */ diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c index 346de6b579d..df53201265e 100644 --- a/src/mame/drivers/qix.c +++ b/src/mame/drivers/qix.c @@ -236,7 +236,7 @@ Interrupts: static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE(1) AM_RANGE(0x8400, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8bff) AM_READ(MRA8_NOP) /* 6850 ACIA */ + AM_RANGE(0x8800, 0x8bff) AM_READ(SMH_NOP) /* 6850 ACIA */ AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x3fe) AM_READWRITE(qix_video_firq_r, qix_video_firq_w) AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x3fe) AM_READWRITE(qix_data_firq_ack_r, qix_data_firq_ack_w) AM_RANGE(0x9000, 0x93ff) AM_READWRITE(pia_3_r, pia_3_w) @@ -250,7 +250,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( zoo_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE(1) AM_RANGE(0x0400, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x0bff) AM_READ(MRA8_NOP) /* ACIA */ + AM_RANGE(0x0800, 0x0bff) AM_READ(SMH_NOP) /* ACIA */ AM_RANGE(0x0c00, 0x0c00) AM_MIRROR(0x3fe) AM_READWRITE(qix_video_firq_r, qix_video_firq_w) AM_RANGE(0x0c01, 0x0c01) AM_MIRROR(0x3fe) AM_READWRITE(qix_data_firq_ack_r, qix_data_firq_ack_w) AM_RANGE(0x1000, 0x13ff) AM_READWRITE(pia_3_r, pia_3_w) @@ -273,7 +273,7 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READWRITE(qix_68705_portA_r, qix_68705_portA_w) AM_BASE_MEMBER(qix_state, _68705_port_out) AM_RANGE(0x0001, 0x0001) AM_READWRITE(qix_68705_portB_r, qix_68705_portB_w) AM_RANGE(0x0002, 0x0002) AM_READWRITE(qix_68705_portC_r, qix_68705_portC_w) - AM_RANGE(0x0004, 0x0007) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(qix_state, _68705_ddr) + AM_RANGE(0x0004, 0x0007) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(qix_state, _68705_ddr) AM_RANGE(0x0010, 0x007f) AM_RAM AM_RANGE(0x0080, 0x07ff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c index 2eb50836bd4..4e044a1cf87 100644 --- a/src/mame/drivers/quantum.c +++ b/src/mame/drivers/quantum.c @@ -149,12 +149,12 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x900000, 0x9001ff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x940000, 0x940001) AM_READ(trackball_r) /* trackball */ AM_RANGE(0x948000, 0x948001) AM_READ(switches_r) - AM_RANGE(0x950000, 0x95001f) AM_WRITE(MWA16_RAM) AM_BASE(&quantum_colorram) + AM_RANGE(0x950000, 0x95001f) AM_WRITE(SMH_RAM) AM_BASE(&quantum_colorram) AM_RANGE(0x958000, 0x958001) AM_WRITE(led_w) - AM_RANGE(0x960000, 0x960001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x960000, 0x960001) AM_WRITE(SMH_NOP) AM_RANGE(0x968000, 0x968001) AM_WRITE(avgdvg_reset_word_w) AM_RANGE(0x970000, 0x970001) AM_WRITE(avgdvg_go_word_w) - AM_RANGE(0x978000, 0x978001) AM_READWRITE(MRA16_NOP, watchdog_reset16_w) + AM_RANGE(0x978000, 0x978001) AM_READWRITE(SMH_NOP, watchdog_reset16_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c index c4859d3af19..ff99869895c 100644 --- a/src/mame/drivers/quasar.c +++ b/src/mame/drivers/quasar.c @@ -182,7 +182,7 @@ static ADDRESS_MAP_START( quasar_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x03) AM_READWRITE(quasar_IO_r, video_page_select_w) AM_RANGE(0x08, 0x0b) AM_WRITE(io_page_select_w) AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE(cvs_collision_clear, quasar_sh_command_w) - AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READWRITE(cvs_collision_r, MWA8_NOP) + AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READWRITE(cvs_collision_r, SMH_NOP) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(input_port_4_r) ADDRESS_MAP_END @@ -193,21 +193,21 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport_sound, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00 , 0x7F ) AM_READ(MRA8_RAM) + AM_RANGE(0x00 , 0x7F ) AM_READ(SMH_RAM) AM_RANGE(0x80 , 0x80 ) AM_READ(quasar_sh_command_r) AM_RANGE(I8039_t1, I8039_t1) AM_READ(Quasar_T1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writeport_sound, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00 , 0x7F ) AM_WRITE(MWA8_RAM) + AM_RANGE(0x00 , 0x7F ) AM_WRITE(SMH_RAM) AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(Quasar_DAC_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c index 27d89b5c70b..875c0542e2d 100644 --- a/src/mame/drivers/quizdna.c +++ b/src/mame/drivers/quizdna.c @@ -41,29 +41,29 @@ static WRITE8_HANDLER( gekiretu_rombank_w ) /****************************************************************************/ static ADDRESS_MAP_START( quizdna_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( quizdna_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) 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_WRITE(MWA8_RAM) - AM_RANGE(0xe000, 0xe1ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xe200, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xe000, 0xe1ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe200, 0xefff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xffff) AM_WRITE(paletteram_xBGR_RRRR_GGGG_BBBB_w) AM_BASE(&paletteram) ADDRESS_MAP_END static ADDRESS_MAP_START( gekiretu_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) 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_WRITE(MWA8_RAM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_WRITE(paletteram_xBGR_RRRR_GGGG_BBBB_w) AM_BASE(&paletteram) - AM_RANGE(0xf000, 0xf1ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf200, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf000, 0xf1ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf200, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( quizdna_readport, ADDRESS_SPACE_IO, 8 ) @@ -82,7 +82,7 @@ static ADDRESS_MAP_START( quizdna_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x02, 0x03) AM_WRITE(quizdna_bg_xscroll_w) AM_RANGE(0x04, 0x04) AM_WRITE(quizdna_bg_yscroll_w) - AM_RANGE(0x05, 0x06) AM_WRITE(MWA8_NOP) /* unknown */ + AM_RANGE(0x05, 0x06) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w) AM_RANGE(0xe0, 0xe0) AM_WRITE(YM2203_control_port_0_w) @@ -94,7 +94,7 @@ static ADDRESS_MAP_START( gakupara_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x01) AM_WRITE(quizdna_bg_xscroll_w) AM_RANGE(0x02, 0x02) AM_WRITE(quizdna_bg_yscroll_w) - AM_RANGE(0x03, 0x04) AM_WRITE(MWA8_NOP) /* unknown */ + AM_RANGE(0x03, 0x04) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w) AM_RANGE(0xe0, 0xe0) AM_WRITE(YM2203_control_port_0_w) @@ -106,7 +106,7 @@ static ADDRESS_MAP_START( gekiretu_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x02, 0x03) AM_WRITE(quizdna_bg_xscroll_w) AM_RANGE(0x04, 0x04) AM_WRITE(quizdna_bg_yscroll_w) - AM_RANGE(0x05, 0x06) AM_WRITE(MWA8_NOP) /* unknown */ + AM_RANGE(0x05, 0x06) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0xc0, 0xc0) AM_WRITE(gekiretu_rombank_w) AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w) AM_RANGE(0xe0, 0xe0) AM_WRITE(YM2203_control_port_0_w) diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c index 2a6b43c50dc..97644db3690 100644 --- a/src/mame/drivers/quizpani.c +++ b/src/mame/drivers/quizpani.c @@ -47,33 +47,33 @@ extern VIDEO_START( quizpani ); extern VIDEO_UPDATE( quizpani ); static ADDRESS_MAP_START( quizpani_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r) AM_RANGE(0x100002, 0x100003) AM_READ(input_port_1_word_r) AM_RANGE(0x100008, 0x100009) AM_READ(input_port_2_word_r) AM_RANGE(0x10000a, 0x10000b) AM_READ(input_port_3_word_r) AM_RANGE(0x104000, 0x104001) AM_READ(OKIM6295_status_0_lsb_r) - AM_RANGE(0x108000, 0x1083ff) AM_READ(MRA16_RAM) - AM_RANGE(0x110000, 0x113fff) AM_READ(MRA16_RAM) - AM_RANGE(0x180000, 0x18ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x33ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x108000, 0x1083ff) AM_READ(SMH_RAM) + AM_RANGE(0x110000, 0x113fff) AM_READ(SMH_RAM) + AM_RANGE(0x180000, 0x18ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x33ffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( quizpani_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100014, 0x100015) AM_WRITE(MWA16_NOP) - AM_RANGE(0x100016, 0x100017) AM_WRITE(MWA16_NOP) /* IRQ eanble? */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100014, 0x100015) AM_WRITE(SMH_NOP) + AM_RANGE(0x100016, 0x100017) AM_WRITE(SMH_NOP) /* IRQ eanble? */ AM_RANGE(0x100018, 0x100019) AM_WRITE(quizpani_tilesbank_w) AM_RANGE(0x104000, 0x104001) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x104020, 0x104027) AM_WRITE(NMK112_okibank_lsb_w) AM_RANGE(0x108000, 0x1083ff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x108400, 0x1085ff) AM_WRITE(MWA16_NOP) - AM_RANGE(0x10c000, 0x10c007) AM_WRITE(MWA16_RAM) AM_BASE(&quizpani_scrollreg) - AM_RANGE(0x10c008, 0x10c403) AM_WRITE(MWA16_NOP) + AM_RANGE(0x108400, 0x1085ff) AM_WRITE(SMH_NOP) + AM_RANGE(0x10c000, 0x10c007) AM_WRITE(SMH_RAM) AM_BASE(&quizpani_scrollreg) + AM_RANGE(0x10c008, 0x10c403) AM_WRITE(SMH_NOP) AM_RANGE(0x110000, 0x113fff) AM_WRITE(quizpani_bg_videoram_w) AM_BASE(&quizpani_bg_videoram) AM_RANGE(0x11c000, 0x11ffff) AM_WRITE(quizpani_txt_videoram_w) AM_BASE(&quizpani_txt_videoram) - AM_RANGE(0x180000, 0x18ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x200000, 0x33ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x180000, 0x18ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x200000, 0x33ffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static INPUT_PORTS_START( quizpani ) diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 5d5ba0c40b9..f5923edd1e0 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -502,20 +502,20 @@ static READ32_HANDLER( randomrabbits ) } static ADDRESS_MAP_START( rabbit_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA32_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) AM_RANGE(0x200000, 0x200003) AM_READ(rabbit_input_r) AM_RANGE(0x400010, 0x400013) AM_READ(randomrabbits) // gfx chip status? AM_RANGE(0x400980, 0x400983) AM_READ(randomrabbits) // sound chip status? AM_RANGE(0x400984, 0x400987) AM_READ(randomrabbits) // sound chip status? - AM_RANGE(0x440000, 0x47ffff) AM_READ(MRA32_BANK1) // roms read from here during testing + AM_RANGE(0x440000, 0x47ffff) AM_READ(SMH_BANK1) // roms read from here during testing /* tilemaps */ AM_RANGE(0x480000, 0x483fff) AM_READ(rabbit_tilemap0_r) AM_RANGE(0x484000, 0x487fff) AM_READ(rabbit_tilemap1_r) AM_RANGE(0x488000, 0x48bfff) AM_READ(rabbit_tilemap2_r) AM_RANGE(0x48c000, 0x48ffff) AM_READ(rabbit_tilemap3_r) - AM_RANGE(0x494000, 0x49ffff) AM_READ(MRA32_RAM) - AM_RANGE(0x4a0000, 0x4affff) AM_READ(MRA32_RAM) /* palette */ - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA32_RAM) + AM_RANGE(0x494000, 0x49ffff) AM_READ(SMH_RAM) + AM_RANGE(0x4a0000, 0x4affff) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END /* rom bank is used when testing roms, not currently hooked up */ @@ -736,41 +736,41 @@ static WRITE32_HANDLER( rabbit_eeprom_write ) } static ADDRESS_MAP_START( rabbit_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x000003) AM_WRITE(MWA32_NOP) // bug in code / emulation? - AM_RANGE(0x000010, 0x000013) AM_WRITE(MWA32_NOP) // bug in code / emulation? - AM_RANGE(0x000024, 0x000027) AM_WRITE(MWA32_NOP) // bug in code / emulation? - AM_RANGE(0x00719C, 0x00719F) AM_WRITE(MWA32_NOP) // bug in code / emulation? - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA32_ROM) + AM_RANGE(0x000000, 0x000003) AM_WRITE(SMH_NOP) // bug in code / emulation? + AM_RANGE(0x000010, 0x000013) AM_WRITE(SMH_NOP) // bug in code / emulation? + AM_RANGE(0x000024, 0x000027) AM_WRITE(SMH_NOP) // bug in code / emulation? + AM_RANGE(0x00719C, 0x00719F) AM_WRITE(SMH_NOP) // bug in code / emulation? + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x200003) AM_WRITE(rabbit_eeprom_write) /* this lot are probably gfxchip/blitter etc. related */ - AM_RANGE(0x400010, 0x400013) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_viewregs0 ) - AM_RANGE(0x400100, 0x400117) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_tilemap_regs[0] ) // tilemap regs1 - AM_RANGE(0x400120, 0x400137) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_tilemap_regs[1] ) // tilemap regs2 - AM_RANGE(0x400140, 0x400157) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_tilemap_regs[2] ) // tilemap regs3 - AM_RANGE(0x400160, 0x400177) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_tilemap_regs[3] ) // tilemap regs4 - AM_RANGE(0x400200, 0x40021b) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_spriteregs ) // sprregs? + AM_RANGE(0x400010, 0x400013) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_viewregs0 ) + AM_RANGE(0x400100, 0x400117) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_tilemap_regs[0] ) // tilemap regs1 + AM_RANGE(0x400120, 0x400137) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_tilemap_regs[1] ) // tilemap regs2 + AM_RANGE(0x400140, 0x400157) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_tilemap_regs[2] ) // tilemap regs3 + AM_RANGE(0x400160, 0x400177) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_tilemap_regs[3] ) // tilemap regs4 + AM_RANGE(0x400200, 0x40021b) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_spriteregs ) // sprregs? AM_RANGE(0x400300, 0x400303) AM_WRITE(rabbit_rombank_w) // used during rom testing, rombank/area select + something else? - AM_RANGE(0x400400, 0x400413) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_viewregs6 ) // some global controls? (brightness etc.?) - AM_RANGE(0x400500, 0x400503) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_viewregs7 ) + AM_RANGE(0x400400, 0x400413) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_viewregs6 ) // some global controls? (brightness etc.?) + AM_RANGE(0x400500, 0x400503) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_viewregs7 ) AM_RANGE(0x400700, 0x40070f) AM_WRITE(rabbit_blitter_w) AM_BASE( &rabbit_blitterregs ) - AM_RANGE(0x400800, 0x40080f) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_viewregs9 ) // never changes? + AM_RANGE(0x400800, 0x40080f) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_viewregs9 ) // never changes? AM_RANGE(0x400900, 0x40098f) AM_WRITE(rabbit_audio_w) /* hmm */ - AM_RANGE(0x479700, 0x479713) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_viewregs10 ) + AM_RANGE(0x479700, 0x479713) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_viewregs10 ) /* tilemaps */ AM_RANGE(0x480000, 0x483fff) AM_WRITE(rabbit_tilemap0_w) AM_RANGE(0x484000, 0x487fff) AM_WRITE(rabbit_tilemap1_w) AM_RANGE(0x488000, 0x48bfff) AM_WRITE(rabbit_tilemap2_w) AM_RANGE(0x48c000, 0x48ffff) AM_WRITE(rabbit_tilemap3_w) - AM_RANGE(0x494000, 0x497fff) AM_WRITE(MWA32_RAM) AM_BASE(&rabbit_spriteram) // sprites? + AM_RANGE(0x494000, 0x497fff) AM_WRITE(SMH_RAM) AM_BASE(&rabbit_spriteram) // sprites? AM_RANGE(0x4a0000, 0x4affff) AM_WRITE(rabbit_paletteram_dword_w) AM_BASE(&paletteram32) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA32_RAM) + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /* tmmjprd has a different memory map */ static ADDRESS_MAP_START( tmmjprd_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA32_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) AM_RANGE(0x200010, 0x200013) AM_READ(randomrabbits) // gfx chip status? AM_RANGE(0x200980, 0x200983) AM_READ(randomrabbits) // sound chip status? AM_RANGE(0x200984, 0x200987) AM_READ(randomrabbits) // sound chip status? @@ -778,9 +778,9 @@ static ADDRESS_MAP_START( tmmjprd_readmem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x284000, 0x287fff) AM_READ(rabbit_tilemap1_r) AM_RANGE(0x288000, 0x28bfff) AM_READ(rabbit_tilemap2_r) AM_RANGE(0x28c000, 0x28ffff) AM_READ(rabbit_tilemap3_r) - AM_RANGE(0x290000, 0x29ffff) AM_READ(MRA32_RAM) + AM_RANGE(0x290000, 0x29ffff) AM_READ(SMH_RAM) AM_RANGE(0x400000, 0x400003) AM_READ(tmmjprd_input_r) - AM_RANGE(0xf00000, 0xffffff) AM_READ(MRA32_RAM) + AM_RANGE(0xf00000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static WRITE32_HANDLER( tmmjprd_paletteram_dword_w ) @@ -797,32 +797,32 @@ static WRITE32_HANDLER( tmmjprd_paletteram_dword_w ) static ADDRESS_MAP_START( tmmjprd_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA32_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) /* check these are used .. */ -// AM_RANGE(0x200010, 0x200013) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_viewregs0 ) - AM_RANGE(0x200100, 0x200117) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_tilemap_regs[0] ) // tilemap regs1 - AM_RANGE(0x200120, 0x200137) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_tilemap_regs[1] ) // tilemap regs2 - AM_RANGE(0x200140, 0x200157) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_tilemap_regs[2] ) // tilemap regs3 - AM_RANGE(0x200160, 0x200177) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_tilemap_regs[3] ) // tilemap regs4 - AM_RANGE(0x200200, 0x20021b) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_spriteregs ) // sprregs? +// AM_RANGE(0x200010, 0x200013) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_viewregs0 ) + AM_RANGE(0x200100, 0x200117) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_tilemap_regs[0] ) // tilemap regs1 + AM_RANGE(0x200120, 0x200137) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_tilemap_regs[1] ) // tilemap regs2 + AM_RANGE(0x200140, 0x200157) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_tilemap_regs[2] ) // tilemap regs3 + AM_RANGE(0x200160, 0x200177) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_tilemap_regs[3] ) // tilemap regs4 + AM_RANGE(0x200200, 0x20021b) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_spriteregs ) // sprregs? // AM_RANGE(0x200300, 0x200303) AM_WRITE(rabbit_rombank_w) // used during rom testing, rombank/area select + something else? -// AM_RANGE(0x200400, 0x200413) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_viewregs6 ) // some global controls? (brightness etc.?) -// AM_RANGE(0x200500, 0x200503) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_viewregs7 ) +// AM_RANGE(0x200400, 0x200413) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_viewregs6 ) // some global controls? (brightness etc.?) +// AM_RANGE(0x200500, 0x200503) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_viewregs7 ) // AM_RANGE(0x200700, 0x20070f) AM_WRITE(rabbit_blitter_w) AM_BASE( &rabbit_blitterregs ) -// AM_RANGE(0x200800, 0x20080f) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_viewregs9 ) // never changes? +// AM_RANGE(0x200800, 0x20080f) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_viewregs9 ) // never changes? // AM_RANGE(0x200900, 0x20098f) AM_WRITE(rabbit_audio_w) /* hmm */ -// AM_RANGE(0x279700, 0x279713) AM_WRITE(MWA32_RAM) AM_BASE( &rabbit_viewregs10 ) +// AM_RANGE(0x279700, 0x279713) AM_WRITE(SMH_RAM) AM_BASE( &rabbit_viewregs10 ) /* tilemaps */ AM_RANGE(0x280000, 0x283fff) AM_WRITE(rabbit_tilemap0_w) AM_RANGE(0x284000, 0x287fff) AM_WRITE(rabbit_tilemap1_w) AM_RANGE(0x288000, 0x28bfff) AM_WRITE(rabbit_tilemap2_w) AM_RANGE(0x28c000, 0x28ffff) AM_WRITE(rabbit_tilemap3_w) /* ?? is palette ram shared with sprites in this case or just a different map */ - AM_RANGE(0x290000, 0x29bfff) AM_WRITE(MWA32_RAM) AM_BASE(&rabbit_spriteram) + AM_RANGE(0x290000, 0x29bfff) AM_WRITE(SMH_RAM) AM_BASE(&rabbit_spriteram) AM_RANGE(0x29c000, 0x29ffff) AM_WRITE(tmmjprd_paletteram_dword_w) AM_BASE(&paletteram32) AM_RANGE(0x400000, 0x400003) AM_WRITE(rabbit_eeprom_write) - AM_RANGE(0xf00000, 0xffffff) AM_WRITE(MWA32_RAM) + AM_RANGE(0xf00000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static INPUT_PORTS_START( rabbit ) diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c index f66218ddf60..8795bee5d10 100644 --- a/src/mame/drivers/raiden.c +++ b/src/mame/drivers/raiden.c @@ -65,17 +65,17 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0b000, 0x0b007) AM_WRITE(raiden_control_w) AM_RANGE(0x0c000, 0x0c7ff) AM_WRITE(raiden_text_w) AM_BASE(&videoram16) AM_RANGE(0x0d000, 0x0d00d) AM_READWRITE(seibu_main_word_r, seibu_main_word_w) - AM_RANGE(0x0d060, 0x0d067) AM_WRITE(MWA16_RAM) AM_BASE(&raiden_scroll_ram) + AM_RANGE(0x0d060, 0x0d067) AM_WRITE(SMH_RAM) AM_BASE(&raiden_scroll_ram) AM_RANGE(0xa0000, 0xfffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x01fff) AM_RAM - AM_RANGE(0x02000, 0x027ff) AM_READWRITE(MRA16_RAM, raiden_background_w) AM_BASE(&raiden_back_data) - AM_RANGE(0x02800, 0x02fff) AM_READWRITE(MRA16_RAM, raiden_foreground_w) AM_BASE(&raiden_fore_data) - AM_RANGE(0x03000, 0x03fff) AM_READWRITE(MRA16_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x02000, 0x027ff) AM_READWRITE(SMH_RAM, raiden_background_w) AM_BASE(&raiden_back_data) + AM_RANGE(0x02800, 0x02fff) AM_READWRITE(SMH_RAM, raiden_foreground_w) AM_BASE(&raiden_fore_data) + AM_RANGE(0x03000, 0x03fff) AM_READWRITE(SMH_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x04000, 0x04fff) AM_RAM AM_SHARE(1) - AM_RANGE(0x07ffe, 0x0afff) AM_WRITE(MWA16_NOP) + AM_RANGE(0x07ffe, 0x0afff) AM_WRITE(SMH_NOP) AM_RANGE(0xc0000, 0xfffff) AM_ROM ADDRESS_MAP_END @@ -90,7 +90,7 @@ static ADDRESS_MAP_START( alt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c000, 0x0c7ff) AM_WRITE(raiden_text_w) AM_BASE(&videoram16) AM_RANGE(0x0e000, 0x0e001) AM_READ(input_port_1_word_r) AM_RANGE(0x0e002, 0x0e003) AM_READ(input_port_2_word_r) - AM_RANGE(0x0f000, 0x0f035) AM_WRITE(MWA16_RAM) AM_BASE(&raiden_scroll_ram) + AM_RANGE(0x0f000, 0x0f035) AM_WRITE(SMH_RAM) AM_BASE(&raiden_scroll_ram) AM_RANGE(0xa0000, 0xfffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 069debbd8d0..8f35421b6a1 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -951,14 +951,14 @@ static ADDRESS_MAP_START( raiden2_mem, ADDRESS_SPACE_PROGRAM, 16 ) // AM_RANGE(0x00000, 0x003ff) AM_RAM AM_RANGE(0x0c000, 0x0cfff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x0d000, 0x0d7ff) AM_READWRITE(MRA16_RAM, raiden2_background_w) AM_BASE(&back_data) - AM_RANGE(0x0d800, 0x0dfff) AM_READWRITE(MRA16_RAM, raiden2_foreground_w) AM_BASE(&fore_data) - AM_RANGE(0x0e000, 0x0e7ff) AM_READWRITE(MRA16_RAM, raiden2_midground_w) AM_BASE(&mid_data) - AM_RANGE(0x0e800, 0x0f7ff) AM_READWRITE(MRA16_RAM, raiden2_text_w) AM_BASE(&videoram16) + AM_RANGE(0x0d000, 0x0d7ff) AM_READWRITE(SMH_RAM, raiden2_background_w) AM_BASE(&back_data) + AM_RANGE(0x0d800, 0x0dfff) AM_READWRITE(SMH_RAM, raiden2_foreground_w) AM_BASE(&fore_data) + AM_RANGE(0x0e000, 0x0e7ff) AM_READWRITE(SMH_RAM, raiden2_midground_w) AM_BASE(&mid_data) + AM_RANGE(0x0e800, 0x0f7ff) AM_READWRITE(SMH_RAM, raiden2_text_w) AM_BASE(&videoram16) AM_RANGE(0x0f800, 0x0ffff) AM_RAM /* Stack area */ - AM_RANGE(0x10000, 0x1efff) AM_READWRITE(MRA16_RAM, w1x) AM_BASE(&w1ram) - AM_RANGE(0x1f000, 0x1ffff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x10000, 0x1efff) AM_READWRITE(SMH_RAM, w1x) AM_BASE(&w1ram) + AM_RANGE(0x1f000, 0x1ffff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK(1) AM_RANGE(0x40000, 0xfffff) AM_ROMBANK(2) @@ -2137,8 +2137,8 @@ static ADDRESS_MAP_START( rdx_v33_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x006b0, 0x006b1) AM_WRITE(mcu_prog_w) AM_RANGE(0x006b2, 0x006b3) AM_WRITE(mcu_prog_w2) - AM_RANGE(0x006b4, 0x006b5) AM_WRITE(MWA16_NOP) - AM_RANGE(0x006b6, 0x006b7) AM_WRITE(MWA16_NOP) + AM_RANGE(0x006b4, 0x006b5) AM_WRITE(SMH_NOP) + AM_RANGE(0x006b6, 0x006b7) AM_WRITE(SMH_NOP) AM_RANGE(0x006bc, 0x006bd) AM_WRITE(mcu_prog_offs_w) @@ -2161,13 +2161,13 @@ static ADDRESS_MAP_START( rdx_v33_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00880, 0x0bfff) AM_RAM AM_RANGE(0x0c000, 0x0cfff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x0d000, 0x0d7ff) AM_READWRITE(MRA16_RAM, raiden2_background_w) AM_BASE(&back_data) - AM_RANGE(0x0d800, 0x0dfff) AM_READWRITE(MRA16_RAM, raiden2_foreground_w) AM_BASE(&fore_data) - AM_RANGE(0x0e000, 0x0e7ff) AM_READWRITE(MRA16_RAM, raiden2_midground_w) AM_BASE(&mid_data) - AM_RANGE(0x0e800, 0x0f7ff) AM_READWRITE(MRA16_RAM, raiden2_text_w) AM_BASE(&videoram16) + AM_RANGE(0x0d000, 0x0d7ff) AM_READWRITE(SMH_RAM, raiden2_background_w) AM_BASE(&back_data) + AM_RANGE(0x0d800, 0x0dfff) AM_READWRITE(SMH_RAM, raiden2_foreground_w) AM_BASE(&fore_data) + AM_RANGE(0x0e000, 0x0e7ff) AM_READWRITE(SMH_RAM, raiden2_midground_w) AM_BASE(&mid_data) + AM_RANGE(0x0e800, 0x0f7ff) AM_READWRITE(SMH_RAM, raiden2_text_w) AM_BASE(&videoram16) AM_RANGE(0x0f800, 0x0ffff) AM_RAM /* Stack area */ AM_RANGE(0x10000, 0x1efff) AM_RAM - AM_RANGE(0x1f000, 0x1ffff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x1f000, 0x1ffff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) /* not sure of bank sizes etc. */ AM_RANGE(0x20000, 0x2ffff) AM_ROMBANK(1) diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index 3b2973db301..93dc0c01094 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -278,13 +278,13 @@ static WRITE16_HANDLER( jumping_sound_w ) ***************************************************************************/ static ADDRESS_MAP_START( rainbow_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x10c000, 0x10ffff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) /* palette */ - AM_RANGE(0x201000, 0x203fff) AM_READ(MRA16_RAM) /* read in initial checks */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x10c000, 0x10ffff) AM_READ(SMH_RAM) /* main RAM */ + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0x201000, 0x203fff) AM_READ(SMH_RAM) /* read in initial checks */ AM_RANGE(0x390000, 0x390003) AM_READ(input_port_0_word_r) AM_RANGE(0x3b0000, 0x3b0003) AM_READ(input_port_1_word_r) - AM_RANGE(0x3e0000, 0x3e0001) AM_READ(MRA16_NOP) + AM_RANGE(0x3e0000, 0x3e0001) AM_READ(SMH_NOP) AM_RANGE(0x3e0002, 0x3e0003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x800000, 0x8007ff) AM_READ(rainbow_cchip_ram_r) AM_RANGE(0x800802, 0x800803) AM_READ(rainbow_cchip_ctrl_r) @@ -293,12 +293,12 @@ static ADDRESS_MAP_START( rainbow_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( rainbow_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x10c000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x10c000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x201000, 0x203fff) AM_WRITE(MWA16_RAM) /* written in initial checks */ + AM_RANGE(0x201000, 0x203fff) AM_WRITE(SMH_RAM) /* written in initial checks */ AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE(rainbow_spritectrl_w) - AM_RANGE(0x3c0000, 0x3c0003) AM_WRITE(MWA16_NOP) /* written very often, watchdog? */ + AM_RANGE(0x3c0000, 0x3c0003) AM_WRITE(SMH_NOP) /* written very often, watchdog? */ AM_RANGE(0x3e0000, 0x3e0001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x3e0002, 0x3e0003) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x800000, 0x8007ff) AM_WRITE(rainbow_cchip_ram_w) @@ -313,35 +313,35 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jumping_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x09ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x10c000, 0x10ffff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) /* palette */ - AM_RANGE(0x201000, 0x203fff) AM_READ(MRA16_RAM) /* read in initial checks */ + AM_RANGE(0x000000, 0x09ffff) AM_READ(SMH_ROM) + AM_RANGE(0x10c000, 0x10ffff) AM_READ(SMH_RAM) /* main RAM */ + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0x201000, 0x203fff) AM_READ(SMH_RAM) /* read in initial checks */ AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r) AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r) AM_RANGE(0x401000, 0x401001) AM_READ(input_port_2_word_r) AM_RANGE(0x401002, 0x401003) AM_READ(input_port_3_word_r) - AM_RANGE(0x420000, 0x420001) AM_READ(MRA16_NOP) /* read, but result not used */ - AM_RANGE(0x440000, 0x4407ff) AM_READ(MRA16_RAM) + AM_RANGE(0x420000, 0x420001) AM_READ(SMH_NOP) /* read, but result not used */ + AM_RANGE(0x440000, 0x4407ff) AM_READ(SMH_RAM) AM_RANGE(0xc00000, 0xc0ffff) AM_READ(PC080SN_word_0_r) - AM_RANGE(0xd00000, 0xd01fff) AM_READ(MRA16_RAM) /* original spriteram location, needed for Attract Mode */ + AM_RANGE(0xd00000, 0xd01fff) AM_READ(SMH_RAM) /* original spriteram location, needed for Attract Mode */ ADDRESS_MAP_END static ADDRESS_MAP_START( jumping_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x09ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x10c000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x09ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x10c000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200fff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x201000, 0x203fff) AM_WRITE(MWA16_RAM) /* written in initial checks */ + AM_RANGE(0x201000, 0x203fff) AM_WRITE(SMH_RAM) /* written in initial checks */ AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE(jumping_spritectrl_w) - AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(MWA16_NOP) /* watchdog? */ + AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(SMH_NOP) /* watchdog? */ AM_RANGE(0x400006, 0x400007) AM_WRITE(jumping_sound_w) AM_RANGE(0x430000, 0x430003) AM_WRITE(PC080SN_yscroll_word_0_w) - AM_RANGE(0x440000, 0x4407ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x800000, 0x80ffff) AM_WRITE(MWA16_NOP) /* original c-chip location (not used) */ + AM_RANGE(0x440000, 0x4407ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x800000, 0x80ffff) AM_WRITE(SMH_NOP) /* original c-chip location (not used) */ AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(PC080SN_word_0_w) - AM_RANGE(0xc20000, 0xc20003) AM_WRITE(MWA16_NOP) /* seems it is a leftover from rainbow: scroll y written here too */ + AM_RANGE(0xc20000, 0xc20003) AM_WRITE(SMH_NOP) /* seems it is a leftover from rainbow: scroll y written here too */ AM_RANGE(0xc40000, 0xc40003) AM_WRITE(PC080SN_xscroll_word_0_w) - AM_RANGE(0xd00000, 0xd01fff) AM_WRITE(MWA16_RAM) /* original spriteram location, needed for Attract Mode */ + AM_RANGE(0xd00000, 0xd01fff) AM_WRITE(SMH_RAM) /* original spriteram location, needed for Attract Mode */ ADDRESS_MAP_END @@ -364,17 +364,17 @@ static READ8_HANDLER( jumping_latch_r ) static ADDRESS_MAP_START( rainbow_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK5) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK5) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0x9001, 0x9001) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0x9002, 0x9100) AM_READ(MRA8_RAM) + AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END static ADDRESS_MAP_START( rainbow_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) @@ -382,22 +382,22 @@ static ADDRESS_MAP_START( rainbow_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( jumping_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0xb000, 0xb000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xb400, 0xb400) AM_READ(YM2203_status_port_1_r) AM_RANGE(0xb800, 0xb800) AM_READ(jumping_latch_r) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( jumping_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0xb000, 0xb000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xb400, 0xb400) AM_WRITE(YM2203_control_port_1_w) AM_RANGE(0xb401, 0xb401) AM_WRITE(YM2203_write_port_1_w) - AM_RANGE(0xbc00, 0xbc00) AM_WRITE(MWA8_NOP) /* looks like a bankswitch, but sound works with or without it */ + AM_RANGE(0xbc00, 0xbc00) AM_WRITE(SMH_NOP) /* looks like a bankswitch, but sound works with or without it */ ADDRESS_MAP_END diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c index 928e7013da1..bf7064dbf5d 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -308,17 +308,17 @@ static WRITE8_HANDLER( locomotn_latch_w ) static ADDRESS_MAP_START( rallyx_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x8000, 0x8fff) AM_READWRITE(MRA8_RAM, rallyx_videoram_w) AM_BASE(&rallyx_videoram) + AM_RANGE(0x8000, 0x8fff) AM_READWRITE(SMH_RAM, rallyx_videoram_w) AM_BASE(&rallyx_videoram) AM_RANGE(0x9800, 0x9fff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa080, 0xa080) AM_READ(input_port_1_r) AM_RANGE(0xa100, 0xa100) AM_READ(input_port_2_r) - AM_RANGE(0xa000, 0xa00f) AM_WRITE(MWA8_RAM) AM_BASE(&rallyx_radarattr) + AM_RANGE(0xa000, 0xa00f) AM_WRITE(SMH_RAM) AM_BASE(&rallyx_radarattr) AM_RANGE(0xa080, 0xa080) AM_WRITE(watchdog_reset_w) AM_RANGE(0xa100, 0xa11f) AM_WRITE(pacman_sound_w) AM_BASE(&namco_soundregs) AM_RANGE(0xa130, 0xa130) AM_WRITE(rallyx_scrollx_w) AM_RANGE(0xa140, 0xa140) AM_WRITE(rallyx_scrolly_w) - AM_RANGE(0xa170, 0xa170) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xa170, 0xa170) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xa180, 0xa187) AM_WRITE(rallyx_latch_w) ADDRESS_MAP_END @@ -330,13 +330,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jungler_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8fff) AM_READWRITE(MRA8_RAM, rallyx_videoram_w) AM_BASE(&rallyx_videoram) + AM_RANGE(0x8000, 0x8fff) AM_READWRITE(SMH_RAM, rallyx_videoram_w) AM_BASE(&rallyx_videoram) AM_RANGE(0x9800, 0x9fff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa080, 0xa080) AM_READ(input_port_1_r) AM_RANGE(0xa100, 0xa100) AM_READ(input_port_2_r) AM_RANGE(0xa180, 0xa180) AM_READ(input_port_3_r) - AM_RANGE(0xa000, 0xa00f) AM_MIRROR(0x00f0) AM_WRITE(MWA8_RAM) AM_BASE(&rallyx_radarattr) // jungler writes to a03x + AM_RANGE(0xa000, 0xa00f) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&rallyx_radarattr) // jungler writes to a03x AM_RANGE(0xa080, 0xa080) AM_WRITE(watchdog_reset_w) AM_RANGE(0xa100, 0xa100) AM_WRITE(soundlatch_w) AM_RANGE(0xa130, 0xa130) AM_WRITE(rallyx_scrollx_w) /* only jungler and tactcian */ diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c index 724ca48fec3..e1f983195d1 100644 --- a/src/mame/drivers/rampart.c +++ b/src/mame/drivers/rampart.c @@ -177,10 +177,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x140000, 0x147fff) AM_MIRROR(0x438000) AM_ROM AM_RANGE(0x200000, 0x21ffff) AM_RAM AM_BASE(&rampart_bitmap) AM_RANGE(0x220000, 0x3bffff) AM_WRITENOP /* the code blasts right through this when initializing */ - AM_RANGE(0x3c0000, 0x3c07ff) AM_MIRROR(0x019800) AM_READWRITE(MRA16_RAM, atarigen_expanded_666_paletteram_w) AM_BASE(&paletteram16) - AM_RANGE(0x3e0000, 0x3e07ff) AM_MIRROR(0x010000) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0x3c0000, 0x3c07ff) AM_MIRROR(0x019800) AM_READWRITE(SMH_RAM, atarigen_expanded_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x3e0000, 0x3e07ff) AM_MIRROR(0x010000) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3e0800, 0x3e3f3f) AM_MIRROR(0x010000) AM_RAM - AM_RANGE(0x3e3f40, 0x3e3f7f) AM_MIRROR(0x010000) AM_READWRITE(MRA16_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) + AM_RANGE(0x3e3f40, 0x3e3f7f) AM_MIRROR(0x010000) AM_READWRITE(SMH_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x3e3f80, 0x3effff) AM_MIRROR(0x010000) AM_RAM AM_RANGE(0x460000, 0x460001) AM_MIRROR(0x019ffe) AM_READWRITE(adpcm_r, adpcm_w) AM_RANGE(0x480000, 0x480003) AM_MIRROR(0x019ffc) AM_WRITE(ym2413_w) diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index f373c9e96a8..8f4f1a8c8c4 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -225,8 +225,8 @@ static WRITE8_HANDLER( rastan_msm5205_stop_w ) static ADDRESS_MAP_START( rastan_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x05ffff) AM_ROM AM_RANGE(0x10c000, 0x10ffff) AM_RAM - AM_RANGE(0x200000, 0x200fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x350008, 0x350009) AM_WRITE(MWA16_NOP) /* 0 only (often) ? */ + AM_RANGE(0x200000, 0x200fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x350008, 0x350009) AM_WRITE(SMH_NOP) /* 0 only (often) ? */ AM_RANGE(0x380000, 0x380001) AM_WRITE(rastan_spritectrl_w) /* sprite palette bank, coin counters & lockout */ AM_RANGE(0x390000, 0x390001) AM_READ(input_port_0_word_r) AM_RANGE(0x390002, 0x390003) AM_READ(input_port_1_word_r) @@ -235,7 +235,7 @@ static ADDRESS_MAP_START( rastan_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x390008, 0x390009) AM_READ(input_port_4_word_r) AM_RANGE(0x39000a, 0x39000b) AM_READ(input_port_5_word_r) AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x3e0000, 0x3e0001) AM_READWRITE(MRA16_NOP, taitosound_port16_lsb_w) + AM_RANGE(0x3e0000, 0x3e0001) AM_READWRITE(SMH_NOP, taitosound_port16_lsb_w) AM_RANGE(0x3e0002, 0x3e0003) AM_READWRITE(taitosound_comm16_lsb_r, taitosound_comm16_lsb_w) AM_RANGE(0xc00000, 0xc0ffff) AM_READWRITE(PC080SN_word_0_r, PC080SN_word_0_w) AM_RANGE(0xc20000, 0xc20003) AM_WRITE(PC080SN_yscroll_word_0_w) diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index d7376beca63..8293128a45a 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -110,7 +110,7 @@ static ADDRESS_MAP_START( rbmk_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x50ffff) AM_RAM AM_RANGE(0x940000, 0x940fff) AM_RAM AM_BASE(&gms_vidram2) AM_RANGE(0x980300, 0x983fff) AM_RAM // 0x2048 words ???, byte access - AM_RANGE(0x900000, 0x900fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x900000, 0x900fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x9c0000, 0x9c0fff) AM_RAM AM_BASE(&gms_vidram) AM_RANGE(0xb00000, 0xb00001) AM_WRITE(eeprom_w) AM_RANGE(0xC00000, 0xC00001) AM_READ(input_port_0_word_r) AM_WRITE(gms_write1) diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c index 9785f760ced..be46b96838e 100644 --- a/src/mame/drivers/rcorsair.c +++ b/src/mame/drivers/rcorsair.c @@ -54,11 +54,11 @@ so even the Main CPU is unknown, assuming the 8085 is the sound CPU #include "cpu/i8085/i8085.h" static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static INPUT_PORTS_START( inports ) diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c index baeb0b477e7..2dbdbbca4fe 100644 --- a/src/mame/drivers/realbrk.c +++ b/src/mame/drivers/realbrk.c @@ -156,16 +156,16 @@ static WRITE16_HANDLER( backup_ram_w ) static ADDRESS_MAP_START( base_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE(&spriteram16) // Sprites - AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(MRA16_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x600000, 0x601fff) AM_READWRITE(MRA16_RAM,realbrk_vram_0_w) AM_BASE(&realbrk_vram_0 ) // Background (0) - AM_RANGE(0x602000, 0x603fff) AM_READWRITE(MRA16_RAM,realbrk_vram_1_w) AM_BASE(&realbrk_vram_1 ) // Background (1) - AM_RANGE(0x604000, 0x604fff) AM_READWRITE(MRA16_RAM,realbrk_vram_2_w) AM_BASE(&realbrk_vram_2 ) // Text (2) - AM_RANGE(0x606000, 0x60600f) AM_READWRITE(MRA16_RAM,realbrk_vregs_w) AM_BASE(&realbrk_vregs ) // Scroll + Video Regs + AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(SMH_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16 ) // Palette + AM_RANGE(0x600000, 0x601fff) AM_READWRITE(SMH_RAM,realbrk_vram_0_w) AM_BASE(&realbrk_vram_0 ) // Background (0) + AM_RANGE(0x602000, 0x603fff) AM_READWRITE(SMH_RAM,realbrk_vram_1_w) AM_BASE(&realbrk_vram_1 ) // Background (1) + AM_RANGE(0x604000, 0x604fff) AM_READWRITE(SMH_RAM,realbrk_vram_2_w) AM_BASE(&realbrk_vram_2 ) // Text (2) + AM_RANGE(0x606000, 0x60600f) AM_READWRITE(SMH_RAM,realbrk_vregs_w) AM_BASE(&realbrk_vregs ) // Scroll + Video Regs AM_RANGE(0x605000, 0x61ffff) AM_RAM // AM_RANGE(0x800000, 0x800001) AM_WRITE(YMZ280B_register_0_msb_w ) // YMZ280 AM_RANGE(0x800002, 0x800003) AM_READWRITE(YMZ280B_status_0_msb_r,YMZ280B_data_0_msb_w) // AM_RANGE(0xfe0000, 0xfeffff) AM_RAM // RAM - AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE(MRA16_RAM,tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers + AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE(SMH_RAM,tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers ADDRESS_MAP_END /*realbrk specific memory map*/ @@ -174,7 +174,7 @@ static ADDRESS_MAP_START( realbrk_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x80000a, 0x80000b) AM_WRITE(YM2413_data_port_0_lsb_w ) // AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r ) // P1 & P2 (Inputs) AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) // Coins - AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,MWA16_RAM) AM_BASE(&realbrk_dsw_select ) // DSW select + AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select ) // DSW select AM_RANGE(0xff0000, 0xfffbff) AM_RAM // RAM AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE(realbrk_flipscreen_w ) // Hack! Parallel port data register ADDRESS_MAP_END @@ -192,19 +192,19 @@ static ADDRESS_MAP_START( pkgnshdx_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0x800008, 0x800009) AM_WRITE(YM2413_register_port_0_lsb_w ) // YM2413 AM_RANGE(0x80000a, 0x80000b) AM_WRITE(YM2413_data_port_0_lsb_w ) // AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnshdx_input_r ) // P1 & P2 (Inputs) - AM_RANGE(0xc00004, 0xc00005) AM_WRITE(MWA16_RAM) AM_BASE(&realbrk_dsw_select) // DSW select + AM_RANGE(0xc00004, 0xc00005) AM_WRITE(SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select AM_RANGE(0xff0000, 0xfffbff) AM_READWRITE(backup_ram_dx_r,backup_ram_w) AM_BASE(&backup_ram) // RAM ADDRESS_MAP_END /*dai2kaku specific memory map*/ static ADDRESS_MAP_START( dai2kaku_mem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x605000, 0x6053ff) AM_READWRITE(MRA16_RAM,MWA16_RAM) AM_BASE(&realbrk_vram_0ras ) // rasterinfo (0) - AM_RANGE(0x605400, 0x6057ff) AM_READWRITE(MRA16_RAM,MWA16_RAM) AM_BASE(&realbrk_vram_1ras ) // rasterinfo (1) + AM_RANGE(0x605000, 0x6053ff) AM_READWRITE(SMH_RAM,SMH_RAM) AM_BASE(&realbrk_vram_0ras ) // rasterinfo (0) + AM_RANGE(0x605400, 0x6057ff) AM_READWRITE(SMH_RAM,SMH_RAM) AM_BASE(&realbrk_vram_1ras ) // rasterinfo (1) AM_RANGE(0x800008, 0x800009) AM_WRITE(YM2413_register_port_0_lsb_w ) // YM2413 AM_RANGE(0x80000a, 0x80000b) AM_WRITE(YM2413_data_port_0_lsb_w ) // AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r ) // P1 & P2 (Inputs) AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) // Coins - AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,MWA16_RAM) AM_BASE(&realbrk_dsw_select ) // DSW select + AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select ) // DSW select AM_RANGE(0xff0000, 0xfffbff) AM_RAM // RAM AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE(dai2kaku_flipscreen_w ) // Hack! Parallel port data register ADDRESS_MAP_END diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c index e4fa4348881..c56c493a52a 100644 --- a/src/mame/drivers/redalert.c +++ b/src/mame/drivers/redalert.c @@ -118,16 +118,16 @@ static WRITE8_HANDLER( redalert_interrupt_clear_w ) static ADDRESS_MAP_START( redalert_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x3fff) AM_READWRITE(MRA8_RAM, redalert_bitmap_videoram_w) AM_BASE(&redalert_bitmap_videoram) + AM_RANGE(0x2000, 0x3fff) AM_READWRITE(SMH_RAM, redalert_bitmap_videoram_w) AM_BASE(&redalert_bitmap_videoram) AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE(&redalert_charmap_videoram) AM_RANGE(0x5000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0f8f) AM_READ_PORT("C000") AM_WRITENOP AM_RANGE(0xc010, 0xc010) AM_MIRROR(0x0f8f) AM_READ_PORT("C010") AM_WRITENOP AM_RANGE(0xc020, 0xc020) AM_MIRROR(0x0f8f) AM_READ_PORT("C020") AM_WRITENOP - AM_RANGE(0xc030, 0xc030) AM_MIRROR(0x0f8f) AM_READWRITE(MRA8_NOP, redalert_audio_command_w) - AM_RANGE(0xc040, 0xc040) AM_MIRROR(0x0f8f) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&redalert_video_control) - AM_RANGE(0xc050, 0xc050) AM_MIRROR(0x0f8f) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&redalert_bitmap_color) - AM_RANGE(0xc060, 0xc060) AM_MIRROR(0x0f8f) AM_READWRITE(MRA8_NOP, redalert_voice_command_w) + AM_RANGE(0xc030, 0xc030) AM_MIRROR(0x0f8f) AM_READWRITE(SMH_NOP, redalert_audio_command_w) + AM_RANGE(0xc040, 0xc040) AM_MIRROR(0x0f8f) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&redalert_video_control) + AM_RANGE(0xc050, 0xc050) AM_MIRROR(0x0f8f) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&redalert_bitmap_color) + AM_RANGE(0xc060, 0xc060) AM_MIRROR(0x0f8f) AM_READWRITE(SMH_NOP, redalert_voice_command_w) AM_RANGE(0xc070, 0xc070) AM_MIRROR(0x0f8f) AM_READWRITE(redalert_interrupt_clear_r, redalert_interrupt_clear_w) AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION(REGION_CPU1, 0x8000) ADDRESS_MAP_END @@ -135,18 +135,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( demoneye_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_RAM - AM_RANGE(0x2000, 0x3fff) AM_READWRITE(MRA8_RAM, redalert_bitmap_videoram_w) AM_BASE(&redalert_bitmap_videoram) + AM_RANGE(0x2000, 0x3fff) AM_READWRITE(SMH_RAM, redalert_bitmap_videoram_w) AM_BASE(&redalert_bitmap_videoram) AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(&redalert_charmap_videoram) AM_RANGE(0x6000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x0f8f) AM_READ_PORT("C000") AM_WRITENOP AM_RANGE(0xc010, 0xc010) AM_MIRROR(0x0f8f) AM_READ_PORT("C010") AM_WRITENOP AM_RANGE(0xc020, 0xc020) AM_MIRROR(0x0f8f) AM_READ_PORT("C020") AM_WRITENOP - AM_RANGE(0xc030, 0xc030) AM_MIRROR(0x0f8f) AM_READWRITE(MRA8_NOP, demoneye_audio_command_w) - AM_RANGE(0xc040, 0xc040) AM_MIRROR(0x0f8f) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&redalert_video_control) - AM_RANGE(0xc050, 0xc050) AM_MIRROR(0x0f8f) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&redalert_bitmap_color) - AM_RANGE(0xc060, 0xc060) AM_MIRROR(0x0f80) AM_READWRITE(MRA8_NOP, MWA8_NOP) /* unknown */ - AM_RANGE(0xc061, 0xc061) AM_MIRROR(0x0f80) AM_READWRITE(MRA8_NOP, MWA8_NOP) /* unknown */ - AM_RANGE(0xc062, 0xc062) AM_MIRROR(0x0f80) AM_READWRITE(MRA8_NOP, MWA8_NOP) /* unknown */ + AM_RANGE(0xc030, 0xc030) AM_MIRROR(0x0f8f) AM_READWRITE(SMH_NOP, demoneye_audio_command_w) + AM_RANGE(0xc040, 0xc040) AM_MIRROR(0x0f8f) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&redalert_video_control) + AM_RANGE(0xc050, 0xc050) AM_MIRROR(0x0f8f) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&redalert_bitmap_color) + AM_RANGE(0xc060, 0xc060) AM_MIRROR(0x0f80) AM_READWRITE(SMH_NOP, SMH_NOP) /* unknown */ + AM_RANGE(0xc061, 0xc061) AM_MIRROR(0x0f80) AM_READWRITE(SMH_NOP, SMH_NOP) /* unknown */ + AM_RANGE(0xc062, 0xc062) AM_MIRROR(0x0f80) AM_READWRITE(SMH_NOP, SMH_NOP) /* unknown */ AM_RANGE(0xc070, 0xc070) AM_MIRROR(0x0f8f) AM_READWRITE(redalert_interrupt_clear_r, redalert_interrupt_clear_w) /* probably not correct */ AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION(REGION_CPU1, 0x8000) ADDRESS_MAP_END diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c index e9e4ecb0edd..03c2b5dc6d8 100644 --- a/src/mame/drivers/redclash.c +++ b/src/mame/drivers/redclash.c @@ -59,23 +59,23 @@ static WRITE8_HANDLER( irqack_w ) static ADDRESS_MAP_START( zero_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_ROM) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_RANGE(0x4800, 0x4800) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x4801, 0x4801) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0x4802, 0x4802) AM_READ(input_port_2_r) /* DSW0 */ AM_RANGE(0x4803, 0x4803) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) /* video RAM */ + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) /* video RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( zero_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x3800, 0x3bff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x3800, 0x3bff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x4000, 0x43ff) AM_WRITE(redclash_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x5000, 0x5007) AM_WRITE(MWA8_NOP) /* to sound board */ + AM_RANGE(0x5000, 0x5007) AM_WRITE(SMH_NOP) /* to sound board */ AM_RANGE(0x5800, 0x5800) AM_WRITE(redclash_star0_w) - AM_RANGE(0x5801, 0x5804) AM_WRITE(MWA8_NOP) /* to sound board */ + AM_RANGE(0x5801, 0x5804) AM_WRITE(SMH_NOP) /* to sound board */ AM_RANGE(0x5805, 0x5805) AM_WRITE(redclash_star1_w) AM_RANGE(0x5806, 0x5806) AM_WRITE(redclash_star2_w) AM_RANGE(0x5807, 0x5807) AM_WRITE(redclash_flipscreen_w) @@ -84,28 +84,28 @@ static ADDRESS_MAP_START( zero_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM) AM_RANGE(0x4800, 0x4800) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x4801, 0x4801) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0x4802, 0x4802) AM_READ(input_port_2_r) /* DSW0 */ AM_RANGE(0x4803, 0x4803) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) /* video RAM */ - AM_RANGE(0x6000, 0x67ff) AM_READ(MRA8_RAM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) /* video RAM */ + AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) -// AM_RANGE(0x3000, 0x3000) AM_WRITE(MWA8_NOP) -// AM_RANGE(0x3800, 0x3800) AM_WRITE(MWA8_NOP) + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) +// AM_RANGE(0x3000, 0x3000) AM_WRITE(SMH_NOP) +// AM_RANGE(0x3800, 0x3800) AM_WRITE(SMH_NOP) AM_RANGE(0x4000, 0x43ff) AM_WRITE(redclash_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x5000, 0x5007) AM_WRITE(MWA8_NOP) /* to sound board */ + AM_RANGE(0x5000, 0x5007) AM_WRITE(SMH_NOP) /* to sound board */ AM_RANGE(0x5800, 0x5800) AM_WRITE(redclash_star0_w) AM_RANGE(0x5801, 0x5801) AM_WRITE(redclash_gfxbank_w) AM_RANGE(0x5805, 0x5805) AM_WRITE(redclash_star1_w) AM_RANGE(0x5806, 0x5806) AM_WRITE(redclash_star2_w) AM_RANGE(0x5807, 0x5807) AM_WRITE(redclash_flipscreen_w) - AM_RANGE(0x6000, 0x67ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6800, 0x6bff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x6000, 0x67ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x6800, 0x6bff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x7000, 0x7000) AM_WRITE(redclash_star_reset_w) AM_RANGE(0x7800, 0x7800) AM_WRITE(irqack_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c index f9ec2e79388..399c6c7d77d 100644 --- a/src/mame/drivers/relief.c +++ b/src/mame/drivers/relief.c @@ -187,15 +187,15 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x260010, 0x260011) AM_READ(special_port2_r) AM_RANGE(0x260012, 0x260013) AM_READ(input_port_3_word_r) AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(MRA16_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(SMH_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(atarivc_r, atarivc_w) AM_BASE(&atarivc_data) - AM_RANGE(0x3f0000, 0x3f1fff) AM_READWRITE(MRA16_RAM, atarigen_playfield2_latched_msb_w) AM_BASE(&atarigen_playfield2) - AM_RANGE(0x3f2000, 0x3f3fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_latched_lsb_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0x3f4000, 0x3f5fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_dual_upper_w) AM_BASE(&atarigen_playfield_upper) - AM_RANGE(0x3f6000, 0x3f67ff) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0x3f0000, 0x3f1fff) AM_READWRITE(SMH_RAM, atarigen_playfield2_latched_msb_w) AM_BASE(&atarigen_playfield2) + AM_RANGE(0x3f2000, 0x3f3fff) AM_READWRITE(SMH_RAM, atarigen_playfield_latched_lsb_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0x3f4000, 0x3f5fff) AM_READWRITE(SMH_RAM, atarigen_playfield_dual_upper_w) AM_BASE(&atarigen_playfield_upper) + AM_RANGE(0x3f6000, 0x3f67ff) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3f6800, 0x3f8eff) AM_RAM AM_RANGE(0x3f8f00, 0x3f8f7f) AM_RAM AM_BASE(&atarivc_eof_data) - AM_RANGE(0x3f8f80, 0x3f8fff) AM_READWRITE(MRA16_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) + AM_RANGE(0x3f8f80, 0x3f8fff) AM_READWRITE(SMH_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x3f9000, 0x3fffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c index 11b5a21e2f9..be1c61b335e 100644 --- a/src/mame/drivers/renegade.c +++ b/src/mame/drivers/renegade.c @@ -518,21 +518,21 @@ static WRITE8_HANDLER( renegade_coin_counter_w ) /********************************************************************************************/ static ADDRESS_MAP_START( main_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x37ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x37ff) AM_READ(SMH_RAM) AM_RANGE(0x3800, 0x3800) AM_READ(input_port_0_r) /* Player#1 controls, P1,P2 start */ AM_RANGE(0x3801, 0x3801) AM_READ(input_port_1_r) /* Player#2 controls, coin triggers */ AM_RANGE(0x3802, 0x3802) AM_READ(input_port_2_r) /* DIP2 various IO ports */ AM_RANGE(0x3803, 0x3803) AM_READ(input_port_3_r) /* DIP1 */ AM_RANGE(0x3804, 0x3804) AM_READ(mcu_r) AM_RANGE(0x3805, 0x3805) AM_READ(mcu_reset_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( main_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x17ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1800, 0x1fff) AM_WRITE(renegade_videoram2_w) AM_BASE(&renegade_videoram2) - AM_RANGE(0x2000, 0x27ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) + AM_RANGE(0x2000, 0x27ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_RANGE(0x2800, 0x2fff) AM_WRITE(renegade_videoram_w) AM_BASE(&videoram) AM_RANGE(0x3000, 0x30ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram) AM_RANGE(0x3100, 0x31ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) @@ -542,27 +542,27 @@ static ADDRESS_MAP_START( main_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3803, 0x3803) AM_WRITE(renegade_flipscreen_w) AM_RANGE(0x3804, 0x3804) AM_WRITE(mcu_w) AM_RANGE(0x3805, 0x3805) AM_WRITE(bankswitch_w) - AM_RANGE(0x3806, 0x3806) AM_WRITE(MWA8_NOP) // ?? watchdog + AM_RANGE(0x3806, 0x3806) AM_WRITE(SMH_NOP) // ?? watchdog AM_RANGE(0x3807, 0x3807) AM_WRITE(renegade_coin_counter_w) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r) AM_RANGE(0x2801, 0x2801) AM_READ(YM3526_status_port_0_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1800, 0x1800) AM_WRITE(MWA8_NOP) // this gets written the same values as 0x2000 + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1800, 0x1800) AM_WRITE(SMH_NOP) // this gets written the same values as 0x2000 AM_RANGE(0x2000, 0x2000) AM_WRITE(adpcm_play_w) AM_RANGE(0x2800, 0x2800) AM_WRITE(YM3526_control_port_0_w) AM_RANGE(0x2801, 0x2801) AM_WRITE(YM3526_write_port_0_w) - AM_RANGE(0x3000, 0x3000) AM_WRITE(MWA8_NOP) /* adpcm related? stereo pan? */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x3000, 0x3000) AM_WRITE(SMH_NOP) /* adpcm related? stereo pan? */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c index 6dadd69d3c7..a9ff13ebf4c 100644 --- a/src/mame/drivers/retofinv.c +++ b/src/mame/drivers/retofinv.c @@ -131,13 +131,13 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7fff, 0x7fff) AM_WRITE(coincounter_w) AM_RANGE(0x7b00, 0x7bff) AM_ROM /* space for diagnostic ROM? The code looks */ /* for a string here, and jumps if it's present */ - AM_RANGE(0x8000, 0x87ff) AM_READWRITE(MRA8_RAM, retofinv_fg_videoram_w) AM_SHARE(2) AM_BASE(&retofinv_fg_videoram) + AM_RANGE(0x8000, 0x87ff) AM_READWRITE(SMH_RAM, retofinv_fg_videoram_w) AM_SHARE(2) AM_BASE(&retofinv_fg_videoram) AM_RANGE(0x8800, 0x9fff) AM_RAM AM_SHARE(1) AM_BASE(&retofinv_sharedram) - AM_RANGE(0xa000, 0xa7ff) AM_READWRITE(MRA8_RAM, retofinv_bg_videoram_w) AM_SHARE(3) AM_BASE(&retofinv_bg_videoram) + AM_RANGE(0xa000, 0xa7ff) AM_READWRITE(SMH_RAM, retofinv_bg_videoram_w) AM_SHARE(3) AM_BASE(&retofinv_bg_videoram) AM_RANGE(0xb800, 0xb802) AM_WRITE(retofinv_gfx_ctrl_w) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_1_r) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_2_r) - AM_RANGE(0xc002, 0xc002) AM_READ(MRA8_NOP) /* bit 7 must be 0, otherwise game resets */ + AM_RANGE(0xc002, 0xc002) AM_READ(SMH_NOP) /* bit 7 must be 0, otherwise game resets */ AM_RANGE(0xc003, 0xc003) AM_READ(retofinv_mcu_status_r) AM_RANGE(0xc004, 0xc004) AM_READ(input_port_0_r) AM_RANGE(0xc005, 0xc005) AM_READ(input_port_3_r) @@ -158,9 +158,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x8000, 0x87ff) AM_READWRITE(MRA8_RAM, retofinv_fg_videoram_w) AM_SHARE(2) + AM_RANGE(0x8000, 0x87ff) AM_READWRITE(SMH_RAM, retofinv_fg_videoram_w) AM_SHARE(2) AM_RANGE(0x8800, 0x9fff) AM_RAM AM_SHARE(1) - AM_RANGE(0xa000, 0xa7ff) AM_READWRITE(MRA8_RAM, retofinv_bg_videoram_w) AM_SHARE(3) + AM_RANGE(0xa000, 0xa7ff) AM_READWRITE(SMH_RAM, retofinv_bg_videoram_w) AM_SHARE(3) AM_RANGE(0xc804, 0xc804) AM_WRITE(irq1_ack_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index c12ee56b336..1634a7a53e2 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -169,64 +169,64 @@ static MACHINE_RESET( themj ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_READ(MRA8_ROM) - AM_RANGE(0xa000, 0xa7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xa800, 0xb7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) /* rmhaisei only */ + AM_RANGE(0x0000, 0x9fff) AM_READ(SMH_ROM) + AM_RANGE(0xa000, 0xa7ff) AM_READ(SMH_RAM) + AM_RANGE(0xa800, 0xb7ff) AM_READ(SMH_RAM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) /* rmhaisei only */ ADDRESS_MAP_END static ADDRESS_MAP_START( themj_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK1) - AM_RANGE(0xa000, 0xa7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xa800, 0xb7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_BANK2) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK1) + AM_RANGE(0xa000, 0xa7ff) AM_READ(SMH_RAM) + AM_RANGE(0xa800, 0xb7ff) AM_READ(SMH_RAM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_BANK2) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xa000, 0xa7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xa000, 0xa7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa800, 0xafff) AM_WRITE(rmhaihai_colorram_w) AM_BASE(&colorram) AM_RANGE(0xb000, 0xb7ff) AM_WRITE(rmhaihai_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xb83c, 0xb83c) AM_WRITE(MWA8_NOP) // ?? - AM_RANGE(0xbc00, 0xbc00) AM_WRITE(MWA8_NOP) // ?? - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) /* rmhaisei only */ + AM_RANGE(0xb83c, 0xb83c) AM_WRITE(SMH_NOP) // ?? + AM_RANGE(0xbc00, 0xbc00) AM_WRITE(SMH_NOP) // ?? + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) /* rmhaisei only */ ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(samples_r) AM_RANGE(0x8000, 0x8000) AM_READ(keyboard_r) - AM_RANGE(0x8001, 0x8001) AM_READ(MRA8_NOP) // ?? + AM_RANGE(0x8001, 0x8001) AM_READ(SMH_NOP) // ?? AM_RANGE(0x8020, 0x8020) AM_READ(AY8910_read_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x8000, 0x8000) AM_WRITE(MWA8_NOP) // ?? + AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0x8001, 0x8001) AM_WRITE(keyboard_w) AM_RANGE(0x8020, 0x8020) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x8021, 0x8021) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x8040, 0x8040) AM_WRITE(adpcm_w) AM_RANGE(0x8060, 0x8060) AM_WRITE(ctrl_w) - AM_RANGE(0x8080, 0x8080) AM_WRITE(MWA8_NOP) // ?? - AM_RANGE(0xbc04, 0xbc04) AM_WRITE(MWA8_NOP) // ?? - AM_RANGE(0xbc0c, 0xbc0c) AM_WRITE(MWA8_NOP) // ?? + AM_RANGE(0x8080, 0x8080) AM_WRITE(SMH_NOP) // ?? + AM_RANGE(0xbc04, 0xbc04) AM_WRITE(SMH_NOP) // ?? + AM_RANGE(0xbc0c, 0xbc0c) AM_WRITE(SMH_NOP) // ?? ADDRESS_MAP_END static ADDRESS_MAP_START( themj_writeport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x8000, 0x8000) AM_WRITE(MWA8_NOP) // ?? + AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0x8001, 0x8001) AM_WRITE(keyboard_w) AM_RANGE(0x8020, 0x8020) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x8021, 0x8021) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x8040, 0x8040) AM_WRITE(adpcm_w) AM_RANGE(0x8060, 0x8060) AM_WRITE(ctrl_w) - AM_RANGE(0x8080, 0x8080) AM_WRITE(MWA8_NOP) // ?? + AM_RANGE(0x8080, 0x8080) AM_WRITE(SMH_NOP) // ?? AM_RANGE(0x80a0, 0x80a0) AM_WRITE(themj_rombank_w) - AM_RANGE(0xbc04, 0xbc04) AM_WRITE(MWA8_NOP) // ?? - AM_RANGE(0xbc0c, 0xbc0c) AM_WRITE(MWA8_NOP) // ?? + AM_RANGE(0xbc04, 0xbc04) AM_WRITE(SMH_NOP) // ?? + AM_RANGE(0xbc0c, 0xbc0c) AM_WRITE(SMH_NOP) // ?? ADDRESS_MAP_END static INPUT_PORTS_START( rmhaihai ) diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index bae8575bb1e..b5dedb8147c 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -105,38 +105,38 @@ static ADDRESS_MAP_START( rockrage_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READ(K007342_r) /* Color RAM + Video RAM */ AM_RANGE(0x2000, 0x21ff) AM_READ(K007420_r) /* Sprite RAM */ AM_RANGE(0x2200, 0x23ff) AM_READ(K007342_scroll_r) /* Scroll RAM */ - AM_RANGE(0x2400, 0x247f) AM_READ(MRA8_RAM) /* Palette */ + AM_RANGE(0x2400, 0x247f) AM_READ(SMH_RAM) /* Palette */ AM_RANGE(0x2e01, 0x2e01) AM_READ(input_port_3_r) /* 1P controls */ AM_RANGE(0x2e02, 0x2e02) AM_READ(input_port_4_r) /* 2P controls */ AM_RANGE(0x2e03, 0x2e03) AM_READ(input_port_1_r) /* DISPW #2 */ AM_RANGE(0x2e40, 0x2e40) AM_READ(input_port_0_r) /* DIPSW #1 */ AM_RANGE(0x2e00, 0x2e00) AM_READ(input_port_2_r) /* coinsw, testsw, startsw */ - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) /* RAM */ - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) /* RAM */ + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( rockrage_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_WRITE(K007342_w) /* Color RAM + Video RAM */ AM_RANGE(0x2000, 0x21ff) AM_WRITE(K007420_w) /* Sprite RAM */ AM_RANGE(0x2200, 0x23ff) AM_WRITE(K007342_scroll_w) /* Scroll RAM */ - AM_RANGE(0x2400, 0x247f) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram)/* palette */ + AM_RANGE(0x2400, 0x247f) AM_WRITE(SMH_RAM) AM_BASE(&paletteram)/* palette */ AM_RANGE(0x2600, 0x2607) AM_WRITE(K007342_vreg_w) /* Video Registers */ AM_RANGE(0x2e80, 0x2e80) AM_WRITE(rockrage_sh_irqtrigger_w)/* cause interrupt on audio CPU */ AM_RANGE(0x2ec0, 0x2ec0) AM_WRITE(watchdog_reset_w) /* watchdog reset */ 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_WRITE(MWA8_RAM) /* RAM */ - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_RAM) /* banked ROM */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x4000, 0x5fff) AM_WRITE(SMH_RAM) /* RAM */ + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_RAM) /* banked ROM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( rockrage_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3000, 0x3000) AM_READ(rockrage_VLM5030_busy_r)/* VLM5030 */ AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0x6001, 0x6001) AM_READ(YM2151_status_port_0_r) /* YM 2151 */ - AM_RANGE(0x7000, 0x77ff) AM_READ(MRA8_RAM) /* RAM */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x7000, 0x77ff) AM_READ(SMH_RAM) /* RAM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( rockrage_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) @@ -144,8 +144,8 @@ static ADDRESS_MAP_START( rockrage_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x4000) AM_WRITE(rockrage_speech_w) /* VLM5030 */ AM_RANGE(0x6000, 0x6000) AM_WRITE(YM2151_register_port_0_w) /* YM 2151 */ AM_RANGE(0x6001, 0x6001) AM_WRITE(YM2151_data_port_0_w) /* YM 2151 */ - AM_RANGE(0x7000, 0x77ff) AM_WRITE(MWA8_RAM) /* RAM */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x7000, 0x77ff) AM_WRITE(SMH_RAM) /* RAM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END /*************************************************************************** diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c index 71017c1663c..ea1b7191657 100644 --- a/src/mame/drivers/rocnrope.c +++ b/src/mame/drivers/rocnrope.c @@ -37,27 +37,27 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3083, 0x3083) AM_READ(input_port_3_r) /* DSW 0 */ AM_RANGE(0x3000, 0x3000) AM_READ(input_port_4_r) /* DSW 1 */ AM_RANGE(0x3100, 0x3100) AM_READ(input_port_5_r) /* DSW 2 */ - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x4000, 0x402f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x4400, 0x442f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x4000, 0x402f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x4400, 0x442f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(rocnrope_colorram_w) AM_BASE(&colorram) AM_RANGE(0x4c00, 0x4fff) AM_WRITE(rocnrope_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x5000, 0x5fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5000, 0x5fff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_WRITE(watchdog_reset_w) AM_RANGE(0x8080, 0x8080) AM_WRITE(rocnrope_flipscreen_w) AM_RANGE(0x8081, 0x8081) AM_WRITE(timeplt_sh_irqtrigger_w) /* cause interrupt on audio CPU */ - AM_RANGE(0x8082, 0x8082) AM_WRITE(MWA8_NOP) /* interrupt acknowledge??? */ - AM_RANGE(0x8083, 0x8083) AM_WRITE(MWA8_NOP) /* Coin counter 1 */ - AM_RANGE(0x8084, 0x8084) AM_WRITE(MWA8_NOP) /* Coin counter 2 */ + AM_RANGE(0x8082, 0x8082) AM_WRITE(SMH_NOP) /* interrupt acknowledge??? */ + AM_RANGE(0x8083, 0x8083) AM_WRITE(SMH_NOP) /* Coin counter 1 */ + AM_RANGE(0x8084, 0x8084) AM_WRITE(SMH_NOP) /* Coin counter 2 */ AM_RANGE(0x8087, 0x8087) AM_WRITE(interrupt_enable_w) AM_RANGE(0x8100, 0x8100) AM_WRITE(soundlatch_w) AM_RANGE(0x8182, 0x818d) AM_WRITE(rocnrope_interrupt_vector_w) - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index 98b9034ec7c..703a8245e62 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -132,217 +132,217 @@ static READ16_HANDLER( schmeisr_control_r ) { return readinputport(1); } /**********************************************************************************/ static ADDRESS_MAP_START( rohga_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) AM_RANGE(0x280000, 0x2807ff) AM_MIRROR(0x800) AM_READ(deco16_104_rohga_prot_r) /* Protection device */ AM_RANGE(0x2c0000, 0x2c0001) AM_READ(rohga_dip3_r) - AM_RANGE(0x321100, 0x321101) AM_READ(MRA16_NOP) /* Irq ack? Value not used */ - AM_RANGE(0x3c0000, 0x3c1fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3c2000, 0x3c2fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3c4000, 0x3c4fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3c6000, 0x3c6fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3c8000, 0x3c8fff) AM_MIRROR(0x1000) AM_READ(MRA16_RAM) - AM_RANGE(0x3ca000, 0x3cafff) AM_MIRROR(0x1000) AM_READ(MRA16_RAM) - AM_RANGE(0x3cc000, 0x3ccfff) AM_MIRROR(0x1000) AM_READ(MRA16_RAM) - AM_RANGE(0x3ce000, 0x3cefff) AM_MIRROR(0x1000) AM_READ(MRA16_RAM) - AM_RANGE(0x3d0000, 0x3d0fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3e0000, 0x3e1fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3f0000, 0x3f3fff) AM_READ(MRA16_RAM) + AM_RANGE(0x321100, 0x321101) AM_READ(SMH_NOP) /* Irq ack? Value not used */ + AM_RANGE(0x3c0000, 0x3c1fff) AM_READ(SMH_RAM) + AM_RANGE(0x3c2000, 0x3c2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3c4000, 0x3c4fff) AM_READ(SMH_RAM) + AM_RANGE(0x3c6000, 0x3c6fff) AM_READ(SMH_RAM) + AM_RANGE(0x3c8000, 0x3c8fff) AM_MIRROR(0x1000) AM_READ(SMH_RAM) + AM_RANGE(0x3ca000, 0x3cafff) AM_MIRROR(0x1000) AM_READ(SMH_RAM) + AM_RANGE(0x3cc000, 0x3ccfff) AM_MIRROR(0x1000) AM_READ(SMH_RAM) + AM_RANGE(0x3ce000, 0x3cefff) AM_MIRROR(0x1000) AM_READ(SMH_RAM) + AM_RANGE(0x3d0000, 0x3d0fff) AM_READ(SMH_RAM) + AM_RANGE(0x3e0000, 0x3e1fff) AM_READ(SMH_RAM) + AM_RANGE(0x3f0000, 0x3f3fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( rohga_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x20000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) - AM_RANGE(0x240000, 0x24000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x20000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x240000, 0x24000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) AM_RANGE(0x280000, 0x2807ff) AM_MIRROR(0x800) AM_WRITE(deco16_104_rohga_prot_w) AM_BASE(&deco16_prot_ram) /* Protection writes */ AM_RANGE(0x300000, 0x300001) AM_WRITE(rohga_buffer_spriteram16_w) /* write 1 for sprite dma */ - AM_RANGE(0x310000, 0x310009) AM_WRITE(MWA16_NOP) /* Palette control? */ + AM_RANGE(0x310000, 0x310009) AM_WRITE(SMH_NOP) /* Palette control? */ AM_RANGE(0x31000a, 0x31000b) AM_WRITE(deco16_palette_dma_w) /* Write 1111 for dma? (Or any value?) */ - AM_RANGE(0x320000, 0x320001) AM_WRITE(MWA16_NOP) /* ? */ + AM_RANGE(0x320000, 0x320001) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0x322000, 0x322001) AM_WRITE(deco16_priority_w) AM_RANGE(0x3c0000, 0x3c1fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x3c2000, 0x3c2fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) AM_RANGE(0x3c4000, 0x3c4fff) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x3c6000, 0x3c6fff) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x3c8000, 0x3c8fff) AM_MIRROR(0x1000) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x3ca000, 0x3cafff) AM_MIRROR(0x1000) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x3cc000, 0x3ccfff) AM_MIRROR(0x1000) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf3_rowscroll) - AM_RANGE(0x3ce000, 0x3cefff) AM_MIRROR(0x1000) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) - AM_RANGE(0x3d0000, 0x3d07ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x3c8000, 0x3c8fff) AM_MIRROR(0x1000) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x3ca000, 0x3cafff) AM_MIRROR(0x1000) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x3cc000, 0x3ccfff) AM_MIRROR(0x1000) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf3_rowscroll) + AM_RANGE(0x3ce000, 0x3cefff) AM_MIRROR(0x1000) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x3d0000, 0x3d07ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x3e0000, 0x3e1fff) AM_WRITE(deco16_buffered_palette_w) AM_BASE(&paletteram16) - AM_RANGE(0x3f0000, 0x3f3fff) AM_WRITE(MWA16_RAM) /* Main ram */ + AM_RANGE(0x3f0000, 0x3f3fff) AM_WRITE(SMH_RAM) /* Main ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( wizdfire_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) - AM_RANGE(0x202000, 0x202fff) AM_READ(MRA16_RAM) - AM_RANGE(0x208000, 0x208fff) AM_READ(MRA16_RAM) - AM_RANGE(0x20a000, 0x20afff) AM_READ(MRA16_RAM) - AM_RANGE(0x20c000, 0x20cfff) AM_READ(MRA16_RAM) - AM_RANGE(0x20e000, 0x20efff) AM_READ(MRA16_RAM) - AM_RANGE(0x340000, 0x3407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x360000, 0x3607ff) AM_READ(MRA16_RAM) - AM_RANGE(0x380000, 0x381fff) AM_READ(MRA16_RAM) - AM_RANGE(0xfdc000, 0xfe3fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) + AM_RANGE(0x202000, 0x202fff) AM_READ(SMH_RAM) + AM_RANGE(0x208000, 0x208fff) AM_READ(SMH_RAM) + AM_RANGE(0x20a000, 0x20afff) AM_READ(SMH_RAM) + AM_RANGE(0x20c000, 0x20cfff) AM_READ(SMH_RAM) + AM_RANGE(0x20e000, 0x20efff) AM_READ(SMH_RAM) + AM_RANGE(0x340000, 0x3407ff) AM_READ(SMH_RAM) + AM_RANGE(0x360000, 0x3607ff) AM_READ(SMH_RAM) + AM_RANGE(0x380000, 0x381fff) AM_READ(SMH_RAM) + AM_RANGE(0xfdc000, 0xfe3fff) AM_READ(SMH_RAM) AM_RANGE(0xfe4000, 0xfe47ff) AM_READ(deco16_104_prot_r) /* Protection device */ - AM_RANGE(0xfe5000, 0xfeffff) AM_READ(MRA16_RAM) + AM_RANGE(0xfe5000, 0xfeffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( wizdfire_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x200fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x202000, 0x202fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) AM_RANGE(0x208000, 0x208fff) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x20a000, 0x20afff) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x20b000, 0x20b3ff) AM_WRITE(MWA16_RAM) /* ? Always 0 written */ - AM_RANGE(0x20c000, 0x20c7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf3_rowscroll) - AM_RANGE(0x20e000, 0x20e7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x20b000, 0x20b3ff) AM_WRITE(SMH_RAM) /* ? Always 0 written */ + AM_RANGE(0x20c000, 0x20c7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf3_rowscroll) + AM_RANGE(0x20e000, 0x20e7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) - AM_RANGE(0x300000, 0x30000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) - AM_RANGE(0x310000, 0x31000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x300000, 0x30000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x310000, 0x31000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) AM_RANGE(0x320000, 0x320001) AM_WRITE(deco16_priority_w) /* Priority */ - AM_RANGE(0x320002, 0x320003) AM_WRITE(MWA16_NOP) /* ? */ - AM_RANGE(0x320004, 0x320005) AM_WRITE(MWA16_NOP) /* VBL IRQ ack */ + AM_RANGE(0x320002, 0x320003) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0x320004, 0x320005) AM_WRITE(SMH_NOP) /* VBL IRQ ack */ - AM_RANGE(0x340000, 0x3407ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x340000, 0x3407ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x350000, 0x350001) AM_WRITE(buffer_spriteram16_w) /* Triggers DMA for spriteram */ - AM_RANGE(0x360000, 0x3607ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x360000, 0x3607ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) AM_RANGE(0x370000, 0x370001) AM_WRITE(buffer_spriteram16_2_w) /* Triggers DMA for spriteram */ AM_RANGE(0x380000, 0x381fff) AM_WRITE(deco16_buffered_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x390008, 0x390009) AM_WRITE(deco16_palette_dma_w) AM_RANGE(0xfe4000, 0xfe47ff) AM_WRITE(deco16_104_prot_w) AM_BASE(&deco16_prot_ram) /* Protection writes */ - AM_RANGE(0xfdc000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Main ram */ + AM_RANGE(0xfdc000, 0xfeffff) AM_WRITE(SMH_RAM) /* Main ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( nitrobal_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) - AM_RANGE(0x202000, 0x202fff) AM_READ(MRA16_RAM) - AM_RANGE(0x204000, 0x2047ff) AM_READ(MRA16_RAM) - AM_RANGE(0x206000, 0x2067ff) AM_READ(MRA16_RAM) - AM_RANGE(0x208000, 0x208fff) AM_READ(MRA16_RAM) - AM_RANGE(0x20a000, 0x20afff) AM_READ(MRA16_RAM) - AM_RANGE(0x20c000, 0x20c7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x20e000, 0x20e7ff) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) + AM_RANGE(0x202000, 0x202fff) AM_READ(SMH_RAM) + AM_RANGE(0x204000, 0x2047ff) AM_READ(SMH_RAM) + AM_RANGE(0x206000, 0x2067ff) AM_READ(SMH_RAM) + AM_RANGE(0x208000, 0x208fff) AM_READ(SMH_RAM) + AM_RANGE(0x20a000, 0x20afff) AM_READ(SMH_RAM) + AM_RANGE(0x20c000, 0x20c7ff) AM_READ(SMH_RAM) + AM_RANGE(0x20e000, 0x20e7ff) AM_READ(SMH_RAM) - AM_RANGE(0x300000, 0x30000f) AM_READ(MRA16_RAM) - AM_RANGE(0x310000, 0x31000f) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x30000f) AM_READ(SMH_RAM) + AM_RANGE(0x310000, 0x31000f) AM_READ(SMH_RAM) AM_RANGE(0x320000, 0x320001) AM_READ(nitrobal_control_r) - AM_RANGE(0x340000, 0x3407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x360000, 0x3607ff) AM_READ(MRA16_RAM) - AM_RANGE(0x380000, 0x381fff) AM_READ(MRA16_RAM) + AM_RANGE(0x340000, 0x3407ff) AM_READ(SMH_RAM) + AM_RANGE(0x360000, 0x3607ff) AM_READ(SMH_RAM) + AM_RANGE(0x380000, 0x381fff) AM_READ(SMH_RAM) - AM_RANGE(0xfec000, 0xff3fff) AM_READ(MRA16_RAM) + AM_RANGE(0xfec000, 0xff3fff) AM_READ(SMH_RAM) AM_RANGE(0xff4000, 0xff47ff) AM_READ(deco16_146_nitroball_prot_r) /* Protection device */ - AM_RANGE(0xff8000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xff8000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( nitrobal_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x200fff) AM_MIRROR(0x1000) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x202000, 0x2027ff) AM_MIRROR(0x800) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) AM_RANGE(0x208000, 0x2087ff) AM_MIRROR(0x800) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x20a000, 0x20a7ff) AM_MIRROR(0x800) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x204000, 0x2047ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x206000, 0x2067ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x20c000, 0x20c7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf3_rowscroll) - AM_RANGE(0x20e000, 0x20e7ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x204000, 0x2047ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x206000, 0x2067ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x20c000, 0x20c7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf3_rowscroll) + AM_RANGE(0x20e000, 0x20e7ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) - AM_RANGE(0x300000, 0x30000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) - AM_RANGE(0x310000, 0x31000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x300000, 0x30000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x310000, 0x31000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) AM_RANGE(0x320000, 0x320001) AM_WRITE(deco16_priority_w) /* Priority */ - AM_RANGE(0x320002, 0x320003) AM_WRITE(MWA16_NOP) /* ? */ - AM_RANGE(0x320004, 0x320005) AM_WRITE(MWA16_NOP) /* VBL IRQ ack */ + AM_RANGE(0x320002, 0x320003) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0x320004, 0x320005) AM_WRITE(SMH_NOP) /* VBL IRQ ack */ - AM_RANGE(0x340000, 0x3407ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x340000, 0x3407ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x350000, 0x350001) AM_WRITE(buffer_spriteram16_w) /* Triggers DMA for spriteram */ - AM_RANGE(0x360000, 0x3607ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x360000, 0x3607ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) AM_RANGE(0x370000, 0x370001) AM_WRITE(buffer_spriteram16_2_w) /* Triggers DMA for spriteram */ AM_RANGE(0x380000, 0x381fff) AM_WRITE(deco16_buffered_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x390008, 0x390009) AM_WRITE(deco16_palette_dma_w) - AM_RANGE(0xfec000, 0xff3fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xfec000, 0xff3fff) AM_WRITE(SMH_RAM) AM_RANGE(0xff4000, 0xff47ff) AM_MIRROR(0x800) AM_WRITE(deco16_146_nitroball_prot_w) AM_BASE(&deco16_prot_ram) /* Protection writes */ - AM_RANGE(0xff8000, 0xffffff) AM_WRITE(MWA16_RAM) /* Main ram */ + AM_RANGE(0xff8000, 0xffffff) AM_WRITE(SMH_RAM) /* Main ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( schmeisr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x280000, 0x2807ff) AM_READ(deco16_104_rohga_prot_r) /* Protection device */ AM_RANGE(0x2c0000, 0x2c0001) AM_READ(rohga_dip3_r) AM_RANGE(0x300000, 0x300001) AM_READ(nitrobal_control_r) AM_RANGE(0x310002, 0x310003) AM_READ(schmeisr_control_r) - AM_RANGE(0x321100, 0x321101) AM_READ(MRA16_NOP) /* Irq ack? Value not used */ - AM_RANGE(0x3c0000, 0x3c1fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3c2000, 0x3c2fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3c4000, 0x3c4fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3c6000, 0x3c6fff) AM_READ(MRA16_RAM) - AM_RANGE(0x3c8000, 0x3c8fff) AM_MIRROR(0x1000) AM_READ(MRA16_RAM) - AM_RANGE(0x3ca000, 0x3cafff) AM_MIRROR(0x1000) AM_READ(MRA16_RAM) - AM_RANGE(0x3cc000, 0x3ccfff) AM_MIRROR(0x1000) AM_READ(MRA16_RAM) - AM_RANGE(0x3ce000, 0x3cefff) AM_MIRROR(0x1000) AM_READ(MRA16_RAM) - AM_RANGE(0x3d0000, 0x3d07ff) AM_READ(MRA16_RAM) - AM_RANGE(0x3e0000, 0x3e1fff) AM_MIRROR(0x2000) AM_READ(MRA16_RAM) - AM_RANGE(0xff0000, 0xff7fff) AM_READ(MRA16_RAM) + AM_RANGE(0x321100, 0x321101) AM_READ(SMH_NOP) /* Irq ack? Value not used */ + AM_RANGE(0x3c0000, 0x3c1fff) AM_READ(SMH_RAM) + AM_RANGE(0x3c2000, 0x3c2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3c4000, 0x3c4fff) AM_READ(SMH_RAM) + AM_RANGE(0x3c6000, 0x3c6fff) AM_READ(SMH_RAM) + AM_RANGE(0x3c8000, 0x3c8fff) AM_MIRROR(0x1000) AM_READ(SMH_RAM) + AM_RANGE(0x3ca000, 0x3cafff) AM_MIRROR(0x1000) AM_READ(SMH_RAM) + AM_RANGE(0x3cc000, 0x3ccfff) AM_MIRROR(0x1000) AM_READ(SMH_RAM) + AM_RANGE(0x3ce000, 0x3cefff) AM_MIRROR(0x1000) AM_READ(SMH_RAM) + AM_RANGE(0x3d0000, 0x3d07ff) AM_READ(SMH_RAM) + AM_RANGE(0x3e0000, 0x3e1fff) AM_MIRROR(0x2000) AM_READ(SMH_RAM) + AM_RANGE(0xff0000, 0xff7fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( schmeisr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x20000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) - AM_RANGE(0x240000, 0x24000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x20000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x240000, 0x24000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) AM_RANGE(0x280000, 0x2807ff) AM_MIRROR(0x800) AM_WRITE(deco16_104_rohga_prot_w) AM_BASE(&deco16_prot_ram) /* Protection writes */ AM_RANGE(0x300000, 0x300001) AM_WRITE(rohga_buffer_spriteram16_w) /* write 1 for sprite dma */ - AM_RANGE(0x310000, 0x310009) AM_WRITE(MWA16_NOP) /* Palette control? */ + AM_RANGE(0x310000, 0x310009) AM_WRITE(SMH_NOP) /* Palette control? */ AM_RANGE(0x31000a, 0x31000b) AM_WRITE(deco16_palette_dma_w) /* Write 1111 for dma? (Or any value?) */ - AM_RANGE(0x320000, 0x320001) AM_WRITE(MWA16_NOP) /* ? */ + AM_RANGE(0x320000, 0x320001) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0x322000, 0x322001) AM_WRITE(deco16_priority_w) AM_RANGE(0x3c0000, 0x3c1fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x3c2000, 0x3c2fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) AM_RANGE(0x3c4000, 0x3c4fff) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x3c6000, 0x3c6fff) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x3c8000, 0x3c8fff) AM_MIRROR(0x1000) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x3ca000, 0x3cafff) AM_MIRROR(0x1000) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x3cc000, 0x3ccfff) AM_MIRROR(0x1000) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf3_rowscroll) - AM_RANGE(0x3ce000, 0x3cefff) AM_MIRROR(0x1000) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf4_rowscroll) - AM_RANGE(0x3d0000, 0x3d07ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x3c8000, 0x3c8fff) AM_MIRROR(0x1000) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x3ca000, 0x3cafff) AM_MIRROR(0x1000) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x3cc000, 0x3ccfff) AM_MIRROR(0x1000) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf3_rowscroll) + AM_RANGE(0x3ce000, 0x3cefff) AM_MIRROR(0x1000) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf4_rowscroll) + AM_RANGE(0x3d0000, 0x3d07ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x3e0000, 0x3e1fff) AM_MIRROR(0x2000) AM_WRITE(deco16_buffered_palette_w) AM_BASE(&paletteram16) - AM_RANGE(0xff0000, 0xff7fff) AM_WRITE(MWA16_RAM) /* Main ram */ + AM_RANGE(0xff0000, 0xff7fff) AM_WRITE(SMH_RAM) /* Main ram */ ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_READ(MRA8_NOP) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA8_NOP) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_1_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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 c8f2f64b677..c3a2dea356e 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -88,10 +88,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0300, 0x030f) AM_READ(K053244_r) AM_RANGE(0x0800, 0x0fff) AM_READ(rollerg_K051316_r) AM_RANGE(0x1000, 0x17ff) AM_READ(K053245_r) - AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x3aff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x3aff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -99,26 +99,26 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0020, 0x0020) AM_WRITE(watchdog_reset_w) AM_RANGE(0x0030, 0x0031) AM_WRITE(K053260_0_w) AM_RANGE(0x0040, 0x0040) AM_WRITE(soundirq_w) - AM_RANGE(0x0100, 0x010f) AM_WRITE(MWA8_NOP) /* 053252? */ + AM_RANGE(0x0100, 0x010f) AM_WRITE(SMH_NOP) /* 053252? */ AM_RANGE(0x0200, 0x020f) AM_WRITE(K051316_ctrl_0_w) AM_RANGE(0x0300, 0x030f) AM_WRITE(K053244_w) AM_RANGE(0x0800, 0x0fff) AM_WRITE(K051316_0_w) AM_RANGE(0x1000, 0x17ff) AM_WRITE(K053245_w) AM_RANGE(0x1800, 0x1fff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE(&paletteram) - AM_RANGE(0x2000, 0x3aff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x2000, 0x3aff) AM_WRITE(SMH_RAM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa02f) AM_READ(K053260_0_r) AM_RANGE(0xc000, 0xc000) AM_READ(YM3812_status_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa02f) AM_WRITE(K053260_0_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM3812_write_port_0_w) diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c index 0b5d7c68bfd..48bc7e38501 100644 --- a/src/mame/drivers/rollrace.c +++ b/src/mame/drivers/rollrace.c @@ -35,35 +35,35 @@ static WRITE8_HANDLER( ra_fake_d800_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_ROM) /* only rollace2 */ - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_ROM) /* only rollace2 */ + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) AM_RANGE(0xd900, 0xd900) AM_READ(ra_fake_d800_r) /* protection ??*/ - AM_RANGE(0xe000, 0xe3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe400, 0xe47f) AM_READ(MRA8_RAM) - AM_RANGE(0xec00, 0xec0f) AM_READ(MRA8_NOP) /* Analog sound effects ??*/ - AM_RANGE(0xf000, 0xf0ff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xe3ff) AM_READ(SMH_RAM) + AM_RANGE(0xe400, 0xe47f) AM_READ(SMH_RAM) + AM_RANGE(0xec00, 0xec0f) AM_READ(SMH_NOP) /* Analog sound effects ??*/ + AM_RANGE(0xf000, 0xf0ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_0_r) /* player1*/ AM_RANGE(0xf801, 0xf801) AM_READ(input_port_1_r) /* player2*/ AM_RANGE(0xf804, 0xf804) AM_READ(input_port_3_r) AM_RANGE(0xf802, 0xf802) AM_READ(input_port_2_r) AM_RANGE(0xf805, 0xf805) AM_READ(input_port_4_r) - AM_RANGE(0xd806, 0xd806) AM_READ(MRA8_NOP) /* looks like a watchdog, bit4 checked*/ + AM_RANGE(0xd806, 0xd806) AM_READ(SMH_NOP) /* looks like a watchdog, bit4 checked*/ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xd900, 0xd900) AM_WRITE(ra_fake_d800_w) /* protection ?? */ - AM_RANGE(0xe000, 0xe3ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xe400, 0xe47f) AM_WRITE(MWA8_RAM) AM_BASE(&colorram) + AM_RANGE(0xe000, 0xe3ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xe400, 0xe47f) AM_WRITE(SMH_RAM) AM_BASE(&colorram) AM_RANGE(0xe800, 0xe800) AM_WRITE(soundlatch_w) - AM_RANGE(0xec00, 0xec0f) AM_WRITE(MWA8_NOP) /* Analog sound effects ?? ec00 sound enable ?*/ - AM_RANGE(0xf000, 0xf0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xec00, 0xec0f) AM_WRITE(SMH_NOP) /* Analog sound effects ?? ec00 sound enable ?*/ + AM_RANGE(0xf000, 0xf0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(rollrace_flipx_w) AM_RANGE(0xfc01, 0xfc01) AM_WRITE(interrupt_enable_w) - AM_RANGE(0xfc02, 0xfc03) AM_WRITE(MWA8_NOP) /* coin counters */ + AM_RANGE(0xfc02, 0xfc03) AM_WRITE(SMH_NOP) /* coin counters */ AM_RANGE(0xfc04, 0xfc05) AM_WRITE(rollrace_charbank_w) AM_RANGE(0xfc06, 0xfc06) AM_WRITE(rollrace_spritebank_w) AM_RANGE(0xf400, 0xf400) AM_WRITE(rollrace_backgroundcolor_w) @@ -73,14 +73,14 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_snd, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_snd, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x2fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_WRITE(interrupt_enable_w) AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x4001, 0x4001) AM_WRITE(AY8910_write_port_0_w) diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c index 3a44ae5db78..ad0abc80e38 100644 --- a/src/mame/drivers/route16.c +++ b/src/mame/drivers/route16.c @@ -226,7 +226,7 @@ static WRITE8_HANDLER ( speakres_out2_w ) static ADDRESS_MAP_START( route16_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - /*AM_RANGE(0x3000, 0x3001) AM_READWRITE(MRA8_NOP, MWA8_NOP) protection device */ + /*AM_RANGE(0x3000, 0x3001) AM_READWRITE(SMH_NOP, SMH_NOP) protection device */ AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, route16_sharedram_w) AM_BASE(&sharedram) AM_RANGE(0x4800, 0x4800) AM_READWRITE(input_port_0_r, route16_out0_w) AM_RANGE(0x5000, 0x5000) AM_READWRITE(input_port_1_r, route16_out1_w) diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index b1afbfc58e4..6a76aee865c 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -355,20 +355,20 @@ static WRITE8_HANDLER ( dynax_bank_w ) static ADDRESS_MAP_START( royalmah_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE( 0x0000, 0x6fff ) AM_READWRITE( MRA8_ROM, royalmah_rom_w ) + AM_RANGE( 0x0000, 0x6fff ) AM_READWRITE( SMH_ROM, royalmah_rom_w ) AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE( 0x8000, 0xffff ) AM_READ( MRA8_BANK1 ) // banked ROMs not present in royalmah - AM_RANGE( 0x8000, 0xffff ) AM_WRITE( MWA8_RAM ) AM_BASE(&videoram) + AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK1 ) // banked ROMs not present in royalmah + AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE(&videoram) ADDRESS_MAP_END static ADDRESS_MAP_START( mjapinky_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE( 0x0000, 0x6fff ) AM_READWRITE( MRA8_ROM, royalmah_rom_w ) + AM_RANGE( 0x0000, 0x6fff ) AM_READWRITE( SMH_ROM, royalmah_rom_w ) AM_RANGE( 0x7000, 0x77ff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE( 0x7800, 0x7fff ) AM_RAM AM_RANGE( 0x8000, 0x8000 ) AM_READ( mjapinky_dsw_r ) - AM_RANGE( 0x8000, 0xffff ) AM_READ( MRA8_BANK1 ) - AM_RANGE( 0x8000, 0xffff ) AM_WRITE( MWA8_RAM ) AM_BASE(&videoram) + AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK1 ) + AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE(&videoram) ADDRESS_MAP_END @@ -484,8 +484,8 @@ 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(MRA8_BANK1) - AM_RANGE( 0x8000, 0xffff ) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) + AM_RANGE( 0x8000, 0xffff ) AM_READ(SMH_BANK1) + AM_RANGE( 0x8000, 0xffff ) AM_WRITE(SMH_RAM) AM_BASE(&videoram) ADDRESS_MAP_END static WRITE8_HANDLER( janptr96_dswsel_w ) @@ -618,8 +618,8 @@ static ADDRESS_MAP_START( mjifb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x6fff ) AM_ROM AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE( 0x8000, 0xbfff ) AM_READWRITE(mjifb_rom_io_r, mjifb_rom_io_w) AM_BASE(&videoram) - AM_RANGE( 0xc000, 0xffff ) AM_READWRITE(MRA8_ROM, mjifb_videoram_w) -// AM_RANGE( 0xc000, 0xffff ) AM_READWRITE(MRA8_ROM, MWA8_RAM) This should, but doesn't work + AM_RANGE( 0xc000, 0xffff ) AM_READWRITE(SMH_ROM, mjifb_videoram_w) +// AM_RANGE( 0xc000, 0xffff ) AM_READWRITE(SMH_ROM, SMH_RAM) This should, but doesn't work ADDRESS_MAP_END static READ8_HANDLER( mjifb_p3_r ) @@ -717,7 +717,7 @@ static ADDRESS_MAP_START( mjdejavu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x0000, 0x6fff ) AM_ROM AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE( 0x8000, 0xbfff ) AM_READWRITE(mjdejavu_rom_io_r, mjdejavu_rom_io_w) AM_BASE(&videoram) - AM_RANGE( 0xc000, 0xffff ) AM_READWRITE(MRA8_ROM, mjifb_videoram_w) + AM_RANGE( 0xc000, 0xffff ) AM_READWRITE(SMH_ROM, mjifb_videoram_w) ADDRESS_MAP_END @@ -758,8 +758,8 @@ 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(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE( 0x8000, 0xffff ) AM_READ( MRA8_BANK1 ) - AM_RANGE( 0x8000, 0xffff ) AM_WRITE( MWA8_RAM ) AM_BASE(&videoram) + AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK1 ) + AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE(&videoram) ADDRESS_MAP_END static ADDRESS_MAP_START( mjtensin_iomap, ADDRESS_SPACE_IO, 8 ) @@ -821,7 +821,7 @@ static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE( 0x7fc2, 0x7fc2 ) AM_WRITE( AY8910_write_port_0_w ) AM_RANGE( 0x7fc3, 0x7fc3 ) AM_WRITE( AY8910_control_port_0_w ) AM_RANGE( 0x7fd0, 0x7fd0 ) AM_WRITE( janptr96_coin_counter_w ) - AM_RANGE( 0x7fd1, 0x7fd1 ) AM_READWRITE( input_port_10_r, MWA8_NOP ) + AM_RANGE( 0x7fd1, 0x7fd1 ) AM_READWRITE( input_port_10_r, SMH_NOP ) AM_RANGE( 0x7fd3, 0x7fd3 ) AM_WRITE( input_port_select_w ) AM_RANGE( 0x7fe0, 0x7fe0 ) AM_READ( cafetime_dsw_r ) AM_RANGE( 0x7fe1, 0x7fe1 ) AM_WRITE( cafetime_dsw_w ) @@ -829,8 +829,8 @@ 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_READWRITE( msm6242_r, msm6242_w ) - AM_RANGE( 0x8000, 0xffff ) AM_READ( MRA8_BANK1 ) - AM_RANGE( 0x8000, 0xffff ) AM_WRITE( MWA8_RAM ) AM_BASE(&videoram) + AM_RANGE( 0x8000, 0xffff ) AM_READ( SMH_BANK1 ) + AM_RANGE( 0x8000, 0xffff ) AM_WRITE( SMH_RAM ) AM_BASE(&videoram) ADDRESS_MAP_END diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c index 3447f412374..cdffb335e85 100644 --- a/src/mame/drivers/rpunch.c +++ b/src/mame/drivers/rpunch.c @@ -240,23 +240,23 @@ static WRITE8_HANDLER( upd_data_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x04ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x060000, 0x060fff) AM_READ(MRA16_RAM) - AM_RANGE(0x080000, 0x083fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x04ffff) AM_READ(SMH_RAM) + AM_RANGE(0x060000, 0x060fff) AM_READ(SMH_RAM) + AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM) AM_RANGE(0x0c0018, 0x0c001b) AM_READ(common_port_r) AM_RANGE(0x0c001c, 0x0c001d) AM_READ(input_port_3_word_r) AM_RANGE(0x0c001e, 0x0c001f) AM_READ(sound_busy_r) - AM_RANGE(0x0a0000, 0x0a07ff) AM_READ(MRA16_RAM) - AM_RANGE(0x0fc000, 0x0fffff) AM_READ(MRA16_RAM) + AM_RANGE(0x0a0000, 0x0a07ff) AM_READ(SMH_RAM) + AM_RANGE(0x0fc000, 0x0fffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xfffff) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x04ffff) AM_WRITE(MWA16_RAM) AM_BASE(&rpunch_bitmapram) AM_SIZE(&rpunch_bitmapram_size) - AM_RANGE(0x060000, 0x060fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x04ffff) AM_WRITE(SMH_RAM) AM_BASE(&rpunch_bitmapram) AM_SIZE(&rpunch_bitmapram_size) + AM_RANGE(0x060000, 0x060fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0x080000, 0x083fff) AM_WRITE(rpunch_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size) AM_RANGE(0x0a0000, 0x0a07ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0c0000, 0x0c0007) AM_WRITE(rpunch_scrollreg_w) @@ -265,7 +265,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c000e, 0x0c000f) AM_WRITE(sound_command_w) AM_RANGE(0x0c0010, 0x0c0013) AM_WRITE(rpunch_ins_w) AM_RANGE(0x0c0028, 0x0c0029) AM_WRITE(rpunch_crtc_register_w) - AM_RANGE(0x0fc000, 0x0fffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x0fc000, 0x0fffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -277,20 +277,20 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xf001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xf200, 0xf200) AM_READ(sound_command_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xf400, 0xf400) AM_WRITE(upd_control_w) AM_RANGE(0xf600, 0xf600) AM_WRITE(upd_data_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c index 7f8d2529251..11cfae3cdcf 100644 --- a/src/mame/drivers/runaway.c +++ b/src/mame/drivers/runaway.c @@ -86,33 +86,33 @@ static WRITE8_HANDLER( runaway_irq_ack_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READ(MRA8_RAM) - AM_RANGE(0x0400, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_RAM) + AM_RANGE(0x0400, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3007) AM_READ(runaway_input_r) AM_RANGE(0x4000, 0x4000) AM_READ(input_port_2_r) AM_RANGE(0x5000, 0x5000) AM_READ(atari_vg_earom_r) AM_RANGE(0x6000, 0x600f) AM_READ(pokey1_r) AM_RANGE(0x7000, 0x700f) AM_READ(pokey2_r) - AM_RANGE(0x8000, 0xcfff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) /* for the interrupt vectors */ + AM_RANGE(0x8000, 0xcfff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) /* for the interrupt vectors */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0400, 0x07bf) AM_WRITE(runaway_video_ram_w) AM_BASE(&runaway_video_ram) - AM_RANGE(0x07c0, 0x07ff) AM_WRITE(MWA8_RAM) AM_BASE(&runaway_sprite_ram) + AM_RANGE(0x07c0, 0x07ff) AM_WRITE(SMH_RAM) AM_BASE(&runaway_sprite_ram) AM_RANGE(0x1000, 0x1000) AM_WRITE(runaway_irq_ack_w) AM_RANGE(0x1400, 0x143F) AM_WRITE(atari_vg_earom_w) AM_RANGE(0x1800, 0x1800) AM_WRITE(atari_vg_earom_ctrl_w) AM_RANGE(0x1c00, 0x1c0f) AM_WRITE(runaway_paletteram_w) - AM_RANGE(0x2000, 0x2000) AM_WRITE(MWA8_NOP) /* coin counter? */ - AM_RANGE(0x2001, 0x2001) AM_WRITE(MWA8_NOP) /* coin counter? */ + AM_RANGE(0x2000, 0x2000) AM_WRITE(SMH_NOP) /* coin counter? */ + AM_RANGE(0x2001, 0x2001) AM_WRITE(SMH_NOP) /* coin counter? */ AM_RANGE(0x2003, 0x2004) AM_WRITE(runaway_led_w) AM_RANGE(0x2005, 0x2005) AM_WRITE(runaway_tile_bank_w) AM_RANGE(0x6000, 0x600f) AM_WRITE(pokey1_w) AM_RANGE(0x7000, 0x700f) AM_WRITE(pokey2_w) - AM_RANGE(0x8000, 0xcfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xcfff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index eb2526e184c..96aee144e22 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -211,19 +211,19 @@ static INTERRUPT_GEN(rng_interrupt) } static ADDRESS_MAP_START( rngreadmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x2fffff) AM_READ(MRA16_ROM) // main program + data - AM_RANGE(0x300000, 0x3007ff) AM_READ(MRA16_RAM) // palette RAM - AM_RANGE(0x380000, 0x39ffff) AM_READ(MRA16_RAM) // work RAM - AM_RANGE(0x400000, 0x43ffff) AM_READ(MRA16_NOP) // K053936_0_rom_r }, // '936 ROM readback window + AM_RANGE(0x000000, 0x2fffff) AM_READ(SMH_ROM) // main program + data + AM_RANGE(0x300000, 0x3007ff) AM_READ(SMH_RAM) // palette RAM + AM_RANGE(0x380000, 0x39ffff) AM_READ(SMH_RAM) // work RAM + AM_RANGE(0x400000, 0x43ffff) AM_READ(SMH_NOP) // K053936_0_rom_r }, // '936 ROM readback window AM_RANGE(0x480000, 0x48001f) AM_READ(rng_sysregs_r) AM_RANGE(0x4c0000, 0x4c001f) AM_READ(K053252_word_r) // CCU (for scanline and vblank polling) AM_RANGE(0x580014, 0x580015) AM_READ(sound_status_msb_r) - AM_RANGE(0x580000, 0x58001f) AM_READ(MRA16_RAM) // sound regs read fall-through + AM_RANGE(0x580000, 0x58001f) AM_READ(SMH_RAM) // sound regs read fall-through AM_RANGE(0x5c0000, 0x5c000d) AM_READ(K053246_word_r) // 246A ROM readback window AM_RANGE(0x600000, 0x600fff) AM_READ(K053247_word_r) // OBJ RAM - AM_RANGE(0x601000, 0x601fff) AM_READ(MRA16_RAM) // communication? second monitor buffer? - AM_RANGE(0x6c0000, 0x6cffff) AM_READ(MRA16_RAM) // PSAC2 render RAM - AM_RANGE(0x700000, 0x7007ff) AM_READ(MRA16_RAM) // PSAC2 line effect + AM_RANGE(0x601000, 0x601fff) AM_READ(SMH_RAM) // communication? second monitor buffer? + AM_RANGE(0x6c0000, 0x6cffff) AM_READ(SMH_RAM) // PSAC2 render RAM + AM_RANGE(0x700000, 0x7007ff) AM_READ(SMH_RAM) // PSAC2 line effect AM_RANGE(0x740000, 0x741fff) AM_READ(rng_ttl_ram_r) // text plane RAM #if RNG_DEBUG AM_RANGE(0x5c0010, 0x5c001f) AM_READ(K053247_reg_word_r) @@ -232,24 +232,24 @@ static ADDRESS_MAP_START( rngreadmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( rngwritemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x2fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x2fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x300000, 0x3007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x380000, 0x39ffff) AM_WRITE(MWA16_RAM) // work RAM + AM_RANGE(0x380000, 0x39ffff) AM_WRITE(SMH_RAM) // work RAM AM_RANGE(0x480000, 0x48001f) AM_WRITE(rng_sysregs_w) AM_BASE(&rng_sysreg) AM_RANGE(0x4c0000, 0x4c001f) AM_WRITE(K053252_word_w) // CCU AM_RANGE(0x540000, 0x540001) AM_WRITE(sound_irq_w) AM_RANGE(0x58000c, 0x58000d) AM_WRITE(sound_cmd1_w) AM_RANGE(0x58000e, 0x58000f) AM_WRITE(sound_cmd2_w) - AM_RANGE(0x580000, 0x58001f) AM_WRITE(MWA16_RAM) // sound regs write fall-through + AM_RANGE(0x580000, 0x58001f) AM_WRITE(SMH_RAM) // sound regs write fall-through AM_RANGE(0x5c0010, 0x5c001f) AM_WRITE(K053247_reg_word_w) AM_RANGE(0x600000, 0x600fff) AM_WRITE(K053247_word_w) // OBJ RAM - AM_RANGE(0x601000, 0x601fff) AM_WRITE(MWA16_RAM) // communication? second monitor buffer? + AM_RANGE(0x601000, 0x601fff) AM_WRITE(SMH_RAM) // communication? second monitor buffer? AM_RANGE(0x640000, 0x640007) AM_WRITE(K053246_word_w) // '246A registers - AM_RANGE(0x680000, 0x68001f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) // '936 registers + AM_RANGE(0x680000, 0x68001f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) // '936 registers AM_RANGE(0x6c0000, 0x6cffff) AM_WRITE(rng_936_videoram_w) AM_BASE(&rng_936_videoram) // PSAC2 ('936) RAM (34v + 35v) - AM_RANGE(0x700000, 0x7007ff) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_linectrl) // "Line RAM" + AM_RANGE(0x700000, 0x7007ff) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_linectrl) // "Line RAM" AM_RANGE(0x740000, 0x741fff) AM_WRITE(rng_ttl_ram_w) // text plane RAM - AM_RANGE(0x7c0000, 0x7c0001) AM_WRITE(MWA16_NOP) // watchdog + AM_RANGE(0x7c0000, 0x7c0001) AM_WRITE(SMH_NOP) // watchdog ADDRESS_MAP_END /**********************************************************************************/ @@ -279,27 +279,27 @@ static INTERRUPT_GEN(audio_interrupt) /* sound (this should be split into audio/xexex.c or pregx.c or so someday) */ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK2) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe22f) AM_READ(K054539_0_r) - AM_RANGE(0xe230, 0xe3ff) AM_READ(MRA8_RAM) + AM_RANGE(0xe230, 0xe3ff) AM_READ(SMH_RAM) AM_RANGE(0xe400, 0xe62f) AM_READ(K054539_1_r) - AM_RANGE(0xe630, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xe630, 0xe7ff) AM_READ(SMH_RAM) AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r) AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe22f) AM_WRITE(K054539_0_w) - AM_RANGE(0xe230, 0xe3ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe230, 0xe3ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe400, 0xe62f) AM_WRITE(K054539_1_w) - AM_RANGE(0xe630, 0xe7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe630, 0xe7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(sound_status_w) AM_RANGE(0xf800, 0xf800) AM_WRITE(z80ctrl_w) - AM_RANGE(0xfff0, 0xfff3) AM_WRITE(MWA8_NOP) + AM_RANGE(0xfff0, 0xfff3) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static const struct K054539interface k054539_interface = diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index f172f1a84bb..bddf91cf7ed 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -202,12 +202,12 @@ static MACHINE_START( safarir ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x17ff) AM_ROM AM_RANGE(0x2000, 0x27ff) AM_READWRITE(ram_r, ram_w) AM_SIZE(&ram_size) - AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_READWRITE(MRA8_NOP, ram_bank_w) - AM_RANGE(0x2c00, 0x2cff) AM_MIRROR(0x03ff) AM_READWRITE(MRA8_NOP, MWA8_RAM) AM_BASE(&bg_scroll) + AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_READWRITE(SMH_NOP, ram_bank_w) + AM_RANGE(0x2c00, 0x2cff) AM_MIRROR(0x03ff) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&bg_scroll) AM_RANGE(0x3000, 0x30ff) AM_MIRROR(0x03ff) AM_WRITENOP /* goes to SN76477 */ AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_WRITENOP /* cleared at the beginning */ - AM_RANGE(0x3800, 0x38ff) AM_MIRROR(0x03ff) AM_READWRITE(input_port_0_r, MWA8_NOP) - AM_RANGE(0x3c00, 0x3cff) AM_MIRROR(0x03ff) AM_READWRITE(input_port_1_r, MWA8_NOP) + AM_RANGE(0x3800, 0x38ff) AM_MIRROR(0x03ff) AM_READWRITE(input_port_0_r, SMH_NOP) + AM_RANGE(0x3c00, 0x3cff) AM_MIRROR(0x03ff) AM_READWRITE(input_port_1_r, SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index d7b5365c175..1daf277a757 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -207,13 +207,13 @@ static ADDRESS_MAP_START( sandscrp, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700000, 0x70ffff) AM_RAM // RAM AM_RANGE(0x200000, 0x20001f) AM_READWRITE(galpanib_calc_r,galpanib_calc_w) // Protection - AM_RANGE(0x300000, 0x30000f) AM_READWRITE(MRA16_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 - AM_RANGE(0x401000, 0x401fff) AM_READWRITE(MRA16_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // + AM_RANGE(0x300000, 0x30000f) AM_READWRITE(SMH_RAM, kaneko16_layers_0_regs_w) AM_BASE(&kaneko16_layers_0_regs) // Layers 0 Regs + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, kaneko16_vram_1_w) AM_BASE(&kaneko16_vram_1) // Layers 0 + AM_RANGE(0x401000, 0x401fff) AM_READWRITE(SMH_RAM, kaneko16_vram_0_w) AM_BASE(&kaneko16_vram_0) // AM_RANGE(0x402000, 0x402fff) AM_RAM AM_BASE(&kaneko16_vscroll_1) // AM_RANGE(0x403000, 0x403fff) AM_RAM AM_BASE(&kaneko16_vscroll_0) // AM_RANGE(0x500000, 0x501fff) AM_READWRITE(pandora_spriteram_LSB_r, pandora_spriteram_LSB_w ) // sprites - AM_RANGE(0x600000, 0x600fff) AM_READWRITE(MRA16_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE(0x600000, 0x600fff) AM_READWRITE(SMH_RAM, paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0xa00000, 0xa00001) AM_WRITE(sandscrp_coin_counter_w) // Coin Counters (Lockout unused) AM_RANGE(0xb00000, 0xb00001) AM_READ(input_port_0_word_r) // Inputs AM_RANGE(0xb00002, 0xb00003) AM_READ(input_port_1_word_r) // @@ -264,7 +264,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(MRA8_BANK1, MWA8_ROM) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK1, SMH_ROM) // 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 6ca853d9e1d..dce8bbabd9e 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -61,10 +61,10 @@ static WRITE8_HANDLER(sangho_ram_w) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xffff) AM_WRITE(sangho_ram_w) - AM_RANGE(0x0000, 0x3fff) AM_READ( MRA8_BANK1 ) - AM_RANGE(0x4000, 0x7fff) AM_READ( MRA8_BANK2 ) - AM_RANGE(0x8000, 0xbfff) AM_READ( MRA8_BANK3 ) - AM_RANGE(0xc000, 0xffff) AM_READ( MRA8_BANK4 ) + AM_RANGE(0x0000, 0x3fff) AM_READ( SMH_BANK1 ) + AM_RANGE(0x4000, 0x7fff) AM_READ( SMH_BANK2 ) + AM_RANGE(0x8000, 0xbfff) AM_READ( SMH_BANK3 ) + AM_RANGE(0xc000, 0xffff) AM_READ( SMH_BANK4 ) ADDRESS_MAP_END /* Wrong ! */ diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c index b3493b3d2e8..cf397b1dc8b 100644 --- a/src/mame/drivers/sauro.c +++ b/src/mame/drivers/sauro.c @@ -142,15 +142,15 @@ static void lrq_callback(int state) } static ADDRESS_MAP_START( sauro_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xebff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xebff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sauro_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe800, 0xebff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xe800, 0xebff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xf000, 0xf3ff) AM_WRITE(tecfri_videoram_w) AM_BASE(&tecfri_videoram) AM_RANGE(0xf400, 0xf7ff) AM_WRITE(tecfri_colorram_w) AM_BASE(&tecfri_colorram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(tecfri_videoram2_w) AM_BASE(&tecfri_videoram2) @@ -171,39 +171,39 @@ static ADDRESS_MAP_START( sauro_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xa1, 0xa1) AM_WRITE(sauro_scroll_fg_w) AM_RANGE(0x80, 0x80) AM_WRITE(sauro_sound_command_w) AM_RANGE(0xc0, 0xc0) AM_WRITE(flip_screen_w) - AM_RANGE(0xc2, 0xc2) AM_WRITE(MWA8_NOP) /* coin reset */ + AM_RANGE(0xc2, 0xc2) AM_WRITE(SMH_NOP) /* coin reset */ AM_RANGE(0xc3, 0xc3) AM_WRITE(sauro_coin1_w) - AM_RANGE(0xc4, 0xc4) AM_WRITE(MWA8_NOP) /* coin reset */ + AM_RANGE(0xc4, 0xc4) AM_WRITE(SMH_NOP) /* coin reset */ AM_RANGE(0xc5, 0xc5) AM_WRITE(sauro_coin2_w) - AM_RANGE(0xc6, 0xc7) AM_WRITE(MWA8_NOP) /* same as 0x80 - verified with debugger */ - AM_RANGE(0xc8, 0xc8) AM_WRITE(MWA8_NOP) /* written every int: 0 written at end of isr */ - AM_RANGE(0xc9, 0xc9) AM_WRITE(MWA8_NOP) /* written every int: 1 written at start of isr */ + AM_RANGE(0xc6, 0xc7) AM_WRITE(SMH_NOP) /* same as 0x80 - verified with debugger */ + AM_RANGE(0xc8, 0xc8) AM_WRITE(SMH_NOP) /* written every int: 0 written at end of isr */ + AM_RANGE(0xc9, 0xc9) AM_WRITE(SMH_NOP) /* written every int: 1 written at start of isr */ AM_RANGE(0xca, 0xcb) AM_WRITE(sauro_palette_bank_w) /* 1 written upon death, cleared 2 vblanks later */ /* Sequence 3,2,1 written during intro screen */ - AM_RANGE(0xcc, 0xcc) AM_WRITE(MWA8_NOP) /* same as 0xca */ - AM_RANGE(0xcd, 0xcd) AM_WRITE(MWA8_NOP) /* same as 0xcb */ - AM_RANGE(0xce, 0xce) AM_WRITE(MWA8_NOP) /* only written at startup */ + AM_RANGE(0xcc, 0xcc) AM_WRITE(SMH_NOP) /* same as 0xca */ + AM_RANGE(0xcd, 0xcd) AM_WRITE(SMH_NOP) /* same as 0xcb */ + AM_RANGE(0xce, 0xce) AM_WRITE(SMH_NOP) /* only written at startup */ AM_RANGE(0xe0, 0xe0) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sauro_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(sauro_sound_command_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sauro_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(adpcm_w) - AM_RANGE(0xe000, 0xe006) AM_WRITE(MWA8_NOP) /* echo from write to e0000 */ - AM_RANGE(0xe00e, 0xe00f) AM_WRITE(MWA8_NOP) + AM_RANGE(0xe000, 0xe006) AM_WRITE(SMH_NOP) /* echo from write to e0000 */ + AM_RANGE(0xe00e, 0xe00f) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( trckydoc_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_2_r) AM_RANGE(0xf808, 0xf808) AM_READ(input_port_3_r) AM_RANGE(0xf810, 0xf810) AM_READ(input_port_0_r) @@ -212,21 +212,21 @@ static ADDRESS_MAP_START( trckydoc_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( trckydoc_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe800, 0xebff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xe800, 0xebff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xec00, 0xefff) AM_WRITE(trckydoc_spriteram_mirror_w) // it clears sprites from the screen by writing here to set some of the attributes AM_RANGE(0xf000, 0xf3ff) AM_WRITE(tecfri_videoram_w) AM_BASE(&tecfri_videoram) AM_RANGE(0xf400, 0xf7ff) AM_WRITE(tecfri_colorram_w) AM_BASE(&tecfri_colorram) AM_RANGE(0xf820, 0xf820) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0xf821, 0xf821) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xf830, 0xf830) AM_WRITE(tecfri_scroll_bg_w) - AM_RANGE(0xf838, 0xf838) AM_WRITE(MWA8_NOP) /* only written at startup */ + AM_RANGE(0xf838, 0xf838) AM_WRITE(SMH_NOP) /* only written at startup */ AM_RANGE(0xf839, 0xf839) AM_WRITE(flip_screen_w) AM_RANGE(0xf83a, 0xf83a) AM_WRITE(sauro_coin1_w) AM_RANGE(0xf83b, 0xf83b) AM_WRITE(sauro_coin2_w) AM_RANGE(0xf83c, 0xf83c) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xf83f, 0xf83f) AM_WRITE(MWA8_NOP) /* only written at startup */ + AM_RANGE(0xf83f, 0xf83f) AM_WRITE(SMH_NOP) /* only written at startup */ ADDRESS_MAP_END static INPUT_PORTS_START( tecfri ) diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c index cd227da9dcc..a9c27c6f2e6 100644 --- a/src/mame/drivers/sbasketb.c +++ b/src/mame/drivers/sbasketb.c @@ -55,43 +55,43 @@ static WRITE8_HANDLER( sbasketb_coin_counter_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x2000, 0x3bff) AM_READ(MRA8_RAM) - AM_RANGE(0x3c10, 0x3c10) AM_READ(MRA8_NOP) /* ???? */ + AM_RANGE(0x2000, 0x3bff) AM_READ(SMH_RAM) + AM_RANGE(0x3c10, 0x3c10) AM_READ(SMH_NOP) /* ???? */ AM_RANGE(0x3e00, 0x3e00) AM_READ(input_port_0_r) AM_RANGE(0x3e01, 0x3e01) AM_READ(input_port_1_r) AM_RANGE(0x3e02, 0x3e02) AM_READ(input_port_2_r) - AM_RANGE(0x3e03, 0x3e03) AM_READ(MRA8_NOP) + AM_RANGE(0x3e03, 0x3e03) AM_READ(SMH_NOP) AM_RANGE(0x3e80, 0x3e80) AM_READ(input_port_3_r) AM_RANGE(0x3f00, 0x3f00) AM_READ(input_port_4_r) - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x2000, 0x2fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_RAM) AM_RANGE(0x3000, 0x33ff) AM_WRITE(sbasketb_colorram_w) AM_BASE(&colorram) AM_RANGE(0x3400, 0x37ff) AM_WRITE(sbasketb_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x3800, 0x39ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x3a00, 0x3bff) AM_WRITE(MWA8_RAM) /* Probably unused, but initialized */ + AM_RANGE(0x3800, 0x39ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3a00, 0x3bff) AM_WRITE(SMH_RAM) /* Probably unused, but initialized */ AM_RANGE(0x3c00, 0x3c00) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x3c20, 0x3c20) AM_WRITE(MWA8_RAM) AM_BASE(&sbasketb_palettebank) + AM_RANGE(0x3c20, 0x3c20) AM_WRITE(SMH_RAM) AM_BASE(&sbasketb_palettebank) AM_RANGE(0x3c80, 0x3c80) AM_WRITE(sbasketb_flipscreen_w) AM_RANGE(0x3c81, 0x3c81) AM_WRITE(interrupt_enable_w) AM_RANGE(0x3c83, 0x3c84) AM_WRITE(sbasketb_coin_counter_w) - AM_RANGE(0x3c85, 0x3c85) AM_WRITE(MWA8_RAM) AM_BASE(&sbasketb_spriteram_select) + AM_RANGE(0x3c85, 0x3c85) AM_WRITE(SMH_RAM) AM_BASE(&sbasketb_spriteram_select) AM_RANGE(0x3d00, 0x3d00) AM_WRITE(soundlatch_w) AM_RANGE(0x3d80, 0x3d80) AM_WRITE(sbasketb_sh_irqtrigger_w) - AM_RANGE(0x3f80, 0x3f80) AM_WRITE(MWA8_RAM) AM_BASE(&sbasketb_scroll) + AM_RANGE(0x3f80, 0x3f80) AM_WRITE(SMH_RAM) AM_BASE(&sbasketb_scroll) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0x8000) AM_READ(hyperspt_sh_timer_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(VLM5030_data_w) /* speech data */ AM_RANGE(0xc000, 0xdfff) AM_WRITE(hyperspt_sound_w) /* speech and output controll */ AM_RANGE(0xe000, 0xe000) AM_WRITE(DAC_0_data_w) diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index 285be7749ea..75de83ac36e 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -184,7 +184,7 @@ static READ8_HANDLER (controls_r) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x2fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(MRA8_RAM, sbw_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_RAM, sbw_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xf800, 0xf800) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xf801, 0xf801) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) AM_RANGE(0xfc00, 0xffff) AM_RAM @@ -195,7 +195,7 @@ static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READWRITE(input_port_0_r, watchdog_reset_w) AM_RANGE(0x01, 0x01) AM_READWRITE(controls_r, pix_data_w) AM_RANGE(0x02, 0x02) AM_READWRITE(pix_data_r, pix_shift_w) - AM_RANGE(0x03, 0x03) AM_READWRITE(input_port_1_r, MWA8_NOP) + AM_RANGE(0x03, 0x03) AM_READWRITE(input_port_1_r, SMH_NOP) AM_RANGE(0x04, 0x04) AM_READWRITE(input_port_4_r, system_w) AM_RANGE(0x05, 0x05) AM_READWRITE(input_port_5_r, graph_control_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index 038ed8e17ae..d4b4f2b5493 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -333,7 +333,7 @@ static VIDEO_UPDATE( sbrkout ) 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(0x0400, 0x07ff) AM_READWRITE(MRA8_RAM, sbrkout_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x0400, 0x07ff) AM_READWRITE(SMH_RAM, sbrkout_videoram_w) AM_BASE(&videoram) AM_RANGE(0x0800, 0x083f) AM_READ(switches_r) AM_RANGE(0x0840, 0x0840) AM_MIRROR(0x003f) AM_READ_PORT("COIN") AM_RANGE(0x0880, 0x0880) AM_MIRROR(0x003f) AM_READ_PORT("START") diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c index a6379542f29..0bd75068665 100644 --- a/src/mame/drivers/sbugger.c +++ b/src/mame/drivers/sbugger.c @@ -115,18 +115,18 @@ WRITE8_HANDLER( sbugger_videoram_w ); /* memory maps */ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x37ff) AM_READ(MRA8_ROM) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) /* video ram */ - AM_RANGE(0xe000, 0xe0ff) AM_READ(MRA8_RAM) /* sp is set to e0ff = iternal 8156 RAM*/ - AM_RANGE(0xf400, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x37ff) AM_READ(SMH_ROM) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) /* video ram */ + AM_RANGE(0xe000, 0xe0ff) AM_READ(SMH_RAM) /* sp is set to e0ff = iternal 8156 RAM*/ + AM_RANGE(0xf400, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x37ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x37ff) AM_WRITE(SMH_ROM) AM_RANGE(0xc800, 0xcbff) AM_WRITE(sbugger_videoram_attr_w) AM_BASE(&sbugger_videoram_attr) AM_RANGE(0xcc00, 0xcfff) AM_WRITE(sbugger_videoram_w) AM_BASE(&sbugger_videoram) - AM_RANGE(0xe000, 0xe0ff) AM_WRITE(MWA8_RAM) /* sp is set to e0ff */ - AM_RANGE(0xf400, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xe0ff) AM_WRITE(SMH_RAM) /* sp is set to e0ff */ + AM_RANGE(0xf400, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c index 563936a07c4..3e10f980e4e 100644 --- a/src/mame/drivers/scobra.c +++ b/src/mame/drivers/scobra.c @@ -129,24 +129,24 @@ static WRITE8_HANDLER(hustler_ppi8255_1_w) } static ADDRESS_MAP_START( type1_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8bff) AM_READ(SMH_RAM) AM_RANGE(0x8c00, 0x8fff) AM_READ(galaxian_videoram_r) /* mirror */ - AM_RANGE(0x9000, 0x90ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9000, 0x90ff) AM_READ(SMH_RAM) AM_RANGE(0x9800, 0x9803) AM_READ(ppi8255_0_r) AM_RANGE(0xa000, 0xa003) AM_READ(ppi8255_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r) ADDRESS_MAP_END static ADDRESS_MAP_START( type1_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x8c00, 0x8fff) AM_WRITE(galaxian_videoram_w) /* mirror */ AM_RANGE(0x9000, 0x903f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9040, 0x905f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9060, 0x907f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9080, 0x90ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9040, 0x905f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9060, 0x907f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9080, 0x90ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9800, 0x9803) AM_WRITE(ppi8255_0_w) AM_RANGE(0xa000, 0xa003) AM_WRITE(ppi8255_1_w) AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxian_nmi_enable_w) @@ -157,9 +157,9 @@ static ADDRESS_MAP_START( type1_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( type2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x88ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x88ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) AM_RANGE(0x9400, 0x97ff) AM_READ(galaxian_videoram_r) /* mirror */ AM_RANGE(0x9800, 0x9800) AM_READ(watchdog_reset_r) AM_RANGE(0xa000, 0xa00f) AM_READ(scobra_type2_ppi8255_0_r) @@ -167,12 +167,12 @@ static ADDRESS_MAP_START( type2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( type2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x883f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x8840, 0x885f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x8860, 0x887f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x8880, 0x88ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x8840, 0x885f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x8860, 0x887f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x8880, 0x88ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9400, 0x97ff) AM_WRITE(galaxian_videoram_w) /* mirror */ AM_RANGE(0xa000, 0xa00f) AM_WRITE(scobra_type2_ppi8255_0_w) @@ -186,49 +186,49 @@ static ADDRESS_MAP_START( type2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( hustler_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8bff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x90ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8bff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x90ff) AM_READ(SMH_RAM) AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r) AM_RANGE(0xd000, 0xd01f) AM_READ(hustler_ppi8255_0_r) AM_RANGE(0xe000, 0xe01f) AM_READ(hustler_ppi8255_1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( hustler_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9000, 0x903f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9040, 0x905f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9060, 0x907f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9080, 0x90ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9040, 0x905f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9060, 0x907f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9080, 0x90ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa802, 0xa802) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0xa804, 0xa804) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxian_flip_screen_y_w) - AM_RANGE(0xa80e, 0xa80e) AM_WRITE(MWA8_NOP) /* coin counters */ + AM_RANGE(0xa80e, 0xa80e) AM_WRITE(SMH_NOP) /* coin counters */ AM_RANGE(0xd000, 0xd01f) AM_WRITE(hustler_ppi8255_0_w) AM_RANGE(0xe000, 0xe01f) AM_WRITE(hustler_ppi8255_1_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hustlerb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8bff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x90ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8bff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x90ff) AM_READ(SMH_RAM) AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r) AM_RANGE(0xc100, 0xc103) AM_READ(ppi8255_0_r) AM_RANGE(0xc200, 0xc203) AM_READ(ppi8255_1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( hustlerb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9000, 0x903f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9040, 0x905f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9060, 0x907f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9080, 0x90ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9040, 0x905f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9060, 0x907f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9080, 0x90ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxian_nmi_enable_w) - AM_RANGE(0xa802, 0xa802) AM_WRITE(MWA8_NOP) /* coin counters */ + AM_RANGE(0xa802, 0xa802) AM_WRITE(SMH_NOP) /* coin counters */ AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxian_flip_screen_y_w) AM_RANGE(0xa807, 0xa807) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0xc100, 0xc103) AM_WRITE(ppi8255_0_w) @@ -236,32 +236,32 @@ static ADDRESS_MAP_START( hustlerb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mimonkey_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8bff) AM_READ(SMH_RAM) AM_RANGE(0x8c00, 0x8fff) AM_READ(galaxian_videoram_r) /* mirror */ - AM_RANGE(0x9000, 0x90ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9000, 0x90ff) AM_READ(SMH_RAM) AM_RANGE(0x9800, 0x9803) AM_READ(ppi8255_0_r) AM_RANGE(0xa000, 0xa003) AM_READ(ppi8255_1_r) AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mimonkey_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x8c00, 0x8fff) AM_WRITE(galaxian_videoram_w) /* mirror */ AM_RANGE(0x9000, 0x903f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9040, 0x905f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9060, 0x907f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9080, 0x90ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9040, 0x905f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9060, 0x907f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9080, 0x90ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9800, 0x9803) AM_WRITE(ppi8255_0_w) AM_RANGE(0xa000, 0xa003) AM_WRITE(ppi8255_1_w) AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0xa800, 0xa802) AM_WRITE(galaxian_gfxbank_w) AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0xa807, 0xa807) AM_WRITE(galaxian_flip_screen_y_w) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -321,14 +321,14 @@ static WRITE8_HANDLER( anteatg_ppi8255_1_reg3_w ) } static ADDRESS_MAP_START( anteatg_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READ(MRA8_ROM) - AM_RANGE(0x0400, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x20ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4600, 0x4fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6400, 0x7aff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_ROM) + AM_RANGE(0x0400, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x20ff) AM_READ(SMH_RAM) + AM_RANGE(0x4600, 0x4fff) AM_READ(SMH_ROM) + AM_RANGE(0x6400, 0x7aff) AM_READ(SMH_ROM) AM_RANGE(0x7c00, 0x7fff) AM_READ(galaxian_videoram_r) /* mirror */ - AM_RANGE(0x8300, 0x98ff) AM_READ(MRA8_ROM) - AM_RANGE(0xa300, 0xa7ff) AM_READ(MRA8_ROM) + AM_RANGE(0x8300, 0x98ff) AM_READ(SMH_ROM) + AM_RANGE(0xa300, 0xa7ff) AM_READ(SMH_ROM) AM_RANGE(0xf521, 0xf521) AM_READ(watchdog_reset_r) AM_RANGE(0xf612, 0xf612) AM_READ(anteatg_ppi8255_0_reg0_r) AM_RANGE(0xf631, 0xf631) AM_READ(anteatg_ppi8255_0_reg1_r) @@ -337,13 +337,13 @@ static ADDRESS_MAP_START( anteatg_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( anteatg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x0400, 0x0bff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x0400, 0x0bff) AM_WRITE(SMH_RAM) AM_RANGE(0x0c00, 0x0fff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x2000, 0x203f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x2040, 0x205f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x2060, 0x207f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x2080, 0x20ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x2040, 0x205f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x2060, 0x207f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x2080, 0x20ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2423, 0x2423) AM_WRITE(anteatg_ppi8255_1_reg3_w) AM_RANGE(0x2450, 0x2450) AM_WRITE(anteatg_ppi8255_1_reg0_w) AM_RANGE(0x2511, 0x2511) AM_WRITE(anteatg_ppi8255_1_reg1_w) @@ -353,11 +353,11 @@ static ADDRESS_MAP_START( anteatg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2653, 0x2653) AM_WRITE(scramble_background_enable_w) AM_RANGE(0x2702, 0x2702) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0x2736, 0x2736) AM_WRITE(galaxian_flip_screen_x_w) - AM_RANGE(0x4600, 0x4fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6400, 0x7aff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4600, 0x4fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6400, 0x7aff) AM_WRITE(SMH_ROM) AM_RANGE(0x7c00, 0x7fff) AM_WRITE(galaxian_videoram_w) /* mirror */ - AM_RANGE(0x8300, 0x98ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xa300, 0xa7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8300, 0x98ff) AM_WRITE(SMH_ROM) + AM_RANGE(0xa300, 0xa7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf612, 0xf612) AM_WRITE(anteatg_ppi8255_0_reg0_w) AM_RANGE(0xf631, 0xf631) AM_WRITE(anteatg_ppi8255_0_reg1_w) AM_RANGE(0xf710, 0xf710) AM_WRITE(anteatg_ppi8255_0_reg2_w) @@ -365,36 +365,36 @@ static ADDRESS_MAP_START( anteatg_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( anteatgb_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READ(MRA8_ROM) - AM_RANGE(0x0400, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0x1200, 0x12ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_ROM) + AM_RANGE(0x0400, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1200, 0x12ff) AM_READ(SMH_RAM) AM_RANGE(0x145b, 0x145b) AM_READ(watchdog_reset_r) - AM_RANGE(0x4600, 0x4fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6400, 0x7aff) AM_READ(MRA8_ROM) - AM_RANGE(0x8300, 0x98ff) AM_READ(MRA8_ROM) - AM_RANGE(0xa300, 0xa7ff) AM_READ(MRA8_ROM) + AM_RANGE(0x4600, 0x4fff) AM_READ(SMH_ROM) + AM_RANGE(0x6400, 0x7aff) AM_READ(SMH_ROM) + AM_RANGE(0x8300, 0x98ff) AM_READ(SMH_ROM) + AM_RANGE(0xa300, 0xa7ff) AM_READ(SMH_ROM) AM_RANGE(0xf300, 0xf303) AM_READ(ppi8255_0_r) AM_RANGE(0xfe00, 0xfe03) AM_READ(ppi8255_1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( anteatgb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x0400, 0x0bff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x0400, 0x0bff) AM_WRITE(SMH_RAM) AM_RANGE(0x0c00, 0x0fff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x1200, 0x123f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x1240, 0x125f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x1260, 0x127f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x1280, 0x12ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x1240, 0x125f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x1260, 0x127f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x1280, 0x12ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1171, 0x1171) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0x1174, 0x1174) AM_WRITE(galaxian_stars_enable_w) AM_RANGE(0x1177, 0x1177) AM_WRITE(galaxian_flip_screen_y_w) AM_RANGE(0x1173, 0x1173) AM_WRITE(scramble_background_enable_w) AM_RANGE(0x1172, 0x1172) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0x1176, 0x1176) AM_WRITE(galaxian_flip_screen_x_w) - AM_RANGE(0x4600, 0x4fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6400, 0x7aff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8300, 0x98ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xa300, 0xa7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4600, 0x4fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6400, 0x7aff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8300, 0x98ff) AM_WRITE(SMH_ROM) + AM_RANGE(0xa300, 0xa7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf300, 0xf303) AM_WRITE(ppi8255_0_w) AM_RANGE(0xfe00, 0xfe03) AM_WRITE(ppi8255_1_w) ADDRESS_MAP_END @@ -412,23 +412,23 @@ static WRITE8_HANDLER(scobra_soundram_w) } static ADDRESS_MAP_START( scobra_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_READ(scobra_soundram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( scobra_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(scobra_soundram_w) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_NOP) AM_BASE(&scobra_soundram) /* only here to initialize pointer */ + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_NOP) AM_BASE(&scobra_soundram) /* only here to initialize pointer */ AM_RANGE(0x9000, 0x9fff) AM_WRITE(scramble_filter_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hustlerb_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x6000, 0x6fff) AM_WRITE(frogger_filter_w) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_NOP) AM_BASE(&scobra_soundram) /* only here to initialize pointer */ + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_NOP) AM_BASE(&scobra_soundram) /* only here to initialize pointer */ ADDRESS_MAP_END @@ -447,13 +447,13 @@ static ADDRESS_MAP_START( scobra_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( hustler_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( hustler_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6000, 0x6fff) AM_WRITE(frogger_filter_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c index bea1a2b73f1..012d6357bed 100644 --- a/src/mame/drivers/scotrsht.c +++ b/src/mame/drivers/scotrsht.c @@ -42,19 +42,19 @@ static WRITE8_HANDLER( scotrsht_soundlatch_w ) } static ADDRESS_MAP_START( scotrsht_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READWRITE(MRA8_RAM, scotrsht_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x0800, 0x0fff) AM_READWRITE(MRA8_RAM, scotrsht_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x0000, 0x07ff) AM_READWRITE(SMH_RAM, scotrsht_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x0800, 0x0fff) AM_READWRITE(SMH_RAM, scotrsht_videoram_w) AM_BASE(&videoram) AM_RANGE(0x1000, 0x10bf) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* sprites */ AM_RANGE(0x10c0, 0x1fff) AM_RAM /* work ram */ AM_RANGE(0x2000, 0x201f) AM_RAM AM_BASE(&scotrsht_scroll) /* scroll registers */ - AM_RANGE(0x2040, 0x2040) AM_WRITE(MWA8_NOP) - AM_RANGE(0x2041, 0x2041) AM_WRITE(MWA8_NOP) - AM_RANGE(0x2042, 0x2042) AM_WRITE(MWA8_NOP) /* it should be -> bit 2 = scroll direction like in jailbrek, but it's not used */ + AM_RANGE(0x2040, 0x2040) AM_WRITE(SMH_NOP) + AM_RANGE(0x2041, 0x2041) AM_WRITE(SMH_NOP) + AM_RANGE(0x2042, 0x2042) AM_WRITE(SMH_NOP) /* it should be -> bit 2 = scroll direction like in jailbrek, but it's not used */ AM_RANGE(0x2043, 0x2043) AM_WRITE(scotrsht_charbank_w) AM_RANGE(0x2044, 0x2044) AM_WRITE(ctrl_w) AM_RANGE(0x3000, 0x3000) AM_WRITE(scotrsht_palettebank_w) AM_RANGE(0x3100, 0x3100) AM_WRITE(scotrsht_soundlatch_w) - AM_RANGE(0x3200, 0x3200) AM_WRITE(MWA8_NOP) /* it writes 0, 1 */ + AM_RANGE(0x3200, 0x3200) AM_WRITE(SMH_NOP) /* it writes 0, 1 */ AM_RANGE(0x3100, 0x3100) AM_READ(input_port_4_r) /* DSW1 */ AM_RANGE(0x3200, 0x3200) AM_READ(input_port_5_r) /* DSW2 */ AM_RANGE(0x3300, 0x3300) AM_READ(input_port_0_r) /* coins, start */ diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c index d5917db34c3..bde0bfa8c1a 100644 --- a/src/mame/drivers/scramble.c +++ b/src/mame/drivers/scramble.c @@ -79,10 +79,10 @@ static READ8_HANDLER( monsterz_prot_r ) static ADDRESS_MAP_START( scramble_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4bff) AM_READ(SMH_RAM) AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxian_videoram_r) /* mirror */ - AM_RANGE(0x5000, 0x50ff) AM_READ(MRA8_RAM) + AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r) AM_RANGE(0x7800, 0x7800) AM_READ(watchdog_reset_r) AM_RANGE(0x8100, 0x8103) AM_READ(ppi8255_0_r) @@ -91,14 +91,14 @@ static ADDRESS_MAP_START( scramble_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( scramble_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x4c00, 0x4fff) AM_WRITE(galaxian_videoram_w) /* mirror address */ AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0x6804, 0x6804) AM_WRITE(galaxian_stars_enable_w) @@ -110,11 +110,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( turpins_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) AM_RANGE(0x9400, 0x97ff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa001, 0xa001) AM_READ(input_port_1_r) @@ -124,18 +124,18 @@ static ADDRESS_MAP_START( turpins_readmem, ADDRESS_SPACE_PROGRAM, 8 ) // AM_RANGE(0x8100, 0x8103) AM_READ(ppi8255_0_r) // AM_RANGE(0x8200, 0x8203) AM_READ(ppi8255_1_r) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( turpins_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9400, 0x97ff) AM_WRITE(galaxian_videoram_w) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0xa802, 0xa802) AM_WRITE(galaxian_coin_counter_w) @@ -148,11 +148,11 @@ static ADDRESS_MAP_START( turpins_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( explorer_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4bff) AM_READ(SMH_RAM) AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxian_videoram_r) /* mirror */ - AM_RANGE(0x5000, 0x50ff) AM_READ(MRA8_RAM) - AM_RANGE(0x5100, 0x51ff) AM_READ(MRA8_NOP) /* test mode mirror? */ + AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) + AM_RANGE(0x5100, 0x51ff) AM_READ(SMH_NOP) /* test mode mirror? */ AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r) AM_RANGE(0x8000, 0x8000) AM_READ(input_port_0_r) AM_RANGE(0x8001, 0x8001) AM_READ(input_port_1_r) @@ -161,48 +161,48 @@ static ADDRESS_MAP_START( explorer_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( explorer_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x4c00, 0x4fff) AM_WRITE(galaxian_videoram_w) /* mirror address */ AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x5100, 0x51ff) AM_WRITE(MWA8_NOP) /* test mode mirror? */ - AM_RANGE(0x6800, 0x6800) AM_WRITE(MWA8_NOP) + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x5100, 0x51ff) AM_WRITE(SMH_NOP) /* test mode mirror? */ + AM_RANGE(0x6800, 0x6800) AM_WRITE(SMH_NOP) AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxian_coin_counter_w) - AM_RANGE(0x6803, 0x6803) AM_WRITE(MWA8_NOP) + AM_RANGE(0x6803, 0x6803) AM_WRITE(SMH_NOP) AM_RANGE(0x6804, 0x6804) AM_WRITE(galaxian_stars_enable_w) AM_RANGE(0x6806, 0x6806) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0x6807, 0x6807) AM_WRITE(galaxian_flip_screen_y_w) - AM_RANGE(0x7000, 0x7000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x7000, 0x7000) AM_WRITE(SMH_NOP) AM_RANGE(0x8000, 0x8000) AM_WRITE(soundlatch_w) AM_RANGE(0x9000, 0x9000) AM_WRITE(hotshock_sh_irqtrigger_w) ADDRESS_MAP_END static ADDRESS_MAP_START( ckongs_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x6bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x6bff) AM_READ(SMH_RAM) AM_RANGE(0x7000, 0x7003) AM_READ(ppi8255_0_r) AM_RANGE(0x7800, 0x7803) AM_READ(ppi8255_1_r) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r) ADDRESS_MAP_END static ADDRESS_MAP_START( ckongs_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x6bff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x6bff) AM_WRITE(SMH_RAM) AM_RANGE(0x7000, 0x7003) AM_WRITE(ppi8255_0_w) AM_RANGE(0x7800, 0x7803) AM_WRITE(ppi8255_1_w) AM_RANGE(0x9000, 0x93ff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x9800, 0x983f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x9860, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x9880, 0x98ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x9860, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x9880, 0x98ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa801, 0xa801) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0xa802, 0xa802) AM_WRITE(galaxian_coin_counter_w) AM_RANGE(0xa806, 0xa806) AM_WRITE(galaxian_flip_screen_x_w) @@ -232,24 +232,24 @@ static WRITE8_HANDLER(mars_ppi8255_1_w) static ADDRESS_MAP_START( mars_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4bff) AM_READ(SMH_RAM) AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x5000, 0x50ff) AM_READ(MRA8_RAM) + AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r) - AM_RANGE(0x7000, 0x7000) AM_READ(MRA8_NOP) + AM_RANGE(0x7000, 0x7000) AM_READ(SMH_NOP) AM_RANGE(0x8100, 0x810f) AM_READ(mars_ppi8255_0_r) AM_RANGE(0x8200, 0x820f) AM_READ(mars_ppi8255_1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( mars_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6800, 0x6800) AM_WRITE(galaxian_coin_counter_1_w) AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxian_stars_enable_w) AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxian_nmi_enable_w) @@ -262,24 +262,24 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( newsin7_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4bff) AM_READ(SMH_RAM) AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x5000, 0x50ff) AM_READ(MRA8_RAM) + AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r) AM_RANGE(0x8200, 0x820f) AM_READ(mars_ppi8255_1_r) - AM_RANGE(0xa000, 0xafff) AM_READ(MRA8_ROM) + AM_RANGE(0xa000, 0xafff) AM_READ(SMH_ROM) AM_RANGE(0xc100, 0xc10f) AM_READ(mars_ppi8255_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( newsin7_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6800, 0x6800) AM_WRITE(galaxian_coin_counter_1_w) AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxian_stars_enable_w) AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxian_nmi_enable_w) @@ -287,20 +287,20 @@ static ADDRESS_MAP_START( newsin7_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6809, 0x6809) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0x680b, 0x680b) AM_WRITE(galaxian_flip_screen_y_w) AM_RANGE(0x8200, 0x820f) AM_WRITE(mars_ppi8255_1_w) - AM_RANGE(0xa000, 0xafff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xa000, 0xafff) AM_WRITE(SMH_ROM) AM_RANGE(0xc100, 0xc10f) AM_WRITE(mars_ppi8255_0_w) ADDRESS_MAP_END static ADDRESS_MAP_START( mrkougar_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x4c00, 0x4fff) AM_WRITE(galaxian_videoram_w) /* mirror address */ AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6800, 0x6800) AM_WRITE(galaxian_coin_counter_1_w) AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0x6808, 0x6808) AM_WRITE(galaxian_coin_counter_0_w) @@ -312,10 +312,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hotshock_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4bff) AM_READ(SMH_RAM) AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxian_videoram_r) - AM_RANGE(0x5000, 0x50ff) AM_READ(MRA8_RAM) + AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_READ(input_port_0_r) AM_RANGE(0x8001, 0x8001) AM_READ(input_port_1_r) AM_RANGE(0x8002, 0x8002) AM_READ(input_port_2_r) @@ -323,13 +323,13 @@ static ADDRESS_MAP_START( hotshock_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( hotshock_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_WRITE(galaxian_coin_counter_2_w) AM_RANGE(0x6002, 0x6002) AM_WRITE(galaxian_coin_counter_1_w) AM_RANGE(0x6004, 0x6004) AM_WRITE(hotshock_flip_screen_w) @@ -343,62 +343,62 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hunchbks_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) AM_RANGE(0x1210, 0x1213) AM_READ(ppi8255_1_r) - AM_RANGE(0x1400, 0x14ff) AM_READ(MRA8_RAM) + AM_RANGE(0x1400, 0x14ff) AM_READ(SMH_RAM) AM_RANGE(0x1500, 0x1503) AM_READ(ppi8255_0_r) AM_RANGE(0x1680, 0x1680) AM_READ(watchdog_reset_r) AM_RANGE(0x1780, 0x1780) AM_READ(watchdog_reset_r) - AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_ROM) + AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_ROM) AM_RANGE(0x3000, 0x3fff) AM_READ(hunchbks_mirror_r) - AM_RANGE(0x4000, 0x4fff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x4fff) AM_READ(SMH_ROM) AM_RANGE(0x5000, 0x5fff) AM_READ(hunchbks_mirror_r) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_ROM) AM_RANGE(0x7000, 0x7fff) AM_READ(hunchbks_mirror_r) ADDRESS_MAP_END static ADDRESS_MAP_START( hunchbks_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) AM_RANGE(0x1210, 0x1213) AM_WRITE(ppi8255_1_w) AM_RANGE(0x1400, 0x143f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x1440, 0x145f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x1460, 0x147f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x1480, 0x14ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x1440, 0x145f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x1460, 0x147f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x1480, 0x14ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1500, 0x1503) AM_WRITE(ppi8255_0_w) AM_RANGE(0x1606, 0x1606) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0x1607, 0x1607) AM_WRITE(galaxian_flip_screen_y_w) AM_RANGE(0x1800, 0x1bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) - AM_RANGE(0x1c00, 0x1fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x2000, 0x2fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x1c00, 0x1fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_ROM) AM_RANGE(0x3000, 0x3fff) AM_WRITE(hunchbks_mirror_w) - AM_RANGE(0x4000, 0x4fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_ROM) AM_RANGE(0x5000, 0x5fff) AM_WRITE(hunchbks_mirror_w) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_ROM) AM_RANGE(0x7000, 0x7fff) AM_WRITE(hunchbks_mirror_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sfx_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x4bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x4bff) AM_READ(SMH_RAM) AM_RANGE(0x4c00, 0x4fff) AM_READ(galaxian_videoram_r) /* mirror */ - AM_RANGE(0x5000, 0x50ff) AM_READ(MRA8_RAM) - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8100, 0x8103) AM_READ(ppi8255_0_r) AM_RANGE(0x8200, 0x8203) AM_READ(ppi8255_1_r) - AM_RANGE(0xc000, 0xefff) AM_READ(MRA8_ROM) + AM_RANGE(0xc000, 0xefff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sfx_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x4c00, 0x4fff) AM_WRITE(galaxian_videoram_w) /* mirror address */ AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6800, 0x6800) AM_WRITE(scramble_background_red_w) AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0x6802, 0x6802) AM_WRITE(galaxian_coin_counter_w) @@ -407,20 +407,20 @@ static ADDRESS_MAP_START( sfx_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6805, 0x6805) AM_WRITE(scramble_background_green_w) AM_RANGE(0x6806, 0x6806) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0x6807, 0x6807) AM_WRITE(galaxian_flip_screen_y_w) - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8100, 0x8103) AM_WRITE(ppi8255_0_w) AM_RANGE(0x8200, 0x8203) AM_WRITE(ppi8255_1_w) - AM_RANGE(0xc000, 0xefff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xc000, 0xefff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sfx_sample_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sfx_sample_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sfx_sample_readport, ADDRESS_SPACE_IO, 8 ) @@ -474,32 +474,32 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mimonscr_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x43ff) AM_READ(galaxian_videoram_r) /* mirror address?, probably not */ - AM_RANGE(0x4400, 0x4bff) AM_READ(MRA8_RAM) - AM_RANGE(0x5000, 0x50ff) AM_READ(MRA8_RAM) + AM_RANGE(0x4400, 0x4bff) AM_READ(SMH_RAM) + AM_RANGE(0x5000, 0x50ff) AM_READ(SMH_RAM) AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r) AM_RANGE(0x8100, 0x8103) AM_READ(ppi8255_0_r) AM_RANGE(0x8200, 0x8203) AM_READ(ppi8255_1_r) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mimonscr_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x43ff) AM_WRITE(galaxian_videoram_w) /* mirror address?, probably not */ - AM_RANGE(0x4400, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x4400, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4800, 0x4bff) AM_WRITE(galaxian_videoram_w) AM_BASE(&galaxian_videoram) AM_RANGE(0x5000, 0x503f) AM_WRITE(galaxian_attributesram_w) AM_BASE(&galaxian_attributesram) - AM_RANGE(0x5040, 0x505f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) - AM_RANGE(0x5060, 0x507f) AM_WRITE(MWA8_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) - AM_RANGE(0x5080, 0x50ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x5040, 0x505f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_spriteram) AM_SIZE(&galaxian_spriteram_size) + AM_RANGE(0x5060, 0x507f) AM_WRITE(SMH_RAM) AM_BASE(&galaxian_bulletsram) AM_SIZE(&galaxian_bulletsram_size) + AM_RANGE(0x5080, 0x50ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6801, 0x6801) AM_WRITE(galaxian_nmi_enable_w) AM_RANGE(0x6800, 0x6802) AM_WRITE(galaxian_gfxbank_w) AM_RANGE(0x6806, 0x6806) AM_WRITE(galaxian_flip_screen_x_w) AM_RANGE(0x6807, 0x6807) AM_WRITE(galaxian_flip_screen_y_w) AM_RANGE(0x8100, 0x8103) AM_WRITE(ppi8255_0_w) AM_RANGE(0x8200, 0x8203) AM_WRITE(ppi8255_1_w) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -1959,14 +1959,14 @@ static WRITE8_HANDLER(scramble_soundram_w) } static ADDRESS_MAP_START( scramble_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_READ(scramble_soundram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( scramble_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(scramble_soundram_w) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_NOP) AM_BASE(&scramble_soundram) /* only here to initialize pointer */ + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_NOP) AM_BASE(&scramble_soundram) /* only here to initialize pointer */ AM_RANGE(0x9000, 0x9fff) AM_WRITE(scramble_filter_w) ADDRESS_MAP_END @@ -2086,13 +2086,13 @@ MACHINE_DRIVER_END static ADDRESS_MAP_START( frogger_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( frogger_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6000, 0x6fff) AM_WRITE(frogger_filter_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c index b0c1f9b9185..1a2d387d0fe 100644 --- a/src/mame/drivers/scregg.c +++ b/src/mame/drivers/scregg.c @@ -70,57 +70,57 @@ WRITE8_HANDLER( btime_mirrorcolorram_w ); WRITE8_HANDLER( btime_video_control_w ); static ADDRESS_MAP_START( dommy_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) AM_RANGE(0x2800, 0x2bff) AM_READ(btime_mirrorvideoram_r) AM_RANGE(0x4000, 0x4000) AM_READ(input_port_2_r) /* DSW1 */ AM_RANGE(0x4001, 0x4001) AM_READ(input_port_3_r) /* DSW2 */ /* AM_RANGE(0x4004, 0x4004) */ /* this is read */ AM_RANGE(0x4002, 0x4002) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x4003, 0x4003) AM_READ(input_port_1_r) /* IN1 */ - AM_RANGE(0xa000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( dommy_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x2000, 0x23ff) AM_WRITE(MWA8_RAM) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) - AM_RANGE(0x2400, 0x27ff) AM_WRITE(MWA8_RAM) AM_BASE(&btime_colorram) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) + AM_RANGE(0x2400, 0x27ff) AM_WRITE(SMH_RAM) AM_BASE(&btime_colorram) AM_RANGE(0x2800, 0x2bff) AM_WRITE(btime_mirrorvideoram_w) - AM_RANGE(0x4000, 0x4000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_NOP) AM_RANGE(0x4001, 0x4001) AM_WRITE(btime_video_control_w) AM_RANGE(0x4004, 0x4004) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x4005, 0x4005) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x4006, 0x4006) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x4007, 0x4007) AM_WRITE(AY8910_write_port_1_w) - AM_RANGE(0xa000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xa000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( eggs_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x17ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x17ff) AM_READ(SMH_RAM) AM_RANGE(0x1800, 0x1bff) AM_READ(btime_mirrorvideoram_r) AM_RANGE(0x1c00, 0x1fff) AM_READ(btime_mirrorcolorram_r) AM_RANGE(0x2000, 0x2000) AM_READ(input_port_2_r) /* DSW1 */ AM_RANGE(0x2001, 0x2001) AM_READ(input_port_3_r) /* DSW2 */ AM_RANGE(0x2002, 0x2002) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x2003, 0x2003) AM_READ(input_port_1_r) /* IN1 */ - AM_RANGE(0x3000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) /* reset/interrupt vectors */ + AM_RANGE(0x3000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) /* reset/interrupt vectors */ ADDRESS_MAP_END static ADDRESS_MAP_START( eggs_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1000, 0x13ff) AM_WRITE(MWA8_RAM) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) - AM_RANGE(0x1400, 0x17ff) AM_WRITE(MWA8_RAM) AM_BASE(&btime_colorram) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1000, 0x13ff) AM_WRITE(SMH_RAM) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) + AM_RANGE(0x1400, 0x17ff) AM_WRITE(SMH_RAM) AM_BASE(&btime_colorram) AM_RANGE(0x1800, 0x1bff) AM_WRITE(btime_mirrorvideoram_w) AM_RANGE(0x1c00, 0x1fff) AM_WRITE(btime_mirrorcolorram_w) AM_RANGE(0x2000, 0x2000) AM_WRITE(btime_video_control_w) - AM_RANGE(0x2001, 0x2001) AM_WRITE(MWA8_NOP) + AM_RANGE(0x2001, 0x2001) AM_WRITE(SMH_NOP) AM_RANGE(0x2004, 0x2004) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x2005, 0x2005) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x2006, 0x2006) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x2007, 0x2007) AM_WRITE(AY8910_write_port_1_w) - AM_RANGE(0x3000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x3000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c index 9528e92ab04..d2f5d26f6fa 100644 --- a/src/mame/drivers/sderby.c +++ b/src/mame/drivers/sderby.c @@ -119,43 +119,43 @@ static READ16_HANDLER( roulette_input_r ) } static ADDRESS_MAP_START( sderby_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) AM_RANGE(0x308000, 0x30800d) AM_READ(sderby_input_r) AM_RANGE(0x30800e, 0x30800f) AM_READ(OKIM6295_status_0_lsb_r) - AM_RANGE(0xd00000, 0xd001ff) AM_READ(MRA16_RAM) - AM_RANGE(0xf00000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xd00000, 0xd001ff) AM_READ(SMH_RAM) + AM_RANGE(0xf00000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sderby_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100fff) AM_WRITE(sderby_videoram_w) AM_BASE(&sderby_videoram) // bg AM_RANGE(0x101000, 0x101fff) AM_WRITE(sderby_md_videoram_w) AM_BASE(&sderby_md_videoram) // mid AM_RANGE(0x102000, 0x103fff) AM_WRITE(sderby_fg_videoram_w) AM_BASE(&sderby_fg_videoram) // fg AM_RANGE(0x104000, 0x10400b) AM_WRITE(sderby_scroll_w) - AM_RANGE(0x10400c, 0x10400d) AM_WRITE(MWA16_NOP) // ??? - check code at 0x000456 (executed once at startup) - AM_RANGE(0x10400e, 0x10400f) AM_WRITE(MWA16_NOP) // ??? - check code at 0x000524 (executed once at startup) - AM_RANGE(0x200000, 0x200fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x308008, 0x308009) AM_WRITE(MWA16_NOP) // ??? + AM_RANGE(0x10400c, 0x10400d) AM_WRITE(SMH_NOP) // ??? - check code at 0x000456 (executed once at startup) + AM_RANGE(0x10400e, 0x10400f) AM_WRITE(SMH_NOP) // ??? - check code at 0x000524 (executed once at startup) + AM_RANGE(0x200000, 0x200fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x308008, 0x308009) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0x30800e, 0x30800f) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x380000, 0x380fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP) // ??? - check code at 0x00042e (executed once at startup) - AM_RANGE(0xd00000, 0xd001ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0xf00000, 0xffffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP) // ??? - check code at 0x00042e (executed once at startup) + AM_RANGE(0xd00000, 0xd001ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf00000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( roulette_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x440000, 0x440fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x440000, 0x440fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x500000, 0x500fff) AM_RAM AM_WRITE(sderby_videoram_w) AM_BASE(&sderby_videoram) // bg AM_RANGE(0x501000, 0x501fff) AM_RAM AM_WRITE(sderby_md_videoram_w) AM_BASE(&sderby_md_videoram) // mid AM_RANGE(0x502000, 0x503fff) AM_RAM AM_WRITE(sderby_fg_videoram_w) AM_BASE(&sderby_fg_videoram) // fg AM_RANGE(0x504000, 0x50400b) AM_RAM AM_WRITE(sderby_scroll_w) - AM_RANGE(0x50400e, 0x50400f) AM_WRITE( MWA16_NOP ) + AM_RANGE(0x50400e, 0x50400f) AM_WRITE( SMH_NOP ) - AM_RANGE(0x708000, 0x70800d) AM_READ(roulette_input_r) AM_WRITE(MWA16_NOP) // what are the writes? - AM_RANGE(0x708008, 0x708009) AM_WRITE(MWA16_NOP) // ??? + AM_RANGE(0x708000, 0x70800d) AM_READ(roulette_input_r) AM_WRITE(SMH_NOP) // what are the writes? + AM_RANGE(0x708008, 0x708009) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0x70800e, 0x70800f) AM_READ(OKIM6295_status_0_lsb_r) AM_WRITE(OKIM6295_data_0_lsb_w) // ?? it only ever plays 1 sound AM_RANGE(0x780000, 0x780fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c index 6dc99c9cd4d..4263cb7f27c 100644 --- a/src/mame/drivers/seattle.c +++ b/src/mame/drivers/seattle.c @@ -1737,14 +1737,14 @@ static ADDRESS_MAP_START( seattle_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x16100000, 0x1611ffff) AM_READWRITE(cmos_r, cmos_w) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) AM_RANGE(0x17000000, 0x17000003) AM_READWRITE(cmos_protect_r, cmos_protect_w) AM_RANGE(0x17100000, 0x17100003) AM_WRITE(seattle_watchdog_w) - AM_RANGE(0x17300000, 0x17300003) AM_READWRITE(MRA32_RAM, seattle_interrupt_enable_w) AM_BASE(&interrupt_enable) - AM_RANGE(0x17400000, 0x17400003) AM_READWRITE(MRA32_RAM, interrupt_config_w) AM_BASE(&interrupt_config) + AM_RANGE(0x17300000, 0x17300003) AM_READWRITE(SMH_RAM, seattle_interrupt_enable_w) AM_BASE(&interrupt_enable) + AM_RANGE(0x17400000, 0x17400003) AM_READWRITE(SMH_RAM, interrupt_config_w) AM_BASE(&interrupt_config) AM_RANGE(0x17500000, 0x17500003) AM_READ(interrupt_state_r) AM_RANGE(0x17600000, 0x17600003) AM_READ(interrupt_state2_r) AM_RANGE(0x17700000, 0x17700003) AM_WRITE(vblank_clear_w) AM_RANGE(0x17800000, 0x17800003) AM_NOP AM_RANGE(0x17900000, 0x17900003) AM_READWRITE(status_leds_r, status_leds_w) - AM_RANGE(0x17f00000, 0x17f00003) AM_READWRITE(MRA32_RAM, asic_reset_w) AM_BASE(&asic_reset) + AM_RANGE(0x17f00000, 0x17f00003) AM_READWRITE(SMH_RAM, asic_reset_w) AM_BASE(&asic_reset) AM_RANGE(0x1fc00000, 0x1fc7ffff) AM_ROM AM_REGION(REGION_USER1, 0) AM_BASE(&rombase) ADDRESS_MAP_END @@ -2738,8 +2738,8 @@ static void init_common(int ioasic, int serialnum, int yearoffs, int config) { case PHOENIX_CONFIG: /* original Phoenix board only has 4MB of RAM */ - memory_install_read32_handler (0, ADDRESS_SPACE_PROGRAM, 0x00400000, 0x007fffff, 0, 0, MRA32_NOP); - memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x00400000, 0x007fffff, 0, 0, MWA32_NOP); + memory_install_read32_handler (0, ADDRESS_SPACE_PROGRAM, 0x00400000, 0x007fffff, 0, 0, SMH_NOP); + memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, 0x00400000, 0x007fffff, 0, 0, SMH_NOP); break; case SEATTLE_WIDGET_CONFIG: diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 7787737ecdf..c2eac53b8dd 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -2088,7 +2088,7 @@ static DRIVER_INIT( tfrceacb ) { /* disable the palette bank switching from the protection chip */ segac2_common_init(NULL); - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x800000, 0x800001, 0, 0, MWA16_NOP); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x800000, 0x800001, 0, 0, SMH_NOP); } static DRIVER_INIT( borench ) diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index 8db2723752a..7594f5d3188 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -317,30 +317,30 @@ static struct sms_vdp *md_sms_vdp; #ifdef UNUSED_FUNCTION static ADDRESS_MAP_START( sms_readmem, ADDRESS_SPACE_PROGRAM, 8 ) -// AM_RANGE(0x0000 , 0xbfff) AM_READ(MRA8_ROM) -// AM_RANGE(0xc000 , 0xdfff) AM_READ(MRA8_RAM) AM_MIRROR(0x2000) +// AM_RANGE(0x0000 , 0xbfff) AM_READ(SMH_ROM) +// AM_RANGE(0xc000 , 0xdfff) AM_READ(SMH_RAM) AM_MIRROR(0x2000) ADDRESS_MAP_END static ADDRESS_MAP_START( sms_writemem, ADDRESS_SPACE_PROGRAM, 8 ) -// AM_RANGE(0x0000 , 0xbfff) AM_WRITE(MWA8_ROM) -// AM_RANGE(0xc000 , 0xdfff) AM_WRITE(MWA8_RAM) AM_MIRROR(0x2000) +// AM_RANGE(0x0000 , 0xbfff) AM_WRITE(SMH_ROM) +// AM_RANGE(0xc000 , 0xdfff) AM_WRITE(SMH_RAM) AM_MIRROR(0x2000) ADDRESS_MAP_END #endif /* we have to fill in the ROM addresses for systeme due to the encrypted games */ static ADDRESS_MAP_START( systeme_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* Fixed ROM */ - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) /* Banked ROM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* Fixed ROM */ + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) /* Banked ROM */ -// AM_RANGE(0x0000 , 0xbfff) AM_READ(MRA8_ROM) -// AM_RANGE(0xc000 , 0xdfff) AM_READ(MRA8_RAM) AM_MIRROR(0x2000) +// AM_RANGE(0x0000 , 0xbfff) AM_READ(SMH_ROM) +// AM_RANGE(0xc000 , 0xdfff) AM_READ(SMH_RAM) AM_MIRROR(0x2000) ADDRESS_MAP_END static ADDRESS_MAP_START( systeme_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* Fixed ROM */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* Fixed ROM */ -// AM_RANGE(0x0000 , 0xbfff) AM_WRITE(MWA8_ROM) -// AM_RANGE(0xc000 , 0xdfff) AM_WRITE(MWA8_RAM) AM_MIRROR(0x2000) +// AM_RANGE(0x0000 , 0xbfff) AM_WRITE(SMH_ROM) +// AM_RANGE(0xc000 , 0xdfff) AM_WRITE(SMH_RAM) AM_MIRROR(0x2000) ADDRESS_MAP_END static ADDRESS_MAP_START( sms_readport, ADDRESS_SPACE_IO, 8 ) @@ -2203,8 +2203,8 @@ static void init_systeme_map(void) /* fixed rom bank area */ // sms_rom = auto_malloc(0xc000); -// memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0x0000, 0xbfff, 0, 0, MRA8_BANK1); -// memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x7fff, 0, 0, MWA8_UNMAP); +// memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0x0000, 0xbfff, 0, 0, SMH_BANK1); +// memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x7fff, 0, 0, SMH_UNMAP); // memory_set_bankptr( 1, sms_rom ); memory_configure_bank(1, 0, 16, memory_region(REGION_CPU1) + 0x10000, 0x4000); @@ -2217,8 +2217,8 @@ static void init_systeme_map(void) /* main ram area */ sms_mainram = auto_malloc(0x4000); - memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xffff, 0, 0, MRA8_BANK2); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xffff, 0, 0, MWA8_BANK2); + memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xffff, 0, 0, SMH_BANK2); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xffff, 0, 0, SMH_BANK2); memory_set_bankptr( 2, sms_mainram ); memset(sms_mainram,0x00,0x4000); diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c index caef096081f..54543971ccc 100644 --- a/src/mame/drivers/segag80r.c +++ b/src/mame/drivers/segag80r.c @@ -340,8 +340,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_ROM /* CPU board ROM */ AM_RANGE(0x0800, 0x7fff) AM_ROM /* PROM board ROM area */ AM_RANGE(0x8000, 0xbfff) AM_ROM /* PROM board ROM area */ - AM_RANGE(0xc800, 0xcfff) AM_READWRITE(MRA8_RAM, mainram_w) AM_BASE(&mainram) - AM_RANGE(0xe000, 0xffff) AM_READWRITE(MRA8_RAM, vidram_w) AM_BASE(&videoram) + AM_RANGE(0xc800, 0xcfff) AM_READWRITE(SMH_RAM, mainram_w) AM_BASE(&mainram) + AM_RANGE(0xe000, 0xffff) AM_READWRITE(SMH_RAM, vidram_w) AM_BASE(&videoram) ADDRESS_MAP_END diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c index 60611835d39..e9dd461eb41 100644 --- a/src/mame/drivers/segag80v.c +++ b/src/mame/drivers/segag80v.c @@ -400,8 +400,8 @@ static WRITE8_HANDLER( unknown_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_ROM /* CPU board ROM */ AM_RANGE(0x0800, 0xbfff) AM_ROM /* PROM board ROM area */ - AM_RANGE(0xc800, 0xcfff) AM_READWRITE(MRA8_RAM, mainram_w) AM_BASE(&mainram) - AM_RANGE(0xe000, 0xefff) AM_READWRITE(MRA8_RAM, vectorram_w) AM_BASE(&vectorram) AM_SIZE(&vectorram_size) + AM_RANGE(0xc800, 0xcfff) AM_READWRITE(SMH_RAM, mainram_w) AM_BASE(&mainram) + AM_RANGE(0xe000, 0xefff) AM_READWRITE(SMH_RAM, vectorram_w) AM_BASE(&vectorram) AM_SIZE(&vectorram_size) ADDRESS_MAP_END diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index 777a91a668f..1e83d756a1d 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -362,10 +362,10 @@ static ADDRESS_MAP_START( hangon_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x20c000, 0x20ffff) AM_RAM - AM_RANGE(0x400000, 0x403fff) AM_READWRITE(MRA16_RAM, segaic16_tileram_0_w) AM_BASE(&segaic16_tileram_0) - AM_RANGE(0x410000, 0x410fff) AM_READWRITE(MRA16_RAM, segaic16_textram_0_w) AM_BASE(&segaic16_textram_0) + AM_RANGE(0x400000, 0x403fff) AM_READWRITE(SMH_RAM, segaic16_tileram_0_w) AM_BASE(&segaic16_tileram_0) + AM_RANGE(0x410000, 0x410fff) AM_READWRITE(SMH_RAM, segaic16_textram_0_w) AM_BASE(&segaic16_textram_0) AM_RANGE(0x600000, 0x6007ff) AM_RAM AM_BASE(&segaic16_spriteram_0) - AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(MRA16_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(SMH_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0xc00000, 0xc3ffff) AM_ROM AM_REGION(REGION_CPU2, 0) AM_RANGE(0xc68000, 0xc68fff) AM_RAM AM_SHARE(1) AM_BASE(&segaic16_roadram_0) AM_RANGE(0xc7c000, 0xc7ffff) AM_RAM AM_SHARE(2) @@ -377,9 +377,9 @@ static ADDRESS_MAP_START( sharrier_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x040000, 0x043fff) AM_RAM AM_BASE(&workram) - AM_RANGE(0x100000, 0x107fff) AM_READWRITE(MRA16_RAM, segaic16_tileram_0_w) AM_BASE(&segaic16_tileram_0) - AM_RANGE(0x108000, 0x108fff) AM_READWRITE(MRA16_RAM, segaic16_textram_0_w) AM_BASE(&segaic16_textram_0) - AM_RANGE(0x110000, 0x110fff) AM_READWRITE(MRA16_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x100000, 0x107fff) AM_READWRITE(SMH_RAM, segaic16_tileram_0_w) AM_BASE(&segaic16_tileram_0) + AM_RANGE(0x108000, 0x108fff) AM_READWRITE(SMH_RAM, segaic16_textram_0_w) AM_BASE(&segaic16_textram_0) + AM_RANGE(0x110000, 0x110fff) AM_READWRITE(SMH_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x124000, 0x127fff) AM_RAM AM_SHARE(2) AM_RANGE(0x130000, 0x130fff) AM_RAM AM_BASE(&segaic16_spriteram_0) AM_RANGE(0x140000, 0x14ffff) AM_READWRITE(sharrier_io_r, sharrier_io_w) diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index bf67e2dda51..5785678d810 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -99,16 +99,16 @@ static const ppi8255_interface single_ppi_intf = static const struct 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, MRA16_BANK10, MWA16_BANK10, &segaic16_roadram_0, "road RAM" }, - { 0x35/2, 0x60000, 0x08000, 0xf18000, ~0, MRA16_BANK11, MWA16_BANK11, &cpu1ram, "CPU 1 RAM" }, - { 0x35/2, 0x00000, 0x60000, 0xf00000, ~0, MRA16_BANK12, MWA16_UNMAP, &cpu1rom, "CPU 1 ROM" }, + { 0x35/2, 0x80000, 0x01000, 0xf0f000, ~0, SMH_BANK10, SMH_BANK10, &segaic16_roadram_0, "road RAM" }, + { 0x35/2, 0x60000, 0x08000, 0xf18000, ~0, SMH_BANK11, SMH_BANK11, &cpu1ram, "CPU 1 RAM" }, + { 0x35/2, 0x00000, 0x60000, 0xf00000, ~0, SMH_BANK12, 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, MRA16_BANK13, MWA16_BANK13, &segaic16_spriteram_0, "object RAM" }, - { 0x29/2, 0x00000, 0x02000, 0xffe000, ~0, MRA16_BANK14, segaic16_paletteram_w, &paletteram16, "color RAM" }, - { 0x25/2, 0x00000, 0x10000, 0xfe0000, ~0, MRA16_BANK15, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x25/2, 0x10000, 0x01000, 0xfef000, ~0, MRA16_BANK16, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x21/2, 0x60000, 0x08000, 0xf98000, ~0, MRA16_BANK17, MWA16_BANK17, &workram, "CPU 0 RAM" }, - { 0x21/2, 0x00000, 0x60000, 0xf80000, 0x00000, MRA16_BANK18, MWA16_UNMAP, NULL, "CPU 0 ROM" }, + { 0x2d/2, 0x00000, 0x01000, 0xfff000, ~0, SMH_BANK13, SMH_BANK13, &segaic16_spriteram_0, "object RAM" }, + { 0x29/2, 0x00000, 0x02000, 0xffe000, ~0, SMH_BANK14, segaic16_paletteram_w, &paletteram16, "color RAM" }, + { 0x25/2, 0x00000, 0x10000, 0xfe0000, ~0, SMH_BANK15, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, + { 0x25/2, 0x10000, 0x01000, 0xfef000, ~0, SMH_BANK16, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, + { 0x21/2, 0x60000, 0x08000, 0xf98000, ~0, SMH_BANK17, SMH_BANK17, &workram, "CPU 0 RAM" }, + { 0x21/2, 0x00000, 0x60000, 0xf80000, 0x00000, SMH_BANK18, SMH_UNMAP, NULL, "CPU 0 ROM" }, { 0 } }; diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index 6ab2a087f84..e45d610530a 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -811,10 +811,10 @@ static NVRAM_HANDLER( system16a ) static ADDRESS_MAP_START( system16a_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0x380000) AM_ROM - AM_RANGE(0x400000, 0x407fff) AM_MIRROR(0xb88000) AM_READWRITE(MRA16_RAM, segaic16_tileram_0_w) AM_BASE(&segaic16_tileram_0) - AM_RANGE(0x410000, 0x410fff) AM_MIRROR(0xb8f000) AM_READWRITE(MRA16_RAM, segaic16_textram_0_w) AM_BASE(&segaic16_textram_0) + AM_RANGE(0x400000, 0x407fff) AM_MIRROR(0xb88000) AM_READWRITE(SMH_RAM, segaic16_tileram_0_w) AM_BASE(&segaic16_tileram_0) + AM_RANGE(0x410000, 0x410fff) AM_MIRROR(0xb8f000) AM_READWRITE(SMH_RAM, segaic16_textram_0_w) AM_BASE(&segaic16_textram_0) AM_RANGE(0x440000, 0x4407ff) AM_MIRROR(0x3bf800) AM_RAM AM_BASE(&segaic16_spriteram_0) - AM_RANGE(0x840000, 0x840fff) AM_MIRROR(0x3bf000) AM_READWRITE(MRA16_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x840000, 0x840fff) AM_MIRROR(0x3bf000) AM_READWRITE(SMH_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0xc40000, 0xc43fff) AM_MIRROR(0x39c000) AM_READWRITE(misc_io_r, misc_io_w) AM_RANGE(0xc60000, 0xc6ffff) AM_READ(watchdog_reset16_r) AM_RANGE(0xc70000, 0xc73fff) AM_MIRROR(0x38c000) AM_RAM AM_BASE(&workram) diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index 974d0c5d139..418e1bff838 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -934,70 +934,70 @@ static WRITE16_HANDLER( atomicp_sound_w ); static const struct 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, MRA16_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, MRA16_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, MRA16_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, MRA16_BANK13, MWA16_BANK13, &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, MRA16_BANK14, MWA16_BANK14, &workram, "work RAM" }, - { 0x29/2, 0x00000, 0x20000, 0xfe0000, 0x20000, MRA16_BANK15, MWA16_UNMAP, NULL, "ROM 2" }, - { 0x25/2, 0x00000, 0x20000, 0xfe0000, 0x10000, MRA16_BANK16, MWA16_UNMAP, NULL, "ROM 1" }, - { 0x21/2, 0x00000, 0x20000, 0xfe0000, 0x00000, MRA16_BANK17, MWA16_UNMAP, NULL, "ROM 0" }, + { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, SMH_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, SMH_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, SMH_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, SMH_BANK13, SMH_BANK13, &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, SMH_BANK14, SMH_BANK14, &workram, "work RAM" }, + { 0x29/2, 0x00000, 0x20000, 0xfe0000, 0x20000, SMH_BANK15, SMH_UNMAP, NULL, "ROM 2" }, + { 0x25/2, 0x00000, 0x20000, 0xfe0000, 0x10000, SMH_BANK16, SMH_UNMAP, NULL, "ROM 1" }, + { 0x21/2, 0x00000, 0x20000, 0xfe0000, 0x00000, SMH_BANK17, SMH_UNMAP, NULL, "ROM 0" }, { 0 } }; static const struct 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, MRA16_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, MRA16_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, MRA16_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, MRA16_BANK13, MWA16_BANK13, &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, MRA16_BANK14, MWA16_BANK14, &workram, "work RAM" }, - { 0x29/2, 0x00000, 0x20000, 0xfe0000, 0x40000, MRA16_BANK15, MWA16_UNMAP, NULL, "ROM 2" }, - { 0x25/2, 0x00000, 0x20000, 0xfe0000, 0x20000, MRA16_BANK16, MWA16_UNMAP, NULL, "ROM 1" }, - { 0x21/2, 0x00000, 0x20000, 0xfe0000, 0x00000, MRA16_BANK17, MWA16_UNMAP, NULL, "ROM 0" }, + { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, SMH_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, SMH_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, SMH_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, SMH_BANK13, SMH_BANK13, &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, SMH_BANK14, SMH_BANK14, &workram, "work RAM" }, + { 0x29/2, 0x00000, 0x20000, 0xfe0000, 0x40000, SMH_BANK15, SMH_UNMAP, NULL, "ROM 2" }, + { 0x25/2, 0x00000, 0x20000, 0xfe0000, 0x20000, SMH_BANK16, SMH_UNMAP, NULL, "ROM 1" }, + { 0x21/2, 0x00000, 0x20000, 0xfe0000, 0x00000, SMH_BANK17, SMH_UNMAP, NULL, "ROM 0" }, { 0 } }; static const struct 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, MRA16_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, MRA16_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, MRA16_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, MRA16_BANK13, MWA16_BANK13, &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, MRA16_BANK14, MWA16_BANK14, &workram, "work RAM" }, + { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, SMH_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, SMH_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, SMH_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, SMH_BANK13, SMH_BANK13, &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, SMH_BANK14, SMH_BANK14, &workram, "work RAM" }, { 0x29/2, 0x00000, 0x10000, 0xff0000, ~0, NULL, rom_5704_bank_w, NULL, "tile bank" }, - { 0x25/2, 0x00000, 0x80000, 0xfc0000, 0x80000, MRA16_BANK16, MWA16_UNMAP, NULL, "ROM 1" }, - { 0x21/2, 0x00000, 0x80000, 0xfc0000, 0x00000, MRA16_BANK17, MWA16_UNMAP, NULL, "ROM 0" }, + { 0x25/2, 0x00000, 0x80000, 0xfc0000, 0x80000, SMH_BANK16, SMH_UNMAP, NULL, "ROM 1" }, + { 0x21/2, 0x00000, 0x80000, 0xfc0000, 0x00000, SMH_BANK17, SMH_UNMAP, NULL, "ROM 0" }, { 0 } }; static const struct 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, MRA16_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, MRA16_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, MRA16_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, MRA16_BANK13, MWA16_BANK13, &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, MRA16_BANK14, MWA16_BANK14, &workram, "work RAM" }, + { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, SMH_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, SMH_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, SMH_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, SMH_BANK13, SMH_BANK13, &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, SMH_BANK14, SMH_BANK14, &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, MRA16_BANK17, MWA16_UNMAP, NULL, "ROM 0" }, + { 0x21/2, 0x00000, 0x80000, 0xfc0000, 0x00000, SMH_BANK17, SMH_UNMAP, NULL, "ROM 0" }, { 0 } }; static const struct 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, MRA16_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, MRA16_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, MRA16_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, MRA16_BANK13, MWA16_BANK13, &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, MRA16_BANK14, MWA16_BANK14, &workram, "work RAM" }, + { 0x39/2, 0x00000, 0x01000, 0xfff000, ~0, SMH_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, SMH_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, SMH_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, SMH_BANK13, SMH_BANK13, &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, SMH_BANK14, SMH_BANK14, &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, MRA16_BANK17, MWA16_UNMAP, NULL, "ROM 0" }, + { 0x21/2, 0x00000, 0x80000, 0xf80000, 0x00000, SMH_BANK17, SMH_UNMAP, NULL, "ROM 0" }, { 0 } }; diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index 938481e1256..3e0664ac6ed 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -93,42 +93,42 @@ static WRITE16_HANDLER( rom_5987_bank_w ); static const struct 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, MRA16_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, MRA16_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, MRA16_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, MRA16_BANK13, MWA16_BANK13, &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, MRA16_BANK14, MWA16_BANK14, &workram, "work RAM" }, + { 0x39/2, 0x00000, 0x02000, 0xffe000, ~0, SMH_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, SMH_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, SMH_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, SMH_BANK13, SMH_BANK13, &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, SMH_BANK14, SMH_BANK14, &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, MRA16_BANK17, MWA16_UNMAP, NULL, "ROM 0" }, + { 0x21/2, 0x00000, 0x80000, 0xf80000, 0x00000, SMH_BANK17, SMH_UNMAP, NULL, "ROM 0" }, { 0 } }; static const struct 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, MRA16_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, MRA16_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, MRA16_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, MRA16_BANK13, MWA16_BANK13, &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, MRA16_BANK14, MWA16_BANK14, &workram, "work RAM" }, + { 0x39/2, 0x00000, 0x02000, 0xffe000, ~0, SMH_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, SMH_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, SMH_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, SMH_BANK13, SMH_BANK13, &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, SMH_BANK14, SMH_BANK14, &workram, "work RAM" }, { 0x29/2, 0x00000, 0x00010, 0xfffff0, ~0, genesis_vdp_r, genesis_vdp_w, NULL, "VDP" }, - { 0x25/2, 0x00000, 0x80000, 0xf80000, 0x80000, MRA16_BANK16, MWA16_UNMAP, NULL, "ROM 1" }, - { 0x21/2, 0x00000, 0x80000, 0xf80000, 0x00000, MRA16_BANK17, MWA16_UNMAP, NULL, "ROM 0" }, + { 0x25/2, 0x00000, 0x80000, 0xf80000, 0x80000, SMH_BANK16, SMH_UNMAP, NULL, "ROM 1" }, + { 0x21/2, 0x00000, 0x80000, 0xf80000, 0x00000, SMH_BANK17, SMH_UNMAP, NULL, "ROM 0" }, { 0 } }; static const struct 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, MRA16_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, - { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, MRA16_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, - { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, MRA16_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, - { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, MRA16_BANK13, MWA16_BANK13, &segaic16_spriteram_0, "object RAM" }, - { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, MRA16_BANK14, MWA16_BANK14, &workram, "work RAM" }, + { 0x39/2, 0x00000, 0x02000, 0xffe000, ~0, SMH_BANK10, segaic16_paletteram_w, &paletteram16, "color RAM" }, + { 0x35/2, 0x00000, 0x10000, 0xfe0000, ~0, SMH_BANK11, segaic16_tileram_0_w, &segaic16_tileram_0, "tile RAM" }, + { 0x35/2, 0x10000, 0x01000, 0xfef000, ~0, SMH_BANK12, segaic16_textram_0_w, &segaic16_textram_0, "text RAM" }, + { 0x31/2, 0x00000, 0x00800, 0xfff800, ~0, SMH_BANK13, SMH_BANK13, &segaic16_spriteram_0, "object RAM" }, + { 0x2d/2, 0x00000, 0x04000, 0xffc000, ~0, SMH_BANK14, SMH_BANK14, &workram, "work RAM" }, { 0x29/2, 0x00000, 0x00010, 0xfffff0, ~0, genesis_vdp_r, genesis_vdp_w, NULL, "VDP" }, - { 0x25/2, 0x00000, 0x80000, 0xf80000, 0x80000, MRA16_BANK16, rom_5987_bank_w, NULL, "ROM 1/banking" }, - { 0x21/2, 0x00000, 0x100000,0xf00000, 0x00000, MRA16_BANK17, MWA16_UNMAP, NULL, "ROM 0" }, + { 0x25/2, 0x00000, 0x80000, 0xf80000, 0x80000, SMH_BANK16, rom_5987_bank_w, NULL, "ROM 1/banking" }, + { 0x21/2, 0x00000, 0x100000,0xf00000, 0x00000, SMH_BANK17, SMH_UNMAP, NULL, "ROM 0" }, { 0 } }; diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index aafb45e6228..a3246a9fb4b 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -1021,7 +1021,7 @@ static ADDRESS_MAP_START( system24_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x260000, 0x260001) AM_WRITENOP // Vertical synchronization register AM_RANGE(0x270000, 0x270001) AM_WRITENOP // Video synchronization switch AM_RANGE(0x280000, 0x29ffff) AM_READWRITE(sys24_char_r, sys24_char_w) - AM_RANGE(0x400000, 0x403fff) AM_READWRITE(MRA16_RAM, system24temp_sys16_paletteram1_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x403fff) AM_READWRITE(SMH_RAM, system24temp_sys16_paletteram1_w) AM_BASE(&paletteram16) AM_RANGE(0x404000, 0x40401f) AM_READWRITE(sys24_mixer_r, sys24_mixer_w) AM_RANGE(0x600000, 0x63ffff) AM_READWRITE(sys24_sprite_r, sys24_sprite_w) AM_RANGE(0x800000, 0x80007f) AM_READWRITE(system24temp_sys16_io_r, system24temp_sys16_io_w) @@ -1037,7 +1037,7 @@ static ADDRESS_MAP_START( system24_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc80000, 0xcbffff) AM_ROMBANK(2) AM_RANGE(0xcc0000, 0xcc0001) AM_READWRITE(curbank_r, curbank_w) AM_RANGE(0xcc0006, 0xcc0007) AM_READWRITE(mlatch_r, mlatch_w) -AM_RANGE(0xd00300, 0xd00301) AM_WRITE(MWA16_NOP) +AM_RANGE(0xd00300, 0xd00301) AM_WRITE(SMH_NOP) AM_RANGE(0xf00000, 0xf3ffff) AM_RAM AM_SHARE(3) AM_RANGE(0xf40000, 0xf7ffff) AM_ROM AM_SHARE(1) AM_RANGE(0xf80000, 0xffffff) AM_RAM AM_SHARE(2) @@ -1060,7 +1060,7 @@ static ADDRESS_MAP_START( system24_cpu2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x260000, 0x260001) AM_WRITENOP // Vertical synchronization register AM_RANGE(0x270000, 0x270001) AM_WRITENOP // Video synchronization switch AM_RANGE(0x280000, 0x29ffff) AM_READWRITE(sys24_char_r, sys24_char_w) - AM_RANGE(0x400000, 0x403fff) AM_READWRITE(MRA16_RAM, system24temp_sys16_paletteram1_w) + AM_RANGE(0x400000, 0x403fff) AM_READWRITE(SMH_RAM, system24temp_sys16_paletteram1_w) AM_RANGE(0x404000, 0x40401f) AM_READWRITE(sys24_mixer_r, sys24_mixer_w) AM_RANGE(0x600000, 0x63ffff) AM_READWRITE(sys24_sprite_r, sys24_sprite_w) AM_RANGE(0x800000, 0x80007f) AM_READWRITE(system24temp_sys16_io_r, system24temp_sys16_io_w) @@ -1076,7 +1076,7 @@ static ADDRESS_MAP_START( system24_cpu2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc80000, 0xcbffff) AM_ROMBANK(2) AM_RANGE(0xcc0000, 0xcc0001) AM_READWRITE(curbank_r, curbank_w) AM_RANGE(0xcc0006, 0xcc0007) AM_READWRITE(mlatch_r, mlatch_w) -AM_RANGE(0xd00300, 0xd00301) AM_WRITE(MWA16_NOP) +AM_RANGE(0xd00300, 0xd00301) AM_WRITE(SMH_NOP) AM_RANGE(0xf00000, 0xf3ffff) AM_RAM AM_SHARE(3) AM_RANGE(0xf40000, 0xf7ffff) AM_ROM AM_SHARE(1) AM_RANGE(0xf80000, 0xffffff) AM_RAM AM_SHARE(2) diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index e929706e586..e740a78cb04 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -521,14 +521,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x080000, 0x083fff) AM_MIRROR(0x01c000) AM_RAM AM_SHARE(1) AM_BASE(&backupram1) AM_RANGE(0x0a0000, 0x0a3fff) AM_MIRROR(0x01c000) AM_RAM AM_SHARE(2) AM_BASE(&backupram2) - AM_RANGE(0x0c0000, 0x0cffff) AM_READWRITE(MRA16_RAM, segaic16_tileram_0_w) AM_BASE(&segaic16_tileram_0) - AM_RANGE(0x0d0000, 0x0d0fff) AM_MIRROR(0x00f000) AM_READWRITE(MRA16_RAM, segaic16_textram_0_w) AM_BASE(&segaic16_textram_0) + AM_RANGE(0x0c0000, 0x0cffff) AM_READWRITE(SMH_RAM, segaic16_tileram_0_w) AM_BASE(&segaic16_tileram_0) + AM_RANGE(0x0d0000, 0x0d0fff) AM_MIRROR(0x00f000) AM_READWRITE(SMH_RAM, segaic16_textram_0_w) AM_BASE(&segaic16_textram_0) AM_RANGE(0x0e0000, 0x0e0007) AM_MIRROR(0x003ff8) AM_READWRITE(segaic16_multiply_0_r, segaic16_multiply_0_w) AM_RANGE(0x0e4000, 0x0e401f) AM_MIRROR(0x003fe0) AM_READWRITE(segaic16_divide_0_r, segaic16_divide_0_w) AM_RANGE(0x0e8000, 0x0e801f) AM_MIRROR(0x003fe0) AM_READWRITE(segaic16_compare_timer_0_r, segaic16_compare_timer_0_w) AM_RANGE(0x100000, 0x100fff) AM_MIRROR(0x00f000) AM_RAM AM_BASE(&segaic16_spriteram_0) AM_RANGE(0x110000, 0x11ffff) AM_WRITE(segaic16_sprites_draw_0_w) - AM_RANGE(0x120000, 0x123fff) AM_MIRROR(0x00c000) AM_READWRITE(MRA16_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x120000, 0x123fff) AM_MIRROR(0x00c000) AM_READWRITE(SMH_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x130000, 0x13ffff) AM_READWRITE(adc_r, adc_w) AM_RANGE(0x140000, 0x14000f) AM_MIRROR(0x00fff0) AM_READWRITE(iochip_0_r, iochip_0_w) AM_RANGE(0x150000, 0x15000f) AM_MIRROR(0x00fff0) AM_READWRITE(iochip_1_r, iochip_1_w) diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c index 27525995fe1..71c0d331d10 100644 --- a/src/mame/drivers/segaybd.c +++ b/src/mame/drivers/segaybd.c @@ -429,7 +429,7 @@ static ADDRESS_MAP_START( suby_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0000, 0x0cffff) AM_RAM AM_SHARE(1) AM_RANGE(0x180000, 0x1807ff) AM_MIRROR(0x007800) AM_RAM AM_BASE(&segaic16_rotateram_0) AM_RANGE(0x188000, 0x188fff) AM_MIRROR(0x007000) AM_RAM AM_BASE(&segaic16_spriteram_0) - AM_RANGE(0x190000, 0x193fff) AM_MIRROR(0x004000) AM_READWRITE(MRA16_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x190000, 0x193fff) AM_MIRROR(0x004000) AM_READWRITE(SMH_RAM, segaic16_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x198000, 0x19ffff) AM_READ(segaic16_rotate_control_0_r) AM_RANGE(0x1f0000, 0x1fffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c index ee24ad2d4ef..623aa30797b 100644 --- a/src/mame/drivers/seicross.c +++ b/src/mame/drivers/seicross.c @@ -120,10 +120,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE(1) AM_RANGE(0x8820, 0x887f) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x9000, 0x93ff) AM_READWRITE(MRA8_RAM, seicross_videoram_w) AM_BASE(&videoram) /* video RAM */ + AM_RANGE(0x9000, 0x93ff) AM_READWRITE(SMH_RAM, seicross_videoram_w) AM_BASE(&videoram) /* video RAM */ AM_RANGE(0x9800, 0x981f) AM_RAM AM_BASE(&seicross_row_scroll) - AM_RANGE(0x9880, 0x989f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_2_size) - AM_RANGE(0x9c00, 0x9fff) AM_READWRITE(MRA8_RAM, seicross_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x9880, 0x989f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x9c00, 0x9fff) AM_READWRITE(SMH_RAM, seicross_colorram_w) AM_BASE(&colorram) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) /* test */ diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c index b0b42416394..3c4c95948c8 100644 --- a/src/mame/drivers/senjyo.c +++ b/src/mame/drivers/senjyo.c @@ -161,15 +161,15 @@ static WRITE8_HANDLER( paletteram_IIBBGGRR_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x97ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9800, 0x987f) AM_READ(MRA8_RAM) - AM_RANGE(0x9c00, 0x9dff) AM_READ(MRA8_RAM) - AM_RANGE(0x9e00, 0x9e3f) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xa7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xa800, 0xafff) AM_READ(MRA8_RAM) - AM_RANGE(0xb000, 0xb7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xb800, 0xbbff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x97ff) AM_READ(SMH_RAM) + AM_RANGE(0x9800, 0x987f) AM_READ(SMH_RAM) + AM_RANGE(0x9c00, 0x9dff) AM_READ(SMH_RAM) + AM_RANGE(0x9e00, 0x9e3f) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xa7ff) AM_READ(SMH_RAM) + AM_RANGE(0xa800, 0xafff) AM_READ(SMH_RAM) + AM_RANGE(0xb000, 0xb7ff) AM_READ(SMH_RAM) + AM_RANGE(0xb800, 0xbbff) AM_READ(SMH_RAM) AM_RANGE(0xd000, 0xd000) AM_READ(input_port_0_r) /* player 1 input */ AM_RANGE(0xd001, 0xd001) AM_READ(input_port_1_r) /* player 2 input */ AM_RANGE(0xd002, 0xd002) AM_READ(input_port_2_r) /* coin */ @@ -178,43 +178,43 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(senjyo_fgvideoram_w) AM_BASE(&senjyo_fgvideoram) AM_RANGE(0x9400, 0x97ff) AM_WRITE(senjyo_fgcolorram_w) AM_BASE(&senjyo_fgcolorram) - AM_RANGE(0x9800, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x9800, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x9c00, 0x9dff) AM_WRITE(paletteram_IIBBGGRR_w) AM_BASE(&paletteram) - AM_RANGE(0x9e00, 0x9e1f) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_fgscroll) - AM_RANGE(0x9e20, 0x9e21) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_scrolly3) + AM_RANGE(0x9e00, 0x9e1f) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_fgscroll) + AM_RANGE(0x9e20, 0x9e21) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_scrolly3) /* { 0x9e22, 0x9e23, height of the layer (Senjyo only, fixed at 0x380) */ - AM_RANGE(0x9e25, 0x9e25) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_scrollx3) + AM_RANGE(0x9e25, 0x9e25) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_scrollx3) AM_RANGE(0x9e27, 0x9e27) AM_WRITE(senjyo_bgstripes_w) AM_BASE(&senjyo_bgstripesram) /* controls width of background stripes */ - AM_RANGE(0x9e28, 0x9e29) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_scrolly2) + AM_RANGE(0x9e28, 0x9e29) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_scrolly2) /* { 0x9e2a, 0x9e2b, height of the layer (Senjyo only, fixed at 0x200) */ - AM_RANGE(0x9e2d, 0x9e2d) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_scrollx2) - AM_RANGE(0x9e30, 0x9e31) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_scrolly1) + AM_RANGE(0x9e2d, 0x9e2d) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_scrollx2) + AM_RANGE(0x9e30, 0x9e31) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_scrolly1) /* { 0x9e32, 0x9e33, height of the layer (Senjyo only, fixed at 0x100) */ - AM_RANGE(0x9e35, 0x9e35) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_scrollx1) + AM_RANGE(0x9e35, 0x9e35) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_scrollx1) /* { 0x9e38, 0x9e38, probably radar y position (Senjyo only, fixed at 0x61) */ /* { 0x9e3d, 0x9e3d, probably radar x position (Senjyo only, 0x00/0xc0 depending on screen flip) */ -AM_RANGE(0x9e00, 0x9e3f) AM_WRITE(MWA8_RAM) +AM_RANGE(0x9e00, 0x9e3f) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa7ff) AM_WRITE(senjyo_bg3videoram_w) AM_BASE(&senjyo_bg3videoram) AM_RANGE(0xa800, 0xafff) AM_WRITE(senjyo_bg2videoram_w) AM_BASE(&senjyo_bg2videoram) AM_RANGE(0xb000, 0xb7ff) AM_WRITE(senjyo_bg1videoram_w) AM_BASE(&senjyo_bg1videoram) - AM_RANGE(0xb800, 0xbbff) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_radarram) + AM_RANGE(0xb800, 0xbbff) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_radarram) AM_RANGE(0xd000, 0xd000) AM_WRITE(flip_screen_w) AM_RANGE(0xd004, 0xd004) AM_WRITE(z80pioA_0_p_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_WRITE(SN76496_0_w) AM_RANGE(0x9000, 0x9000) AM_WRITE(SN76496_1_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(SN76496_2_w) @@ -242,44 +242,44 @@ static WRITE8_HANDLER(starforb_scrollx2) static ADDRESS_MAP_START( starforb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(senjyo_fgvideoram_w) AM_BASE(&senjyo_fgvideoram) AM_RANGE(0x9400, 0x97ff) AM_WRITE(senjyo_fgcolorram_w) AM_BASE(&senjyo_fgcolorram) - AM_RANGE(0x9800, 0x987f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x9800, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x9c00, 0x9dff) AM_WRITE(paletteram_IIBBGGRR_w) AM_BASE(&paletteram) /* The format / use of the ram here is different on the bootleg */ - AM_RANGE(0x9e20, 0x9e21) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_scrolly3) - AM_RANGE(0x9e25, 0x9e25) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_scrollx3) + AM_RANGE(0x9e20, 0x9e21) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_scrolly3) + AM_RANGE(0x9e25, 0x9e25) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_scrollx3) AM_RANGE(0x9e30, 0x9e31) AM_WRITE(starforb_scrolly2) AM_BASE(&senjyo_scrolly2) // ok AM_RANGE(0x9e35, 0x9e35) AM_WRITE(starforb_scrollx2) AM_BASE(&senjyo_scrollx2) // ok - AM_RANGE(0x9e00, 0x9e3f) AM_WRITE(MWA8_RAM) + AM_RANGE(0x9e00, 0x9e3f) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa7ff) AM_WRITE(senjyo_bg3videoram_w) AM_BASE(&senjyo_bg3videoram) AM_RANGE(0xa800, 0xafff) AM_WRITE(senjyo_bg2videoram_w) AM_BASE(&senjyo_bg2videoram) AM_RANGE(0xb000, 0xb7ff) AM_WRITE(senjyo_bg1videoram_w) AM_BASE(&senjyo_bg1videoram) - AM_RANGE(0xb800, 0xbbff) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_radarram) + AM_RANGE(0xb800, 0xbbff) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_radarram) AM_RANGE(0xd000, 0xd000) AM_WRITE(flip_screen_w) AM_RANGE(0xd004, 0xd004) AM_WRITE(z80pioA_0_p_w) /* these aren't used / written, left here to make sure memory is allocated */ - AM_RANGE(0xfe00, 0xfe1f) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_fgscroll) + AM_RANGE(0xfe00, 0xfe1f) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_fgscroll) AM_RANGE(0xfe27, 0xfe27) AM_WRITE(senjyo_bgstripes_w) AM_BASE(&senjyo_bgstripesram) /* controls width of background stripes */ - AM_RANGE(0xfe28, 0xfe29) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_scrolly1) - AM_RANGE(0xfe2d, 0xfe2d) AM_WRITE(MWA8_RAM) AM_BASE(&senjyo_scrollx1) + AM_RANGE(0xfe28, 0xfe29) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_scrolly1) + AM_RANGE(0xfe2d, 0xfe2d) AM_WRITE(SMH_RAM) AM_BASE(&senjyo_scrollx1) ADDRESS_MAP_END static ADDRESS_MAP_START( starforb_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( starforb_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_WRITE(SN76496_0_w) AM_RANGE(0x9000, 0x9000) AM_WRITE(SN76496_1_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(SN76496_2_w) @@ -289,7 +289,7 @@ static ADDRESS_MAP_START( starforb_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf000, 0xf000) AM_WRITE(unknown) #endif - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static WRITE8_HANDLER( pio_w ) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 82f822c82bc..e5e31389c28 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -1584,28 +1584,28 @@ static VIDEO_EOF( seta_buffer_sprites ) static ADDRESS_MAP_START( tndrcade_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x380000, 0x3803ff) AM_READ(MRA16_RAM ) // Palette -/**/AM_RANGE(0x400000, 0x400001) AM_READ(MRA16_RAM ) // ? $4000 -/**/AM_RANGE(0x600000, 0x600607) AM_READ(MRA16_RAM ) // Sprites Y + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x380000, 0x3803ff) AM_READ(SMH_RAM ) // Palette +/**/AM_RANGE(0x400000, 0x400001) AM_READ(SMH_RAM ) // ? $4000 +/**/AM_RANGE(0x600000, 0x600607) AM_READ(SMH_RAM ) // Sprites Y AM_RANGE(0xa00000, 0xa00fff) AM_READ(sharedram_68000_r ) // Shared RAM - AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM ) // RAM (Mirrored?) + AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM ) // RAM (Mirrored?) AM_RANGE(0xffc000, 0xffffff) AM_READ(mirror_ram_r ) // RAM (Mirrored?) ADDRESS_MAP_END static ADDRESS_MAP_START( tndrcade_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP ) // ? 0 - AM_RANGE(0x280000, 0x280001) AM_WRITE(MWA16_NOP ) // ? 0 / 1 (sub cpu related?) - AM_RANGE(0x300000, 0x300001) AM_WRITE(MWA16_NOP ) // ? 0 / 1 - AM_RANGE(0x380000, 0x3803ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_RAM ) // ? $4000 - AM_RANGE(0x600000, 0x600607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // ? 0 + AM_RANGE(0x280000, 0x280001) AM_WRITE(SMH_NOP ) // ? 0 / 1 (sub cpu related?) + AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_NOP ) // ? 0 / 1 + AM_RANGE(0x380000, 0x3803ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_RAM ) // ? $4000 + AM_RANGE(0x600000, 0x600607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y AM_RANGE(0x800000, 0x800007) AM_WRITE(sub_ctrl_w ) // Sub CPU Control? AM_RANGE(0xa00000, 0xa00fff) AM_WRITE(sharedram_68000_w ) // Shared RAM - AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&mirror_ram ) // RAM (Mirrored?) + AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&mirror_ram ) // RAM (Mirrored?) AM_RANGE(0xffc000, 0xffffff) AM_WRITE(mirror_ram_w ) // RAM (Mirrored?) ADDRESS_MAP_END @@ -1616,35 +1616,35 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( downtown_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x09ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x09ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x103fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0x200000, 0x200001) AM_READ(MRA16_NOP ) // watchdog? (twineagl) + AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP ) // watchdog? (twineagl) AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x900000, 0x901fff) AM_READ(MRA16_RAM ) // VRAM - AM_RANGE(0x902000, 0x903fff) AM_READ(MRA16_RAM ) // VRAM + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x900000, 0x901fff) AM_READ(SMH_RAM ) // VRAM + AM_RANGE(0x902000, 0x903fff) AM_READ(SMH_RAM ) // VRAM AM_RANGE(0xb00000, 0xb00fff) AM_READ(sharedram_68000_r ) // Shared RAM - AM_RANGE(0xd00000, 0xd003ff) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xf00000, 0xffffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0xd00000, 0xd003ff) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xf00000, 0xffffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( downtown_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x09ffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x09ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x103fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP ) // watchdog? - AM_RANGE(0x300000, 0x300001) AM_WRITE(MWA16_NOP ) // IRQ enable/acknowledge? + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // watchdog? + AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_NOP ) // IRQ enable/acknowledge? AM_RANGE(0x400000, 0x400007) AM_WRITE(twineagl_tilebank_w ) // special tile banking to animate water in twineagl - AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0x700000, 0x7003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x800000, 0x800005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM Ctrl + AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x800000, 0x800005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM Ctrl AM_RANGE(0x900000, 0x903fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM AM_RANGE(0xa00000, 0xa00007) AM_WRITE(sub_ctrl_w ) // Sub CPU Control? AM_RANGE(0xb00000, 0xb00fff) AM_WRITE(sharedram_68000_w ) // Shared RAM - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_RAM ) // ? $4000 - AM_RANGE(0xd00000, 0xd00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xf00000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_RAM ) // ? $4000 + AM_RANGE(0xd00000, 0xd00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xf00000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -1686,38 +1686,38 @@ static WRITE16_HANDLER( calibr50_soundlatch_w ) } static ADDRESS_MAP_START( calibr50_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x09ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x100000, 0x100007) AM_READ(MRA16_NOP ) // ? (same as a00010-a00017?) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM ) // NVRAM - AM_RANGE(0x300000, 0x300001) AM_READ(MRA16_NOP ) // ? (value's read but not used) + AM_RANGE(0x000000, 0x09ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x100000, 0x100007) AM_READ(SMH_NOP ) // ? (same as a00010-a00017?) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM ) // NVRAM + AM_RANGE(0x300000, 0x300001) AM_READ(SMH_NOP ) // ? (value's read but not used) AM_RANGE(0x400000, 0x400001) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x900000, 0x901fff) AM_READ(MRA16_RAM ) // VRAM - AM_RANGE(0x902000, 0x903fff) AM_READ(MRA16_RAM ) // VRAM - AM_RANGE(0x904000, 0x904fff) AM_READ(MRA16_RAM ) // + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x900000, 0x901fff) AM_READ(SMH_RAM ) // VRAM + AM_RANGE(0x902000, 0x903fff) AM_READ(SMH_RAM ) // VRAM + AM_RANGE(0x904000, 0x904fff) AM_READ(SMH_RAM ) // AM_RANGE(0xa00000, 0xa00019) AM_READ(calibr50_ip_r ) // Input Ports -/**/AM_RANGE(0xd00000, 0xd00607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr +/**/AM_RANGE(0xd00000, 0xd00607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr AM_RANGE(0xb00000, 0xb00001) AM_READ(soundlatch2_word_r ) // From Sub CPU -/**/AM_RANGE(0xc00000, 0xc00001) AM_READ(MRA16_RAM ) // ? $4000 +/**/AM_RANGE(0xc00000, 0xc00001) AM_READ(SMH_RAM ) // ? $4000 ADDRESS_MAP_END static ADDRESS_MAP_START( calibr50_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x09ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x200000, 0x200fff) AM_WRITE(MWA16_RAM ) // NVRAM - AM_RANGE(0x300000, 0x300001) AM_WRITE(MWA16_NOP ) // ? (random value) - AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0x700000, 0x7003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x800000, 0x800005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM Ctrl + AM_RANGE(0x000000, 0x09ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x200000, 0x200fff) AM_WRITE(SMH_RAM ) // NVRAM + AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_NOP ) // ? (random value) + AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x800000, 0x800005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM Ctrl AM_RANGE(0x900000, 0x903fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM - AM_RANGE(0x904000, 0x904fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0xd00000, 0xd00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0x904000, 0x904fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0xd00000, 0xd00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr AM_RANGE(0xb00000, 0xb00001) AM_WRITE(calibr50_soundlatch_w ) // To Sub CPU - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_RAM ) // ? $4000 + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_RAM ) // ? $4000 ADDRESS_MAP_END @@ -1774,39 +1774,39 @@ static WRITE16_HANDLER( usclssic_lockout_w ) static ADDRESS_MAP_START( usclssic_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x800000, 0x800607) AM_READ(MRA16_RAM ) // Sprites Y -/**/AM_RANGE(0x900000, 0x900001) AM_READ(MRA16_RAM ) // ? - AM_RANGE(0xa00000, 0xa00005) AM_READ(MRA16_RAM ) // VRAM Ctrl -/**/AM_RANGE(0xb00000, 0xb003ff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x800000, 0x800607) AM_READ(SMH_RAM ) // Sprites Y +/**/AM_RANGE(0x900000, 0x900001) AM_READ(SMH_RAM ) // ? + AM_RANGE(0xa00000, 0xa00005) AM_READ(SMH_RAM ) // VRAM Ctrl +/**/AM_RANGE(0xb00000, 0xb003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xb40000, 0xb40003) AM_READ(usclssic_trackball_x_r ) // TrackBall X AM_RANGE(0xb40004, 0xb40007) AM_READ(usclssic_trackball_y_r ) // TrackBall Y + Buttons AM_RANGE(0xb40010, 0xb40011) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0xb40018, 0xb4001f) AM_READ(usclssic_dsw_r ) // 2 DSWs - AM_RANGE(0xb80000, 0xb80001) AM_READ(MRA16_NOP ) // watchdog (value is discarded)? - AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xd00000, 0xd01fff) AM_READ(MRA16_RAM ) // VRAM - AM_RANGE(0xd02000, 0xd03fff) AM_READ(MRA16_RAM ) // VRAM - AM_RANGE(0xd04000, 0xd04fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0xe00000, 0xe00fff) AM_READ(MRA16_RAM ) // NVRAM? (odd bytes) + AM_RANGE(0xb80000, 0xb80001) AM_READ(SMH_NOP ) // watchdog (value is discarded)? + AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xd00000, 0xd01fff) AM_READ(SMH_RAM ) // VRAM + AM_RANGE(0xd02000, 0xd03fff) AM_READ(SMH_RAM ) // VRAM + AM_RANGE(0xd04000, 0xd04fff) AM_READ(SMH_RAM ) // + AM_RANGE(0xe00000, 0xe00fff) AM_READ(SMH_RAM ) // NVRAM? (odd bytes) ADDRESS_MAP_END static ADDRESS_MAP_START( usclssic_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x800000, 0x800607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_RAM ) // ? $4000 - AM_RANGE(0xa00000, 0xa00005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM Ctrl - AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x800000, 0x800607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_RAM ) // ? $4000 + AM_RANGE(0xa00000, 0xa00005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM Ctrl + AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette AM_RANGE(0xb40000, 0xb40001) AM_WRITE(usclssic_lockout_w ) // Coin Lockout + Tiles Banking AM_RANGE(0xb40010, 0xb40011) AM_WRITE(calibr50_soundlatch_w ) // To Sub CPU AM_RANGE(0xb40018, 0xb40019) AM_WRITE(watchdog_reset16_w ) // Watchdog - AM_RANGE(0xb4000a, 0xb4000b) AM_WRITE(MWA16_NOP ) // ? (value's not important. In lev2&6) - AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xb4000a, 0xb4000b) AM_WRITE(SMH_NOP ) // ? (value's not important. In lev2&6) + AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr AM_RANGE(0xd00000, 0xd03fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM - AM_RANGE(0xd04000, 0xd04fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0xe00000, 0xe00fff) AM_WRITE(MWA16_RAM ) // NVRAM? (odd bytes) + AM_RANGE(0xd04000, 0xd04fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0xe00000, 0xe00fff) AM_WRITE(SMH_RAM ) // NVRAM? (odd bytes) ADDRESS_MAP_END @@ -1816,30 +1816,30 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( atehate_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x900000, 0x9fffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x900000, 0x9fffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x100000, 0x103fff) AM_READ(seta_sound_word_r ) // Sound AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y AM_RANGE(0xb00000, 0xb00001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0xb00002, 0xb00003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0xb00004, 0xb00005) AM_READ(input_port_2_word_r ) // Coins -/**/AM_RANGE(0xc00000, 0xc00001) AM_READ(MRA16_RAM ) // ? 0x4000 - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr +/**/AM_RANGE(0xc00000, 0xc00001) AM_READ(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr ADDRESS_MAP_END static ADDRESS_MAP_START( atehate_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x900000, 0x9fffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x900000, 0x9fffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x100000, 0x103fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP ) // ? watchdog ? - AM_RANGE(0x300000, 0x300001) AM_WRITE(MWA16_NOP ) // ? 0 (irq ack lev 2?) - AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP ) // ? (end of lev 1: bit 4 goes 1,0,1) - AM_RANGE(0x700000, 0x7003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // ? watchdog ? + AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_NOP ) // ? 0 (irq ack lev 2?) + AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP ) // ? (end of lev 1: bit 4 goes 1,0,1) + AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr ADDRESS_MAP_END /*************************************************************************** @@ -1847,52 +1847,52 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( blandia_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM (up to 2MB) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM (main ram for zingzip, wrofaero writes to 20f000-20ffff) - AM_RANGE(0x210000, 0x21ffff) AM_READ(MRA16_RAM ) // RAM (gundhara) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM ) // RAM (wrofaero only?) - AM_RANGE(0x500000, 0x500005) AM_READ(MRA16_RAM ) // (gundhara) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM (up to 2MB) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM (main ram for zingzip, wrofaero writes to 20f000-20ffff) + AM_RANGE(0x210000, 0x21ffff) AM_READ(SMH_RAM ) // RAM (gundhara) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // RAM (wrofaero only?) + AM_RANGE(0x500000, 0x500005) AM_READ(SMH_RAM ) // (gundhara) AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM ) // (rezon,jjsquawk) - AM_RANGE(0x700400, 0x700fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x701000, 0x70ffff) AM_READ(MRA16_RAM ) // -/**/AM_RANGE(0x800000, 0x800607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0x880000, 0x880001) AM_READ(MRA16_RAM ) // ? 0xc000 - AM_RANGE(0x900000, 0x903fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr -/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(MRA16_RAM ) // VRAM 0&1 Ctrl -/**/AM_RANGE(0xa80000, 0xa80005) AM_READ(MRA16_RAM ) // VRAM 2&3 Ctrl - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // VRAM 0&1 - AM_RANGE(0xb04000, 0xb0ffff) AM_READ(MRA16_RAM ) // (jjsquawk) - AM_RANGE(0xb80000, 0xb83fff) AM_READ(MRA16_RAM ) // VRAM 2&3 - AM_RANGE(0xb84000, 0xb8ffff) AM_READ(MRA16_RAM ) // (jjsquawk) + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // (rezon,jjsquawk) + AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x701000, 0x70ffff) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x800000, 0x800607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0x880000, 0x880001) AM_READ(SMH_RAM ) // ? 0xc000 + AM_RANGE(0x900000, 0x903fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr +/**/AM_RANGE(0xa00000, 0xa00005) AM_READ(SMH_RAM ) // VRAM 0&1 Ctrl +/**/AM_RANGE(0xa80000, 0xa80005) AM_READ(SMH_RAM ) // VRAM 2&3 Ctrl + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // VRAM 0&1 + AM_RANGE(0xb04000, 0xb0ffff) AM_READ(SMH_RAM ) // (jjsquawk) + AM_RANGE(0xb80000, 0xb83fff) AM_READ(SMH_RAM ) // VRAM 2&3 + AM_RANGE(0xb84000, 0xb8ffff) AM_READ(SMH_RAM ) // (jjsquawk) AM_RANGE(0xc00000, 0xc03fff) AM_READ(seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( blandia_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM (up to 2MB) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x210000, 0x21ffff) AM_WRITE(MWA16_RAM ) // RAM (gundhara) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM ) // RAM (wrofaero only?) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM (up to 2MB) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x210000, 0x21ffff) AM_WRITE(SMH_RAM ) // RAM (gundhara) + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM ) // RAM (wrofaero only?) AM_RANGE(0x500000, 0x500005) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Video Registers - AM_RANGE(0x700000, 0x7003ff) AM_WRITE(MWA16_RAM ) // (rezon,jjsquawk) - AM_RANGE(0x700400, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x701000, 0x70ffff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x800000, 0x800607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0x880000, 0x880001) AM_WRITE(MWA16_RAM ) // ? 0xc000 - AM_RANGE(0x900000, 0x903fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xa00000, 0xa00005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0xa80000, 0xa80005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM ) // (rezon,jjsquawk) + AM_RANGE(0x700400, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x701000, 0x70ffff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x800000, 0x800607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0x880000, 0x880001) AM_WRITE(SMH_RAM ) // ? 0xc000 + AM_RANGE(0x900000, 0x903fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xa00000, 0xa00005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0xa80000, 0xa80005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 - AM_RANGE(0xb04000, 0xb0ffff) AM_WRITE(MWA16_RAM ) // (jjsquawk) + AM_RANGE(0xb04000, 0xb0ffff) AM_WRITE(SMH_RAM ) // (jjsquawk) AM_RANGE(0xb80000, 0xb83fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0xb84000, 0xb8ffff) AM_WRITE(MWA16_RAM ) // (jjsquawk) + AM_RANGE(0xb84000, 0xb8ffff) AM_WRITE(SMH_RAM ) // (jjsquawk) AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xd00000, 0xd00007) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP ) // ? VBlank IRQ Ack - AM_RANGE(0xf00000, 0xf00001) AM_WRITE(MWA16_NOP ) // ? Sound IRQ Ack + AM_RANGE(0xd00000, 0xd00007) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP ) // ? VBlank IRQ Ack + AM_RANGE(0xf00000, 0xf00001) AM_WRITE(SMH_NOP ) // ? Sound IRQ Ack ADDRESS_MAP_END @@ -1902,52 +1902,52 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( blandiap_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM (up to 2MB) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM (main ram for zingzip, wrofaero writes to 20f000-20ffff) - AM_RANGE(0x210000, 0x21ffff) AM_READ(MRA16_RAM ) // RAM (gundhara) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM ) // RAM (wrofaero only?) - AM_RANGE(0x500000, 0x500005) AM_READ(MRA16_RAM ) // (gundhara) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM (up to 2MB) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM (main ram for zingzip, wrofaero writes to 20f000-20ffff) + AM_RANGE(0x210000, 0x21ffff) AM_READ(SMH_RAM ) // RAM (gundhara) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // RAM (wrofaero only?) + AM_RANGE(0x500000, 0x500005) AM_READ(SMH_RAM ) // (gundhara) AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM ) // (rezon,jjsquawk) - AM_RANGE(0x700400, 0x700fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x701000, 0x70ffff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // VRAM 0&1 - AM_RANGE(0x804000, 0x80ffff) AM_READ(MRA16_RAM ) // (jjsquawk) - AM_RANGE(0x880000, 0x883fff) AM_READ(MRA16_RAM ) // VRAM 2&3 - AM_RANGE(0x884000, 0x88ffff) AM_READ(MRA16_RAM ) // (jjsquawk) -/**/AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // VRAM 0&1 Ctrl -/**/AM_RANGE(0x980000, 0x980005) AM_READ(MRA16_RAM ) // VRAM 2&3 Ctrl -/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y -/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(MRA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // (rezon,jjsquawk) + AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x701000, 0x70ffff) AM_READ(SMH_RAM ) // + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 0&1 + AM_RANGE(0x804000, 0x80ffff) AM_READ(SMH_RAM ) // (jjsquawk) + AM_RANGE(0x880000, 0x883fff) AM_READ(SMH_RAM ) // VRAM 2&3 + AM_RANGE(0x884000, 0x88ffff) AM_READ(SMH_RAM ) // (jjsquawk) +/**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // VRAM 0&1 Ctrl +/**/AM_RANGE(0x980000, 0x980005) AM_READ(SMH_RAM ) // VRAM 2&3 Ctrl +/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y +/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr AM_RANGE(0xc00000, 0xc03fff) AM_READ(seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( blandiap_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM (up to 2MB) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x210000, 0x21ffff) AM_WRITE(MWA16_RAM ) // RAM (gundhara) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM ) // RAM (wrofaero only?) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM (up to 2MB) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x210000, 0x21ffff) AM_WRITE(SMH_RAM ) // RAM (gundhara) + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM ) // RAM (wrofaero only?) AM_RANGE(0x500000, 0x500005) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Video Registers - AM_RANGE(0x700000, 0x7003ff) AM_WRITE(MWA16_RAM ) // (rezon,jjsquawk) - AM_RANGE(0x700400, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x701000, 0x70ffff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM ) // (rezon,jjsquawk) + AM_RANGE(0x700400, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x701000, 0x70ffff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 - AM_RANGE(0x804000, 0x80ffff) AM_WRITE(MWA16_RAM ) // (jjsquawk) + AM_RANGE(0x804000, 0x80ffff) AM_WRITE(SMH_RAM ) // (jjsquawk) AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0x884000, 0x88ffff) AM_WRITE(MWA16_RAM ) // (jjsquawk) - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0x980000, 0x980005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xa80000, 0xa80001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0x884000, 0x88ffff) AM_WRITE(SMH_RAM ) // (jjsquawk) + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0x980000, 0x980005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xd00000, 0xd00007) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP ) // ? VBlank IRQ Ack - AM_RANGE(0xf00000, 0xf00001) AM_WRITE(MWA16_NOP ) // ? Sound IRQ Ack + AM_RANGE(0xd00000, 0xd00007) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP ) // ? VBlank IRQ Ack + AM_RANGE(0xf00000, 0xf00001) AM_WRITE(SMH_NOP ) // ? Sound IRQ Ack ADDRESS_MAP_END @@ -1998,56 +1998,56 @@ static WRITE16_HANDLER( zombraid_gun_w ) } static ADDRESS_MAP_START( wrofaero_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM (up to 2MB) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM (main ram for zingzip, wrofaero writes to 20f000-20ffff) - AM_RANGE(0x210000, 0x21ffff) AM_READ(MRA16_RAM ) // RAM (gundhara) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM ) // RAM (wrofaero only?) - AM_RANGE(0x500000, 0x500005) AM_READ(MRA16_RAM ) // (gundhara) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM (up to 2MB) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM (main ram for zingzip, wrofaero writes to 20f000-20ffff) + AM_RANGE(0x210000, 0x21ffff) AM_READ(SMH_RAM ) // RAM (gundhara) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // RAM (wrofaero only?) + AM_RANGE(0x500000, 0x500005) AM_READ(SMH_RAM ) // (gundhara) AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM ) // (rezon,jjsquawk) - AM_RANGE(0x700400, 0x700fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x701000, 0x70ffff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // VRAM 0&1 - AM_RANGE(0x804000, 0x80ffff) AM_READ(MRA16_RAM ) // (jjsquawk) - AM_RANGE(0x880000, 0x883fff) AM_READ(MRA16_RAM ) // VRAM 2&3 - AM_RANGE(0x884000, 0x88ffff) AM_READ(MRA16_RAM ) // (jjsquawk) -/**/AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // VRAM 0&1 Ctrl -/**/AM_RANGE(0x980000, 0x980005) AM_READ(MRA16_RAM ) // VRAM 2&3 Ctrl -/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y -/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(MRA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // (rezon,jjsquawk) + AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x701000, 0x70ffff) AM_READ(SMH_RAM ) // + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 0&1 + AM_RANGE(0x804000, 0x80ffff) AM_READ(SMH_RAM ) // (jjsquawk) + AM_RANGE(0x880000, 0x883fff) AM_READ(SMH_RAM ) // VRAM 2&3 + AM_RANGE(0x884000, 0x88ffff) AM_READ(SMH_RAM ) // (jjsquawk) +/**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // VRAM 0&1 Ctrl +/**/AM_RANGE(0x980000, 0x980005) AM_READ(SMH_RAM ) // VRAM 2&3 Ctrl +/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y +/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr AM_RANGE(0xc00000, 0xc03fff) AM_READ(seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( wrofaero_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM (up to 2MB) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) AM_BASE(&seta_workram ) // RAM (pointer for zombraid crosshair hack) - AM_RANGE(0x210000, 0x21ffff) AM_WRITE(MWA16_RAM ) // RAM (gundhara) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM ) // RAM (wrofaero only?) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM (up to 2MB) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_BASE(&seta_workram ) // RAM (pointer for zombraid crosshair hack) + AM_RANGE(0x210000, 0x21ffff) AM_WRITE(SMH_RAM ) // RAM (gundhara) + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM ) // RAM (wrofaero only?) AM_RANGE(0x500000, 0x500005) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Video Registers - AM_RANGE(0x700000, 0x7003ff) AM_WRITE(MWA16_RAM ) // (rezon,jjsquawk) - AM_RANGE(0x700400, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x701000, 0x70ffff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM ) // (rezon,jjsquawk) + AM_RANGE(0x700400, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x701000, 0x70ffff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 - AM_RANGE(0x804000, 0x80ffff) AM_WRITE(MWA16_RAM ) // (jjsquawk) + AM_RANGE(0x804000, 0x80ffff) AM_WRITE(SMH_RAM ) // (jjsquawk) AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0x884000, 0x88ffff) AM_WRITE(MWA16_RAM ) // (jjsquawk) - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0x980000, 0x980005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xa80000, 0xa80001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0x884000, 0x88ffff) AM_WRITE(SMH_RAM ) // (jjsquawk) + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0x980000, 0x980005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(seta_sound_word_w ) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w ) // ? #else - AM_RANGE(0xd00000, 0xd00007) AM_WRITE(MWA16_NOP ) // ? + AM_RANGE(0xd00000, 0xd00007) AM_WRITE(SMH_NOP ) // ? #endif - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP ) // ? VBlank IRQ Ack - AM_RANGE(0xf00000, 0xf00001) AM_WRITE(MWA16_NOP ) // ? Sound IRQ Ack + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP ) // ? VBlank IRQ Ack + AM_RANGE(0xf00000, 0xf00001) AM_WRITE(SMH_NOP ) // ? Sound IRQ Ack ADDRESS_MAP_END /*************************************************************************** @@ -2055,35 +2055,35 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( orbs_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x100000, 0x100001) AM_READ(MRA16_NOP ) // ? - AM_RANGE(0x200000, 0x200001) AM_READ(MRA16_NOP ) // ? + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP ) // ? + AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP ) // ? AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins //AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 - AM_RANGE(0x8000f0, 0x8000f1) AM_READ(MRA16_RAM ) // NVRAM - AM_RANGE(0x800100, 0x8001ff) AM_READ(MRA16_RAM ) // NVRAM + AM_RANGE(0x8000f0, 0x8000f1) AM_READ(SMH_RAM ) // NVRAM + AM_RANGE(0x800100, 0x8001ff) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xb00000, 0xb003ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr -/**/AM_RANGE(0xd00000, 0xd00001) AM_READ(MRA16_RAM ) // ? 0x4000 -/**/AM_RANGE(0xe00000, 0xe00607) AM_READ(MRA16_RAM ) // Sprites Y + AM_RANGE(0xb00000, 0xb003ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr +/**/AM_RANGE(0xd00000, 0xd00001) AM_READ(SMH_RAM ) // ? 0x4000 +/**/AM_RANGE(0xe00000, 0xe00607) AM_READ(SMH_RAM ) // Sprites Y ADDRESS_MAP_END static ADDRESS_MAP_START( orbs_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0x8000f0, 0x8000f1) AM_WRITE(MWA16_RAM ) // NVRAM - AM_RANGE(0x800100, 0x8001ff) AM_WRITE(MWA16_RAM ) // NVRAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0x8000f0, 0x8000f1) AM_WRITE(SMH_RAM ) // NVRAM + AM_RANGE(0x800100, 0x8001ff) AM_WRITE(SMH_RAM ) // NVRAM AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xd00000, 0xd00001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xe00000, 0xe00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xd00000, 0xd00001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xe00000, 0xe00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y ADDRESS_MAP_END @@ -2093,34 +2093,34 @@ ADDRESS_MAP_END /* similar to krzybowl */ static ADDRESS_MAP_START( blockcar_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf03fff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0xf04000, 0xf041ff) AM_READ(MRA16_RAM ) // Backup RAM? - AM_RANGE(0xf05000, 0xf050ff) AM_READ(MRA16_RAM ) // Backup RAM? + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf03fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0xf04000, 0xf041ff) AM_READ(SMH_RAM ) // Backup RAM? + AM_RANGE(0xf05000, 0xf050ff) AM_READ(SMH_RAM ) // Backup RAM? AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xb00000, 0xb003ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr -/**/AM_RANGE(0xd00000, 0xd00001) AM_READ(MRA16_RAM ) // ? 0x4000 -/**/AM_RANGE(0xe00000, 0xe00607) AM_READ(MRA16_RAM ) // Sprites Y + AM_RANGE(0xb00000, 0xb003ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr +/**/AM_RANGE(0xd00000, 0xd00001) AM_READ(SMH_RAM ) // ? 0x4000 +/**/AM_RANGE(0xe00000, 0xe00607) AM_READ(SMH_RAM ) // Sprites Y ADDRESS_MAP_END static ADDRESS_MAP_START( blockcar_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf03fff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0xf04000, 0xf041ff) AM_WRITE(MWA16_RAM ) // Backup RAM? - AM_RANGE(0xf05000, 0xf050ff) AM_WRITE(MWA16_RAM ) // Backup RAM? - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA16_NOP ) // ? 1 (start of interrupts, main loop: watchdog?) - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP ) // ? 0/1 (IRQ acknowledge?) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf03fff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0xf04000, 0xf041ff) AM_WRITE(SMH_RAM ) // Backup RAM? + AM_RANGE(0xf05000, 0xf050ff) AM_WRITE(SMH_RAM ) // Backup RAM? + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP ) // ? 1 (start of interrupts, main loop: watchdog?) + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // ? 0/1 (IRQ acknowledge?) AM_RANGE(0x400000, 0x400001) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Sound Enable (bit 4?) AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xd00000, 0xd00001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xe00000, 0xe00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xd00000, 0xd00001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xe00000, 0xe00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y ADDRESS_MAP_END @@ -2130,48 +2130,48 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( daioh_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x500006, 0x500007) AM_READ(input_port_4_word_r ) // Buttons 4,5,6 AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM ) - AM_RANGE(0x700400, 0x700fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x701000, 0x70ffff) AM_READ(MRA16_RAM ) - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // VRAM 0&1 - AM_RANGE(0x804000, 0x80ffff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x880000, 0x883fff) AM_READ(MRA16_RAM ) // VRAM 2&3 - AM_RANGE(0x884000, 0x88ffff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // VRAM 0&1 Ctrl - AM_RANGE(0x980000, 0x980005) AM_READ(MRA16_RAM ) // VRAM 2&3 Ctrl - AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0xa80000, 0xa80001) AM_READ(MRA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xb04000, 0xb13fff) AM_READ(MRA16_RAM ) // + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) + AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x701000, 0x70ffff) AM_READ(SMH_RAM ) + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 0&1 + AM_RANGE(0x804000, 0x80ffff) AM_READ(SMH_RAM ) // + AM_RANGE(0x880000, 0x883fff) AM_READ(SMH_RAM ) // VRAM 2&3 + AM_RANGE(0x884000, 0x88ffff) AM_READ(SMH_RAM ) // + AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // VRAM 0&1 Ctrl + AM_RANGE(0x980000, 0x980005) AM_READ(SMH_RAM ) // VRAM 2&3 Ctrl + AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0xa80000, 0xa80001) AM_READ(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xb04000, 0xb13fff) AM_READ(SMH_RAM ) // AM_RANGE(0xc00000, 0xc03fff) AM_READ(seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( daioh_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x500000, 0x500005) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Video Registers - AM_RANGE(0x700000, 0x7003ff) AM_WRITE(MWA16_RAM ) - AM_RANGE(0x700400, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x701000, 0x70ffff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM ) + AM_RANGE(0x700400, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x701000, 0x70ffff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 - AM_RANGE(0x804000, 0x80ffff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x804000, 0x80ffff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0x884000, 0x88ffff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0x980000, 0x980005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xa80000, 0xa80001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xb04000, 0xb13fff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x884000, 0x88ffff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0x980000, 0x980005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xb04000, 0xb13fff) AM_WRITE(SMH_RAM ) // AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP ) // + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP ) // ADDRESS_MAP_END @@ -2180,38 +2180,38 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( drgnunit_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_READ(MRA16_RAM ) // RAM (qzkklogy) - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM ) // RAM (drgnunit,stg) + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM (qzkklogy) + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM ) // RAM (drgnunit,stg) AM_RANGE(0x100000, 0x103fff) AM_READ(seta_sound_word_r ) // Sound AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x900000, 0x901fff) AM_READ(MRA16_RAM ) // VRAM - AM_RANGE(0x902000, 0x903fff) AM_READ(MRA16_RAM ) // VRAM + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x900000, 0x901fff) AM_READ(SMH_RAM ) // VRAM + AM_RANGE(0x902000, 0x903fff) AM_READ(SMH_RAM ) // VRAM AM_RANGE(0xb00000, 0xb00001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0xb00002, 0xb00003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0xb00004, 0xb00005) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0xb00006, 0xb00007) AM_READ(MRA16_NOP ) // unused (qzkklogy) -/**/AM_RANGE(0xc00000, 0xc00001) AM_READ(MRA16_RAM ) // ? $4000 -/**/AM_RANGE(0xd00000, 0xd00607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xb00006, 0xb00007) AM_READ(SMH_NOP ) // unused (qzkklogy) +/**/AM_RANGE(0xc00000, 0xc00001) AM_READ(SMH_RAM ) // ? $4000 +/**/AM_RANGE(0xd00000, 0xd00607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr ADDRESS_MAP_END static ADDRESS_MAP_START( drgnunit_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(MWA16_RAM ) // RAM (qzkklogy) - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM (drgnunit,stg) + AM_RANGE(0x000000, 0x0bffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM (qzkklogy) + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM (drgnunit,stg) AM_RANGE(0x100000, 0x103fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP ) // Watchdog - AM_RANGE(0x300000, 0x300001) AM_WRITE(MWA16_NOP ) // ? IRQ Ack + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // Watchdog + AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_NOP ) // ? IRQ Ack AM_RANGE(0x500000, 0x500001) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Video Registers - AM_RANGE(0x700000, 0x7003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x800000, 0x800005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM Ctrl + AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x800000, 0x800005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM Ctrl AM_RANGE(0x900000, 0x903fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM - AM_RANGE(0x904000, 0x90ffff) AM_WRITE(MWA16_NOP ) // unused (qzkklogy) - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_RAM ) // ? $4000 - AM_RANGE(0xd00000, 0xd00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0x904000, 0x90ffff) AM_WRITE(SMH_NOP ) // unused (qzkklogy) + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_RAM ) // ? $4000 + AM_RANGE(0xd00000, 0xd00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr ADDRESS_MAP_END @@ -2220,51 +2220,51 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( extdwnhl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x210000, 0x21ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x220000, 0x23ffff) AM_READ(MRA16_RAM ) // RAM (sokonuke) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x210000, 0x21ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x220000, 0x23ffff) AM_READ(SMH_RAM ) // RAM (sokonuke) AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x400008, 0x40000b) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x40000c, 0x40000d) AM_READ(watchdog_reset16_r ) // Watchdog (extdwnhl, MUST RETURN $FFFF) - AM_RANGE(0x500004, 0x500007) AM_READ(MRA16_NOP ) // IRQ Ack (extdwnhl) - AM_RANGE(0x600400, 0x600fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x601000, 0x610bff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // VRAM 0&1 - AM_RANGE(0x804000, 0x80ffff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x880000, 0x883fff) AM_READ(MRA16_RAM ) // VRAM 2&3 - AM_RANGE(0x884000, 0x88ffff) AM_READ(MRA16_RAM ) // -/**/AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // VRAM 0&1 Ctrl -/**/AM_RANGE(0x980000, 0x980005) AM_READ(MRA16_RAM ) // VRAM 2&3 Ctrl -/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y -/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(MRA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xb04000, 0xb13fff) AM_READ(MRA16_RAM ) // + AM_RANGE(0x500004, 0x500007) AM_READ(SMH_NOP ) // IRQ Ack (extdwnhl) + AM_RANGE(0x600400, 0x600fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x601000, 0x610bff) AM_READ(SMH_RAM ) // + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 0&1 + AM_RANGE(0x804000, 0x80ffff) AM_READ(SMH_RAM ) // + AM_RANGE(0x880000, 0x883fff) AM_READ(SMH_RAM ) // VRAM 2&3 + AM_RANGE(0x884000, 0x88ffff) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // VRAM 0&1 Ctrl +/**/AM_RANGE(0x980000, 0x980005) AM_READ(SMH_RAM ) // VRAM 2&3 Ctrl +/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y +/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xb04000, 0xb13fff) AM_READ(SMH_RAM ) // AM_RANGE(0xe00000, 0xe03fff) AM_READ(seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( extdwnhl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x210000, 0x21ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x220000, 0x23ffff) AM_WRITE(MWA16_RAM ) // RAM (sokonuke) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x210000, 0x21ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x220000, 0x23ffff) AM_WRITE(SMH_RAM ) // RAM (sokonuke) AM_RANGE(0x40000c, 0x40000d) AM_WRITE(watchdog_reset16_w ) // Watchdog (sokonuke) AM_RANGE(0x500000, 0x500003) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Video Registers - AM_RANGE(0x500004, 0x500007) AM_WRITE(MWA16_NOP ) // IRQ Ack (sokonuke) - AM_RANGE(0x600400, 0x600fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x601000, 0x610bff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x500004, 0x500007) AM_WRITE(SMH_NOP ) // IRQ Ack (sokonuke) + AM_RANGE(0x600400, 0x600fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x601000, 0x610bff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 - AM_RANGE(0x804000, 0x80ffff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x804000, 0x80ffff) AM_WRITE(SMH_RAM ) // AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0x884000, 0x88ffff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0x980000, 0x980005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xa80000, 0xa80001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xb04000, 0xb13fff) AM_WRITE(MWA16_RAM ) // + AM_RANGE(0x884000, 0x88ffff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0x980000, 0x980005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xb04000, 0xb13fff) AM_WRITE(SMH_RAM ) // AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(seta_sound_word_w ) // Sound ADDRESS_MAP_END @@ -2273,91 +2273,91 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( kamenrid_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // ROM AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x500004, 0x500007) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x500008, 0x500009) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x50000c, 0x50000d) AM_READ(watchdog_reset16_r ) // xx Watchdog? - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x700400, 0x700fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x701000, 0x703fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM ) // VRAM 0 - AM_RANGE(0x802000, 0x803fff) AM_READ(MRA16_RAM ) // VRAM 1 - AM_RANGE(0x804000, 0x807fff) AM_READ(MRA16_RAM ) // tested - AM_RANGE(0x880000, 0x881fff) AM_READ(MRA16_RAM ) // VRAM 2 - AM_RANGE(0x882000, 0x883fff) AM_READ(MRA16_RAM ) // VRAM 3 - AM_RANGE(0x884000, 0x887fff) AM_READ(MRA16_RAM ) // tested - AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xb04000, 0xb07fff) AM_READ(MRA16_RAM ) // tested + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x701000, 0x703fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM ) // VRAM 0 + AM_RANGE(0x802000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 1 + AM_RANGE(0x804000, 0x807fff) AM_READ(SMH_RAM ) // tested + AM_RANGE(0x880000, 0x881fff) AM_READ(SMH_RAM ) // VRAM 2 + AM_RANGE(0x882000, 0x883fff) AM_READ(SMH_RAM ) // VRAM 3 + AM_RANGE(0x884000, 0x887fff) AM_READ(SMH_RAM ) // tested + AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xb04000, 0xb07fff) AM_READ(SMH_RAM ) // tested AM_RANGE(0xd00000, 0xd03fff) AM_READ(seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( kamenrid_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // ROM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // ROM AM_RANGE(0x50000c, 0x50000d) AM_WRITE(watchdog_reset16_w ) // Watchdog (sokonuke) AM_RANGE(0x600000, 0x600005) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // ? Coin Lockout + Video Registers - AM_RANGE(0x600006, 0x600007) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0x700000, 0x7003ff) AM_WRITE(MWA16_RAM ) // Palette RAM (tested) - AM_RANGE(0x700400, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x701000, 0x703fff) AM_WRITE(MWA16_RAM ) // Palette + AM_RANGE(0x600006, 0x600007) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM ) // Palette RAM (tested) + AM_RANGE(0x700400, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x701000, 0x703fff) AM_WRITE(SMH_RAM ) // Palette AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 - AM_RANGE(0x804000, 0x807fff) AM_WRITE(MWA16_RAM ) // tested + AM_RANGE(0x804000, 0x807fff) AM_WRITE(SMH_RAM ) // tested AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0x884000, 0x887fff) AM_WRITE(MWA16_RAM ) // tested - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0x980000, 0x980005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xa80000, 0xa80001) AM_WRITE(MWA16_RAM ) // ? $4000 - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xb04000, 0xb07fff) AM_WRITE(MWA16_RAM) // tested + AM_RANGE(0x884000, 0x887fff) AM_WRITE(SMH_RAM ) // tested + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0x980000, 0x980005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_RAM ) // ? $4000 + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xb04000, 0xb07fff) AM_WRITE(SMH_RAM) // tested #if __uPD71054_TIMER AM_RANGE(0xc00000, 0xc00007) AM_WRITE(timer_regs_w ) // ? #else - AM_RANGE(0xc00000, 0xc00007) AM_WRITE(MWA16_NOP ) // ? + AM_RANGE(0xc00000, 0xc00007) AM_WRITE(SMH_NOP ) // ? #endif AM_RANGE(0xd00000, 0xd03fff) AM_WRITE(seta_sound_word_w ) // Sound ADDRESS_MAP_END /* almast identical to kamenrid */ static ADDRESS_MAP_START( madshark_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // ROM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // ROM AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x500008, 0x50000b) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700400, 0x700fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM ) // VRAM 0 - AM_RANGE(0x802000, 0x803fff) AM_READ(MRA16_RAM ) // VRAM 1 - AM_RANGE(0x880000, 0x881fff) AM_READ(MRA16_RAM ) // VRAM 2 - AM_RANGE(0x882000, 0x883fff) AM_READ(MRA16_RAM ) // VRAM 3 - AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr + AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM ) // VRAM 0 + AM_RANGE(0x802000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 1 + AM_RANGE(0x880000, 0x881fff) AM_READ(SMH_RAM ) // VRAM 2 + AM_RANGE(0x882000, 0x883fff) AM_READ(SMH_RAM ) // VRAM 3 + AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr AM_RANGE(0xd00000, 0xd03fff) AM_READ(seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( madshark_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // ROM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // ROM AM_RANGE(0x50000c, 0x50000d) AM_WRITE(watchdog_reset16_w ) // Watchdog AM_RANGE(0x600000, 0x600005) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // ? Coin Lockout + Video Registers - AM_RANGE(0x600006, 0x600007) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0x700400, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x600006, 0x600007) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0x700400, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0x980000, 0x980005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xa80000, 0xa80001) AM_WRITE(MWA16_RAM ) // ? $4000 - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0x980000, 0x980005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_RAM ) // ? $4000 + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr #if __uPD71054_TIMER AM_RANGE(0xc00000, 0xc00007) AM_WRITE(timer_regs_w ) // ? #else - AM_RANGE(0xc00000, 0xc00007) AM_WRITE(MWA16_NOP ) // ? + AM_RANGE(0xc00000, 0xc00007) AM_WRITE(SMH_NOP ) // ? #endif AM_RANGE(0xd00000, 0xd03fff) AM_WRITE(seta_sound_word_w ) // Sound ADDRESS_MAP_END @@ -2393,35 +2393,35 @@ static READ16_HANDLER( krzybowl_input_r ) } static ADDRESS_MAP_START( krzybowl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x100000, 0x100001) AM_READ(MRA16_NOP ) // ? - AM_RANGE(0x200000, 0x200001) AM_READ(MRA16_NOP ) // ? + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP ) // ? + AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP ) // ? AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 - AM_RANGE(0x8000f0, 0x8000f1) AM_READ(MRA16_RAM ) // NVRAM - AM_RANGE(0x800100, 0x8001ff) AM_READ(MRA16_RAM ) // NVRAM + AM_RANGE(0x8000f0, 0x8000f1) AM_READ(SMH_RAM ) // NVRAM + AM_RANGE(0x800100, 0x8001ff) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xb00000, 0xb003ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr -/**/AM_RANGE(0xd00000, 0xd00001) AM_READ(MRA16_RAM ) // ? 0x4000 -/**/AM_RANGE(0xe00000, 0xe00607) AM_READ(MRA16_RAM ) // Sprites Y + AM_RANGE(0xb00000, 0xb003ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr +/**/AM_RANGE(0xd00000, 0xd00001) AM_READ(SMH_RAM ) // ? 0x4000 +/**/AM_RANGE(0xe00000, 0xe00607) AM_READ(SMH_RAM ) // Sprites Y ADDRESS_MAP_END static ADDRESS_MAP_START( krzybowl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0x8000f0, 0x8000f1) AM_WRITE(MWA16_RAM ) // NVRAM - AM_RANGE(0x800100, 0x8001ff) AM_WRITE(MWA16_RAM ) // NVRAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0x8000f0, 0x8000f1) AM_WRITE(SMH_RAM ) // NVRAM + AM_RANGE(0x800100, 0x8001ff) AM_WRITE(SMH_RAM ) // NVRAM AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xd00000, 0xd00001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xe00000, 0xe00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xd00000, 0xd00001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xe00000, 0xe00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y ADDRESS_MAP_END @@ -2443,47 +2443,47 @@ static WRITE16_HANDLER( msgundam_vregs_w ) /* Mirror RAM is necessary or startup, to clear Work RAM after the test */ static ADDRESS_MAP_START( msgundam_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700400, 0x700fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x800000, 0x800607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0x900000, 0x903fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xa00000, 0xa03fff) AM_READ(MRA16_RAM ) // VRAM 0&1 - AM_RANGE(0xa80000, 0xa83fff) AM_READ(MRA16_RAM ) // VRAM 2&3 - AM_RANGE(0xb00000, 0xb00005) AM_READ(MRA16_RAM ) // VRAM 0&1 Ctrl - AM_RANGE(0xb80000, 0xb80005) AM_READ(MRA16_RAM ) // VRAM 1&2 Ctrl + AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x800000, 0x800607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0x900000, 0x903fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xa00000, 0xa03fff) AM_READ(SMH_RAM ) // VRAM 0&1 + AM_RANGE(0xa80000, 0xa83fff) AM_READ(SMH_RAM ) // VRAM 2&3 + AM_RANGE(0xb00000, 0xb00005) AM_READ(SMH_RAM ) // VRAM 0&1 Ctrl + AM_RANGE(0xb80000, 0xb80005) AM_READ(SMH_RAM ) // VRAM 1&2 Ctrl AM_RANGE(0xc00000, 0xc03fff) AM_READ(seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( msgundam_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) AM_BASE(&mirror_ram ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_BASE(&mirror_ram ) // RAM AM_RANGE(0x210000, 0x21ffff) AM_WRITE(mirror_ram_w ) // Mirrored RAM AM_RANGE(0x220000, 0x22ffff) AM_WRITE(mirror_ram_w ) AM_RANGE(0x230000, 0x23ffff) AM_WRITE(mirror_ram_w ) AM_RANGE(0x240000, 0x24ffff) AM_WRITE(mirror_ram_w ) - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP ) // Lev 2 IRQ Ack - AM_RANGE(0x400004, 0x400005) AM_WRITE(MWA16_NOP ) // Lev 4 IRQ Ack + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP ) // Lev 2 IRQ Ack + AM_RANGE(0x400004, 0x400005) AM_WRITE(SMH_NOP ) // Lev 4 IRQ Ack AM_RANGE(0x500000, 0x500005) AM_WRITE(msgundam_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Video Registers - AM_RANGE(0x700400, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x800000, 0x800607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0x880000, 0x880001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0x900000, 0x903fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0x700400, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x800000, 0x800607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0x880000, 0x880001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0x900000, 0x903fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 AM_RANGE(0xa80000, 0xa83fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0xb00000, 0xb00005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0xb80000, 0xb80005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0xb00000, 0xb00005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0xb80000, 0xb80005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(seta_sound_word_w ) // Sound #if __uPD71054_TIMER AM_RANGE(0xd00000, 0xd00007) AM_WRITE(timer_regs_w ) // ? #else - AM_RANGE(0xd00000, 0xd00007) AM_WRITE(MWA16_NOP ) // ? + AM_RANGE(0xd00000, 0xd00007) AM_WRITE(SMH_NOP ) // ? #endif ADDRESS_MAP_END @@ -2497,39 +2497,39 @@ ADDRESS_MAP_END /* similar to wrofaero */ static ADDRESS_MAP_START( oisipuzl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x17ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x17ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x700000, 0x703fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // VRAM 0&1 - AM_RANGE(0x880000, 0x883fff) AM_READ(MRA16_RAM ) // VRAM 2&3 -/**/AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // VRAM 0&1 Ctrl -/**/AM_RANGE(0x980000, 0x980005) AM_READ(MRA16_RAM ) // VRAM 2&3 Ctrl -/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y -/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(MRA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xc00400, 0xc00fff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 0&1 + AM_RANGE(0x880000, 0x883fff) AM_READ(SMH_RAM ) // VRAM 2&3 +/**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // VRAM 0&1 Ctrl +/**/AM_RANGE(0x980000, 0x980005) AM_READ(SMH_RAM ) // VRAM 2&3 Ctrl +/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y +/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xc00400, 0xc00fff) AM_READ(SMH_RAM ) // Palette ADDRESS_MAP_END static ADDRESS_MAP_START( oisipuzl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x17ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP ) // ? IRQ Ack + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x17ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP ) // ? IRQ Ack AM_RANGE(0x500000, 0x500005) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Video Registers AM_RANGE(0x700000, 0x703fff) AM_WRITE(seta_sound_word_w ) // Sound AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0x980000, 0x980005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xa80000, 0xa80001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xc00400, 0xc00fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0x980000, 0x980005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xc00400, 0xc00fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette ADDRESS_MAP_END /*************************************************************************** @@ -2539,41 +2539,41 @@ ADDRESS_MAP_END /* the same as oisipuzl with the sound system replaced */ static ADDRESS_MAP_START( triplfun_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x17ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x17ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x500006, 0x500007) AM_READ(OKIM6295_status_0_lsb_r) // tfun sound - AM_RANGE(0x700000, 0x703fff) AM_READ(MRA16_RAM ) // old sound - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // VRAM 0&1 - AM_RANGE(0x880000, 0x883fff) AM_READ(MRA16_RAM ) // VRAM 2&3 -/**/AM_RANGE(0x900000, 0x900005) AM_READ(MRA16_RAM ) // VRAM 0&1 Ctrl -/**/AM_RANGE(0x980000, 0x980005) AM_READ(MRA16_RAM ) // VRAM 2&3 Ctrl -/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y -/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(MRA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xc00400, 0xc00fff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0x700000, 0x703fff) AM_READ(SMH_RAM ) // old sound + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 0&1 + AM_RANGE(0x880000, 0x883fff) AM_READ(SMH_RAM ) // VRAM 2&3 +/**/AM_RANGE(0x900000, 0x900005) AM_READ(SMH_RAM ) // VRAM 0&1 Ctrl +/**/AM_RANGE(0x980000, 0x980005) AM_READ(SMH_RAM ) // VRAM 2&3 Ctrl +/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y +/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xc00400, 0xc00fff) AM_READ(SMH_RAM ) // Palette ADDRESS_MAP_END static ADDRESS_MAP_START( triplfun_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x17ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP ) // ? IRQ Ack + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x17ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP ) // ? IRQ Ack AM_RANGE(0x500000, 0x500005) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Video Registers AM_RANGE(0x500006, 0x500007) AM_WRITE(OKIM6295_data_0_lsb_w) // tfun sound - AM_RANGE(0x700000, 0x703fff) AM_WRITE(MWA16_RAM ) // old sound + AM_RANGE(0x700000, 0x703fff) AM_WRITE(SMH_RAM ) // old sound AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0x980000, 0x980005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xa80000, 0xa80001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xc00400, 0xc00fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0x980000, 0x980005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xc00400, 0xc00fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette ADDRESS_MAP_END /*************************************************************************** @@ -2617,26 +2617,26 @@ static READ16_HANDLER( kiwame_input_r ) } static ADDRESS_MAP_START( kiwame_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xfffc00, 0xffffff) AM_READ(kiwame_nvram_r ) // NVRAM + Regs ? - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr -/**/AM_RANGE(0x900000, 0x900001) AM_READ(MRA16_RAM ) // ? 0x4000 -/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0xb00000, 0xb003ff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr +/**/AM_RANGE(0x900000, 0x900001) AM_READ(SMH_RAM ) // ? 0x4000 +/**/AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0xb00000, 0xb003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xc00000, 0xc03fff) AM_READ(seta_sound_word_r ) // Sound AM_RANGE(0xd00000, 0xd00009) AM_READ(kiwame_input_r ) AM_RANGE(0xe00000, 0xe00003) AM_READ(seta_dsw_r ) // DSW ADDRESS_MAP_END static ADDRESS_MAP_START( kiwame_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xfffc00, 0xffffff) AM_WRITE(kiwame_nvram_w) AM_BASE(&kiwame_nvram ) // NVRAM + Regs ? - AM_RANGE(0x800000, 0x803fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x800000, 0x803fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(seta_sound_word_w ) // Sound ADDRESS_MAP_END @@ -2658,36 +2658,36 @@ static WRITE16_HANDLER( thunderl_protection_w ) /* Similar to downtown etc. */ static ADDRESS_MAP_START( thunderl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x100000, 0x103fff) AM_READ(seta_sound_word_r ) // Sound AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xb00000, 0xb00001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0xb00002, 0xb00003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0xb00004, 0xb00005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0xb0000c, 0xb0000d) AM_READ(thunderl_protection_r ) // Protection (not in wits) AM_RANGE(0xb00008, 0xb00009) AM_READ(input_port_4_word_r ) // P3 (wits) AM_RANGE(0xb0000a, 0xb0000b) AM_READ(input_port_5_word_r ) // P4 (wits) -/**/AM_RANGE(0xc00000, 0xc00001) AM_READ(MRA16_RAM ) // ? 0x4000 -/**/AM_RANGE(0xd00000, 0xd00607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xe04000, 0xe07fff) AM_READ(MRA16_RAM ) // (wits) +/**/AM_RANGE(0xc00000, 0xc00001) AM_READ(SMH_RAM ) // ? 0x4000 +/**/AM_RANGE(0xd00000, 0xd00607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xe04000, 0xe07fff) AM_READ(SMH_RAM ) // (wits) ADDRESS_MAP_END static ADDRESS_MAP_START( thunderl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x100000, 0x103fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0x300000, 0x300001) AM_WRITE(MWA16_NOP ) // ? + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_NOP ) // ? AM_RANGE(0x400000, 0x40ffff) AM_WRITE(thunderl_protection_w ) // Protection (not in wits) AM_RANGE(0x500000, 0x500001) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout - AM_RANGE(0x700000, 0x7003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xd00000, 0xd00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xe04000, 0xe07fff) AM_WRITE(MWA16_RAM ) // (wits) + AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xd00000, 0xd00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xe04000, 0xe07fff) AM_WRITE(SMH_RAM ) // (wits) ADDRESS_MAP_END /*************************************************************************** @@ -2709,15 +2709,15 @@ static WRITE16_HANDLER( wiggie_soundlatch_w ) static ADDRESS_MAP_START( wiggie_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(wiggie_soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( wiggie_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) ADDRESS_MAP_END @@ -2726,31 +2726,31 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( umanclub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x300000, 0x3003ff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x300400, 0x300fff) AM_READ(MRA16_RAM ) // + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x300000, 0x3003ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x300400, 0x300fff) AM_READ(SMH_RAM ) // AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y -/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(MRA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y +/**/AM_RANGE(0xa80000, 0xa80001) AM_READ(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr AM_RANGE(0xc00000, 0xc03fff) AM_READ(seta_sound_word_r ) // Sound ADDRESS_MAP_END static ADDRESS_MAP_START( umanclub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x300000, 0x3003ff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0x300400, 0x300fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP ) // ? (end of lev 2) - AM_RANGE(0x400004, 0x400005) AM_WRITE(MWA16_NOP ) // ? (end of lev 2) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x300000, 0x3003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x300400, 0x300fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP ) // ? (end of lev 2) + AM_RANGE(0x400004, 0x400005) AM_WRITE(SMH_NOP ) // ? (end of lev 2) AM_RANGE(0x500000, 0x500001) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Video Registers - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xa80000, 0xa80001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(seta_sound_word_w ) // Sound ADDRESS_MAP_END @@ -2768,34 +2768,34 @@ static WRITE16_HANDLER( utoukond_soundlatch_w ) } static ADDRESS_MAP_START( utoukond_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // ROM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // ROM AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x700400, 0x700fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM ) // VRAM 0 - AM_RANGE(0x802000, 0x803fff) AM_READ(MRA16_RAM ) // VRAM 1 - AM_RANGE(0x880000, 0x881fff) AM_READ(MRA16_RAM ) // VRAM 2 - AM_RANGE(0x882000, 0x883fff) AM_READ(MRA16_RAM ) // VRAM 3 - AM_RANGE(0xa00000, 0xa00607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr + AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM ) // VRAM 0 + AM_RANGE(0x802000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 1 + AM_RANGE(0x880000, 0x881fff) AM_READ(SMH_RAM ) // VRAM 2 + AM_RANGE(0x882000, 0x883fff) AM_READ(SMH_RAM ) // VRAM 3 + AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr ADDRESS_MAP_END static ADDRESS_MAP_START( utoukond_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // ROM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // ROM AM_RANGE(0x500000, 0x500005) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // ? Coin Lockout + Video Registers - AM_RANGE(0x700400, 0x700fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x700400, 0x700fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette AM_RANGE(0x800000, 0x803fff) AM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0 AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_2_w) AM_BASE(&seta_vram_2 ) // VRAM 2 - AM_RANGE(0x900000, 0x900005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0x980000, 0x980005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl - AM_RANGE(0xa00000, 0xa00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0x900000, 0x900005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0x980000, 0x980005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_2 ) // VRAM 2&3 Ctrl + AM_RANGE(0xa00000, 0xa00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr AM_RANGE(0xc00000, 0xc00001) AM_WRITE(utoukond_soundlatch_w ) // To Sound CPU (cause an IRQ) - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP ) // ? ack + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP ) // ? ack ADDRESS_MAP_END /*************************************************************************** @@ -2828,7 +2828,7 @@ static WRITE8_HANDLER( sub_bankswitch_lockout_w ) static READ8_HANDLER( ff_r ) {return 0xff;} static ADDRESS_MAP_START( tndrcade_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x0800, 0x0800) AM_READ(ff_r ) // ? (bits 0/1/2/3: 1 -> do test 0-ff/100-1e0/5001-57ff/banked rom) // AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r ) // // AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // @@ -2836,21 +2836,21 @@ static ADDRESS_MAP_START( tndrcade_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1001, 0x1001) AM_READ(input_port_1_r ) // P2 AM_RANGE(0x1002, 0x1002) AM_READ(input_port_2_r ) // Coins AM_RANGE(0x2001, 0x2001) AM_READ(YM2203_read_port_0_r ) - AM_RANGE(0x5000, 0x57ff) AM_READ(MRA8_RAM ) // Shared RAM - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM ) // ROM + AM_RANGE(0x5000, 0x57ff) AM_READ(SMH_RAM ) // Shared RAM + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( tndrcade_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x1000, 0x1000) AM_WRITE(sub_bankswitch_lockout_w ) // ROM Bank + Coin Lockout AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2203_control_port_0_w ) AM_RANGE(0x2001, 0x2001) AM_WRITE(YM2203_write_port_0_w ) AM_RANGE(0x3000, 0x3000) AM_WRITE(YM3812_control_port_0_w ) AM_RANGE(0x3001, 0x3001) AM_WRITE(YM3812_write_port_0_w ) - AM_RANGE(0x5000, 0x57ff) AM_WRITE(MWA8_RAM) AM_BASE(&sharedram ) // Shared RAM - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x5000, 0x57ff) AM_WRITE(SMH_RAM) AM_BASE(&sharedram ) // Shared RAM + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END /*************************************************************************** @@ -2858,25 +2858,25 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( twineagl_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r ) // AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // AM_RANGE(0x1000, 0x1000) AM_READ(input_port_0_r ) // P1 AM_RANGE(0x1001, 0x1001) AM_READ(input_port_1_r ) // P2 AM_RANGE(0x1002, 0x1002) AM_READ(input_port_2_r ) // Coins - AM_RANGE(0x5000, 0x57ff) AM_READ(MRA8_RAM ) // Shared RAM - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM ) // ROM + AM_RANGE(0x5000, 0x57ff) AM_READ(SMH_RAM ) // Shared RAM + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( twineagl_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x1000, 0x1000) AM_WRITE(sub_bankswitch_lockout_w ) // ROM Bank + Coin Lockout - AM_RANGE(0x5000, 0x57ff) AM_WRITE(MWA8_RAM) AM_BASE(&sharedram ) // Shared RAM - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x5000, 0x57ff) AM_WRITE(SMH_RAM) AM_BASE(&sharedram ) // Shared RAM + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END /*************************************************************************** @@ -2907,21 +2907,21 @@ static READ8_HANDLER( downtown_ip_r ) } static ADDRESS_MAP_START( downtown_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r ) // AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // AM_RANGE(0x1000, 0x1007) AM_READ(downtown_ip_r ) // Input Ports - AM_RANGE(0x5000, 0x57ff) AM_READ(MRA8_RAM ) // Shared RAM - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM ) // ROM + AM_RANGE(0x5000, 0x57ff) AM_READ(SMH_RAM ) // Shared RAM + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( downtown_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x1000, 0x1000) AM_WRITE(sub_bankswitch_lockout_w ) // ROM Bank + Coin Lockout - AM_RANGE(0x5000, 0x57ff) AM_WRITE(MWA8_RAM) AM_BASE(&sharedram ) // Shared RAM - AM_RANGE(0x7000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x5000, 0x57ff) AM_WRITE(SMH_RAM) AM_BASE(&sharedram ) // Shared RAM + AM_RANGE(0x7000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END /*************************************************************************** @@ -2937,16 +2937,16 @@ static WRITE8_HANDLER( calibr50_soundlatch2_w ) static ADDRESS_MAP_START( calibr50_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READ(seta_sound_r ) // Sound AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r ) // From Main CPU - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( calibr50_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_WRITE(seta_sound_w ) // Sound AM_RANGE(0x4000, 0x4000) AM_WRITE(sub_bankswitch_w ) // Bankswitching - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // Banked ROM AM_RANGE(0xc000, 0xc000) AM_WRITE(calibr50_soundlatch2_w ) // To Main CPU - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END /*************************************************************************** @@ -2954,26 +2954,26 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( metafox_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r ) // AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // AM_RANGE(0x1000, 0x1000) AM_READ(input_port_2_r ) // Coins AM_RANGE(0x1002, 0x1002) AM_READ(input_port_0_r ) // P1 -// AM_RANGE(0x1004, 0x1004) AM_READ(MRA8_NOP ) // ? +// AM_RANGE(0x1004, 0x1004) AM_READ(SMH_NOP ) // ? AM_RANGE(0x1006, 0x1006) AM_READ(input_port_1_r ) // P2 - AM_RANGE(0x5000, 0x57ff) AM_READ(MRA8_RAM ) // Shared RAM - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM ) // ROM + AM_RANGE(0x5000, 0x57ff) AM_READ(SMH_RAM ) // Shared RAM + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( metafox_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x1000, 0x1000) AM_WRITE(sub_bankswitch_lockout_w ) // ROM Bank + Coin Lockout - AM_RANGE(0x5000, 0x57ff) AM_WRITE(MWA8_RAM) AM_BASE(&sharedram ) // Shared RAM - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x5000, 0x57ff) AM_WRITE(SMH_RAM) AM_BASE(&sharedram ) // Shared RAM + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END @@ -2982,13 +2982,13 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( utoukond_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xffff) AM_READ(seta_sound_r) ADDRESS_MAP_END static ADDRESS_MAP_START( utoukond_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xffff) AM_WRITE(seta_sound_w) ADDRESS_MAP_END @@ -3003,7 +3003,7 @@ static ADDRESS_MAP_START( utoukond_sound_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x01, 0x01) AM_WRITE(YM3438_data_port_0_A_w) AM_RANGE(0x02, 0x02) AM_WRITE(YM3438_control_port_0_B_w) AM_RANGE(0x03, 0x03) AM_WRITE(YM3438_data_port_0_B_w) - AM_RANGE(0x80, 0x80) AM_WRITE(MWA8_NOP) //? + AM_RANGE(0x80, 0x80) AM_WRITE(SMH_NOP) //? ADDRESS_MAP_END /* it has a series of tests on startup, if they don't pass it causes an address error */ @@ -3031,32 +3031,32 @@ static WRITE16_HANDLER( pairlove_prot_w ) ***************************************************************************/ static ADDRESS_MAP_START( pairlove_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins AM_RANGE(0x900000, 0x9001ff) AM_READ(pairlove_prot_r) AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xb00000, 0xb00fff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xd00000, 0xd00001) AM_READ(MRA16_RAM ) // ? 0x4000 - AM_RANGE(0xe00000, 0xe00607) AM_READ(MRA16_RAM ) // Sprites Y - AM_RANGE(0xf00000, 0xf0ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0xb00000, 0xb00fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr + AM_RANGE(0xd00000, 0xd00001) AM_READ(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xe00000, 0xe00607) AM_READ(SMH_RAM ) // Sprites Y + AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( pairlove_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA16_NOP ) // ? 1 (start of interrupts, main loop: watchdog?) - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP ) // ? 0/1 (IRQ acknowledge?) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP ) // ? 1 (start of interrupts, main loop: watchdog?) + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // ? 0/1 (IRQ acknowledge?) AM_RANGE(0x400000, 0x400001) AM_WRITE(seta_vregs_w) AM_BASE(&seta_vregs ) // Coin Lockout + Sound Enable (bit 4?) AM_RANGE(0x900000, 0x9001ff) AM_WRITE(pairlove_prot_w) AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xb00000, 0xb00fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette - AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xd00000, 0xd00001) AM_WRITE(MWA16_RAM ) // ? 0x4000 - AM_RANGE(0xe00000, 0xe00607) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0xb00000, 0xb00fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xd00000, 0xd00001) AM_WRITE(SMH_RAM ) // ? 0x4000 + AM_RANGE(0xe00000, 0xe00607) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xf00000, 0xf0ffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END @@ -3076,7 +3076,7 @@ static ADDRESS_MAP_START( crazyfgt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x610006, 0x610007) AM_WRITENOP AM_RANGE(0x620000, 0x620003) AM_WRITENOP // protection AM_RANGE(0x630000, 0x630003) AM_READ(seta_dsw_r) - AM_RANGE(0x640400, 0x640fff) AM_WRITE(MWA16_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette + AM_RANGE(0x640400, 0x640fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette AM_RANGE(0x650000, 0x650001) AM_WRITE(YM3812_control_port_0_lsb_w) AM_RANGE(0x650002, 0x650003) AM_WRITE(YM3812_write_port_0_lsb_w) AM_RANGE(0x658000, 0x658001) AM_WRITE(OKIM6295_data_0_lsb_w) @@ -3126,27 +3126,27 @@ static READ16_HANDLER( inttoote_700000_r ) static ADDRESS_MAP_START( inttoote_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM (up to 2MB) - AM_RANGE(0x200000, 0x200001) AM_READWRITE(inttoote_key_r, MWA16_RAM) AM_BASE(&inttoote_key_select) + AM_RANGE(0x200000, 0x200001) AM_READWRITE(inttoote_key_r, SMH_RAM) AM_BASE(&inttoote_key_select) AM_RANGE(0x200002, 0x200003) AM_READ(input_port_2_word_r) - AM_RANGE(0x200010, 0x200011) AM_READWRITE(input_port_3_word_r, MWA16_NOP) + AM_RANGE(0x200010, 0x200011) AM_READWRITE(input_port_3_word_r, SMH_NOP) AM_RANGE(0x300000, 0x300001) AM_WRITE(watchdog_reset16_w) // Watchdog - AM_RANGE(0x300010, 0x300011) AM_WRITE(MWA16_NOP) // lev1 ack - AM_RANGE(0x300020, 0x300021) AM_WRITE(MWA16_NOP) // lev2 ack - AM_RANGE(0x300040, 0x300041) AM_WRITE(MWA16_NOP) // lev4 ack - AM_RANGE(0x300060, 0x300061) AM_WRITE(MWA16_NOP) // lev6 ack + AM_RANGE(0x300010, 0x300011) AM_WRITE(SMH_NOP) // lev1 ack + AM_RANGE(0x300020, 0x300021) AM_WRITE(SMH_NOP) // lev2 ack + AM_RANGE(0x300040, 0x300041) AM_WRITE(SMH_NOP) // lev4 ack + AM_RANGE(0x300060, 0x300061) AM_WRITE(SMH_NOP) // lev6 ack AM_RANGE(0x500000, 0x500003) AM_READ(inttoote_dsw_r) // DSW x 3 - AM_RANGE(0x700000, 0x700101) AM_READWRITE(inttoote_700000_r,MWA16_RAM) AM_BASE(&inttoote_700000) + AM_RANGE(0x700000, 0x700101) AM_READWRITE(inttoote_700000_r,SMH_RAM) AM_BASE(&inttoote_700000) AM_RANGE(0x800000, 0x80001f) AM_READWRITE(msm6242_lsb_r,msm6242_lsb_w) // 6242RTC AM_RANGE(0x900000, 0x903fff) AM_READWRITE( seta_sound_word_r, seta_sound_word_w ) // Sound - AM_RANGE(0xa00000, 0xa00005) AM_WRITE(MWA16_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl - AM_RANGE(0xb00000, 0xb03fff) AM_READWRITE(MRA16_RAM,seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0&1 + AM_RANGE(0xa00000, 0xa00005) AM_WRITE(SMH_RAM) AM_BASE(&seta_vctrl_0 ) // VRAM 0&1 Ctrl + AM_RANGE(0xb00000, 0xb03fff) AM_READWRITE(SMH_RAM,seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM 0&1 AM_RANGE(0xc00000, 0xc00001) AM_RAM // ? 0x4000 @@ -9337,8 +9337,8 @@ static DRIVER_INIT( metafox ) UINT16 *RAM = (UINT16 *) memory_region(REGION_CPU1); /* This game uses the 21c000-21ffff area for protection? */ -// memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x21c000, 0x21ffff, 0, 0, MRA16_NOP); -// memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x21c000, 0x21ffff, 0, 0, MWA16_NOP); +// memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x21c000, 0x21ffff, 0, 0, SMH_NOP); +// memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x21c000, 0x21ffff, 0, 0, SMH_NOP); RAM[0x8ab1c/2] = 0x4e71; // patch protection test: "cp error" RAM[0x8ab1e/2] = 0x4e71; @@ -9382,7 +9382,7 @@ static DRIVER_INIT ( blandia ) static DRIVER_INIT( eightfrc ) { - memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x500004, 0x500005, 0, 0, MRA16_NOP); // watchdog?? + memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x500004, 0x500005, 0, 0, SMH_NOP); // watchdog?? } @@ -9407,7 +9407,7 @@ static DRIVER_INIT( kiwame ) static DRIVER_INIT( rezon ) { - memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x500006, 0x500007, 0, 0, MRA16_NOP); // irq ack? + memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x500006, 0x500007, 0, 0, SMH_NOP); // irq ack? } static DRIVER_INIT(wiggie) @@ -9439,8 +9439,8 @@ static DRIVER_INIT(wiggie) } /* X1_010 is not used. */ - memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x100000, 0x103fff, 0, 0, MRA16_NOP); - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x100000, 0x103fff, 0, 0, MWA16_NOP); + memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x100000, 0x103fff, 0, 0, SMH_NOP); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x100000, 0x103fff, 0, 0, SMH_NOP); memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xB00008, 0xB00009, 0, 0, wiggie_soundlatch_w); diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index e3ee68b84b0..045c1bf103e 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -453,9 +453,9 @@ static WRITE16_HANDLER( grdians_lockout_w ) } static ADDRESS_MAP_START( grdians_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x304000, 0x30ffff) AM_READ(MRA16_RAM ) // ? seems tile data + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x304000, 0x30ffff) AM_READ(SMH_RAM ) // ? seems tile data AM_RANGE(0x600000, 0x600001) AM_READ(input_port_0_word_r ) // DSW 1 AM_RANGE(0x600002, 0x600003) AM_READ(input_port_1_word_r ) // DSW 2 AM_RANGE(0x700000, 0x700001) AM_READ(input_port_2_word_r ) // P1 @@ -463,20 +463,20 @@ static ADDRESS_MAP_START( grdians_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700004, 0x700005) AM_READ(input_port_4_word_r ) // Coins AM_RANGE(0x70000c, 0x70000d) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0xb00000, 0xb03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xc00000, 0xc3ffff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xc40000, 0xc4ffff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xfffc00, 0xffffff) AM_READ(MRA16_RAM ) // TMP68301 Registers + AM_RANGE(0xc00000, 0xc3ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xc40000, 0xc4ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( grdians_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x304000, 0x30ffff) AM_WRITE(MWA16_RAM ) // ? seems tile data + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x304000, 0x30ffff) AM_WRITE(SMH_RAM ) // ? seems tile data AM_RANGE(0x800000, 0x800001) AM_WRITE(grdians_lockout_w ) AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xc00000, 0xc3ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xc00000, 0xc3ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0xc50000, 0xc5ffff) AM_WRITE(MWA16_RAM ) // cleared + AM_RANGE(0xc50000, 0xc5ffff) AM_WRITE(SMH_RAM ) // cleared AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs ) // Video Registers AM_RANGE(0xe00010, 0xe0001f) AM_WRITE(seta2_sound_bank_w ) // Samples Banks AM_RANGE(0xfffc00, 0xffffff) AM_WRITE(tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers @@ -524,9 +524,9 @@ static WRITE16_HANDLER( gundamex_eeprom_w ) } static ADDRESS_MAP_START( gundamex_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x500000, 0x57ffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x500000, 0x57ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x600000, 0x600001) AM_READ(input_port_0_word_r ) // DSW 1 AM_RANGE(0x600002, 0x600003) AM_READ(input_port_1_word_r ) // DSW 2 AM_RANGE(0x700000, 0x700001) AM_READ(input_port_2_word_r ) // P1 @@ -539,15 +539,15 @@ static ADDRESS_MAP_START( gundamex_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( gundamex_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x500000, 0x57ffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x500000, 0x57ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x70000c, 0x70000d) AM_WRITE(watchdog_reset16_w ) AM_RANGE(0x800000, 0x800001) AM_WRITE(grdians_lockout_w ) AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xc00000, 0xc3ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xc00000, 0xc3ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0xc50000, 0xc5ffff) AM_WRITE(MWA16_RAM ) // cleared + AM_RANGE(0xc50000, 0xc5ffff) AM_WRITE(SMH_RAM ) // cleared AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs ) // Video Registers AM_RANGE(0xe00010, 0xe0001f) AM_WRITE(seta2_sound_bank_w ) // Samples Banks AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE(gundamex_eeprom_w ) // parallel data register @@ -580,8 +580,8 @@ static WRITE16_HANDLER( mj4simai_keyboard_w ) } static ADDRESS_MAP_START( mj4simai_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x600000, 0x600001) AM_READ(mj4simai_p1_r ) // P1 AM_RANGE(0x600002, 0x600003) AM_READ(mj4simai_p1_r ) // P2, but I'm using P1 again AM_RANGE(0x600006, 0x600007) AM_READ(watchdog_reset16_r ) // Watchdog @@ -589,19 +589,19 @@ static ADDRESS_MAP_START( mj4simai_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600300, 0x600301) AM_READ(input_port_0_word_r ) // DSW 1 AM_RANGE(0x600302, 0x600303) AM_READ(input_port_1_word_r ) // DSW 2 AM_RANGE(0xb00000, 0xb03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xc00000, 0xc3ffff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xc40000, 0xc4ffff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xfffc00, 0xffffff) AM_READ(MRA16_RAM ) // TMP68301 Registers + AM_RANGE(0xc00000, 0xc3ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xc40000, 0xc4ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( mj4simai_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x600004, 0x600005) AM_WRITE(mj4simai_keyboard_w ) // select keyboard row to read - AM_RANGE(0x600200, 0x600201) AM_WRITE(MWA16_NOP ) // Leds? Coins? + AM_RANGE(0x600200, 0x600201) AM_WRITE(SMH_NOP ) // Leds? Coins? AM_RANGE(0x600300, 0x60030f) AM_WRITE(seta2_sound_bank_w ) // Samples Banks AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xc00000, 0xc3ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xc00000, 0xc3ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs ) // Video Registers AM_RANGE(0xfffc00, 0xffffff) AM_WRITE(tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers @@ -613,8 +613,8 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( myangel_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x700000, 0x700001) AM_READ(input_port_2_word_r ) // P1 AM_RANGE(0x700002, 0x700003) AM_READ(input_port_3_word_r ) // P2 AM_RANGE(0x700004, 0x700005) AM_READ(input_port_4_word_r ) // Coins @@ -622,18 +622,18 @@ static ADDRESS_MAP_START( myangel_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700300, 0x700301) AM_READ(input_port_0_word_r ) // DSW 1 AM_RANGE(0x700302, 0x700303) AM_READ(input_port_1_word_r ) // DSW 2 AM_RANGE(0xb00000, 0xb03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xc00000, 0xc3ffff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xc40000, 0xc4ffff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xfffc00, 0xffffff) AM_READ(MRA16_RAM ) // TMP68301 Registers + AM_RANGE(0xc00000, 0xc3ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xc40000, 0xc4ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( myangel_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x700200, 0x700201) AM_WRITE(MWA16_NOP ) // Leds? Coins? + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x700200, 0x700201) AM_WRITE(SMH_NOP ) // Leds? Coins? AM_RANGE(0x700310, 0x70031f) AM_WRITE(seta2_sound_bank_w ) // Samples Banks AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xc00000, 0xc3ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xc00000, 0xc3ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0xc40000, 0xc4ffff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0xc60000, 0xc6003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs ) // Video Registers AM_RANGE(0xfffc00, 0xffffff) AM_WRITE(tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers @@ -645,8 +645,8 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( myangel2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x600000, 0x600001) AM_READ(input_port_2_word_r ) // P1 AM_RANGE(0x600002, 0x600003) AM_READ(input_port_3_word_r ) // P2 AM_RANGE(0x600004, 0x600005) AM_READ(input_port_4_word_r ) // Coins @@ -654,18 +654,18 @@ static ADDRESS_MAP_START( myangel2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600300, 0x600301) AM_READ(input_port_0_word_r ) // DSW 1 AM_RANGE(0x600302, 0x600303) AM_READ(input_port_1_word_r ) // DSW 2 AM_RANGE(0xb00000, 0xb03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xd00000, 0xd3ffff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xd40000, 0xd4ffff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0xfffc00, 0xffffff) AM_READ(MRA16_RAM ) // TMP68301 Registers + AM_RANGE(0xd00000, 0xd3ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xd40000, 0xd4ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( myangel2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x600200, 0x600201) AM_WRITE(MWA16_NOP ) // Leds? Coins? + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x600200, 0x600201) AM_WRITE(SMH_NOP ) // Leds? Coins? AM_RANGE(0x600300, 0x60030f) AM_WRITE(seta2_sound_bank_w ) // Samples Banks AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(seta_sound_word_w ) // Sound - AM_RANGE(0xd00000, 0xd3ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xd00000, 0xd3ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0xd40000, 0xd4ffff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0xd60000, 0xd6003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs ) // Video Registers AM_RANGE(0xfffc00, 0xffffff) AM_WRITE(tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers @@ -699,8 +699,8 @@ static WRITE16_HANDLER( pzlbowl_coin_counter_w ) } static ADDRESS_MAP_START( pzlbowl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x400300, 0x400301) AM_READ(input_port_0_word_r ) // DSW 1 AM_RANGE(0x400302, 0x400303) AM_READ(input_port_1_word_r ) // DSW 2 AM_RANGE(0x500000, 0x500001) AM_READ(input_port_2_word_r ) // P1 @@ -708,18 +708,18 @@ static ADDRESS_MAP_START( pzlbowl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500004, 0x500005) AM_READ(pzlbowl_coins_r ) // Coins + Protection? AM_RANGE(0x500006, 0x500007) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r ) // Protection - AM_RANGE(0x800000, 0x83ffff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0x840000, 0x84ffff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0x800000, 0x83ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0x840000, 0x84ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x900000, 0x903fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xfffc00, 0xffffff) AM_READ(MRA16_RAM ) // TMP68301 Registers + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( pzlbowl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x400300, 0x40030f) AM_WRITE(seta2_sound_bank_w ) // Samples Banks AM_RANGE(0x500004, 0x500005) AM_WRITE(pzlbowl_coin_counter_w ) // Coins Counter - AM_RANGE(0x800000, 0x83ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x800000, 0x83ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x840000, 0x84ffff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0x860000, 0x86003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs ) // Video Registers AM_RANGE(0x900000, 0x903fff) AM_WRITE(seta_sound_word_w ) // Sound @@ -732,10 +732,10 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( penbros_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x210000, 0x23ffff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x210000, 0x23ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x500300, 0x500301) AM_READ(input_port_0_word_r ) // DSW 1 AM_RANGE(0x500302, 0x500303) AM_READ(input_port_1_word_r ) // DSW 2 AM_RANGE(0x600000, 0x600001) AM_READ(input_port_2_word_r ) // P1 @@ -743,20 +743,20 @@ static ADDRESS_MAP_START( penbros_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600004, 0x600005) AM_READ(input_port_4_word_r ) // Coins AM_RANGE(0x600006, 0x600007) AM_READ(watchdog_reset16_r ) // Watchdog // AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r ) // Protection - AM_RANGE(0xb00000, 0xb3ffff) AM_READ(MRA16_RAM ) // Sprites - AM_RANGE(0xb40000, 0xb4ffff) AM_READ(MRA16_RAM ) // Palette + AM_RANGE(0xb00000, 0xb3ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xb40000, 0xb4ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xfffc00, 0xffffff) AM_READ(MRA16_RAM ) // TMP68301 Registers + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( penbros_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x210000, 0x23ffff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x210000, 0x23ffff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x500300, 0x50030f) AM_WRITE(seta2_sound_bank_w ) // Samples Banks AM_RANGE(0x600004, 0x600005) AM_WRITE(pzlbowl_coin_counter_w ) // Coins Counter - AM_RANGE(0xb00000, 0xb3ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xb00000, 0xb3ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0xb40000, 0xb4ffff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0xb60000, 0xb6003f) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs ) // Video Registers AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(seta_sound_word_w ) // Sound @@ -810,13 +810,13 @@ static ADDRESS_MAP_START( samshoot_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x700006, 0x700007 ) AM_READ( watchdog_reset16_r ) // Watchdog? AM_RANGE( 0x800000, 0x83ffff ) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites - AM_RANGE( 0x840000, 0x84ffff ) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE( 0x840000, 0x84ffff ) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE( 0x860000, 0x86003f ) AM_WRITE(seta2_vregs_w) AM_BASE(&seta2_vregs) // Video Registers AM_RANGE( 0x900000, 0x903fff ) AM_READWRITE( seta_sound_word_r, seta_sound_word_w ) // Sound AM_RANGE( 0xfffd0a, 0xfffd0b ) AM_READ( input_port_1_word_r ) // parallel data register (DSW 2) - AM_RANGE( 0xfffc00, 0xffffff ) AM_READWRITE( MRA16_RAM, tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers + AM_RANGE( 0xfffc00, 0xffffff ) AM_READWRITE( SMH_RAM, tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers ADDRESS_MAP_END diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index 28a42962710..ffccba9457f 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -193,8 +193,8 @@ static WRITE8_HANDLER( msm5205_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x04ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x800000, 0x800fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x04ffff) AM_READ(SMH_ROM) + AM_RANGE(0x800000, 0x800fff) AM_READ(SMH_RAM) AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_3_word_r) AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_4_word_r) AM_RANGE(0xc00004, 0xc00005) AM_READ(button1_r) @@ -203,13 +203,13 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc0000a, 0xc0000b) AM_READ(input_port_1_word_r) AM_RANGE(0xc0000c, 0xc0000d) AM_READ(input_port_2_word_r) AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r) - AM_RANGE(0xff8000, 0xffdfff) AM_READ(MRA16_RAM) - AM_RANGE(0xffe000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xff8000, 0xffdfff) AM_READ(SMH_RAM) + AM_RANGE(0xffe000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmemus, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x04ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x800000, 0x800fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x04ffff) AM_READ(SMH_ROM) + AM_RANGE(0x800000, 0x800fff) AM_READ(SMH_RAM) AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_3_word_r) AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_4_word_r) AM_RANGE(0xc00004, 0xc00005) AM_READ(dummy_r) @@ -218,13 +218,13 @@ static ADDRESS_MAP_START( readmemus, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc0000a, 0xc0000b) AM_READ(input_port_1_word_r) AM_RANGE(0xc0000c, 0xc0000d) AM_READ(input_port_2_word_r) AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r) - AM_RANGE(0xff8000, 0xffdfff) AM_READ(MRA16_RAM) - AM_RANGE(0xffe000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xff8000, 0xffdfff) AM_READ(SMH_RAM) + AM_RANGE(0xffe000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmemjp, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x04ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x800000, 0x800fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x04ffff) AM_READ(SMH_ROM) + AM_RANGE(0x800000, 0x800fff) AM_READ(SMH_RAM) AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_3_word_r) AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_4_word_r) AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_5_word_r) @@ -233,12 +233,12 @@ static ADDRESS_MAP_START( readmemjp, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc0000a, 0xc0000b) AM_READ(input_port_1_word_r) AM_RANGE(0xc0000c, 0xc0000d) AM_READ(input_port_2_word_r) AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r) - AM_RANGE(0xff8000, 0xffdfff) AM_READ(MRA16_RAM) - AM_RANGE(0xffe000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xff8000, 0xffdfff) AM_READ(SMH_RAM) + AM_RANGE(0xffe000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x04ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x04ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x800000, 0x800fff) AM_WRITE(sf_videoram_w) AM_BASE(&sf_videoram) AM_SIZE(&videoram_size) AM_RANGE(0xb00000, 0xb007ff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xc00010, 0xc00011) AM_WRITE(sf_coin_w) @@ -247,34 +247,34 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc0001a, 0xc0001b) AM_WRITE(sf_gfxctrl_w) AM_RANGE(0xc0001c, 0xc0001d) AM_WRITE(soundcmd_w) AM_RANGE(0xc0001e, 0xc0001f) AM_WRITE(protection_w) - AM_RANGE(0xff8000, 0xffdfff) AM_WRITE(MWA16_RAM) - AM_RANGE(0xffe000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&sf_objectram) + AM_RANGE(0xff8000, 0xffdfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xffe000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&sf_objectram) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2151_status_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2151_data_port_0_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END /* Yes, _no_ ram */ static ADDRESS_MAP_START( sound2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) -/* AM_RANGE(0x0000, 0xffff) AM_WRITE(MWA8_ROM) avoid cluttering up error.log */ - AM_RANGE(0x0000, 0xffff) AM_WRITE(MWA8_NOP) +/* AM_RANGE(0x0000, 0xffff) AM_WRITE(SMH_ROM) avoid cluttering up error.log */ + AM_RANGE(0x0000, 0xffff) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound2_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index 0c274f07d4d..771b00a3255 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -22,20 +22,20 @@ #include "cpu/z80/z80.h" static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END #ifdef UNUSED_FUNCTION static ADDRESS_MAP_START( readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END #endif diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c index 045b0423783..4604f172fef 100644 --- a/src/mame/drivers/sg1000a.c +++ b/src/mame/drivers/sg1000a.c @@ -124,15 +124,15 @@ CN4 CN5 *************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7FFF) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbFFF) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc3ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7FFF) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbFFF) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc3ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7FFF) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbFFF) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc3ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7FFF) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbFFF) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc3ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -149,7 +149,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0xBE, 0xBE) AM_WRITE(TMS9928A_vram_w) AM_RANGE(0xBF, 0xBF) AM_WRITE(TMS9928A_register_w) - AM_RANGE(0xDF, 0xDF) AM_WRITE(MWA8_NOP) //? 8255 ? + AM_RANGE(0xDF, 0xDF) AM_WRITE(SMH_NOP) //? 8255 ? AM_RANGE(0x7f, 0x7F) AM_WRITE(SN76496_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/sgladiat.c b/src/mame/drivers/sgladiat.c index 64f12c26e05..0304acbef88 100644 --- a/src/mame/drivers/sgladiat.c +++ b/src/mame/drivers/sgladiat.c @@ -103,12 +103,12 @@ static ADDRESS_MAP_START( sgladiat_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa600, 0xa600) AM_WRITE(sglatiat_flipscreen_w) AM_RANGE(0xa700, 0xa700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w) AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE(3) AM_BASE(&snk_rambase) -// AM_RANGE(0xd200, 0xd200) AM_WRITE(MWA8_RAM) /* ?0x24 */ -// AM_RANGE(0xd300, 0xd300) AM_WRITE(MWA8_RAM) /* ------xx: msb scrollx */ -// AM_RANGE(0xd400, 0xd400) AM_WRITE(MWA8_RAM) /* xscroll (sprite) */ -// AM_RANGE(0xd500, 0xd500) AM_WRITE(MWA8_RAM) /* yscroll (sprite) */ -// AM_RANGE(0xd600, 0xd600) AM_WRITE(MWA8_RAM) /* xscroll (bg) */ -// AM_RANGE(0xd700, 0xd700) AM_WRITE(MWA8_RAM) /* yscroll (bg) */ +// AM_RANGE(0xd200, 0xd200) AM_WRITE(SMH_RAM) /* ?0x24 */ +// AM_RANGE(0xd300, 0xd300) AM_WRITE(SMH_RAM) /* ------xx: msb scrollx */ +// AM_RANGE(0xd400, 0xd400) AM_WRITE(SMH_RAM) /* xscroll (sprite) */ +// AM_RANGE(0xd500, 0xd500) AM_WRITE(SMH_RAM) /* yscroll (sprite) */ +// AM_RANGE(0xd600, 0xd600) AM_WRITE(SMH_RAM) /* xscroll (bg) */ +// AM_RANGE(0xd700, 0xd700) AM_WRITE(SMH_RAM) /* yscroll (bg) */ AM_RANGE(0xd800, 0xdfff) AM_RAM AM_BASE(&spriteram) AM_SHARE(1) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&videoram) AM_SHARE(2) AM_RANGE(0xe800, 0xefff) AM_RAM @@ -132,7 +132,7 @@ static ADDRESS_MAP_START( sgladiat_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc000) AM_READ(sgladiat_sound_nmi_ack_r) AM_RANGE(0xe000, 0xe000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(AY8910_write_port_0_w) - AM_RANGE(0xe002, 0xe003) AM_WRITE(MWA8_NOP) // leftover wave generator ports? + AM_RANGE(0xe002, 0xe003) AM_WRITE(SMH_NOP) // leftover wave generator ports? AM_RANGE(0xe004, 0xe004) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0xe005, 0xe005) AM_WRITE(AY8910_write_port_1_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index 38765bc0d23..a7d537c9f80 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -228,17 +228,17 @@ static WRITE16_HANDLER ( shadfrce_sound_brt_w ) /* Memory Maps - ToDo, Work Out Unknowns */ static ADDRESS_MAP_START( shadfrce_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) - AM_RANGE(0x101000, 0x101fff) AM_READ(MRA16_RAM) - AM_RANGE(0x102000, 0x1027ff) AM_READ(MRA16_RAM) - AM_RANGE(0x102800, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x141fff) AM_READ(MRA16_RAM) - AM_RANGE(0x142000, 0x143fff) AM_READ(MRA16_RAM) - AM_RANGE(0x180000, 0x187fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) + AM_RANGE(0x101000, 0x101fff) AM_READ(SMH_RAM) + AM_RANGE(0x102000, 0x1027ff) AM_READ(SMH_RAM) + AM_RANGE(0x102800, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x141fff) AM_READ(SMH_RAM) + AM_RANGE(0x142000, 0x143fff) AM_READ(SMH_RAM) + AM_RANGE(0x180000, 0x187fff) AM_READ(SMH_RAM) /* inputs, dipswitches etc. */ - AM_RANGE(0x1c000a, 0x1c000b) AM_READ(MRA16_NOP) /* ?? */ - AM_RANGE(0x1d000c, 0x1d000d) AM_READ(MRA16_NOP) /* ?? */ + AM_RANGE(0x1c000a, 0x1c000b) AM_READ(SMH_NOP) /* ?? */ + AM_RANGE(0x1d000c, 0x1d000d) AM_READ(SMH_NOP) /* ?? */ #if USE_SHADFRCE_FAKE_INPUT_PORTS AM_RANGE(0x1d0020, 0x1d0027) AM_READ(shadfrce_input_ports_r) #else @@ -247,37 +247,37 @@ static ADDRESS_MAP_START( shadfrce_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1d0024, 0x1d0025) AM_READ(input_port_2_word_r) AM_RANGE(0x1d0026, 0x1d0027) AM_READ(input_port_3_word_r) #endif - AM_RANGE(0x1F0000, 0x1FFFFF) AM_READ(MRA16_RAM) + AM_RANGE(0x1F0000, 0x1FFFFF) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( shadfrce_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100fff) AM_WRITE(shadfrce_bg0videoram_w) AM_BASE(&shadfrce_bg0videoram) /* video */ - AM_RANGE(0x101000, 0x101fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x101000, 0x101fff) AM_WRITE(SMH_RAM) AM_RANGE(0x102000, 0x1027ff) AM_WRITE(shadfrce_bg1videoram_w) AM_BASE(&shadfrce_bg1videoram) /* bg 2 */ - AM_RANGE(0x102800, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x102800, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x140000, 0x141fff) AM_WRITE(shadfrce_fgvideoram_w) AM_BASE(&shadfrce_fgvideoram) - AM_RANGE(0x142000, 0x143fff) AM_WRITE(MWA16_RAM) AM_BASE(&shadfrce_spvideoram) AM_SIZE(&spriteram_size) /* sprites */ + AM_RANGE(0x142000, 0x143fff) AM_WRITE(SMH_RAM) AM_BASE(&shadfrce_spvideoram) AM_SIZE(&spriteram_size) /* sprites */ AM_RANGE(0x180000, 0x187fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) /* ?? */ /* probably video registers etc. */ -// AM_RANGE(0x1c0000, 0x1d000d) AM_WRITE(MWA16_RAM) AM_BASE(&shadfrce_videoregs) +// AM_RANGE(0x1c0000, 0x1d000d) AM_WRITE(SMH_RAM) AM_BASE(&shadfrce_videoregs) AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE(shadfrce_bg0scrollx_w) /* SCROLL X */ AM_RANGE(0x1c0002, 0x1c0003) AM_WRITE(shadfrce_bg0scrolly_w) /* SCROLL Y */ AM_RANGE(0x1c0004, 0x1c0005) AM_WRITE(shadfrce_bg1scrollx_w) /* SCROLL X */ AM_RANGE(0x1c0006, 0x1c0007) AM_WRITE(shadfrce_bg1scrolly_w) /* SCROLL Y */ - AM_RANGE(0x1c0008, 0x1c0009) AM_WRITE(MWA16_NOP) /* ?? */ + AM_RANGE(0x1c0008, 0x1c0009) AM_WRITE(SMH_NOP) /* ?? */ AM_RANGE(0x1c000a, 0x1c000b) AM_WRITE(shadfrce_flip_screen) - AM_RANGE(0x1c000c, 0x1c000d) AM_WRITE(MWA16_NOP) /* ?? */ - AM_RANGE(0x1d0000, 0x1d0001) AM_WRITE(MWA16_NOP) /* ?? */ - AM_RANGE(0x1d0002, 0x1d0003) AM_WRITE(MWA16_NOP) /* ?? */ - AM_RANGE(0x1d0006, 0x1d0007) AM_WRITE(MWA16_NOP) /* ?? */ - AM_RANGE(0x1d0008, 0x1d0009) AM_WRITE(MWA16_NOP) /* ?? */ + AM_RANGE(0x1c000c, 0x1c000d) AM_WRITE(SMH_NOP) /* ?? */ + AM_RANGE(0x1d0000, 0x1d0001) AM_WRITE(SMH_NOP) /* ?? */ + AM_RANGE(0x1d0002, 0x1d0003) AM_WRITE(SMH_NOP) /* ?? */ + AM_RANGE(0x1d0006, 0x1d0007) AM_WRITE(SMH_NOP) /* ?? */ + AM_RANGE(0x1d0008, 0x1d0009) AM_WRITE(SMH_NOP) /* ?? */ AM_RANGE(0x1d000c, 0x1d000d) AM_WRITE(shadfrce_sound_brt_w) /* sound command + screen brightness */ - AM_RANGE(0x1d0010, 0x1d0011) AM_WRITE(MWA16_NOP) /* ?? */ - AM_RANGE(0x1d0012, 0x1d0013) AM_WRITE(MWA16_NOP) /* ?? */ - AM_RANGE(0x1d0014, 0x1d0015) AM_WRITE(MWA16_NOP) /* ?? */ - AM_RANGE(0x1d0016, 0x1d0017) AM_WRITE(MWA16_NOP) /* ?? */ - AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1d0010, 0x1d0011) AM_WRITE(SMH_NOP) /* ?? */ + AM_RANGE(0x1d0012, 0x1d0013) AM_WRITE(SMH_NOP) /* ?? */ + AM_RANGE(0x1d0014, 0x1d0015) AM_WRITE(SMH_NOP) /* ?? */ + AM_RANGE(0x1d0016, 0x1d0017) AM_WRITE(SMH_NOP) /* ?? */ + AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /* and the sound cpu */ @@ -288,22 +288,22 @@ static WRITE8_HANDLER( oki_bankswitch_w ) } static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc801, 0xc801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xd800, 0xd800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc800, 0xc800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xd800, 0xd800) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(oki_bankswitch_w) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c index 94b88a1a197..82e192d8727 100644 --- a/src/mame/drivers/shangha3.c +++ b/src/mame/drivers/shangha3.c @@ -113,85 +113,85 @@ static WRITE16_HANDLER( heberpop_sound_command_w ) static ADDRESS_MAP_START( shangha3_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_READ(input_port_0_word_r) AM_RANGE(0x200002, 0x200003) AM_READ(input_port_1_word_r) AM_RANGE(0x20001e, 0x20001f) AM_READ(AY8910_read_port_0_lsb_r) AM_RANGE(0x20004e, 0x20004f) AM_READ(shangha3_prot_r) AM_RANGE(0x20006e, 0x20006f) AM_READ(OKIM6295_status_0_lsb_r) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( shangha3_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x200008, 0x200009) AM_WRITE(shangha3_blitter_go_w) - AM_RANGE(0x20000a, 0x20000b) AM_WRITE(MWA16_NOP) /* irq ack? */ + AM_RANGE(0x20000a, 0x20000b) AM_WRITE(SMH_NOP) /* irq ack? */ AM_RANGE(0x20000c, 0x20000d) AM_WRITE(shangha3_coinctrl_w) AM_RANGE(0x20002e, 0x20002f) AM_WRITE(AY8910_write_port_0_lsb_w) AM_RANGE(0x20003e, 0x20003f) AM_WRITE(AY8910_control_port_0_lsb_w) AM_RANGE(0x20004e, 0x20004f) AM_WRITE(shangha3_prot_w) AM_RANGE(0x20006e, 0x20006f) AM_WRITE(OKIM6295_data_0_lsb_w) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM) AM_BASE(&shangha3_ram) AM_SIZE(&shangha3_ram_size) /* gfx & work ram */ + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM) AM_BASE(&shangha3_ram) AM_SIZE(&shangha3_ram_size) /* gfx & work ram */ AM_RANGE(0x340000, 0x340001) AM_WRITE(shangha3_flipscreen_w) AM_RANGE(0x360000, 0x360001) AM_WRITE(shangha3_gfxlist_addr_w) ADDRESS_MAP_END static ADDRESS_MAP_START( heberpop_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_READ(input_port_0_word_r) AM_RANGE(0x200002, 0x200003) AM_READ(input_port_1_word_r) AM_RANGE(0x200004, 0x200005) AM_READ(input_port_2_word_r) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0xb7ffff) AM_READ(heberpop_gfxrom_r) ADDRESS_MAP_END static ADDRESS_MAP_START( heberpop_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x200008, 0x200009) AM_WRITE(shangha3_blitter_go_w) - AM_RANGE(0x20000a, 0x20000b) AM_WRITE(MWA16_NOP) /* irq ack? */ + AM_RANGE(0x20000a, 0x20000b) AM_WRITE(SMH_NOP) /* irq ack? */ AM_RANGE(0x20000c, 0x20000d) AM_WRITE(heberpop_coinctrl_w) AM_RANGE(0x20000e, 0x20000f) AM_WRITE(heberpop_sound_command_w) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM) AM_BASE(&shangha3_ram) AM_SIZE(&shangha3_ram_size) /* gfx & work ram */ + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM) AM_BASE(&shangha3_ram) AM_SIZE(&shangha3_ram_size) /* gfx & work ram */ AM_RANGE(0x340000, 0x340001) AM_WRITE(shangha3_flipscreen_w) AM_RANGE(0x360000, 0x360001) AM_WRITE(shangha3_gfxlist_addr_w) ADDRESS_MAP_END static ADDRESS_MAP_START( blocken_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r) AM_RANGE(0x100002, 0x100003) AM_READ(input_port_1_word_r) AM_RANGE(0x100004, 0x100005) AM_READ(input_port_2_word_r) - AM_RANGE(0x200000, 0x200fff) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0xb7ffff) AM_READ(heberpop_gfxrom_r) ADDRESS_MAP_END static ADDRESS_MAP_START( blocken_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100008, 0x100009) AM_WRITE(shangha3_blitter_go_w) - AM_RANGE(0x10000a, 0x10000b) AM_WRITE(MWA16_NOP) /* irq ack? */ + AM_RANGE(0x10000a, 0x10000b) AM_WRITE(SMH_NOP) /* irq ack? */ AM_RANGE(0x10000c, 0x10000d) AM_WRITE(heberpop_coinctrl_w) AM_RANGE(0x10000e, 0x10000f) AM_WRITE(heberpop_sound_command_w) AM_RANGE(0x200000, 0x200fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM) AM_BASE(&shangha3_ram) AM_SIZE(&shangha3_ram_size) /* gfx & work ram */ + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM) AM_BASE(&shangha3_ram) AM_SIZE(&shangha3_ram_size) /* gfx & work ram */ AM_RANGE(0x340000, 0x340001) AM_WRITE(shangha3_flipscreen_w) AM_RANGE(0x360000, 0x360001) AM_WRITE(shangha3_gfxlist_addr_w) ADDRESS_MAP_END static ADDRESS_MAP_START( heberpop_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xf7ff) AM_READ(MRA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xf7ff) AM_READ(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( heberpop_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xf7ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xf7ff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( heberpop_sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c index 2c896657470..bf18da981d2 100644 --- a/src/mame/drivers/shanghai.c +++ b/src/mame/drivers/shanghai.c @@ -800,7 +800,7 @@ static ADDRESS_MAP_START( kothello_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x07fff) AM_RAM AM_RANGE(0x08010, 0x08011) AM_READWRITE(kothello_HD63484_status_r, HD63484_address_w) AM_RANGE(0x08012, 0x08013) AM_READWRITE(HD63484_data_r, HD63484_data_w) - AM_RANGE(0x09010, 0x0901f) AM_READWRITE(shanghai_rand_r, MWA16_NOP) // unknown, sub cpu communication ? + AM_RANGE(0x09010, 0x0901f) AM_READWRITE(shanghai_rand_r, SMH_NOP) // unknown, sub cpu communication ? AM_RANGE(0x0a000, 0x0a1ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0b010, 0x0b01f) AM_READWRITE(seibu_main_word_r, seibu_main_word_w) AM_RANGE(0x80000, 0xfffff) AM_ROM diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c index 07f6d7fac8a..4a8243b37e5 100644 --- a/src/mame/drivers/shangkid.c +++ b/src/mame/drivers/shangkid.c @@ -274,19 +274,19 @@ GFXDECODE_END static ADDRESS_MAP_START( chinhero_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM - AM_RANGE(0xa000, 0xa000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xb000, 0xb000) AM_WRITE(shangkid_bbx_enable_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(shangkid_sound_enable_w) - AM_RANGE(0xb002, 0xb002) AM_WRITE(MWA8_NOP) /* main CPU interrupt-related */ - AM_RANGE(0xb003, 0xb003) AM_WRITE(MWA8_NOP) /* BBX interrupt-related */ + AM_RANGE(0xb002, 0xb002) AM_WRITE(SMH_NOP) /* main CPU interrupt-related */ + AM_RANGE(0xb003, 0xb003) AM_WRITE(SMH_NOP) /* BBX interrupt-related */ AM_RANGE(0xb004, 0xb004) AM_WRITE(shangkid_cpu_reset_w) - AM_RANGE(0xb006, 0xb006) AM_WRITE(MWA8_NOP) /* coin counter */ + AM_RANGE(0xb006, 0xb006) AM_WRITE(SMH_NOP) /* coin counter */ AM_RANGE(0xb800, 0xb800) AM_READ(input_port_0_r) /* SW1 */ AM_RANGE(0xb801, 0xb801) AM_READ(input_port_1_r) /* coin/start */ AM_RANGE(0xb802, 0xb802) AM_READ(input_port_2_r) /* player#2 */ AM_RANGE(0xb803, 0xb803) AM_READ(input_port_3_r) /* player#1 */ - AM_RANGE(0xc000, 0xc002) AM_WRITE(MWA8_RAM) AM_BASE(&shangkid_videoreg) - AM_RANGE(0xd000, 0xdfff) AM_READWRITE(MRA8_RAM, shangkid_videoram_w) AM_BASE(&videoram) AM_SHARE(1) + AM_RANGE(0xc000, 0xc002) AM_WRITE(SMH_RAM) AM_BASE(&shangkid_videoreg) + AM_RANGE(0xd000, 0xdfff) AM_READWRITE(SMH_RAM, shangkid_videoram_w) AM_BASE(&videoram) AM_SHARE(1) AM_RANGE(0xe000, 0xfdff) AM_RAM AM_SHARE(2) AM_RANGE(0xfe00, 0xffff) AM_RAM AM_BASE(&spriteram) AM_SHARE(3) ADDRESS_MAP_END @@ -294,20 +294,20 @@ 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(0xa000, 0xa000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xb000, 0xb000) AM_WRITE(shangkid_bbx_enable_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(shangkid_sound_enable_w) - AM_RANGE(0xb002, 0xb002) AM_WRITE(MWA8_NOP) /* main CPU interrupt-related */ - AM_RANGE(0xb003, 0xb003) AM_WRITE(MWA8_NOP) /* BBX interrupt-related */ + AM_RANGE(0xb002, 0xb002) AM_WRITE(SMH_NOP) /* main CPU interrupt-related */ + AM_RANGE(0xb003, 0xb003) AM_WRITE(SMH_NOP) /* BBX interrupt-related */ AM_RANGE(0xb004, 0xb004) AM_WRITE(shangkid_cpu_reset_w) - AM_RANGE(0xb006, 0xb006) AM_WRITE(MWA8_NOP) /* coin counter */ + AM_RANGE(0xb006, 0xb006) AM_WRITE(SMH_NOP) /* coin counter */ AM_RANGE(0xb007, 0xb007) AM_WRITE(shangkid_maincpu_bank_w) AM_RANGE(0xb800, 0xb800) AM_READ(input_port_0_r) /* SW1 */ AM_RANGE(0xb801, 0xb801) AM_READ(input_port_1_r) /* coin/start */ AM_RANGE(0xb802, 0xb802) AM_READ(input_port_2_r) /* player#2 */ AM_RANGE(0xb803, 0xb803) AM_READ(input_port_3_r) /* player#1 */ - AM_RANGE(0xc000, 0xc002) AM_WRITE(MWA8_RAM) AM_BASE(&shangkid_videoreg) - AM_RANGE(0xd000, 0xdfff) AM_READWRITE(MRA8_RAM, shangkid_videoram_w) AM_BASE(&videoram) AM_SHARE(1) + AM_RANGE(0xc000, 0xc002) AM_WRITE(SMH_RAM) AM_BASE(&shangkid_videoreg) + AM_RANGE(0xd000, 0xdfff) AM_READWRITE(SMH_RAM, shangkid_videoram_w) AM_BASE(&videoram) AM_SHARE(1) AM_RANGE(0xe000, 0xfdff) AM_RAM AM_SHARE(2) AM_RANGE(0xfe00, 0xffff) AM_RAM AM_BASE(&spriteram) AM_SHARE(3) ADDRESS_MAP_END @@ -316,37 +316,37 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( chinhero_bbx_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM - AM_RANGE(0xa000, 0xa000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xb000, 0xb000) AM_WRITE(shangkid_bbx_enable_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(shangkid_sound_enable_w) - AM_RANGE(0xb002, 0xb002) AM_WRITE(MWA8_NOP) /* main CPU interrupt-related */ - AM_RANGE(0xb003, 0xb003) AM_WRITE(MWA8_NOP) /* BBX interrupt-related */ + AM_RANGE(0xb002, 0xb002) AM_WRITE(SMH_NOP) /* main CPU interrupt-related */ + AM_RANGE(0xb003, 0xb003) AM_WRITE(SMH_NOP) /* BBX interrupt-related */ AM_RANGE(0xb004, 0xb004) AM_WRITE(shangkid_cpu_reset_w) - AM_RANGE(0xb006, 0xb006) AM_WRITE(MWA8_NOP) /* coin counter */ + AM_RANGE(0xb006, 0xb006) AM_WRITE(SMH_NOP) /* coin counter */ AM_RANGE(0xb800, 0xb800) AM_READ(input_port_0_r) /* SW1 */ AM_RANGE(0xb801, 0xb801) AM_READ(input_port_1_r) /* coin/start */ AM_RANGE(0xb802, 0xb802) AM_READ(input_port_2_r) /* player#2 */ AM_RANGE(0xb803, 0xb803) AM_READ(input_port_3_r) /* player#1 */ - AM_RANGE(0xd000, 0xdfff) AM_READWRITE(MRA8_RAM, shangkid_videoram_w) AM_SHARE(1) + AM_RANGE(0xd000, 0xdfff) AM_READWRITE(SMH_RAM, shangkid_videoram_w) AM_SHARE(1) AM_RANGE(0xe000, 0xfdff) AM_RAM AM_SHARE(2) AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE(3) ADDRESS_MAP_END static ADDRESS_MAP_START( shangkid_bbx_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM - AM_RANGE(0xa000, 0xa000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xb000, 0xb000) AM_WRITE(shangkid_bbx_enable_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(shangkid_sound_enable_w) - AM_RANGE(0xb002, 0xb002) AM_WRITE(MWA8_NOP) /* main CPU interrupt-related */ - AM_RANGE(0xb003, 0xb003) AM_WRITE(MWA8_NOP) /* BBX interrupt-related */ + AM_RANGE(0xb002, 0xb002) AM_WRITE(SMH_NOP) /* main CPU interrupt-related */ + AM_RANGE(0xb003, 0xb003) AM_WRITE(SMH_NOP) /* BBX interrupt-related */ AM_RANGE(0xb004, 0xb004) AM_WRITE(shangkid_cpu_reset_w) - AM_RANGE(0xb006, 0xb006) AM_WRITE(MWA8_NOP) /* coin counter */ + AM_RANGE(0xb006, 0xb006) AM_WRITE(SMH_NOP) /* coin counter */ AM_RANGE(0xb007, 0xb007) AM_WRITE(shangkid_maincpu_bank_w) AM_RANGE(0xb800, 0xb800) AM_READ(input_port_0_r) /* SW1 */ AM_RANGE(0xb801, 0xb801) AM_READ(input_port_1_r) /* coin/start */ AM_RANGE(0xb802, 0xb802) AM_READ(input_port_2_r) /* player#2 */ AM_RANGE(0xb803, 0xb803) AM_READ(input_port_3_r) /* player#1 */ - AM_RANGE(0xd000, 0xdfff) AM_READWRITE(MRA8_RAM, shangkid_videoram_w) AM_SHARE(1) + AM_RANGE(0xd000, 0xdfff) AM_READWRITE(SMH_RAM, shangkid_videoram_w) AM_SHARE(1) AM_RANGE(0xe000, 0xfdff) AM_RAM AM_SHARE(2) AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE(3) ADDRESS_MAP_END diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c index ae2c086cc1c..f71f1b29499 100644 --- a/src/mame/drivers/shaolins.c +++ b/src/mame/drivers/shaolins.c @@ -42,11 +42,11 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0701, 0x0701) AM_READ(input_port_1_r) /* player 1 controls */ AM_RANGE(0x0702, 0x0702) AM_READ(input_port_2_r) /* player 2 controls */ AM_RANGE(0x0703, 0x0703) AM_READ(input_port_5_r) /* selftest */ - AM_RANGE(0x2800, 0x2bff) AM_READ(MRA8_RAM) /* RAM BANK 2 */ - AM_RANGE(0x3000, 0x33ff) AM_READ(MRA8_RAM) /* RAM BANK 1 */ - AM_RANGE(0x3800, 0x3fff) AM_READ(MRA8_RAM) /* video RAM */ - AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_ROM) /* Machine checks for extra rom */ - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x2800, 0x2bff) AM_READ(SMH_RAM) /* RAM BANK 2 */ + AM_RANGE(0x3000, 0x33ff) AM_READ(SMH_RAM) /* RAM BANK 1 */ + AM_RANGE(0x3800, 0x3fff) AM_READ(SMH_RAM) /* video RAM */ + AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_ROM) /* Machine checks for extra rom */ + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -56,16 +56,16 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0300, 0x0300) AM_WRITE(SN76496_0_w) /* trigger chip to read from latch. The program always */ AM_RANGE(0x0400, 0x0400) AM_WRITE(SN76496_1_w) /* writes the same number as the latch, so we don't */ /* bother emulating them. */ - AM_RANGE(0x0800, 0x0800) AM_WRITE(MWA8_NOP) /* latch for 76496 #0 */ - AM_RANGE(0x1000, 0x1000) AM_WRITE(MWA8_NOP) /* latch for 76496 #1 */ + AM_RANGE(0x0800, 0x0800) AM_WRITE(SMH_NOP) /* latch for 76496 #0 */ + AM_RANGE(0x1000, 0x1000) AM_WRITE(SMH_NOP) /* latch for 76496 #1 */ AM_RANGE(0x1800, 0x1800) AM_WRITE(shaolins_palettebank_w) AM_RANGE(0x2000, 0x2000) AM_WRITE(shaolins_scroll_w) - AM_RANGE(0x2800, 0x2bff) AM_WRITE(MWA8_RAM) /* RAM BANK 2 */ - AM_RANGE(0x3000, 0x30ff) AM_WRITE(MWA8_RAM) /* RAM BANK 1 */ - AM_RANGE(0x3100, 0x33ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x2800, 0x2bff) AM_WRITE(SMH_RAM) /* RAM BANK 2 */ + AM_RANGE(0x3000, 0x30ff) AM_WRITE(SMH_RAM) /* RAM BANK 1 */ + AM_RANGE(0x3100, 0x33ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3800, 0x3bff) AM_WRITE(shaolins_colorram_w) AM_BASE(&colorram) AM_RANGE(0x3c00, 0x3fff) AM_WRITE(shaolins_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index d3c57893b15..d0361f5ead2 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -48,17 +48,17 @@ static WRITE8_HANDLER( sichuan2_coin_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc800, 0xcaff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc800, 0xcaff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc800, 0xcaff) AM_WRITE(sichuan2_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xd000, 0xdfff) AM_WRITE(sichuan2_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) @@ -78,13 +78,13 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0xfd00, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0xfd00, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xfd00, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xfd00, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c index 7862790bf9d..e2f0aaa8aa6 100644 --- a/src/mame/drivers/shootout.c +++ b/src/mame/drivers/shootout.c @@ -78,70 +78,70 @@ static WRITE8_HANDLER( shootout_coin_counter_w ) /*******************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_READ(input_port_0_r) AM_RANGE(0x1001, 0x1001) AM_READ(input_port_1_r) AM_RANGE(0x1002, 0x1002) AM_READ(input_port_2_r) AM_RANGE(0x1003, 0x1003) AM_READ(input_port_3_r) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) /* foreground */ - AM_RANGE(0x2800, 0x2fff) AM_READ(MRA8_RAM) /* background */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) /* foreground */ + AM_RANGE(0x2800, 0x2fff) AM_READ(SMH_RAM) /* background */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_WRITE(shootout_bankswitch_w) AM_RANGE(0x1001, 0x1001) AM_WRITE(shootout_flipscreen_w) AM_RANGE(0x1002, 0x1002) AM_WRITE(shootout_coin_counter_w) AM_RANGE(0x1003, 0x1003) AM_WRITE(sound_cpu_command_w) - AM_RANGE(0x1004, 0x17ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1800, 0x19ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x1004, 0x17ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1800, 0x19ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x2000, 0x27ff) AM_WRITE(shootout_textram_w) AM_BASE(&shootout_textram) AM_RANGE(0x2800, 0x2fff) AM_WRITE(shootout_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_alt, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_READ(input_port_0_r) AM_RANGE(0x1001, 0x1001) AM_READ(input_port_1_r) AM_RANGE(0x1002, 0x1002) AM_READ(input_port_2_r) AM_RANGE(0x1003, 0x1003) AM_READ(input_port_3_r) - AM_RANGE(0x2000, 0x21ff) AM_READ(MRA8_RAM) + AM_RANGE(0x2000, 0x21ff) AM_READ(SMH_RAM) AM_RANGE(0x2800, 0x2800) AM_READ(YM2203_status_port_0_r) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) /* foreground */ - AM_RANGE(0x3800, 0x3fff) AM_READ(MRA8_RAM) /* background */ - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) /* foreground */ + AM_RANGE(0x3800, 0x3fff) AM_READ(SMH_RAM) /* background */ + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_alt, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x1800, 0x1800) AM_WRITE(shootout_coin_counter_w) - AM_RANGE(0x2000, 0x21ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x2000, 0x21ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x2800, 0x2800) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x2801, 0x2801) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x3000, 0x37ff) AM_WRITE(shootout_textram_w) AM_BASE(&shootout_textram) AM_RANGE(0x3800, 0x3fff) AM_WRITE(shootout_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /*******************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x4000, 0x4000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4000, 0x4000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x4001, 0x4001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(interrupt_enable_w) - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /*******************************************************************************/ diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c index 180f5bd72e7..69065f35d43 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -273,14 +273,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4808, 0x4808) AM_WRITE(cpu_shared_ctrl_main_w) AM_RANGE(0x4801, 0x4801) AM_WRITE(nmi_disable_and_clear_line_w) AM_RANGE(0x4809, 0x4809) AM_WRITE(nmi_enable_w) - AM_RANGE(0x4802, 0x4802) AM_WRITE(MWA8_NOP) - AM_RANGE(0x480a, 0x480a) AM_WRITE(MWA8_NOP) - AM_RANGE(0x4803, 0x4803) AM_WRITE(MWA8_NOP) - AM_RANGE(0x480b, 0x480b) AM_WRITE(MWA8_NOP) + AM_RANGE(0x4802, 0x4802) AM_WRITE(SMH_NOP) + AM_RANGE(0x480a, 0x480a) AM_WRITE(SMH_NOP) + AM_RANGE(0x4803, 0x4803) AM_WRITE(SMH_NOP) + AM_RANGE(0x480b, 0x480b) AM_WRITE(SMH_NOP) AM_RANGE(0x4804, 0x4804) AM_WRITE(shougi_mcu_halt_off_w) AM_RANGE(0x480c, 0x480c) AM_WRITE(shougi_mcu_halt_on_w) - AM_RANGE(0x4807, 0x4807) AM_WRITE(MWA8_NOP)//?????? connected to +5v via resistor - AM_RANGE(0x480f, 0x480f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x4807, 0x4807) AM_WRITE(SMH_NOP)//?????? connected to +5v via resistor + AM_RANGE(0x480f, 0x480f) AM_WRITE(SMH_NOP) AM_RANGE(0x5000, 0x5000) AM_READ(input_port_0_r) AM_RANGE(0x5800, 0x5800) AM_WRITE(shougi_watchdog_reset_w) AM_READ(input_port_0_r) /* game won't boot if watchdog doesn't work */ diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c index 58dc98e952e..08f824c2aea 100644 --- a/src/mame/drivers/shuuz.c +++ b/src/mame/drivers/shuuz.c @@ -148,14 +148,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x105002, 0x105003) AM_READ(input_port_1_word_r) AM_RANGE(0x106000, 0x106001) AM_READWRITE(adpcm_r, adpcm_w) AM_RANGE(0x107000, 0x107007) AM_NOP - AM_RANGE(0x3e0000, 0x3e087f) AM_READWRITE(MRA16_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x3e0000, 0x3e087f) AM_READWRITE(SMH_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(atarivc_r, atarivc_w) AM_BASE(&atarivc_data) - AM_RANGE(0x3f4000, 0x3f5eff) AM_READWRITE(MRA16_RAM, atarigen_playfield_latched_msb_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0x3f4000, 0x3f5eff) AM_READWRITE(SMH_RAM, atarigen_playfield_latched_msb_w) AM_BASE(&atarigen_playfield) AM_RANGE(0x3f5f00, 0x3f5f7f) AM_RAM AM_BASE(&atarivc_eof_data) - AM_RANGE(0x3f5f80, 0x3f5fff) AM_READWRITE(MRA16_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) - AM_RANGE(0x3f6000, 0x3f7fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_upper_w) AM_BASE(&atarigen_playfield_upper) + AM_RANGE(0x3f5f80, 0x3f5fff) AM_READWRITE(SMH_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) + AM_RANGE(0x3f6000, 0x3f7fff) AM_READWRITE(SMH_RAM, atarigen_playfield_upper_w) AM_BASE(&atarigen_playfield_upper) AM_RANGE(0x3f8000, 0x3fcfff) AM_RAM - AM_RANGE(0x3fd000, 0x3fd3ff) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0x3fd000, 0x3fd3ff) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3fd400, 0x3fffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index 404326883e9..75edb097085 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -86,19 +86,19 @@ static READ8_HANDLER( turtship_ports_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc800, 0xc800) AM_READ(input_port_0_r) AM_RANGE(0xc801, 0xc801) AM_READ(input_port_1_r) AM_RANGE(0xc802, 0xc802) AM_READ(input_port_2_r) AM_RANGE(0xc803, 0xc803) AM_READ(input_port_3_r) AM_RANGE(0xc804, 0xc804) AM_READ(input_port_4_r) AM_RANGE(0xc805, 0xc805) AM_READ(input_port_5_r) - AM_RANGE(0xd000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc3ff) AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE(&paletteram) AM_RANGE(0xc400, 0xc7ff) AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_BASE(&paletteram_2) AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w) @@ -107,28 +107,28 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc804, 0xc804) AM_WRITE(sidearms_c804_w) AM_RANGE(0xc805, 0xc805) AM_WRITE(sidearms_star_scrollx_w) AM_RANGE(0xc806, 0xc806) AM_WRITE(sidearms_star_scrolly_w) - AM_RANGE(0xc808, 0xc809) AM_WRITE(MWA8_RAM) AM_BASE(&sidearms_bg_scrollx) - AM_RANGE(0xc80a, 0xc80b) AM_WRITE(MWA8_RAM) AM_BASE(&sidearms_bg_scrolly) + AM_RANGE(0xc808, 0xc809) AM_WRITE(SMH_RAM) AM_BASE(&sidearms_bg_scrollx) + AM_RANGE(0xc80a, 0xc80b) AM_WRITE(SMH_RAM) AM_BASE(&sidearms_bg_scrolly) AM_RANGE(0xc80c, 0xc80c) AM_WRITE(sidearms_gfxctrl_w) /* background and sprite enable */ AM_RANGE(0xd000, 0xd7ff) AM_WRITE(sidearms_videoram_w) AM_BASE(&videoram) AM_RANGE(0xd800, 0xdfff) AM_WRITE(sidearms_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( turtship_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xe7ff) AM_READ(SMH_RAM) AM_RANGE(0xe800, 0xe807) AM_READ(turtship_ports_r) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( turtship_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xe000, 0xe3ff) AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE(&paletteram) AM_RANGE(0xe400, 0xe7ff) AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_BASE(&paletteram_2) AM_RANGE(0xe800, 0xe800) AM_WRITE(soundlatch_w) @@ -137,8 +137,8 @@ static ADDRESS_MAP_START( turtship_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe804, 0xe804) AM_WRITE(sidearms_c804_w) AM_RANGE(0xe805, 0xe805) AM_WRITE(sidearms_star_scrollx_w) AM_RANGE(0xe806, 0xe806) AM_WRITE(sidearms_star_scrolly_w) - AM_RANGE(0xe808, 0xe809) AM_WRITE(MWA8_RAM) AM_BASE(&sidearms_bg_scrollx) - AM_RANGE(0xe80a, 0xe80b) AM_WRITE(MWA8_RAM) AM_BASE(&sidearms_bg_scrolly) + AM_RANGE(0xe808, 0xe809) AM_WRITE(SMH_RAM) AM_BASE(&sidearms_bg_scrollx) + AM_RANGE(0xe80a, 0xe80b) AM_WRITE(SMH_RAM) AM_BASE(&sidearms_bg_scrolly) AM_RANGE(0xe80c, 0xe80c) AM_WRITE(sidearms_gfxctrl_w) /* background and sprite enable */ AM_RANGE(0xf000, 0xf7ff) AM_WRITE(sidearms_videoram_w) AM_BASE(&videoram) AM_RANGE(0xf800, 0xffff) AM_WRITE(sidearms_colorram_w) AM_BASE(&colorram) @@ -146,16 +146,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r) AM_RANGE(0xf000, 0xf000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xf002, 0xf002) AM_READ(YM2203_status_port_1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(YM2203_control_port_1_w) @@ -183,8 +183,8 @@ static WRITE8_HANDLER( whizz_bankswitch_w ) } static ADDRESS_MAP_START( whizz_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc800, 0xc800) AM_READ(input_port_0_r) AM_RANGE(0xc801, 0xc801) AM_READ(input_port_1_r) AM_RANGE(0xc802, 0xc802) AM_READ(input_port_2_r) @@ -193,38 +193,38 @@ static ADDRESS_MAP_START( whizz_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc805, 0xc805) AM_READ(input_port_5_r) AM_RANGE(0xc806, 0xc806) AM_READ(input_port_6_r) AM_RANGE(0xc807, 0xc807) AM_READ(input_port_7_r) - AM_RANGE(0xd000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( whizz_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc3ff) AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE(&paletteram) AM_RANGE(0xc400, 0xc7ff) AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split2_w) AM_BASE(&paletteram_2) AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(whizz_bankswitch_w) AM_RANGE(0xc802, 0xc802) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xc803, 0xc803) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xc803, 0xc803) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xc804, 0xc804) AM_WRITE(sidearms_c804_w) - AM_RANGE(0xc805, 0xc805) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xc805, 0xc805) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xe805, 0xe805) AM_WRITE(sidearms_star_scrollx_w) AM_RANGE(0xe806, 0xe806) AM_WRITE(sidearms_star_scrolly_w) - AM_RANGE(0xc808, 0xc809) AM_WRITE(MWA8_RAM) AM_BASE(&sidearms_bg_scrollx) - AM_RANGE(0xc80a, 0xc80b) AM_WRITE(MWA8_RAM) AM_BASE(&sidearms_bg_scrolly) + AM_RANGE(0xc808, 0xc809) AM_WRITE(SMH_RAM) AM_BASE(&sidearms_bg_scrollx) + AM_RANGE(0xc80a, 0xc80b) AM_WRITE(SMH_RAM) AM_BASE(&sidearms_bg_scrolly) AM_RANGE(0xc80c, 0xc80c) AM_WRITE(sidearms_gfxctrl_w) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(sidearms_videoram_w) AM_BASE(&videoram) AM_RANGE(0xd800, 0xdfff) AM_WRITE(sidearms_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( whizz_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( whizz_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( whizz_readport, ADDRESS_SPACE_IO, 8 ) @@ -237,7 +237,7 @@ static ADDRESS_MAP_START( whizz_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x01, 0x01) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0x40, 0x40) AM_WRITE(MWA8_NOP) + AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c index d451fac3d98..a60c0b946d2 100644 --- a/src/mame/drivers/sidepckt.c +++ b/src/mame/drivers/sidepckt.c @@ -127,53 +127,53 @@ static WRITE8_HANDLER( sidepctj_i8751_w ) /******************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0x1000, 0x13ff) AM_READ(MRA8_RAM) - AM_RANGE(0x1800, 0x1bff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x20ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0x1000, 0x13ff) AM_READ(SMH_RAM) + AM_RANGE(0x1800, 0x1bff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x20ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r) AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r) AM_RANGE(0x3002, 0x3002) AM_READ(input_port_2_r) AM_RANGE(0x3003, 0x3003) AM_READ(input_port_3_r) AM_RANGE(0x3014, 0x3014) AM_READ(sidepckt_i8751_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x13ff) AM_WRITE(sidepckt_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x1800, 0x1bff) AM_WRITE(sidepckt_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x2000, 0x20ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x2000, 0x20ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3004, 0x3004) AM_WRITE(sound_cpu_command_w) AM_RANGE(0x300c, 0x300c) AM_WRITE(sidepckt_flipscreen_w) AM_RANGE(0x3018, 0x3018) AM_WRITE(sidepckt_i8751_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( j_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x13ff) AM_WRITE(sidepckt_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x1800, 0x1bff) AM_WRITE(sidepckt_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x2000, 0x20ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x2000, 0x20ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x3004, 0x3004) AM_WRITE(sound_cpu_command_w) AM_RANGE(0x300c, 0x300c) AM_WRITE(sidepckt_flipscreen_w) AM_RANGE(0x3018, 0x3018) AM_WRITE(sidepctj_i8751_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x1001, 0x1001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0x2000, 0x2000) AM_WRITE(YM3526_control_port_0_w) AM_RANGE(0x2001, 0x2001) AM_WRITE(YM3526_write_port_0_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index c3ce4e070df..ca8334be0c8 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -209,13 +209,13 @@ static WRITE32_HANDLER(silk_ym_dataport_w) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x40c000, 0x40cfff) AM_READ(MRA32_RAM) - AM_RANGE(0x600000, 0x603fff) AM_READ(MRA32_RAM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) + AM_RANGE(0x40c000, 0x40cfff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x603fff) AM_READ(SMH_RAM) - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA32_RAM) - AM_RANGE(0x804000, 0x807fff) AM_READ(MRA32_RAM) - AM_RANGE(0x808000, 0x80bfff) AM_READ(MRA32_RAM) + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM) + AM_RANGE(0x804000, 0x807fff) AM_READ(SMH_RAM) + AM_RANGE(0x808000, 0x80bfff) AM_READ(SMH_RAM) AM_RANGE(0xC00000, 0xC00003) AM_READ(io32_r) // player inputs AM_RANGE(0xC00004, 0xC00007) AM_READ(io32_1_r) // dip switches @@ -223,12 +223,12 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xC0002C, 0xC0002f) AM_READ(silk_ym_r) AM_RANGE(0xC00030, 0xC00033) AM_READ(silk_6295_1_r) - AM_RANGE(0xfe0000, 0xffffff) AM_READ(MRA32_RAM) + AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x40c000, 0x40cfff) AM_WRITE(MWA32_RAM) AM_BASE(&silkroad_sprram) // sprites + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x40c000, 0x40cfff) AM_WRITE(SMH_RAM) AM_BASE(&silkroad_sprram) // sprites AM_RANGE(0x600000, 0x603fff) AM_WRITE(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_BASE(&paletteram32) // palette AM_RANGE(0x800000, 0x803fff) AM_WRITE(silkroad_fgram_w) AM_BASE(&silkroad_vidram) // lower Layer @@ -243,19 +243,19 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 32 ) // C00038 appears to be the coin counter, bit 0 is pulsed when a coin is inserted /* - AM_RANGE(0xC00034, 0xC00037) AM_WRITE(MWA32_NOP) + AM_RANGE(0xC00034, 0xC00037) AM_WRITE(SMH_NOP) */ - AM_RANGE(0xC0010c, 0xC00123) AM_WRITE(MWA32_RAM) AM_BASE(&silkroad_regs) + AM_RANGE(0xC0010c, 0xC00123) AM_WRITE(SMH_RAM) AM_BASE(&silkroad_regs) /* - AM_RANGE(0xC0010C, 0xC0010f) AM_WRITE(MWA32_NOP) // 0 - AM_RANGE(0xC00110, 0xC00113) AM_WRITE(MWA32_NOP) // 1 - AM_RANGE(0xC00114, 0xC00117) AM_WRITE(MWA32_NOP) // 2 + AM_RANGE(0xC0010C, 0xC0010f) AM_WRITE(SMH_NOP) // 0 + AM_RANGE(0xC00110, 0xC00113) AM_WRITE(SMH_NOP) // 1 + AM_RANGE(0xC00114, 0xC00117) AM_WRITE(SMH_NOP) // 2 - AM_RANGE(0xC0011c, 0xC0011f) AM_WRITE(MWA32_NOP) // 4 - AM_RANGE(0xC00120, 0xC00123) AM_WRITE(MWA32_NOP) // 5 + AM_RANGE(0xC0011c, 0xC0011f) AM_WRITE(SMH_NOP) // 4 + AM_RANGE(0xC00120, 0xC00123) AM_WRITE(SMH_NOP) // 5 */ - AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(MWA32_RAM) + AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index 1890ad62b04..faae2b2c90f 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -323,7 +323,7 @@ static ADDRESS_MAP_START( joemacr_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x154000, 0x155fff) AM_READWRITE(simpl156_pf2_data_r, simpl156_pf2_data_w) AM_RANGE(0x160000, 0x161fff) AM_READWRITE(simpl156_pf1_rowscroll_r, simpl156_pf1_rowscroll_w) AM_RANGE(0x164000, 0x165fff) AM_READWRITE(simpl156_pf2_rowscroll_r, simpl156_pf2_rowscroll_w) - AM_RANGE(0x170000, 0x170003) AM_RAM AM_WRITE(MWA32_NOP) // ? + AM_RANGE(0x170000, 0x170003) AM_RAM AM_WRITE(SMH_NOP) // ? AM_RANGE(0x180000, 0x180003) AM_READWRITE(oki_r,oki_w) AM_RANGE(0x1c0000, 0x1c0003) AM_READWRITE(oki2_r,oki2_w) AM_RANGE(0x200000, 0x200003) AM_READ(simpl156_inputs_read) @@ -347,7 +347,7 @@ static ADDRESS_MAP_START( chainrec_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x454000, 0x455fff) AM_READWRITE(simpl156_pf2_data_r, simpl156_pf2_data_w) AM_RANGE(0x460000, 0x461fff) AM_READWRITE(simpl156_pf1_rowscroll_r, simpl156_pf1_rowscroll_w) AM_RANGE(0x464000, 0x465fff) AM_READWRITE(simpl156_pf2_rowscroll_r, simpl156_pf2_rowscroll_w) - AM_RANGE(0x470000, 0x470003) AM_RAM AM_WRITE(MWA32_NOP) // ?? + AM_RANGE(0x470000, 0x470003) AM_RAM AM_WRITE(SMH_NOP) // ?? AM_RANGE(0x480000, 0x480003) AM_READWRITE(oki_r,oki_w) ADDRESS_MAP_END @@ -368,7 +368,7 @@ static ADDRESS_MAP_START( magdrop_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x3d4000, 0x3d5fff) AM_READWRITE(simpl156_pf2_data_r, simpl156_pf2_data_w) AM_RANGE(0x3e0000, 0x3e1fff) AM_READWRITE(simpl156_pf1_rowscroll_r, simpl156_pf1_rowscroll_w) AM_RANGE(0x3e4000, 0x3e5fff) AM_READWRITE(simpl156_pf2_rowscroll_r, simpl156_pf2_rowscroll_w) - AM_RANGE(0x3f0000, 0x3f0003) AM_RAM AM_WRITE(MWA32_NOP) //? + AM_RANGE(0x3f0000, 0x3f0003) AM_RAM AM_WRITE(SMH_NOP) //? AM_RANGE(0x400000, 0x400003) AM_READWRITE(oki_r,oki_w) ADDRESS_MAP_END @@ -389,7 +389,7 @@ static ADDRESS_MAP_START( magdropp_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x6d4000, 0x6d5fff) AM_READWRITE(simpl156_pf2_data_r, simpl156_pf2_data_w) AM_RANGE(0x6e0000, 0x6e1fff) AM_READWRITE(simpl156_pf1_rowscroll_r, simpl156_pf1_rowscroll_w) AM_RANGE(0x6e4000, 0x6e5fff) AM_READWRITE(simpl156_pf2_rowscroll_r, simpl156_pf2_rowscroll_w) - AM_RANGE(0x6f0000, 0x6f0003) AM_RAM AM_WRITE(MWA32_NOP) // ? + AM_RANGE(0x6f0000, 0x6f0003) AM_RAM AM_WRITE(SMH_NOP) // ? AM_RANGE(0x780000, 0x780003) AM_READWRITE(oki_r,oki_w) ADDRESS_MAP_END @@ -409,7 +409,7 @@ static ADDRESS_MAP_START( mitchell156_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1d4000, 0x1d5fff) AM_READWRITE(simpl156_pf2_data_r, simpl156_pf2_data_w) AM_RANGE(0x1e0000, 0x1e1fff) AM_READWRITE(simpl156_pf1_rowscroll_r, simpl156_pf1_rowscroll_w) AM_RANGE(0x1e4000, 0x1e5fff) AM_READWRITE(simpl156_pf2_rowscroll_r, simpl156_pf2_rowscroll_w) - AM_RANGE(0x1f0000, 0x1f0003) AM_RAM AM_WRITE(MWA32_NOP) // ? + AM_RANGE(0x1f0000, 0x1f0003) AM_RAM AM_WRITE(SMH_NOP) // ? AM_RANGE(0x200000, 0x200003) AM_READ(simpl156_inputs_read) AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE(&simpl156_systemram) // work ram (32-bit) ADDRESS_MAP_END diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c index 3b19cb26f6b..9c8a35bcce9 100644 --- a/src/mame/drivers/skullxbo.c +++ b/src/mame/drivers/skullxbo.c @@ -133,7 +133,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff1e80, 0xff1eff) AM_WRITE(skullxbo_xscroll_w) AM_RANGE(0xff1f00, 0xff1f7f) AM_WRITE(atarigen_scanline_int_ack_w) AM_RANGE(0xff1f80, 0xff1fff) AM_WRITE(watchdog_reset16_w) - AM_RANGE(0xff2000, 0xff2fff) AM_READWRITE(MRA16_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0xff2000, 0xff2fff) AM_READWRITE(SMH_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0xff4000, 0xff47ff) AM_WRITE(skullxbo_yscroll_w) AM_BASE(&atarigen_yscroll) AM_RANGE(0xff4800, 0xff4fff) AM_WRITE(skullxbo_mobwr_w) AM_RANGE(0xff6000, 0xff6fff) AM_WRITE(atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) @@ -141,11 +141,11 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff5800, 0xff5801) AM_READ(input_port_0_word_r) AM_RANGE(0xff5802, 0xff5803) AM_READ(special_port1_r) AM_RANGE(0xff6000, 0xff6fff) AM_READ(atarigen_eeprom_r) - AM_RANGE(0xff8000, 0xff9fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_latched_lsb_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0xffa000, 0xffbfff) AM_READWRITE(MRA16_RAM, atarigen_playfield_upper_w) AM_BASE(&atarigen_playfield_upper) - AM_RANGE(0xffc000, 0xffcf7f) AM_READWRITE(MRA16_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) - AM_RANGE(0xffcf80, 0xffcfff) AM_READWRITE(MRA16_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) - AM_RANGE(0xffd000, 0xffdfff) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0xff8000, 0xff9fff) AM_READWRITE(SMH_RAM, atarigen_playfield_latched_lsb_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0xffa000, 0xffbfff) AM_READWRITE(SMH_RAM, atarigen_playfield_upper_w) AM_BASE(&atarigen_playfield_upper) + AM_RANGE(0xffc000, 0xffcf7f) AM_READWRITE(SMH_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) + AM_RANGE(0xffcf80, 0xffcfff) AM_READWRITE(SMH_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) + AM_RANGE(0xffd000, 0xffdfff) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xffe000, 0xffffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 927e2ef59f5..249ebc66518 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -154,10 +154,10 @@ static WRITE8_HANDLER( nmi_enable_w ) static ADDRESS_MAP_START( skyarmy_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7FFF) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87FF) AM_READ(MRA8_RAM) - AM_RANGE(0x8800, 0x93FF) AM_READ(MRA8_RAM) /* Video RAM */ - AM_RANGE(0x9800, 0x983F) AM_READ(MRA8_RAM) /* Sprites */ + AM_RANGE(0x0000, 0x7FFF) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87FF) AM_READ(SMH_RAM) + AM_RANGE(0x8800, 0x93FF) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x9800, 0x983F) AM_READ(SMH_RAM) /* Sprites */ AM_RANGE(0x9840, 0x985F) AM_READ(skyarmy_scrollram_r) /* Sroll RAM */ AM_RANGE(0xA000, 0xA000) AM_READ(input_port_0_r) AM_RANGE(0xA001, 0xA001) AM_READ(input_port_1_r) @@ -166,16 +166,16 @@ static ADDRESS_MAP_START( skyarmy_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( skyarmy_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7FFF) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87FF) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7FFF) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87FF) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8BFF) AM_WRITE(skyarmy_videoram_w) AM_BASE(&skyarmy_videoram) /* Video RAM */ AM_RANGE(0x9000, 0x93FF) AM_WRITE(skyarmy_colorram_w) AM_BASE(&skyarmy_colorram) /* Color RAM */ - AM_RANGE(0x9800, 0x983F) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* Sprites */ + AM_RANGE(0x9800, 0x983F) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* Sprites */ AM_RANGE(0x9840, 0x985F) AM_WRITE(skyarmy_scrollram_w) AM_BASE(&skyarmy_scrollram) /* Sprites */ AM_RANGE(0xa004, 0xa004) AM_WRITE(nmi_enable_w) // ??? - AM_RANGE(0xa005, 0xa005) AM_WRITE(MWA8_NOP) - AM_RANGE(0xa006, 0xa006) AM_WRITE(MWA8_NOP) - AM_RANGE(0xa007, 0xa007) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa005, 0xa005) AM_WRITE(SMH_NOP) + AM_RANGE(0xa006, 0xa006) AM_WRITE(SMH_NOP) + AM_RANGE(0xa007, 0xa007) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static INPUT_PORTS_START( skyarmy ) diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c index 73755fa48e3..de0bb497d5b 100644 --- a/src/mame/drivers/skydiver.c +++ b/src/mame/drivers/skydiver.c @@ -184,8 +184,8 @@ static WRITE8_HANDLER( skydiver_whistle_w ) static ADDRESS_MAP_START( skydiver_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x4300) AM_READWRITE(skydiver_wram_r, skydiver_wram_w) - AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x4000) AM_READWRITE(MRA8_RAM, MWA8_RAM) /* RAM B1 */ - AM_RANGE(0x0400, 0x07ff) AM_MIRROR(0x4000) AM_READWRITE(MRA8_RAM, skydiver_videoram_w) AM_BASE(&skydiver_videoram) /* RAMs K1,M1,P1,J1,N1,K/L1,L1,H/J1 */ + AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x4000) AM_READWRITE(SMH_RAM, SMH_RAM) /* RAM B1 */ + AM_RANGE(0x0400, 0x07ff) AM_MIRROR(0x4000) AM_READWRITE(SMH_RAM, skydiver_videoram_w) AM_BASE(&skydiver_videoram) /* RAMs K1,M1,P1,J1,N1,K/L1,L1,H/J1 */ AM_RANGE(0x0800, 0x0801) AM_MIRROR(0x47f0) AM_WRITE(skydiver_lamp_s_w) AM_RANGE(0x0802, 0x0803) AM_MIRROR(0x47f0) AM_WRITE(skydiver_lamp_k_w) AM_RANGE(0x0804, 0x0805) AM_MIRROR(0x47f0) AM_WRITE(skydiver_start_lamp_1_w) @@ -214,10 +214,10 @@ static ADDRESS_MAP_START( skydiver_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1810, 0x1810) AM_MIRROR(0x47e4) AM_READ(input_port_12_r) AM_RANGE(0x1811, 0x1811) AM_MIRROR(0x47e4) AM_READ(input_port_13_r) AM_RANGE(0x2000, 0x201f) AM_MIRROR(0x47e0) AM_READWRITE(watchdog_reset_r, skydiver_2000_201F_w) - AM_RANGE(0x2800, 0x2fff) AM_MIRROR(0x4000) AM_READ(MRA8_ROM) - AM_RANGE(0x3000, 0x37ff) AM_MIRROR(0x4000) AM_READ(MRA8_ROM) - AM_RANGE(0x3800, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x2800, 0x2fff) AM_MIRROR(0x4000) AM_READ(SMH_ROM) + AM_RANGE(0x3000, 0x37ff) AM_MIRROR(0x4000) AM_READ(SMH_ROM) + AM_RANGE(0x3800, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c index d8998ae411c..337cd278918 100644 --- a/src/mame/drivers/skyfox.c +++ b/src/mame/drivers/skyfox.c @@ -45,8 +45,8 @@ VIDEO_UPDATE( skyfox ); ***************************************************************************/ static ADDRESS_MAP_START( skyfox_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r ) // Input Ports AM_RANGE(0xe001, 0xe001) AM_READ(input_port_1_r ) // AM_RANGE(0xe002, 0xe002) AM_READ(input_port_2_r ) // @@ -55,10 +55,10 @@ static ADDRESS_MAP_START( skyfox_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( skyfox_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0xd000, 0xd3ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size ) // Sprites - AM_RANGE(0xd400, 0xdfff) AM_WRITE(MWA8_RAM ) // RAM? + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0xd000, 0xd3ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xd400, 0xdfff) AM_WRITE(SMH_RAM ) // RAM? AM_RANGE(0xe008, 0xe00f) AM_WRITE(skyfox_vregs_w ) // Video Regs ADDRESS_MAP_END @@ -82,20 +82,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( skyfox_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xa001, 0xa001) AM_READ(YM2203_read_port_0_r ) // YM2203 #1 // AM_RANGE(0xc001, 0xc001) AM_READ(YM2203_read_port_1_r ) // YM2203 #2 AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END static ADDRESS_MAP_START( skyfox_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM ) // RAM -// AM_RANGE(0x9000, 0x9001) AM_WRITE(MWA8_NOP ) // ?? + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM ) // RAM +// AM_RANGE(0x9000, 0x9001) AM_WRITE(SMH_NOP ) // ?? AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w ) // YM2203 #1 AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w ) // -// AM_RANGE(0xb000, 0xb001) AM_WRITE(MWA8_NOP ) // ?? +// AM_RANGE(0xb000, 0xb001) AM_WRITE(SMH_NOP ) // ?? AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2203_control_port_1_w ) // YM2203 #2 AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2203_write_port_1_w ) // ADDRESS_MAP_END diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c index 83f08bafb89..a4202db16f2 100644 --- a/src/mame/drivers/skykid.c +++ b/src/mame/drivers/skykid.c @@ -115,7 +115,7 @@ static MACHINE_START( skykid ) static ADDRESS_MAP_START( skykid_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_BANK1) /* banked ROM */ + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_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 */ @@ -124,7 +124,7 @@ static ADDRESS_MAP_START( skykid_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6800, 0x6bff) AM_READWRITE(namcos1_cus30_r,namcos1_cus30_w) AM_BASE(&namco_wavedata)/* PSG device, shared RAM */ AM_RANGE(0x7000, 0x7fff) AM_WRITE(skykid_irq_1_ctrl_w) /* IRQ control */ AM_RANGE(0x7800, 0x7fff) AM_READ(watchdog_reset_r) /* watchdog reset */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x8000, 0x8fff) AM_WRITE(skykid_subreset_w) /* MCU control */ AM_RANGE(0x9000, 0x9fff) AM_WRITE(skykid_bankswitch_w) /* Bankswitch control */ AM_RANGE(0xa000, 0xa001) AM_WRITE(skykid_flipscreen_priority_w) /* flip screen & priority */ @@ -136,9 +136,9 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x13ff) AM_READWRITE(namcos1_cus30_r, namcos1_cus30_w) AM_BASE(&namco_wavedata) /* PSG device, shared RAM */ AM_RANGE(0x2000, 0x3fff) AM_WRITE(watchdog_reset_w) /* watchdog? */ AM_RANGE(0x4000, 0x7fff) AM_WRITE(skykid_irq_2_ctrl_w) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_RAM - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 00d0163edd5..6b33939288c 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -151,11 +151,11 @@ static ADDRESS_MAP_START( mem_map_skylncr, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8fff) AM_READWRITE( MRA8_RAM, skylncr_videoram_w ) AM_BASE( &skylncr_videoram ) - AM_RANGE(0x9000, 0x97ff) AM_READWRITE( MRA8_RAM, skylncr_colorram_w ) AM_BASE( &skylncr_colorram ) + AM_RANGE(0x8800, 0x8fff) AM_READWRITE( SMH_RAM, skylncr_videoram_w ) AM_BASE( &skylncr_videoram ) + AM_RANGE(0x9000, 0x97ff) AM_READWRITE( SMH_RAM, skylncr_colorram_w ) AM_BASE( &skylncr_colorram ) - AM_RANGE(0x9800, 0x9fff) AM_READWRITE( MRA8_RAM, skylncr_videoram2_w ) AM_BASE( &skylncr_videoram2 ) - AM_RANGE(0xa000, 0xa7ff) AM_READWRITE( MRA8_RAM, skylncr_colorram2_w ) AM_BASE( &skylncr_colorram2 ) + AM_RANGE(0x9800, 0x9fff) AM_READWRITE( SMH_RAM, skylncr_videoram2_w ) AM_BASE( &skylncr_videoram2 ) + AM_RANGE(0xa000, 0xa7ff) AM_READWRITE( SMH_RAM, skylncr_colorram2_w ) AM_BASE( &skylncr_colorram2 ) AM_RANGE(0xaa55, 0xaa55) AM_READ( ret_ff ) diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c index a39ea8fe447..c0a6a10268b 100644 --- a/src/mame/drivers/skyraid.c +++ b/src/mame/drivers/skyraid.c @@ -101,31 +101,31 @@ static WRITE8_HANDLER( skyraid_scroll_w ) static ADDRESS_MAP_START( skyraid_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_READ(MRA8_RAM) AM_MIRROR(0x300) - AM_RANGE(0x0800, 0x087f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x00ff) AM_READ(SMH_RAM) AM_MIRROR(0x300) + AM_RANGE(0x0800, 0x087f) AM_READ(SMH_RAM) AM_RANGE(0x0880, 0x0bff) AM_READ(skyraid_alpha_num_r) AM_RANGE(0x1000, 0x1000) AM_READ(skyraid_port_0_r) AM_RANGE(0x1000, 0x1001) AM_READ(input_port_1_r) AM_RANGE(0x1400, 0x1400) AM_READ(input_port_2_r) AM_RANGE(0x1400, 0x1401) AM_READ(input_port_3_r) - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( skyraid_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_WRITE(MWA8_RAM) AM_MIRROR(0x300) - AM_RANGE(0x0400, 0x040f) AM_WRITE(MWA8_RAM) AM_BASE(&skyraid_pos_ram) - AM_RANGE(0x0800, 0x087f) AM_WRITE(MWA8_RAM) AM_BASE(&skyraid_alpha_num_ram) + AM_RANGE(0x0000, 0x00ff) AM_WRITE(SMH_RAM) AM_MIRROR(0x300) + AM_RANGE(0x0400, 0x040f) AM_WRITE(SMH_RAM) AM_BASE(&skyraid_pos_ram) + AM_RANGE(0x0800, 0x087f) AM_WRITE(SMH_RAM) AM_BASE(&skyraid_alpha_num_ram) AM_RANGE(0x0880, 0x0bff) AM_WRITE(skyraid_alpha_num_w) - AM_RANGE(0x1c00, 0x1c0f) AM_WRITE(MWA8_RAM) AM_BASE(&skyraid_obj_ram) + AM_RANGE(0x1c00, 0x1c0f) AM_WRITE(SMH_RAM) AM_BASE(&skyraid_obj_ram) AM_RANGE(0x4000, 0x4000) AM_WRITE(skyraid_scroll_w) AM_RANGE(0x4400, 0x4400) AM_WRITE(skyraid_sound_w) AM_RANGE(0x4800, 0x4800) AM_WRITE(skyraid_range_w) AM_RANGE(0x5000, 0x5000) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5800, 0x5800) AM_WRITE(skyraid_offset_w) - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index 2b5bfa23e9d..6742d48e2d0 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -244,92 +244,92 @@ INTERRUPT_GEN( getstar_interrupt ); static ADDRESS_MAP_START( perfrman_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8800, 0x880f) AM_READ(slapfight_dpram_r) - AM_RANGE(0x8810, 0x8fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x9000, 0x97ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9800, 0x9fff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xa7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8810, 0x8fff) AM_READ(SMH_BANK1) + AM_RANGE(0x9000, 0x97ff) AM_READ(SMH_RAM) + AM_RANGE(0x9800, 0x9fff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xa7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( perfrman_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x880f) AM_WRITE(slapfight_dpram_w) AM_BASE(&slapfight_dpram) AM_SIZE(&slapfight_dpram_size) - AM_RANGE(0x8810, 0x8fff) AM_WRITE(MWA8_BANK1) /* Shared RAM with sound CPU */ + AM_RANGE(0x8810, 0x8fff) AM_WRITE(SMH_BANK1) /* Shared RAM with sound CPU */ AM_RANGE(0x9000, 0x97ff) AM_WRITE(slapfight_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x9800, 0x9fff) AM_WRITE(slapfight_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xa000, 0xa7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xa000, 0xa7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( tigerh_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc800, 0xc80f) AM_READ(slapfight_dpram_r) - AM_RANGE(0xc810, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xc810, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc800, 0xc80f) AM_READ(slapfight_dpram_r) - AM_RANGE(0xc810, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xc810, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) // AM_RANGE(0xe803, 0xe803) AM_READ(mcu_r) // MCU lives here - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc800, 0xc80f) AM_WRITE(slapfight_dpram_w) AM_BASE(&slapfight_dpram) AM_SIZE(&slapfight_dpram_size) - AM_RANGE(0xc810, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc810, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(slapfight_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xd800, 0xdfff) AM_WRITE(slapfight_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xe800, 0xe800) AM_WRITE(MWA8_RAM) AM_BASE(&slapfight_scrollx_lo) - AM_RANGE(0xe801, 0xe801) AM_WRITE(MWA8_RAM) AM_BASE(&slapfight_scrollx_hi) - AM_RANGE(0xe802, 0xe802) AM_WRITE(MWA8_RAM) AM_BASE(&slapfight_scrolly) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe800, 0xe800) AM_WRITE(SMH_RAM) AM_BASE(&slapfight_scrollx_lo) + AM_RANGE(0xe801, 0xe801) AM_WRITE(SMH_RAM) AM_BASE(&slapfight_scrollx_hi) + AM_RANGE(0xe802, 0xe802) AM_WRITE(SMH_RAM) AM_BASE(&slapfight_scrolly) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(slapfight_fixram_w) AM_BASE(&slapfight_videoram) AM_SIZE(&slapfight_videoram_size) AM_RANGE(0xf800, 0xffff) AM_WRITE(slapfight_fixcol_w) AM_BASE(&slapfight_colorram) ADDRESS_MAP_END static ADDRESS_MAP_START( slapbtuk_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc800, 0xc80f) AM_READ(slapfight_dpram_r) - AM_RANGE(0xc810, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xc810, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) // AM_RANGE(0xe803, 0xe803) AM_READ(getstar_e803_r) - AM_RANGE(0xec00, 0xefff) AM_READ(MRA8_ROM) // it reads a copy of the logo from here! - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xec00, 0xefff) AM_READ(SMH_ROM) // it reads a copy of the logo from here! + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( slapbtuk_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc800, 0xc80f) AM_WRITE(slapfight_dpram_w) AM_BASE(&slapfight_dpram) AM_SIZE(&slapfight_dpram_size) - AM_RANGE(0xc810, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc810, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(slapfight_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xd800, 0xdfff) AM_WRITE(slapfight_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xe800, 0xe800) AM_WRITE(MWA8_RAM) AM_BASE(&slapfight_scrollx_hi) - AM_RANGE(0xe802, 0xe802) AM_WRITE(MWA8_RAM) AM_BASE(&slapfight_scrolly) - AM_RANGE(0xe803, 0xe803) AM_WRITE(MWA8_RAM) AM_BASE(&slapfight_scrollx_lo) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe800, 0xe800) AM_WRITE(SMH_RAM) AM_BASE(&slapfight_scrollx_hi) + AM_RANGE(0xe802, 0xe802) AM_WRITE(SMH_RAM) AM_BASE(&slapfight_scrolly) + AM_RANGE(0xe803, 0xe803) AM_WRITE(SMH_RAM) AM_BASE(&slapfight_scrollx_lo) AM_RANGE(0xf000, 0xf7ff) AM_WRITE(slapfight_fixram_w) AM_BASE(&slapfight_videoram) AM_SIZE(&slapfight_videoram_size) AM_RANGE(0xf800, 0xffff) AM_WRITE(slapfight_fixcol_w) AM_BASE(&slapfight_colorram) ADDRESS_MAP_END @@ -354,8 +354,8 @@ static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_READ(tigerh_68705_portA_r) AM_RANGE(0x0001, 0x0001) AM_READ(tigerh_68705_portB_r) AM_RANGE(0x0002, 0x0002) AM_READ(tigerh_68705_portC_r) - AM_RANGE(0x0010, 0x007f) AM_READ(MRA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -366,8 +366,8 @@ static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0004, 0x0004) AM_WRITE(tigerh_68705_ddrA_w) AM_RANGE(0x0005, 0x0005) AM_WRITE(tigerh_68705_ddrB_w) AM_RANGE(0x0006, 0x0006) AM_WRITE(tigerh_68705_ddrC_w) - AM_RANGE(0x0010, 0x007f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0080, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0010, 0x007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( tigerh_writeport, ADDRESS_SPACE_IO, 8 ) @@ -394,44 +394,44 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( perfrman_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0x8800, 0x880f) AM_READ(slapfight_dpram_r) - AM_RANGE(0x8810, 0x8fff) AM_READ(MRA8_BANK1) + AM_RANGE(0x8810, 0x8fff) AM_READ(SMH_BANK1) AM_RANGE(0xa081, 0xa081) AM_READ(AY8910_read_port_0_r) AM_RANGE(0xa091, 0xa091) AM_READ(AY8910_read_port_1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( perfrman_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8800, 0x880f) AM_WRITE(slapfight_dpram_w) - AM_RANGE(0x8810, 0x8fff) AM_WRITE(MWA8_BANK1) /* Shared RAM with main CPU */ + AM_RANGE(0x8810, 0x8fff) AM_WRITE(SMH_BANK1) /* Shared RAM with main CPU */ AM_RANGE(0xa080, 0xa080) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xa082, 0xa082) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0xa090, 0xa090) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0xa092, 0xa092) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0xa0e0, 0xa0e0) AM_WRITE(getstar_sh_intenable_w) /* maybe a0f0 also -LE */ -// AM_RANGE(0xa0f0, 0xa0f0) AM_WRITE(MWA8_NOP) +// AM_RANGE(0xa0f0, 0xa0f0) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0xa081, 0xa081) AM_READ(AY8910_read_port_0_r) AM_RANGE(0xa091, 0xa091) AM_READ(AY8910_read_port_1_r) AM_RANGE(0xc800, 0xc80f) AM_READ(slapfight_dpram_r) - AM_RANGE(0xc810, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xc810, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0xa080, 0xa080) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xa082, 0xa082) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0xa090, 0xa090) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0xa092, 0xa092) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0xa0e0, 0xa0e0) AM_WRITE(getstar_sh_intenable_w) /* maybe a0f0 also -LE */ AM_RANGE(0xc800, 0xc80f) AM_WRITE(slapfight_dpram_w) - AM_RANGE(0xc810, 0xcfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc810, 0xcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END #define COMMON_START\ diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index cda4a7198f9..1ec42519fff 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -271,10 +271,10 @@ static READ16_HANDLER( slapshot_msb_sound_r ) ***********************************************************/ static ADDRESS_MAP_START( slapshot_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x500000, 0x50ffff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM) /* sprite ram */ - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) /* debugging */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM) /* main RAM */ + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM) /* sprite ram */ + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) /* debugging */ AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0480SCP_word_r) /* tilemaps */ AM_RANGE(0x830000, 0x83002f) AM_READ(TC0480SCP_ctrl_word_r) AM_RANGE(0x900000, 0x907fff) AM_READ(color_ram_word_r) /* 8bpg palette */ @@ -285,10 +285,10 @@ static ADDRESS_MAP_START( slapshot_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( slapshot_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x500000, 0x50ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x600000, 0x60ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x700000, 0x701fff) AM_WRITE(MWA16_RAM) AM_BASE(&taito_sprite_ext) AM_SIZE(&taito_spriteext_size) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x500000, 0x50ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x700000, 0x701fff) AM_WRITE(SMH_RAM) AM_BASE(&taito_sprite_ext) AM_SIZE(&taito_spriteext_size) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0480SCP_word_w) /* tilemaps */ AM_RANGE(0x830000, 0x83002f) AM_WRITE(TC0480SCP_ctrl_word_w) AM_RANGE(0x900000, 0x907fff) AM_WRITE(color_ram_word_w) AM_BASE(&color_ram) @@ -299,10 +299,10 @@ static ADDRESS_MAP_START( slapshot_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( opwolf3_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x500000, 0x50ffff) AM_READ(MRA16_RAM) /* main RAM */ - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM) /* sprite ram */ - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) /* debugging */ + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) + AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM) /* main RAM */ + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM) /* sprite ram */ + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) /* debugging */ AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0480SCP_word_r) /* tilemaps */ AM_RANGE(0x830000, 0x83002f) AM_READ(TC0480SCP_ctrl_word_r) AM_RANGE(0x900000, 0x907fff) AM_READ(color_ram_word_r) /* 8bpg palette */ @@ -314,10 +314,10 @@ static ADDRESS_MAP_START( opwolf3_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( opwolf3_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x500000, 0x50ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x600000, 0x60ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x700000, 0x701fff) AM_WRITE(MWA16_RAM) AM_BASE(&taito_sprite_ext) AM_SIZE(&taito_spriteext_size) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x500000, 0x50ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x700000, 0x701fff) AM_WRITE(SMH_RAM) AM_BASE(&taito_sprite_ext) AM_SIZE(&taito_spriteext_size) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0480SCP_word_w) /* tilemaps */ AM_RANGE(0x830000, 0x83002f) AM_WRITE(TC0480SCP_ctrl_word_w) AM_RANGE(0x900000, 0x907fff) AM_WRITE(color_ram_word_w) AM_BASE(&color_ram) @@ -331,29 +331,29 @@ ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK10) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index c92aca14357..329569f5c97 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -394,7 +394,7 @@ static ADDRESS_MAP_START( sliver_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x100001) AM_WRITE(sliver_RAMDAC_offset_w) AM_RANGE(0x100002, 0x100003) AM_WRITE(sliver_RAMDAC_color_w) - AM_RANGE(0x100004, 0x100005) AM_WRITE(MWA16_NOP)//RAMDAC + AM_RANGE(0x100004, 0x100005) AM_WRITE(SMH_NOP)//RAMDAC AM_RANGE(0x300002, 0x300003) AM_NOP // bit 0 tested, writes 0xe0 and 0xc0 - both r and w at the end of interrupt code diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index e3e9cddbcac..2dbb4d15c63 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -134,56 +134,56 @@ static WRITE16_HANDLER( sound_w ) /*******************************************************************************/ static ADDRESS_MAP_START( pow_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x043fff) AM_READ(SMH_RAM) AM_RANGE(0x080000, 0x080001) AM_READ(control_1_r) AM_RANGE(0x0c0000, 0x0c0001) AM_READ(control_2_r) - AM_RANGE(0x0e0000, 0x0e0001) AM_READ(MRA16_NOP) /* Watchdog or IRQ ack */ - AM_RANGE(0x0e8000, 0x0e8001) AM_READ(MRA16_NOP) /* Watchdog or IRQ ack */ + AM_RANGE(0x0e0000, 0x0e0001) AM_READ(SMH_NOP) /* Watchdog or IRQ ack */ + AM_RANGE(0x0e8000, 0x0e8001) AM_READ(SMH_NOP) /* Watchdog or IRQ ack */ AM_RANGE(0x0f0000, 0x0f0001) AM_READ(dip_1_r) AM_RANGE(0x0f0008, 0x0f0009) AM_READ(dip_2_r) AM_RANGE(0x100000, 0x100fff) AM_READ(pow_video16_r) AM_RANGE(0x200000, 0x207fff) AM_READ(pow_spriteram16_r) - AM_RANGE(0x400000, 0x400fff) AM_READ(MRA16_RAM) + AM_RANGE(0x400000, 0x400fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( pow_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x043fff) AM_WRITE(SMH_RAM) AM_RANGE(0x080000, 0x080001) AM_WRITE(sound_w) AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(pow_flipscreen16_w) - AM_RANGE(0x0f0008, 0x0f0009) AM_WRITE(MWA16_NOP) + AM_RANGE(0x0f0008, 0x0f0009) AM_WRITE(SMH_NOP) AM_RANGE(0x100000, 0x100fff) AM_WRITE(pow_video16_w) AM_BASE(&videoram16) - AM_RANGE(0x101000, 0x101fff) AM_WRITE(MWA16_NOP) // unknown register writes + AM_RANGE(0x101000, 0x101fff) AM_WRITE(SMH_NOP) // unknown register writes AM_RANGE(0x200000, 0x207fff) AM_WRITE(pow_spriteram16_w) AM_BASE(&spriteram16) AM_RANGE(0x400000, 0x400fff) AM_WRITE(pow_paletteram16_word_w) AM_BASE(&paletteram16) ADDRESS_MAP_END static ADDRESS_MAP_START( searchar_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x043fff) AM_READ(SMH_RAM) AM_RANGE(0x080000, 0x080005) AM_READ(protcontrols_r) /* Player 1 & 2 */ AM_RANGE(0x0c0000, 0x0c0001) AM_READ(rotary_1_r) /* Player 1 rotary */ AM_RANGE(0x0c8000, 0x0c8001) AM_READ(rotary_2_r) /* Player 2 rotary */ AM_RANGE(0x0d0000, 0x0d0001) AM_READ(rotary_lsb_r) /* Extra rotary bits */ - AM_RANGE(0x0e0000, 0x0e0001) AM_READ(MRA16_NOP) /* Watchdog or IRQ ack */ - AM_RANGE(0x0e8000, 0x0e8001) AM_READ(MRA16_NOP) /* Watchdog or IRQ ack */ + AM_RANGE(0x0e0000, 0x0e0001) AM_READ(SMH_NOP) /* Watchdog or IRQ ack */ + AM_RANGE(0x0e8000, 0x0e8001) AM_READ(SMH_NOP) /* Watchdog or IRQ ack */ AM_RANGE(0x0f0000, 0x0f0001) AM_READ(dip_1_r) AM_RANGE(0x0f0008, 0x0f0009) AM_READ(dip_2_r) AM_RANGE(0x0f8000, 0x0f8001) AM_READ(sound_cpu_r) AM_RANGE(0x100000, 0x107fff) AM_READ(pow_spriteram16_r) AM_RANGE(0x200000, 0x200fff) AM_READ(pow_video16_r) - AM_RANGE(0x300000, 0x33ffff) AM_READ(MRA16_BANK1) /* Extra code bank */ - AM_RANGE(0x400000, 0x400fff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x33ffff) AM_READ(SMH_BANK1) /* Extra code bank */ + AM_RANGE(0x400000, 0x400fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( searchar_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x043fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x043fff) AM_WRITE(SMH_RAM) AM_RANGE(0x080000, 0x080001) AM_WRITE(sound_w) AM_RANGE(0x080006, 0x080007) AM_WRITE(protection_w) /* top byte unknown, bottom is protection in ikari3 and streetsm */ AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(pow_flipscreen16_w) - AM_RANGE(0x0f0000, 0x0f0001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x0f0000, 0x0f0001) AM_WRITE(SMH_NOP) AM_RANGE(0x100000, 0x107fff) AM_WRITE(pow_spriteram16_w) AM_BASE(&spriteram16) AM_RANGE(0x200000, 0x200fff) AM_WRITE(pow_video16_w) AM_BASE(&videoram16) AM_RANGE(0x201000, 0x201fff) AM_WRITE(pow_video16_w) /* Mirror used by Ikari 3 */ @@ -193,14 +193,14 @@ ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static WRITE8_HANDLER( D7759_write_port_0_w ) diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c index 9292fc017a1..6c83977e6a1 100644 --- a/src/mame/drivers/snowbros.c +++ b/src/mame/drivers/snowbros.c @@ -161,37 +161,37 @@ static WRITE16_HANDLER( semicom_soundcmd_w ) /* Snow Bros Memory Map */ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x300001) AM_READ(snowbros_68000_sound_r) AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r) AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r) AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r) - AM_RANGE(0x600000, 0x6001ff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x6001ff) AM_READ(SMH_RAM) AM_RANGE(0x700000, 0x701fff) AM_READ(pandora_spriteram_LSB_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(snowbros_68000_sound_w) AM_RANGE(0x400000, 0x400001) AM_WRITE(snowbros_flipscreen_w) AM_RANGE(0x600000, 0x6001ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x700000, 0x701fff) AM_WRITE(pandora_spriteram_LSB_w) - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_NOP) /* IRQ 4 acknowledge? */ - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_NOP) /* IRQ 3 acknowledge? */ - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) /* IRQ 2 acknowledge? */ + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP) /* IRQ 4 acknowledge? */ + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_NOP) /* IRQ 3 acknowledge? */ + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* IRQ 2 acknowledge? */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -210,63 +210,63 @@ ADDRESS_MAP_END /* Winter Bobble - bootleg GFX chip */ static ADDRESS_MAP_START( wintbob_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x300001) AM_READ(snowbros_68000_sound_r) AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r) AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r) AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r) - AM_RANGE(0x600000, 0x6001ff) AM_READ(MRA16_RAM) - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x6001ff) AM_READ(SMH_RAM) + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( wintbob_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(snowbros_68000_sound_w) AM_RANGE(0x400000, 0x400001) AM_WRITE(snowbros_flipscreen_w) AM_RANGE(0x600000, 0x6001ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x700000, 0x701fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_NOP) /* IRQ 4 acknowledge? */ - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_NOP) /* IRQ 3 acknowledge? */ - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) /* IRQ 2 acknowledge? */ + AM_RANGE(0x700000, 0x701fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP) /* IRQ 4 acknowledge? */ + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_NOP) /* IRQ 3 acknowledge? */ + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* IRQ 2 acknowledge? */ ADDRESS_MAP_END /* Honey Dolls */ static ADDRESS_MAP_START( honeydol_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_RANGE(0x900000, 0x900001) AM_READ(input_port_0_word_r) AM_RANGE(0x900002, 0x900003) AM_READ(input_port_1_word_r) AM_RANGE(0x900004, 0x900005) AM_READ(input_port_2_word_r) - AM_RANGE(0xa00000, 0xa007ff) AM_READ(MRA16_RAM) - AM_RANGE(0xb00000, 0xb01fff) AM_READ(MRA16_RAM) + AM_RANGE(0xa00000, 0xa007ff) AM_READ(SMH_RAM) + AM_RANGE(0xb00000, 0xb01fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( honeydol_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) AM_BASE(&hyperpac_ram) - AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP) /* ?*/ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_BASE(&hyperpac_ram) + AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP) /* ?*/ AM_RANGE(0x300000, 0x300001) AM_WRITE(snowbros_68000_sound_w) /* ?*/ AM_RANGE(0xa00000, 0xa007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xb00000, 0xb01fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP) /* IRQ 4 acknowledge? */ - AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP) /* IRQ 3 acknowledge? */ - AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_NOP) /* IRQ 2 acknowledge? */ - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_NOP) /* ?*/ + AM_RANGE(0xb00000, 0xb01fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP) /* IRQ 4 acknowledge? */ + AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP) /* IRQ 3 acknowledge? */ + AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_NOP) /* IRQ 2 acknowledge? */ + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP) /* ?*/ ADDRESS_MAP_END static ADDRESS_MAP_START( honeydol_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xe010, 0xe010) AM_READ(OKIM6295_status_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( honeydol_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe010, 0xe010) AM_WRITE(OKIM6295_data_0_w) ADDRESS_MAP_END @@ -295,39 +295,39 @@ static WRITE16_HANDLER( twinadv_68000_sound_w ) } static ADDRESS_MAP_START( twinadv_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x300001) AM_READ(snowbros_68000_sound_r) AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r) AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r) AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r) - AM_RANGE(0x600000, 0x6001ff) AM_READ(MRA16_RAM) - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x6001ff) AM_READ(SMH_RAM) + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( twinadv_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(twinadv_68000_sound_w) AM_RANGE(0x400000, 0x400001) AM_WRITE(snowbros_flipscreen_w) AM_RANGE(0x600000, 0x6001ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x700000, 0x701fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_NOP) /* IRQ 4 acknowledge? */ - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_NOP) /* IRQ 3 acknowledge? */ - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) /* IRQ 2 acknowledge? */ + AM_RANGE(0x700000, 0x701fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP) /* IRQ 4 acknowledge? */ + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_NOP) /* IRQ 3 acknowledge? */ + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* IRQ 2 acknowledge? */ ADDRESS_MAP_END static ADDRESS_MAP_START( twinadv_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) // AM_RANGE(0xe010, 0xe010) AM_READ(OKIM6295_status_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( twinadv_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) // AM_RANGE(0xe010, 0xe010) AM_WRITE(OKIM6295_data_0_w) ADDRESS_MAP_END @@ -362,40 +362,40 @@ sound hardware is also different */ static ADDRESS_MAP_START( hyperpac_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r) AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r) AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r) - AM_RANGE(0x600000, 0x6001ff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x6001ff) AM_READ(SMH_RAM) AM_RANGE(0x700000, 0x701fff) AM_READ(pandora_spriteram_LSB_r) ADDRESS_MAP_END static ADDRESS_MAP_START( hyperpac_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) AM_BASE(&hyperpac_ram) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_BASE(&hyperpac_ram) AM_RANGE(0x300000, 0x300001) AM_WRITE(semicom_soundcmd_w) // AM_RANGE(0x400000, 0x400001) ??? AM_RANGE(0x600000, 0x6001ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x700000, 0x701fff) AM_WRITE(pandora_spriteram_LSB_w) - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_NOP) /* IRQ 4 acknowledge? */ - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_NOP) /* IRQ 3 acknowledge? */ - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) /* IRQ 2 acknowledge? */ + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP) /* IRQ 4 acknowledge? */ + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_NOP) /* IRQ 3 acknowledge? */ + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* IRQ 2 acknowledge? */ ADDRESS_MAP_END static ADDRESS_MAP_START( hyperpac_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xcfff) AM_READ(MRA8_ROM) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xcfff) AM_READ(SMH_ROM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) AM_RANGE(0xf001, 0xf001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( hyperpac_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xcfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xcfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(OKIM6295_data_0_w) @@ -513,53 +513,53 @@ static WRITE16_HANDLER( sb3_sound_w ) static ADDRESS_MAP_START( readmem3, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE( 0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE( 0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE( 0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE( 0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE( 0x300000, 0x300001) AM_READ(sb3_sound_r) // ? AM_RANGE( 0x500000, 0x500001) AM_READ(input_port_0_word_r) AM_RANGE( 0x500002, 0x500003) AM_READ(input_port_1_word_r) AM_RANGE( 0x500004, 0x500005) AM_READ(input_port_2_word_r) - AM_RANGE( 0x600000, 0x6003ff) AM_READ(MRA16_RAM) - AM_RANGE( 0x700000, 0x7021ff) AM_READ(MRA16_RAM) + AM_RANGE( 0x600000, 0x6003ff) AM_READ(SMH_RAM) + AM_RANGE( 0x700000, 0x7021ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem3, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE( 0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE( 0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE( 0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE( 0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE( 0x200000, 0x200001) AM_WRITE(watchdog_reset16_w) AM_RANGE( 0x300000, 0x300001) AM_WRITE(sb3_sound_w) // ? AM_RANGE( 0x400000, 0x400001) AM_WRITE(snowbros_flipscreen_w) AM_RANGE( 0x600000, 0x6003ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE (&paletteram16) - AM_RANGE( 0x700000, 0x7021ff) AM_WRITE(MWA16_RAM) AM_BASE( &spriteram16) AM_SIZE( &spriteram_size ) - AM_RANGE( 0x800000, 0x800001) AM_WRITE(MWA16_NOP) /* IRQ 4 acknowledge? */ - AM_RANGE( 0x900000, 0x900001) AM_WRITE(MWA16_NOP) /* IRQ 3 acknowledge? */ - AM_RANGE( 0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) /* IRQ 2 acknowledge? */ + AM_RANGE( 0x700000, 0x7021ff) AM_WRITE(SMH_RAM) AM_BASE( &spriteram16) AM_SIZE( &spriteram_size ) + AM_RANGE( 0x800000, 0x800001) AM_WRITE(SMH_NOP) /* IRQ 4 acknowledge? */ + AM_RANGE( 0x900000, 0x900001) AM_WRITE(SMH_NOP) /* IRQ 3 acknowledge? */ + AM_RANGE( 0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* IRQ 2 acknowledge? */ ADDRESS_MAP_END /* Final Tetris */ static ADDRESS_MAP_START( finalttr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r) AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r) AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r) - AM_RANGE(0x600000, 0x6001ff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x6001ff) AM_READ(SMH_RAM) AM_RANGE(0x700000, 0x701fff) AM_READ(pandora_spriteram_LSB_r) ADDRESS_MAP_END static ADDRESS_MAP_START( finalttr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&hyperpac_ram) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&hyperpac_ram) AM_RANGE(0x300000, 0x300001) AM_WRITE(semicom_soundcmd_w) // AM_RANGE(0x400000, 0x400001) ??? AM_RANGE(0x600000, 0x6001ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x700000, 0x701fff) AM_WRITE(pandora_spriteram_LSB_w) - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_NOP) /* IRQ 4 acknowledge? */ - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_NOP) /* IRQ 3 acknowledge? */ - AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) /* IRQ 2 acknowledge? */ + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP) /* IRQ 4 acknowledge? */ + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_NOP) /* IRQ 3 acknowledge? */ + AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* IRQ 2 acknowledge? */ ADDRESS_MAP_END static INPUT_PORTS_START( snowbros ) diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c index 3e011c432ec..bc2c128170b 100644 --- a/src/mame/drivers/solomon.c +++ b/src/mame/drivers/solomon.c @@ -53,12 +53,12 @@ static READ8_HANDLER( solomon_0xe603_r ) 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, 0xd3ff) AM_READWRITE(MRA8_RAM, solomon_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xd400, 0xd7ff) AM_READWRITE(MRA8_RAM, solomon_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xd800, 0xdbff) AM_READWRITE(MRA8_RAM, solomon_colorram2_w) AM_BASE(&solomon_colorram2) - AM_RANGE(0xdc00, 0xdfff) AM_READWRITE(MRA8_RAM, solomon_videoram2_w) AM_BASE(&solomon_videoram2) + AM_RANGE(0xd000, 0xd3ff) AM_READWRITE(SMH_RAM, solomon_colorram_w) AM_BASE(&colorram) + AM_RANGE(0xd400, 0xd7ff) AM_READWRITE(SMH_RAM, solomon_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xd800, 0xdbff) AM_READWRITE(SMH_RAM, solomon_colorram2_w) AM_BASE(&solomon_colorram2) + AM_RANGE(0xdc00, 0xdfff) AM_READWRITE(SMH_RAM, solomon_videoram2_w) AM_BASE(&solomon_videoram2) AM_RANGE(0xe000, 0xe07f) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xe400, 0xe5ff) AM_READWRITE(MRA8_RAM, paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) + AM_RANGE(0xe400, 0xe5ff) AM_READWRITE(SMH_RAM, paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) AM_RANGE(0xe600, 0xe600) AM_READ(input_port_0_r) AM_RANGE(0xe601, 0xe601) AM_READ(input_port_1_r) AM_RANGE(0xe602, 0xe602) AM_READ(input_port_2_r) @@ -75,7 +75,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r) - AM_RANGE(0xffff, 0xffff) AM_WRITE(MWA8_NOP) /* watchdog? */ + AM_RANGE(0xffff, 0xffff) AM_WRITE(SMH_NOP) /* watchdog? */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c index 98a1c0f8183..2b25da318c5 100644 --- a/src/mame/drivers/sonson.c +++ b/src/mame/drivers/sonson.c @@ -80,8 +80,8 @@ static WRITE8_HANDLER( sonson_sh_irqtrigger_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x17ff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) AM_RANGE(0x3002, 0x3002) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x3003, 0x3003) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0x3004, 0x3004) AM_READ(input_port_2_r) /* IN2 */ @@ -90,31 +90,31 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x1000, 0x13ff) AM_WRITE(sonson_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0x1400, 0x17ff) AM_WRITE(sonson_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x2020, 0x207f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x3000, 0x3000) AM_WRITE(MWA8_RAM) AM_BASE(&sonson_scroll) - AM_RANGE(0x3008, 0x3008) AM_WRITE(MWA8_NOP) + AM_RANGE(0x2020, 0x207f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x3000, 0x3000) AM_WRITE(SMH_RAM) AM_BASE(&sonson_scroll) + AM_RANGE(0x3008, 0x3008) AM_WRITE(SMH_NOP) AM_RANGE(0x3010, 0x3010) AM_WRITE(soundlatch_w) AM_RANGE(0x3018, 0x3018) AM_WRITE(sonson_flipscreen_w) AM_RANGE(0x3019, 0x3019) AM_WRITE(sonson_sh_irqtrigger_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x2001, 0x2001) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x4001, 0x4001) AM_WRITE(AY8910_write_port_1_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index 16f6a3d9d32..96e5f83e3f7 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -306,12 +306,12 @@ static ADDRESS_MAP_START( readwritemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x3000, 0x3fff) AM_ROM AM_RANGE(0x7000, 0x77ff) AM_RAM - AM_RANGE(0xc000, 0xdfff) AM_READWRITE(MRA8_RAM, zvideoram_w) AM_BASE(&videoram) - AM_RANGE(0xa000, 0xbfff) AM_READWRITE(spaceg_colorram_r, MWA8_RAM) AM_BASE(&unkram) + AM_RANGE(0xc000, 0xdfff) AM_READWRITE(SMH_RAM, zvideoram_w) AM_BASE(&videoram) + AM_RANGE(0xa000, 0xbfff) AM_READWRITE(spaceg_colorram_r, SMH_RAM) AM_BASE(&unkram) - AM_RANGE(0x9400, 0x9400) AM_WRITE(MWA8_RAM) AM_BASE(&io9400) /* gfx ctrl */ - AM_RANGE(0x9401, 0x9401) AM_WRITE(MWA8_RAM) AM_BASE(&io9401) /* gfx ctrl */ + AM_RANGE(0x9400, 0x9400) AM_WRITE(SMH_RAM) AM_BASE(&io9400) /* gfx ctrl */ + AM_RANGE(0x9401, 0x9401) AM_WRITE(SMH_RAM) AM_BASE(&io9401) /* gfx ctrl */ /* 9402 - bits 0 and 1 probably control the lamps under the player 1 and player 2 start buttons bit 3 is probably a flip screen diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c index 16a4b3d2cb0..03b5a489beb 100644 --- a/src/mame/drivers/spbactn.c +++ b/src/mame/drivers/spbactn.c @@ -145,12 +145,12 @@ static WRITE16_HANDLER( soundcommand_w ) } static ADDRESS_MAP_START( spbactn_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x40000, 0x43fff) AM_READ(MRA16_RAM) - AM_RANGE(0x50000, 0x50fff) AM_READ(MRA16_RAM) - AM_RANGE(0x60000, 0x67fff) AM_READ(MRA16_RAM) - AM_RANGE(0x70000, 0x77fff) AM_READ(MRA16_RAM) - AM_RANGE(0x80000, 0x82fff) AM_READ(MRA16_RAM) + AM_RANGE(0x00000, 0x3ffff) AM_READ(SMH_ROM) + AM_RANGE(0x40000, 0x43fff) AM_READ(SMH_RAM) + AM_RANGE(0x50000, 0x50fff) AM_READ(SMH_RAM) + AM_RANGE(0x60000, 0x67fff) AM_READ(SMH_RAM) + AM_RANGE(0x70000, 0x77fff) AM_READ(SMH_RAM) + AM_RANGE(0x80000, 0x82fff) AM_READ(SMH_RAM) AM_RANGE(0x90000, 0x90001) AM_READ(input_port_0_word_r) AM_RANGE(0x90010, 0x90011) AM_READ(input_port_1_word_r) AM_RANGE(0x90020, 0x90021) AM_READ(input_port_2_word_r) @@ -159,61 +159,61 @@ static ADDRESS_MAP_START( spbactn_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( spbactn_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000, 0x3ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x40000, 0x43fff) AM_WRITE(MWA16_RAM) // main ram - AM_RANGE(0x50000, 0x50fff) AM_WRITE(MWA16_RAM) AM_BASE(&spbactn_spvideoram) - AM_RANGE(0x60000, 0x67fff) AM_WRITE(MWA16_RAM) AM_BASE(&spbactn_fgvideoram) - AM_RANGE(0x70000, 0x77fff) AM_WRITE(MWA16_RAM) AM_BASE(&spbactn_bgvideoram) + AM_RANGE(0x00000, 0x3ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x40000, 0x43fff) AM_WRITE(SMH_RAM) // main ram + AM_RANGE(0x50000, 0x50fff) AM_WRITE(SMH_RAM) AM_BASE(&spbactn_spvideoram) + AM_RANGE(0x60000, 0x67fff) AM_WRITE(SMH_RAM) AM_BASE(&spbactn_fgvideoram) + AM_RANGE(0x70000, 0x77fff) AM_WRITE(SMH_RAM) AM_BASE(&spbactn_bgvideoram) AM_RANGE(0x80000, 0x827ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) /* this is an awful lot of unknowns */ - AM_RANGE(0x90000, 0x90001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x90000, 0x90001) AM_WRITE(SMH_NOP) AM_RANGE(0x90010, 0x90011) AM_WRITE(soundcommand_w) // AM_RANGE(0x90020, 0x90021) AM_WRITE(soundcommand_w) - AM_RANGE(0x90030, 0x90031) AM_WRITE(MWA16_NOP) + AM_RANGE(0x90030, 0x90031) AM_WRITE(SMH_NOP) - AM_RANGE(0x90080, 0x90081) AM_WRITE(MWA16_NOP) - AM_RANGE(0x90090, 0x90091) AM_WRITE(MWA16_NOP) - AM_RANGE(0x900a0, 0x900a1) AM_WRITE(MWA16_NOP) - AM_RANGE(0x900b0, 0x900b1) AM_WRITE(MWA16_NOP) - AM_RANGE(0x900c0, 0x900c1) AM_WRITE(MWA16_NOP) - AM_RANGE(0x900d0, 0x900d1) AM_WRITE(MWA16_NOP) - AM_RANGE(0x900e0, 0x900e1) AM_WRITE(MWA16_NOP) - AM_RANGE(0x900f0, 0x900f1) AM_WRITE(MWA16_NOP) + AM_RANGE(0x90080, 0x90081) AM_WRITE(SMH_NOP) + AM_RANGE(0x90090, 0x90091) AM_WRITE(SMH_NOP) + AM_RANGE(0x900a0, 0x900a1) AM_WRITE(SMH_NOP) + AM_RANGE(0x900b0, 0x900b1) AM_WRITE(SMH_NOP) + AM_RANGE(0x900c0, 0x900c1) AM_WRITE(SMH_NOP) + AM_RANGE(0x900d0, 0x900d1) AM_WRITE(SMH_NOP) + AM_RANGE(0x900e0, 0x900e1) AM_WRITE(SMH_NOP) + AM_RANGE(0x900f0, 0x900f1) AM_WRITE(SMH_NOP) - AM_RANGE(0xa0000, 0xa0001) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa0004, 0xa0005) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa0008, 0xa0009) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa000c, 0xa000d) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa0010, 0xa0011) AM_WRITE(MWA16_NOP) + AM_RANGE(0xa0000, 0xa0001) AM_WRITE(SMH_NOP) + AM_RANGE(0xa0004, 0xa0005) AM_WRITE(SMH_NOP) + AM_RANGE(0xa0008, 0xa0009) AM_WRITE(SMH_NOP) + AM_RANGE(0xa000c, 0xa000d) AM_WRITE(SMH_NOP) + AM_RANGE(0xa0010, 0xa0011) AM_WRITE(SMH_NOP) - AM_RANGE(0xa0100, 0xa0101) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa0104, 0xa0105) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa0108, 0xa0109) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa010c, 0xa010d) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa0110, 0xa0111) AM_WRITE(MWA16_NOP) + AM_RANGE(0xa0100, 0xa0101) AM_WRITE(SMH_NOP) + AM_RANGE(0xa0104, 0xa0105) AM_WRITE(SMH_NOP) + AM_RANGE(0xa0108, 0xa0109) AM_WRITE(SMH_NOP) + AM_RANGE(0xa010c, 0xa010d) AM_WRITE(SMH_NOP) + AM_RANGE(0xa0110, 0xa0111) AM_WRITE(SMH_NOP) - AM_RANGE(0xa0200, 0xa0201) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa0202, 0xa0203) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa0204, 0xa0205) AM_WRITE(MWA16_NOP) - AM_RANGE(0xa0206, 0xa0207) AM_WRITE(MWA16_NOP) + AM_RANGE(0xa0200, 0xa0201) AM_WRITE(SMH_NOP) + AM_RANGE(0xa0202, 0xa0203) AM_WRITE(SMH_NOP) + AM_RANGE(0xa0204, 0xa0205) AM_WRITE(SMH_NOP) + AM_RANGE(0xa0206, 0xa0207) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(OKIM6295_status_0_r) - AM_RANGE(0xfc00, 0xfc00) AM_READ(MRA8_NOP) /* irq ack ?? */ + AM_RANGE(0xfc00, 0xfc00) AM_READ(SMH_NOP) /* irq ack ?? */ AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0xf810, 0xf810) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0xf811, 0xf811) AM_WRITE(YM3812_write_port_0_w) - AM_RANGE(0xfc00, 0xfc00) AM_WRITE(MWA8_NOP) /* irq ack ?? */ + AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_NOP) /* irq ack ?? */ ADDRESS_MAP_END static INPUT_PORTS_START( spbactn ) diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c index e9e5ac3af20..0dfd4edf6ff 100644 --- a/src/mame/drivers/spcforce.c +++ b/src/mame/drivers/spcforce.c @@ -80,35 +80,35 @@ static WRITE8_HANDLER( spcforce_soundtrigger_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) AM_RANGE(0x7000, 0x7000) AM_READ(input_port_0_r) AM_RANGE(0x7001, 0x7001) AM_READ(input_port_1_r) AM_RANGE(0x7002, 0x7002) AM_READ(input_port_2_r) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x93ff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xa3ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xa3ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) AM_RANGE(0x7000, 0x7000) AM_WRITE(soundlatch_w) AM_RANGE(0x7001, 0x7001) AM_WRITE(spcforce_soundtrigger_w) AM_RANGE(0x700b, 0x700b) AM_WRITE(spcforce_flip_screen_w) AM_RANGE(0x700e, 0x700e) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x700f, 0x700f) AM_WRITE(MWA8_NOP) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x9000, 0x93ff) AM_WRITE(MWA8_RAM) AM_BASE(&colorram) - AM_RANGE(0xa000, 0xa3ff) AM_WRITE(MWA8_RAM) AM_BASE(&spcforce_scrollram) + AM_RANGE(0x700f, 0x700f) AM_WRITE(SMH_NOP) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x9000, 0x93ff) AM_WRITE(SMH_RAM) AM_BASE(&colorram) + AM_RANGE(0xa000, 0xa3ff) AM_WRITE(SMH_RAM) AM_BASE(&spcforce_scrollram) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index a7d8659a43a..ec0e7d76450 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -266,42 +266,42 @@ static READ8_HANDLER( port_0_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(port_0_r) AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r) /* DIPs */ AM_RANGE(0x3801, 0x3805) AM_READ(mcu63701_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1000, 0x10ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1000, 0x10ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x2000, 0x2fff) AM_WRITE(spdodgeb_videoram_w) AM_BASE(&spdodgeb_videoram) -// AM_RANGE(0x3000, 0x3000) AM_WRITE(MWA8_RAM) -// AM_RANGE(0x3001, 0x3001) AM_WRITE(MWA8_RAM) +// AM_RANGE(0x3000, 0x3000) AM_WRITE(SMH_RAM) +// AM_RANGE(0x3001, 0x3001) AM_WRITE(SMH_RAM) AM_RANGE(0x3002, 0x3002) AM_WRITE(sound_command_w) -// AM_RANGE(0x3003, 0x3003) AM_WRITE(MWA8_RAM) +// AM_RANGE(0x3003, 0x3003) AM_WRITE(SMH_RAM) AM_RANGE(0x3004, 0x3004) AM_WRITE(spdodgeb_scrollx_lo_w) -// AM_RANGE(0x3005, 0x3005) AM_WRITE(MWA8_RAM) /* mcu63701_output_w */ +// AM_RANGE(0x3005, 0x3005) AM_WRITE(SMH_RAM) /* mcu63701_output_w */ 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(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x2800, 0x2800) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0x2801, 0x2801) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0x3800, 0x3807) AM_WRITE(spd_adpcm_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c index 918ec50fe62..7ad89e87991 100644 --- a/src/mame/drivers/speedatk.c +++ b/src/mame/drivers/speedatk.c @@ -149,22 +149,22 @@ static READ8_HANDLER( read_8001 ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8000) AM_READ(key_matrix_r) AM_RANGE(0x8001, 0x8001) AM_READ(read_8001) - AM_RANGE(0x8588, 0x858f) AM_READ(MRA8_RAM) - AM_RANGE(0x8800, 0x8bff) AM_READ(MRA8_RAM) - AM_RANGE(0x8c00, 0x8fff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xa3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xb000, 0xb3ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8588, 0x858f) AM_READ(SMH_RAM) + AM_RANGE(0x8800, 0x8bff) AM_READ(SMH_RAM) + AM_RANGE(0x8c00, 0x8fff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xa3ff) AM_READ(SMH_RAM) + AM_RANGE(0xb000, 0xb3ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8000) AM_WRITE(key_matrix_w) - AM_RANGE(0x8588, 0x858f) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8800, 0x8bff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8c00, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x8588, 0x858f) AM_WRITE(SMH_RAM) + AM_RANGE(0x8800, 0x8bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8c00, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa3ff) AM_WRITE(speedatk_videoram_w) AM_BASE(&videoram) AM_RANGE(0xb000, 0xb3ff) AM_WRITE(speedatk_colorram_w) AM_BASE(&colorram) ADDRESS_MAP_END @@ -173,9 +173,9 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x40, 0x40) AM_READ(input_port_0_r) /* are these not used? after they're read it sets bit 7 */ - AM_RANGE(0x60, 0x60) AM_READ(MRA8_NOP) - AM_RANGE(0x61, 0x61) AM_READ(MRA8_NOP) - AM_RANGE(0x68, 0x68) AM_READ(MRA8_NOP) + AM_RANGE(0x60, 0x60) AM_READ(SMH_NOP) + AM_RANGE(0x61, 0x61) AM_READ(SMH_NOP) + AM_RANGE(0x68, 0x68) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c index db8ee11c7f9..89bab06212c 100644 --- a/src/mame/drivers/speedspn.c +++ b/src/mame/drivers/speedspn.c @@ -117,25 +117,25 @@ static WRITE8_HANDLER( oki_banking_w ) /* main cpu */ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8800, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0x8800, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x9fff) AM_READ(speedspn_vidram_r) /* banked? */ - AM_RANGE(0xa000, 0xa7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xa800, 0xafff) AM_READ(MRA8_RAM) - AM_RANGE(0xb000, 0xbfff) AM_READ(MRA8_RAM) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_BANK1) /* banked ROM */ + AM_RANGE(0xa000, 0xa7ff) AM_READ(SMH_RAM) + AM_RANGE(0xa800, 0xafff) AM_READ(SMH_RAM) + AM_RANGE(0xb000, 0xbfff) AM_READ(SMH_RAM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_BANK1) /* banked ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x87ff) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_BASE(&paletteram) /* RAM COLOUR */ AM_RANGE(0x8800, 0x8fff) AM_WRITE(speedspn_attram_w) AM_BASE(&speedspn_attram) AM_RANGE(0x9000, 0x9fff) AM_WRITE(speedspn_vidram_w) /* RAM FIX / RAM OBJECTS (selected by bit 0 of port 17) */ - AM_RANGE(0xa000, 0xa7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xa800, 0xafff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xb000, 0xbfff) AM_WRITE(MWA8_RAM) /* RAM PROGRAM */ - AM_RANGE(0xc000, 0xffff) AM_WRITE(MWA8_ROM) /* banked ROM */ + AM_RANGE(0xa000, 0xa7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa800, 0xafff) AM_WRITE(SMH_RAM) + AM_RANGE(0xb000, 0xbfff) AM_WRITE(SMH_RAM) /* RAM PROGRAM */ + AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) /* banked ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) @@ -160,15 +160,15 @@ ADDRESS_MAP_END /* sound cpu */ static ADDRESS_MAP_START( readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(oki_banking_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c index ad4e38ed312..4844d1d6295 100644 --- a/src/mame/drivers/speglsht.c +++ b/src/mame/drivers/speglsht.c @@ -157,7 +157,7 @@ static ADDRESS_MAP_START( speglsht_mem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x01800400, 0x01800403) AM_READ(input_port_1_dword_r) AM_RANGE(0x01a00000, 0x01afffff) AM_RAM AM_BASE(&speglsht_framebuffer) AM_RANGE(0x01b00000, 0x01b07fff) AM_RAM //cleared ... video related ? - AM_RANGE(0x01c00000, 0x01dfffff) AM_READ(MRA32_ROM) AM_WRITE(MWA32_ROM) AM_REGION(REGION_USER2, 0) + AM_RANGE(0x01c00000, 0x01dfffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_REGION(REGION_USER2, 0) AM_RANGE(0x0a000000, 0x0a003fff) AM_READWRITE(shared_r, shared_w) AM_RANGE(0x1eff0000, 0x1eff001f) AM_RAM AM_RANGE(0x1eff003c, 0x1eff003f) AM_READNOP //interrupt related diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c index 977646da74a..7ec31346bfd 100644 --- a/src/mame/drivers/splash.c +++ b/src/mame/drivers/splash.c @@ -86,18 +86,18 @@ static WRITE16_HANDLER( roldf_sh_irqtrigger_w ) } static ADDRESS_MAP_START( splash_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x3fffff) AM_READ(MRA16_ROM) /* ROM */ - AM_RANGE(0x800000, 0x83ffff) AM_READ(MRA16_RAM) /* Pixel Layer */ + AM_RANGE(0x000000, 0x3fffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x800000, 0x83ffff) AM_READ(SMH_RAM) /* Pixel Layer */ AM_RANGE(0x840000, 0x840001) AM_READ(input_port_0_word_r)/* DIPSW #1 */ AM_RANGE(0x840002, 0x840003) AM_READ(input_port_1_word_r)/* DIPSW #2 */ AM_RANGE(0x840004, 0x840005) AM_READ(input_port_2_word_r)/* INPUT #1 */ AM_RANGE(0x840006, 0x840007) AM_READ(input_port_3_word_r)/* INPUT #2 */ AM_RANGE(0x880000, 0x8817ff) AM_READ(splash_vram_r) /* Video RAM */ - AM_RANGE(0x881800, 0x881803) AM_READ(MRA16_RAM) /* Scroll registers */ - AM_RANGE(0x881804, 0x881fff) AM_READ(MRA16_RAM) /* Work RAM */ - AM_RANGE(0x8c0000, 0x8c0fff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x900000, 0x900fff) AM_READ(MRA16_RAM) /* Sprite RAM */ - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0x881800, 0x881803) AM_READ(SMH_RAM) /* Scroll registers */ + AM_RANGE(0x881804, 0x881fff) AM_READ(SMH_RAM) /* Work RAM */ + AM_RANGE(0x8c0000, 0x8c0fff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x900000, 0x900fff) AM_READ(SMH_RAM) /* Sprite RAM */ + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static WRITE16_HANDLER( splash_coin_w ) @@ -117,24 +117,24 @@ static WRITE16_HANDLER( splash_coin_w ) } static ADDRESS_MAP_START( splash_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x3fffff) AM_WRITE(MWA16_ROM) /* ROM */ - AM_RANGE(0x800000, 0x83ffff) AM_WRITE(MWA16_RAM) AM_BASE(&splash_pixelram) /* Pixel Layer */ + AM_RANGE(0x000000, 0x3fffff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x800000, 0x83ffff) AM_WRITE(SMH_RAM) AM_BASE(&splash_pixelram) /* Pixel Layer */ AM_RANGE(0x84000e, 0x84000f) AM_WRITE(splash_sh_irqtrigger_w) /* Sound command */ AM_RANGE(0x84000a, 0x84003b) AM_WRITE(splash_coin_w) /* Coin Counters + Coin Lockout */ AM_RANGE(0x880000, 0x8817ff) AM_WRITE(splash_vram_w) AM_BASE(&splash_videoram) /* Video RAM */ - AM_RANGE(0x881800, 0x881803) AM_WRITE(MWA16_RAM) AM_BASE(&splash_vregs) /* Scroll registers */ - AM_RANGE(0x881804, 0x881fff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0x881800, 0x881803) AM_WRITE(SMH_RAM) AM_BASE(&splash_vregs) /* Scroll registers */ + AM_RANGE(0x881804, 0x881fff) AM_WRITE(SMH_RAM) /* Work RAM */ AM_RANGE(0x8c0000, 0x8c0fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)/* Palette is xRRRRxGGGGxBBBBx */ - AM_RANGE(0x900000, 0x900fff) AM_WRITE(MWA16_RAM) AM_BASE(&splash_spriteram) /* Sprite RAM */ - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0x900000, 0x900fff) AM_WRITE(SMH_RAM) AM_BASE(&splash_spriteram) /* Sprite RAM */ + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( splash_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xd7ff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x0000, 0xd7ff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r) /* Sound latch */ AM_RANGE(0xf000, 0xf000) AM_READ(YM3812_status_port_0_r) /* YM3812 */ - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) /* RAM */ ADDRESS_MAP_END static int adpcm_data; @@ -151,12 +151,12 @@ static void splash_msm5205_int(int data) static ADDRESS_MAP_START( splash_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xd7ff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x0000, 0xd7ff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0xd800, 0xd800) AM_WRITE(splash_adpcm_data_w) /* ADPCM data for the MSM5205 chip */ -// AM_RANGE(0xe000, 0xe000) AM_WRITE(MWA8_NOP) /* ??? */ +// AM_RANGE(0xe000, 0xe000) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xf000, 0xf000) AM_WRITE(YM3812_control_port_0_w) /* YM3812 */ AM_RANGE(0xf001, 0xf001) AM_WRITE(YM3812_write_port_0_w) /* YM3812 */ - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) /* RAM */ ADDRESS_MAP_END /* Return of Lady Frog Maps */ @@ -171,36 +171,36 @@ static READ16_HANDLER( roldfrog_bombs_r ) } static ADDRESS_MAP_START( roldfrog_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x3fffff) AM_READ(MRA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x3fffff) AM_READ(SMH_ROM) /* ROM */ AM_RANGE(0x400000, 0x407fff) AM_ROM AM_BASE(&roldfrog_protdata) /* Protection Data */ - AM_RANGE(0x408000, 0x4087ff) AM_READ(MRA16_RAM) /* Extra Ram */ - AM_RANGE(0x800000, 0x83ffff) AM_READ(MRA16_RAM) /* Pixel Layer */ + AM_RANGE(0x408000, 0x4087ff) AM_READ(SMH_RAM) /* Extra Ram */ + AM_RANGE(0x800000, 0x83ffff) AM_READ(SMH_RAM) /* Pixel Layer */ AM_RANGE(0x840000, 0x840001) AM_READ(input_port_0_word_r)/* DIPSW #1 */ AM_RANGE(0x840002, 0x840003) AM_READ(input_port_1_word_r)/* DIPSW #2 */ AM_RANGE(0x840004, 0x840005) AM_READ(input_port_2_word_r)/* INPUT #1 */ AM_RANGE(0x840006, 0x840007) AM_READ(input_port_3_word_r)/* INPUT #2 */ AM_RANGE(0x880000, 0x8817ff) AM_READ(splash_vram_r) /* Video RAM */ - AM_RANGE(0x881800, 0x881803) AM_READ(MRA16_RAM) /* Scroll registers */ - AM_RANGE(0x881804, 0x881fff) AM_READ(MRA16_RAM) /* Work RAM */ - AM_RANGE(0x8c0000, 0x8c0fff) AM_READ(MRA16_RAM) /* Palette */ + AM_RANGE(0x881800, 0x881803) AM_READ(SMH_RAM) /* Scroll registers */ + AM_RANGE(0x881804, 0x881fff) AM_READ(SMH_RAM) /* Work RAM */ + AM_RANGE(0x8c0000, 0x8c0fff) AM_READ(SMH_RAM) /* Palette */ AM_RANGE(0xa00000, 0xa00001) AM_READ(roldfrog_bombs_r) - AM_RANGE(0xd00000, 0xd00fff) AM_READ(MRA16_RAM) /* Sprite RAM */ - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0xd00000, 0xd00fff) AM_READ(SMH_RAM) /* Sprite RAM */ + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( roldfrog_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x3fffff) AM_WRITE(MWA16_ROM) /* ROM */ - AM_RANGE(0x408000, 0x4087ff) AM_WRITE(MWA16_RAM) /* Extra Ram */ - AM_RANGE(0x800000, 0x83ffff) AM_WRITE(MWA16_RAM) AM_BASE(&splash_pixelram) /* Pixel Layer */ + AM_RANGE(0x000000, 0x3fffff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x408000, 0x4087ff) AM_WRITE(SMH_RAM) /* Extra Ram */ + AM_RANGE(0x800000, 0x83ffff) AM_WRITE(SMH_RAM) AM_BASE(&splash_pixelram) /* Pixel Layer */ AM_RANGE(0x84000e, 0x84000f) AM_WRITE(roldf_sh_irqtrigger_w) /* Sound command */ AM_RANGE(0x84000a, 0x84003b) AM_WRITE(splash_coin_w) /* Coin Counters + Coin Lockout */ AM_RANGE(0x880000, 0x8817ff) AM_WRITE(splash_vram_w) AM_BASE(&splash_videoram) /* Video RAM */ - AM_RANGE(0x881800, 0x881803) AM_WRITE(MWA16_RAM) AM_BASE(&splash_vregs) /* Scroll registers */ - AM_RANGE(0x881804, 0x881fff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0x881800, 0x881803) AM_WRITE(SMH_RAM) AM_BASE(&splash_vregs) /* Scroll registers */ + AM_RANGE(0x881804, 0x881fff) AM_WRITE(SMH_RAM) /* Work RAM */ AM_RANGE(0x8c0000, 0x8c0fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)/* Palette is xRRRRxGGGGxBBBBx */ - AM_RANGE(0xd00000, 0xd00fff) AM_WRITE(MWA16_RAM) AM_BASE(&splash_spriteram) /* Sprite RAM */ - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_RAM) AM_BASE(&roldfrog_bitmap_mode) /* Bitmap Mode? */ - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0xd00000, 0xd00fff) AM_WRITE(SMH_RAM) AM_BASE(&splash_spriteram) /* Sprite RAM */ + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_RAM) AM_BASE(&roldfrog_bitmap_mode) /* Bitmap Mode? */ + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END @@ -221,33 +221,33 @@ static ADDRESS_MAP_START( roldf_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( funystrp_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) /* ROM */ - AM_RANGE(0x100000, 0x100fff) AM_READ(MRA16_ROM) /* protection? RAM */ - AM_RANGE(0x800000, 0x83ffff) AM_READ(MRA16_RAM) /* Pixel Layer */ + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_ROM) /* protection? RAM */ + AM_RANGE(0x800000, 0x83ffff) AM_READ(SMH_RAM) /* Pixel Layer */ AM_RANGE(0x840000, 0x840001) AM_READ(input_port_0_word_r)/* DIPSW #1 */ AM_RANGE(0x840002, 0x840003) AM_READ(input_port_1_word_r)/* DIPSW #2 */ AM_RANGE(0x840004, 0x840005) AM_READ(input_port_2_word_r)/* INPUT #1 */ AM_RANGE(0x840006, 0x840007) AM_READ(input_port_3_word_r)/* INPUT #2 */ AM_RANGE(0x880000, 0x8817ff) AM_READ(splash_vram_r) /* Video RAM */ - AM_RANGE(0x881800, 0x881803) AM_READ(MRA16_RAM) /* Scroll registers */ - AM_RANGE(0x881804, 0x881fff) AM_READ(MRA16_RAM) /* Work RAM */ - AM_RANGE(0x8c0000, 0x8c0fff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0xD00000, 0xD01fff) AM_READ(MRA16_RAM) /* Sprite RAM */ - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* Work RAM */ + AM_RANGE(0x881800, 0x881803) AM_READ(SMH_RAM) /* Scroll registers */ + AM_RANGE(0x881804, 0x881fff) AM_READ(SMH_RAM) /* Work RAM */ + AM_RANGE(0x8c0000, 0x8c0fff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0xD00000, 0xD01fff) AM_READ(SMH_RAM) /* Sprite RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( funystrp_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) /* ROM */ - AM_RANGE(0x100000, 0x100fff) AM_WRITE(MWA16_RAM) /* protection? RAM */ - AM_RANGE(0x800000, 0x83ffff) AM_WRITE(MWA16_RAM) AM_BASE(&splash_pixelram) /* Pixel Layer */ + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x100000, 0x100fff) AM_WRITE(SMH_RAM) /* protection? RAM */ + AM_RANGE(0x800000, 0x83ffff) AM_WRITE(SMH_RAM) AM_BASE(&splash_pixelram) /* Pixel Layer */ // AM_RANGE(0x84000e, 0x84000f) AM_WRITE(splash_sh_irqtrigger_w) /* Sound command */ AM_RANGE(0x84000a, 0x84003b) AM_WRITE(splash_coin_w) /* Coin Counters + Coin Lockout */ AM_RANGE(0x880000, 0x8817ff) AM_WRITE(splash_vram_w) AM_BASE(&splash_videoram) /* Video RAM */ - AM_RANGE(0x881800, 0x881803) AM_WRITE(MWA16_RAM) AM_BASE(&splash_vregs) /* Scroll registers */ - AM_RANGE(0x881804, 0x881fff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0x881800, 0x881803) AM_WRITE(SMH_RAM) AM_BASE(&splash_vregs) /* Scroll registers */ + AM_RANGE(0x881804, 0x881fff) AM_WRITE(SMH_RAM) /* Work RAM */ AM_RANGE(0x8c0000, 0x8c0fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)/* Palette is xRRRRxGGGGxBBBBx */ - AM_RANGE(0xd00000, 0xd01fff) AM_WRITE(MWA16_RAM) AM_BASE(&splash_spriteram) /* Sprite RAM */ - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) /* Work RAM */ + AM_RANGE(0xd00000, 0xd01fff) AM_WRITE(SMH_RAM) AM_BASE(&splash_spriteram) /* Sprite RAM */ + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) /* Work RAM */ ADDRESS_MAP_END static INPUT_PORTS_START( splash ) diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index 4352e80813c..4b70bb85a59 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -121,21 +121,21 @@ static WRITE8_HANDLER( sprcros2_s_port3_w ) } static ADDRESS_MAP_START( sprcros2_m_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xe000, 0xf7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) //shared with slave cpu + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_BANK1) + AM_RANGE(0xe000, 0xf7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) //shared with slave cpu ADDRESS_MAP_END static ADDRESS_MAP_START( sprcros2_m_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_BANK1) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_BANK1) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(sprcros2_fgvideoram_w) AM_BASE(&sprcros2_fgvideoram) - AM_RANGE(0xe800, 0xe817) AM_WRITE(MWA8_RAM) //always zero - AM_RANGE(0xe818, 0xe83f) AM_WRITE(MWA8_RAM) AM_BASE(&sprcros2_spriteram) AM_SIZE(&sprcros2_spriteram_size) - AM_RANGE(0xe840, 0xefff) AM_WRITE(MWA8_RAM) //always zero - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&sprcros2_sharedram) //shared with slave cpu + AM_RANGE(0xe800, 0xe817) AM_WRITE(SMH_RAM) //always zero + AM_RANGE(0xe818, 0xe83f) AM_WRITE(SMH_RAM) AM_BASE(&sprcros2_spriteram) AM_SIZE(&sprcros2_spriteram_size) + AM_RANGE(0xe840, 0xefff) AM_WRITE(SMH_RAM) //always zero + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&sprcros2_sharedram) //shared with slave cpu ADDRESS_MAP_END static ADDRESS_MAP_START( sprcros2_m_readport, ADDRESS_SPACE_IO, 8 ) @@ -156,20 +156,20 @@ static ADDRESS_MAP_START( sprcros2_m_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sprcros2_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_BANK2) - AM_RANGE(0xe000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_BANK2) + AM_RANGE(0xe000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xffff) AM_READ(sprcros2_sharedram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sprcros2_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_BANK2) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_BANK2) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(sprcros2_bgvideoram_w) AM_BASE(&sprcros2_bgvideoram) - AM_RANGE(0xe800, 0xefff) AM_WRITE(MWA8_RAM) //always zero - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe800, 0xefff) AM_WRITE(SMH_RAM) //always zero + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf800, 0xffff) AM_WRITE(sprcros2_sharedram_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c index ffd6b27118a..deadd2a4a63 100644 --- a/src/mame/drivers/sprint2.c +++ b/src/mame/drivers/sprint2.c @@ -246,7 +246,7 @@ static WRITE8_HANDLER( sprint2_lamp2_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_READ(sprint2_wram_r) - AM_RANGE(0x0400, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0400, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x0818, 0x081f) AM_READ(sprint2_input_A_r) AM_RANGE(0x0828, 0x082f) AM_READ(sprint2_input_B_r) AM_RANGE(0x0830, 0x0837) AM_READ(sprint2_dip_r) @@ -256,9 +256,9 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0c00, 0x0fff) AM_READ(sprint2_sync_r) AM_RANGE(0x1000, 0x13ff) AM_READ(sprint2_collision1_r) AM_RANGE(0x1400, 0x17ff) AM_READ(sprint2_collision2_r) - AM_RANGE(0x1800, 0x1800) AM_READ(MRA8_NOP) /* debugger ROM location? */ - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x1800, 0x1800) AM_READ(SMH_NOP) /* debugger ROM location? */ + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -270,15 +270,15 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0c20, 0x0c2f) AM_WRITE(sprint2_skid2_w) AM_RANGE(0x0c30, 0x0c3f) AM_WRITE(sprint2_lamp1_w) AM_RANGE(0x0c40, 0x0c4f) AM_WRITE(sprint2_lamp2_w) - AM_RANGE(0x0c60, 0x0c6f) AM_WRITE(MWA8_NOP) /* SPARE */ + AM_RANGE(0x0c60, 0x0c6f) AM_WRITE(SMH_NOP) /* SPARE */ AM_RANGE(0x0c80, 0x0cff) AM_WRITE(watchdog_reset_w) AM_RANGE(0x0d00, 0x0d7f) AM_WRITE(sprint2_collision_reset1_w) AM_RANGE(0x0d80, 0x0dff) AM_WRITE(sprint2_collision_reset2_w) AM_RANGE(0x0e00, 0x0e7f) AM_WRITE(sprint2_steering_reset1_w) AM_RANGE(0x0e80, 0x0eff) AM_WRITE(sprint2_steering_reset2_w) AM_RANGE(0x0f00, 0x0f7f) AM_WRITE(sprint2_noise_reset_w) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c index 70bc7caa0ad..2f7d7606e54 100644 --- a/src/mame/drivers/sprint4.c +++ b/src/mame/drivers/sprint4.c @@ -241,7 +241,7 @@ static ADDRESS_MAP_START( sprint4_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x700) AM_READWRITE(sprint4_wram_r, sprint4_wram_w) - AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x400) AM_READWRITE(MRA8_RAM, sprint4_video_ram_w) AM_BASE(&videoram) + AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x400) AM_READWRITE(SMH_RAM, sprint4_video_ram_w) AM_BASE(&videoram) AM_RANGE(0x0000, 0x0007) AM_MIRROR(0x718) AM_READ(sprint4_analog_r) AM_RANGE(0x0020, 0x0027) AM_MIRROR(0x718) AM_READ(sprint4_coin_r) diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c index 598e0810a6e..f9dce70d956 100644 --- a/src/mame/drivers/sprint8.c +++ b/src/mame/drivers/sprint8.c @@ -112,35 +112,35 @@ static WRITE8_HANDLER( sprint8_motor_w ) {} static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x00ff) AM_READ(SMH_RAM) AM_RANGE(0x1c00, 0x1c00) AM_READ(sprint8_collision_r) AM_RANGE(0x1c01, 0x1c08) AM_READ(sprint8_input_r) AM_RANGE(0x1c09, 0x1c09) AM_READ(input_port_16_r) AM_RANGE(0x1c0a, 0x1c0a) AM_READ(input_port_17_r) AM_RANGE(0x1c0f, 0x1c0f) AM_READ(input_port_18_r) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x00ff) AM_WRITE(SMH_RAM) AM_RANGE(0x1800, 0x1bff) AM_WRITE(sprint8_video_ram_w) AM_BASE(&sprint8_video_ram) - AM_RANGE(0x1c00, 0x1c0f) AM_WRITE(MWA8_RAM) AM_BASE(&sprint8_pos_h_ram) - AM_RANGE(0x1c10, 0x1c1f) AM_WRITE(MWA8_RAM) AM_BASE(&sprint8_pos_v_ram) - AM_RANGE(0x1c20, 0x1c2f) AM_WRITE(MWA8_RAM) AM_BASE(&sprint8_pos_d_ram) + AM_RANGE(0x1c00, 0x1c0f) AM_WRITE(SMH_RAM) AM_BASE(&sprint8_pos_h_ram) + AM_RANGE(0x1c10, 0x1c1f) AM_WRITE(SMH_RAM) AM_BASE(&sprint8_pos_v_ram) + AM_RANGE(0x1c20, 0x1c2f) AM_WRITE(SMH_RAM) AM_BASE(&sprint8_pos_d_ram) AM_RANGE(0x1c30, 0x1c37) AM_WRITE(sprint8_lockout_w) AM_RANGE(0x1d00, 0x1d00) AM_WRITE(sprint8_int_reset_w) AM_RANGE(0x1d01, 0x1d01) AM_WRITE(sprint8_crash_w) AM_RANGE(0x1d02, 0x1d02) AM_WRITE(sprint8_explosion_w) AM_RANGE(0x1d03, 0x1d03) AM_WRITE(sprint8_bugle_w) AM_RANGE(0x1d04, 0x1d04) AM_WRITE(sprint8_bug_w) - AM_RANGE(0x1d05, 0x1d05) AM_WRITE(MWA8_RAM) AM_BASE(&sprint8_team) + AM_RANGE(0x1d05, 0x1d05) AM_WRITE(SMH_RAM) AM_BASE(&sprint8_team) AM_RANGE(0x1d06, 0x1d06) AM_WRITE(sprint8_attract_w) AM_RANGE(0x1e00, 0x1e07) AM_WRITE(sprint8_motor_w) - AM_RANGE(0x1f00, 0x1f00) AM_WRITE(MWA8_NOP) /* probably a watchdog, disabled in service mode */ - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x1f00, 0x1f00) AM_WRITE(SMH_NOP) /* probably a watchdog, disabled in service mode */ + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index a02eac4bab0..1fcc43bcc5d 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -352,33 +352,33 @@ static WRITE8_HANDLER( sound_bank_w ) static ADDRESS_MAP_START( spy_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(spy_bankedram1_r) - AM_RANGE(0x0800, 0x1aff) AM_READ(MRA8_RAM) + AM_RANGE(0x0800, 0x1aff) AM_READ(SMH_RAM) AM_RANGE(0x3fd0, 0x3fd0) AM_READ(input_port_4_r) AM_RANGE(0x3fd1, 0x3fd1) AM_READ(input_port_0_r) AM_RANGE(0x3fd2, 0x3fd2) AM_READ(input_port_1_r) AM_RANGE(0x3fd3, 0x3fd3) AM_READ(input_port_2_r) AM_RANGE(0x3fe0, 0x3fe0) AM_READ(input_port_3_r) AM_RANGE(0x2000, 0x5fff) AM_READ(K052109_051960_r) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( spy_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(spy_bankedram1_w) AM_BASE(&ram) - AM_RANGE(0x0800, 0x1aff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0800, 0x1aff) AM_WRITE(SMH_RAM) AM_RANGE(0x3f80, 0x3f80) AM_WRITE(bankswitch_w) AM_RANGE(0x3f90, 0x3f90) AM_WRITE(spy_3f90_w) AM_RANGE(0x3fa0, 0x3fa0) AM_WRITE(watchdog_reset_w) AM_RANGE(0x3fb0, 0x3fb0) AM_WRITE(soundlatch_w) AM_RANGE(0x3fc0, 0x3fc0) AM_WRITE(spy_sh_irqtrigger_w) AM_RANGE(0x2000, 0x5fff) AM_WRITE(K052109_051960_w) - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( spy_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa00d) AM_READ(K007232_read_port_0_r) AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_1_r) AM_RANGE(0xc000, 0xc000) AM_READ(YM3812_status_port_0_r) @@ -386,8 +386,8 @@ static ADDRESS_MAP_START( spy_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( spy_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(sound_bank_w) AM_RANGE(0xa000, 0xa00d) AM_WRITE(K007232_write_port_0_w) AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_1_w) diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index a2c76540250..fe9bb968eeb 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -384,10 +384,10 @@ static WRITE8_HANDLER( srmp3_rombank_w ) static ADDRESS_MAP_START( srmp2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x143fff) AM_READ(MRA16_RAM) /* Sprites Code + X + Attr */ - AM_RANGE(0x180000, 0x180607) AM_READ(MRA16_RAM) /* Sprites Y */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x143fff) AM_READ(SMH_RAM) /* Sprites Code + X + Attr */ + AM_RANGE(0x180000, 0x180607) AM_READ(SMH_RAM) /* Sprites Y */ AM_RANGE(0x900000, 0x900001) AM_READ(input_port_0_word_r) /* Coinage */ AM_RANGE(0xa00000, 0xa00001) AM_READ(srmp2_input_1_r) /* I/O port 1 */ AM_RANGE(0xa00002, 0xa00003) AM_READ(srmp2_input_2_r) /* I/O port 2 */ @@ -397,47 +397,47 @@ static ADDRESS_MAP_START( srmp2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( srmp2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x140000, 0x143fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) /* Sprites Code + X + Attr */ - AM_RANGE(0x180000, 0x180609) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) /* Sprites Y */ - AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x0c0000, 0x0c3fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x140000, 0x143fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) /* Sprites Code + X + Attr */ + AM_RANGE(0x180000, 0x180609) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) /* Sprites Y */ + AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x800000, 0x800001) AM_WRITE(srmp2_flags_w) /* ADPCM bank, Color bank, etc. */ - AM_RANGE(0x900000, 0x900001) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xa00000, 0xa00001) AM_WRITE(srmp2_input_1_w) /* I/O ??? */ AM_RANGE(0xa00002, 0xa00003) AM_WRITE(srmp2_input_2_w) /* I/O ??? */ AM_RANGE(0xb00000, 0xb00001) AM_WRITE(srmp2_adpcm_code_w) /* ADPCM number */ - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_NOP) /* ??? */ - AM_RANGE(0xd00000, 0xd00001) AM_WRITE(MWA16_NOP) /* ??? */ - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0xd00000, 0xd00001) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xf00000, 0xf00001) AM_WRITE(AY8910_control_port_0_lsb_w) AM_RANGE(0xf00002, 0xf00003) AM_WRITE(AY8910_write_port_0_lsb_w) ADDRESS_MAP_END static ADDRESS_MAP_START( mjyuugi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r) /* Coinage */ - AM_RANGE(0x100010, 0x100011) AM_READ(MRA16_NOP) /* ??? */ - AM_RANGE(0x200000, 0x200001) AM_READ(MRA16_NOP) /* ??? */ - AM_RANGE(0x300000, 0x300001) AM_READ(MRA16_NOP) /* ??? */ + AM_RANGE(0x100010, 0x100011) AM_READ(SMH_NOP) /* ??? */ + AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP) /* ??? */ + AM_RANGE(0x300000, 0x300001) AM_READ(SMH_NOP) /* ??? */ AM_RANGE(0x500000, 0x500001) AM_READ(input_port_8_word_r) /* DSW 3-1 */ AM_RANGE(0x500010, 0x500011) AM_READ(input_port_9_word_r) /* DSW 3-2 */ - AM_RANGE(0x700000, 0x7003ff) AM_READ(MRA16_RAM) - AM_RANGE(0x800000, 0x800001) AM_READ(MRA16_NOP) /* ??? */ + AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM) + AM_RANGE(0x800000, 0x800001) AM_READ(SMH_NOP) /* ??? */ AM_RANGE(0x900000, 0x900001) AM_READ(srmp2_input_1_r) /* I/O port 1 */ AM_RANGE(0x900002, 0x900003) AM_READ(srmp2_input_2_r) /* I/O port 2 */ AM_RANGE(0xa00000, 0xa00001) AM_READ(srmp2_cchip_status_0_r) /* custom chip status ??? */ AM_RANGE(0xa00002, 0xa00003) AM_READ(srmp2_cchip_status_1_r) /* custom chip status ??? */ AM_RANGE(0xb00000, 0xb00001) AM_READ(AY8910_read_port_0_lsb_r) - AM_RANGE(0xd00000, 0xd00609) AM_READ(MRA16_RAM) /* Sprites Y */ - AM_RANGE(0xd02000, 0xd023ff) AM_READ(MRA16_RAM) /* ??? */ - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM) /* Sprites Code + X + Attr */ - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xd00000, 0xd00609) AM_READ(SMH_RAM) /* Sprites Y */ + AM_RANGE(0xd02000, 0xd023ff) AM_READ(SMH_RAM) /* ??? */ + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM) /* Sprites Code + X + Attr */ + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( mjyuugi_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(mjyuugi_flags_w) /* Coin Counter */ AM_RANGE(0x100010, 0x100011) AM_WRITE(mjyuugi_adpcm_bank_w) /* ADPCM bank, GFX bank */ AM_RANGE(0x700000, 0x7003ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) @@ -446,11 +446,11 @@ static ADDRESS_MAP_START( mjyuugi_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa00001) AM_WRITE(srmp2_adpcm_code_w) /* ADPCM number */ AM_RANGE(0xb00000, 0xb00001) AM_WRITE(AY8910_control_port_0_lsb_w) AM_RANGE(0xb00002, 0xb00003) AM_WRITE(AY8910_write_port_0_lsb_w) - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_NOP) /* ??? */ - AM_RANGE(0xd00000, 0xd00609) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) /* Sprites Y */ - AM_RANGE(0xd02000, 0xd023ff) AM_WRITE(MWA16_RAM) /* ??? only writes $00fa */ - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) /* Sprites Code + X + Attr */ - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0xd00000, 0xd00609) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) /* Sprites Y */ + AM_RANGE(0xd02000, 0xd023ff) AM_WRITE(SMH_RAM) /* ??? only writes $00fa */ + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) /* Sprites Code + X + Attr */ + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) ADDRESS_MAP_END @@ -561,23 +561,23 @@ static WRITE8_HANDLER( srmp3_flags_w ) static ADDRESS_MAP_START( srmp3_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK1) /* rom bank */ - AM_RANGE(0xa000, 0xa7ff) AM_READ(MRA8_RAM) /* work ram */ - AM_RANGE(0xb000, 0xb303) AM_READ(MRA8_RAM) /* Sprites Y */ - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) /* Sprites Code + X + Attr */ - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK1) /* rom bank */ + AM_RANGE(0xa000, 0xa7ff) AM_READ(SMH_RAM) /* work ram */ + AM_RANGE(0xb000, 0xb303) AM_READ(SMH_RAM) /* Sprites Y */ + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) /* Sprites Code + X + Attr */ + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( srmp3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_ROM) /* rom bank */ - AM_RANGE(0xa000, 0xa7ff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* work ram */ - AM_RANGE(0xa800, 0xa800) AM_WRITE(MWA8_NOP) /* flag ? */ - AM_RANGE(0xb000, 0xb303) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) /* Sprites Y */ - AM_RANGE(0xb800, 0xb800) AM_WRITE(MWA8_NOP) /* flag ? */ - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) /* Sprites Code + X + Attr */ - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_3) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_ROM) /* rom bank */ + AM_RANGE(0xa000, 0xa7ff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* work ram */ + AM_RANGE(0xa800, 0xa800) AM_WRITE(SMH_NOP) /* flag ? */ + AM_RANGE(0xb000, 0xb303) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) /* Sprites Y */ + AM_RANGE(0xb800, 0xb800) AM_WRITE(SMH_NOP) /* flag ? */ + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) /* Sprites Code + X + Attr */ + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_3) ADDRESS_MAP_END static ADDRESS_MAP_START( srmp3_readport, ADDRESS_SPACE_IO, 8 ) @@ -591,7 +591,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( srmp3_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x20, 0x20) AM_WRITE(MWA8_NOP) /* elapsed interrupt signal */ + AM_RANGE(0x20, 0x20) AM_WRITE(SMH_NOP) /* elapsed interrupt signal */ AM_RANGE(0x40, 0x40) AM_WRITE(srmp3_flags_w) /* GFX bank, counter, lockout */ AM_RANGE(0x60, 0x60) AM_WRITE(srmp3_rombank_w) /* ROM bank select */ AM_RANGE(0xa0, 0xa0) AM_WRITE(srmp3_adpcm_code_w) /* ADPCM number */ diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 312cd18ed86..e82f7e45723 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -164,13 +164,13 @@ static READ32_HANDLER(data_r) static ADDRESS_MAP_START( srmp5_mem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x000fffff) AM_RAM //maybe 0 - 2fffff ? AM_RANGE(0x002f0000, 0x002f7fff) AM_RAM - AM_RANGE(0x01000000, 0x01000003) AM_WRITE(MWA32_RAM) // 0xaa .. watchdog ? + AM_RANGE(0x01000000, 0x01000003) AM_WRITE(SMH_RAM) // 0xaa .. watchdog ? AM_RANGE(0x01800004, 0x01800007) AM_READ(input_port_0_dword_r) AM_RANGE(0x01800008, 0x0180000b) AM_READ(input_port_1_dword_r) AM_RANGE(0x0180000c, 0x0180000f) AM_WRITE(bank_w) AM_RANGE(0x01800010, 0x01800013) AM_READ(input_port_2_dword_r) //multiplexed controls (selected by writes to 1c) AM_RANGE(0x01800014, 0x01800017) AM_READ(input_port_3_dword_r) - AM_RANGE(0x0180001c, 0x0180001f) AM_WRITE(MWA32_RAM)//c1 c2 c4 c8 => mahjong inputs (at $10) - bits 0-3 + AM_RANGE(0x0180001c, 0x0180001f) AM_WRITE(SMH_RAM)//c1 c2 c4 c8 => mahjong inputs (at $10) - bits 0-3 AM_RANGE(0x01800200, 0x0180020f) AM_RAM //sound related ? only few writes after boot AM_RANGE(0x01a00000, 0x01bfffff) AM_READ(data_r) @@ -178,10 +178,10 @@ static ADDRESS_MAP_START( srmp5_mem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x0a100000, 0x0a1fffff) AM_RAM AM_BASE(&paletteram32) AM_RANGE(0x0a200000, 0x0a3fffff) AM_READWRITE(tileram_r, tileram_w) AM_BASE(&videoram32) - AM_RANGE(0x1eff0000, 0x1eff001f) AM_WRITE(MWA32_RAM) + AM_RANGE(0x1eff0000, 0x1eff001f) AM_WRITE(SMH_RAM) AM_RANGE(0x1eff003c, 0x1eff003f) AM_READNOP - AM_RANGE(0x1fc00000, 0x1fdfffff) AM_READ(MRA32_ROM) AM_WRITE(MWA32_ROM) AM_REGION(REGION_USER1, 0) - AM_RANGE(0x2fc00000, 0x2fdfffff) AM_READ(MRA32_ROM) AM_WRITE(MWA32_ROM) AM_REGION(REGION_USER1, 0) + AM_RANGE(0x1fc00000, 0x1fdfffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_REGION(REGION_USER1, 0) + AM_RANGE(0x2fc00000, 0x2fdfffff) AM_READ(SMH_ROM) AM_WRITE(SMH_ROM) AM_REGION(REGION_USER1, 0) ADDRESS_MAP_END static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 2818e8feb7c..5e31d858243 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -576,11 +576,11 @@ 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(MRA16_BANK1) // banked ROM (used by ROM check) + AM_RANGE(0x600000, 0x7fffff) AM_READ(SMH_BANK1) // banked ROM (used by ROM check) AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION(REGION_USER1, 0) AM_RANGE(0x300000, 0x300005) AM_READWRITE(srmp6_inputs_r, srmp6_input_select_w) // inputs - AM_RANGE(0x480000, 0x480fff) AM_READWRITE(MRA16_RAM, paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x480000, 0x480fff) AM_READWRITE(SMH_RAM, paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x4d0000, 0x4d0001) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w) // watchdog // OBJ RAM: checked [$400000-$47dfff] diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c index 55024835584..7b64e7f885a 100644 --- a/src/mame/drivers/srumbler.c +++ b/src/mame/drivers/srumbler.c @@ -67,23 +67,23 @@ static INTERRUPT_GEN( srumbler_interrupt ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_RAM) /* RAM (of 1 sort or another) */ + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_RAM) /* RAM (of 1 sort or another) */ AM_RANGE(0x4008, 0x4008) AM_READ(input_port_0_r) AM_RANGE(0x4009, 0x4009) AM_READ(input_port_1_r) AM_RANGE(0x400a, 0x400a) AM_READ(input_port_2_r) AM_RANGE(0x400b, 0x400b) AM_READ(input_port_3_r) AM_RANGE(0x400c, 0x400c) AM_READ(input_port_4_r) - AM_RANGE(0x5000, 0x5fff) AM_READ(MRA8_BANK6) /* Banked ROM */ - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_BANK7) /* Banked ROM */ - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_BANK8) /* Banked ROM */ - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_BANK9) /* Banked ROM */ - AM_RANGE(0x9000, 0x9fff) AM_READ(MRA8_BANK10) /* Banked ROM */ - AM_RANGE(0xa000, 0xafff) AM_READ(MRA8_BANK11) /* Banked ROM */ - AM_RANGE(0xb000, 0xbfff) AM_READ(MRA8_BANK12) /* Banked ROM */ - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_BANK13) /* Banked ROM */ - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_BANK14) /* Banked ROM */ - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_BANK15) /* Banked ROM */ - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_BANK16) /* Banked ROM */ + AM_RANGE(0x5000, 0x5fff) AM_READ(SMH_BANK6) /* Banked ROM */ + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_BANK7) /* Banked ROM */ + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_BANK8) /* Banked ROM */ + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_BANK9) /* Banked ROM */ + AM_RANGE(0x9000, 0x9fff) AM_READ(SMH_BANK10) /* Banked ROM */ + AM_RANGE(0xa000, 0xafff) AM_READ(SMH_BANK11) /* Banked ROM */ + AM_RANGE(0xb000, 0xbfff) AM_READ(SMH_BANK12) /* Banked ROM */ + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_BANK13) /* Banked ROM */ + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_BANK14) /* Banked ROM */ + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_BANK15) /* Banked ROM */ + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_BANK16) /* Banked ROM */ ADDRESS_MAP_END /* @@ -97,32 +97,32 @@ Ignore the warnings about writing to unmapped memory. */ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1dff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1e00, 0x1fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x1dff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1e00, 0x1fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x2000, 0x3fff) AM_WRITE(srumbler_background_w) AM_BASE(&srumbler_backgroundram) AM_RANGE(0x4008, 0x4008) AM_WRITE(srumbler_bankswitch_w) AM_RANGE(0x4009, 0x4009) AM_WRITE(srumbler_4009_w) AM_RANGE(0x400a, 0x400d) AM_WRITE(srumbler_scroll_w) AM_RANGE(0x400e, 0x400e) AM_WRITE(soundlatch_w) AM_RANGE(0x5000, 0x5fff) AM_WRITE(srumbler_foreground_w) AM_BASE(&srumbler_foregroundram) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_RAM) /* Video RAM 2 ??? (not used) */ + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_RAM) /* Video RAM 2 ??? (not used) */ AM_RANGE(0x7000, 0x73ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE(&paletteram) - AM_RANGE(0x7400, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x7400, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x8001, 0x8001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_1_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_1_w) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/ssf2md.c b/src/mame/drivers/ssf2md.c index e0d0fcce2cc..2d67941b5c5 100644 --- a/src/mame/drivers/ssf2md.c +++ b/src/mame/drivers/ssf2md.c @@ -18,9 +18,9 @@ static READ16_HANDLER( ssf2ghw_dsw_r ) static DRIVER_INIT( ssf2ghw ) { - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xA130F0, 0xA130FF, 0, 0, MWA16_NOP); // custom banking is disabled (!) - memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x400000, 0x5fffff, 0, 0, MRA16_BANK5); - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x400000, 0x5fffff, 0, 0, MWA16_UNMAP); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xA130F0, 0xA130FF, 0, 0, SMH_NOP); // custom banking is disabled (!) + memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x400000, 0x5fffff, 0, 0, SMH_BANK5); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x400000, 0x5fffff, 0, 0, SMH_UNMAP); memory_set_bankptr( 5, memory_region( REGION_CPU1 )+0x400000 ); diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index 10cb2bb2744..3f6d279c71c 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -148,56 +148,56 @@ static MACHINE_RESET( sshangha ) /******************************************************************************/ static ADDRESS_MAP_START( sshangha_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x084000, 0x0847ff) AM_READ(sshanghb_protection16_r) AM_RANGE(0x101000, 0x101001) AM_READ(deco_71_r)//bootleg hack - AM_RANGE(0x200000, 0x207fff) AM_READ(MRA16_RAM) - AM_RANGE(0x340000, 0x340fff) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x207fff) AM_READ(SMH_RAM) + AM_RANGE(0x340000, 0x340fff) AM_READ(SMH_RAM) AM_RANGE(0x350000, 0x350001) AM_READ(deco_71_r) - AM_RANGE(0x360000, 0x360fff) AM_READ(MRA16_RAM) + AM_RANGE(0x360000, 0x360fff) AM_READ(SMH_RAM) AM_RANGE(0x370000, 0x370001) AM_READ(deco_71_r) - AM_RANGE(0x380000, 0x383fff) AM_READ(MRA16_RAM) - AM_RANGE(0xfec000, 0xff3fff) AM_READ(MRA16_RAM) + AM_RANGE(0x380000, 0x383fff) AM_READ(SMH_RAM) + AM_RANGE(0xfec000, 0xff3fff) AM_READ(SMH_RAM) AM_RANGE(0xff4000, 0xff47ff) AM_READ(sshangha_protection16_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sshangha_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x10000c, 0x10000d) AM_WRITE(sshangha_sound_w) AM_RANGE(0x10100c, 0x10100d) AM_WRITE(sshangha_sound_w) /* the bootleg writes here */ AM_RANGE(0x200000, 0x201fff) AM_WRITE(sshangha_pf1_data_w) AM_BASE(&sshangha_pf1_data) AM_RANGE(0x202000, 0x203fff) AM_WRITE(sshangha_pf2_data_w) AM_BASE(&sshangha_pf2_data) - AM_RANGE(0x204000, 0x2047ff) AM_WRITE(MWA16_RAM) AM_BASE(&sshangha_pf1_rowscroll) - AM_RANGE(0x206000, 0x2067ff) AM_WRITE(MWA16_RAM) AM_BASE(&sshangha_pf2_rowscroll) + AM_RANGE(0x204000, 0x2047ff) AM_WRITE(SMH_RAM) AM_BASE(&sshangha_pf1_rowscroll) + AM_RANGE(0x206000, 0x2067ff) AM_WRITE(SMH_RAM) AM_BASE(&sshangha_pf2_rowscroll) AM_RANGE(0x300000, 0x30000f) AM_WRITE(sshangha_control_0_w) AM_RANGE(0x320000, 0x320001) AM_WRITE(sshangha_video_w) - AM_RANGE(0x320002, 0x320005) AM_WRITE(MWA16_NOP) - AM_RANGE(0x340000, 0x340fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) - AM_RANGE(0x350000, 0x350007) AM_WRITE(MWA16_NOP) - AM_RANGE(0x360000, 0x360fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) - AM_RANGE(0x370000, 0x370007) AM_WRITE(MWA16_NOP) + AM_RANGE(0x320002, 0x320005) AM_WRITE(SMH_NOP) + AM_RANGE(0x340000, 0x340fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x350000, 0x350007) AM_WRITE(SMH_NOP) + AM_RANGE(0x360000, 0x360fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) + AM_RANGE(0x370000, 0x370007) AM_WRITE(SMH_NOP) AM_RANGE(0x380000, 0x383fff) AM_WRITE(sshangha_palette_24bit_w) AM_BASE(&paletteram16) - AM_RANGE(0x3c0000, 0x3c0fff) AM_WRITE(MWA16_RAM) /* Sprite ram buffer on bootleg only?? */ - AM_RANGE(0xfec000, 0xff3fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x3c0000, 0x3c0fff) AM_WRITE(SMH_RAM) /* Sprite ram buffer on bootleg only?? */ + AM_RANGE(0xfec000, 0xff3fff) AM_WRITE(SMH_RAM) AM_RANGE(0xff4000, 0xff47ff) AM_WRITE(sshangha_protection16_w) AM_BASE(&sshangha_prot_data) ADDRESS_MAP_END /******************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_READ(YM2203_status_port_0_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) // AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2203_write_port_0_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index b815b5f4d78..0f35c18c764 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -162,7 +162,7 @@ static READ8_HANDLER(controls_r) static ADDRESS_MAP_START( ssingles_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x00ff) AM_WRITE(ssingles_videoram_w) AM_RANGE(0x0800, 0x08ff) AM_WRITE(ssingles_colorram_w) - AM_RANGE(0x0000, 0x1fff) AM_READ( MRA8_ROM ) + AM_RANGE(0x0000, 0x1fff) AM_READ( SMH_ROM ) AM_RANGE(0xc000, 0xc000) AM_READ( c000_r ) AM_RANGE(0xc001, 0xc001) AM_READWRITE( c001_r, c001_w ) AM_RANGE(0x6000, 0xbfff) AM_ROM diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c index c7b4032d36e..86f1bab62d8 100644 --- a/src/mame/drivers/sslam.c +++ b/src/mame/drivers/sslam.c @@ -405,12 +405,12 @@ static WRITE16_HANDLER( powerbls_sound_w ) static ADDRESS_MAP_START( sslam_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000400, 0x07ffff) AM_RAM - AM_RANGE(0x100000, 0x103fff) AM_READWRITE(MRA16_RAM, sslam_bg_tileram_w) AM_BASE(&sslam_bg_tileram) - AM_RANGE(0x104000, 0x107fff) AM_READWRITE(MRA16_RAM, sslam_md_tileram_w) AM_BASE(&sslam_md_tileram) - AM_RANGE(0x108000, 0x10ffff) AM_READWRITE(MRA16_RAM, sslam_tx_tileram_w) AM_BASE(&sslam_tx_tileram) + AM_RANGE(0x100000, 0x103fff) AM_READWRITE(SMH_RAM, sslam_bg_tileram_w) AM_BASE(&sslam_bg_tileram) + AM_RANGE(0x104000, 0x107fff) AM_READWRITE(SMH_RAM, sslam_md_tileram_w) AM_BASE(&sslam_md_tileram) + AM_RANGE(0x108000, 0x10ffff) AM_READWRITE(SMH_RAM, sslam_tx_tileram_w) AM_BASE(&sslam_tx_tileram) AM_RANGE(0x110000, 0x11000d) AM_RAM AM_BASE(&sslam_regs) AM_RANGE(0x200000, 0x200001) AM_WRITENOP - AM_RANGE(0x280000, 0x280fff) AM_READWRITE(MRA16_RAM, bigtwin_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x280000, 0x280fff) AM_READWRITE(SMH_RAM, bigtwin_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE(&sslam_spriteram) AM_RANGE(0x304000, 0x304001) AM_WRITENOP AM_RANGE(0x300010, 0x300011) AM_READ_PORT("IN0") @@ -428,12 +428,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( powerbls_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x100000, 0x103fff) AM_READWRITE(MRA16_RAM, powerbls_bg_tileram_w) AM_BASE(&sslam_bg_tileram) + AM_RANGE(0x100000, 0x103fff) AM_READWRITE(SMH_RAM, powerbls_bg_tileram_w) AM_BASE(&sslam_bg_tileram) AM_RANGE(0x104000, 0x107fff) AM_RAM // not used AM_RANGE(0x110000, 0x11000d) AM_RAM AM_BASE(&sslam_regs) AM_RANGE(0x200000, 0x200001) AM_WRITENOP AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE(&sslam_spriteram) - AM_RANGE(0x280000, 0x2803ff) AM_READWRITE(MRA16_RAM, bigtwin_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x280000, 0x2803ff) AM_READWRITE(SMH_RAM, bigtwin_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x300010, 0x300011) AM_READ_PORT("IN0") AM_RANGE(0x300012, 0x300013) AM_READ_PORT("IN1") AM_RANGE(0x300014, 0x300015) AM_READ_PORT("IN2") diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c index d21371d5bc8..ca4c9d9b84d 100644 --- a/src/mame/drivers/ssozumo.c +++ b/src/mame/drivers/ssozumo.c @@ -57,57 +57,57 @@ static WRITE8_HANDLER( ssozumo_sh_command_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x077f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x077f) AM_READ(SMH_RAM) - AM_RANGE(0x2000, 0x27ff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x31ff) AM_READ(MRA8_RAM) + AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x31ff) AM_READ(SMH_RAM) AM_RANGE(0x4000, 0x4000) AM_READ(input_port_0_r) AM_RANGE(0x4010, 0x4010) AM_READ(input_port_1_r) AM_RANGE(0x4020, 0x4020) AM_READ(input_port_2_r) AM_RANGE(0x4030, 0x4030) AM_READ(input_port_3_r) - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x077f) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x077f) AM_WRITE(SMH_RAM) - AM_RANGE(0x0780, 0x07ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0780, 0x07ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x2000, 0x23ff) AM_WRITE(ssozumo_videoram2_w) AM_BASE(&ssozumo_videoram2) AM_RANGE(0x2400, 0x27ff) AM_WRITE(ssozumo_colorram2_w) AM_BASE(&ssozumo_colorram2) AM_RANGE(0x3000, 0x31ff) AM_WRITE(ssozumo_videoram_w) AM_BASE(&videoram) AM_RANGE(0x3200, 0x33ff) AM_WRITE(ssozumo_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x3400, 0x35ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x3600, 0x37ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x3400, 0x35ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x3600, 0x37ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4000, 0x4000) AM_WRITE(ssozumo_flipscreen_w) AM_RANGE(0x4010, 0x4010) AM_WRITE(ssozumo_sh_command_w) AM_RANGE(0x4020, 0x4020) AM_WRITE(ssozumo_scroll_w) -// AM_RANGE(0x4030, 0x4030) AM_WRITE(MWA8_RAM) +// AM_RANGE(0x4030, 0x4030) AM_WRITE(SMH_RAM) AM_RANGE(0x4050, 0x407f) AM_WRITE(ssozumo_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM) AM_RANGE(0x2007, 0x2007) AM_READ(soundlatch_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x2001, 0x2001) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x2002, 0x2002) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x2003, 0x2003) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x2004, 0x2004) AM_WRITE(DAC_0_signed_data_w) AM_RANGE(0x2005, 0x2005) AM_WRITE(interrupt_enable_w) - AM_RANGE(0x4000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c index 266652a1d4a..c47f334ea38 100644 --- a/src/mame/drivers/sspeedr.c +++ b/src/mame/drivers/sspeedr.c @@ -97,14 +97,14 @@ static WRITE8_HANDLER( sspeedr_sound_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x21ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x21ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x21ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x21ff) AM_WRITE(SMH_RAM) AM_RANGE(0x7f00, 0x7f17) AM_WRITE(sspeedr_score_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c index fc9deff18e5..db81310164c 100644 --- a/src/mame/drivers/ssrj.c +++ b/src/mame/drivers/ssrj.c @@ -63,13 +63,13 @@ static READ8_HANDLER(ssrj_wheel_r) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_READ(ssrj_vram1_r) AM_RANGE(0xc800, 0xcfff) AM_READ(ssrj_vram2_r) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) AM_RANGE(0xd800, 0xdfff) AM_READ(ssrj_vram4_r) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe800, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe800, 0xefff) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_READ(input_port_0_r) AM_RANGE(0xf001, 0xf001) AM_READ(ssrj_wheel_r) AM_RANGE(0xf002, 0xf002) AM_READ(input_port_2_r) @@ -77,18 +77,18 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc7ff) AM_WRITE(ssrj_vram1_w) AM_BASE(&ssrj_vram1) AM_RANGE(0xc800, 0xcfff) AM_WRITE(ssrj_vram2_w) AM_BASE(&ssrj_vram2) - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_RAM) AM_BASE(&ssrj_vram3) + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) AM_BASE(&ssrj_vram3) AM_RANGE(0xd800, 0xdfff) AM_WRITE(ssrj_vram4_w) AM_BASE(&ssrj_vram4) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe800, 0xefff) AM_WRITE(MWA8_RAM) AM_BASE(&ssrj_scrollram) - AM_RANGE(0xf003, 0xf003) AM_WRITE(MWA8_NOP) /* unknown */ + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xe800, 0xefff) AM_WRITE(SMH_RAM) AM_BASE(&ssrj_scrollram) + AM_RANGE(0xf003, 0xf003) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0xf401, 0xf401) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0xf400, 0xf400) AM_WRITE(AY8910_control_port_0_w) - AM_RANGE(0xfc00, 0xfc00) AM_WRITE(MWA8_NOP) /* unknown */ - AM_RANGE(0xf800, 0xf800) AM_WRITE(MWA8_NOP) /* wheel ? */ + AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_NOP) /* unknown */ + AM_RANGE(0xf800, 0xf800) AM_WRITE(SMH_NOP) /* wheel ? */ ADDRESS_MAP_END static INPUT_PORTS_START( ssrj ) diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 2ac1dbbf7e5..4f4a549d647 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -421,32 +421,32 @@ static READ16_HANDLER( fake_r ) { return ssv_scroll[offset]; } #endif #define SSV_READMEM( _ROM ) \ - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA16_RAM ) /* RAM */ \ - AM_RANGE(0x100000, 0x13ffff) AM_READ(MRA16_RAM ) /* Sprites */ \ - AM_RANGE(0x140000, 0x15ffff) AM_READ(MRA16_RAM ) /* Palette */ \ - AM_RANGE(0x160000, 0x17ffff) AM_READ(MRA16_RAM ) /* */ \ + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_RAM ) /* RAM */ \ + AM_RANGE(0x100000, 0x13ffff) AM_READ(SMH_RAM ) /* Sprites */ \ + AM_RANGE(0x140000, 0x15ffff) AM_READ(SMH_RAM ) /* Palette */ \ + AM_RANGE(0x160000, 0x17ffff) AM_READ(SMH_RAM ) /* */ \ AM_RANGE(0x1c0000, 0x1c0001) AM_READ(ssv_vblank_r ) /* Vblank? */ \ -/**/AM_RANGE(0x1c0002, 0x1c007f) AM_READ(MRA16_RAM ) /* Scroll */ \ +/**/AM_RANGE(0x1c0002, 0x1c007f) AM_READ(SMH_RAM ) /* Scroll */ \ AM_RANGE(0x210002, 0x210003) AM_READ(input_port_0_word_r ) /* DSW */ \ AM_RANGE(0x210004, 0x210005) AM_READ(input_port_1_word_r ) /* DSW */ \ AM_RANGE(0x210008, 0x210009) AM_READ(input_port_2_word_r ) /* P1 */ \ AM_RANGE(0x21000a, 0x21000b) AM_READ(input_port_3_word_r ) /* P2 */ \ AM_RANGE(0x21000c, 0x21000d) AM_READ(input_port_4_word_r ) /* Coins */ \ - AM_RANGE(0x21000e, 0x21000f) AM_READ(MRA16_NOP ) /* */ \ + AM_RANGE(0x21000e, 0x21000f) AM_READ(SMH_NOP ) /* */ \ AM_RANGE(0x300000, 0x30007f) AM_READ(ES5506_data_0_word_r ) /* Sound */ \ - AM_RANGE(0x482000, 0x482fff) AM_READWRITE(MRA16_RAM, dsp_w) AM_BASE(&dsp_ram) \ - AM_RANGE(_ROM, 0xffffff) AM_READ(MRA16_BANK1 ) /* ROM */ \ + AM_RANGE(0x482000, 0x482fff) AM_READWRITE(SMH_RAM, dsp_w) AM_BASE(&dsp_ram) \ + AM_RANGE(_ROM, 0xffffff) AM_READ(SMH_BANK1 ) /* ROM */ \ //AM_RANGE(0x990000, 0x99007f) AM_READ(fake_r) #define SSV_WRITEMEM \ - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_mainram) /* RAM */ \ - AM_RANGE(0x100000, 0x13ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) /* Sprites */ \ + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_RAM) AM_BASE(&ssv_mainram) /* RAM */ \ + AM_RANGE(0x100000, 0x13ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) /* Sprites */ \ AM_RANGE(0x140000, 0x15ffff) AM_WRITE(paletteram16_xrgb_swap_word_w) AM_BASE(&paletteram16) \ - AM_RANGE(0x160000, 0x17ffff) AM_WRITE(MWA16_RAM) \ + AM_RANGE(0x160000, 0x17ffff) AM_WRITE(SMH_RAM) \ AM_RANGE(0x1c0000, 0x1c007f) AM_WRITE(ssv_scroll_w) AM_BASE(&ssv_scroll ) /*Scroll */ \ AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_w) /*Lockout */ \ - AM_RANGE(0x210010, 0x210011) AM_WRITE(MWA16_NOP) \ - AM_RANGE(0x230000, 0x230071) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_irq_vectors) /* IRQ Vectors */ \ + AM_RANGE(0x210010, 0x210011) AM_WRITE(SMH_NOP) \ + AM_RANGE(0x230000, 0x230071) AM_WRITE(SMH_RAM) AM_BASE(&ssv_irq_vectors) /* IRQ Vectors */ \ AM_RANGE(0x240000, 0x240071) AM_WRITE(ssv_irq_ack_w ) /* IRQ Ack */ \ AM_RANGE(0x260000, 0x260001) AM_WRITE(ssv_irq_enable_w) /* IRQ Enable */ \ AM_RANGE(0x300000, 0x30007f) AM_WRITE(ES5506_data_0_word_w) /* Sound */ \ @@ -465,19 +465,19 @@ static READ16_HANDLER( drifto94_rand_r ) } static ADDRESS_MAP_START( drifto94_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x480000, 0x480001) AM_READ(MRA16_NOP ) // ? + AM_RANGE(0x480000, 0x480001) AM_READ(SMH_NOP ) // ? AM_RANGE(0x510000, 0x510001) AM_READ(drifto94_rand_r ) // ?? AM_RANGE(0x520000, 0x520001) AM_READ(drifto94_rand_r ) // ?? - AM_RANGE(0x580000, 0x5807ff) AM_READ(MRA16_RAM ) // NVRAM + AM_RANGE(0x580000, 0x5807ff) AM_READ(SMH_RAM ) // NVRAM SSV_READMEM( 0xc00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( drifto94_writemem, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 1 at the start - AM_RANGE(0x400000, 0x47ffff) AM_WRITE(MWA16_RAM ) // ? - AM_RANGE(0x480000, 0x480001) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0x483000, 0x485fff) AM_WRITE(MWA16_NOP ) // ? - AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP ) // ?? - AM_RANGE(0x580000, 0x5807ff) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_nvram) AM_SIZE(&ssv_nvram_size ) // NVRAM +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 1 at the start + AM_RANGE(0x400000, 0x47ffff) AM_WRITE(SMH_RAM ) // ? + AM_RANGE(0x480000, 0x480001) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0x483000, 0x485fff) AM_WRITE(SMH_NOP ) // ? + AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP ) // ?? + AM_RANGE(0x580000, 0x5807ff) AM_WRITE(SMH_RAM) AM_BASE(&ssv_nvram) AM_SIZE(&ssv_nvram_size ) // NVRAM SSV_WRITEMEM ADDRESS_MAP_END @@ -607,10 +607,10 @@ static WRITE16_HANDLER( gdfs_blitram_w ) static ADDRESS_MAP_START( gdfs_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x540000, 0x540001) AM_READ(gdfs_eeprom_r) - AM_RANGE(0x600000, 0x600fff) AM_READ(MRA16_RAM) - AM_RANGE(0x400000, 0x43ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x440000, 0x44003f) AM_READ(MRA16_RAM) - AM_RANGE(0x800000, 0x87ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x600fff) AM_READ(SMH_RAM) + AM_RANGE(0x400000, 0x43ffff) AM_READ(SMH_RAM) + AM_RANGE(0x440000, 0x44003f) AM_READ(SMH_RAM) + AM_RANGE(0x800000, 0x87ffff) AM_READ(SMH_RAM) AM_RANGE(0x8c0000, 0x8c00ff) AM_READ(gdfs_blitram_r) AM_RANGE(0x900000, 0x9fffff) AM_READ(gdfs_gfxram_r) SSV_READMEM( 0xc00000 ) @@ -618,11 +618,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gdfs_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x41ffff) AM_WRITE(gdfs_tmapram_w) AM_BASE(&gdfs_tmapram) - AM_RANGE(0x420000, 0x43ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x440000, 0x44003f) AM_WRITE(MWA16_RAM) AM_BASE(&gdfs_tmapscroll) + AM_RANGE(0x420000, 0x43ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x440000, 0x44003f) AM_WRITE(SMH_RAM) AM_BASE(&gdfs_tmapscroll) AM_RANGE(0x500000, 0x500001) AM_WRITE(gdfs_eeprom_w) - AM_RANGE(0x600000, 0x600fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x800000, 0x87ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) + AM_RANGE(0x600000, 0x600fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x800000, 0x87ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) AM_RANGE(0x8c0000, 0x8c00ff) AM_WRITE(gdfs_blitram_w) AM_BASE(&gdfs_blitram) AM_RANGE(0x900000, 0x9fffff) AM_WRITE(gdfs_gfxram_w) SSV_WRITEMEM @@ -654,17 +654,17 @@ static READ16_HANDLER( hypreact_input_r ) static ADDRESS_MAP_START( hypreact_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog -// AM_RANGE(0x280000, 0x280001) AM_READ(MRA16_NOP ) // ? read at the start, value not used +// AM_RANGE(0x280000, 0x280001) AM_READ(SMH_NOP ) // ? read at the start, value not used AM_RANGE(0xc00000, 0xc00001) AM_READ(hypreact_input_r ) // Inputs - AM_RANGE(0xc00006, 0xc00007) AM_READ(MRA16_RAM ) // - AM_RANGE(0xc00008, 0xc00009) AM_READ(MRA16_NOP ) // + AM_RANGE(0xc00006, 0xc00007) AM_READ(SMH_RAM ) // + AM_RANGE(0xc00008, 0xc00009) AM_READ(SMH_NOP ) // SSV_READMEM( 0xf00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( hypreact_writemem, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 5 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 5 at the start AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w ) // Inverted lockout lines - AM_RANGE(0xc00006, 0xc00007) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_input_sel ) // Inputs - AM_RANGE(0xc00008, 0xc00009) AM_WRITE(MWA16_NOP ) // + AM_RANGE(0xc00006, 0xc00007) AM_WRITE(SMH_RAM) AM_BASE(&ssv_input_sel ) // Inputs + AM_RANGE(0xc00008, 0xc00009) AM_WRITE(SMH_NOP ) // SSV_WRITEMEM ADDRESS_MAP_END @@ -675,16 +675,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hypreac2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog -// AM_RANGE(0x280000, 0x280001) AM_READ(MRA16_NOP ) // ? read at the start, value not used +// AM_RANGE(0x280000, 0x280001) AM_READ(SMH_NOP ) // ? read at the start, value not used AM_RANGE(0x500000, 0x500001) AM_READ(hypreact_input_r ) // Inputs AM_RANGE(0x500002, 0x500003) AM_READ(hypreact_input_r ) // (again?) // 0x540000, 0x540003 communication with another unit SSV_READMEM( 0xe00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( hypreac2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 5 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 5 at the start AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w ) // Inverted lockout lines - AM_RANGE(0x520000, 0x520001) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_input_sel ) // Inputs + AM_RANGE(0x520000, 0x520001) AM_WRITE(SMH_RAM) AM_BASE(&ssv_input_sel ) // Inputs // 0x540000, 0x540003 communication with other units SSV_WRITEMEM ADDRESS_MAP_END @@ -697,14 +697,14 @@ ADDRESS_MAP_END static READ16_HANDLER( srmp4_input_r ); static ADDRESS_MAP_START( janjans1_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x210006, 0x210007) AM_READ(MRA16_NOP ) + AM_RANGE(0x210006, 0x210007) AM_READ(SMH_NOP ) AM_RANGE(0x800002, 0x800003) AM_READ(srmp4_input_r ) // Inputs SSV_READMEM( 0xc00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( janjans1_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x210000, 0x210001) AM_WRITE(MWA16_NOP ) // koikois2 but not janjans1 -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 1 at the start - AM_RANGE(0x800000, 0x800001) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_input_sel ) // Inputs + AM_RANGE(0x210000, 0x210001) AM_WRITE(SMH_NOP ) // koikois2 but not janjans1 +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 1 at the start + AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_RAM) AM_BASE(&ssv_input_sel ) // Inputs SSV_WRITEMEM ADDRESS_MAP_END @@ -714,13 +714,13 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( keithlcy_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x21000e, 0x21000f) AM_READ(MRA16_NOP ) // + AM_RANGE(0x21000e, 0x21000f) AM_READ(SMH_NOP ) // SSV_READMEM( 0xe00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( keithlcy_writemem, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 1 at the start - AM_RANGE(0x210010, 0x210011) AM_WRITE(MWA16_NOP ) // - AM_RANGE(0x400000, 0x47ffff) AM_WRITE(MWA16_RAM ) // ? +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 1 at the start + AM_RANGE(0x210010, 0x210011) AM_WRITE(SMH_NOP ) // + AM_RANGE(0x400000, 0x47ffff) AM_WRITE(SMH_RAM ) // ? SSV_WRITEMEM ADDRESS_MAP_END @@ -731,14 +731,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( meosism_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog -// AM_RANGE(0x280000, 0x280001) AM_READ(MRA16_NOP ) // ? read once, value not used - AM_RANGE(0x580000, 0x58ffff) AM_READ(MRA16_RAM ) // NVRAM +// AM_RANGE(0x280000, 0x280001) AM_READ(SMH_NOP ) // ? read once, value not used + AM_RANGE(0x580000, 0x58ffff) AM_READ(SMH_RAM ) // NVRAM SSV_READMEM( 0xf00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( meosism_writemem, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 5 at the start -// AM_RANGE(0x500004, 0x500005) AM_WRITE(MWA16_NOP ) // ? 0,58,18 - AM_RANGE(0x580000, 0x58ffff) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_nvram) AM_SIZE(&ssv_nvram_size ) // NVRAM +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 5 at the start +// AM_RANGE(0x500004, 0x500005) AM_WRITE(SMH_NOP ) // ? 0,58,18 + AM_RANGE(0x580000, 0x58ffff) AM_WRITE(SMH_RAM) AM_BASE(&ssv_nvram) AM_SIZE(&ssv_nvram_size ) // NVRAM SSV_WRITEMEM ADDRESS_MAP_END @@ -764,9 +764,9 @@ static ADDRESS_MAP_START( mslider_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mslider_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x010000, 0x01ffff) AM_WRITE(ssv_mainram_w) // RAM Mirror -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 1 at the start - AM_RANGE(0x400000, 0x47ffff) AM_WRITE(MWA16_RAM ) // ? -// AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP ) // ? ff at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 1 at the start + AM_RANGE(0x400000, 0x47ffff) AM_WRITE(SMH_RAM ) // ? +// AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP ) // ? ff at the start SSV_WRITEMEM ADDRESS_MAP_END @@ -780,7 +780,7 @@ static ADDRESS_MAP_START( ryorioh_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ryorioh_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_WRITE(watchdog_reset16_w ) // Watchdog -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 1 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 1 at the start SSV_WRITEMEM ADDRESS_MAP_END @@ -806,9 +806,9 @@ static ADDRESS_MAP_START( srmp4_readmem, ADDRESS_SPACE_PROGRAM, 16 ) SSV_READMEM( 0xf00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( srmp4_writemem, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 1,5 at the start - AM_RANGE(0xc0000e, 0xc0000f) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_input_sel ) // Inputs - AM_RANGE(0xc00010, 0xc00011) AM_WRITE(MWA16_NOP ) // +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 1,5 at the start + AM_RANGE(0xc0000e, 0xc0000f) AM_WRITE(SMH_RAM) AM_BASE(&ssv_input_sel ) // Inputs + AM_RANGE(0xc00010, 0xc00011) AM_WRITE(SMH_NOP ) // SSV_WRITEMEM ADDRESS_MAP_END @@ -850,7 +850,7 @@ static READ16_HANDLER( srmp7_input_r ) } static ADDRESS_MAP_START( srmp7_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x010000, 0x050faf) AM_READ(MRA16_RAM ) // More RAM + AM_RANGE(0x010000, 0x050faf) AM_READ(SMH_RAM ) // More RAM AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0x300076, 0x300077) AM_READ(srmp7_irqv_r ) // Sound // 0x540000, 0x540003, related to lev 5 irq? @@ -858,12 +858,12 @@ static ADDRESS_MAP_START( srmp7_readmem, ADDRESS_SPACE_PROGRAM, 16 ) SSV_READMEM( 0xc00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( srmp7_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x010000, 0x050faf) AM_WRITE(MWA16_RAM ) // More RAM -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 0,4 at the start + AM_RANGE(0x010000, 0x050faf) AM_WRITE(SMH_RAM ) // More RAM +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 0,4 at the start AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w ) // Coin Counters / Lockouts // 0x540000, 0x540003, related to lev 5 irq? AM_RANGE(0x580000, 0x580001) AM_WRITE(srmp7_sound_bank_w ) // Sound Bank - AM_RANGE(0x680000, 0x680001) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_input_sel ) // Inputs + AM_RANGE(0x680000, 0x680001) AM_WRITE(SMH_RAM) AM_BASE(&ssv_input_sel ) // Inputs SSV_WRITEMEM ADDRESS_MAP_END @@ -874,17 +874,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( survarts_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog -// AM_RANGE(0x290000, 0x290001) AM_READ(MRA16_NOP ) // ? -// AM_RANGE(0x2a0000, 0x2a0001) AM_READ(MRA16_NOP ) // ? +// AM_RANGE(0x290000, 0x290001) AM_READ(SMH_NOP ) // ? +// AM_RANGE(0x2a0000, 0x2a0001) AM_READ(SMH_NOP ) // ? - AM_RANGE(0x400000, 0x43ffff) AM_READ(MRA16_RAM) // dyna + AM_RANGE(0x400000, 0x43ffff) AM_READ(SMH_RAM) // dyna AM_RANGE(0x500008, 0x500009) AM_READ(input_port_5_word_r ) // Extra Buttons SSV_READMEM( 0xf00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( survarts_writemem, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 0,4 at the start - AM_RANGE(0x400000, 0x43ffff) AM_WRITE(MWA16_RAM) // dyna +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 0,4 at the start + AM_RANGE(0x400000, 0x43ffff) AM_WRITE(SMH_RAM) // dyna SSV_WRITEMEM ADDRESS_MAP_END @@ -932,16 +932,16 @@ static ADDRESS_MAP_START( sxyreact_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0x500002, 0x500003) AM_READ(sxyreact_ballswitch_r ) // ? AM_RANGE(0x500004, 0x500005) AM_READ(sxyreact_dial_r ) // Dial Value (serial) - AM_RANGE(0x580000, 0x58ffff) AM_READ(MRA16_RAM ) // NVRAM + AM_RANGE(0x580000, 0x58ffff) AM_READ(SMH_RAM ) // NVRAM SSV_READMEM( 0xe00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sxyreact_writemem, ADDRESS_SPACE_PROGRAM, 16 ) // AM_RANGE(0x020000, 0x03ffff) AM_WRITE(ssv_mainram_w ) // sxyreac2 reads / writes here, why? -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 1 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 1 at the start AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w ) // Inverted lockout lines AM_RANGE(0x520000, 0x520001) AM_WRITE(sxyreact_dial_w ) // Dial Value (advance 1 bit) AM_RANGE(0x520004, 0x520005) AM_WRITE(sxyreact_motor_w ) // Dial Motor? - AM_RANGE(0x580000, 0x58ffff) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_nvram) AM_SIZE(&ssv_nvram_size ) // NVRAM + AM_RANGE(0x580000, 0x58ffff) AM_WRITE(SMH_RAM) AM_BASE(&ssv_nvram) AM_SIZE(&ssv_nvram_size ) // NVRAM SSV_WRITEMEM ADDRESS_MAP_END @@ -953,12 +953,12 @@ ADDRESS_MAP_END /* comes as either a standalone board or a standard SSV rom board (verified) */ static ADDRESS_MAP_START( twineag2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x010000, 0x03ffff) AM_READ(MRA16_RAM ) // More RAM + AM_RANGE(0x010000, 0x03ffff) AM_READ(SMH_RAM ) // More RAM AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog (also value is cmp.b with mem 8) SSV_READMEM( 0xe00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( twineag2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x010000, 0x03ffff) AM_WRITE(MWA16_RAM ) // More RAM + AM_RANGE(0x010000, 0x03ffff) AM_WRITE(SMH_RAM ) // More RAM SSV_WRITEMEM ADDRESS_MAP_END @@ -970,13 +970,13 @@ ADDRESS_MAP_END /* standalone board based on SSV hardware */ static ADDRESS_MAP_START( ultrax_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x010000, 0x03ffff) AM_READ(MRA16_RAM ) // More RAM + AM_RANGE(0x010000, 0x03ffff) AM_READ(SMH_RAM ) // More RAM AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog (also value is cmp.b with memory address 8) SSV_READMEM( 0xe00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ultrax_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x010000, 0x03ffff) AM_WRITE(MWA16_RAM ) // More RAM -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 2,6 at the start + AM_RANGE(0x010000, 0x03ffff) AM_WRITE(SMH_RAM ) // More RAM +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 2,6 at the start SSV_WRITEMEM ADDRESS_MAP_END @@ -1020,14 +1020,14 @@ static WRITE16_HANDLER(latch16_w) static ADDRESS_MAP_START( jsk_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x050000, 0x05ffff) AM_READ(ssv_mainram_r ) // RAM Mirror? - AM_RANGE(0x400000, 0x47ffff) AM_READ(MRA16_RAM ) // RAM? + AM_RANGE(0x400000, 0x47ffff) AM_READ(SMH_RAM ) // RAM? AM_RANGE(0x900000, 0x900007) AM_READ(latch16_r) SSV_READMEM( 0xf00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( jsk_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x050000, 0x05ffff) AM_WRITE(ssv_mainram_w ) // RAM Mirror? AM_RANGE(0x210000, 0x210001) AM_WRITE(watchdog_reset16_w ) // Watchdog - AM_RANGE(0x400000, 0x47ffff) AM_WRITE(MWA16_RAM ) // RAM? + AM_RANGE(0x400000, 0x47ffff) AM_WRITE(SMH_RAM ) // RAM? AM_RANGE(0x900000, 0x900007) AM_WRITE(latch16_w) SSV_WRITEMEM ADDRESS_MAP_END @@ -1105,20 +1105,20 @@ static WRITE16_HANDLER( eaglshot_gfxram_w ) static ADDRESS_MAP_START( eaglshot_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x180000, 0x1bffff) AM_READ(eaglshot_gfxram_r ) - AM_RANGE(0x210000, 0x210001) AM_READ(/*watchdog_reset16_r*/MRA16_NOP ) // Watchdog + AM_RANGE(0x210000, 0x210001) AM_READ(/*watchdog_reset16_r*/SMH_NOP ) // Watchdog AM_RANGE(0xa00000, 0xbfffff) AM_READ(eaglshot_gfxrom_r ) - AM_RANGE(0xc00000, 0xc007ff) AM_READ(MRA16_RAM ) // NVRAM + AM_RANGE(0xc00000, 0xc007ff) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0xd00000, 0xd00001) AM_READ(eaglshot_trackball_r ) SSV_READMEM( 0xf00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( eaglshot_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x180000, 0x1bffff) AM_WRITE(eaglshot_gfxram_w ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(MWA16_NOP ) // ? 0,4 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 0,4 at the start AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w ) // Inverted lockout lines AM_RANGE(0x800000, 0x800001) AM_WRITE(eaglshot_gfxrom_w ) AM_RANGE(0x900000, 0x900001) AM_WRITE(eaglshot_trackball_w ) - AM_RANGE(0xc00000, 0xc007ff) AM_WRITE(MWA16_RAM) AM_BASE(&ssv_nvram) AM_SIZE(&ssv_nvram_size ) // NVRAM + AM_RANGE(0xc00000, 0xc007ff) AM_WRITE(SMH_RAM) AM_BASE(&ssv_nvram) AM_SIZE(&ssv_nvram_size ) // NVRAM SSV_WRITEMEM ADDRESS_MAP_END diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index e356f176c02..6f2e1891ead 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -129,7 +129,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(MRA32_BANK2) + AM_RANGE(0xfff80000, 0xffffffff) AM_READ(SMH_BANK2) ADDRESS_MAP_END static ADDRESS_MAP_START( st0016_m2_io, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c index ae28d6af00a..a43296da864 100644 --- a/src/mame/drivers/stactics.c +++ b/src/mame/drivers/stactics.c @@ -177,18 +177,18 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_READ(input_port_0_r) AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ(input_port_1_r) AM_RANGE(0x6000, 0x6001) AM_MIRROR(0x0f08) AM_WRITE(stactics_coin_lockout_w) - AM_RANGE(0x6002, 0x6005) AM_MIRROR(0x0f08) AM_WRITE(MWA8_NOP) - AM_RANGE(0x6006, 0x6007) AM_MIRROR(0x0f08) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(stactics_state, palette) + AM_RANGE(0x6002, 0x6005) AM_MIRROR(0x0f08) AM_WRITE(SMH_NOP) + AM_RANGE(0x6006, 0x6007) AM_MIRROR(0x0f08) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(stactics_state, palette) /* AM_RANGE(0x6010, 0x6017) AM_MIRROR(0x0f08) AM_WRITE(stactics_sound_w) */ - AM_RANGE(0x6016, 0x6016) AM_MIRROR(0x0f08) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(stactics_state, motor_on) /* Note: This overlaps rocket sound */ - AM_RANGE(0x6020, 0x6027) AM_MIRROR(0x0f08) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(stactics_state, lamps) + AM_RANGE(0x6016, 0x6016) AM_MIRROR(0x0f08) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(stactics_state, motor_on) /* Note: This overlaps rocket sound */ + AM_RANGE(0x6020, 0x6027) AM_MIRROR(0x0f08) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(stactics_state, lamps) AM_RANGE(0x6030, 0x6030) AM_MIRROR(0x0f0f) AM_WRITE(stactics_speed_latch_w) AM_RANGE(0x6040, 0x6040) AM_MIRROR(0x0f0f) AM_WRITE(stactics_shot_trigger_w) AM_RANGE(0x6050, 0x6050) AM_MIRROR(0x0f0f) AM_WRITE(stactics_shot_flag_clear_w) - AM_RANGE(0x6060, 0x606f) AM_MIRROR(0x0f00) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(stactics_state, display_buffer) - AM_RANGE(0x6070, 0x609f) AM_MIRROR(0x0f00) AM_WRITE(MWA8_NOP) + AM_RANGE(0x6060, 0x606f) AM_MIRROR(0x0f00) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(stactics_state, display_buffer) + AM_RANGE(0x6070, 0x609f) AM_MIRROR(0x0f00) AM_WRITE(SMH_NOP) /* AM_RANGE(0x60a0, 0x60ef) AM_MIRROR(0x0f00) AM_WRITE(stactics_sound2_w) */ - AM_RANGE(0x60f0, 0x60ff) AM_MIRROR(0x0f00) AM_WRITE(MWA8_NOP) + AM_RANGE(0x60f0, 0x60ff) AM_MIRROR(0x0f00) AM_WRITE(SMH_NOP) AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_READ(input_port_2_r) AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_READ(input_port_3_r) AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x0800) AM_WRITE(stactics_scroll_ram_w) diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c index 1abbc98cf04..6e568968b8b 100644 --- a/src/mame/drivers/stadhero.c +++ b/src/mame/drivers/stadhero.c @@ -66,12 +66,12 @@ static WRITE16_HANDLER( stadhero_control_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM - AM_RANGE(0x200000, 0x2007ff) AM_READWRITE(MRA16_RAM, stadhero_pf1_data_w) AM_BASE(&stadhero_pf1_data) - AM_RANGE(0x240000, 0x240007) AM_READWRITE(MRA16_RAM, MWA16_RAM) AM_BASE(&stadhero_pf2_control_0) - AM_RANGE(0x240010, 0x240017) AM_WRITE(MWA16_RAM) AM_BASE(&stadhero_pf2_control_1) + AM_RANGE(0x200000, 0x2007ff) AM_READWRITE(SMH_RAM, stadhero_pf1_data_w) AM_BASE(&stadhero_pf1_data) + AM_RANGE(0x240000, 0x240007) AM_READWRITE(SMH_RAM, SMH_RAM) AM_BASE(&stadhero_pf2_control_0) + AM_RANGE(0x240010, 0x240017) AM_WRITE(SMH_RAM) AM_BASE(&stadhero_pf2_control_1) AM_RANGE(0x260000, 0x261fff) AM_READWRITE(stadhero_pf2_data_r, stadhero_pf2_data_w) AM_RANGE(0x30c000, 0x30c00b) AM_READWRITE(stadhero_control_r, stadhero_control_w) - AM_RANGE(0x310000, 0x3107ff) AM_READWRITE(MRA16_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x310000, 0x3107ff) AM_READWRITE(SMH_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0xff8000, 0xffbfff) AM_RAM /* Main ram */ AM_RANGE(0xffc000, 0xffc7ff) AM_MIRROR(0x000800) AM_RAM AM_BASE(&spriteram16) ADDRESS_MAP_END diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c index 4e8f24f80fd..2b79ef3e37c 100644 --- a/src/mame/drivers/starcrus.c +++ b/src/mame/drivers/starcrus.c @@ -35,13 +35,13 @@ extern int s1_sprite; extern int s2_sprite; static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) /* Program ROM */ - AM_RANGE(0x1000, 0x10ff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) /* Program ROM */ + AM_RANGE(0x1000, 0x10ff) AM_READ(SMH_RAM) /* RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) /* Program ROM */ - AM_RANGE(0x1000, 0x10ff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) /* Program ROM */ + AM_RANGE(0x1000, 0x10ff) AM_WRITE(SMH_RAM) /* RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c index 42fcf987bdf..2b3727bb653 100644 --- a/src/mame/drivers/starfire.c +++ b/src/mame/drivers/starfire.c @@ -153,7 +153,7 @@ static READ8_HANDLER( fireone_input_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_READWRITE(starfire_scratch_r, starfire_scratch_w) - AM_RANGE(0xa000, 0xbfff) AM_READWRITE(MRA8_RAM, starfire_colorram_w) AM_BASE(&starfire_colorram) + AM_RANGE(0xa000, 0xbfff) AM_READWRITE(SMH_RAM, starfire_colorram_w) AM_BASE(&starfire_colorram) AM_RANGE(0xc000, 0xffff) AM_READWRITE(starfire_videoram_r, starfire_videoram_w) AM_BASE(&starfire_videoram) ADDRESS_MAP_END diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c index 9ac3b87f9d9..a2edc3c620f 100644 --- a/src/mame/drivers/starshp1.c +++ b/src/mame/drivers/starshp1.c @@ -162,30 +162,30 @@ static WRITE8_HANDLER( starshp1_misc_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_READ(MRA8_RAM) AM_MIRROR(0x100) - AM_RANGE(0x2c00, 0x3fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x00ff) AM_READ(SMH_RAM) AM_MIRROR(0x100) + AM_RANGE(0x2c00, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xb000, 0xb000) AM_READ(starshp1_port_1_r) AM_RANGE(0xc400, 0xc400) AM_READ(starshp1_port_2_r) AM_RANGE(0xd800, 0xd800) AM_READ(starshp1_rng_r) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_WRITE(MWA8_RAM) AM_MIRROR(0x100) - AM_RANGE(0x2c00, 0x3fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x00ff) AM_WRITE(SMH_RAM) AM_MIRROR(0x100) + AM_RANGE(0x2c00, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc300, 0xc3ff) AM_WRITE(starshp1_sspic_w) /* spaceship picture */ AM_RANGE(0xc400, 0xc4ff) AM_WRITE(starshp1_ssadd_w) /* spaceship address */ AM_RANGE(0xc800, 0xc9ff) AM_WRITE(starshp1_playfield_w) AM_BASE(&starshp1_playfield_ram) - AM_RANGE(0xcc00, 0xcc0f) AM_WRITE(MWA8_RAM) AM_BASE(&starshp1_hpos_ram) - AM_RANGE(0xd000, 0xd00f) AM_WRITE(MWA8_RAM) AM_BASE(&starshp1_vpos_ram) - AM_RANGE(0xd400, 0xd40f) AM_WRITE(MWA8_RAM) AM_BASE(&starshp1_obj_ram) + AM_RANGE(0xcc00, 0xcc0f) AM_WRITE(SMH_RAM) AM_BASE(&starshp1_hpos_ram) + AM_RANGE(0xd000, 0xd00f) AM_WRITE(SMH_RAM) AM_BASE(&starshp1_vpos_ram) + AM_RANGE(0xd400, 0xd40f) AM_WRITE(SMH_RAM) AM_BASE(&starshp1_obj_ram) AM_RANGE(0xd800, 0xd80f) AM_WRITE(starshp1_collision_reset_w) AM_RANGE(0xdc00, 0xdc0f) AM_WRITE(starshp1_misc_w) AM_RANGE(0xdd00, 0xdd0f) AM_WRITE(starshp1_analog_in_w) AM_RANGE(0xde00, 0xde0f) AM_WRITE(starshp1_audio_w) AM_RANGE(0xdf00, 0xdf0f) AM_WRITE(starshp1_analog_out_w) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c index 5ced02871e0..b504565ebf9 100644 --- a/src/mame/drivers/starwars.c +++ b/src/mame/drivers/starwars.c @@ -175,7 +175,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4620, 0x463f) AM_WRITE(avgdvg_reset_w) AM_RANGE(0x4640, 0x465f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x4660, 0x467f) AM_WRITE(irq_ack_w) - AM_RANGE(0x4680, 0x469f) AM_READWRITE(MRA8_NOP,starwars_out_w) + AM_RANGE(0x4680, 0x469f) AM_READWRITE(SMH_NOP,starwars_out_w) AM_RANGE(0x46a0, 0x46bf) AM_WRITE(starwars_nstore_w) AM_RANGE(0x46c0, 0x46c2) AM_WRITE(starwars_adc_select_w) AM_RANGE(0x46e0, 0x46e0) AM_WRITE(starwars_soundrst_w) @@ -587,7 +587,7 @@ static DRIVER_INIT( esb ) memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x9fff, 0, 0, esb_slapstic_w); /* install additional banking */ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xffff, 0, 0, MRA8_BANK2); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xffff, 0, 0, SMH_BANK2); /* prepare the matrix processor */ starwars_is_esb = 1; diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index c345590085b..0315ec71461 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -297,30 +297,30 @@ static READ8_HANDLER (hangman_questions_read) } static ADDRESS_MAP_START( statriv2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4800, 0x48ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) + AM_RANGE(0x4800, 0x48ff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( statriv2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x4800, 0x48ff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) // backup ram? + AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x4800, 0x48ff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) // backup ram? AM_RANGE(0xc800, 0xcfff) AM_WRITE(statriv2_videoram_w) AM_BASE(&statriv2_videoram) ADDRESS_MAP_END static ADDRESS_MAP_START( supertr2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4800, 0x48ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) + AM_RANGE(0x4800, 0x48ff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( supertr2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x4800, 0x48ff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) // backup ram? + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x4800, 0x48ff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) // backup ram? AM_RANGE(0xc800, 0xcfff) AM_WRITE(statriv2_videoram_w) AM_BASE(&statriv2_videoram) ADDRESS_MAP_END @@ -329,17 +329,17 @@ static ADDRESS_MAP_START( statriv2_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r) AM_RANGE(0x2b, 0x2b) AM_READ(statriv2_questions_read) // question data AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r) // ??? - AM_RANGE(0xce, 0xce) AM_READ(MRA8_NOP) // ??? + AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( statriv2_writeport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x22, 0x22) AM_WRITE(MWA8_NOP) // ??? - AM_RANGE(0x23, 0x23) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0x22, 0x22) AM_WRITE(SMH_NOP) // ??? + AM_RANGE(0x23, 0x23) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0x29, 0x29) AM_WRITE(question_offset_low_w) AM_RANGE(0x2a, 0x2a) AM_WRITE(question_offset_high_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xb1, 0xb1) AM_WRITE(AY8910_write_port_0_w) - AM_RANGE(0xc0, 0xcf) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( statriv4_readport, ADDRESS_SPACE_IO, 8 ) @@ -347,17 +347,17 @@ static ADDRESS_MAP_START( statriv4_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r) AM_RANGE(0x28, 0x28) AM_READ(statriv2_questions_read) // question data AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r) // ??? - AM_RANGE(0xce, 0xce) AM_READ(MRA8_NOP) // ??? + AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( statriv4_writeport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x22, 0x22) AM_WRITE(MWA8_NOP) // ??? - AM_RANGE(0x23, 0x23) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0x22, 0x22) AM_WRITE(SMH_NOP) // ??? + AM_RANGE(0x23, 0x23) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0x29, 0x29) AM_WRITE(question_offset_high_w) AM_RANGE(0x2a, 0x2a) AM_WRITE(question_offset_low_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xb1, 0xb1) AM_WRITE(AY8910_write_port_0_w) - AM_RANGE(0xc0, 0xcf) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( supertr2_readport, ADDRESS_SPACE_IO, 8 ) @@ -365,28 +365,28 @@ static ADDRESS_MAP_START( supertr2_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r) AM_RANGE(0x28, 0x28) AM_READ(supertr2_questions_read) // question data AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r) // ??? - AM_RANGE(0xce, 0xce) AM_READ(MRA8_NOP) // ??? + AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( supertr2_writeport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x22, 0x22) AM_WRITE(MWA8_NOP) // ??? - AM_RANGE(0x23, 0x23) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0x22, 0x22) AM_WRITE(SMH_NOP) // ??? + AM_RANGE(0x23, 0x23) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0x28, 0x28) AM_WRITE(question_offset_low_w) AM_RANGE(0x29, 0x29) AM_WRITE(question_offset_med_w) AM_RANGE(0x2a, 0x2a) AM_WRITE(question_offset_high_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xb1, 0xb1) AM_WRITE(AY8910_write_port_0_w) - AM_RANGE(0xc0, 0xcf) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( trivquiz_writeport, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x22, 0x22) AM_WRITE(MWA8_NOP) // ??? - AM_RANGE(0x23, 0x23) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0x22, 0x22) AM_WRITE(SMH_NOP) // ??? + AM_RANGE(0x23, 0x23) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0x28, 0x28) AM_WRITE(question_offset_low_w) AM_RANGE(0x29, 0x29) AM_WRITE(question_offset_high_w) AM_RANGE(0xb0, 0xb0) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xb1, 0xb1) AM_WRITE(AY8910_write_port_0_w) - AM_RANGE(0xc0, 0xcf) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( trivquiz_readport, ADDRESS_SPACE_IO, 8 ) @@ -394,7 +394,7 @@ static ADDRESS_MAP_START( trivquiz_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r) AM_RANGE(0x2a, 0x2a) AM_READ(statriv2_questions_read) // question data AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r) // ??? - AM_RANGE(0xce, 0xce) AM_READ(MRA8_NOP) // ??? + AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( supertr3_readport, ADDRESS_SPACE_IO, 8 ) @@ -402,7 +402,7 @@ static ADDRESS_MAP_START( supertr3_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r) AM_RANGE(0x28, 0x28) AM_READ(supertr3_questions_read) // question data AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r) // ??? - AM_RANGE(0xce, 0xce) AM_READ(MRA8_NOP) // ??? + AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( hangman_readport, ADDRESS_SPACE_IO, 8 ) @@ -410,7 +410,7 @@ static ADDRESS_MAP_START( hangman_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r) AM_RANGE(0x28, 0x28) AM_READ(hangman_questions_read) // question data AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r) // ??? - AM_RANGE(0xce, 0xce) AM_READ(MRA8_NOP) // ??? + AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP) // ??? ADDRESS_MAP_END static INPUT_PORTS_START( statriv2 ) diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c index 32a9095afe1..0a2c6543e3d 100644 --- a/src/mame/drivers/stepstag.c +++ b/src/mame/drivers/stepstag.c @@ -26,47 +26,47 @@ static READ16_HANDLER( unknown_read_0xffff00 ) } static ADDRESS_MAP_START( stepstag_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) - AM_RANGE(0x300000, 0x33ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x33ffff) AM_READ(SMH_RAM) - AM_RANGE(0x400000, 0x43ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x400000, 0x43ffff) AM_READ(SMH_RAM) - AM_RANGE(0x500000, 0x53ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x500000, 0x53ffff) AM_READ(SMH_RAM) - AM_RANGE(0x800000, 0x87ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x900000, 0x97ffff) AM_READ(MRA16_RAM) - AM_RANGE(0xa00000, 0xa7ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x800000, 0x87ffff) AM_READ(SMH_RAM) + AM_RANGE(0x900000, 0x97ffff) AM_READ(SMH_RAM) + AM_RANGE(0xa00000, 0xa7ffff) AM_READ(SMH_RAM) AM_RANGE(0xc00000, 0xc00001) AM_READ(unknown_read_0xc00000) AM_RANGE(0xd00000, 0xd00001) AM_READ(unknown_read_0xd00000) AM_RANGE(0xffff00, 0xffff01) AM_READ(unknown_read_0xffff00) ADDRESS_MAP_END static ADDRESS_MAP_START( stepstag_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) - AM_RANGE(0x300000, 0x3fffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x300000, 0x3fffff) AM_WRITE(SMH_RAM) - AM_RANGE(0x400000, 0x43ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x400000, 0x43ffff) AM_WRITE(SMH_RAM) - AM_RANGE(0x500000, 0x53ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x500000, 0x53ffff) AM_WRITE(SMH_RAM) - AM_RANGE(0x700000, 0x700001) AM_WRITE(MWA16_NOP) //?? - AM_RANGE(0x700002, 0x700003) AM_WRITE(MWA16_NOP) //?? - AM_RANGE(0x700004, 0x700005) AM_WRITE(MWA16_NOP) //?? - AM_RANGE(0x700006, 0x700007) AM_WRITE(MWA16_NOP) //?? + AM_RANGE(0x700000, 0x700001) AM_WRITE(SMH_NOP) //?? + AM_RANGE(0x700002, 0x700003) AM_WRITE(SMH_NOP) //?? + AM_RANGE(0x700004, 0x700005) AM_WRITE(SMH_NOP) //?? + AM_RANGE(0x700006, 0x700007) AM_WRITE(SMH_NOP) //?? - AM_RANGE(0x800000, 0x87ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x880000, 0x880001) AM_WRITE(MWA16_NOP) //?? - AM_RANGE(0x900000, 0x97ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x980000, 0x980001) AM_WRITE(MWA16_NOP) //?? - AM_RANGE(0xa00000, 0xa7ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0xa80000, 0xa80001) AM_WRITE(MWA16_NOP) //?? - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_NOP) //?? - AM_RANGE(0xf00000, 0xf00001) AM_WRITE(MWA16_NOP) //?? + AM_RANGE(0x800000, 0x87ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x880000, 0x880001) AM_WRITE(SMH_NOP) //?? + AM_RANGE(0x900000, 0x97ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x980000, 0x980001) AM_WRITE(SMH_NOP) //?? + AM_RANGE(0xa00000, 0xa7ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa80000, 0xa80001) AM_WRITE(SMH_NOP) //?? + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_NOP) //?? + AM_RANGE(0xf00000, 0xf00001) AM_WRITE(SMH_NOP) //?? ADDRESS_MAP_END static READ16_HANDLER( unknown_sub_read_0xbe0004 ) @@ -76,12 +76,12 @@ static READ16_HANDLER( unknown_sub_read_0xbe0004 ) static ADDRESS_MAP_START( stepstag_sub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0xbe0004, 0xbe0005) AM_READ(unknown_sub_read_0xbe0004) ADDRESS_MAP_END static ADDRESS_MAP_START( stepstag_sub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static INPUT_PORTS_START( stepstag ) diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c index 9aa4bd68817..861d50a764a 100644 --- a/src/mame/drivers/stfight.c +++ b/src/mame/drivers/stfight.c @@ -264,54 +264,54 @@ extern UINT8 *stfight_vh_latch_ram; extern UINT8 *stfight_sprite_ram; static ADDRESS_MAP_START( readmem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) /* sf02.bin */ - AM_RANGE(0xc000, 0xc1ff) AM_READ(MRA8_RAM) /* palette ram */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) /* sf02.bin */ + AM_RANGE(0xc000, 0xc1ff) AM_READ(SMH_RAM) /* palette ram */ AM_RANGE(0xc200, 0xc200) AM_READ(input_port_0_r) /* IN1 */ AM_RANGE(0xc201, 0xc201) AM_READ(input_port_1_r) /* IN2 */ AM_RANGE(0xc202, 0xc202) AM_READ(input_port_2_r) /* IN3 */ AM_RANGE(0xc203, 0xc204) AM_READ(stfight_dsw_r) /* DS0,1 */ AM_RANGE(0xc205, 0xc205) AM_READ(stfight_coin_r) /* coin mech */ - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) /* video */ - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) /* video */ + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_BANK1) /* sf02.bin */ - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) - AM_RANGE(0xc100, 0xc1ff) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram_2) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_BANK1) /* sf02.bin */ + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) + AM_RANGE(0xc100, 0xc1ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram_2) AM_RANGE(0xc500, 0xc500) AM_WRITE(stfight_fm_w) /* play fm sound */ AM_RANGE(0xc600, 0xc600) AM_WRITE(stfight_adpcm_control_w) /* voice control */ AM_RANGE(0xc700, 0xc700) AM_WRITE(stfight_coin_w) /* coin mech */ - AM_RANGE(0xc804, 0xc806) AM_WRITE(MWA8_NOP) /* TBD */ + AM_RANGE(0xc804, 0xc806) AM_WRITE(SMH_NOP) /* TBD */ AM_RANGE(0xc807, 0xc807) AM_WRITE(stfight_sprite_bank_w) AM_RANGE(0xd000, 0xd3ff) AM_WRITE(stfight_text_char_w) AM_BASE(&stfight_text_char_ram) AM_RANGE(0xd400, 0xd7ff) AM_WRITE(stfight_text_attr_w) AM_BASE(&stfight_text_attr_ram) AM_RANGE(0xd800, 0xd808) AM_WRITE(stfight_vh_latch_w) AM_BASE(&stfight_vh_latch_ram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) AM_BASE(&stfight_sprite_ram) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) AM_BASE(&stfight_sprite_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xc001, 0xc001) AM_READ(YM2203_read_port_0_r) AM_RANGE(0xc801, 0xc801) AM_READ(YM2203_read_port_1_r) AM_RANGE(0xf000, 0xf000) AM_READ(stfight_fm_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_cpu2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xc800, 0xc800) AM_WRITE(YM2203_control_port_1_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(YM2203_write_port_1_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(stfight_e800_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c index 4524211958c..7f8cb88509a 100644 --- a/src/mame/drivers/strnskil.c +++ b/src/mame/drivers/strnskil.c @@ -88,11 +88,11 @@ static WRITE8_HANDLER( protection_w ) /****************************************************************************/ static ADDRESS_MAP_START( strnskil_readmem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x9fff) AM_READ(SMH_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) AM_SHARE(1) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) /* videoram */ + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) AM_SHARE(1) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) /* videoram */ AM_RANGE(0xd800, 0xd800) AM_READ(strnskil_d800_r) AM_RANGE(0xd801, 0xd801) AM_READ(input_port_0_r) /* dsw 1 */ @@ -103,27 +103,27 @@ static ADDRESS_MAP_START( strnskil_readmem1, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( strnskil_writemem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_WRITE(MWA8_RAM) AM_SHARE(1) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_WRITE(SMH_RAM) AM_SHARE(1) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(strnskil_videoram_w) AM_BASE(&videoram) AM_RANGE(0xd808, 0xd808) AM_WRITE(strnskil_scrl_ctrl_w) - AM_RANGE(0xd809, 0xd809) AM_WRITE(MWA8_NOP) /* coin counter? */ - AM_RANGE(0xd80a, 0xd80b) AM_WRITE(MWA8_RAM) AM_BASE(&strnskil_xscroll) + AM_RANGE(0xd809, 0xd809) AM_WRITE(SMH_NOP) /* coin counter? */ + AM_RANGE(0xd80a, 0xd80b) AM_WRITE(SMH_RAM) AM_BASE(&strnskil_xscroll) ADDRESS_MAP_END static ADDRESS_MAP_START( strnskil_readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) AM_SHARE(1) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) AM_SHARE(1) ADDRESS_MAP_END static ADDRESS_MAP_START( strnskil_writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xc800, 0xcfff) AM_WRITE(MWA8_RAM) AM_SHARE(1) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc800, 0xcfff) AM_WRITE(SMH_RAM) AM_SHARE(1) AM_RANGE(0xd801, 0xd801) AM_WRITE(SN76496_0_w) AM_RANGE(0xd802, 0xd802) AM_WRITE(SN76496_1_w) @@ -510,7 +510,7 @@ ROM_END static DRIVER_INIT( pettanp ) { -// AM_RANGE(0xd80c, 0xd80c) AM_WRITE(MWA8_NOP) /* protection reset? */ +// AM_RANGE(0xd80c, 0xd80c) AM_WRITE(SMH_NOP) /* protection reset? */ // AM_RANGE(0xd80d, 0xd80d) AM_WRITE(protection_w) /* protection data write (pettanp) */ // AM_RANGE(0xd806, 0xd806) AM_READ(protection_r) /* protection data read (pettanp) */ diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c index 415589bc895..9c4400ccdf7 100644 --- a/src/mame/drivers/subs.c +++ b/src/mame/drivers/subs.c @@ -49,10 +49,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0007) AM_READ(subs_control_r) AM_RANGE(0x0020, 0x0027) AM_READ(subs_coin_r) AM_RANGE(0x0060, 0x0063) AM_READ(subs_options_r) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM) - AM_RANGE(0x0800, 0x0bff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) /* A14/A15 unused, so mirror ROM */ + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM) + AM_RANGE(0x0800, 0x0bff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) /* A14/A15 unused, so mirror ROM */ ADDRESS_MAP_END @@ -69,10 +69,10 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x006a, 0x006b) AM_WRITE(subs_crash_w) AM_RANGE(0x006c, 0x006d) AM_WRITE(subs_invert1_w) AM_RANGE(0x006e, 0x006f) AM_WRITE(subs_invert2_w) - AM_RANGE(0x0090, 0x009f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0800, 0x0bff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0090, 0x009f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x0800, 0x0bff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index 5c7384d4908..c2edf39d4ee 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -100,11 +100,11 @@ static WRITE16_HANDLER( bestbest_coin_w ) ***************************************************************************/ static ADDRESS_MAP_START( bssoccer_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x200000, 0x203fff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x203fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x400000, 0x4001ff) AM_READ(suna16_paletteram16_r ) // Banked Palette - AM_RANGE(0x400200, 0x400fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x600000, 0x61ffff) AM_READ(MRA16_RAM ) // Sprites + AM_RANGE(0x400200, 0x400fff) AM_READ(SMH_RAM ) // + AM_RANGE(0x600000, 0x61ffff) AM_READ(SMH_RAM ) // Sprites AM_RANGE(0xa00000, 0xa00001) AM_READ(input_port_0_word_r ) // P1 (Inputs) AM_RANGE(0xa00002, 0xa00003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0xa00004, 0xa00005) AM_READ(input_port_2_word_r ) // P3 @@ -114,16 +114,16 @@ static ADDRESS_MAP_START( bssoccer_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bssoccer_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x200000, 0x203fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x203fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x400000, 0x4001ff) AM_WRITE(suna16_paletteram16_w ) // Banked Palette - AM_RANGE(0x400200, 0x400fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x600000, 0x61ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites + AM_RANGE(0x400200, 0x400fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x600000, 0x61ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites AM_RANGE(0xa00000, 0xa00001) AM_WRITE(suna16_soundlatch_w ) // To Sound CPU AM_RANGE(0xa00002, 0xa00003) AM_WRITE(suna16_flipscreen_w ) // Flip Screen AM_RANGE(0xa00004, 0xa00005) AM_WRITE(bssoccer_leds_w ) // Leds - AM_RANGE(0xa00006, 0xa00007) AM_WRITE(MWA16_NOP ) // ? IRQ 1 Ack - AM_RANGE(0xa00008, 0xa00009) AM_WRITE(MWA16_NOP ) // ? IRQ 2 Ack + AM_RANGE(0xa00006, 0xa00007) AM_WRITE(SMH_NOP ) // ? IRQ 1 Ack + AM_RANGE(0xa00008, 0xa00009) AM_WRITE(SMH_NOP ) // ? IRQ 2 Ack ADDRESS_MAP_END @@ -137,31 +137,31 @@ static WRITE16_HANDLER( uballoon_spriteram16_w ) } static ADDRESS_MAP_START( uballoon_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x200000, 0x2001ff) AM_READ(suna16_paletteram16_r ) // Banked Palette - AM_RANGE(0x200200, 0x200fff) AM_READ(MRA16_RAM ) // - AM_RANGE(0x400000, 0x41ffff) AM_READ(MRA16_RAM ) // Sprites + AM_RANGE(0x200200, 0x200fff) AM_READ(SMH_RAM ) // + AM_RANGE(0x400000, 0x41ffff) AM_READ(SMH_RAM ) // Sprites AM_RANGE(0x600000, 0x600001) AM_READ(input_port_0_word_r ) // P1 + Coins(Inputs) AM_RANGE(0x600002, 0x600003) AM_READ(input_port_1_word_r ) // P2 + Coins AM_RANGE(0x600004, 0x600005) AM_READ(input_port_2_word_r ) // DSW 1 AM_RANGE(0x600006, 0x600007) AM_READ(input_port_3_word_r ) // DSW 2 - AM_RANGE(0xa00000, 0xa0ffff) AM_READ(MRA16_NOP ) // Protection + AM_RANGE(0xa00000, 0xa0ffff) AM_READ(SMH_NOP ) // Protection ADDRESS_MAP_END static ADDRESS_MAP_START( uballoon_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x800000, 0x803fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x800000, 0x803fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x200000, 0x2001ff) AM_WRITE(suna16_paletteram16_w ) // Banked Palette - AM_RANGE(0x200200, 0x200fff) AM_WRITE(MWA16_RAM ) // - AM_RANGE(0x400000, 0x41ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites + AM_RANGE(0x200200, 0x200fff) AM_WRITE(SMH_RAM ) // + AM_RANGE(0x400000, 0x41ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites AM_RANGE(0x5c0000, 0x5dffff) AM_WRITE(uballoon_spriteram16_w ) // Sprites (Mirror?) AM_RANGE(0x600000, 0x600001) AM_WRITE(suna16_soundlatch_w ) // To Sound CPU AM_RANGE(0x600004, 0x600005) AM_WRITE(suna16_flipscreen_w ) // Flip Screen AM_RANGE(0x600008, 0x600009) AM_WRITE(uballoon_leds_w ) // Leds - AM_RANGE(0x60000c, 0x60000d) AM_WRITE(MWA16_NOP ) // ? IRQ 1 Ack - AM_RANGE(0x600010, 0x600011) AM_WRITE(MWA16_NOP ) // ? IRQ 1 Ack - AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(MWA16_NOP ) // Protection + AM_RANGE(0x60000c, 0x60000d) AM_WRITE(SMH_NOP ) // ? IRQ 1 Ack + AM_RANGE(0x600010, 0x600011) AM_WRITE(SMH_NOP ) // ? IRQ 1 Ack + AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(SMH_NOP ) // Protection ADDRESS_MAP_END @@ -170,24 +170,24 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( sunaq_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 + Coins AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 + Coins AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // DSW AM_RANGE(0x500006, 0x500007) AM_READ(input_port_3_word_r ) // (unused?) AM_RANGE(0x540000, 0x5401ff) AM_READ(suna16_paletteram16_r ) // Banked Palette - AM_RANGE(0x540200, 0x540fff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x580000, 0x583fff) AM_READ(MRA16_RAM ) // RAM - AM_RANGE(0x5c0000, 0x5dffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x540200, 0x540fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x580000, 0x583fff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x5c0000, 0x5dffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( sunaq_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x500000, 0x500001) AM_WRITE(suna16_soundlatch_w ) // To Sound CPU AM_RANGE(0x500002, 0x500003) AM_WRITE(suna16_flipscreen_w ) // Flip Screen AM_RANGE(0x540000, 0x5401ff) AM_WRITE(suna16_paletteram16_w ) - AM_RANGE(0x540200, 0x540fff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x580000, 0x583fff) AM_WRITE(MWA16_RAM ) // RAM + AM_RANGE(0x540200, 0x540fff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x580000, 0x583fff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x5c0000, 0x5dffff) AM_WRITE(uballoon_spriteram16_w) AM_BASE(&spriteram16 ) // Sprites ADDRESS_MAP_END @@ -250,15 +250,15 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( bssoccer_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r ) // YM2151 AM_RANGE(0xfc00, 0xfc00) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END static ADDRESS_MAP_START( bssoccer_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w ) // YM2151 AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w ) // AM_RANGE(0xfd00, 0xfd00) AM_WRITE(soundlatch2_w ) // To PCM Z80 #1 @@ -270,15 +270,15 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( uballoon_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r ) // YM2151 AM_RANGE(0xfc00, 0xfc00) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END static ADDRESS_MAP_START( uballoon_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w ) // YM2151 AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w ) // AM_RANGE(0xfc00, 0xfc00) AM_WRITE(soundlatch2_w ) // To PCM Z80 @@ -289,15 +289,15 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( sunaq_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xe82f) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0xe830, 0xf7ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0xe82f) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xe830, 0xf7ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r ) // YM2151 AM_RANGE(0xfc00, 0xfc00) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END static ADDRESS_MAP_START( sunaq_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xe82f) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0xe830, 0xf7ff) AM_WRITE(MWA8_RAM ) // RAM (writes to efxx, could be a program bug tho) + AM_RANGE(0x0000, 0xe82f) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xe830, 0xf7ff) AM_WRITE(SMH_RAM ) // RAM (writes to efxx, could be a program bug tho) AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w ) // YM2151 AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w ) // AM_RANGE(0xfc00, 0xfc00) AM_WRITE(soundlatch2_w ) // To PCM Z80 @@ -355,20 +355,20 @@ static WRITE8_HANDLER( bssoccer_pcm_2_bankswitch_w ) /* Memory maps: Yes, *no* RAM */ static ADDRESS_MAP_START( bssoccer_pcm_1_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x1000, 0xffff) AM_READ(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x1000, 0xffff) AM_READ(SMH_BANK1 ) // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( bssoccer_pcm_1_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x0000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( bssoccer_pcm_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x1000, 0xffff) AM_READ(MRA8_BANK2 ) // Banked ROM + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x1000, 0xffff) AM_READ(SMH_BANK2 ) // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( bssoccer_pcm_2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x0000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END @@ -426,11 +426,11 @@ static WRITE8_HANDLER( uballoon_pcm_1_bankswitch_w ) /* Memory maps: Yes, *no* RAM */ static ADDRESS_MAP_START( uballoon_pcm_1_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x0400, 0xffff) AM_READ(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x0400, 0xffff) AM_READ(SMH_BANK1 ) // Banked ROM ADDRESS_MAP_END static ADDRESS_MAP_START( uballoon_pcm_1_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x0000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index eb821f7a2f9..e5ea7f2e048 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -528,35 +528,35 @@ static WRITE8_HANDLER( hardhead_flipscreen_w ) } static ADDRESS_MAP_START( hardhead_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM - AM_RANGE(0xc000, 0xd7ff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0xd800, 0xd9ff) AM_READ(MRA8_RAM ) // Palette + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM + AM_RANGE(0xc000, 0xd7ff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0xd800, 0xd9ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xda00, 0xda00) AM_READ(hardhead_ip_r ) // Input Ports AM_RANGE(0xda80, 0xda80) AM_READ(soundlatch2_r ) // From Sound CPU AM_RANGE(0xdd80, 0xddff) AM_READ(hardhead_protection_r ) // Protection - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM ) // Sprites + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM ) // Sprites ADDRESS_MAP_END static ADDRESS_MAP_START( hardhead_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // Banked ROM - AM_RANGE(0xc000, 0xd7ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // Banked ROM + AM_RANGE(0xc000, 0xd7ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xd800, 0xd9ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE(&paletteram ) // Palette - AM_RANGE(0xda00, 0xda00) AM_WRITE(MWA8_RAM) AM_BASE(&hardhead_ip ) // Input Port Select + AM_RANGE(0xda00, 0xda00) AM_WRITE(SMH_RAM) AM_BASE(&hardhead_ip ) // Input Port Select AM_RANGE(0xda80, 0xda80) AM_WRITE(hardhead_bankswitch_w ) // ROM Banking AM_RANGE(0xdb00, 0xdb00) AM_WRITE(soundlatch_w ) // To Sound CPU AM_RANGE(0xdb80, 0xdb80) AM_WRITE(hardhead_flipscreen_w ) // Flip Screen + Coin Lockout - AM_RANGE(0xdc00, 0xdc00) AM_WRITE(MWA8_NOP ) // <- R (after bank select) - AM_RANGE(0xdc80, 0xdc80) AM_WRITE(MWA8_NOP ) // <- R (after bank select) - AM_RANGE(0xdd00, 0xdd00) AM_WRITE(MWA8_NOP ) // <- R (after ip select) + AM_RANGE(0xdc00, 0xdc00) AM_WRITE(SMH_NOP ) // <- R (after bank select) + AM_RANGE(0xdc80, 0xdc80) AM_WRITE(SMH_NOP ) // <- R (after bank select) + AM_RANGE(0xdd00, 0xdd00) AM_WRITE(SMH_NOP ) // <- R (after ip select) AM_RANGE(0xdd80, 0xddff) AM_WRITE(hardhead_protection_w ) // Protection AM_RANGE(0xe000, 0xffff) AM_WRITE(suna8_spriteram_w) AM_BASE(&spriteram ) // Sprites ADDRESS_MAP_END static ADDRESS_MAP_START( hardhead_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ(MRA8_NOP ) // ? IRQ Ack + AM_RANGE(0x00, 0x00) AM_READ(SMH_NOP ) // ? IRQ Ack ADDRESS_MAP_END static ADDRESS_MAP_START( hardhead_writeport, ADDRESS_SPACE_IO, 8 ) @@ -603,35 +603,35 @@ static READ8_HANDLER( rranger_soundstatus_r ) } static ADDRESS_MAP_START( rranger_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM AM_RANGE(0xc000, 0xc000) AM_READ(watchdog_reset_r ) // Watchdog (Tested!) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_0_r ) // P1 (Inputs) AM_RANGE(0xc003, 0xc003) AM_READ(input_port_1_r ) // P2 AM_RANGE(0xc004, 0xc004) AM_READ(rranger_soundstatus_r ) // Latch Status? - AM_RANGE(0xc200, 0xc200) AM_READ(MRA8_NOP ) // Protection? + AM_RANGE(0xc200, 0xc200) AM_READ(SMH_NOP ) // Protection? AM_RANGE(0xc280, 0xc280) AM_READ(input_port_2_r ) // DSW 1 AM_RANGE(0xc2c0, 0xc2c0) AM_READ(input_port_3_r ) // DSW 2 - AM_RANGE(0xc600, 0xc7ff) AM_READ(MRA8_RAM ) // Palette - AM_RANGE(0xc800, 0xdfff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM ) // Sprites + AM_RANGE(0xc600, 0xc7ff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM ) // Sprites ADDRESS_MAP_END static ADDRESS_MAP_START( rranger_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // Banked ROM AM_RANGE(0xc000, 0xc000) AM_WRITE(soundlatch_w ) // To Sound CPU AM_RANGE(0xc002, 0xc002) AM_WRITE(rranger_bankswitch_w ) // ROM Banking - AM_RANGE(0xc200, 0xc200) AM_WRITE(MWA8_NOP ) // Protection? - AM_RANGE(0xc280, 0xc280) AM_WRITE(MWA8_NOP ) // ? NMI Ack + AM_RANGE(0xc200, 0xc200) AM_WRITE(SMH_NOP ) // Protection? + AM_RANGE(0xc280, 0xc280) AM_WRITE(SMH_NOP ) // ? NMI Ack AM_RANGE(0xc600, 0xc7ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE(&paletteram ) // Palette - AM_RANGE(0xc800, 0xdfff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0xc800, 0xdfff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_WRITE(suna8_spriteram_w) AM_BASE(&spriteram ) // Sprites ADDRESS_MAP_END static ADDRESS_MAP_START( rranger_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ(MRA8_NOP ) // ? IRQ Ack + AM_RANGE(0x00, 0x00) AM_READ(SMH_NOP ) // ? IRQ Ack ADDRESS_MAP_END static ADDRESS_MAP_START( rranger_writeport, ADDRESS_SPACE_IO, 8 ) @@ -694,8 +694,8 @@ static WRITE8_HANDLER( brickzn_rombank_w ) } static ADDRESS_MAP_START( brickzn_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM AM_RANGE(0xc100, 0xc100) AM_READ(input_port_0_r ) // P1 (Buttons) AM_RANGE(0xc101, 0xc101) AM_READ(input_port_1_r ) // P2 AM_RANGE(0xc102, 0xc102) AM_READ(input_port_2_r ) // DSW 1 @@ -704,19 +704,19 @@ static ADDRESS_MAP_START( brickzn_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc10c, 0xc10c) AM_READ(input_port_5_r ) // P2 AM_RANGE(0xc140, 0xc140) AM_READ(brickzn_c140_r ) // ??? AM_RANGE(0xc600, 0xc7ff) AM_READ(suna8_banked_paletteram_r ) // Palette (Banked) - AM_RANGE(0xc800, 0xdfff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_READ(suna8_banked_spriteram_r ) // Sprites (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( brickzn_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // 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 + ? AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(brickzn_unknown_w ) // ??? AM_RANGE(0xc600, 0xc7ff) AM_WRITE(brickzn_banked_paletteram_w ) // Palette (Banked) - AM_RANGE(0xc800, 0xdfff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0xc800, 0xdfff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_WRITE(suna8_banked_spriteram_w ) // Sprites (Banked) ADDRESS_MAP_END @@ -805,21 +805,21 @@ static WRITE8_HANDLER( hardhea2_rambank_1_w ) static ADDRESS_MAP_START( hardhea2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r ) // P1 (Inputs) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r ) // P2 AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r ) // DSW 1 AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r ) // DSW 2 AM_RANGE(0xc080, 0xc080) AM_READ(input_port_4_r ) // vblank? - AM_RANGE(0xc600, 0xc7ff) AM_READ(MRA8_RAM ) // Palette (Banked??) - AM_RANGE(0xc800, 0xdfff) AM_READ(MRA8_BANK2 ) // RAM (Banked?) + AM_RANGE(0xc600, 0xc7ff) AM_READ(SMH_RAM ) // Palette (Banked??) + AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_BANK2 ) // RAM (Banked?) AM_RANGE(0xe000, 0xffff) AM_READ(suna8_banked_spriteram_r ) // Sprites (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( hardhea2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // Banked ROM AM_RANGE(0xc200, 0xc200) AM_WRITE(hardhea2_spritebank_w ) // Sprite RAM Bank AM_RANGE(0xc280, 0xc280) AM_WRITE(hardhea2_rombank_w ) // ROM Bank (?mirrored up to c2ff?) @@ -830,7 +830,7 @@ static ADDRESS_MAP_START( hardhea2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc300, 0xc300) AM_WRITE(hardhea2_flipscreen_w ) // Flip Screen AM_RANGE(0xc380, 0xc380) AM_WRITE(hardhea2_nmi_w ) // ? NMI related ? AM_RANGE(0xc400, 0xc400) AM_WRITE(hardhea2_leds_w ) // Leds + Coin Counter - AM_RANGE(0xc480, 0xc480) AM_WRITE(MWA8_NOP ) // ~ROM Bank + AM_RANGE(0xc480, 0xc480) AM_WRITE(SMH_NOP ) // ~ROM Bank AM_RANGE(0xc500, 0xc500) AM_WRITE(soundlatch_w ) // To Sound CPU // *** Protection @@ -848,7 +848,7 @@ static ADDRESS_MAP_START( hardhea2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) // Protection *** AM_RANGE(0xc600, 0xc7ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE(&paletteram ) // Palette (Banked??) - AM_RANGE(0xc800, 0xdfff) AM_WRITE(MWA8_BANK2 ) // RAM (Banked?) + AM_RANGE(0xc800, 0xdfff) AM_WRITE(SMH_BANK2 ) // RAM (Banked?) AM_RANGE(0xe000, 0xffff) AM_WRITE(suna8_banked_spriteram_w ) // Sprites (Banked) ADDRESS_MAP_END @@ -870,20 +870,20 @@ static WRITE8_HANDLER( starfigh_spritebank_w ) } static ADDRESS_MAP_START( starfigh_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r ) // P1 (Inputs) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r ) // P2 AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r ) // DSW 1 AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r ) // DSW 2 AM_RANGE(0xc600, 0xc7ff) AM_READ(suna8_banked_paletteram_r ) // Palette (Banked??) - AM_RANGE(0xc800, 0xdfff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_READ(suna8_banked_spriteram_r ) // Sprites (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( starfigh_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // Banked ROM AM_RANGE(0xc200, 0xc200) AM_WRITE(starfigh_spritebank_w ) // Sprite RAM Bank AM_RANGE(0xc380, 0xc3ff) AM_WRITE(starfigh_spritebank_latch_w ) // Sprite RAM Bank AM_RANGE(0xc280, 0xc280) AM_WRITE(hardhea2_rombank_w ) // ROM Bank (?mirrored up to c2ff?) @@ -891,7 +891,7 @@ static ADDRESS_MAP_START( starfigh_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc400, 0xc400) AM_WRITE(hardhea2_leds_w ) // Leds + Coin Counter AM_RANGE(0xc500, 0xc500) AM_WRITE(soundlatch_w ) // To Sound CPU AM_RANGE(0xc600, 0xc7ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE(&paletteram ) // Palette (Banked??) - AM_RANGE(0xc800, 0xdfff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0xc800, 0xdfff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_WRITE(suna8_banked_spriteram_w ) // Sprites (Banked) ADDRESS_MAP_END @@ -964,22 +964,22 @@ static READ8_HANDLER( sparkman_c0a3_r ) } static ADDRESS_MAP_START( sparkman_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r ) // P1 (Inputs) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r ) // P2 AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r ) // DSW 1 AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r ) // DSW 2 AM_RANGE(0xc080, 0xc080) AM_READ(input_port_4_r ) // Buttons AM_RANGE(0xc0a3, 0xc0a3) AM_READ(sparkman_c0a3_r ) // ??? - AM_RANGE(0xc600, 0xc7ff) AM_READ(MRA8_RAM ) // Palette (Banked??) - AM_RANGE(0xc800, 0xdfff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0xc600, 0xc7ff) AM_READ(SMH_RAM ) // Palette (Banked??) + AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_READ(suna8_banked_spriteram_r ) // Sprites (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( sparkman_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // Banked ROM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // Banked ROM AM_RANGE(0xc200, 0xc200) AM_WRITE(sparkman_spritebank_w ) // Sprite RAM Bank AM_RANGE(0xc280, 0xc280) AM_WRITE(sparkman_rombank_w ) // ROM Bank (?mirrored up to c2ff?) AM_RANGE(0xc300, 0xc300) AM_WRITE(sparkman_flipscreen_w ) // Flip Screen @@ -987,7 +987,7 @@ static ADDRESS_MAP_START( sparkman_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc400, 0xc400) AM_WRITE(sparkman_leds_w ) // Leds + Coin Counter AM_RANGE(0xc500, 0xc500) AM_WRITE(soundlatch_w ) // To Sound CPU AM_RANGE(0xc600, 0xc7ff) AM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE(&paletteram ) // Palette (Banked??) - AM_RANGE(0xc800, 0xdfff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0xc800, 0xdfff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_WRITE(suna8_banked_spriteram_w ) // Sprites (Banked) ADDRESS_MAP_END @@ -1005,15 +1005,15 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( hardhead_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xc800, 0xc800) AM_READ(YM3812_status_port_0_r ) // ? unsure AM_RANGE(0xd800, 0xd800) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END static ADDRESS_MAP_START( hardhead_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xd000, 0xd000) AM_WRITE(soundlatch2_w ) // AM_RANGE(0xa000, 0xa000) AM_WRITE(YM3812_control_port_0_w ) // YM3812 AM_RANGE(0xa001, 0xa001) AM_WRITE(YM3812_write_port_0_w ) @@ -1023,7 +1023,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hardhead_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_READ(MRA8_NOP ) // ? IRQ Ack + AM_RANGE(0x01, 0x01) AM_READ(SMH_NOP ) // ? IRQ Ack ADDRESS_MAP_END static ADDRESS_MAP_START( hardhead_sound_writeport, ADDRESS_SPACE_IO, 8 ) @@ -1037,14 +1037,14 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( rranger_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xd800, 0xd800) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END static ADDRESS_MAP_START( rranger_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xd000, 0xd000) AM_WRITE(soundlatch2_w ) // AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w ) // YM2203 AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w ) @@ -1066,18 +1066,18 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( brickzn_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r ) // From Main CPU ADDRESS_MAP_END static ADDRESS_MAP_START( brickzn_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0xc000, 0xc000) AM_WRITE(YM3812_control_port_0_w ) // YM3812 AM_RANGE(0xc001, 0xc001) AM_WRITE(YM3812_write_port_0_w ) AM_RANGE(0xc002, 0xc002) AM_WRITE(AY8910_control_port_0_w ) // AY8910 AM_RANGE(0xc003, 0xc003) AM_WRITE(AY8910_write_port_0_w ) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch2_w ) // To PCM CPU ADDRESS_MAP_END @@ -1093,10 +1093,10 @@ ADDRESS_MAP_END /* PCM Z80 , 4 DACs (4 bits per sample), NO RAM !! */ static ADDRESS_MAP_START( brickzn_pcm_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xffff) AM_READ(MRA8_ROM ) // ROM + AM_RANGE(0x0000, 0xffff) AM_READ(SMH_ROM ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( brickzn_pcm_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x0000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index 497a0d96e00..1f762c1a4ed 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -60,59 +60,59 @@ static WRITE16_HANDLER( sound_w ) /******************************************************************************/ static ADDRESS_MAP_START( supbtime_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(supbtime_controls_r) - AM_RANGE(0x320000, 0x321fff) AM_READ(MRA16_RAM) - AM_RANGE(0x322000, 0x323fff) AM_READ(MRA16_RAM) - AM_RANGE(0x340000, 0x3407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x342000, 0x3427ff) AM_READ(MRA16_RAM) + AM_RANGE(0x320000, 0x321fff) AM_READ(SMH_RAM) + AM_RANGE(0x322000, 0x323fff) AM_READ(SMH_RAM) + AM_RANGE(0x340000, 0x3407ff) AM_READ(SMH_RAM) + AM_RANGE(0x342000, 0x3427ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( supbtime_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x104000, 0x11ffff) AM_WRITE(MWA16_NOP) /* Nothing there */ - AM_RANGE(0x120000, 0x1207ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) - AM_RANGE(0x120800, 0x13ffff) AM_WRITE(MWA16_NOP) /* Nothing there */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x104000, 0x11ffff) AM_WRITE(SMH_NOP) /* Nothing there */ + AM_RANGE(0x120000, 0x1207ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x120800, 0x13ffff) AM_WRITE(SMH_NOP) /* Nothing there */ AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x18000a, 0x18000d) AM_WRITE(MWA16_NOP) + AM_RANGE(0x18000a, 0x18000d) AM_WRITE(SMH_NOP) AM_RANGE(0x1a0000, 0x1a0001) AM_WRITE(sound_w) - AM_RANGE(0x300000, 0x30000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x300000, 0x30000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x320000, 0x321fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x322000, 0x323fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x340000, 0x3407ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) - AM_RANGE(0x342000, 0x3427ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) + AM_RANGE(0x340000, 0x3407ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) + AM_RANGE(0x342000, 0x3427ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) ADDRESS_MAP_END static ADDRESS_MAP_START( chinatwn_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(supbtime_controls_r) - AM_RANGE(0x1a0000, 0x1a3fff) AM_READ(MRA16_RAM) - AM_RANGE(0x320000, 0x321fff) AM_READ(MRA16_RAM) - AM_RANGE(0x322000, 0x323fff) AM_READ(MRA16_RAM) - AM_RANGE(0x340000, 0x3407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x342000, 0x3427ff) AM_READ(MRA16_RAM) + AM_RANGE(0x1a0000, 0x1a3fff) AM_READ(SMH_RAM) + AM_RANGE(0x320000, 0x321fff) AM_READ(SMH_RAM) + AM_RANGE(0x322000, 0x323fff) AM_READ(SMH_RAM) + AM_RANGE(0x340000, 0x3407ff) AM_READ(SMH_RAM) + AM_RANGE(0x342000, 0x3427ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( chinatwn_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(sound_w) - AM_RANGE(0x120000, 0x1207ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x120000, 0x1207ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x18000a, 0x18000d) AM_WRITE(MWA16_NOP) - AM_RANGE(0x1a0000, 0x1a3fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x18000a, 0x18000d) AM_WRITE(SMH_NOP) + AM_RANGE(0x1a0000, 0x1a3fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x300000, 0x30000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x300000, 0x30000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x320000, 0x321fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x322000, 0x323fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x340000, 0x3407ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) // unused - AM_RANGE(0x342000, 0x3427ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) // unused + AM_RANGE(0x340000, 0x3407ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) // unused + AM_RANGE(0x342000, 0x3427ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) // unused ADDRESS_MAP_END /******************************************************************************/ @@ -131,22 +131,22 @@ static WRITE8_HANDLER( YM2151_w ) /* Physical memory map (21 bits) */ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_READ(MRA8_NOP) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) - AM_RANGE(0x130000, 0x130001) AM_READ(MRA8_NOP) /* This board only has 1 oki chip */ + AM_RANGE(0x130000, 0x130001) AM_READ(SMH_NOP) /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA8_NOP) /* YM2203 - this board doesn't have one */ + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) /* YM2203 - this board doesn't have one */ AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) - AM_RANGE(0x130000, 0x130001) AM_WRITE(MWA8_NOP) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x130000, 0x130001) AM_WRITE(SMH_NOP) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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/supdrapo.c b/src/mame/drivers/supdrapo.c index b6498e08a33..211045d9eee 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -44,10 +44,10 @@ WRITE8_HANDLER( supdrapo_char_bank_w ) #endif static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x4fff) AM_READ(MRA8_ROM) - AM_RANGE(0x5800, 0x5817) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x67ff) AM_READ(MRA8_RAM) - AM_RANGE(0x6c00, 0x6fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x4fff) AM_READ(SMH_ROM) + AM_RANGE(0x5800, 0x5817) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM) + AM_RANGE(0x6c00, 0x6fff) AM_READ(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_READ(input_port_4_r) //? AM_RANGE(0x8001, 0x8001) AM_READ(input_port_0_r) //input AM_RANGE(0x8002, 0x8002) AM_READ(input_port_1_r) //input @@ -55,28 +55,28 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8004, 0x8004) AM_READ(input_port_3_r) //input AM_RANGE(0x8005, 0x8005) AM_READ(input_port_6_r) //? AM_RANGE(0x8006, 0x8006) AM_READ(input_port_5_r) //dip? - AM_RANGE(0x9000, 0x9097) AM_READ(MRA8_RAM) - AM_RANGE(0x909d, 0x909d) AM_READ(MRA8_RAM) + AM_RANGE(0x9000, 0x9097) AM_READ(SMH_RAM) + AM_RANGE(0x909d, 0x909d) AM_READ(SMH_RAM) AM_RANGE(0x9400, 0x9400) AM_READ(input_port_7_r) //need check ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x4fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x5000, 0x50ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x5800, 0x5837) AM_WRITE(MWA8_RAM) //every 2, starts 5801 - AM_RANGE(0x583b, 0x583b) AM_WRITE(MWA8_RAM) - AM_RANGE(0x6000, 0x67ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x4fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x5000, 0x50ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x5800, 0x5837) AM_WRITE(SMH_RAM) //every 2, starts 5801 + AM_RANGE(0x583b, 0x583b) AM_WRITE(SMH_RAM) + AM_RANGE(0x6000, 0x67ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6800, 0x6bff) AM_WRITE(supdrapo_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x6c00, 0x6fff) AM_WRITE(MWA8_RAM) AM_BASE(&char_bank) - AM_RANGE(0x7000, 0x77ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x7800, 0x7c00) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0x8000) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8003, 0x8003) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8004, 0x8004) AM_WRITE(MWA8_RAM) - AM_RANGE(0x9000, 0x9097) AM_WRITE(MWA8_RAM) - AM_RANGE(0x9081, 0x9081) AM_WRITE(MWA8_RAM) - AM_RANGE(0x909d, 0x909d) AM_WRITE(MWA8_RAM) + AM_RANGE(0x6c00, 0x6fff) AM_WRITE(SMH_RAM) AM_BASE(&char_bank) + AM_RANGE(0x7000, 0x77ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x7800, 0x7c00) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_RAM) + AM_RANGE(0x8003, 0x8003) AM_WRITE(SMH_RAM) + AM_RANGE(0x8004, 0x8004) AM_WRITE(SMH_RAM) + AM_RANGE(0x9000, 0x9097) AM_WRITE(SMH_RAM) + AM_RANGE(0x9081, 0x9081) AM_WRITE(SMH_RAM) + AM_RANGE(0x909d, 0x909d) AM_WRITE(SMH_RAM) AM_RANGE(0x9800, 0x9800) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x9801, 0x9801) AM_WRITE(AY8910_control_port_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c index e6afda14611..df6f75c8f80 100644 --- a/src/mame/drivers/superchs.c +++ b/src/mame/drivers/superchs.c @@ -230,45 +230,45 @@ static WRITE32_HANDLER( superchs_stick_w ) ***********************************************************/ static ADDRESS_MAP_START( superchs_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_READ(MRA32_RAM) /* main CPUA ram */ - AM_RANGE(0x140000, 0x141fff) AM_READ(MRA32_RAM) /* Sprite ram */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_READ(SMH_RAM) /* main CPUA ram */ + AM_RANGE(0x140000, 0x141fff) AM_READ(SMH_RAM) /* Sprite ram */ AM_RANGE(0x180000, 0x18ffff) AM_READ(TC0480SCP_long_r) AM_RANGE(0x1b0000, 0x1b002f) AM_READ(TC0480SCP_ctrl_long_r) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA32_RAM) /* Shared ram */ - AM_RANGE(0x280000, 0x287fff) AM_READ(MRA32_RAM) /* Palette ram */ - AM_RANGE(0x2c0000, 0x2c07ff) AM_READ(MRA32_RAM) /* Sound shared ram */ + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) /* Shared ram */ + AM_RANGE(0x280000, 0x287fff) AM_READ(SMH_RAM) /* Palette ram */ + AM_RANGE(0x2c0000, 0x2c07ff) AM_READ(SMH_RAM) /* Sound shared ram */ AM_RANGE(0x300000, 0x300007) AM_READ(superchs_input_r) AM_RANGE(0x340000, 0x340003) AM_READ(superchs_stick_r) /* stick coord read */ ADDRESS_MAP_END static ADDRESS_MAP_START( superchs_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x100000, 0x11ffff) AM_WRITE(MWA32_RAM) AM_BASE(&superchs_ram) - AM_RANGE(0x140000, 0x141fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x11ffff) AM_WRITE(SMH_RAM) AM_BASE(&superchs_ram) + AM_RANGE(0x140000, 0x141fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x180000, 0x18ffff) AM_WRITE(TC0480SCP_long_w) AM_RANGE(0x1b0000, 0x1b002f) AM_WRITE(TC0480SCP_ctrl_long_w) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA32_RAM) AM_BASE(&shared_ram) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_BASE(&shared_ram) AM_RANGE(0x240000, 0x240003) AM_WRITE(cpua_ctrl_w) AM_RANGE(0x280000, 0x287fff) AM_WRITE(superchs_palette_w) AM_BASE(&paletteram32) - AM_RANGE(0x2c0000, 0x2c07ff) AM_WRITE(MWA32_RAM) AM_BASE(&f3_shared_ram) + AM_RANGE(0x2c0000, 0x2c07ff) AM_WRITE(SMH_RAM) AM_BASE(&f3_shared_ram) AM_RANGE(0x300000, 0x300007) AM_WRITE(superchs_input_w) /* eerom etc. */ AM_RANGE(0x340000, 0x340003) AM_WRITE(superchs_stick_w) /* stick int request */ ADDRESS_MAP_END static ADDRESS_MAP_START( superchs_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) /* local ram */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) /* local ram */ AM_RANGE(0x800000, 0x80ffff) AM_READ(shared_ram_r) - AM_RANGE(0xa00000, 0xa001ff) AM_READ(MRA16_RAM) + AM_RANGE(0xa00000, 0xa001ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( superchs_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x600000, 0x60ffff) AM_WRITE(TC0480SCP_word_w) /* Only written upon errors */ AM_RANGE(0x800000, 0x80ffff) AM_WRITE(shared_ram_w) - AM_RANGE(0xa00000, 0xa001ff) AM_WRITE(MWA16_RAM) /* Extra road control?? */ + AM_RANGE(0xa00000, 0xa001ff) AM_WRITE(SMH_RAM) /* Extra road control?? */ ADDRESS_MAP_END /***********************************************************/ diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index 7f8edc55213..cfbaac81b46 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -496,40 +496,40 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) AM_RANGE(0xe000, 0xe0ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xe100, 0xe7ff) AM_RAM - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, superqix_videoram_w) AM_BASE(&superqix_videoram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, superqix_videoram_w) AM_BASE(&superqix_videoram) AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END static ADDRESS_MAP_START( pbillian_port_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READWRITE(MRA8_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) + AM_RANGE(0x0000, 0x01ff) AM_READWRITE(SMH_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r) AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x0408, 0x0408) AM_READ(pbillian_from_mcu_r) AM_RANGE(0x0408, 0x0408) AM_WRITE(pbillian_z80_mcu_w) AM_RANGE(0x0410, 0x0410) AM_WRITE(pbillian_0410_w) - AM_RANGE(0x0418, 0x0418) AM_READ(MRA8_NOP) //? - AM_RANGE(0x0419, 0x0419) AM_WRITE(MWA8_NOP) //? watchdog ? + AM_RANGE(0x0418, 0x0418) AM_READ(SMH_NOP) //? + AM_RANGE(0x0419, 0x0419) AM_WRITE(SMH_NOP) //? watchdog ? AM_RANGE(0x041a, 0x041a) AM_WRITE(pbillian_sample_trigger_w) - AM_RANGE(0x041b, 0x041b) AM_READ(MRA8_NOP) // input related? but probably not used + AM_RANGE(0x041b, 0x041b) AM_READ(SMH_NOP) // input related? but probably not used ADDRESS_MAP_END static ADDRESS_MAP_START( hotsmash_port_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READWRITE(MRA8_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) + AM_RANGE(0x0000, 0x01ff) AM_READWRITE(SMH_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r) AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x0408, 0x0408) AM_READ(hotsmash_from_mcu_r) AM_RANGE(0x0408, 0x0408) AM_WRITE(hotsmash_z80_mcu_w) AM_RANGE(0x0410, 0x0410) AM_WRITE(pbillian_0410_w) - AM_RANGE(0x0418, 0x0418) AM_READ(MRA8_NOP) //? - AM_RANGE(0x0419, 0x0419) AM_WRITE(MWA8_NOP) //? watchdog ? + AM_RANGE(0x0418, 0x0418) AM_READ(SMH_NOP) //? + AM_RANGE(0x0419, 0x0419) AM_WRITE(SMH_NOP) //? watchdog ? AM_RANGE(0x041a, 0x041a) AM_WRITE(pbillian_sample_trigger_w) - AM_RANGE(0x041b, 0x041b) AM_READ(MRA8_NOP) // input related? but probably not used + AM_RANGE(0x041b, 0x041b) AM_READ(SMH_NOP) // input related? but probably not used ADDRESS_MAP_END static ADDRESS_MAP_START( sqix_port_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_READWRITE(MRA8_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) + AM_RANGE(0x0000, 0x00ff) AM_READWRITE(SMH_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r) AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w) @@ -539,12 +539,12 @@ static ADDRESS_MAP_START( sqix_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0408, 0x0408) AM_READ(mcu_acknowledge_r) AM_RANGE(0x0410, 0x0410) AM_WRITE(superqix_0410_w) /* ROM bank, NMI enable, tile bank */ AM_RANGE(0x0418, 0x0418) AM_READ(nmi_ack_r) - AM_RANGE(0x0800, 0x77ff) AM_READWRITE(MRA8_RAM, superqix_bitmapram_w) AM_BASE(&superqix_bitmapram) - AM_RANGE(0x8800, 0xf7ff) AM_READWRITE(MRA8_RAM, superqix_bitmapram2_w) AM_BASE(&superqix_bitmapram2) + AM_RANGE(0x0800, 0x77ff) AM_READWRITE(SMH_RAM, superqix_bitmapram_w) AM_BASE(&superqix_bitmapram) + AM_RANGE(0x8800, 0xf7ff) AM_READWRITE(SMH_RAM, superqix_bitmapram2_w) AM_BASE(&superqix_bitmapram2) ADDRESS_MAP_END static ADDRESS_MAP_START( bootleg_port_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_READWRITE(MRA8_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) + AM_RANGE(0x0000, 0x00ff) AM_READWRITE(SMH_RAM, paletteram_BBGGRRII_w) AM_BASE(&paletteram) AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r) AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w) @@ -554,8 +554,8 @@ static ADDRESS_MAP_START( bootleg_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0408, 0x0408) AM_WRITE(bootleg_flipscreen_w) AM_RANGE(0x0410, 0x0410) AM_WRITE(superqix_0410_w) /* ROM bank, NMI enable, tile bank */ AM_RANGE(0x0418, 0x0418) AM_READ(input_port_2_r) - AM_RANGE(0x0800, 0x77ff) AM_READWRITE(MRA8_RAM, superqix_bitmapram_w) AM_BASE(&superqix_bitmapram) - AM_RANGE(0x8800, 0xf7ff) AM_READWRITE(MRA8_RAM, superqix_bitmapram2_w) AM_BASE(&superqix_bitmapram2) + AM_RANGE(0x0800, 0x77ff) AM_READWRITE(SMH_RAM, superqix_bitmapram_w) AM_BASE(&superqix_bitmapram) + AM_RANGE(0x8800, 0xf7ff) AM_READWRITE(SMH_RAM, superqix_bitmapram2_w) AM_BASE(&superqix_bitmapram2) ADDRESS_MAP_END diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index cef14a20d60..5b61066217c 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -308,7 +308,7 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( supertnk_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x0000, 0x0000) AM_WRITE(MWA8_NOP) + AM_RANGE(0x0000, 0x0000) AM_WRITE(SMH_NOP) AM_RANGE(0x0400, 0x0400) AM_WRITE(supertnk_bitplane_select_0_w) AM_RANGE(0x0401, 0x0401) AM_WRITE(supertnk_bitplane_select_1_w) AM_RANGE(0x0402, 0x0402) AM_WRITE(supertnk_bankswitch_0_w) diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index f89161b93c3..0c809a92881 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -77,10 +77,10 @@ static VIDEO_UPDATE( suprgolf ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x4000, 0x4000) AM_WRITE( rom2_bank_select_w ) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK2) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2) AM_RANGE(0xc000, 0xcfff) AM_RAM AM_RANGE(0xd000, 0xdfff) AM_RAM diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c index 686f76d9236..0045eb3c2f3 100644 --- a/src/mame/drivers/suprnova.c +++ b/src/mame/drivers/suprnova.c @@ -859,49 +859,49 @@ static WRITE32_HANDLER( skns_ymz280_w ) } static ADDRESS_MAP_START( skns_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x0007ffff) AM_READ(MRA32_ROM) /* BIOS ROM */ + AM_RANGE(0x00000000, 0x0007ffff) AM_READ(SMH_ROM) /* BIOS ROM */ AM_RANGE(0x00400000, 0x00400003) AM_READ(nova_input_port_0_r) AM_RANGE(0x00400004, 0x00400007) AM_READ(nova_input_port_dip_r) - AM_RANGE(0x00400008, 0x0040000b) AM_READ(MRA32_RAM) + AM_RANGE(0x00400008, 0x0040000b) AM_READ(SMH_RAM) /* In between is write only */ AM_RANGE(0x0040000c, 0x0040000f) AM_READ(nova_input_port_3_r) - AM_RANGE(0x00800000, 0x00801fff) AM_READ(MRA32_RAM) /* 'backup' RAM */ + AM_RANGE(0x00800000, 0x00801fff) AM_READ(SMH_RAM) /* 'backup' RAM */ // AM_RANGE(0x00c00000, 0x00c00003) AM_READ(skns_ymz280_r) /* ymz280 (sound) */ AM_RANGE(0x01000000, 0x0100000f) AM_READ(skns_msm6242_r) - AM_RANGE(0x02000000, 0x02003fff) AM_READ(MRA32_RAM) /* 'spc' RAM */ - AM_RANGE(0x02100000, 0x0210003f) AM_READ(MRA32_RAM) /* 'spc' */ - AM_RANGE(0x02400000, 0x0240007f) AM_READ(MRA32_RAM) /* 'v3' */ - AM_RANGE(0x02500000, 0x02507fff) AM_READ(MRA32_RAM) /* 'v3tbl' RAM */ - AM_RANGE(0x02600000, 0x02607fff) AM_READ(MRA32_RAM) /* 'v3slc' RAM */ - AM_RANGE(0x02a00000, 0x02a0001f) AM_READ(MRA32_RAM) /* skns_pal_regs */ - AM_RANGE(0x02a40000, 0x02a5ffff) AM_READ(MRA32_RAM) /* 'palette' RAM */ + AM_RANGE(0x02000000, 0x02003fff) AM_READ(SMH_RAM) /* 'spc' RAM */ + AM_RANGE(0x02100000, 0x0210003f) AM_READ(SMH_RAM) /* 'spc' */ + AM_RANGE(0x02400000, 0x0240007f) AM_READ(SMH_RAM) /* 'v3' */ + AM_RANGE(0x02500000, 0x02507fff) AM_READ(SMH_RAM) /* 'v3tbl' RAM */ + AM_RANGE(0x02600000, 0x02607fff) AM_READ(SMH_RAM) /* 'v3slc' RAM */ + AM_RANGE(0x02a00000, 0x02a0001f) AM_READ(SMH_RAM) /* skns_pal_regs */ + AM_RANGE(0x02a40000, 0x02a5ffff) AM_READ(SMH_RAM) /* 'palette' RAM */ AM_RANGE(0x02f00000, 0x02f000ff) AM_READ(skns_hit_r) /* hit */ - AM_RANGE(0x04000000, 0x041fffff) AM_READ(MRA32_BANK1) /* GAME ROM */ - AM_RANGE(0x04800000, 0x0483ffff) AM_READ(MRA32_RAM) /* 'v3t' RAM */ - AM_RANGE(0x06000000, 0x060fffff) AM_READ(MRA32_RAM) /* 'main' RAM */ - AM_RANGE(0xc0000000, 0xc0000fff) AM_READ(MRA32_RAM) /* 'cache' RAM */ + AM_RANGE(0x04000000, 0x041fffff) AM_READ(SMH_BANK1) /* GAME ROM */ + AM_RANGE(0x04800000, 0x0483ffff) AM_READ(SMH_RAM) /* 'v3t' RAM */ + AM_RANGE(0x06000000, 0x060fffff) AM_READ(SMH_RAM) /* 'main' RAM */ + AM_RANGE(0xc0000000, 0xc0000fff) AM_READ(SMH_RAM) /* 'cache' RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( skns_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x00000000, 0x0007ffff) AM_WRITE(MWA32_ROM) /* BIOS ROM */ + AM_RANGE(0x00000000, 0x0007ffff) AM_WRITE(SMH_ROM) /* BIOS ROM */ AM_RANGE(0x00400000, 0x0040000f) AM_WRITE(skns_io_w) /* I/O Write */ - AM_RANGE(0x00800000, 0x00801fff) AM_WRITE(MWA32_RAM) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) /* 'backup' RAM */ + AM_RANGE(0x00800000, 0x00801fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram32) AM_SIZE(&generic_nvram_size) /* 'backup' RAM */ AM_RANGE(0x00c00000, 0x00c00003) AM_WRITE(skns_ymz280_w) /* ymz280_w (sound) */ AM_RANGE(0x01000000, 0x0100000f) AM_WRITE(skns_msm6242_w) AM_RANGE(0x01800000, 0x01800003) AM_WRITE(skns_hit2_w) - AM_RANGE(0x02000000, 0x02003fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) /* sprite ram */ - AM_RANGE(0x02100000, 0x0210003f) AM_WRITE(MWA32_RAM) AM_BASE(&skns_spc_regs) /* sprite registers */ + AM_RANGE(0x02000000, 0x02003fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) /* sprite ram */ + AM_RANGE(0x02100000, 0x0210003f) AM_WRITE(SMH_RAM) AM_BASE(&skns_spc_regs) /* sprite registers */ AM_RANGE(0x02400000, 0x0240007f) AM_WRITE(skns_v3_regs_w) AM_BASE(&skns_v3_regs) /* tilemap registers */ AM_RANGE(0x02500000, 0x02503fff) AM_WRITE(skns_tilemapA_w) AM_BASE(&skns_tilemapA_ram) /* tilemap A */ AM_RANGE(0x02504000, 0x02507fff) AM_WRITE(skns_tilemapB_w) AM_BASE(&skns_tilemapB_ram) /* tilemap B */ - AM_RANGE(0x02600000, 0x02607fff) AM_WRITE(MWA32_RAM) AM_BASE(&skns_v3slc_ram) /* tilemap linescroll */ + AM_RANGE(0x02600000, 0x02607fff) AM_WRITE(SMH_RAM) AM_BASE(&skns_v3slc_ram) /* tilemap linescroll */ AM_RANGE(0x02a00000, 0x02a0001f) AM_WRITE(skns_pal_regs_w) AM_BASE(&skns_pal_regs) AM_RANGE(0x02a40000, 0x02a5ffff) AM_WRITE(skns_palette_ram_w) AM_BASE(&skns_palette_ram) AM_RANGE(0x02f00000, 0x02f000ff) AM_WRITE(skns_hit_w) - AM_RANGE(0x04000000, 0x041fffff) AM_WRITE(MWA32_ROM) /* GAME ROM */ + AM_RANGE(0x04000000, 0x041fffff) AM_WRITE(SMH_ROM) /* GAME ROM */ AM_RANGE(0x04800000, 0x0483ffff) AM_WRITE(skns_v3t_w) AM_BASE(&skns_v3t_ram) /* tilemap b ram based tiles */ - AM_RANGE(0x06000000, 0x060fffff) AM_WRITE(MWA32_RAM) AM_BASE(&skns_main_ram) - AM_RANGE(0xc0000000, 0xc0000fff) AM_WRITE(MWA32_RAM) AM_BASE(&skns_cache_ram) /* 'cache' RAM */ + AM_RANGE(0x06000000, 0x060fffff) AM_WRITE(SMH_RAM) AM_BASE(&skns_main_ram) + AM_RANGE(0xc0000000, 0xc0000fff) AM_WRITE(SMH_RAM) AM_BASE(&skns_cache_ram) /* 'cache' RAM */ ADDRESS_MAP_END /***** GFX DECODE *****/ diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c index 32bceef9835..22cda53506a 100644 --- a/src/mame/drivers/suprridr.c +++ b/src/mame/drivers/suprridr.c @@ -164,8 +164,8 @@ static WRITE8_HANDLER( coin_lock_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8bff) AM_READWRITE(MRA8_RAM, suprridr_bgram_w) AM_BASE(&suprridr_bgram) - AM_RANGE(0x9000, 0x97ff) AM_READWRITE(MRA8_RAM, suprridr_fgram_w) AM_BASE(&suprridr_fgram) + AM_RANGE(0x8800, 0x8bff) AM_READWRITE(SMH_RAM, suprridr_bgram_w) AM_BASE(&suprridr_bgram) + AM_RANGE(0x9000, 0x97ff) AM_READWRITE(SMH_RAM, suprridr_fgram_w) AM_BASE(&suprridr_fgram) AM_RANGE(0x9800, 0x983f) AM_RAM AM_RANGE(0x9840, 0x987f) AM_RAM AM_BASE(&spriteram) AM_RANGE(0x9880, 0x9bff) AM_RAM diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index 626331523b3..39ab6fab02a 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -135,14 +135,14 @@ static WRITE8_HANDLER( suprslam_sh_bankswitch_w ) /*** MEMORY MAPS *************************************************************/ static ADDRESS_MAP_START( suprslam_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0xfb0000, 0xfb1fff) AM_READ(MRA16_RAM) - AM_RANGE(0xfc0000, 0xfcffff) AM_READ(MRA16_RAM) - AM_RANGE(0xfd0000, 0xfdffff) AM_READ(MRA16_RAM) - AM_RANGE(0xfe0000, 0xfe0fff) AM_READ(MRA16_RAM) - AM_RANGE(0xff0000, 0xff1fff) AM_READ(MRA16_RAM) - AM_RANGE(0xff8000, 0xff8fff) AM_READ(MRA16_RAM) - AM_RANGE(0xffa000, 0xffafff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0xfb0000, 0xfb1fff) AM_READ(SMH_RAM) + AM_RANGE(0xfc0000, 0xfcffff) AM_READ(SMH_RAM) + AM_RANGE(0xfd0000, 0xfdffff) AM_READ(SMH_RAM) + AM_RANGE(0xfe0000, 0xfe0fff) AM_READ(SMH_RAM) + AM_RANGE(0xff0000, 0xff1fff) AM_READ(SMH_RAM) + AM_RANGE(0xff8000, 0xff8fff) AM_READ(SMH_RAM) + AM_RANGE(0xffa000, 0xffafff) AM_READ(SMH_RAM) AM_RANGE(0xfff000, 0xfff001) AM_READ(input_port_0_word_r) AM_RANGE(0xfff002, 0xfff003) AM_READ(input_port_1_word_r) AM_RANGE(0xfff004, 0xfff005) AM_READ(input_port_2_word_r) @@ -151,30 +151,30 @@ static ADDRESS_MAP_START( suprslam_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( suprslam_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0xfb0000, 0xfb1fff) AM_WRITE(MWA16_RAM) AM_BASE(&suprslam_spriteram) - AM_RANGE(0xfc0000, 0xfcffff) AM_WRITE(MWA16_RAM) AM_BASE(&suprslam_sp_videoram) - AM_RANGE(0xfd0000, 0xfdffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xfb0000, 0xfb1fff) AM_WRITE(SMH_RAM) AM_BASE(&suprslam_spriteram) + AM_RANGE(0xfc0000, 0xfcffff) AM_WRITE(SMH_RAM) AM_BASE(&suprslam_sp_videoram) + AM_RANGE(0xfd0000, 0xfdffff) AM_WRITE(SMH_RAM) AM_RANGE(0xfe0000, 0xfe0fff) AM_WRITE(suprslam_screen_videoram_w) AM_BASE(&suprslam_screen_videoram) AM_RANGE(0xff0000, 0xff1fff) AM_WRITE(suprslam_bg_videoram_w) AM_BASE(&suprslam_bg_videoram) -// AM_RANGE(0xff2000, 0xff203f) AM_WRITE(MWA16_RAM) /* ?? */ - AM_RANGE(0xff8000, 0xff8fff) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_linectrl) +// AM_RANGE(0xff2000, 0xff203f) AM_WRITE(SMH_RAM) /* ?? */ + AM_RANGE(0xff8000, 0xff8fff) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_linectrl) AM_RANGE(0xff9000, 0xff9001) AM_WRITE(sound_command_w) AM_RANGE(0xffa000, 0xffafff) AM_WRITE(paletteram16_xGGGGGBBBBBRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xffd000, 0xffd01f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) + AM_RANGE(0xffd000, 0xffd01f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) AM_RANGE(0xffe000, 0xffe001) AM_WRITE(suprslam_bank_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( suprslam_sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index f1cf25e855e..f33870a38c7 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -87,8 +87,8 @@ static WRITE8_HANDLER( surpratk_5fc0_w ) static ADDRESS_MAP_START( surpratk_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(bankedram_r) - AM_RANGE(0x0800, 0x1fff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_BANK1) /* banked ROM */ + AM_RANGE(0x0800, 0x1fff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_BANK1) /* banked ROM */ AM_RANGE(0x5f8c, 0x5f8c) AM_READ(input_port_0_r) AM_RANGE(0x5f8d, 0x5f8d) AM_READ(input_port_1_r) AM_RANGE(0x5f8e, 0x5f8e) AM_READ(input_port_4_r) @@ -98,13 +98,13 @@ static ADDRESS_MAP_START( surpratk_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5fa0, 0x5faf) AM_READ(K053244_r) AM_RANGE(0x5fc0, 0x5fc0) AM_READ(watchdog_reset_r) AM_RANGE(0x4000, 0x7fff) AM_READ(K052109_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */ ADDRESS_MAP_END static ADDRESS_MAP_START( surpratk_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(bankedram_w) AM_BASE(&ram) - AM_RANGE(0x0800, 0x1fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_ROM) /* banked ROM */ + AM_RANGE(0x0800, 0x1fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_ROM) /* banked ROM */ AM_RANGE(0x5fa0, 0x5faf) AM_WRITE(K053244_w) AM_RANGE(0x5fb0, 0x5fbf) AM_WRITE(K053251_w) AM_RANGE(0x5fc0, 0x5fc0) AM_WRITE(surpratk_5fc0_w) @@ -112,7 +112,7 @@ static ADDRESS_MAP_START( surpratk_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5fd1, 0x5fd1) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x5fc4, 0x5fc4) AM_WRITE(surpratk_videobank_w) AM_RANGE(0x4000, 0x7fff) AM_WRITE(K052109_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index e894bdc3ddd..58188345747 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -124,70 +124,70 @@ static WRITE8_HANDLER( system1_soundport_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) // ROM - AM_RANGE(0xd000, 0xd1ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) // ROM + AM_RANGE(0xd000, 0xd1ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd800, 0xddff) AM_WRITE(system1_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(system1_backgroundram_w) AM_BASE(&system1_backgroundram) AM_SIZE(&system1_backgroundram_size) - AM_RANGE(0xe800, 0xeeff) AM_WRITE(MWA8_RAM) AM_BASE(&system1_videoram) AM_SIZE(&system1_videoram_size) - AM_RANGE(0xefbd, 0xefbd) AM_WRITE(MWA8_RAM) AM_BASE(&system1_scroll_y) - AM_RANGE(0xeffc, 0xeffd) AM_WRITE(MWA8_RAM) AM_BASE(&system1_scroll_x) + AM_RANGE(0xe800, 0xeeff) AM_WRITE(SMH_RAM) AM_BASE(&system1_videoram) AM_SIZE(&system1_videoram_size) + AM_RANGE(0xefbd, 0xefbd) AM_WRITE(SMH_RAM) AM_BASE(&system1_scroll_y) + AM_RANGE(0xeffc, 0xeffd) AM_WRITE(SMH_RAM) AM_BASE(&system1_scroll_x) AM_RANGE(0xf000, 0xf3ff) AM_WRITE(system1_background_collisionram_w) AM_BASE(&system1_background_collisionram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(system1_sprites_collisionram_w) AM_BASE(&system1_sprites_collisionram) /* these are required to make various games work (teddybb, imsorry, raflesia) */ /* these may actually be backed by RAM, or may be mirrors of other RAM areas */ - AM_RANGE(0xd200, 0xd7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xde00, 0xdfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xef00, 0xefbc) AM_WRITE(MWA8_RAM) - AM_RANGE(0xefbe, 0xeffb) AM_WRITE(MWA8_RAM) - AM_RANGE(0xeffe, 0xefff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf400, 0xf7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xfc00, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd200, 0xd7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xde00, 0xdfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xef00, 0xefbc) AM_WRITE(SMH_RAM) + AM_RANGE(0xefbe, 0xeffb) AM_WRITE(SMH_RAM) + AM_RANGE(0xeffe, 0xefff) AM_WRITE(SMH_RAM) + AM_RANGE(0xf400, 0xf7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xfc00, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( blckgalb_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) // ROM - AM_RANGE(0xd000, 0xd1ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) // ROM + AM_RANGE(0xd000, 0xd1ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd800, 0xddff) AM_WRITE(system1_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xe800, 0xeeff) AM_WRITE(system1_backgroundram_w) AM_BASE(&system1_backgroundram) AM_SIZE(&system1_backgroundram_size) - AM_RANGE(0xe000, 0xe6ff) AM_WRITE(MWA8_RAM) AM_BASE(&system1_videoram) AM_SIZE(&system1_videoram_size) - AM_RANGE(0xe7bd, 0xe7bd) AM_WRITE(MWA8_RAM) AM_BASE(&system1_scroll_y) // ??? - AM_RANGE(0xe7c0, 0xe7c1) AM_WRITE(MWA8_RAM) AM_BASE(&system1_scroll_x) + AM_RANGE(0xe000, 0xe6ff) AM_WRITE(SMH_RAM) AM_BASE(&system1_videoram) AM_SIZE(&system1_videoram_size) + AM_RANGE(0xe7bd, 0xe7bd) AM_WRITE(SMH_RAM) AM_BASE(&system1_scroll_y) // ??? + AM_RANGE(0xe7c0, 0xe7c1) AM_WRITE(SMH_RAM) AM_BASE(&system1_scroll_x) AM_RANGE(0xf000, 0xf3ff) AM_WRITE(system1_background_collisionram_w) AM_BASE(&system1_background_collisionram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(system1_sprites_collisionram_w) AM_BASE(&system1_sprites_collisionram) ADDRESS_MAP_END static ADDRESS_MAP_START( brain_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xffff) AM_READ(MRA8_RAM) AM_BASE(&system1_ram) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xffff) AM_READ(SMH_RAM) AM_BASE(&system1_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( wbml_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) AM_BASE(&system1_ram) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_BASE(&system1_ram) AM_RANGE(0xe000, 0xefff) AM_READ(wbml_paged_videoram_r) - AM_RANGE(0xf000, 0xf3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf800, 0xfbff) AM_READ(MRA8_RAM) + AM_RANGE(0xf000, 0xf3ff) AM_READ(SMH_RAM) + AM_RANGE(0xf800, 0xfbff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( wbml_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) // ROM - AM_RANGE(0xd000, 0xd1ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd200, 0xd7ff) AM_WRITE(MWA8_RAM) // mirror? + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) // ROM + AM_RANGE(0xd000, 0xd1ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd200, 0xd7ff) AM_WRITE(SMH_RAM) // mirror? AM_RANGE(0xd800, 0xddff) AM_WRITE(system1_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xe000, 0xefff) AM_WRITE(wbml_paged_videoram_w) AM_RANGE(0xf000, 0xf3ff) AM_WRITE(system1_background_collisionram_w) AM_BASE(&system1_background_collisionram) @@ -195,46 +195,46 @@ static ADDRESS_MAP_START( wbml_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( chplft_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) // ROM - AM_RANGE(0xd000, 0xd1ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) // ROM + AM_RANGE(0xd000, 0xd1ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd800, 0xddff) AM_WRITE(system1_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xe7c0, 0xe7ff) AM_WRITE(choplifter_scroll_x_w) AM_BASE(&system1_scrollx_ram) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) AM_BASE(&system1_videoram) AM_SIZE(&system1_videoram_size) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_BASE(&system1_videoram) AM_SIZE(&system1_videoram_size) AM_RANGE(0xe800, 0xeeff) AM_WRITE(system1_backgroundram_w) AM_BASE(&system1_backgroundram) AM_SIZE(&system1_backgroundram_size) AM_RANGE(0xf000, 0xf3ff) AM_WRITE(system1_background_collisionram_w) AM_BASE(&system1_background_collisionram) AM_RANGE(0xf800, 0xfbff) AM_WRITE(system1_sprites_collisionram_w) AM_BASE(&system1_sprites_collisionram) /* needed for P.O.S.T. */ - AM_RANGE(0xd200, 0xd7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xde00, 0xdfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xef00, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd200, 0xd7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xde00, 0xdfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xef00, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( nobo_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc3ff) AM_WRITE(system1_background_collisionram_w) AM_BASE(&system1_background_collisionram) AM_RANGE(0xc800, 0xcbff) AM_WRITE(system1_sprites_collisionram_w) AM_BASE(&system1_sprites_collisionram) - AM_RANGE(0xd000, 0xd1ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd200, 0xd7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd000, 0xd1ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd200, 0xd7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xd800, 0xddff) AM_WRITE(system1_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0xde00, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xde00, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(system1_backgroundram_w) AM_BASE(&system1_backgroundram) AM_SIZE(&system1_backgroundram_size) - AM_RANGE(0xe800, 0xeeff) AM_WRITE(MWA8_RAM) AM_BASE(&system1_videoram) AM_SIZE(&system1_videoram_size) - AM_RANGE(0xefbd, 0xefbd) AM_WRITE(MWA8_RAM) AM_BASE(&system1_scroll_y) - AM_RANGE(0xeffc, 0xeffd) AM_WRITE(MWA8_RAM) AM_BASE(&system1_scroll_x) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe800, 0xeeff) AM_WRITE(SMH_RAM) AM_BASE(&system1_videoram) AM_SIZE(&system1_videoram_size) + AM_RANGE(0xefbd, 0xefbd) AM_WRITE(SMH_RAM) AM_BASE(&system1_scroll_y) + AM_RANGE(0xeffc, 0xeffd) AM_WRITE(SMH_RAM) AM_BASE(&system1_scroll_x) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) /* These addresses are written during P.O.S.T. but don't seem to be used after */ - AM_RANGE(0xc400, 0xc7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xcc00, 0xcfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd200, 0xd7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xde00, 0xdfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xef00, 0xefbc) AM_WRITE(MWA8_RAM) - AM_RANGE(0xefbe, 0xeffb) AM_WRITE(MWA8_RAM) - AM_RANGE(0xeffe, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc400, 0xc7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xcc00, 0xcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd200, 0xd7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xde00, 0xdfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xef00, 0xefbc) AM_WRITE(SMH_RAM) + AM_RANGE(0xefbe, 0xeffb) AM_WRITE(SMH_RAM) + AM_RANGE(0xeffe, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index 18162625a48..c4f082e317c 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -325,45 +325,45 @@ static WRITE8_HANDLER( tturfbl_soundbank_w ) } static ADDRESS_MAP_START( tturfbl_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0xbfff) AM_READ(tturfbl_soundbank_r) AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START(tturfbl_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_NOP) /* ROM bank */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_NOP) /* ROM bank */ AM_RANGE(0xe000, 0xe000) AM_WRITE(tturfbl_soundbank_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(tturfbl_msm5205_data_w) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( tturfbl_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x01, 0x01) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0x80, 0x80) AM_READ(MRA8_NOP) + AM_RANGE(0x80, 0x80) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( tturfbl_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x01, 0x01) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0x40, 0x40) AM_WRITE(MWA8_NOP) - AM_RANGE(0x80, 0x80) AM_WRITE(MWA8_NOP) + AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP) + AM_RANGE(0x80, 0x80) AM_WRITE(SMH_NOP) ADDRESS_MAP_END /*******************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -381,10 +381,10 @@ ADDRESS_MAP_END // 7759 static ADDRESS_MAP_START( sound_readmem_7759, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xdfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xdfff) AM_READ(SMH_BANK1) AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -613,7 +613,7 @@ INPUT_PORTS_END static ADDRESS_MAP_START( bayroute_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) AM_RANGE(0x500000, 0x503fff) AM_READ(SYS16_MRA16_WORKINGRAM) AM_RANGE(0x600000, 0x600fff) AM_READ(SYS16_MRA16_SPRITERAM) AM_RANGE(0x700000, 0x70ffff) AM_READ(SYS16_MRA16_TILERAM) @@ -627,8 +627,8 @@ static ADDRESS_MAP_START( bayroute_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( bayroute_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x100003) AM_WRITE(MWA16_NOP) // tilebank control? + AM_RANGE(0x000000, 0x0bffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x100003) AM_WRITE(SMH_NOP) // tilebank control? AM_RANGE(0x500000, 0x503fff) AM_WRITE(SYS16_MWA16_WORKINGRAM) AM_BASE(&sys16_workingram) AM_RANGE(0x600000, 0x600fff) AM_WRITE(SYS16_MWA16_SPRITERAM) AM_BASE(&sys16_spriteram) AM_RANGE(0x700000, 0x70ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) @@ -636,7 +636,7 @@ static ADDRESS_MAP_START( bayroute_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x800fff) AM_WRITE(SYS16_MWA16_PALETTERAM) AM_BASE(&paletteram16) AM_RANGE(0x900000, 0x900001) AM_WRITE(sys16_coinctrl_w) AM_RANGE(0xff0006, 0xff0007) AM_WRITE(sound_command_w) - AM_RANGE(0xff0020, 0xff003f) AM_WRITE(MWA16_NOP) // config regs + AM_RANGE(0xff0020, 0xff003f) AM_WRITE(SMH_NOP) // config regs ADDRESS_MAP_END /***************************************************************************/ @@ -731,7 +731,7 @@ MACHINE_DRIVER_END /***************************************************************************/ static ADDRESS_MAP_START( dduxbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) @@ -745,7 +745,7 @@ static ADDRESS_MAP_START( dduxbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dduxbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0bffff) AM_WRITE(SMH_ROM) AM_RANGE(0x3f0000, 0x3fffff) AM_WRITE(sys16_tilebank_w) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x410000, 0x410fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) @@ -754,7 +754,7 @@ static ADDRESS_MAP_START( dduxbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc40000, 0xc40001) AM_WRITE(sys16_coinctrl_w) AM_RANGE(0xc40006, 0xc40007) AM_WRITE(sound_command_w) AM_RANGE(0xc46000, 0xc4603f) AM_WRITE(SYS16_MWA16_EXTRAM2) AM_BASE(&sys16_extraram2) - AM_RANGE(0xfe0020, 0xfe003f) AM_WRITE(MWA16_NOP) // config regs + AM_RANGE(0xfe0020, 0xfe003f) AM_WRITE(SMH_NOP) // config regs AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SYS16_MWA16_WORKINGRAM) AM_BASE(&sys16_workingram) ADDRESS_MAP_END @@ -874,7 +874,7 @@ MACHINE_DRIVER_END static ADDRESS_MAP_START( eswat_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x418fff) AM_READ(SYS16_MRA16_TEXTRAM) //* AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) @@ -900,7 +900,7 @@ static WRITE16_HANDLER( eswat_tilebank0_w ) static ADDRESS_MAP_START( eswatbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x3e2000, 0x3e2001) AM_WRITE(eswat_tilebank0_w) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x410000, 0x418fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) @@ -908,7 +908,7 @@ static ADDRESS_MAP_START( eswatbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x840000, 0x840fff) AM_WRITE(SYS16_MWA16_PALETTERAM) AM_BASE(&paletteram16) AM_RANGE(0xc42006, 0xc42007) AM_WRITE(sound_command_w) AM_RANGE(0xc40000, 0xc40001) AM_WRITE(sys16_coinctrl_w) - AM_RANGE(0xc80000, 0xc80001) AM_WRITE(MWA16_NOP) + AM_RANGE(0xc80000, 0xc80001) AM_WRITE(SMH_NOP) AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SYS16_MWA16_WORKINGRAM) AM_BASE(&sys16_workingram) ADDRESS_MAP_END @@ -1180,9 +1180,9 @@ INPUT_PORTS_END Has sound latch at $E000 instead of I/O ports $C0-FF */ static ADDRESS_MAP_START( fpointbl_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static MACHINE_DRIVER_START( fpointbl ) @@ -1209,7 +1209,7 @@ static READ16_HANDLER( ga_io_service_r ) } static ADDRESS_MAP_START( goldnaxe_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x110000, 0x110fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x140000, 0x140fff) AM_READ(SYS16_MRA16_PALETTERAM) @@ -1245,15 +1245,15 @@ static WRITE16_HANDLER( goldnaxe_prot_w ) } static ADDRESS_MAP_START( goldnaxe_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0bffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x110000, 0x110fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) AM_RANGE(0x140000, 0x140fff) AM_WRITE(SYS16_MWA16_PALETTERAM) AM_BASE(&paletteram16) AM_RANGE(0x1f0000, 0x1f0003) AM_WRITE(SYS16_MWA16_EXTRAM) AM_BASE(&sys16_extraram) AM_RANGE(0x200000, 0x200fff) AM_WRITE(SYS16_MWA16_SPRITERAM) AM_BASE(&sys16_spriteram) AM_RANGE(0xc40000, 0xc40001) AM_WRITE(sys16_coinctrl_w) - AM_RANGE(0xc43000, 0xc43001) AM_WRITE(MWA16_NOP) // ? -// AM_RANGE(0xfe0006, 0xfe0007) AM_WRITE(MWA16_NOP) I think this is the real sound out + AM_RANGE(0xc43000, 0xc43001) AM_WRITE(SMH_NOP) // ? +// AM_RANGE(0xfe0006, 0xfe0007) AM_WRITE(SMH_NOP) I think this is the real sound out AM_RANGE(0xffec1c, 0xffec1d) AM_WRITE(goldnaxe_prot_w)// how does this really work? AM_RANGE(0xffecfc, 0xffecfd) AM_WRITE(ga_sound_command_w)// probably just a buffer AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SYS16_MWA16_WORKINGRAM) AM_BASE(&sys16_workingram) /* fails SCRATCH RAM test because of hacks */ @@ -1370,7 +1370,7 @@ MACHINE_DRIVER_END /***************************************************************************/ static ADDRESS_MAP_START( passsht_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) @@ -1384,7 +1384,7 @@ static ADDRESS_MAP_START( passsht_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( passsht_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x410000, 0x410fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) AM_RANGE(0x440000, 0x440fff) AM_WRITE(SYS16_MWA16_SPRITERAM) AM_BASE(&sys16_spriteram) @@ -1439,7 +1439,7 @@ static READ16_HANDLER( passht4b_io2_r ) { return passht4b_io2_val;} static READ16_HANDLER( passht4b_io3_r ) { return passht4b_io3_val;} static ADDRESS_MAP_START( passht4b_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) @@ -1458,7 +1458,7 @@ static ADDRESS_MAP_START( passht4b_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( passht4b_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x410000, 0x410fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) AM_RANGE(0x440000, 0x440fff) AM_WRITE(SYS16_MWA16_SPRITERAM) AM_BASE(&sys16_spriteram) @@ -1725,7 +1725,7 @@ INPUT_PORTS_END /***************************************************************************/ static ADDRESS_MAP_START( shinobl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) @@ -1739,7 +1739,7 @@ static ADDRESS_MAP_START( shinobl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( shinobl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x410000, 0x410fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) AM_RANGE(0x440000, 0x440fff) AM_WRITE(SYS16_MWA16_SPRITERAM) AM_BASE(&sys16_spriteram) @@ -1805,7 +1805,7 @@ MACHINE_DRIVER_END /* bootleg has extra ram for regs? */ static ADDRESS_MAP_START( tetrisbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x418000, 0x41803f) AM_READ(SYS16_MRA16_EXTRAM2) @@ -1816,12 +1816,12 @@ static ADDRESS_MAP_START( tetrisbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service AM_RANGE(0xc42002, 0xc42003) AM_READ(input_port_3_word_r) // dip1 AM_RANGE(0xc42000, 0xc42001) AM_READ(input_port_4_word_r) // dip2 - AM_RANGE(0xc80000, 0xc80001) AM_READ(MRA16_NOP) + AM_RANGE(0xc80000, 0xc80001) AM_READ(SMH_NOP) AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) ADDRESS_MAP_END static ADDRESS_MAP_START( tetrisbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x410000, 0x410fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) AM_RANGE(0x418000, 0x41803f) AM_WRITE(SYS16_MWA16_EXTRAM2) AM_BASE(&sys16_extraram2) @@ -1829,8 +1829,8 @@ static ADDRESS_MAP_START( tetrisbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x840000, 0x840fff) AM_WRITE(SYS16_MWA16_PALETTERAM) AM_BASE(&paletteram16) AM_RANGE(0xc40000, 0xc40001) AM_WRITE(sys16_coinctrl_w) AM_RANGE(0xc42006, 0xc42007) AM_WRITE(sound_command_w) - AM_RANGE(0xc43034, 0xc43035) AM_WRITE(MWA16_NOP) - AM_RANGE(0xc80000, 0xc80001) AM_WRITE(MWA16_NOP) + AM_RANGE(0xc43034, 0xc43035) AM_WRITE(SMH_NOP) + AM_RANGE(0xc80000, 0xc80001) AM_WRITE(SMH_NOP) AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SYS16_MWA16_WORKINGRAM) AM_BASE(&sys16_workingram) ADDRESS_MAP_END @@ -1982,7 +1982,7 @@ INPUT_PORTS_END /***************************************************************************/ static ADDRESS_MAP_START( tturfbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x2001e6, 0x2001e7) AM_READ(tt_io_service_r) AM_RANGE(0x2001e8, 0x2001e9) AM_READ(tt_io_player1_r) AM_RANGE(0x2001ea, 0x2001eb) AM_READ(tt_io_player2_r) @@ -2002,7 +2002,7 @@ static ADDRESS_MAP_START( tturfbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( tturfbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x203fff) AM_WRITE(SYS16_MWA16_EXTRAM) AM_BASE(&sys16_extraram) AM_RANGE(0x300000, 0x300fff) AM_WRITE(SYS16_MWA16_SPRITERAM) AM_BASE(&sys16_spriteram) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) @@ -2010,9 +2010,9 @@ static ADDRESS_MAP_START( tturfbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x500fff) AM_WRITE(SYS16_MWA16_PALETTERAM) AM_BASE(&paletteram16) AM_RANGE(0x600000, 0x600001) AM_WRITE(sys16_coinctrl_w) AM_RANGE(0x600006, 0x600007) AM_WRITE(sound_command_w) - AM_RANGE(0xc44000, 0xc44001) AM_WRITE(MWA16_NOP) + AM_RANGE(0xc44000, 0xc44001) AM_WRITE(SMH_NOP) AM_RANGE(0xc46000, 0xc4601f) AM_WRITE(SYS16_MWA16_EXTRAM3) AM_BASE(&sys16_extraram3) - AM_RANGE(0xff0020, 0xff003f) AM_WRITE(MWA16_NOP) // config regs + AM_RANGE(0xff0020, 0xff003f) AM_WRITE(SMH_NOP) // config regs ADDRESS_MAP_END /***************************************************************************/ @@ -2136,7 +2136,7 @@ INPUT_PORTS_END /***************************************************************************/ static ADDRESS_MAP_START( wb3bbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) @@ -2151,7 +2151,7 @@ static ADDRESS_MAP_START( wb3bbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( wb3bbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x3f0000, 0x3fffff) AM_WRITE(sys16_tilebank_w) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x410000, 0x410fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) @@ -2159,7 +2159,7 @@ static ADDRESS_MAP_START( wb3bbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x840000, 0x840fff) AM_WRITE(SYS16_MWA16_PALETTERAM) AM_BASE(&paletteram16) AM_RANGE(0xc40000, 0xc40001) AM_WRITE(sys16_coinctrl_w) AM_RANGE(0xc42006, 0xc42007) AM_WRITE(sound_command_w) - AM_RANGE(0xc44000, 0xc44001) AM_WRITE(MWA16_NOP) + AM_RANGE(0xc44000, 0xc44001) AM_WRITE(SMH_NOP) AM_RANGE(0xc46000, 0xc4601f) AM_WRITE(SYS16_MWA16_EXTRAM3) AM_BASE(&sys16_extraram3) AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SYS16_MWA16_WORKINGRAM) AM_BASE(&sys16_workingram) ADDRESS_MAP_END diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c index 4c26626230f..c12fc3fab41 100644 --- a/src/mame/drivers/system18.c +++ b/src/mame/drivers/system18.c @@ -232,7 +232,7 @@ static WRITE8_HANDLER( shdancbl_bankctrl_w ) } static ADDRESS_MAP_START( shdancbl_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0xbfff) AM_READ(shdancbl_soundbank_r) AM_RANGE(0xc400, 0xc400) AM_READ(soundlatch_r) AM_RANGE(0xcc00, 0xcc00) AM_READ(YM3438_status_port_0_A_r) @@ -243,14 +243,14 @@ static ADDRESS_MAP_START( shdancbl_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd001, 0xd001) AM_READ(YM3438_status_port_1_B_r) AM_RANGE(0xd002, 0xd002) AM_READ(YM3438_status_port_1_B_r) AM_RANGE(0xd003, 0xd003) AM_READ(YM3438_status_port_1_B_r) - AM_RANGE(0xdf00, 0xdfff) AM_READ(MRA8_NOP) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xdf00, 0xdfff) AM_READ(SMH_NOP) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START(shdancbl_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_NOP) /* ROM bank */ - AM_RANGE(0xc000, 0xc00f) AM_WRITE(MWA8_NOP) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_NOP) /* ROM bank */ + AM_RANGE(0xc000, 0xc00f) AM_WRITE(SMH_NOP) AM_RANGE(0xc800, 0xc800) AM_WRITE(shdancbl_msm5205_data_w) AM_RANGE(0xcc00, 0xcc00) AM_WRITE(YM3438_control_port_0_A_w) AM_RANGE(0xcc01, 0xcc01) AM_WRITE(YM3438_data_port_0_A_w) @@ -261,18 +261,18 @@ static ADDRESS_MAP_START(shdancbl_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd002, 0xd002) AM_WRITE(YM3438_control_port_1_B_w) AM_RANGE(0xd003, 0xd003) AM_WRITE(YM3438_data_port_1_B_w) AM_RANGE(0xd400, 0xd400) AM_WRITE(shdancbl_bankctrl_w) - AM_RANGE(0xdf00, 0xdfff) AM_WRITE(MWA8_NOP) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xdf00, 0xdfff) AM_WRITE(SMH_NOP) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( shdancbl_sound_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0xc0, 0xdf) AM_READ(MRA8_NOP) + AM_RANGE(0xc0, 0xdf) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( shdancbl_sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0xa0, 0xbf) AM_WRITE(MWA8_NOP) + AM_RANGE(0xa0, 0xbf) AM_WRITE(SMH_NOP) ADDRESS_MAP_END /***************************************************************************/ @@ -287,19 +287,19 @@ static READ8_HANDLER( system18_bank_r ) } static ADDRESS_MAP_START( sound_readmem_18, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x9fff) AM_READ(SMH_ROM) AM_RANGE(0xa000, 0xbfff) AM_READ(system18_bank_r) /**** D/A register ****/ AM_RANGE(0xd000, 0xdfff) AM_READ(RF5C68_r) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem_18, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) /**** D/A register ****/ AM_RANGE(0xc000, 0xc008) AM_WRITE(RF5C68_reg_w) AM_RANGE(0xd000, 0xdfff) AM_WRITE(RF5C68_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) //?? + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) //?? ADDRESS_MAP_END @@ -696,7 +696,7 @@ static WRITE16_HANDLER( sys18_io_w ) /***************************************************************************/ static ADDRESS_MAP_START( shdancbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x4407ff) AM_READ(SYS16_MRA16_SPRITERAM) @@ -712,18 +712,18 @@ static ADDRESS_MAP_START( shdancbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( shdancbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x410000, 0x410fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) AM_RANGE(0x440000, 0x440fff) AM_WRITE(SYS16_MWA16_SPRITERAM) AM_BASE(&sys16_spriteram) AM_RANGE(0x840000, 0x840fff) AM_WRITE(SYS16_MWA16_PALETTERAM) AM_BASE(&paletteram16) AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(vdp_w) - AM_RANGE(0xe4001c, 0xe4001d) AM_WRITE(MWA16_NOP) // to prevent access to screen blanking control below + AM_RANGE(0xe4001c, 0xe4001d) AM_WRITE(SMH_NOP) // to prevent access to screen blanking control below AM_RANGE(0xe40000, 0xe4ffff) AM_WRITE(sys18_io_w) AM_RANGE(0xc40006, 0xc40007) AM_WRITE(sound_command_irq_w) - AM_RANGE(0xc44000, 0xc44001) AM_WRITE(MWA16_NOP) // only used via clr.w after tilebank set - AM_RANGE(0xc46000, 0xc46fff) AM_WRITE(MWA16_NOP) // bootleg specific video hardware - AM_RANGE(0xfe0020, 0xfe003f) AM_WRITE(MWA16_NOP) // config regs + AM_RANGE(0xc44000, 0xc44001) AM_WRITE(SMH_NOP) // only used via clr.w after tilebank set + AM_RANGE(0xc46000, 0xc46fff) AM_WRITE(SMH_NOP) // bootleg specific video hardware + AM_RANGE(0xfe0020, 0xfe003f) AM_WRITE(SMH_NOP) // config regs AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SYS16_MWA16_WORKINGRAM) AM_BASE(&sys16_workingram) ADDRESS_MAP_END @@ -802,7 +802,7 @@ static READ16_HANDLER( mwalkbl_skip_r ){ static ADDRESS_MAP_START( mwalkbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) @@ -813,7 +813,7 @@ static ADDRESS_MAP_START( mwalkbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc41002, 0xc41003) AM_READ(input_port_0_word_r) // player1 AM_RANGE(0xc41004, 0xc41005) AM_READ(input_port_1_word_r) // player2 AM_RANGE(0xc41006, 0xc41007) AM_READ(input_port_5_word_r) // player3 - AM_RANGE(0xc41008, 0xc41009) AM_READ(MRA16_NOP) // figure this out, extra input for 3p? + AM_RANGE(0xc41008, 0xc41009) AM_READ(SMH_NOP) // figure this out, extra input for 3p? AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service AM_RANGE(0xe40000, 0xe4ffff) AM_READ(SYS16_MRA16_EXTRAM2) AM_RANGE(0xffe02c, 0xffe02d) AM_READ(mwalkbl_skip_r) @@ -821,7 +821,7 @@ static ADDRESS_MAP_START( mwalkbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( mwalkbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x410000, 0x410fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) AM_RANGE(0x440000, 0x440fff) AM_WRITE(SYS16_MWA16_SPRITERAM) AM_BASE(&sys16_spriteram) @@ -831,7 +831,7 @@ static ADDRESS_MAP_START( mwalkbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc46600, 0xc46601) AM_WRITE(sys18_refreshenable_w) AM_RANGE(0xc46800, 0xc46801) AM_WRITE(sys18_tilebank_w) AM_RANGE(0xe40000, 0xe4ffff) AM_WRITE(SYS16_MWA16_EXTRAM2) AM_BASE(&sys16_extraram2) - AM_RANGE(0xfe0020, 0xfe003f) AM_WRITE(MWA16_NOP) // config regs + AM_RANGE(0xfe0020, 0xfe003f) AM_WRITE(SMH_NOP) // config regs AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SYS16_MWA16_WORKINGRAM) AM_BASE(&sys16_workingram) ADDRESS_MAP_END @@ -935,7 +935,7 @@ static DRIVER_INIT( mwalkbl ){ /* bootleg doesn't have real vdp or i/o */ static ADDRESS_MAP_START( astormbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x110000, 0x110fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x140000, 0x140fff) AM_READ(SYS16_MRA16_PALETTERAM) @@ -952,7 +952,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( astormbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x110000, 0x110fff) AM_WRITE(SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) AM_RANGE(0x140000, 0x140fff) AM_WRITE(SYS16_MWA16_PALETTERAM) AM_BASE(&paletteram16) @@ -961,7 +961,7 @@ static ADDRESS_MAP_START( astormbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa0000e, 0xa0000f) AM_WRITE(sys18_tilebank_w) AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(vdp_w) AM_RANGE(0xc46600, 0xc46601) AM_WRITE(sys18_refreshenable_w) - AM_RANGE(0xfe0020, 0xfe003f) AM_WRITE(MWA16_NOP) + AM_RANGE(0xfe0020, 0xfe003f) AM_WRITE(SMH_NOP) AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SYS16_MWA16_WORKINGRAM) AM_BASE(&sys16_workingram) ADDRESS_MAP_END diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c index e51080959fb..26b0ac0e861 100644 --- a/src/mame/drivers/tagteam.c +++ b/src/mame/drivers/tagteam.c @@ -52,39 +52,39 @@ static WRITE8_HANDLER( sound_command_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_READ(input_port_1_r) /* IN1 */ AM_RANGE(0x2001, 0x2001) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0x2002, 0x2002) AM_READ(input_port_2_r) /* DSW2 */ AM_RANGE(0x2003, 0x2003) AM_READ(input_port_3_r) /* DSW1 */ AM_RANGE(0x4000, 0x43ff) AM_READ(tagteam_mirrorvideoram_r) AM_RANGE(0x4400, 0x47ff) AM_READ(tagteam_mirrorcolorram_r) - AM_RANGE(0x4800, 0x4fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4800, 0x4fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_WRITE(tagteam_flipscreen_w) AM_RANGE(0x2001, 0x2001) AM_WRITE(tagteam_control_w) AM_RANGE(0x2002, 0x2002) AM_WRITE(sound_command_w) -// AM_RANGE(0x2003, 0x2003) AM_WRITE(MWA8_NOP) /* Appears to increment when you're out of the ring */ +// AM_RANGE(0x2003, 0x2003) AM_WRITE(SMH_NOP) /* Appears to increment when you're out of the ring */ AM_RANGE(0x4000, 0x43ff) AM_WRITE(tagteam_mirrorvideoram_w) AM_RANGE(0x4400, 0x47ff) AM_WRITE(tagteam_mirrorcolorram_w) AM_RANGE(0x4800, 0x4bff) AM_WRITE(tagteam_videoram_w) AM_BASE(&videoram) AM_RANGE(0x4c00, 0x4fff) AM_WRITE(tagteam_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_RAM) AM_RANGE(0x2007, 0x2007) AM_READ(soundlatch_r) - AM_RANGE(0x4000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x03ff) AM_WRITE(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x2001, 0x2001) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x2002, 0x2002) AM_WRITE(AY8910_write_port_1_w) diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index 53a52c2a0ec..349fddf4f9f 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -71,30 +71,30 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x27ffff) AM_READ(MRA16_BANK1) /* extra ROM */ - AM_RANGE(0x2c0000, 0x2dffff) AM_READ(MRA16_BANK2) /* extra ROM */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x27ffff) AM_READ(SMH_BANK1) /* extra ROM */ + AM_RANGE(0x2c0000, 0x2dffff) AM_READ(SMH_BANK2) /* extra ROM */ AM_RANGE(0x400000, 0x41ffff) AM_READ(tail2nos_zoomdata_r) AM_RANGE(0x500000, 0x500fff) AM_READ(tail2nos_K051316_0_r) - AM_RANGE(0xff8000, 0xffbfff) AM_READ(MRA16_RAM) /* work RAM */ - AM_RANGE(0xffc000, 0xffc2ff) AM_READ(MRA16_RAM) /* sprites */ - AM_RANGE(0xffc300, 0xffcfff) AM_READ(MRA16_RAM) - AM_RANGE(0xffd000, 0xffdfff) AM_READ(MRA16_RAM) - AM_RANGE(0xffe000, 0xffefff) AM_READ(MRA16_RAM) + AM_RANGE(0xff8000, 0xffbfff) AM_READ(SMH_RAM) /* work RAM */ + AM_RANGE(0xffc000, 0xffc2ff) AM_READ(SMH_RAM) /* sprites */ + AM_RANGE(0xffc300, 0xffcfff) AM_READ(SMH_RAM) + AM_RANGE(0xffd000, 0xffdfff) AM_READ(SMH_RAM) + AM_RANGE(0xffe000, 0xffefff) AM_READ(SMH_RAM) AM_RANGE(0xfff000, 0xfff001) AM_READ(input_port_0_word_r) AM_RANGE(0xfff004, 0xfff005) AM_READ(input_port_1_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x27ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x2c0000, 0x2dffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x27ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2c0000, 0x2dffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x41ffff) AM_WRITE(tail2nos_zoomdata_w) AM_RANGE(0x500000, 0x500fff) AM_WRITE(tail2nos_K051316_0_w) AM_RANGE(0x510000, 0x51001f) AM_WRITE(tail2nos_K051316_ctrl_0_w) - AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(MWA16_RAM) /* work RAM */ - AM_RANGE(0xffc000, 0xffc2ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0xffc300, 0xffcfff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(SMH_RAM) /* work RAM */ + AM_RANGE(0xffc000, 0xffc2ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xffc300, 0xffcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xffd000, 0xffdfff) AM_WRITE(tail2nos_bgvideoram_w) AM_BASE(&tail2nos_bgvideoram) AM_RANGE(0xffe000, 0xffefff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xfff000, 0xfff001) AM_WRITE(tail2nos_gfxbank_w) @@ -102,15 +102,15 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK3) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK3) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -124,7 +124,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x07, 0x07) AM_WRITE(MWA8_NOP) /* clear pending command */ + AM_RANGE(0x07, 0x07) AM_WRITE(SMH_NOP) /* clear pending command */ AM_RANGE(0x08, 0x08) AM_WRITE(YM2608_control_port_0_A_w) AM_RANGE(0x09, 0x09) AM_WRITE(YM2608_data_port_0_A_w) AM_RANGE(0x0a, 0x0a) AM_WRITE(YM2608_control_port_0_B_w) diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index f9f9765e298..317100d2d7c 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -493,38 +493,38 @@ static READ16_HANDLER( pbobble_input_bypass_r ) #define TC0180VCU_MEMR( ADDR ) \ AM_RANGE(ADDR+0x00000, ADDR+0x0ffff) AM_READ(TC0180VCU_word_r) \ - AM_RANGE(ADDR+0x10000, ADDR+0x1197f) AM_READ(MRA16_RAM) \ - AM_RANGE(ADDR+0x11980, ADDR+0x137ff) AM_READ(MRA16_RAM) \ - AM_RANGE(ADDR+0x13800, ADDR+0x13fff) AM_READ(MRA16_RAM) \ + AM_RANGE(ADDR+0x10000, ADDR+0x1197f) AM_READ(SMH_RAM) \ + AM_RANGE(ADDR+0x11980, ADDR+0x137ff) AM_READ(SMH_RAM) \ + AM_RANGE(ADDR+0x13800, ADDR+0x13fff) AM_READ(SMH_RAM) \ AM_RANGE(ADDR+0x18000, ADDR+0x1801f) AM_READ(taitob_v_control_r) \ AM_RANGE(ADDR+0x40000, ADDR+0x7ffff) AM_READ(TC0180VCU_framebuffer_word_r) #define TC0180VCU_MEMW( ADDR ) \ AM_RANGE(ADDR+0x00000, ADDR+0x0ffff) AM_WRITE(TC0180VCU_word_w) AM_BASE(&TC0180VCU_ram) \ - AM_RANGE(ADDR+0x10000, ADDR+0x1197f) AM_WRITE(MWA16_RAM) AM_BASE(&taitob_spriteram) \ - AM_RANGE(ADDR+0x11980, ADDR+0x137ff) AM_WRITE(MWA16_RAM) \ - AM_RANGE(ADDR+0x13800, ADDR+0x13fff) AM_WRITE(MWA16_RAM) AM_BASE(&taitob_scroll) \ + AM_RANGE(ADDR+0x10000, ADDR+0x1197f) AM_WRITE(SMH_RAM) AM_BASE(&taitob_spriteram) \ + AM_RANGE(ADDR+0x11980, ADDR+0x137ff) AM_WRITE(SMH_RAM) \ + AM_RANGE(ADDR+0x13800, ADDR+0x13fff) AM_WRITE(SMH_RAM) AM_BASE(&taitob_scroll) \ AM_RANGE(ADDR+0x18000, ADDR+0x1801f) AM_WRITE(taitob_v_control_w) \ AM_RANGE(ADDR+0x40000, ADDR+0x7ffff) AM_WRITE(TC0180VCU_framebuffer_word_w) static ADDRESS_MAP_START( rastsag2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x600000, 0x607fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x600000, 0x607fff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) /* palette */ + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) /* palette */ TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0xa00000, 0xa0000f) AM_READ(TC0220IOC_halfword_byteswap_r) - AM_RANGE(0x800000, 0x800001) AM_READ(MRA16_NOP) + AM_RANGE(0x800000, 0x800001) AM_READ(SMH_NOP) AM_RANGE(0x800002, 0x800003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( rastsag2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x600000, 0x607fff) AM_WRITE(MWA16_RAM) /* Main RAM */ /*ashura up to 603fff only*/ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x600000, 0x607fff) AM_WRITE(SMH_RAM) /* Main RAM */ /*ashura up to 603fff only*/ AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) @@ -538,22 +538,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( crimec_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0xa00000, 0xa0ffff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0xa00000, 0xa0ffff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM) + AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0x200000, 0x20000f) AM_READ(TC0220IOC_halfword_byteswap_r) - AM_RANGE(0x600000, 0x600001) AM_READ(MRA16_NOP) + AM_RANGE(0x600000, 0x600001) AM_READ(SMH_NOP) AM_RANGE(0x600002, 0x600003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( crimec_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x800000, 0x801fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) @@ -567,22 +567,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tetrist_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x800000, 0x807fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x800000, 0x807fff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0xa00000, 0xa01fff) AM_READ(MRA16_RAM) /*palette*/ + AM_RANGE(0xa00000, 0xa01fff) AM_READ(SMH_RAM) /*palette*/ TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0x600000, 0x60000f) AM_READ(TC0220IOC_halfword_byteswap_r) - AM_RANGE(0x200000, 0x200001) AM_READ(MRA16_NOP) + AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP) AM_RANGE(0x200002, 0x200003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( tetrist_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x800000, 0x807fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x800000, 0x807fff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) @@ -595,23 +595,23 @@ static ADDRESS_MAP_START( tetrist_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( tetrista_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) /*palette*/ + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) /*palette*/ TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0x600000, 0x600001) AM_READ(TC0220IOC_halfword_byteswap_portreg_r) /* DSW A/B, player inputs*/ AM_RANGE(0x600002, 0x600003) AM_READ(TC0220IOC_halfword_byteswap_port_r /*watchdog_reset16_r*/ ) - AM_RANGE(0xa00000, 0xa00001) AM_READ(MRA16_NOP) + AM_RANGE(0xa00000, 0xa00001) AM_READ(SMH_NOP) AM_RANGE(0xa00002, 0xa00003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( tetrista_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x800000, 0x803fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x800000, 0x803fff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) @@ -625,25 +625,25 @@ static ADDRESS_MAP_START( tetrista_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( hitice_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0xa00000, 0xa01fff) AM_READ(MRA16_RAM) + AM_RANGE(0xa00000, 0xa01fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0x600000, 0x60000f) AM_READ(TC0220IOC_halfword_byteswap_r) AM_RANGE(0x610000, 0x610001) AM_READ(input_port_5_word_r) /* player 3,4 inputs*/ - AM_RANGE(0x700000, 0x700001) AM_READ(MRA16_NOP) + AM_RANGE(0x700000, 0x700001) AM_READ(SMH_NOP) AM_RANGE(0x700002, 0x700003) AM_READ(taitosound_comm16_msb_r) - AM_RANGE(0xb00000, 0xb7ffff) AM_READ(MRA16_RAM) + AM_RANGE(0xb00000, 0xb7ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( hitice_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x800000, 0x803fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x800000, 0x803fff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) @@ -662,10 +662,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rambo3_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0xa00000, 0xa01fff) AM_READ(MRA16_RAM) + AM_RANGE(0xa00000, 0xa01fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x400000 ) @@ -679,13 +679,13 @@ static ADDRESS_MAP_START( rambo3_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x60001c, 0x60001d) AM_READ(trackx2_lo_r) AM_RANGE(0x60001e, 0x60001f) AM_READ(trackx2_hi_r) - AM_RANGE(0x200000, 0x200001) AM_READ(MRA16_NOP) + AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP) AM_RANGE(0x200002, 0x200003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( rambo3_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x800000, 0x803fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x800000, 0x803fff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) @@ -699,10 +699,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pbobble_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM) + AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x400000 ) @@ -711,13 +711,13 @@ static ADDRESS_MAP_START( pbobble_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500026, 0x500027) AM_READ(eep_latch_r) /* not read by this game */ AM_RANGE(0x50002e, 0x50002f) AM_READ(input_port_6_word_r) /* shown in service mode, game omits to read it */ - AM_RANGE(0x700000, 0x700001) AM_READ(MRA16_NOP) + AM_RANGE(0x700000, 0x700001) AM_READ(SMH_NOP) AM_RANGE(0x700002, 0x700003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( pbobble_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x800000, 0x801fff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) @@ -733,10 +733,10 @@ static ADDRESS_MAP_START( pbobble_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( spacedx_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM) + AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x400000 ) @@ -745,13 +745,13 @@ static ADDRESS_MAP_START( spacedx_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500026, 0x500027) AM_READ(eep_latch_r) AM_RANGE(0x50002e, 0x50002f) AM_READ(input_port_6_word_r) - AM_RANGE(0x700000, 0x700001) AM_READ(MRA16_NOP) + AM_RANGE(0x700000, 0x700001) AM_READ(SMH_NOP) AM_RANGE(0x700002, 0x700003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( spacedx_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x800000, 0x801fff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) @@ -767,10 +767,10 @@ static ADDRESS_MAP_START( spacedx_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( spacedxo_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x300000, 0x303fff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x303fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x500000 ) @@ -779,13 +779,13 @@ static ADDRESS_MAP_START( spacedxo_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x220000, 0x220001) AM_READ(input_port_6_word_r) AM_RANGE(0x230000, 0x230001) AM_READ(input_port_7_word_r) - AM_RANGE(0x100000, 0x100001) AM_READ(MRA16_NOP) + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) AM_RANGE(0x100002, 0x100003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( spacedxo_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x400000, 0x40ffff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x300000, 0x301fff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) @@ -798,10 +798,10 @@ static ADDRESS_MAP_START( spacedxo_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( qzshowby_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM) + AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x400000 ) @@ -810,13 +810,13 @@ static ADDRESS_MAP_START( qzshowby_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200028, 0x200029) AM_READ(player_34_coin_ctrl_r) AM_RANGE(0x20002e, 0x20002f) AM_READ(input_port_6_word_r) /* player 3,4 buttons */ - AM_RANGE(0x600000, 0x600001) AM_READ(MRA16_NOP) + AM_RANGE(0x600000, 0x600001) AM_READ(SMH_NOP) AM_RANGE(0x600002, 0x600003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( qzshowby_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x800000, 0x801fff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) @@ -833,22 +833,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( viofight_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0xa00000, 0xa03fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0xa00000, 0xa03fff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x600000, 0x601fff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x601fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0x800000, 0x80000f) AM_READ(TC0220IOC_halfword_byteswap_r) - AM_RANGE(0x200000, 0x200001) AM_READ(MRA16_NOP) + AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP) AM_RANGE(0x200002, 0x200003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( viofight_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xa00000, 0xa03fff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x600000, 0x601fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) @@ -862,23 +862,23 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( masterw_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x203fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x203fff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x600000, 0x601fff) AM_READ(MRA16_RAM) /*palette*/ + AM_RANGE(0x600000, 0x601fff) AM_READ(SMH_RAM) /*palette*/ TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0x800000, 0x800001) AM_READ(TC0220IOC_halfword_byteswap_portreg_r) /* DSW A/B, player inputs*/ AM_RANGE(0x800002, 0x800003) AM_READ(TC0220IOC_halfword_byteswap_port_r /*watchdog_reset16_r*/ ) - AM_RANGE(0xa00000, 0xa00001) AM_READ(MRA16_NOP) + AM_RANGE(0xa00000, 0xa00001) AM_READ(SMH_NOP) AM_RANGE(0xa00002, 0xa00003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( masterw_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x203fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x203fff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x600000, 0x601fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) @@ -893,10 +893,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( silentd_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x400000, 0x403fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x400000, 0x403fff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x300000, 0x301fff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x301fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x500000 ) @@ -904,24 +904,24 @@ static ADDRESS_MAP_START( silentd_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(input_port_5_word_r) AM_RANGE(0x220000, 0x220001) AM_READ(input_port_6_word_r) AM_RANGE(0x230000, 0x230001) AM_READ(input_port_7_word_r) -// AM_RANGE(0x240000, 0x240001) AM_READ(MRA16_NOP) /* read 4 times at init */ +// AM_RANGE(0x240000, 0x240001) AM_READ(SMH_NOP) /* read 4 times at init */ - AM_RANGE(0x100000, 0x100001) AM_READ(MRA16_NOP) + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) AM_RANGE(0x100002, 0x100003) AM_READ(taitosound_comm16_msb_r) -// AM_RANGE(0x10001a, 0x10001b) AM_READ(MRA16_NOP) // ??? read at $1e344 -// AM_RANGE(0x10001c, 0x10001d) AM_READ(MRA16_NOP) // ??? read at $1e356 +// AM_RANGE(0x10001a, 0x10001b) AM_READ(SMH_NOP) // ??? read at $1e344 +// AM_RANGE(0x10001c, 0x10001d) AM_READ(SMH_NOP) // ??? read at $1e356 ADDRESS_MAP_END static ADDRESS_MAP_START( silentd_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x400000, 0x403fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x400000, 0x403fff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x300000, 0x301fff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) TC0180VCU_MEMW( 0x500000 ) AM_RANGE(0x200000, 0x20000f) AM_WRITE(TC0220IOC_halfword_w) - AM_RANGE(0x240000, 0x240001) AM_WRITE(MWA16_NOP) // ??? + AM_RANGE(0x240000, 0x240001) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0x100000, 0x100001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x100002, 0x100003) AM_WRITE(taitosound_comm16_msb_w) @@ -929,23 +929,23 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( selfeena_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x300000, 0x301fff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x301fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x200000 ) AM_RANGE(0x400000, 0x40000f) AM_READ(TC0220IOC_halfword_byteswap_r) AM_RANGE(0x410000, 0x41000f) AM_READ(TC0220IOC_halfword_byteswap_r) /* mirror address - seems to be only used for coin control */ - AM_RANGE(0x500000, 0x500001) AM_READ(MRA16_NOP) + AM_RANGE(0x500000, 0x500001) AM_READ(SMH_NOP) AM_RANGE(0x500002, 0x500003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( selfeena_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x300000, 0x301fff) AM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) @@ -960,22 +960,22 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sbm_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) /* Main RAM */ - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) TC0180VCU_MEMR( 0x900000 ) AM_RANGE(0x300000, 0x30000f) AM_READ(TC0510NIO_halfword_wordswap_r) - AM_RANGE(0x320000, 0x320001) AM_READ(MRA16_NOP) + AM_RANGE(0x320000, 0x320001) AM_READ(SMH_NOP) AM_RANGE(0x320002, 0x320003) AM_READ(taitosound_comm16_msb_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sbm_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) @@ -990,16 +990,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( masterw_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END static ADDRESS_MAP_START( masterw_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) @@ -1007,45 +1007,45 @@ static ADDRESS_MAP_START( masterw_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan */ - AM_RANGE(0xe600, 0xe600) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */ + AM_RANGE(0xe600, 0xe600) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(bankswitch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( viofight_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xb000, 0xb000) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END static ADDRESS_MAP_START( viofight_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xb000, 0xb001) AM_WRITE(OKIM6295_data_0_w) /* yes, both addresses for the same chip */ diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index 139257b2a95..39ad319d61d 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -899,270 +899,270 @@ static WRITE16_HANDLER ( driveout_sound_command_w ) ***********************************************************/ static ADDRESS_MAP_START( finalb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x200007) AM_READ(TC0110PCR_word_r) /* palette */ AM_RANGE(0x300000, 0x30000f) AM_READ(TC0220IOC_halfword_r) /* I/O */ AM_RANGE(0x320000, 0x320003) AM_READ(taitof2_sound_r) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( finalb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200007) AM_WRITE(TC0110PCR_word_w) /* palette */ AM_RANGE(0x300000, 0x30000f) AM_WRITE(TC0220IOC_halfword_w) /* I/O */ AM_RANGE(0x320000, 0x320001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x320002, 0x320003) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ - AM_RANGE(0x810000, 0x81ffff) AM_WRITE(MWA16_NOP) /* error in game init code ? */ + AM_RANGE(0x810000, 0x81ffff) AM_WRITE(SMH_NOP) /* error in game init code ? */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0xb00002, 0xb00003) AM_WRITE(MWA16_NOP) /* ?? */ + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xb00002, 0xb00003) AM_WRITE(SMH_NOP) /* ?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( dondokod_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_READ(TC0220IOC_halfword_r) /* I/O */ AM_RANGE(0x320000, 0x320003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) AM_RANGE(0xa00000, 0xa01fff) AM_READ(TC0280GRD_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( dondokod_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300000, 0x30000f) AM_WRITE(TC0220IOC_halfword_w) /* I/O */ AM_RANGE(0x320000, 0x320001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x320002, 0x320003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(TC0280GRD_word_w) /* ROZ tilemap */ AM_RANGE(0xa02000, 0xa0200f) AM_WRITE(TC0280GRD_ctrl_word_w) AM_RANGE(0xb00000, 0xb0001f) AM_WRITE(TC0360PRI_halfword_w) /* ?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( megab_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x120000, 0x12000f) AM_READ(TC0220IOC_halfword_r) /* I/O */ AM_RANGE(0x180000, 0x180fff) AM_READ(cchip2_word_r) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x301fff) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x301fff) AM_READ(SMH_RAM) AM_RANGE(0x600000, 0x60ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ - AM_RANGE(0x610000, 0x61ffff) AM_READ(MRA16_RAM) /* unused? */ + AM_RANGE(0x610000, 0x61ffff) AM_READ(SMH_RAM) /* unused? */ AM_RANGE(0x620000, 0x62000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x800000, 0x80ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x800000, 0x80ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( megab_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x100002, 0x100003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x120000, 0x12000f) AM_WRITE(TC0220IOC_halfword_w) /* I/O */ AM_RANGE(0x180000, 0x180fff) AM_WRITE(cchip2_word_w) AM_BASE(&cchip2_ram) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x301fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x400000, 0x40001f) AM_WRITE(TC0360PRI_halfword_w) /* ?? */ AM_RANGE(0x600000, 0x60ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ - AM_RANGE(0x610000, 0x61ffff) AM_WRITE(MWA16_RAM) /* unused? */ + AM_RANGE(0x610000, 0x61ffff) AM_WRITE(SMH_RAM) /* unused? */ AM_RANGE(0x620000, 0x62000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x800000, 0x80ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x800000, 0x80ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( thundfox_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x101fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x101fff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x20000f) AM_READ(TC0220IOC_halfword_r) /* I/O */ AM_RANGE(0x220000, 0x220003) AM_READ(taitof2_msb_sound_r) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM) AM_RANGE(0x400000, 0x40ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x420000, 0x42000f) AM_READ(TC0100SCN_ctrl_word_0_r) AM_RANGE(0x500000, 0x50ffff) AM_READ(TC0100SCN_word_1_r) /* tilemaps */ AM_RANGE(0x520000, 0x52000f) AM_READ(TC0100SCN_ctrl_word_1_r) - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( thundfox_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x101fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x200000, 0x20000f) AM_WRITE(TC0220IOC_halfword_w) /* I/O */ AM_RANGE(0x220000, 0x220001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x220002, 0x220003) AM_WRITE(taitosound_comm16_msb_w) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x420000, 0x42000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) AM_RANGE(0x500000, 0x50ffff) AM_WRITE(TC0100SCN_word_1_w) /* tilemaps */ AM_RANGE(0x520000, 0x52000f) AM_WRITE(TC0100SCN_ctrl_word_1_w) - AM_RANGE(0x600000, 0x60ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x600000, 0x60ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x800000, 0x80001f) AM_WRITE(TC0360PRI_halfword_swap_w) ADDRESS_MAP_END static ADDRESS_MAP_START( cameltry_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_READ(TC0220IOC_halfword_r) /* I/O */ AM_RANGE(0x300018, 0x30001f) AM_READ(cameltry_paddle_r) AM_RANGE(0x320000, 0x320003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x800000, 0x813fff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) AM_RANGE(0xa00000, 0xa01fff) AM_READ(TC0280GRD_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( cameltry_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300000, 0x30000f) AM_WRITE(TC0220IOC_halfword_w) /* I/O */ AM_RANGE(0x320000, 0x320001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x320002, 0x320003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x800000, 0x813fff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(TC0280GRD_word_w) /* ROZ tilemap */ AM_RANGE(0xa02000, 0xa0200f) AM_WRITE(TC0280GRD_ctrl_word_w) AM_RANGE(0xd00000, 0xd0001f) AM_WRITE(TC0360PRI_halfword_w) /* ?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( qtorimon_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x200007) AM_READ(TC0110PCR_word_r) /* palette */ AM_RANGE(0x500000, 0x50000f) AM_READ(TC0220IOC_halfword_r) /* I/O */ AM_RANGE(0x600000, 0x600003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( qtorimon_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200007) AM_WRITE(TC0110PCR_word_w) /* palette */ AM_RANGE(0x500000, 0x50000f) AM_WRITE(TC0220IOC_halfword_w) /* I/O */ AM_RANGE(0x600000, 0x600001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x600002, 0x600003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x910000, 0x9120ff) AM_WRITE(MWA16_NOP) /* error in init code ? */ + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x910000, 0x9120ff) AM_WRITE(SMH_NOP) /* error in init code ? */ ADDRESS_MAP_END static ADDRESS_MAP_START( liquidk_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_READ(TC0220IOC_halfword_r) /* I/O */ AM_RANGE(0x320000, 0x320003) AM_READ(taitof2_sound_r) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( liquidk_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300000, 0x30000f) AM_WRITE(TC0220IOC_halfword_w) /* I/O */ AM_RANGE(0x320000, 0x320001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x320002, 0x320003) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xb00000, 0xb0001f) AM_WRITE(TC0360PRI_halfword_w) /* ?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( quizhq_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x200007) AM_READ(TC0110PCR_word_r) /* palette */ AM_RANGE(0x500000, 0x50000f) AM_READ(quizhq_input1_r) AM_RANGE(0x580000, 0x58000f) AM_READ(quizhq_input2_r) AM_RANGE(0x600000, 0x600003) AM_READ(taitof2_sound_r) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( quizhq_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200007) AM_WRITE(TC0110PCR_word_w) /* palette */ AM_RANGE(0x500004, 0x500005) AM_WRITE(growl_coin_word_w) AM_RANGE(0x580000, 0x580001) AM_WRITE(taitof2_watchdog_w) /* ??? */ - AM_RANGE(0x580006, 0x580007) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0x580006, 0x580007) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x600000, 0x600001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x600002, 0x600003) AM_WRITE(taitosound_comm16_lsb_w) - AM_RANGE(0x680000, 0x680001) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0x680000, 0x680001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ - AM_RANGE(0x810000, 0x81ffff) AM_WRITE(MWA16_NOP) /* error in init code ? */ + AM_RANGE(0x810000, 0x81ffff) AM_WRITE(SMH_NOP) /* error in init code ? */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( ssi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x10000f) AM_READ(TC0510NIO_halfword_r) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x301fff) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x301fff) AM_READ(SMH_RAM) AM_RANGE(0x400000, 0x400003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x600000, 0x60ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x620000, 0x62000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x800000, 0x80ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x800000, 0x80ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ssi_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x10000f) AM_WRITE(TC0510NIO_halfword_w) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x301fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x400000, 0x400001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x400002, 0x400003) AM_WRITE(taitosound_comm16_msb_w) -// AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP) /* ?? */ +// AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP) /* ?? */ AM_RANGE(0x600000, 0x60ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps (not used) */ AM_RANGE(0x620000, 0x62000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x800000, 0x80ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* sprite ram */ + AM_RANGE(0x800000, 0x80ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* sprite ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( gunfront_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_READ(TC0510NIO_halfword_wordswap_r) AM_RANGE(0x320000, 0x320003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( gunfront_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0bffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300000, 0x30000f) AM_WRITE(TC0510NIO_halfword_wordswap_w) AM_RANGE(0x320000, 0x320001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x320002, 0x320003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) -// AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) /* ?? */ + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) +// AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* ?? */ AM_RANGE(0xb00000, 0xb0001f) AM_WRITE(TC0360PRI_halfword_w) /* ?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( growl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_READ(growl_dsw_r) AM_RANGE(0x320000, 0x32000f) AM_READ(growl_input_r) AM_RANGE(0x400000, 0x400003) AM_READ(taitof2_msb_sound_r) @@ -1170,69 +1170,69 @@ static ADDRESS_MAP_START( growl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x50c000, 0x50c00f) AM_READ(input_port_6_word_r) /* IN4 */ AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( growl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300004, 0x300005) AM_WRITE(growl_coin_word_w) AM_RANGE(0x340000, 0x340001) AM_WRITE(taitof2_watchdog_w) AM_RANGE(0x400000, 0x400001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x400002, 0x400003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x500000, 0x50000f) AM_WRITE(taitof2_spritebank_w) - AM_RANGE(0x504000, 0x504001) AM_WRITE(MWA16_NOP) /* unknown... various values */ + AM_RANGE(0x504000, 0x504001) AM_WRITE(SMH_NOP) /* unknown... various values */ AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xb00000, 0xb0001f) AM_WRITE(TC0360PRI_halfword_w) /* ?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( mjnquest_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x110000, 0x11ffff) AM_READ(MRA16_RAM) /* "sram" */ - AM_RANGE(0x120000, 0x12ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x110000, 0x11ffff) AM_READ(SMH_RAM) /* "sram" */ + AM_RANGE(0x120000, 0x12ffff) AM_READ(SMH_RAM) AM_RANGE(0x200000, 0x200007) AM_READ(TC0110PCR_word_r) /* palette */ AM_RANGE(0x300000, 0x30000f) AM_READ(mjnquest_dsw_r) AM_RANGE(0x310000, 0x310001) AM_READ(mjnquest_input_r) AM_RANGE(0x360000, 0x360003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x400000, 0x40ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x420000, 0x42000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x500000, 0x50ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( mjnquest_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x110000, 0x11ffff) AM_WRITE(MWA16_RAM) /* "sram" */ - AM_RANGE(0x120000, 0x12ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x110000, 0x11ffff) AM_WRITE(SMH_RAM) /* "sram" */ + AM_RANGE(0x120000, 0x12ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x200007) AM_WRITE(TC0110PCR_word_w) /* palette */ AM_RANGE(0x320000, 0x320001) AM_WRITE(mjnquest_inputselect_w) - AM_RANGE(0x330000, 0x330001) AM_WRITE(MWA16_NOP) /* watchdog ? */ - AM_RANGE(0x350000, 0x350001) AM_WRITE(MWA16_NOP) /* watchdog ? */ + AM_RANGE(0x330000, 0x330001) AM_WRITE(SMH_NOP) /* watchdog ? */ + AM_RANGE(0x350000, 0x350001) AM_WRITE(SMH_NOP) /* watchdog ? */ AM_RANGE(0x360000, 0x360001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x360002, 0x360003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x380000, 0x380001) AM_WRITE(TC0100SCN_gfxbank_w) /* scr gfx bank select */ AM_RANGE(0x400000, 0x40ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x420000, 0x42000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x500000, 0x50ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x500000, 0x50ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( footchmp_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) AM_RANGE(0x400000, 0x40ffff) AM_READ(TC0480SCP_word_r) /* tilemaps */ AM_RANGE(0x430000, 0x43002f) AM_READ(TC0480SCP_ctrl_word_r) - AM_RANGE(0x600000, 0x601fff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x601fff) AM_READ(SMH_RAM) AM_RANGE(0x700000, 0x70001f) AM_READ(footchmp_input_r) AM_RANGE(0xa00000, 0xa00003) AM_READ(taitof2_sound_r) ADDRESS_MAP_END static ADDRESS_MAP_START( footchmp_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x300000, 0x30000f) AM_WRITE(taitof2_spritebank_w) /* updated at $a6e, off irq5 */ AM_RANGE(0x400000, 0x40ffff) AM_WRITE(TC0480SCP_word_w) /* tilemaps */ AM_RANGE(0x430000, 0x43002f) AM_WRITE(TC0480SCP_ctrl_word_w) @@ -1245,71 +1245,71 @@ static ADDRESS_MAP_START( footchmp_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( koshien_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_READ(TC0510NIO_halfword_r) AM_RANGE(0x320000, 0x320003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) // AM_RANGE(0xa20000, 0xa20001) AM_READ(koshien_spritebank_r) /* for debugging spritebank */ ADDRESS_MAP_END static ADDRESS_MAP_START( koshien_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300000, 0x30000f) AM_WRITE(TC0510NIO_halfword_w) AM_RANGE(0x320000, 0x320001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x320002, 0x320003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xa20000, 0xa20001) AM_WRITE(koshien_spritebank_w) AM_RANGE(0xb00000, 0xb0001f) AM_WRITE(TC0360PRI_halfword_swap_w) ADDRESS_MAP_END static ADDRESS_MAP_START( yuyugogo_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x200000, 0x20000f) AM_READ(TC0510NIO_halfword_r) AM_RANGE(0x400000, 0x400003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) - AM_RANGE(0xa00000, 0xa01fff) AM_READ(MRA16_RAM) - AM_RANGE(0xb00000, 0xb10fff) AM_READ(MRA16_RAM) - AM_RANGE(0xd00000, 0xdfffff) AM_READ(MRA16_BANK1) /* extra data rom */ + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) + AM_RANGE(0xa00000, 0xa01fff) AM_READ(SMH_RAM) + AM_RANGE(0xb00000, 0xb10fff) AM_READ(SMH_RAM) + AM_RANGE(0xd00000, 0xdfffff) AM_READ(SMH_BANK1) /* extra data rom */ ADDRESS_MAP_END static ADDRESS_MAP_START( yuyugogo_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x20000f) AM_WRITE(TC0510NIO_halfword_w) AM_RANGE(0x400000, 0x400001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x400002, 0x400003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xb00000, 0xb10fff) AM_WRITE(MWA16_RAM) /* deliberate writes to $b10xxx, I think */ + AM_RANGE(0xb00000, 0xb10fff) AM_WRITE(SMH_RAM) /* deliberate writes to $b10xxx, I think */ AM_RANGE(0xc00000, 0xc01fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE(&f2_sprite_extension) AM_SIZE(&f2_spriteext_size) - AM_RANGE(0xd00000, 0xdfffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0xd00000, 0xdfffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( ninjak_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_READ(ninjak_input_r) AM_RANGE(0x400000, 0x400003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( ninjak_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x30000e, 0x30000f) AM_WRITE(ninjak_coin_word_w) AM_RANGE(0x380000, 0x380001) AM_WRITE(taitof2_watchdog_w) /* ??? */ @@ -1318,106 +1318,106 @@ static ADDRESS_MAP_START( ninjak_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600000, 0x60000f) AM_WRITE(taitof2_spritebank_w) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xb00000, 0xb0001f) AM_WRITE(TC0360PRI_halfword_w) /* b00002 written like a watchdog?! */ ADDRESS_MAP_END static ADDRESS_MAP_START( solfigtr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_READ(growl_dsw_r) AM_RANGE(0x320000, 0x32000f) AM_READ(growl_input_r) AM_RANGE(0x400000, 0x400003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( solfigtr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x201fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300004, 0x300005) AM_WRITE(growl_coin_word_w) /* NOT VERIFIED */ AM_RANGE(0x340000, 0x340001) AM_WRITE(taitof2_watchdog_w) /* NOT VERIFIED */ AM_RANGE(0x400000, 0x400001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x400002, 0x400003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x500000, 0x50000f) AM_WRITE(taitof2_spritebank_w) - AM_RANGE(0x504000, 0x504001) AM_WRITE(MWA16_NOP) /* unknown... various values */ + AM_RANGE(0x504000, 0x504001) AM_WRITE(SMH_NOP) /* unknown... various values */ AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xb00000, 0xb0001f) AM_WRITE(TC0360PRI_halfword_w) /* ?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( qzquest_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x17ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x17ffff) AM_READ(SMH_ROM) AM_RANGE(0x200000, 0x20000f) AM_READ(TC0510NIO_halfword_r) AM_RANGE(0x300000, 0x300003) AM_READ(taitof2_sound_r) - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA16_RAM) - AM_RANGE(0x500000, 0x50ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM) + AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM) AM_RANGE(0x700000, 0x70ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x720000, 0x72000f) AM_READ(TC0100SCN_ctrl_word_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( qzquest_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x20000f) AM_WRITE(TC0510NIO_halfword_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x300002, 0x300003) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x400000, 0x401fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x500000, 0x50ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x600000, 0x60ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x500000, 0x50ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x700000, 0x70ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x720000, 0x72000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) ADDRESS_MAP_END static ADDRESS_MAP_START( pulirula_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) AM_RANGE(0x200000, 0x200003) AM_READ(taitof2_msb_sound_r) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM) AM_RANGE(0x400000, 0x401fff) AM_READ(TC0430GRW_word_r) - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) AM_RANGE(0xb00000, 0xb0000f) AM_READ(TC0510NIO_halfword_r) ADDRESS_MAP_END static ADDRESS_MAP_START( pulirula_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0bffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x200001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x200002, 0x200003) AM_WRITE(taitosound_comm16_msb_w) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x400000, 0x401fff) AM_WRITE(TC0430GRW_word_w) /* ROZ tilemap */ AM_RANGE(0x402000, 0x40200f) AM_WRITE(TC0430GRW_ctrl_word_w) -// AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP) /* ??? */ +// AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x600000, 0x603fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE(&f2_sprite_extension) AM_SIZE(&f2_spriteext_size) AM_RANGE(0x700000, 0x701fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xa00000, 0xa0001f) AM_WRITE(TC0360PRI_halfword_swap_w) AM_RANGE(0xb00000, 0xb0000f) AM_WRITE(TC0510NIO_halfword_w) ADDRESS_MAP_END static ADDRESS_MAP_START( metalb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM) AM_RANGE(0x500000, 0x50ffff) AM_READ(TC0480SCP_word_r) /* tilemaps */ AM_RANGE(0x530000, 0x53002f) AM_READ(TC0480SCP_ctrl_word_r) - AM_RANGE(0x700000, 0x703fff) AM_READ(MRA16_RAM) + AM_RANGE(0x700000, 0x703fff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x80000f) AM_READ(TC0510NIO_halfword_wordswap_r) AM_RANGE(0x900000, 0x900003) AM_READ(taitof2_msb_sound_r) ADDRESS_MAP_END static ADDRESS_MAP_START( metalb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0bffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) -// AM_RANGE(0x42000c, 0x42000f) AM_WRITE(MWA16_NOP) /* zeroed */ + AM_RANGE(0x000000, 0x0bffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) +// AM_RANGE(0x42000c, 0x42000f) AM_WRITE(SMH_NOP) /* zeroed */ AM_RANGE(0x500000, 0x50ffff) AM_WRITE(TC0480SCP_word_w) /* tilemaps */ AM_RANGE(0x530000, 0x53002f) AM_WRITE(TC0480SCP_ctrl_word_w) AM_RANGE(0x600000, 0x60001f) AM_WRITE(TC0360PRI_halfword_w) @@ -1425,39 +1425,39 @@ static ADDRESS_MAP_START( metalb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x80000f) AM_WRITE(TC0510NIO_halfword_wordswap_w) AM_RANGE(0x900000, 0x900001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x900002, 0x900003) AM_WRITE(taitosound_comm16_msb_w) -// AM_RANGE(0xa00000, 0xa00001) AM_WRITE(MWA16_NOP) /* ??? */ +// AM_RANGE(0xa00000, 0xa00001) AM_WRITE(SMH_NOP) /* ??? */ ADDRESS_MAP_END static ADDRESS_MAP_START( qzchikyu_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x17ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x17ffff) AM_READ(SMH_ROM) AM_RANGE(0x200000, 0x20000f) AM_READ(TC0510NIO_halfword_r) AM_RANGE(0x300000, 0x300003) AM_READ(taitof2_sound_r) - AM_RANGE(0x400000, 0x401fff) AM_READ(MRA16_RAM) - AM_RANGE(0x500000, 0x50ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x400000, 0x401fff) AM_READ(SMH_RAM) + AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM) AM_RANGE(0x700000, 0x70ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x720000, 0x72000f) AM_READ(TC0100SCN_ctrl_word_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( qzchikyu_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x20000f) AM_WRITE(TC0510NIO_halfword_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x300002, 0x300003) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x400000, 0x401fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x500000, 0x50ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x600000, 0x60ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x500000, 0x50ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x700000, 0x70ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x720000, 0x72000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) ADDRESS_MAP_END static ADDRESS_MAP_START( yesnoj_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM) AM_RANGE(0x500000, 0x50ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x520000, 0x52000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x600000, 0x601fff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x601fff) AM_READ(SMH_RAM) // AM_RANGE(0x700000, 0x70000b) AM_READ(yesnoj_unknown_r) /* what's this? */ AM_RANGE(0x800000, 0x800003) AM_READ(taitof2_msb_sound_r) AM_RANGE(0xa00000, 0xa0000f) AM_READ(yesnoj_input_r) @@ -1465,37 +1465,37 @@ static ADDRESS_MAP_START( yesnoj_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( yesnoj_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x400000, 0x40ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x500000, 0x50ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x520000, 0x52000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) AM_RANGE(0x600000, 0x601fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x800000, 0x800001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x800002, 0x800003) AM_WRITE(taitosound_comm16_msb_w) - AM_RANGE(0x900002, 0x900003) AM_WRITE(MWA16_NOP) /* lots of similar writes */ - AM_RANGE(0xc00000, 0xc00001) AM_WRITE(MWA16_NOP) /* watchdog ?? */ - AM_RANGE(0xd00000, 0xd00001) AM_WRITE(MWA16_NOP) /* lots of similar writes */ + AM_RANGE(0x900002, 0x900003) AM_WRITE(SMH_NOP) /* lots of similar writes */ + AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_NOP) /* watchdog ?? */ + AM_RANGE(0xd00000, 0xd00001) AM_WRITE(SMH_NOP) /* lots of similar writes */ ADDRESS_MAP_END static ADDRESS_MAP_START( deadconx_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) AM_RANGE(0x400000, 0x40ffff) AM_READ(TC0480SCP_word_r) /* tilemaps */ AM_RANGE(0x430000, 0x43002f) AM_READ(TC0480SCP_ctrl_word_r) - AM_RANGE(0x600000, 0x601fff) AM_READ(MRA16_RAM) + AM_RANGE(0x600000, 0x601fff) AM_READ(SMH_RAM) AM_RANGE(0x700000, 0x70001f) AM_READ(deadconx_input_r) AM_RANGE(0xa00000, 0xa00003) AM_READ(taitof2_msb_sound_r) ADDRESS_MAP_END static ADDRESS_MAP_START( deadconx_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x300000, 0x30000f) AM_WRITE(taitof2_spritebank_w) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(TC0480SCP_word_w) /* tilemaps */ -// AM_RANGE(0x42000c, 0x42000f) AM_WRITE(MWA16_NOP) /* zeroed */ +// AM_RANGE(0x42000c, 0x42000f) AM_WRITE(SMH_NOP) /* zeroed */ AM_RANGE(0x430000, 0x43002f) AM_WRITE(TC0480SCP_ctrl_word_w) AM_RANGE(0x500000, 0x50001f) AM_WRITE(TC0360PRI_halfword_w) /* uses 500002 like a watchdog !? */ AM_RANGE(0x600000, 0x601fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) @@ -1506,79 +1506,79 @@ static ADDRESS_MAP_START( deadconx_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dinorex_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x2fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x2fffff) AM_READ(SMH_ROM) AM_RANGE(0x300000, 0x30000f) AM_READ(TC0510NIO_halfword_r) - AM_RANGE(0x500000, 0x501fff) AM_READ(MRA16_RAM) - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x800000, 0x80ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x500000, 0x501fff) AM_READ(SMH_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM) + AM_RANGE(0x800000, 0x80ffff) AM_READ(SMH_RAM) AM_RANGE(0x900000, 0x90ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x920000, 0x92000f) AM_READ(TC0100SCN_ctrl_word_0_r) AM_RANGE(0xa00000, 0xa00003) AM_READ(taitof2_msb_sound_r) ADDRESS_MAP_END static ADDRESS_MAP_START( dinorex_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x2fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x2fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x300000, 0x30000f) AM_WRITE(TC0510NIO_halfword_w) AM_RANGE(0x400000, 0x400fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE(&f2_sprite_extension) AM_SIZE(&f2_spriteext_size) AM_RANGE(0x500000, 0x501fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x600000, 0x60ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x600000, 0x60ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x700000, 0x70001f) AM_WRITE(TC0360PRI_halfword_w) /* ?? */ - AM_RANGE(0x800000, 0x80ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x800000, 0x80ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x900000, 0x90ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x920000, 0x92000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) AM_RANGE(0xa00000, 0xa00001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0xa00002, 0xa00003) AM_WRITE(taitosound_comm16_msb_w) - AM_RANGE(0xb00000, 0xb00001) AM_WRITE(MWA16_NOP) /* watchdog? */ + AM_RANGE(0xb00000, 0xb00001) AM_WRITE(SMH_NOP) /* watchdog? */ ADDRESS_MAP_END static ADDRESS_MAP_START( qjinsei_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) AM_RANGE(0x200000, 0x200003) AM_READ(taitof2_msb_sound_r) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM) + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) AM_RANGE(0xb00000, 0xb0000f) AM_READ(TC0510NIO_halfword_r) ADDRESS_MAP_END static ADDRESS_MAP_START( qjinsei_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x200001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x200002, 0x200003) AM_WRITE(taitosound_comm16_msb_w) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x500000, 0x500001) AM_WRITE(MWA16_NOP) /* watchdog ? */ + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP) /* watchdog ? */ AM_RANGE(0x600000, 0x603fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE(&f2_sprite_extension) AM_SIZE(&f2_spriteext_size) AM_RANGE(0x700000, 0x701fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xa00000, 0xa0001f) AM_WRITE(TC0360PRI_halfword_w) /* ?? */ AM_RANGE(0xb00000, 0xb0000f) AM_WRITE(TC0510NIO_halfword_w) ADDRESS_MAP_END static ADDRESS_MAP_START( qcrayon_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x3fffff) AM_READ(MRA16_BANK1) /* extra data rom */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x3fffff) AM_READ(SMH_BANK1) /* extra data rom */ AM_RANGE(0x500000, 0x500003) AM_READ(taitof2_msb_sound_r) - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) - AM_RANGE(0x800000, 0x80ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) + AM_RANGE(0x800000, 0x80ffff) AM_READ(SMH_RAM) AM_RANGE(0x900000, 0x90ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x920000, 0x92000f) AM_READ(TC0100SCN_ctrl_word_0_r) AM_RANGE(0xa00000, 0xa0000f) AM_READ(TC0510NIO_halfword_r) ADDRESS_MAP_END static ADDRESS_MAP_START( qcrayon_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) -// AM_RANGE(0x200000, 0x200001) AM_WRITE(MWA16_NOP) /* unknown */ - AM_RANGE(0x300000, 0x3fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) +// AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP) /* unknown */ + AM_RANGE(0x300000, 0x3fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x500000, 0x500001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x500002, 0x500003) AM_WRITE(taitosound_comm16_msb_w) AM_RANGE(0x600000, 0x603fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE(&f2_sprite_extension) AM_SIZE(&f2_spriteext_size) AM_RANGE(0x700000, 0x701fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x800000, 0x80ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x800000, 0x80ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x900000, 0x90ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x920000, 0x92000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) AM_RANGE(0xa00000, 0xa0000f) AM_WRITE(TC0510NIO_halfword_w) @@ -1586,25 +1586,25 @@ static ADDRESS_MAP_START( qcrayon_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( qcrayon2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x301fff) AM_READ(MRA16_RAM) - AM_RANGE(0x400000, 0x40ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x301fff) AM_READ(SMH_RAM) + AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM) AM_RANGE(0x500000, 0x50ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x520000, 0x52000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x600000, 0x67ffff) AM_READ(MRA16_BANK1) /* extra data rom */ + AM_RANGE(0x600000, 0x67ffff) AM_READ(SMH_BANK1) /* extra data rom */ AM_RANGE(0x700000, 0x70000f) AM_READ(TC0510NIO_halfword_r) AM_RANGE(0xa00000, 0xa00003) AM_READ(taitof2_msb_sound_r) ADDRESS_MAP_END static ADDRESS_MAP_START( qcrayon2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x301fff) AM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x400000, 0x40ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x400000, 0x40ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x500000, 0x50ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x520000, 0x52000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x600000, 0x67ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x600000, 0x67ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x700000, 0x70000f) AM_WRITE(TC0510NIO_halfword_w) AM_RANGE(0x900000, 0x90001f) AM_WRITE(TC0360PRI_halfword_w) /* ?? */ AM_RANGE(0xa00000, 0xa00001) AM_WRITE(taitosound_port16_msb_w) @@ -1613,57 +1613,57 @@ static ADDRESS_MAP_START( qcrayon2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( driftout_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x200000, 0x200003) AM_READ(taitof2_msb_sound_r) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM) AM_RANGE(0x400000, 0x401fff) AM_READ(TC0430GRW_word_r) - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) AM_RANGE(0xb00000, 0xb0000f) AM_READ(TC0510NIO_halfword_r) AM_RANGE(0xb00018, 0xb0001f) AM_READ(driftout_paddle_r) ADDRESS_MAP_END static ADDRESS_MAP_START( driftout_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x200001) AM_WRITE(taitosound_port16_msb_w) AM_RANGE(0x200002, 0x200003) AM_WRITE(taitosound_comm16_msb_w) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x400000, 0x401fff) AM_WRITE(TC0430GRW_word_w) /* ROZ tilemap */ AM_RANGE(0x402000, 0x40200f) AM_WRITE(TC0430GRW_ctrl_word_w) AM_RANGE(0x700000, 0x701fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xa00000, 0xa0001f) AM_WRITE(TC0360PRI_halfword_swap_w) AM_RANGE(0xb00000, 0xb0000f) AM_WRITE(TC0510NIO_halfword_w) ADDRESS_MAP_END /* same as driftout, except for sound address 0x200000 */ static ADDRESS_MAP_START( driveout_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x200003) AM_READ(MRA16_NOP) - AM_RANGE(0x300000, 0x30ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x200003) AM_READ(SMH_NOP) + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM) AM_RANGE(0x400000, 0x401fff) AM_READ(TC0430GRW_word_r) - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x900000, 0x90ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) AM_RANGE(0xb00000, 0xb0000f) AM_READ(TC0510NIO_halfword_r) AM_RANGE(0xb00018, 0xb0001f) AM_READ(driftout_paddle_r) ADDRESS_MAP_END static ADDRESS_MAP_START( driveout_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x200000, 0x200003) AM_WRITE(driveout_sound_command_w) - AM_RANGE(0x300000, 0x30ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x400000, 0x401fff) AM_WRITE(TC0430GRW_word_w) /* ROZ tilemap */ AM_RANGE(0x402000, 0x40200f) AM_WRITE(TC0430GRW_ctrl_word_w) AM_RANGE(0x700000, 0x701fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x900000, 0x90ffff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x900000, 0x90ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xa00000, 0xa0001f) AM_WRITE(TC0360PRI_halfword_swap_w) AM_RANGE(0xb00000, 0xb0000f) AM_WRITE(TC0510NIO_halfword_w) ADDRESS_MAP_END @@ -1672,29 +1672,29 @@ ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK2) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) /* ?? */ ADDRESS_MAP_END @@ -1702,17 +1702,17 @@ ADDRESS_MAP_END /* Alt version of Cameltry, YM2203 + M6925 sound */ static ADDRESS_MAP_START( camltrya_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) // I can't see a bank control, but there ARE some bytes past 0x8000 -// AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) // I can't see a bank control, but there ARE some bytes past 0x8000 +// AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) AM_RANGE(0xb000, 0xb000) AM_READ(OKIM6295_status_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( camltrya_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) @@ -1724,15 +1724,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( driveout_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(driveout_sound_command_r) ADDRESS_MAP_END static ADDRESS_MAP_START( driveout_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(oki_bank_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index 72b8dc7e874..63dd5c51541 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -152,26 +152,26 @@ static WRITE32_HANDLER( f3_sound_bankswitch_w ) /******************************************************************************/ static ADDRESS_MAP_START( f3_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x20000) AM_READ(MRA32_RAM) - AM_RANGE(0x440000, 0x447fff) AM_READ(MRA32_RAM) /* Palette ram */ + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) + AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x20000) AM_READ(SMH_RAM) + AM_RANGE(0x440000, 0x447fff) AM_READ(SMH_RAM) /* Palette ram */ AM_RANGE(0x4a0000, 0x4a0017) AM_READ(f3_control_r) - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA32_RAM) /* Object data */ - AM_RANGE(0x610000, 0x61bfff) AM_READ(MRA32_RAM) /* Playfield data */ - AM_RANGE(0x61c000, 0x61dfff) AM_READ(MRA32_RAM) /* Text layer */ - AM_RANGE(0x61e000, 0x61ffff) AM_READ(MRA32_RAM) /* Vram */ - AM_RANGE(0x620000, 0x62ffff) AM_READ(MRA32_RAM) /* Line ram */ - AM_RANGE(0x630000, 0x63ffff) AM_READ(MRA32_RAM) /* Pivot ram */ - AM_RANGE(0xc00000, 0xc007ff) AM_READ(MRA32_RAM) /* Sound CPU shared ram */ + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM) /* Object data */ + AM_RANGE(0x610000, 0x61bfff) AM_READ(SMH_RAM) /* Playfield data */ + AM_RANGE(0x61c000, 0x61dfff) AM_READ(SMH_RAM) /* Text layer */ + AM_RANGE(0x61e000, 0x61ffff) AM_READ(SMH_RAM) /* Vram */ + AM_RANGE(0x620000, 0x62ffff) AM_READ(SMH_RAM) /* Line ram */ + AM_RANGE(0x630000, 0x63ffff) AM_READ(SMH_RAM) /* Pivot ram */ + AM_RANGE(0xc00000, 0xc007ff) AM_READ(SMH_RAM) /* Sound CPU shared ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( f3_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA32_ROM) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x300000, 0x30007f) AM_WRITE(f3_sound_bankswitch_w) - AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x20000) AM_WRITE(MWA32_RAM) AM_BASE(&f3_ram) + AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x20000) AM_WRITE(SMH_RAM) AM_BASE(&f3_ram) AM_RANGE(0x440000, 0x447fff) AM_WRITE(f3_palette_24bit_w) AM_BASE(&paletteram32) AM_RANGE(0x4a0000, 0x4a001f) AM_WRITE(f3_control_w) - AM_RANGE(0x600000, 0x60ffff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) + AM_RANGE(0x600000, 0x60ffff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) AM_RANGE(0x610000, 0x61bfff) AM_WRITE(f3_pf_data_w) AM_BASE(&f3_pf_data) AM_RANGE(0x61c000, 0x61dfff) AM_WRITE(f3_videoram_w) AM_BASE(&videoram32) AM_RANGE(0x61e000, 0x61ffff) AM_WRITE(f3_vram_w) AM_BASE(&f3_vram) @@ -179,7 +179,7 @@ static ADDRESS_MAP_START( f3_writemem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x630000, 0x63ffff) AM_WRITE(f3_pivot_w) AM_BASE(&f3_pivot_ram) AM_RANGE(0x660000, 0x66000f) AM_WRITE(f3_control_0_w) AM_RANGE(0x660010, 0x66001f) AM_WRITE(f3_control_1_w) - AM_RANGE(0xc00000, 0xc007ff) AM_WRITE(MWA32_RAM) AM_BASE(&f3_shared_ram) + AM_RANGE(0xc00000, 0xc007ff) AM_WRITE(SMH_RAM) AM_BASE(&f3_shared_ram) AM_RANGE(0xc80000, 0xc80003) AM_WRITE(f3_sound_reset_0_w) AM_RANGE(0xc80100, 0xc80103) AM_WRITE(f3_sound_reset_1_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index 062adac718c..0461a705a91 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -267,20 +267,20 @@ static WRITE8_HANDLER( sound_bankswitch_w ) ***************************************************************************/ static ADDRESS_MAP_START( syvalion_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) /* 68000 RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) /* 68000 RAM */ AM_RANGE(0x110000, 0x11ffff) AM_READ(taitoh_mirrorram_r) /* 68000 RAM (Mirror) */ AM_RANGE(0x200000, 0x200001) AM_READ(syvalion_input_bypass_r) AM_RANGE(0x200002, 0x200003) AM_READ(TC0220IOC_halfword_port_r) - AM_RANGE(0x300000, 0x300001) AM_READ(MRA16_NOP) + AM_RANGE(0x300000, 0x300001) AM_READ(SMH_NOP) AM_RANGE(0x300002, 0x300003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x400000, 0x420fff) AM_READ(TC0080VCO_word_r) - AM_RANGE(0x500800, 0x500fff) AM_READ(MRA16_RAM) + AM_RANGE(0x500800, 0x500fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( syvalion_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) AM_BASE(&taitoh_68000_mainram) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_BASE(&taitoh_68000_mainram) AM_RANGE(0x200000, 0x200001) AM_WRITE(TC0220IOC_halfword_portreg_w) AM_RANGE(0x200002, 0x200003) AM_WRITE(TC0220IOC_halfword_port_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(taitosound_port16_lsb_w) @@ -290,20 +290,20 @@ static ADDRESS_MAP_START( syvalion_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( recordbr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) /* 68000 RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) /* 68000 RAM */ AM_RANGE(0x110000, 0x11ffff) AM_READ(taitoh_mirrorram_r) /* 68000 RAM (Mirror) */ AM_RANGE(0x200000, 0x200001) AM_READ(TC0220IOC_halfword_portreg_r) AM_RANGE(0x200002, 0x200003) AM_READ(TC0220IOC_halfword_port_r) - AM_RANGE(0x300000, 0x300001) AM_READ(MRA16_NOP) + AM_RANGE(0x300000, 0x300001) AM_READ(SMH_NOP) AM_RANGE(0x300002, 0x300003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x400000, 0x420fff) AM_READ(TC0080VCO_word_r) - AM_RANGE(0x500800, 0x500fff) AM_READ(MRA16_RAM) + AM_RANGE(0x500800, 0x500fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( recordbr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) AM_BASE(&taitoh_68000_mainram) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_BASE(&taitoh_68000_mainram) AM_RANGE(0x200000, 0x200001) AM_WRITE(TC0220IOC_halfword_portreg_w) AM_RANGE(0x200002, 0x200003) AM_WRITE(TC0220IOC_halfword_port_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(taitosound_port16_lsb_w) @@ -313,52 +313,52 @@ static ADDRESS_MAP_START( recordbr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dleague_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) /* 68000 RAM */ + AM_RANGE(0x000000, 0x05ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) /* 68000 RAM */ AM_RANGE(0x110000, 0x11ffff) AM_READ(taitoh_mirrorram_r) /* 68000 RAM (Mirror) */ AM_RANGE(0x200000, 0x20000f) AM_READ(TC0220IOC_halfword_r) - AM_RANGE(0x300000, 0x300001) AM_READ(MRA16_NOP) + AM_RANGE(0x300000, 0x300001) AM_READ(SMH_NOP) AM_RANGE(0x300002, 0x300003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x400000, 0x420fff) AM_READ(TC0080VCO_word_r) - AM_RANGE(0x500800, 0x500fff) AM_READ(MRA16_RAM) + AM_RANGE(0x500800, 0x500fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( dleague_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x05ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) AM_BASE(&taitoh_68000_mainram) + AM_RANGE(0x000000, 0x05ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_BASE(&taitoh_68000_mainram) AM_RANGE(0x200000, 0x20000f) AM_WRITE(TC0220IOC_halfword_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x300002, 0x300003) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x400000, 0x420fff) AM_WRITE(TC0080VCO_word_w) AM_RANGE(0x500800, 0x500fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_NOP) /* ?? writes zero once per frame */ + AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_NOP) /* ?? writes zero once per frame */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan control */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan control */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index 5291ad91984..4f351a6a6f2 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -655,12 +655,12 @@ static READ8_HANDLER( horshoes_trackx_hi_r ) #define COMMON_BANKS_READ \ - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) \ - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) \ - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_BANK2) \ - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_BANK3) \ - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_BANK4) \ - AM_RANGE(0xf000, 0xfdff) AM_READ(MRA8_BANK5) \ + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) \ + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) \ + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_BANK2) \ + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_BANK3) \ + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_BANK4) \ + AM_RANGE(0xf000, 0xfdff) AM_READ(SMH_BANK5) \ AM_RANGE(0xfe00, 0xfe03) AM_READ(taitol_bankc_r) \ AM_RANGE(0xfe04, 0xfe04) AM_READ(taitol_control_r) \ AM_RANGE(0xff00, 0xff02) AM_READ(irq_adr_r) \ @@ -669,7 +669,7 @@ static READ8_HANDLER( horshoes_trackx_hi_r ) AM_RANGE(0xff08, 0xff08) AM_READ(rombankswitch_r) #define COMMON_BANKS_WRITE \ - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) \ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) \ AM_RANGE(0xc000, 0xcfff) AM_WRITE(bank0_w) \ AM_RANGE(0xd000, 0xdfff) AM_WRITE(bank1_w) \ AM_RANGE(0xe000, 0xefff) AM_WRITE(bank2_w) \ @@ -685,31 +685,31 @@ static READ8_HANDLER( horshoes_trackx_hi_r ) AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_0_r) \ AM_RANGE(0xa001, 0xa001) AM_READ(ym2203_data0_r) \ AM_RANGE(0xa003, 0xa003) AM_READ(ym2203_data1_r) \ - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) #define COMMON_SINGLE_WRITE \ AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w) \ AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w) \ - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) static ADDRESS_MAP_START( fhawk_readmem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_READ - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( fhawk_writemem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_WRITE - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) AM_BASE(&shared_ram) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) AM_BASE(&shared_ram) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( fhawk_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK6) - AM_RANGE(0xc800, 0xc800) AM_READ(MRA8_NOP) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK6) + AM_RANGE(0xc800, 0xc800) AM_READ(SMH_NOP) AM_RANGE(0xc801, 0xc801) AM_READ(taitosound_comm_r) AM_RANGE(0xe000, 0xffff) AM_READ(shared_r) AM_RANGE(0xd000, 0xd000) AM_READ(input_port_0_r) @@ -720,28 +720,28 @@ static ADDRESS_MAP_START( fhawk_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( fhawk_2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_WRITE(rombank2switch_w) AM_RANGE(0xc800, 0xc800) AM_WRITE(taitosound_port_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(taitosound_comm_w) - AM_RANGE(0xd000, 0xd000) AM_WRITE(MWA8_NOP) // Direct copy of input port 0 + AM_RANGE(0xd000, 0xd000) AM_WRITE(SMH_NOP) // Direct copy of input port 0 AM_RANGE(0xd004, 0xd004) AM_WRITE(control2_w) - AM_RANGE(0xd005, 0xd006) AM_WRITE(MWA8_NOP) // Always 0 + AM_RANGE(0xd005, 0xd006) AM_WRITE(SMH_NOP) // Always 0 AM_RANGE(0xe000, 0xffff) AM_WRITE(shared_w) ADDRESS_MAP_END static ADDRESS_MAP_START( fhawk_3_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK7) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe000) AM_READ(MRA8_NOP) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK7) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe000) AM_READ(SMH_NOP) AM_RANGE(0xe001, 0xe001) AM_READ(taitosound_slave_comm_r) AM_RANGE(0xf000, 0xf000) AM_READ(YM2203_status_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( fhawk_3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(taitosound_slave_comm_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2203_control_port_0_w) @@ -750,44 +750,44 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( raimais_readmem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_READ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_READ(mux_r) - AM_RANGE(0x8801, 0x8801) AM_READ(MRA8_NOP) // Watchdog or interrupt ack (value ignored) - AM_RANGE(0x8c00, 0x8c00) AM_READ(MRA8_NOP) + AM_RANGE(0x8801, 0x8801) AM_READ(SMH_NOP) // Watchdog or interrupt ack (value ignored) + AM_RANGE(0x8c00, 0x8c00) AM_READ(SMH_NOP) AM_RANGE(0x8c01, 0x8c01) AM_READ(taitosound_comm_r) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_RAM) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( raimais_writemem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_WRITE - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) AM_BASE(&shared_ram) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&shared_ram) AM_RANGE(0x8800, 0x8800) AM_WRITE(mux_w) AM_RANGE(0x8801, 0x8801) AM_WRITE(mux_ctrl_w) AM_RANGE(0x8c00, 0x8c00) AM_WRITE(taitosound_port_w) AM_RANGE(0x8c01, 0x8c01) AM_WRITE(taitosound_comm_w) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( raimais_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_READ(shared_r) ADDRESS_MAP_END static ADDRESS_MAP_START( raimais_2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(shared_w) ADDRESS_MAP_END static ADDRESS_MAP_START( raimais_3_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK7) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK7) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END @@ -800,54 +800,54 @@ static WRITE8_HANDLER( sound_bankswitch_w ) } static ADDRESS_MAP_START( raimais_3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan */ - AM_RANGE(0xe600, 0xe600) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */ + AM_RANGE(0xe600, 0xe600) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( champwr_readmem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_READ - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( champwr_writemem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_WRITE - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_RAM) AM_BASE(&shared_ram) + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_RAM) AM_BASE(&shared_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( champwr_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK6) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK6) AM_RANGE(0xc000, 0xdfff) AM_READ(shared_r) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) AM_RANGE(0xe001, 0xe001) AM_READ(input_port_1_r) AM_RANGE(0xe002, 0xe002) AM_READ(input_port_2_r) AM_RANGE(0xe003, 0xe003) AM_READ(input_port_3_r) AM_RANGE(0xe007, 0xe007) AM_READ(input_port_4_r) - AM_RANGE(0xe008, 0xe00f) AM_READ(MRA8_NOP) - AM_RANGE(0xe800, 0xe800) AM_READ(MRA8_NOP) + AM_RANGE(0xe008, 0xe00f) AM_READ(SMH_NOP) + AM_RANGE(0xe800, 0xe800) AM_READ(SMH_NOP) AM_RANGE(0xe801, 0xe801) AM_READ(taitosound_comm_r) AM_RANGE(0xf000, 0xf000) AM_READ(rombank2switch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( champwr_2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_WRITE(shared_w) - AM_RANGE(0xe000, 0xe000) AM_WRITE(MWA8_NOP) // Watchdog + AM_RANGE(0xe000, 0xe000) AM_WRITE(SMH_NOP) // Watchdog AM_RANGE(0xe004, 0xe004) AM_WRITE(control2_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(taitosound_port_w) AM_RANGE(0xe801, 0xe801) AM_WRITE(taitosound_comm_w) @@ -855,17 +855,17 @@ static ADDRESS_MAP_START( champwr_2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( champwr_3_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK7) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK7) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r) - AM_RANGE(0xa000, 0xa000) AM_READ(MRA8_NOP) + AM_RANGE(0xa000, 0xa000) AM_READ(SMH_NOP) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END static ADDRESS_MAP_START( champwr_3_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) @@ -880,23 +880,23 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kurikint_readmem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_READ - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xa7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xa7ff) AM_READ(SMH_RAM) AM_RANGE(0xa800, 0xa800) AM_READ(mux_r) - AM_RANGE(0xa801, 0xa801) AM_READ(MRA8_NOP) // Watchdog or interrupt ack (value ignored) + AM_RANGE(0xa801, 0xa801) AM_READ(SMH_NOP) // Watchdog or interrupt ack (value ignored) ADDRESS_MAP_END static ADDRESS_MAP_START( kurikint_writemem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_WRITE - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xa000, 0xa7ff) AM_WRITE(MWA8_RAM) AM_BASE(&shared_ram) + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa000, 0xa7ff) AM_WRITE(SMH_RAM) AM_BASE(&shared_ram) AM_RANGE(0xa800, 0xa800) AM_WRITE(mux_w) AM_RANGE(0xa801, 0xa801) AM_WRITE(mux_ctrl_w) ADDRESS_MAP_END static ADDRESS_MAP_START( kurikint_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_READ(shared_r) AM_RANGE(0xe800, 0xe800) AM_READ(YM2203_status_port_0_r) #if 0 @@ -909,8 +909,8 @@ static ADDRESS_MAP_START( kurikint_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( kurikint_2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(shared_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xe801, 0xe801) AM_WRITE(YM2203_write_port_0_w) @@ -924,8 +924,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( puzznic_readmem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_READ COMMON_SINGLE_READ - AM_RANGE(0xa800, 0xa800) AM_READ(MRA8_NOP) // Watchdog - AM_RANGE(0xb000, 0xb7ff) AM_READ(MRA8_RAM) // Wrong, used to overcome protection + AM_RANGE(0xa800, 0xa800) AM_READ(SMH_NOP) // Watchdog + AM_RANGE(0xb000, 0xb7ff) AM_READ(SMH_RAM) // Wrong, used to overcome protection AM_RANGE(0xb800, 0xb800) AM_READ(mcu_data_r) AM_RANGE(0xb801, 0xb801) AM_READ(mcu_control_r) ADDRESS_MAP_END @@ -933,10 +933,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( puzznic_writemem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_WRITE COMMON_SINGLE_WRITE - AM_RANGE(0xb000, 0xb7ff) AM_WRITE(MWA8_RAM) // Wrong, used to overcome protection + AM_RANGE(0xb000, 0xb7ff) AM_WRITE(SMH_RAM) // Wrong, used to overcome protection AM_RANGE(0xb800, 0xb800) AM_WRITE(mcu_data_w) AM_RANGE(0xb801, 0xb801) AM_WRITE(mcu_control_w) - AM_RANGE(0xbc00, 0xbc00) AM_WRITE(MWA8_NOP) // Control register, function unknown + AM_RANGE(0xbc00, 0xbc00) AM_WRITE(SMH_NOP) // Control register, function unknown ADDRESS_MAP_END @@ -948,8 +948,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( plotting_writemem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_WRITE COMMON_SINGLE_WRITE - AM_RANGE(0xa800, 0xa800) AM_WRITE(MWA8_NOP) // Watchdog or interrupt ack - AM_RANGE(0xb800, 0xb800) AM_WRITE(MWA8_NOP) // Control register, function unknown + AM_RANGE(0xa800, 0xa800) AM_WRITE(SMH_NOP) // Watchdog or interrupt ack + AM_RANGE(0xb800, 0xb800) AM_WRITE(SMH_NOP) // Control register, function unknown ADDRESS_MAP_END @@ -959,14 +959,14 @@ static ADDRESS_MAP_START( palamed_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_2_r) AM_RANGE(0xa801, 0xa801) AM_READ(input_port_3_r) AM_RANGE(0xa802, 0xa802) AM_READ(input_port_4_r) - AM_RANGE(0xb001, 0xb001) AM_READ(MRA8_NOP) // Watchdog or interrupt ack + AM_RANGE(0xb001, 0xb001) AM_READ(SMH_NOP) // Watchdog or interrupt ack ADDRESS_MAP_END static ADDRESS_MAP_START( palamed_writemem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_WRITE COMMON_SINGLE_WRITE - AM_RANGE(0xa803, 0xa803) AM_WRITE(MWA8_NOP) // Control register, function unknown - AM_RANGE(0xb000, 0xb000) AM_WRITE(MWA8_NOP) // Control register, function unknown (copy of 8822) + AM_RANGE(0xa803, 0xa803) AM_WRITE(SMH_NOP) // Control register, function unknown + AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP) // Control register, function unknown (copy of 8822) ADDRESS_MAP_END @@ -976,15 +976,15 @@ static ADDRESS_MAP_START( cachat_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_2_r) AM_RANGE(0xa801, 0xa801) AM_READ(input_port_3_r) AM_RANGE(0xa802, 0xa802) AM_READ(input_port_4_r) - AM_RANGE(0xb001, 0xb001) AM_READ(MRA8_NOP) // Watchdog or interrupt ack (value ignored) + AM_RANGE(0xb001, 0xb001) AM_READ(SMH_NOP) // Watchdog or interrupt ack (value ignored) AM_RANGE(0xfff8, 0xfff8) AM_READ(rombankswitch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( cachat_writemem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_WRITE COMMON_SINGLE_WRITE - AM_RANGE(0xa803, 0xa803) AM_WRITE(MWA8_NOP) // Control register, function unknown - AM_RANGE(0xb000, 0xb000) AM_WRITE(MWA8_NOP) // Control register, function unknown + AM_RANGE(0xa803, 0xa803) AM_WRITE(SMH_NOP) // Control register, function unknown + AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP) // Control register, function unknown AM_RANGE(0xfff8, 0xfff8) AM_WRITE(rombankswitch_w) ADDRESS_MAP_END @@ -998,20 +998,20 @@ static ADDRESS_MAP_START( horshoes_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa804, 0xa804) AM_READ(horshoes_tracky_hi_r) AM_RANGE(0xa808, 0xa808) AM_READ(horshoes_trackx_lo_r) AM_RANGE(0xa80c, 0xa80c) AM_READ(horshoes_trackx_hi_r) - AM_RANGE(0xb801, 0xb801) AM_READ(MRA8_NOP) // Watchdog or interrupt ack + AM_RANGE(0xb801, 0xb801) AM_READ(SMH_NOP) // Watchdog or interrupt ack ADDRESS_MAP_END static ADDRESS_MAP_START( horshoes_writemem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_WRITE COMMON_SINGLE_WRITE AM_RANGE(0xb802, 0xb802) AM_WRITE(horshoes_bankg_w) - AM_RANGE(0xbc00, 0xbc00) AM_WRITE(MWA8_NOP) + AM_RANGE(0xbc00, 0xbc00) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( evilston_readmem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_READ - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xa7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xa7ff) AM_READ(SMH_RAM) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_0_r) AM_RANGE(0xa801, 0xa801) AM_READ(input_port_1_r) AM_RANGE(0xa802, 0xa802) AM_READ(input_port_2_r) @@ -1032,24 +1032,24 @@ static WRITE8_HANDLER (evilston_snd_w) static ADDRESS_MAP_START( evilston_writemem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_WRITE - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xa000, 0xa7ff) AM_WRITE(MWA8_RAM) AM_BASE(&shared_ram)//shared2_w }, - AM_RANGE(0xa800, 0xa800) AM_WRITE(MWA8_RAM)//watchdog ? - AM_RANGE(0xa804, 0xa804) AM_WRITE(MWA8_RAM) //coin couters/locks ? + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa000, 0xa7ff) AM_WRITE(SMH_RAM) AM_BASE(&shared_ram)//shared2_w }, + AM_RANGE(0xa800, 0xa800) AM_WRITE(SMH_RAM)//watchdog ? + AM_RANGE(0xa804, 0xa804) AM_WRITE(SMH_RAM) //coin couters/locks ? ADDRESS_MAP_END static ADDRESS_MAP_START( evilston_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_READ(shared_r)//shared_r }, AM_RANGE(0xe800, 0xe800) AM_READ(YM2203_status_port_0_r) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_BANK7) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_BANK7) ADDRESS_MAP_END static ADDRESS_MAP_START( evilston_2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(shared_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xe801, 0xe801) AM_WRITE(YM2203_write_port_0_w) diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index ce8ca24a03a..99275b60821 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -417,188 +417,188 @@ static WRITE8_HANDLER( sound_bankswitch_w ) /**************************************************************************/ static ADDRESS_MAP_START( superman_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x500000, 0x500007) AM_READ(superman_dsw_input_r) - AM_RANGE(0x800000, 0x800001) AM_READ(MRA16_NOP) + AM_RANGE(0x800000, 0x800001) AM_READ(SMH_NOP) AM_RANGE(0x800002, 0x800003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x900000, 0x9007ff) AM_READ(cchip1_ram_r) AM_RANGE(0x900802, 0x900803) AM_READ(cchip1_ctrl_r) - AM_RANGE(0xb00000, 0xb00fff) AM_READ(MRA16_RAM) - AM_RANGE(0xd00000, 0xd007ff) AM_READ(MRA16_RAM) /* video attribute ram */ - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM) /* object ram */ - AM_RANGE(0xf00000, 0xf03fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0xb00000, 0xb00fff) AM_READ(SMH_RAM) + AM_RANGE(0xd00000, 0xd007ff) AM_READ(SMH_RAM) /* video attribute ram */ + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM) /* object ram */ + AM_RANGE(0xf00000, 0xf03fff) AM_READ(SMH_RAM) /* Main RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( superman_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x300000, 0x300001) AM_WRITE(MWA16_NOP) /* written each frame at $3a9c, mostly 0x10 */ - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP) /* written each frame at $3aa2, mostly 0x10 */ - AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_NOP) /* written each frame at $3ab0, mostly 0x10 */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_NOP) /* written each frame at $3a9c, mostly 0x10 */ + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP) /* written each frame at $3aa2, mostly 0x10 */ + AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_NOP) /* written each frame at $3ab0, mostly 0x10 */ AM_RANGE(0x800000, 0x800001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x800002, 0x800003) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x900000, 0x9007ff) AM_WRITE(cchip1_ram_w) AM_RANGE(0x900802, 0x900803) AM_WRITE(cchip1_ctrl_w) AM_RANGE(0x900c00, 0x900c01) AM_WRITE(cchip1_bank_w) AM_RANGE(0xb00000, 0xb00fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xf00000, 0xf03fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xf00000, 0xf03fff) AM_WRITE(SMH_RAM) /* Main RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( daisenpu_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x500000, 0x50000f) AM_READ(superman_dsw_input_r) - AM_RANGE(0x800000, 0x800001) AM_READ(MRA16_NOP) + AM_RANGE(0x800000, 0x800001) AM_READ(SMH_NOP) AM_RANGE(0x800002, 0x800003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x900000, 0x90000f) AM_READ(daisenpu_input_r) - AM_RANGE(0xb00000, 0xb00fff) AM_READ(MRA16_RAM) - AM_RANGE(0xd00000, 0xd00fff) AM_READ(MRA16_RAM) /* video attribute ram */ - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM) /* object ram */ - AM_RANGE(0xf00000, 0xf03fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0xb00000, 0xb00fff) AM_READ(SMH_RAM) + AM_RANGE(0xd00000, 0xd00fff) AM_READ(SMH_RAM) /* video attribute ram */ + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM) /* object ram */ + AM_RANGE(0xf00000, 0xf03fff) AM_READ(SMH_RAM) /* Main RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( daisenpu_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) -// AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP) /* written each frame at $2ac, values change */ -// AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_NOP) /* written each frame at $2a2, values change */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) +// AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP) /* written each frame at $2ac, values change */ +// AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_NOP) /* written each frame at $2a2, values change */ AM_RANGE(0x800000, 0x800001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x800002, 0x800003) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x900000, 0x90000f) AM_WRITE(daisenpu_input_w) AM_RANGE(0xb00000, 0xb00fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xf00000, 0xf03fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xf00000, 0xf03fff) AM_WRITE(SMH_RAM) /* Main RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( gigandes_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x500000, 0x500007) AM_READ(superman_dsw_input_r) - AM_RANGE(0x800000, 0x800001) AM_READ(MRA16_NOP) + AM_RANGE(0x800000, 0x800001) AM_READ(SMH_NOP) AM_RANGE(0x800002, 0x800003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x900000, 0x90000f) AM_READ(daisenpu_input_r) - AM_RANGE(0xb00000, 0xb00fff) AM_READ(MRA16_RAM) - AM_RANGE(0xd00000, 0xd007ff) AM_READ(MRA16_RAM) /* video attribute ram */ - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM) /* object ram */ - AM_RANGE(0xf00000, 0xf03fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0xb00000, 0xb00fff) AM_READ(SMH_RAM) + AM_RANGE(0xd00000, 0xd007ff) AM_READ(SMH_RAM) /* video attribute ram */ + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM) /* object ram */ + AM_RANGE(0xf00000, 0xf03fff) AM_READ(SMH_RAM) /* Main RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( gigandes_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP) /* 0x1 written each frame at $d42, watchdog? */ - AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_NOP) /* 0x1 written each frame at $d3c, watchdog? */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP) /* 0x1 written each frame at $d42, watchdog? */ + AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_NOP) /* 0x1 written each frame at $d3c, watchdog? */ AM_RANGE(0x800000, 0x800001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x800002, 0x800003) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x900000, 0x90000f) AM_WRITE(daisenpu_input_w) AM_RANGE(0xb00000, 0xb00fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xf00000, 0xf03fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xf00000, 0xf03fff) AM_WRITE(SMH_RAM) /* Main RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( ballbros_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x500000, 0x50000f) AM_READ(superman_dsw_input_r) - AM_RANGE(0x800000, 0x800001) AM_READ(MRA16_NOP) + AM_RANGE(0x800000, 0x800001) AM_READ(SMH_NOP) AM_RANGE(0x800002, 0x800003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0x900000, 0x90000f) AM_READ(daisenpu_input_r) - AM_RANGE(0xb00000, 0xb00fff) AM_READ(MRA16_RAM) - AM_RANGE(0xd00000, 0xd007ff) AM_READ(MRA16_RAM) /* video attribute ram */ - AM_RANGE(0xe00000, 0xe03fff) AM_READ(MRA16_RAM) /* object ram */ - AM_RANGE(0xf00000, 0xf03fff) AM_READ(MRA16_RAM) /* Main RAM */ + AM_RANGE(0xb00000, 0xb00fff) AM_READ(SMH_RAM) + AM_RANGE(0xd00000, 0xd007ff) AM_READ(SMH_RAM) /* video attribute ram */ + AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM) /* object ram */ + AM_RANGE(0xf00000, 0xf03fff) AM_READ(SMH_RAM) /* Main RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( ballbros_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x400000, 0x400001) AM_WRITE(MWA16_NOP) /* 0x1 written each frame at $c56, watchdog? */ - AM_RANGE(0x600000, 0x600001) AM_WRITE(MWA16_NOP) /* 0x1 written each frame at $c4e, watchdog? */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP) /* 0x1 written each frame at $c56, watchdog? */ + AM_RANGE(0x600000, 0x600001) AM_WRITE(SMH_NOP) /* 0x1 written each frame at $c4e, watchdog? */ AM_RANGE(0x800000, 0x800001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x800002, 0x800003) AM_WRITE(taitosound_comm16_lsb_w) AM_RANGE(0x900000, 0x90000f) AM_WRITE(daisenpu_input_w) AM_RANGE(0xb00000, 0xb00fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16 ) // Sprites Y - AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr - AM_RANGE(0xf00000, 0xf03fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16 ) // Sprites Y + AM_RANGE(0xe00000, 0xe03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2 ) // Sprites Code + X + Attr + AM_RANGE(0xf00000, 0xf03fff) AM_WRITE(SMH_RAM) /* Main RAM */ ADDRESS_MAP_END /**************************************************************************/ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK2) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) /* bankswitch ? */ ADDRESS_MAP_END static ADDRESS_MAP_START( daisenpu_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK2) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe001) AM_READ(YM2151_status_port_0_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( daisenpu_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( ballbros_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK2) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) AM_RANGE(0xe003, 0xe003) AM_READ(YM2610_read_port_0_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( ballbros_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) /* bankswitch ? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index 11132f30c07..3827599a515 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -1424,31 +1424,31 @@ static MACHINE_START( taitoz ) static ADDRESS_MAP_START( contcirc_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_READ(MRA16_RAM) /* main CPUA ram */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM) /* main CPUA ram */ AM_RANGE(0x084000, 0x087fff) AM_READ(sharedram_r) AM_RANGE(0x100000, 0x100007) AM_READ(TC0110PCR_word_r) /* palette */ AM_RANGE(0x200000, 0x20ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x220000, 0x22000f) AM_READ(TC0100SCN_ctrl_word_0_r) AM_RANGE(0x300000, 0x301fff) AM_READ(TC0150ROD_word_r) /* "root ram" */ - AM_RANGE(0x400000, 0x4006ff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0x400000, 0x4006ff) AM_READ(SMH_RAM) /* spriteram */ ADDRESS_MAP_END static ADDRESS_MAP_START( contcirc_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) AM_RANGE(0x084000, 0x087fff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_SIZE(&taitoz_sharedram_size) AM_RANGE(0x090000, 0x090001) AM_WRITE(contcirc_out_w) /* road palette bank, sub CPU reset, 3d glasses control */ AM_RANGE(0x100000, 0x100007) AM_WRITE(TC0110PCR_step1_rbswap_word_w) /* palette */ AM_RANGE(0x200000, 0x20ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x220000, 0x22000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) AM_RANGE(0x300000, 0x301fff) AM_WRITE(TC0150ROD_word_w) /* "root ram" */ - AM_RANGE(0x400000, 0x4006ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x400000, 0x4006ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( contcirc_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM) AM_RANGE(0x084000, 0x087fff) AM_READ(sharedram_r) AM_RANGE(0x100000, 0x100001) AM_READ(contcirc_input_bypass_r) AM_RANGE(0x100002, 0x100003) AM_READ(TC0220IOC_halfword_port_r) /* (actually game uses TC040IOC) */ @@ -1456,8 +1456,8 @@ static ADDRESS_MAP_START( contcirc_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( contcirc_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x080000, 0x083fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) AM_RANGE(0x084000, 0x087fff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_RANGE(0x100000, 0x100001) AM_WRITE(TC0220IOC_halfword_portreg_w) AM_RANGE(0x100002, 0x100003) AM_WRITE(TC0220IOC_halfword_port_w) @@ -1466,25 +1466,25 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( chasehq_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x107fff) AM_READ(MRA16_RAM) /* main CPUA ram */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x107fff) AM_READ(SMH_RAM) /* main CPUA ram */ AM_RANGE(0x108000, 0x10bfff) AM_READ(sharedram_r) - AM_RANGE(0x10c000, 0x10ffff) AM_READ(MRA16_RAM) /* extra CPUA ram */ + AM_RANGE(0x10c000, 0x10ffff) AM_READ(SMH_RAM) /* extra CPUA ram */ AM_RANGE(0x400000, 0x400001) AM_READ(chasehq_input_bypass_r) AM_RANGE(0x400002, 0x400003) AM_READ(TC0220IOC_halfword_port_r) AM_RANGE(0x820000, 0x820003) AM_READ(taitoz_sound_r) AM_RANGE(0xa00000, 0xa00007) AM_READ(TC0110PCR_word_r) /* palette */ AM_RANGE(0xc00000, 0xc0ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0xc20000, 0xc2000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0xd00000, 0xd007ff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0xd00000, 0xd007ff) AM_READ(SMH_RAM) /* spriteram */ AM_RANGE(0xe00000, 0xe003ff) AM_READ(chasehq_motor_r) /* motor cpu */ ADDRESS_MAP_END static ADDRESS_MAP_START( chasehq_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x107fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x107fff) AM_WRITE(SMH_RAM) AM_RANGE(0x108000, 0x10bfff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_SIZE(&taitoz_sharedram_size) - AM_RANGE(0x10c000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x10c000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x400000, 0x400001) AM_WRITE(TC0220IOC_halfword_portreg_w) AM_RANGE(0x400002, 0x400003) AM_WRITE(TC0220IOC_halfword_port_w) AM_RANGE(0x800000, 0x800001) AM_WRITE(cpua_ctrl_w) @@ -1492,30 +1492,30 @@ static ADDRESS_MAP_START( chasehq_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa00007) AM_WRITE(TC0110PCR_step1_word_w) /* palette */ AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0xc20000, 0xc2000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xe00000, 0xe003ff) AM_WRITE(chasehq_motor_w) /* motor cpu */ ADDRESS_MAP_END static ADDRESS_MAP_START( chq_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x108000, 0x10bfff) AM_READ(sharedram_r) AM_RANGE(0x800000, 0x801fff) AM_READ(TC0150ROD_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( chq_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x108000, 0x10bfff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_RANGE(0x800000, 0x801fff) AM_WRITE(TC0150ROD_word_w) ADDRESS_MAP_END static ADDRESS_MAP_START( enforce_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* main CPUA ram */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) /* main CPUA ram */ AM_RANGE(0x104000, 0x107fff) AM_READ(sharedram_r) - AM_RANGE(0x300000, 0x3006ff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0x300000, 0x3006ff) AM_READ(SMH_RAM) /* spriteram */ AM_RANGE(0x400000, 0x401fff) AM_READ(TC0150ROD_word_r) /* "root ram" ??? */ AM_RANGE(0x500000, 0x500007) AM_READ(TC0110PCR_word_r) /* palette */ AM_RANGE(0x600000, 0x60ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ @@ -1523,11 +1523,11 @@ static ADDRESS_MAP_START( enforce_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( enforce_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x104000, 0x107fff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_SIZE(&taitoz_sharedram_size) AM_RANGE(0x200000, 0x200001) AM_WRITE(cpua_ctrl_w) // works without? - AM_RANGE(0x300000, 0x3006ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x300000, 0x3006ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x400000, 0x401fff) AM_WRITE(TC0150ROD_word_w) /* "root ram" ??? */ AM_RANGE(0x500000, 0x500007) AM_WRITE(TC0110PCR_step1_rbswap_word_w) /* palette */ AM_RANGE(0x600000, 0x60ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ @@ -1535,8 +1535,8 @@ static ADDRESS_MAP_START( enforce_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( enforce_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x104000, 0x107fff) AM_READ(sharedram_r) AM_RANGE(0x200000, 0x200003) AM_READ(taitoz_sound_r) AM_RANGE(0x300000, 0x300001) AM_READ(TC0220IOC_halfword_portreg_r) @@ -1544,8 +1544,8 @@ static ADDRESS_MAP_START( enforce_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( enforce_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x104000, 0x107fff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_RANGE(0x200000, 0x200003) AM_WRITE(taitoz_sound_w) AM_RANGE(0x300000, 0x300001) AM_WRITE(TC0220IOC_halfword_portreg_w) @@ -1554,119 +1554,119 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bshark_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) /* main CPUA ram */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) /* main CPUA ram */ AM_RANGE(0x110000, 0x113fff) AM_READ(sharedram_r) AM_RANGE(0x400000, 0x40000f) AM_READ(TC0220IOC_halfword_r) AM_RANGE(0x800000, 0x800007) AM_READ(bshark_stick_r) - AM_RANGE(0xa00000, 0xa01fff) AM_READ(MRA16_RAM) /* palette */ - AM_RANGE(0xc00000, 0xc00fff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0xa00000, 0xa01fff) AM_READ(SMH_RAM) /* palette */ + AM_RANGE(0xc00000, 0xc00fff) AM_READ(SMH_RAM) /* spriteram */ AM_RANGE(0xd00000, 0xd0ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0xd20000, 0xd2000f) AM_READ(TC0100SCN_ctrl_word_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( bshark_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x110000, 0x113fff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_SIZE(&taitoz_sharedram_size) AM_RANGE(0x400000, 0x40000f) AM_WRITE(TC0220IOC_halfword_w) AM_RANGE(0x600000, 0x600001) AM_WRITE(cpua_noz80_ctrl_w) AM_RANGE(0x800000, 0x800007) AM_WRITE(bshark_stick_w) AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xc00000, 0xc00fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xc00000, 0xc00fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xd00000, 0xd0ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0xd20000, 0xd2000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) ADDRESS_MAP_END static ADDRESS_MAP_START( bshark_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x108000, 0x10bfff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x108000, 0x10bfff) AM_READ(SMH_RAM) AM_RANGE(0x110000, 0x113fff) AM_READ(sharedram_r) // AM_RANGE(0x40000a, 0x40000b) AM_READ(taitoz_unknown_r) // ??? AM_RANGE(0x600000, 0x600001) AM_READ(YM2610_status_port_0_A_lsb_r) AM_RANGE(0x600002, 0x600003) AM_READ(YM2610_read_port_0_lsb_r) AM_RANGE(0x600004, 0x600005) AM_READ(YM2610_status_port_0_B_lsb_r) - AM_RANGE(0x60000c, 0x60000d) AM_READ(MRA16_NOP) - AM_RANGE(0x60000e, 0x60000f) AM_READ(MRA16_NOP) + AM_RANGE(0x60000c, 0x60000d) AM_READ(SMH_NOP) + AM_RANGE(0x60000e, 0x60000f) AM_READ(SMH_NOP) AM_RANGE(0x800000, 0x801fff) AM_READ(TC0150ROD_word_r) /* "root ram" */ ADDRESS_MAP_END static ADDRESS_MAP_START( bshark_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x108000, 0x10bfff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x108000, 0x10bfff) AM_WRITE(SMH_RAM) AM_RANGE(0x110000, 0x113fff) AM_WRITE(sharedram_w) -// AM_RANGE(0x400000, 0x400007) AM_WRITE(MWA16_NOP) // pan ??? +// AM_RANGE(0x400000, 0x400007) AM_WRITE(SMH_NOP) // pan ??? AM_RANGE(0x600000, 0x600001) AM_WRITE(YM2610_control_port_0_A_lsb_w) AM_RANGE(0x600002, 0x600003) AM_WRITE(YM2610_data_port_0_A_lsb_w) AM_RANGE(0x600004, 0x600005) AM_WRITE(YM2610_control_port_0_B_lsb_w) AM_RANGE(0x600006, 0x600007) AM_WRITE(YM2610_data_port_0_B_lsb_w) - AM_RANGE(0x60000c, 0x60000d) AM_WRITE(MWA16_NOP) // interrupt controller? - AM_RANGE(0x60000e, 0x60000f) AM_WRITE(MWA16_NOP) + AM_RANGE(0x60000c, 0x60000d) AM_WRITE(SMH_NOP) // interrupt controller? + AM_RANGE(0x60000e, 0x60000f) AM_WRITE(SMH_NOP) AM_RANGE(0x800000, 0x801fff) AM_WRITE(TC0150ROD_word_w) /* "root ram" */ ADDRESS_MAP_END static ADDRESS_MAP_START( sci_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x107fff) AM_READ(MRA16_RAM) /* main CPUA ram */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x107fff) AM_READ(SMH_RAM) /* main CPUA ram */ AM_RANGE(0x108000, 0x10bfff) AM_READ(sharedram_r) /* extent ?? */ - AM_RANGE(0x10c000, 0x10ffff) AM_READ(MRA16_RAM) /* extra CPUA ram */ + AM_RANGE(0x10c000, 0x10ffff) AM_READ(SMH_RAM) /* extra CPUA ram */ AM_RANGE(0x200000, 0x20000f) AM_READ(TC0220IOC_halfword_r) AM_RANGE(0x200010, 0x20001f) AM_READ(sci_steer_input_r) AM_RANGE(0x420000, 0x420003) AM_READ(taitoz_sound_r) - AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM) + AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM) AM_RANGE(0xa00000, 0xa0ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0xa20000, 0xa2000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM) /* spriteram */ // Raine draws only 0x1000 + AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM) /* spriteram */ // Raine draws only 0x1000 AM_RANGE(0xc08000, 0xc08001) AM_READ(sci_spriteframe_r) // debugging ADDRESS_MAP_END static ADDRESS_MAP_START( sci_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x107fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x107fff) AM_WRITE(SMH_RAM) AM_RANGE(0x108000, 0x10bfff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_SIZE(&taitoz_sharedram_size) - AM_RANGE(0x10c000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x10c000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x20000f) AM_WRITE(TC0220IOC_halfword_w) // AM_RANGE(0x400000, 0x400001) AM_WRITE(cpua_ctrl_w) // ?? doesn't seem to fit what's written AM_RANGE(0x420000, 0x420003) AM_WRITE(taitoz_sound_w) AM_RANGE(0x800000, 0x801fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0xa20000, 0xa2000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xc08000, 0xc08001) AM_WRITE(sci_spriteframe_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sci_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x203fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x203fff) AM_READ(SMH_RAM) AM_RANGE(0x208000, 0x20bfff) AM_READ(sharedram_r) AM_RANGE(0xa00000, 0xa01fff) AM_READ(TC0150ROD_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sci_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x203fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x203fff) AM_WRITE(SMH_RAM) AM_RANGE(0x208000, 0x20bfff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(TC0150ROD_word_w) ADDRESS_MAP_END static ADDRESS_MAP_START( nightstr_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) /* main CPUA ram */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) /* main CPUA ram */ AM_RANGE(0x110000, 0x113fff) AM_READ(sharedram_r) AM_RANGE(0x400000, 0x40000f) AM_READ(TC0220IOC_halfword_r) AM_RANGE(0x820000, 0x820003) AM_READ(taitoz_sound_r) AM_RANGE(0xa00000, 0xa00007) AM_READ(TC0110PCR_word_r) /* palette */ AM_RANGE(0xc00000, 0xc0ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0xc20000, 0xc2000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0xd00000, 0xd007ff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0xd00000, 0xd007ff) AM_READ(SMH_RAM) /* spriteram */ AM_RANGE(0xe40000, 0xe40007) AM_READ(nightstr_stick_r) ADDRESS_MAP_END static ADDRESS_MAP_START( nightstr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x110000, 0x113fff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_SIZE(&taitoz_sharedram_size) AM_RANGE(0x400000, 0x40000f) AM_WRITE(TC0220IOC_halfword_w) AM_RANGE(0x800000, 0x800001) AM_WRITE(cpua_ctrl_w) @@ -1674,54 +1674,54 @@ static ADDRESS_MAP_START( nightstr_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa00007) AM_WRITE(TC0110PCR_step1_word_w) /* palette */ AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0xc20000, 0xc2000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) -// AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP) /* ??? */ -// AM_RANGE(0xe00008, 0xe00009) AM_WRITE(MWA16_NOP) /* ??? */ -// AM_RANGE(0xe00010, 0xe00011) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0xd00000, 0xd007ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) +// AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP) /* ??? */ +// AM_RANGE(0xe00008, 0xe00009) AM_WRITE(SMH_NOP) /* ??? */ +// AM_RANGE(0xe00010, 0xe00011) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xe40000, 0xe40007) AM_WRITE(bshark_stick_w) ADDRESS_MAP_END static ADDRESS_MAP_START( nightstr_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x104000, 0x107fff) AM_READ(sharedram_r) AM_RANGE(0x800000, 0x801fff) AM_READ(TC0150ROD_word_r) /* "root ram" */ ADDRESS_MAP_END static ADDRESS_MAP_START( nightstr_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x104000, 0x107fff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_RANGE(0x800000, 0x801fff) AM_WRITE(TC0150ROD_word_w) /* "root ram" */ ADDRESS_MAP_END static ADDRESS_MAP_START( aquajack_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* main CPUA ram */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) /* main CPUA ram */ AM_RANGE(0x104000, 0x107fff) AM_READ(sharedram_r) AM_RANGE(0x300000, 0x300007) AM_READ(TC0110PCR_word_r) /* palette */ AM_RANGE(0x800000, 0x801fff) AM_READ(TC0150ROD_word_r) /* (like Contcirc, uses CPUA for road) */ AM_RANGE(0xa00000, 0xa0ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0xa20000, 0xa2000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0xc40000, 0xc403ff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0xc40000, 0xc403ff) AM_READ(SMH_RAM) /* spriteram */ ADDRESS_MAP_END static ADDRESS_MAP_START( aquajack_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x104000, 0x107fff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_SIZE(&taitoz_sharedram_size) AM_RANGE(0x200000, 0x200001) AM_WRITE(cpua_ctrl_w) // not needed, but it's probably like the others AM_RANGE(0x300000, 0x300007) AM_WRITE(TC0110PCR_step1_word_w) /* palette */ AM_RANGE(0x800000, 0x801fff) AM_WRITE(TC0150ROD_word_w) AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0xa20000, 0xa2000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0xc40000, 0xc403ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xc40000, 0xc403ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( aquajack_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x104000, 0x107fff) AM_READ(sharedram_r) AM_RANGE(0x200000, 0x20000f) AM_READ(TC0220IOC_halfword_r) AM_RANGE(0x300000, 0x300003) AM_READ(taitoz_sound_r) @@ -1730,8 +1730,8 @@ static ADDRESS_MAP_START( aquajack_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( aquajack_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x104000, 0x107fff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_RANGE(0x200000, 0x20000f) AM_WRITE(TC0220IOC_halfword_w) AM_RANGE(0x300000, 0x300003) AM_WRITE(taitoz_sound_w) @@ -1741,72 +1741,72 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( spacegun_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x30c000, 0x30ffff) AM_READ(MRA16_RAM) /* local CPUA ram */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x30c000, 0x30ffff) AM_READ(SMH_RAM) /* local CPUA ram */ AM_RANGE(0x310000, 0x31ffff) AM_READ(sharedram_r) /* extent correct acc. to CPUB inits */ - AM_RANGE(0x500000, 0x5005ff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0x500000, 0x5005ff) AM_READ(SMH_RAM) /* spriteram */ AM_RANGE(0x900000, 0x90ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x920000, 0x92000f) AM_READ(TC0100SCN_ctrl_word_0_r) AM_RANGE(0xb00000, 0xb00007) AM_READ(TC0110PCR_word_r) /* palette */ ADDRESS_MAP_END static ADDRESS_MAP_START( spacegun_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x30c000, 0x30ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x30c000, 0x30ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x310000, 0x31ffff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_SIZE(&taitoz_sharedram_size) - AM_RANGE(0x500000, 0x5005ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x500000, 0x5005ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x900000, 0x90ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x920000, 0x92000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) AM_RANGE(0xb00000, 0xb00007) AM_WRITE(TC0110PCR_step1_rbswap_word_w) /* palette */ ADDRESS_MAP_END static ADDRESS_MAP_START( spacegun_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x20c000, 0x20ffff) AM_READ(MRA16_RAM) /* local CPUB ram */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x20c000, 0x20ffff) AM_READ(SMH_RAM) /* local CPUB ram */ AM_RANGE(0x210000, 0x21ffff) AM_READ(sharedram_r) AM_RANGE(0x800000, 0x80000f) AM_READ(spacegun_input_bypass_r) AM_RANGE(0xc00000, 0xc00001) AM_READ(YM2610_status_port_0_A_lsb_r) AM_RANGE(0xc00002, 0xc00003) AM_READ(YM2610_read_port_0_lsb_r) AM_RANGE(0xc00004, 0xc00005) AM_READ(YM2610_status_port_0_B_lsb_r) - AM_RANGE(0xc0000c, 0xc0000d) AM_READ(MRA16_NOP) - AM_RANGE(0xc0000e, 0xc0000f) AM_READ(MRA16_NOP) + AM_RANGE(0xc0000c, 0xc0000d) AM_READ(SMH_NOP) + AM_RANGE(0xc0000e, 0xc0000f) AM_READ(SMH_NOP) AM_RANGE(0xf00000, 0xf00007) AM_READ(spacegun_lightgun_r) ADDRESS_MAP_END static ADDRESS_MAP_START( spacegun_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x20c000, 0x20ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x20c000, 0x20ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x210000, 0x21ffff) AM_WRITE(sharedram_w) AM_RANGE(0x800000, 0x80000f) AM_WRITE(spacegun_output_bypass_w) AM_RANGE(0xc00000, 0xc00001) AM_WRITE(YM2610_control_port_0_A_lsb_w) AM_RANGE(0xc00002, 0xc00003) AM_WRITE(YM2610_data_port_0_A_lsb_w) AM_RANGE(0xc00004, 0xc00005) AM_WRITE(YM2610_control_port_0_B_lsb_w) AM_RANGE(0xc00006, 0xc00007) AM_WRITE(YM2610_data_port_0_B_lsb_w) - AM_RANGE(0xc0000c, 0xc0000d) AM_WRITE(MWA16_NOP) // interrupt controller? - AM_RANGE(0xc0000e, 0xc0000f) AM_WRITE(MWA16_NOP) + AM_RANGE(0xc0000c, 0xc0000d) AM_WRITE(SMH_NOP) // interrupt controller? + AM_RANGE(0xc0000e, 0xc0000f) AM_WRITE(SMH_NOP) // AM_RANGE(0xc20000, 0xc20003) AM_WRITE(YM2610_????) /* Pan (acc. to Raine) */ -// AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_NOP) /* ??? */ +// AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xf00000, 0xf00007) AM_WRITE(spacegun_lightgun_w) ADDRESS_MAP_END static ADDRESS_MAP_START( dblaxle_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x203fff) AM_READ(MRA16_RAM) /* main CPUA ram */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x203fff) AM_READ(SMH_RAM) /* main CPUA ram */ AM_RANGE(0x210000, 0x21ffff) AM_READ(sharedram_r) AM_RANGE(0x400000, 0x40000f) AM_READ(TC0510NIO_halfword_wordswap_r) AM_RANGE(0x400010, 0x40001f) AM_READ(dblaxle_steer_input_r) AM_RANGE(0x620000, 0x620003) AM_READ(taitoz_sound_r) - AM_RANGE(0x800000, 0x801fff) AM_READ(MRA16_RAM) /* palette */ + AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM) /* palette */ AM_RANGE(0xa00000, 0xa0ffff) AM_READ(TC0480SCP_word_r) /* tilemaps */ AM_RANGE(0xa30000, 0xa3002f) AM_READ(TC0480SCP_ctrl_word_r) - AM_RANGE(0xc00000, 0xc03fff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM) /* spriteram */ AM_RANGE(0xc08000, 0xc08001) AM_READ(sci_spriteframe_r) // debugging ADDRESS_MAP_END static ADDRESS_MAP_START( dblaxle_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x203fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x203fff) AM_WRITE(SMH_RAM) AM_RANGE(0x210000, 0x21ffff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_SIZE(&taitoz_sharedram_size) AM_RANGE(0x400000, 0x40000f) AM_WRITE(TC0510NIO_halfword_wordswap_w) AM_RANGE(0x600000, 0x600001) AM_WRITE(cpua_ctrl_w) /* could this be causing int6 ? */ @@ -1815,44 +1815,44 @@ static ADDRESS_MAP_START( dblaxle_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x900000, 0x90ffff) AM_WRITE(TC0480SCP_word_w) /* tilemap mirror */ AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(TC0480SCP_word_w) /* tilemaps */ AM_RANGE(0xa30000, 0xa3002f) AM_WRITE(TC0480SCP_ctrl_word_w) - AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* mostly unused ? */ + AM_RANGE(0xc00000, 0xc03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* mostly unused ? */ AM_RANGE(0xc08000, 0xc08001) AM_WRITE(sci_spriteframe_w) /* set in int6, seems to stay zero */ ADDRESS_MAP_END static ADDRESS_MAP_START( dblaxle_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x110000, 0x11ffff) AM_READ(sharedram_r) AM_RANGE(0x300000, 0x301fff) AM_READ(TC0150ROD_word_r) - AM_RANGE(0x500000, 0x503fff) AM_READ(MRA16_RAM) /* network ram ? (see Gunbustr) */ + AM_RANGE(0x500000, 0x503fff) AM_READ(SMH_RAM) /* network ram ? (see Gunbustr) */ ADDRESS_MAP_END static ADDRESS_MAP_START( dblaxle_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x110000, 0x11ffff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_RANGE(0x300000, 0x301fff) AM_WRITE(TC0150ROD_word_w) - AM_RANGE(0x500000, 0x503fff) AM_WRITE(MWA16_RAM) /* network ram ? (see Gunbustr) */ + AM_RANGE(0x500000, 0x503fff) AM_WRITE(SMH_RAM) /* network ram ? (see Gunbustr) */ ADDRESS_MAP_END static ADDRESS_MAP_START( racingb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* main CPUA ram */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) /* main CPUA ram */ AM_RANGE(0x110000, 0x11ffff) AM_READ(sharedram_r) AM_RANGE(0x300000, 0x30000f) AM_READ(TC0510NIO_halfword_wordswap_r) AM_RANGE(0x300010, 0x30001f) AM_READ(dblaxle_steer_input_r) AM_RANGE(0x520000, 0x520003) AM_READ(taitoz_sound_r) - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) /* palette */ + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) /* palette */ AM_RANGE(0x900000, 0x90ffff) AM_READ(TC0480SCP_word_r) /* tilemaps */ AM_RANGE(0x930000, 0x93002f) AM_READ(TC0480SCP_ctrl_word_r) - AM_RANGE(0xb00000, 0xb03fff) AM_READ(MRA16_RAM) /* spriteram */ + AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM) /* spriteram */ AM_RANGE(0xb08000, 0xb08001) AM_READ(sci_spriteframe_r) // debugging ADDRESS_MAP_END static ADDRESS_MAP_START( racingb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x110000, 0x11ffff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_SIZE(&taitoz_sharedram_size) AM_RANGE(0x300000, 0x30000f) AM_WRITE(TC0510NIO_halfword_wordswap_w) AM_RANGE(0x500002, 0x500003) AM_WRITE(cpua_ctrl_w) @@ -1860,53 +1860,53 @@ static ADDRESS_MAP_START( racingb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700000, 0x701fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x900000, 0x90ffff) AM_WRITE(TC0480SCP_word_w) /* tilemaps */ AM_RANGE(0x930000, 0x93002f) AM_WRITE(TC0480SCP_ctrl_word_w) - AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* mostly unused ? */ + AM_RANGE(0xb00000, 0xb03fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* mostly unused ? */ AM_RANGE(0xb08000, 0xb08001) AM_WRITE(sci_spriteframe_w) /* alternates 0/0x100 */ ADDRESS_MAP_END static ADDRESS_MAP_START( racingb_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x400000, 0x403fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x400000, 0x403fff) AM_READ(SMH_RAM) AM_RANGE(0x410000, 0x41ffff) AM_READ(sharedram_r) AM_RANGE(0xa00000, 0xa01fff) AM_READ(TC0150ROD_word_r) - AM_RANGE(0xd00000, 0xd03fff) AM_READ(MRA16_RAM) /* network ram ? */ + AM_RANGE(0xd00000, 0xd03fff) AM_READ(SMH_RAM) /* network ram ? */ ADDRESS_MAP_END static ADDRESS_MAP_START( racingb_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x400000, 0x403fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x400000, 0x403fff) AM_WRITE(SMH_RAM) AM_RANGE(0x410000, 0x41ffff) AM_WRITE(sharedram_w) AM_BASE(&taitoz_sharedram) AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(TC0150ROD_word_w) - AM_RANGE(0xd00000, 0xd03fff) AM_WRITE(MWA16_RAM) /* network ram ? */ + AM_RANGE(0xd00000, 0xd03fff) AM_WRITE(SMH_RAM) /* network ram ? */ ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK10) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index 94197a849b1..ed570d7581b 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -375,14 +375,14 @@ static ADDRESS_MAP_START( airsys_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x140000, 0x140001) AM_WRITE(system_control_w) /* Pause the TMS32025 */ AM_RANGE(0x180000, 0x183fff) AM_RAM /* "gradiation ram (0)" */ AM_RANGE(0x184000, 0x187fff) AM_RAM /* "gradiation ram (1)" */ - AM_RANGE(0x188000, 0x18bfff) AM_READWRITE(MRA16_RAM, airsys_paletteram16_w) AM_BASE(&paletteram16) + AM_RANGE(0x188000, 0x18bfff) AM_READWRITE(SMH_RAM, airsys_paletteram16_w) AM_BASE(&paletteram16) AM_RANGE(0x800000, 0x820fff) AM_READWRITE(TC0080VCO_word_r, TC0080VCO_word_w) /* tilemaps, sprites */ AM_RANGE(0x908000, 0x90ffff) AM_RAM AM_BASE(&taitoair_line_ram) /* "line ram" */ AM_RANGE(0x910000, 0x91ffff) AM_RAM AM_BASE(&dsp_ram) /* "dsp common ram" (TMS320C25) */ AM_RANGE(0xa00000, 0xa00007) AM_READ(stick_input_r) AM_RANGE(0xa00100, 0xa00107) AM_READ(stick2_input_r) AM_RANGE(0xa00200, 0xa0020f) AM_READWRITE(TC0220IOC_halfword_r, TC0220IOC_halfword_w) /* other I/O */ - AM_RANGE(0xa80000, 0xa80001) AM_READWRITE(MRA16_NOP, taitosound_port16_lsb_w) + AM_RANGE(0xa80000, 0xa80001) AM_READWRITE(SMH_NOP, taitosound_port16_lsb_w) AM_RANGE(0xa80002, 0xa80003) AM_READWRITE(taitosound_comm16_lsb_r, taitosound_comm16_lsb_w) AM_RANGE(0xb00000, 0xb007ff) AM_RAM /* "power common ram" (mecha drive) */ ADDRESS_MAP_END @@ -397,12 +397,12 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2610_read_port_0_r, YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) - AM_RANGE(0xe200, 0xe200) AM_READWRITE(MRA8_NOP, taitosound_slave_port_w) + AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan control */ - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan control */ + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c index f23d63309e9..ace5d785604 100644 --- a/src/mame/drivers/taitosj.c +++ b/src/mame/drivers/taitosj.c @@ -244,7 +244,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(MRA8_BANK1, MWA8_ROM) + AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_BANK1, SMH_ROM) 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) @@ -256,8 +256,8 @@ static ADDRESS_MAP_START( taitosj_main_nomcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xd05f) AM_RAM AM_BASE(&taitosj_colscrolly) AM_RANGE(0xd100, 0xd1ff) AM_RAM AM_BASE(&taitosj_spriteram) AM_RANGE(0xd200, 0xd27f) AM_MIRROR(0x0080) AM_RAM AM_BASE(&taitosj_paletteram) - AM_RANGE(0xd300, 0xd300) AM_MIRROR(0x00ff) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_video_priority) - AM_RANGE(0xd400, 0xd403) AM_MIRROR(0x00f0) AM_READ(MRA8_RAM) AM_BASE(&taitosj_collision_reg) + AM_RANGE(0xd300, 0xd300) AM_MIRROR(0x00ff) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_video_priority) + AM_RANGE(0xd400, 0xd403) AM_MIRROR(0x00f0) AM_READ(SMH_RAM) AM_BASE(&taitosj_collision_reg) AM_RANGE(0xd404, 0xd404) AM_MIRROR(0x00f3) AM_READ(taitosj_gfxrom_r) AM_RANGE(0xd408, 0xd408) AM_MIRROR(0x00f0) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0xd409, 0xd409) AM_MIRROR(0x00f0) AM_READ(input_port_1_r) /* IN1 */ @@ -267,15 +267,15 @@ static ADDRESS_MAP_START( taitosj_main_nomcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ(input_port_4_r) AM_RANGE(0xd40e, 0xd40e) AM_MIRROR(0x00f0) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) /* DSW2 and DSW3 */ - AM_RANGE(0xd500, 0xd505) AM_MIRROR(0x00f0) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_scroll) - AM_RANGE(0xd506, 0xd507) AM_MIRROR(0x00f0) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_colorbank) + AM_RANGE(0xd500, 0xd505) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_scroll) + AM_RANGE(0xd506, 0xd507) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_colorbank) AM_RANGE(0xd508, 0xd508) AM_MIRROR(0x00f0) AM_WRITE(taitosj_collision_reg_clear_w) - AM_RANGE(0xd509, 0xd50a) AM_MIRROR(0x00f0) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_gfxpointer) + AM_RANGE(0xd509, 0xd50a) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_gfxpointer) AM_RANGE(0xd50b, 0xd50b) AM_MIRROR(0x00f0) AM_WRITE(taitosj_soundcommand_w) - AM_RANGE(0xd50d, 0xd50d) AM_MIRROR(0x00f0) AM_WRITE(MWA8_RAM) /*watchdog_reset_w*/ /* Bio Attack sometimes resets after you die */ + AM_RANGE(0xd50d, 0xd50d) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) /*watchdog_reset_w*/ /* Bio Attack sometimes resets after you die */ AM_RANGE(0xd50e, 0xd50e) AM_MIRROR(0x00f0) AM_WRITE(taitosj_bankswitch_w) - AM_RANGE(0xd50f, 0xd50f) AM_MIRROR(0x00f0) AM_WRITE(MWA8_NOP) - AM_RANGE(0xd600, 0xd600) AM_MIRROR(0x00ff) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_video_mode) + AM_RANGE(0xd50f, 0xd50f) AM_MIRROR(0x00f0) AM_WRITE(SMH_NOP) + AM_RANGE(0xd600, 0xd600) AM_MIRROR(0x00ff) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_video_mode) AM_RANGE(0xd700, 0xdfff) AM_NOP AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -284,7 +284,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(MRA8_BANK1, MWA8_ROM) + AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_BANK1, SMH_ROM) 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) @@ -296,8 +296,8 @@ static ADDRESS_MAP_START( taitosj_main_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xd05f) AM_RAM AM_BASE(&taitosj_colscrolly) AM_RANGE(0xd100, 0xd1ff) AM_RAM AM_BASE(&taitosj_spriteram) AM_RANGE(0xd200, 0xd27f) AM_MIRROR(0x0080) AM_RAM AM_BASE(&taitosj_paletteram) - AM_RANGE(0xd300, 0xd300) AM_MIRROR(0x00ff) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_video_priority) - AM_RANGE(0xd400, 0xd403) AM_MIRROR(0x00f0) AM_READ(MRA8_RAM) AM_BASE(&taitosj_collision_reg) + AM_RANGE(0xd300, 0xd300) AM_MIRROR(0x00ff) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_video_priority) + AM_RANGE(0xd400, 0xd403) AM_MIRROR(0x00f0) AM_READ(SMH_RAM) AM_BASE(&taitosj_collision_reg) AM_RANGE(0xd404, 0xd404) AM_MIRROR(0x00f3) AM_READ(taitosj_gfxrom_r) AM_RANGE(0xd408, 0xd408) AM_MIRROR(0x00f0) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0xd409, 0xd409) AM_MIRROR(0x00f0) AM_READ(input_port_1_r) /* IN1 */ @@ -307,15 +307,15 @@ static ADDRESS_MAP_START( taitosj_main_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ(input_port_4_r) AM_RANGE(0xd40e, 0xd40e) AM_MIRROR(0x00f0) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) /* DSW2 and DSW3 */ - AM_RANGE(0xd500, 0xd505) AM_MIRROR(0x00f0) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_scroll) - AM_RANGE(0xd506, 0xd507) AM_MIRROR(0x00f0) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_colorbank) + AM_RANGE(0xd500, 0xd505) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_scroll) + AM_RANGE(0xd506, 0xd507) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_colorbank) AM_RANGE(0xd508, 0xd508) AM_MIRROR(0x00f0) AM_WRITE(taitosj_collision_reg_clear_w) - AM_RANGE(0xd509, 0xd50a) AM_MIRROR(0x00f0) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_gfxpointer) + AM_RANGE(0xd509, 0xd50a) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_gfxpointer) AM_RANGE(0xd50b, 0xd50b) AM_MIRROR(0x00f0) AM_WRITE(taitosj_soundcommand_w) - AM_RANGE(0xd50d, 0xd50d) AM_MIRROR(0x00f0) AM_WRITE(MWA8_RAM) /*watchdog_reset_w*/ /* Bio Attack sometimes resets after you die */ + AM_RANGE(0xd50d, 0xd50d) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) /*watchdog_reset_w*/ /* Bio Attack sometimes resets after you die */ AM_RANGE(0xd50e, 0xd50e) AM_MIRROR(0x00f0) AM_WRITE(taitosj_bankswitch_w) - AM_RANGE(0xd50f, 0xd50f) AM_MIRROR(0x00f0) AM_WRITE(MWA8_NOP) - AM_RANGE(0xd600, 0xd600) AM_MIRROR(0x00ff) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_video_mode) + AM_RANGE(0xd50f, 0xd50f) AM_MIRROR(0x00f0) AM_WRITE(SMH_NOP) + AM_RANGE(0xd600, 0xd600) AM_MIRROR(0x00ff) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_video_mode) AM_RANGE(0xd700, 0xdfff) AM_NOP AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -347,23 +347,23 @@ 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(MRA8_BANK1, MWA8_ROM) + AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_BANK1, SMH_ROM) 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) - AM_RANGE(0x8802, 0x8802) AM_READWRITE(MRA8_NOP, MWA8_NOP) - AM_RANGE(0x8a00, 0x8a5f) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_colscrolly) + AM_RANGE(0x8802, 0x8802) AM_READWRITE(SMH_NOP, SMH_NOP) + AM_RANGE(0x8a00, 0x8a5f) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_colscrolly) AM_RANGE(0x9000, 0xbfff) AM_WRITE(taitosj_characterram_w) AM_BASE(&taitosj_characterram) AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_RANGE(0xc400, 0xc7ff) AM_RAM AM_BASE(&taitosj_videoram_1) AM_RANGE(0xc800, 0xcbff) AM_RAM AM_BASE(&taitosj_videoram_2) AM_RANGE(0xcc00, 0xcfff) AM_RAM AM_BASE(&taitosj_videoram_3) - AM_RANGE(0xd000, 0xd001) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_colorbank) - AM_RANGE(0xd002, 0xd007) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_scroll) + AM_RANGE(0xd000, 0xd001) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_colorbank) + AM_RANGE(0xd002, 0xd007) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_scroll) AM_RANGE(0xd100, 0xd1ff) AM_RAM AM_BASE(&taitosj_spriteram) AM_RANGE(0xd200, 0xd27f) AM_RAM AM_BASE(&taitosj_paletteram) - AM_RANGE(0xd300, 0xd300) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_video_priority) - AM_RANGE(0xd400, 0xd403) AM_READ(MRA8_RAM) AM_BASE(&taitosj_collision_reg) + AM_RANGE(0xd300, 0xd300) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_video_priority) + AM_RANGE(0xd400, 0xd403) AM_READ(SMH_RAM) AM_BASE(&taitosj_collision_reg) AM_RANGE(0xd404, 0xd404) AM_READ(taitosj_gfxrom_r) AM_RANGE(0xd408, 0xd408) AM_READ(input_port_0_r) /* IN0 */ AM_RANGE(0xd409, 0xd409) AM_READ(input_port_1_r) /* IN1 */ @@ -374,11 +374,11 @@ static ADDRESS_MAP_START( kikstart_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd40e, 0xd40e) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xd40f, 0xd40f) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) /* DSW2 and DSW3 */ AM_RANGE(0xd508, 0xd508) AM_WRITE(taitosj_collision_reg_clear_w) - AM_RANGE(0xd509, 0xd50a) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_gfxpointer) + AM_RANGE(0xd509, 0xd50a) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_gfxpointer) AM_RANGE(0xd50b, 0xd50b) AM_WRITE(taitosj_soundcommand_w) AM_RANGE(0xd50d, 0xd50d) AM_WRITE(watchdog_reset_w) AM_RANGE(0xd50e, 0xd50e) AM_WRITE(taitosj_bankswitch_w) - AM_RANGE(0xd600, 0xd600) AM_WRITE(MWA8_RAM) AM_BASE(&taitosj_video_mode) + AM_RANGE(0xd600, 0xd600) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_video_mode) AM_RANGE(0xd800, 0xdfff) AM_RAM AM_BASE(&kikstart_scrollram)// scroll ram + ??? AM_RANGE(0xe000, 0xefff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/talbot.c b/src/mame/drivers/talbot.c index 9a9a24bf9b5..15e6afa98c4 100644 --- a/src/mame/drivers/talbot.c +++ b/src/mame/drivers/talbot.c @@ -41,20 +41,20 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x7001, 0x7001) AM_WRITE(AY8910_control_port_0_w) - AM_RANGE(0x8000, 0x83ff) AM_READWRITE(MRA8_RAM, talbot_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x8400, 0x87ff) AM_READWRITE(MRA8_RAM, talbot_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x8000, 0x83ff) AM_READWRITE(SMH_RAM, talbot_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x8400, 0x87ff) AM_READWRITE(SMH_RAM, talbot_colorram_w) AM_BASE(&colorram) AM_RANGE(0x8800, 0x8fef) AM_RAM AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xa000, 0xa000) AM_WRITE(interrupt_enable_w) - AM_RANGE(0xa001, 0xa001) AM_WRITE(MWA8_RAM) - AM_RANGE(0xa003, 0xa003) AM_WRITE(MWA8_RAM) + AM_RANGE(0xa001, 0xa001) AM_WRITE(SMH_RAM) + AM_RANGE(0xa003, 0xa003) AM_WRITE(SMH_RAM) AM_RANGE(0xa006, 0xa006) AM_WRITE(talbot_mcu_halt_w) AM_RANGE(0xa007, 0xa007) AM_WRITE(talbot_mcu_switch_w) AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) AM_RANGE(0xa040, 0xa040) AM_READ(input_port_1_r) - AM_RANGE(0xa060, 0xa06f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0xa060, 0xa06f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_RANGE(0xa080, 0xa080) AM_READ(input_port_2_r) - AM_RANGE(0xa0c0, 0xa0c0) AM_READWRITE(input_port_3_r,MWA8_NOP /*watchdog_reset_w*/) + AM_RANGE(0xa0c0, 0xa0c0) AM_READWRITE(input_port_3_r,SMH_NOP /*watchdog_reset_w*/) ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c index 0ecde095677..eb98a2085f7 100644 --- a/src/mame/drivers/tank8.c +++ b/src/mame/drivers/tank8.c @@ -114,9 +114,9 @@ static ADDRESS_MAP_START( tank8_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1c0f, 0x1c0f) AM_READ(input_port_11_r) AM_RANGE(0x1800, 0x1bff) AM_WRITE(tank8_video_ram_w) AM_BASE(&tank8_video_ram) - AM_RANGE(0x1c00, 0x1c0f) AM_WRITE(MWA8_RAM) AM_BASE(&tank8_pos_h_ram) - AM_RANGE(0x1c10, 0x1c1f) AM_WRITE(MWA8_RAM) AM_BASE(&tank8_pos_v_ram) - AM_RANGE(0x1c20, 0x1c2f) AM_WRITE(MWA8_RAM) AM_BASE(&tank8_pos_d_ram) + AM_RANGE(0x1c00, 0x1c0f) AM_WRITE(SMH_RAM) AM_BASE(&tank8_pos_h_ram) + AM_RANGE(0x1c10, 0x1c1f) AM_WRITE(SMH_RAM) AM_BASE(&tank8_pos_v_ram) + AM_RANGE(0x1c20, 0x1c2f) AM_WRITE(SMH_RAM) AM_BASE(&tank8_pos_d_ram) AM_RANGE(0x1c30, 0x1c37) AM_WRITE(tank8_lockout_w) AM_RANGE(0x1d00, 0x1d00) AM_WRITE(tank8_int_reset_w) @@ -124,7 +124,7 @@ static ADDRESS_MAP_START( tank8_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1d02, 0x1d02) AM_WRITE(tank8_explosion_w) AM_RANGE(0x1d03, 0x1d03) AM_WRITE(tank8_bugle_w) AM_RANGE(0x1d04, 0x1d04) AM_WRITE(tank8_bug_w) - AM_RANGE(0x1d05, 0x1d05) AM_WRITE(MWA8_RAM) AM_BASE(&tank8_team) + AM_RANGE(0x1d05, 0x1d05) AM_WRITE(SMH_RAM) AM_BASE(&tank8_team) AM_RANGE(0x1d06, 0x1d06) AM_WRITE(tank8_attract_w) AM_RANGE(0x1e00, 0x1e07) AM_WRITE(tank8_motor_w) diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c index 53704eba0e6..99c67fba5d7 100644 --- a/src/mame/drivers/tankbatt.c +++ b/src/mame/drivers/tankbatt.c @@ -151,28 +151,28 @@ static WRITE8_HANDLER( tankbatt_sh_fire_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM) AM_RANGE(0x0c00, 0x0c07) AM_READ(tankbatt_in0_r) AM_RANGE(0x0c08, 0x0c0f) AM_READ(tankbatt_in1_r) AM_RANGE(0x0c18, 0x0c1f) AM_READ(tankbatt_dsw_r) - AM_RANGE(0x0200, 0x0bff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_ROM) /* for the reset / interrupt vectors */ + AM_RANGE(0x0200, 0x0bff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_ROM) /* for the reset / interrupt vectors */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0010, 0x01ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0010, 0x01ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0800, 0x0bff) AM_WRITE(tankbatt_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x0000, 0x000f) AM_WRITE(MWA8_RAM) AM_BASE(&tankbatt_bulletsram) AM_SIZE(&tankbatt_bulletsram_size) - AM_RANGE(0x0c18, 0x0c18) AM_WRITE(MWA8_NOP) /* watchdog ?? */ + AM_RANGE(0x0000, 0x000f) AM_WRITE(SMH_RAM) AM_BASE(&tankbatt_bulletsram) AM_SIZE(&tankbatt_bulletsram_size) + AM_RANGE(0x0c18, 0x0c18) AM_WRITE(SMH_NOP) /* watchdog ?? */ AM_RANGE(0x0c00, 0x0c01) AM_WRITE(tankbatt_led_w) AM_RANGE(0x0c0a, 0x0c0a) AM_WRITE(tankbatt_interrupt_enable_w) AM_RANGE(0x0c0b, 0x0c0b) AM_WRITE(tankbatt_sh_engine_w) AM_RANGE(0x0c0c, 0x0c0c) AM_WRITE(tankbatt_sh_fire_w) AM_RANGE(0x0c0d, 0x0c0d) AM_WRITE(tankbatt_sh_expl_w) AM_RANGE(0x0c0f, 0x0c0f) AM_WRITE(tankbatt_demo_interrupt_enable_w) - AM_RANGE(0x0200, 0x07ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0200, 0x07ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static INTERRUPT_GEN( tankbatt_interrupt ) diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c index e15656a0c03..aa63b5faaf1 100644 --- a/src/mame/drivers/tankbust.c +++ b/src/mame/drivers/tankbust.c @@ -192,13 +192,13 @@ static READ8_HANDLER( some_changing_input ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x9fff) AM_READ(MRA8_BANK1) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_BANK2) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x9fff) AM_READ(SMH_BANK1) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_BANK2) AM_RANGE(0xe000, 0xe007) AM_READ(debug_output_area_r) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) //AM_RANGE(0xf800, 0xffff) AM_READ(read_from_unmapped_memory) /* a bug in game code ? */ @@ -210,27 +210,27 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc7ff) AM_READ(tankbust_background_videoram_r) AM_RANGE(0xc800, 0xcfff) AM_READ(tankbust_background_colorram_r) AM_RANGE(0xd000, 0xd7ff) AM_READ(tankbust_txtram_r) - AM_RANGE(0xd800, 0xd8ff) AM_READ(MRA8_RAM) + AM_RANGE(0xd800, 0xd8ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x9fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x9fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe007) AM_WRITE(tankbust_e0xx_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(tankbust_yscroll_w) AM_RANGE(0xe801, 0xe802) AM_WRITE(tankbust_xscroll_w) AM_RANGE(0xe803, 0xe803) AM_WRITE(tankbust_soundlatch_w) - AM_RANGE(0xe804, 0xe804) AM_WRITE(MWA8_NOP) /* watchdog ? ; written in long-lasting loops */ + AM_RANGE(0xe804, 0xe804) AM_WRITE(SMH_NOP) /* watchdog ? ; written in long-lasting loops */ AM_RANGE(0xc000, 0xc7ff) AM_WRITE(tankbust_background_videoram_w) AM_BASE(&videoram) AM_RANGE(0xc800, 0xcfff) AM_WRITE(tankbust_background_colorram_w) AM_BASE(&colorram) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(tankbust_txtram_w) AM_BASE(&tankbust_txtram) - AM_RANGE(0xd800, 0xd8ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd800, 0xd8ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) ADDRESS_MAP_END @@ -250,17 +250,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_NOP) /* garbage, written in initialization loop */ + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_NOP) /* garbage, written in initialization loop */ //0x4000 and 0x4040-0x4045 seem to be used (referenced in the code) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_NOP) /* garbage, written in initialization loop */ + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_NOP) /* garbage, written in initialization loop */ ADDRESS_MAP_END diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index 295412e04e3..3a4a834cf45 100644 --- a/src/mame/drivers/taotaido.c +++ b/src/mame/drivers/taotaido.c @@ -99,13 +99,13 @@ static WRITE16_HANDLER( sound_command_w ) } } static ADDRESS_MAP_START( taotaido_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM) // bg ram? - AM_RANGE(0xa00000, 0xa01fff) AM_READ(MRA16_RAM) // sprite ram - AM_RANGE(0xc00000, 0xc0ffff) AM_READ(MRA16_RAM) // sprite tile look up - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) // main ram - AM_RANGE(0xffc000, 0xffcfff) AM_READ(MRA16_RAM) // palette ram - AM_RANGE(0xffe000, 0xffe3ff) AM_READ(MRA16_RAM) // rowscroll / rowselect / scroll ram + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM) // bg ram? + AM_RANGE(0xa00000, 0xa01fff) AM_READ(SMH_RAM) // sprite ram + AM_RANGE(0xc00000, 0xc0ffff) AM_READ(SMH_RAM) // sprite tile look up + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) // main ram + AM_RANGE(0xffc000, 0xffcfff) AM_READ(SMH_RAM) // palette ram + AM_RANGE(0xffe000, 0xffe3ff) AM_READ(SMH_RAM) // rowscroll / rowselect / scroll ram AM_RANGE(0xffff80, 0xffff81) AM_READ(input_port_0_word_r) // player 1 inputs AM_RANGE(0xffff82, 0xffff83) AM_READ(input_port_1_word_r) // player 2 inputs @@ -113,7 +113,7 @@ static ADDRESS_MAP_START( taotaido_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xffff86, 0xffff87) AM_READ(input_port_3_word_r) // DSWA AM_RANGE(0xffff88, 0xffff89) AM_READ(input_port_4_word_r) // DSWB AM_RANGE(0xffff8a, 0xffff8b) AM_READ(input_port_5_word_r) // DSWC - AM_RANGE(0xffff8c, 0xffff8d) AM_READ(MRA16_RAM) // unknown + AM_RANGE(0xffff8c, 0xffff8d) AM_READ(SMH_RAM) // unknown AM_RANGE(0xffff8e, 0xffff8f) AM_READ(input_port_6_word_r) // jumpers #if TAOTAIDO_SHOW_ALL_INPUTS AM_RANGE(0xffffa0, 0xffffa1) AM_READ(input_port_7_word_r) // player 3 inputs (unused) @@ -124,17 +124,17 @@ static ADDRESS_MAP_START( taotaido_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( taotaido_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x800000, 0x803fff) AM_WRITE(taotaido_bgvideoram_w) AM_BASE(&taotaido_bgram) // bg ram? - AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(MWA16_RAM) AM_BASE(&taotaido_spriteram) // sprite ram - AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(MWA16_RAM) AM_BASE(&taotaido_spriteram2) // sprite tile lookup ram - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) // main ram + AM_RANGE(0xa00000, 0xa01fff) AM_WRITE(SMH_RAM) AM_BASE(&taotaido_spriteram) // sprite ram + AM_RANGE(0xc00000, 0xc0ffff) AM_WRITE(SMH_RAM) AM_BASE(&taotaido_spriteram2) // sprite tile lookup ram + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) // main ram AM_RANGE(0xffc000, 0xffcfff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // palette ram - AM_RANGE(0xffe000, 0xffe3ff) AM_WRITE(MWA16_RAM) AM_BASE(&taotaido_scrollram) // rowscroll / rowselect / scroll ram + AM_RANGE(0xffe000, 0xffe3ff) AM_WRITE(SMH_RAM) AM_BASE(&taotaido_scrollram) // rowscroll / rowselect / scroll ram AM_RANGE(0xffff00, 0xffff0f) AM_WRITE(taotaido_tileregs_w) - AM_RANGE(0xffff10, 0xffff11) AM_WRITE(MWA16_NOP) // unknown - AM_RANGE(0xffff20, 0xffff21) AM_WRITE(MWA16_NOP) // unknown - flip screen related + AM_RANGE(0xffff10, 0xffff11) AM_WRITE(SMH_NOP) // unknown + AM_RANGE(0xffff20, 0xffff21) AM_WRITE(SMH_NOP) // unknown - flip screen related AM_RANGE(0xffff40, 0xffff47) AM_WRITE(taotaido_sprite_character_bank_select_w) AM_RANGE(0xffffc0, 0xffffc1) AM_WRITE(sound_command_w) // seems right ADDRESS_MAP_END @@ -155,15 +155,15 @@ static WRITE8_HANDLER( taotaido_sh_bankswitch_w ) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( taotaido_sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c index 6a250b4c1e7..ec61241b1c5 100644 --- a/src/mame/drivers/targeth.c +++ b/src/mame/drivers/targeth.c @@ -55,20 +55,20 @@ static INTERRUPT_GEN(targeth_interrupt ) static ADDRESS_MAP_START( targeth_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* ROM */ - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* Video RAM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) /* Video RAM */ AM_RANGE(0x108000, 0x108001) AM_READ(input_port_0_word_r)/* Gun 1P X */ AM_RANGE(0x108002, 0x108003) AM_READ(input_port_1_word_r)/* Gun 1P Y */ AM_RANGE(0x108004, 0x108005) AM_READ(input_port_2_word_r)/* Gun 2P X */ AM_RANGE(0x108006, 0x108007) AM_READ(input_port_3_word_r)/* Gun 2P Y */ - AM_RANGE(0x200000, 0x2007ff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_READ(MRA16_RAM) /* Sprite RAM */ + AM_RANGE(0x200000, 0x2007ff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x440000, 0x440fff) AM_READ(SMH_RAM) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ(input_port_4_word_r)/* DIPSW #2 */ AM_RANGE(0x700002, 0x700003) AM_READ(input_port_5_word_r)/* DIPSW #1 */ AM_RANGE(0x700006, 0x700007) AM_READ(input_port_6_word_r)/* Coins, Start & Fire buttons */ AM_RANGE(0x700008, 0x700009) AM_READ(input_port_7_word_r)/* Service & Guns Reload? */ AM_RANGE(0x70000e, 0x70000f) AM_READ(OKIM6295_status_0_lsb_r)/* OKI6295 status register */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) /* Work RAM (partially shared with DS5002FP) */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END static WRITE16_HANDLER( OKIM6295_bankswitch_w ) @@ -86,17 +86,17 @@ static WRITE16_HANDLER( targeth_coin_counter_w ) } static ADDRESS_MAP_START( targeth_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x100000, 0x103fff) AM_WRITE(targeth_vram_w) AM_BASE(&targeth_videoram) /* Video RAM */ - AM_RANGE(0x108000, 0x108007) AM_WRITE(MWA16_RAM) AM_BASE(&targeth_vregs) /* Video Registers */ - AM_RANGE(0x10800c, 0x10800d) AM_WRITE(MWA16_NOP) /* CLR Video INT */ + AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&targeth_vregs) /* Video Registers */ + AM_RANGE(0x10800c, 0x10800d) AM_WRITE(SMH_NOP) /* CLR Video INT */ AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_WRITE(MWA16_RAM) AM_BASE(&targeth_spriteram) /* Sprite RAM */ + AM_RANGE(0x440000, 0x440fff) AM_WRITE(SMH_RAM) AM_BASE(&targeth_spriteram) /* Sprite RAM */ AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */ AM_RANGE(0x70000e, 0x70000f) AM_WRITE(OKIM6295_data_0_lsb_w) /* OKI6295 data register */ - AM_RANGE(0x70000a, 0x70001b) AM_WRITE(MWA16_NOP) /* ??? Guns reload related? */ + AM_RANGE(0x70000a, 0x70001b) AM_WRITE(SMH_NOP) /* ??? Guns reload related? */ AM_RANGE(0x70002a, 0x70003b) AM_WRITE(targeth_coin_counter_w) /* Coin counters */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Work RAM (partially shared with DS5002FP) */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index 644ea3faea0..c6582ffbb34 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -178,11 +178,11 @@ static WRITE16_HANDLER(cyclwarr_sound_w) static ADDRESS_MAP_START( apache3_v30_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x07fff) AM_RAM - AM_RANGE(0x08000, 0x08fff) AM_READWRITE(MRA16_RAM, apache3_palette_w) AM_BASE(&paletteram16) - AM_RANGE(0x0c000, 0x0dfff) AM_READWRITE(MRA16_RAM, roundup5_text_w) AM_BASE(&videoram16) - AM_RANGE(0x0e800, 0x0e803) AM_WRITE(MWA16_NOP) // CRT + AM_RANGE(0x08000, 0x08fff) AM_READWRITE(SMH_RAM, apache3_palette_w) AM_BASE(&paletteram16) + AM_RANGE(0x0c000, 0x0dfff) AM_READWRITE(SMH_RAM, roundup5_text_w) AM_BASE(&videoram16) + AM_RANGE(0x0e800, 0x0e803) AM_WRITE(SMH_NOP) // CRT AM_RANGE(0x0f000, 0x0f001) AM_READ(input_port_3_word_r) // Dip 1+2 - AM_RANGE(0x0f000, 0x0f001) AM_WRITE(MWA16_NOP) // todo + AM_RANGE(0x0f000, 0x0f001) AM_WRITE(SMH_NOP) // todo AM_RANGE(0x0f800, 0x0f801) AM_READWRITE(apache3_bank_r, apache3_bank_w) AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(apache3_v30_v20_r, apache3_v30_v20_w) AM_RANGE(0x20000, 0x2ffff) AM_READWRITE(tatsumi_v30_68000_r, tatsumi_v30_68000_w) @@ -196,7 +196,7 @@ static ADDRESS_MAP_START( apache3_68000_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x9a000, 0x9a1ff) AM_WRITE(tatsumi_sprite_control_w) AM_BASE(&tatsumi_sprite_control_ram) AM_RANGE(0xa0000, 0xa0001) AM_WRITE(apache3_a0000_w) AM_RANGE(0xb0000, 0xb0001) AM_WRITE(apache3_irq_ack_w) //todo - z80 reset? - AM_RANGE(0xc0000, 0xc0001) AM_WRITE(MWA16_RAM) AM_BASE(&tatsumi_c_ram) + AM_RANGE(0xc0000, 0xc0001) AM_WRITE(SMH_RAM) AM_BASE(&tatsumi_c_ram) AM_RANGE(0xd0000, 0xdffff) AM_RAM AM_BASE(&apache3_g_ram) AM_RANGE(0xe0000, 0xe7fff) AM_READWRITE(apache3_z80_r, apache3_z80_w) ADDRESS_MAP_END @@ -221,14 +221,14 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( roundup5_v30_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x07fff) AM_RAM - AM_RANGE(0x08000, 0x0bfff) AM_READWRITE(MRA16_RAM, roundup5_text_w) AM_BASE(&videoram16) + AM_RANGE(0x08000, 0x0bfff) AM_READWRITE(SMH_RAM, roundup5_text_w) AM_BASE(&videoram16) AM_RANGE(0x0c000, 0x0c003) AM_WRITE(roundup5_crt_w) AM_RANGE(0x0d000, 0x0d001) AM_READ(input_port_3_word_r) /* Dip 1+2 */ - AM_RANGE(0x0d400, 0x0d40f) AM_WRITE(MWA16_RAM) AM_BASE(&roundup5_unknown0) - AM_RANGE(0x0d800, 0x0d801) AM_WRITE(MWA16_RAM) AM_BASE(&roundup5_unknown1) // VRAM2 X scroll (todo) - AM_RANGE(0x0dc00, 0x0dc01) AM_WRITE(MWA16_RAM) AM_BASE(&roundup5_unknown2) // VRAM2 Y scroll (todo) + AM_RANGE(0x0d400, 0x0d40f) AM_WRITE(SMH_RAM) AM_BASE(&roundup5_unknown0) + AM_RANGE(0x0d800, 0x0d801) AM_WRITE(SMH_RAM) AM_BASE(&roundup5_unknown1) // VRAM2 X scroll (todo) + AM_RANGE(0x0dc00, 0x0dc01) AM_WRITE(SMH_RAM) AM_BASE(&roundup5_unknown2) // VRAM2 Y scroll (todo) AM_RANGE(0x0e000, 0x0e001) AM_WRITE(roundup5_control_w) - AM_RANGE(0x0f000, 0x0ffff) AM_READWRITE(MRA16_RAM, roundup5_palette_w) AM_BASE(&paletteram16) + AM_RANGE(0x0f000, 0x0ffff) AM_READWRITE(SMH_RAM, roundup5_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(roundup_v30_z80_r, roundup_v30_z80_w) AM_RANGE(0x20000, 0x2ffff) AM_READWRITE(tatsumi_v30_68000_r, tatsumi_v30_68000_w) AM_RANGE(0x30000, 0x3ffff) AM_READWRITE(roundup5_vram_r, roundup5_vram_w) @@ -256,8 +256,8 @@ static ADDRESS_MAP_START( roundup5_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xfff8, 0xfff8) AM_READ(input_port_0_r) AM_RANGE(0xfff9, 0xfff9) AM_READ(input_port_1_r) AM_RANGE(0xfffc, 0xfffc) AM_READ(input_port_2_r) - AM_RANGE(0xfff9, 0xfff9) AM_WRITE(MWA8_NOP) //irq ack? - AM_RANGE(0xfffa, 0xfffa) AM_WRITE(MWA8_NOP) //irq ack? + AM_RANGE(0xfff9, 0xfff9) AM_WRITE(SMH_NOP) //irq ack? + AM_RANGE(0xfffa, 0xfffa) AM_WRITE(SMH_NOP) //irq ack? ADDRESS_MAP_END /******************************************************************************/ @@ -312,7 +312,7 @@ static ADDRESS_MAP_START( cyclwarr_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xfff1, 0xfff1) AM_READWRITE(tatsumi_hack_ym2151_r, YM2151_data_port_0_w) AM_RANGE(0xfff4, 0xfff4) AM_READWRITE(tatsumi_hack_oki_r, OKIM6295_data_0_w) AM_RANGE(0xfffc, 0xfffc) AM_READ(soundlatch_r) - AM_RANGE(0xfffe, 0xfffe) AM_WRITE(MWA8_NOP) + AM_RANGE(0xfffe, 0xfffe) AM_WRITE(SMH_NOP) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c index 152f8ab9b78..a08b5434049 100644 --- a/src/mame/drivers/taxidrvr.c +++ b/src/mame/drivers/taxidrvr.c @@ -112,48 +112,48 @@ static MACHINE_RESET( taxidrvr ) static ADDRESS_MAP_START( readmem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) - AM_RANGE(0x9000, 0x9fff) AM_READ(MRA8_RAM) - AM_RANGE(0xa000, 0xafff) AM_READ(MRA8_RAM) - AM_RANGE(0xb000, 0xbfff) AM_READ(MRA8_RAM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xf3ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) + AM_RANGE(0x9000, 0x9fff) AM_READ(SMH_RAM) + AM_RANGE(0xa000, 0xafff) AM_READ(SMH_RAM) + AM_RANGE(0xb000, 0xbfff) AM_READ(SMH_RAM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xf3ff) AM_READ(SMH_RAM) AM_RANGE(0xf400, 0xf403) AM_READ(ppi8255_0_r) AM_RANGE(0xf480, 0xf483) AM_READ(ppi8255_2_r) AM_RANGE(0xf500, 0xf503) AM_READ(ppi8255_3_r) AM_RANGE(0xf580, 0xf583) AM_READ(ppi8255_4_r) - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) /* ??? */ - AM_RANGE(0x9000, 0x9fff) AM_WRITE(MWA8_RAM) /* ??? */ - AM_RANGE(0xa000, 0xafff) AM_WRITE(MWA8_RAM) /* ??? */ - AM_RANGE(0xb000, 0xbfff) AM_WRITE(MWA8_RAM) /* ??? */ - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) AM_BASE(&taxidrvr_vram4) /* radar bitmap */ - AM_RANGE(0xc800, 0xcfff) AM_WRITE(MWA8_RAM) AM_BASE(&taxidrvr_vram5) /* "sprite1" bitmap */ - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_RAM) AM_BASE(&taxidrvr_vram6) /* "sprite2" bitmap */ - AM_RANGE(0xd800, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&taxidrvr_vram7) /* "sprite3" bitmap */ - AM_RANGE(0xe000, 0xe3ff) AM_WRITE(MWA8_RAM) AM_BASE(&taxidrvr_vram1) /* car tilemap */ - AM_RANGE(0xe400, 0xebff) AM_WRITE(MWA8_RAM) AM_BASE(&taxidrvr_vram2) /* bg1 tilemap */ - AM_RANGE(0xec00, 0xefff) AM_WRITE(MWA8_RAM) AM_BASE(&taxidrvr_vram0) /* fg tilemap */ - AM_RANGE(0xf000, 0xf3ff) AM_WRITE(MWA8_RAM) AM_BASE(&taxidrvr_vram3) /* bg2 tilemap */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) /* ??? */ + AM_RANGE(0x9000, 0x9fff) AM_WRITE(SMH_RAM) /* ??? */ + AM_RANGE(0xa000, 0xafff) AM_WRITE(SMH_RAM) /* ??? */ + AM_RANGE(0xb000, 0xbfff) AM_WRITE(SMH_RAM) /* ??? */ + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_BASE(&taxidrvr_vram4) /* radar bitmap */ + AM_RANGE(0xc800, 0xcfff) AM_WRITE(SMH_RAM) AM_BASE(&taxidrvr_vram5) /* "sprite1" bitmap */ + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) AM_BASE(&taxidrvr_vram6) /* "sprite2" bitmap */ + AM_RANGE(0xd800, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&taxidrvr_vram7) /* "sprite3" bitmap */ + AM_RANGE(0xe000, 0xe3ff) AM_WRITE(SMH_RAM) AM_BASE(&taxidrvr_vram1) /* car tilemap */ + AM_RANGE(0xe400, 0xebff) AM_WRITE(SMH_RAM) AM_BASE(&taxidrvr_vram2) /* bg1 tilemap */ + AM_RANGE(0xec00, 0xefff) AM_WRITE(SMH_RAM) AM_BASE(&taxidrvr_vram0) /* fg tilemap */ + AM_RANGE(0xf000, 0xf3ff) AM_WRITE(SMH_RAM) AM_BASE(&taxidrvr_vram3) /* bg2 tilemap */ AM_RANGE(0xf400, 0xf403) AM_WRITE(ppi8255_0_w) AM_RANGE(0xf480, 0xf483) AM_WRITE(ppi8255_2_w) /* "sprite1" placement */ AM_RANGE(0xf500, 0xf503) AM_WRITE(ppi8255_3_w) /* "sprite2" placement */ AM_RANGE(0xf580, 0xf583) AM_WRITE(ppi8255_4_w) /* "sprite3" placement */ -// AM_RANGE(0xf780, 0xf781) AM_WRITE(MWA8_RAM) /* more scroll registers? */ - AM_RANGE(0xf782, 0xf787) AM_WRITE(MWA8_RAM) AM_BASE(&taxidrvr_scroll) /* bg scroll (three copies always identical) */ - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_RAM) +// AM_RANGE(0xf780, 0xf781) AM_WRITE(SMH_RAM) /* more scroll registers? */ + AM_RANGE(0xf782, 0xf787) AM_WRITE(SMH_RAM) AM_BASE(&taxidrvr_scroll) /* bg scroll (three copies always identical) */ + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x67ff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa003) AM_READ(ppi8255_1_r) AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) AM_RANGE(0xe001, 0xe001) AM_READ(input_port_1_r) @@ -163,21 +163,21 @@ static ADDRESS_MAP_START( readmem2, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x67ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x67ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa003) AM_WRITE(ppi8255_1_w) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem3, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x2000) AM_READ(MRA8_NOP) /* irq ack? */ - AM_RANGE(0xfc00, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x2000) AM_READ(SMH_NOP) /* irq ack? */ + AM_RANGE(0xfc00, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem3, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xfc00, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xfc00, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( readport3, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index 07e481ff114..e16b4345f67 100644 --- a/src/mame/drivers/tbowl.c +++ b/src/mame/drivers/tbowl.c @@ -103,12 +103,12 @@ static WRITE8_HANDLER( tbowl_sound_command_w ) /* Board B */ static ADDRESS_MAP_START( readmem_6206B, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) /* RAM 1 */ - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_RAM) /* RAM 1 */ - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_BANK1) /* Banked ROM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) /* RAM 1 */ + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_RAM) /* RAM 1 */ + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_BANK1) /* Banked ROM */ AM_RANGE(0xf800, 0xfbff) AM_READ(shared_r) /* RAM 2 */ AM_RANGE(0xfc00, 0xfc00) AM_READ(input_port_0_r) // Player 1 inputs AM_RANGE(0xfc01, 0xfc01) AM_READ(input_port_1_r) // Player 2 inputs @@ -122,13 +122,13 @@ static ADDRESS_MAP_START( readmem_6206B, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_6206B, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xbfff) AM_WRITE(tbowl_bg2videoram_w) AM_BASE(&tbowl_bg2videoram) AM_RANGE(0xc000, 0xdfff) AM_WRITE(tbowl_bgvideoram_w) AM_BASE(&tbowl_bgvideoram) AM_RANGE(0xe000, 0xefff) AM_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_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf800, 0xfbff) AM_WRITE(shared_w) AM_BASE(&shared_ram) /* check */ AM_RANGE(0xfc00, 0xfc00) AM_WRITE(tbowlb_bankswitch_w) // AM_RANGE(0xfc01, 0xfc01) AM_WRITE(unknown_write) /* written during start-up, not again */ @@ -156,25 +156,25 @@ static WRITE8_HANDLER ( tbowl_trigger_nmi ) } static ADDRESS_MAP_START( readmem_6206C, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) /* not read? */ - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_BANK2) /* Banked ROM */ + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) /* not read? */ + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_BANK2) /* Banked ROM */ AM_RANGE(0xf800, 0xfbff) AM_READ(shared_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_6206C, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xd7ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&tbowl_spriteram) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + 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_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_BASE(&paletteram) // 2x palettes, one for each monitor? - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf800, 0xfbff) AM_WRITE(shared_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(tbowlc_bankswitch_w) - AM_RANGE(0xfc01, 0xfc01) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xfc01, 0xfc01) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xfc02, 0xfc02) AM_WRITE(tbowl_trigger_nmi) /* ? */ - AM_RANGE(0xfc03, 0xfc03) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xfc06, 0xfc06) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xfc03, 0xfc03) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xfc06, 0xfc06) AM_WRITE(SMH_NOP) /* ? */ ADDRESS_MAP_END /* Board A */ @@ -219,14 +219,14 @@ static void tbowl_adpcm_int(int num) } static ADDRESS_MAP_START( readmem_6206A, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xe010, 0xe010) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_6206A, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd000) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xd800, 0xd800) AM_WRITE(YM3812_control_port_1_w) @@ -234,8 +234,8 @@ static ADDRESS_MAP_START( writemem_6206A, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe000, 0xe001) AM_WRITE(tbowl_adpcm_end_w) AM_RANGE(0xe002, 0xe003) AM_WRITE(tbowl_adpcm_start_w) AM_RANGE(0xe004, 0xe005) AM_WRITE(tbowl_adpcm_vol_w) - AM_RANGE(0xe006, 0xe006) AM_WRITE(MWA8_NOP) - AM_RANGE(0xe007, 0xe007) AM_WRITE(MWA8_NOP) /* NMI acknowledge */ + AM_RANGE(0xe006, 0xe006) AM_WRITE(SMH_NOP) + AM_RANGE(0xe007, 0xe007) AM_WRITE(SMH_NOP) /* NMI acknowledge */ ADDRESS_MAP_END /*** Input Ports diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c index bb612cf21bf..f2b3d7a69d5 100644 --- a/src/mame/drivers/tceptor.c +++ b/src/mame/drivers/tceptor.c @@ -177,16 +177,16 @@ static READ8_HANDLER( readFF ) static ADDRESS_MAP_START( m6809_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x17ff) AM_RAM - AM_RANGE(0x1800, 0x1bff) AM_READWRITE(MRA8_RAM, tceptor_tile_ram_w) AM_BASE(&tceptor_tile_ram) - AM_RANGE(0x1c00, 0x1fff) AM_READWRITE(MRA8_RAM, tceptor_tile_attr_w) AM_BASE(&tceptor_tile_attr) - AM_RANGE(0x2000, 0x3fff) AM_READWRITE(MRA8_RAM, tceptor_bg_ram_w) AM_BASE(&tceptor_bg_ram) // background (VIEW RAM) + AM_RANGE(0x1800, 0x1bff) AM_READWRITE(SMH_RAM, tceptor_tile_ram_w) AM_BASE(&tceptor_tile_ram) + AM_RANGE(0x1c00, 0x1fff) AM_READWRITE(SMH_RAM, tceptor_tile_attr_w) AM_BASE(&tceptor_tile_attr) + AM_RANGE(0x2000, 0x3fff) AM_READWRITE(SMH_RAM, tceptor_bg_ram_w) AM_BASE(&tceptor_bg_ram) // background (VIEW RAM) AM_RANGE(0x4000, 0x43ff) AM_READWRITE(namcos1_cus30_r, namcos1_cus30_w) - AM_RANGE(0x4800, 0x4800) AM_WRITE(MWA8_NOP) // 3D scope left/right? - AM_RANGE(0x4f00, 0x4f00) AM_READ(MRA8_NOP) // unknown + AM_RANGE(0x4800, 0x4800) AM_WRITE(SMH_NOP) // 3D scope left/right? + AM_RANGE(0x4f00, 0x4f00) AM_READ(SMH_NOP) // unknown AM_RANGE(0x4f01, 0x4f01) AM_READ(input_port_4_r) // analog input (accel) AM_RANGE(0x4f02, 0x4f02) AM_READ(input_port_5_r) // analog input (left/right) AM_RANGE(0x4f03, 0x4f03) AM_READ(input_port_6_r) // analog input (up/down) - AM_RANGE(0x4f00, 0x4f03) AM_WRITE(MWA8_NOP) // analog input control? + AM_RANGE(0x4f00, 0x4f03) AM_WRITE(SMH_NOP) // analog input control? AM_RANGE(0x5000, 0x5006) AM_WRITE(tceptor_bg_scroll_w) // bg scroll AM_RANGE(0x6000, 0x7fff) AM_RAM AM_SHARE(1) AM_BASE(&m68k_shared_ram) // COM RAM AM_RANGE(0x8000, 0x8000) AM_WRITE(m6809_irq_disable_w) @@ -203,7 +203,7 @@ static ADDRESS_MAP_START( m6502_a_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x2001, 0x2001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) AM_RANGE(0x3000, 0x30ff) AM_RAM AM_SHARE(3) - AM_RANGE(0x3c01, 0x3c01) AM_WRITE(MWA8_RAM) + AM_RANGE(0x3c01, 0x3c01) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -212,7 +212,7 @@ static ADDRESS_MAP_START( m6502_b_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x00ff) AM_RAM AM_SHARE(2) AM_RANGE(0x0100, 0x01ff) AM_RAM AM_RANGE(0x4000, 0x4000) AM_WRITE(voice_w) // voice data - AM_RANGE(0x5000, 0x5000) AM_WRITE(MWA8_RAM) // voice ctrl?? + AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_RAM) // voice ctrl?? AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -221,8 +221,8 @@ static ADDRESS_MAP_START( m68k_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x00ffff) AM_ROM // M68K ERROR 1 AM_RANGE(0x100000, 0x10ffff) AM_ROM // not sure AM_RANGE(0x200000, 0x203fff) AM_RAM // M68K ERROR 0 - AM_RANGE(0x300000, 0x300001) AM_WRITE(MWA16_RAM) - AM_RANGE(0x400000, 0x4001ff) AM_WRITE(MWA16_RAM) AM_BASE(&tceptor_sprite_ram) + AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_RAM) + AM_RANGE(0x400000, 0x4001ff) AM_WRITE(SMH_RAM) AM_BASE(&tceptor_sprite_ram) AM_RANGE(0x500000, 0x51ffff) AM_WRITE(namco_road16_w) AM_RANGE(0x600000, 0x600001) AM_WRITE(m68k_irq_enable_w) // not sure AM_RANGE(0x700000, 0x703fff) AM_READWRITE(m68k_shared_word_r, m68k_shared_word_w) AM_SHARE(1) @@ -250,8 +250,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(HD63701_PORT1, HD63701_PORT1) AM_READWRITE(readFF, MWA8_NOP) - AM_RANGE(HD63701_PORT2, HD63701_PORT2) AM_READWRITE(readFF, MWA8_NOP) + AM_RANGE(HD63701_PORT1, HD63701_PORT1) AM_READWRITE(readFF, SMH_NOP) + AM_RANGE(HD63701_PORT2, HD63701_PORT2) AM_READWRITE(readFF, SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 6f61a222022..d1e64099e94 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -122,9 +122,9 @@ static void tecmo_adpcm_int(int num) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xefff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xefff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_BANK1) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_0_r) AM_RANGE(0xf801, 0xf801) AM_READ(input_port_1_r) AM_RANGE(0xf802, 0xf802) AM_READ(input_port_2_r) @@ -139,14 +139,14 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( rygar_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(tecmo_txvideoram_w) AM_BASE(&tecmo_txvideoram) AM_RANGE(0xd800, 0xdbff) AM_WRITE(tecmo_fgvideoram_w) AM_BASE(&tecmo_fgvideoram) AM_RANGE(0xdc00, 0xdfff) AM_WRITE(tecmo_bgvideoram_w) AM_BASE(&tecmo_bgvideoram) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xe800, 0xefff) AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_BASE(&paletteram) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf800, 0xf802) AM_WRITE(tecmo_fgscroll_w) AM_RANGE(0xf803, 0xf805) AM_WRITE(tecmo_bgscroll_w) AM_RANGE(0xf806, 0xf806) AM_WRITE(tecmo_sound_command_w) @@ -156,14 +156,14 @@ static ADDRESS_MAP_START( rygar_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( gemini_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(tecmo_txvideoram_w) AM_BASE(&tecmo_txvideoram) AM_RANGE(0xd800, 0xdbff) AM_WRITE(tecmo_fgvideoram_w) AM_BASE(&tecmo_fgvideoram) AM_RANGE(0xdc00, 0xdfff) AM_WRITE(tecmo_bgvideoram_w) AM_BASE(&tecmo_bgvideoram) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_BASE(&paletteram) - AM_RANGE(0xe800, 0xefff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe800, 0xefff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf800, 0xf802) AM_WRITE(tecmo_fgscroll_w) AM_RANGE(0xf803, 0xf805) AM_WRITE(tecmo_bgscroll_w) AM_RANGE(0xf806, 0xf806) AM_WRITE(tecmo_sound_command_w) @@ -173,57 +173,57 @@ static ADDRESS_MAP_START( gemini_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( silkworm_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc3ff) AM_WRITE(tecmo_bgvideoram_w) AM_BASE(&tecmo_bgvideoram) AM_RANGE(0xc400, 0xc7ff) AM_WRITE(tecmo_fgvideoram_w) AM_BASE(&tecmo_fgvideoram) AM_RANGE(0xc800, 0xcfff) AM_WRITE(tecmo_txvideoram_w) AM_BASE(&tecmo_txvideoram) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xe800, 0xefff) AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_BASE(&paletteram) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf800, 0xf802) AM_WRITE(tecmo_fgscroll_w) AM_RANGE(0xf803, 0xf805) AM_WRITE(tecmo_bgscroll_w) AM_RANGE(0xf806, 0xf806) AM_WRITE(tecmo_sound_command_w) AM_RANGE(0xf807, 0xf807) AM_WRITE(tecmo_flipscreen_w) AM_RANGE(0xf808, 0xf808) AM_WRITE(tecmo_bankswitch_w) - AM_RANGE(0xf809, 0xf809) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf80b, 0xf80b) AM_WRITE(MWA8_NOP) /* ? if mapped to watchdog like in the others, causes reset */ + AM_RANGE(0xf809, 0xf809) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf80b, 0xf80b) AM_WRITE(SMH_NOP) /* ? if mapped to watchdog like in the others, causes reset */ ADDRESS_MAP_END static ADDRESS_MAP_START( rygar_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( rygar_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0x8001, 0x8001) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(tecmo_adpcm_start_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(tecmo_adpcm_end_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(tecmo_adpcm_vol_w) - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* NMI acknowledge */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* NMI acknowledge */ ADDRESS_MAP_END static ADDRESS_MAP_START( tecmo_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( tecmo_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x2000, 0x207f) AM_WRITE(MWA8_RAM) /* Silkworm set #2 has a custom CPU which */ + AM_RANGE(0x2000, 0x207f) AM_WRITE(SMH_RAM) /* Silkworm set #2 has a custom CPU which */ /* writes code to this area */ - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(YM3812_control_port_0_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(tecmo_adpcm_start_w) AM_RANGE(0xc400, 0xc400) AM_WRITE(tecmo_adpcm_end_w) AM_RANGE(0xc800, 0xc800) AM_WRITE(tecmo_adpcm_vol_w) - AM_RANGE(0xcc00, 0xcc00) AM_WRITE(MWA8_NOP) /* NMI acknowledge */ + AM_RANGE(0xcc00, 0xcc00) AM_WRITE(SMH_NOP) /* NMI acknowledge */ ADDRESS_MAP_END diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c index 417a091bad6..84511082dfb 100644 --- a/src/mame/drivers/tecmo16.c +++ b/src/mame/drivers/tecmo16.c @@ -70,35 +70,35 @@ static WRITE16_HANDLER( tecmo16_sound_command_w ) /******************************************************************************/ static ADDRESS_MAP_START( fstarfrc_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x110000, 0x110fff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x1207ff) AM_READ(MRA16_RAM) - AM_RANGE(0x120800, 0x120fff) AM_READ(MRA16_RAM) - AM_RANGE(0x121000, 0x1217ff) AM_READ(MRA16_RAM) - AM_RANGE(0x121800, 0x121fff) AM_READ(MRA16_RAM) - AM_RANGE(0x122000, 0x127fff) AM_READ(MRA16_RAM) - AM_RANGE(0x130000, 0x130fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x141fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x110000, 0x110fff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM) + AM_RANGE(0x120800, 0x120fff) AM_READ(SMH_RAM) + AM_RANGE(0x121000, 0x1217ff) AM_READ(SMH_RAM) + AM_RANGE(0x121800, 0x121fff) AM_READ(SMH_RAM) + AM_RANGE(0x122000, 0x127fff) AM_READ(SMH_RAM) + AM_RANGE(0x130000, 0x130fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x141fff) AM_READ(SMH_RAM) AM_RANGE(0x150030, 0x150031) AM_READ(input_port_1_word_r) AM_RANGE(0x150040, 0x150041) AM_READ(input_port_0_word_r) AM_RANGE(0x150050, 0x150051) AM_READ(input_port_2_word_r) ADDRESS_MAP_END static ADDRESS_MAP_START( fstarfrc_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x110000, 0x110fff) AM_WRITE(tecmo16_charram_w) AM_BASE(&tecmo16_charram) AM_RANGE(0x120000, 0x1207ff) AM_WRITE(tecmo16_videoram_w) AM_BASE(&tecmo16_videoram) AM_RANGE(0x120800, 0x120fff) AM_WRITE(tecmo16_colorram_w) AM_BASE(&tecmo16_colorram) AM_RANGE(0x121000, 0x1217ff) AM_WRITE(tecmo16_videoram2_w) AM_BASE(&tecmo16_videoram2) AM_RANGE(0x121800, 0x121fff) AM_WRITE(tecmo16_colorram2_w) AM_BASE(&tecmo16_colorram2) - AM_RANGE(0x122000, 0x127fff) AM_WRITE(MWA16_RAM) /* work area */ - AM_RANGE(0x130000, 0x130fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x122000, 0x127fff) AM_WRITE(SMH_RAM) /* work area */ + AM_RANGE(0x130000, 0x130fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x140000, 0x141fff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x150000, 0x150001) AM_WRITE(tecmo16_flipscreen_w) AM_RANGE(0x150010, 0x150011) AM_WRITE(tecmo16_sound_command_w) - AM_RANGE(0x150030, 0x150031) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0x150030, 0x150031) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x160000, 0x160001) AM_WRITE(tecmo16_scroll_char_x_w) AM_RANGE(0x16000c, 0x16000d) AM_WRITE(tecmo16_scroll_x_w) AM_RANGE(0x160012, 0x160013) AM_WRITE(tecmo16_scroll_y_w) @@ -107,16 +107,16 @@ static ADDRESS_MAP_START( fstarfrc_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ginkun_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x110000, 0x110fff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x120fff) AM_READ(MRA16_RAM) - AM_RANGE(0x121000, 0x121fff) AM_READ(MRA16_RAM) - AM_RANGE(0x122000, 0x122fff) AM_READ(MRA16_RAM) - AM_RANGE(0x123000, 0x123fff) AM_READ(MRA16_RAM) - AM_RANGE(0x124000, 0x124fff) AM_READ(MRA16_RAM) - AM_RANGE(0x130000, 0x130fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x141fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x110000, 0x110fff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x120fff) AM_READ(SMH_RAM) + AM_RANGE(0x121000, 0x121fff) AM_READ(SMH_RAM) + AM_RANGE(0x122000, 0x122fff) AM_READ(SMH_RAM) + AM_RANGE(0x123000, 0x123fff) AM_READ(SMH_RAM) + AM_RANGE(0x124000, 0x124fff) AM_READ(SMH_RAM) + AM_RANGE(0x130000, 0x130fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x141fff) AM_READ(SMH_RAM) AM_RANGE(0x150020, 0x150021) AM_READ(input_port_3_word_r) AM_RANGE(0x150030, 0x150031) AM_READ(input_port_1_word_r) AM_RANGE(0x150040, 0x150041) AM_READ(input_port_0_word_r) @@ -124,20 +124,20 @@ static ADDRESS_MAP_START( ginkun_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ginkun_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) /* Main RAM */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) /* Main RAM */ AM_RANGE(0x110000, 0x110fff) AM_WRITE(tecmo16_charram_w) AM_BASE(&tecmo16_charram) AM_RANGE(0x120000, 0x120fff) AM_WRITE(tecmo16_videoram_w) AM_BASE(&tecmo16_videoram) AM_RANGE(0x121000, 0x121fff) AM_WRITE(tecmo16_colorram_w) AM_BASE(&tecmo16_colorram) AM_RANGE(0x122000, 0x122fff) AM_WRITE(tecmo16_videoram2_w) AM_BASE(&tecmo16_videoram2) AM_RANGE(0x123000, 0x123fff) AM_WRITE(tecmo16_colorram2_w) AM_BASE(&tecmo16_colorram2) - AM_RANGE(0x124000, 0x124fff) AM_WRITE(MWA16_RAM) /* extra RAM for Riot */ - AM_RANGE(0x130000, 0x130fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x124000, 0x124fff) AM_WRITE(SMH_RAM) /* extra RAM for Riot */ + AM_RANGE(0x130000, 0x130fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x140000, 0x141fff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x150000, 0x150001) AM_WRITE(tecmo16_flipscreen_w) AM_RANGE(0x150010, 0x150011) AM_WRITE(tecmo16_sound_command_w) - AM_RANGE(0x150020, 0x150021) AM_WRITE(MWA16_NOP) /* ??? */ - AM_RANGE(0x150030, 0x150031) AM_WRITE(MWA16_NOP) /* ??? */ + AM_RANGE(0x150020, 0x150021) AM_WRITE(SMH_NOP) /* ??? */ + AM_RANGE(0x150030, 0x150031) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0x160000, 0x160001) AM_WRITE(tecmo16_scroll_char_x_w) AM_RANGE(0x160006, 0x160007) AM_WRITE(tecmo16_scroll_char_y_w) AM_RANGE(0x16000c, 0x16000d) AM_WRITE(tecmo16_scroll_x_w) @@ -147,23 +147,23 @@ static ADDRESS_MAP_START( ginkun_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xfbff) AM_READ(MRA8_RAM) /* Sound RAM */ + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xfbff) AM_READ(SMH_RAM) /* Sound RAM */ AM_RANGE(0xfc00, 0xfc00) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xfc05, 0xfc05) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xfc08, 0xfc08) AM_READ(soundlatch_r) - AM_RANGE(0xfc0c, 0xfc0c) AM_READ(MRA8_NOP) - AM_RANGE(0xfffe, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xfc0c, 0xfc0c) AM_READ(SMH_NOP) + AM_RANGE(0xfffe, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xfbff) AM_WRITE(MWA8_RAM) /* Sound RAM */ + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xfbff) AM_WRITE(SMH_RAM) /* Sound RAM */ AM_RANGE(0xfc00, 0xfc00) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0xfc04, 0xfc04) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xfc05, 0xfc05) AM_WRITE(YM2151_data_port_0_w) - AM_RANGE(0xfc0c, 0xfc0c) AM_WRITE(MWA8_NOP) - AM_RANGE(0xfffe, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xfc0c, 0xfc0c) AM_WRITE(SMH_NOP) + AM_RANGE(0xfffe, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index c079822622e..b22963e3664 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -248,21 +248,21 @@ static READ16_HANDLER( eeprom_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x20ffff) AM_READ(MRA16_RAM) - AM_RANGE(0x210000, 0x210001) AM_READ(MRA16_RAM) - AM_RANGE(0x300000, 0x3013ff) AM_READ(MRA16_RAM) - AM_RANGE(0x400000, 0x4013ff) AM_READ(MRA16_RAM) - AM_RANGE(0x500000, 0x5013ff) AM_READ(MRA16_RAM) - AM_RANGE(0x700000, 0x703fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM) + AM_RANGE(0x210000, 0x210001) AM_READ(SMH_RAM) + AM_RANGE(0x300000, 0x3013ff) AM_READ(SMH_RAM) + AM_RANGE(0x400000, 0x4013ff) AM_READ(SMH_RAM) + AM_RANGE(0x500000, 0x5013ff) AM_READ(SMH_RAM) + AM_RANGE(0x700000, 0x703fff) AM_READ(SMH_RAM) AM_RANGE(0x880000, 0x880001) AM_READ(input_port_0_word_r) AM_RANGE(0x880002, 0x880007) AM_READ(input_port_1_word_r) /* test */ - AM_RANGE(0x900000, 0x907fff) AM_READ(MRA16_RAM) - AM_RANGE(0x980000, 0x980fff) AM_READ(MRA16_RAM) + AM_RANGE(0x900000, 0x907fff) AM_READ(SMH_RAM) + AM_RANGE(0x980000, 0x980fff) AM_READ(SMH_RAM) AM_RANGE(0xb80000, 0xb80001) AM_READ(reg_b80000_r) - AM_RANGE(0xd00000, 0xd80003) AM_READ(MRA16_RAM) + AM_RANGE(0xd00000, 0xd80003) AM_READ(SMH_RAM) AM_RANGE(0xd80000, 0xd80001) AM_READ(eeprom_r) - AM_RANGE(0xf00000, 0xf00001) AM_READ(MRA16_RAM) + AM_RANGE(0xf00000, 0xf00001) AM_READ(SMH_RAM) AM_RANGE(0xf80000, 0xf80001) AM_READ(reg_f80000_r) ADDRESS_MAP_END @@ -278,24 +278,24 @@ static WRITE16_HANDLER( eeprom_w ) } static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x20ffff) AM_WRITE(MWA16_RAM) AM_BASE(&protram) - AM_RANGE(0x300000, 0x3013ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x400000, 0x4013ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x500000, 0x5013ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x700000, 0x703fff) AM_WRITE(MWA16_RAM) AM_BASE(&videoram16) - AM_RANGE(0x800000, 0x80ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x900000, 0x907fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x20ffff) AM_WRITE(SMH_RAM) AM_BASE(&protram) + AM_RANGE(0x300000, 0x3013ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x400000, 0x4013ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x500000, 0x5013ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x700000, 0x703fff) AM_WRITE(SMH_RAM) AM_BASE(&videoram16) + AM_RANGE(0x800000, 0x80ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x900000, 0x907fff) AM_WRITE(SMH_RAM) AM_RANGE(0x980000, 0x980fff) AM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x880000, 0x88002f) AM_WRITE(MWA16_RAM ) + AM_RANGE(0x880000, 0x88002f) AM_WRITE(SMH_RAM ) AM_RANGE(0xa00000, 0xa00001) AM_WRITE(eeprom_w ) - AM_RANGE(0xa80000, 0xa80005) AM_WRITE(MWA16_RAM ) - AM_RANGE(0xb00000, 0xb00005) AM_WRITE(MWA16_RAM ) - AM_RANGE(0xb80000, 0xb80005) AM_WRITE(MWA16_RAM ) - AM_RANGE(0xc00000, 0xc00005) AM_WRITE(MWA16_RAM ) - AM_RANGE(0xc80000, 0xc80005) AM_WRITE(MWA16_RAM ) - AM_RANGE(0xe00000, 0xe00001) AM_WRITE(MWA16_RAM ) + AM_RANGE(0xa80000, 0xa80005) AM_WRITE(SMH_RAM ) + AM_RANGE(0xb00000, 0xb00005) AM_WRITE(SMH_RAM ) + AM_RANGE(0xb80000, 0xb80005) AM_WRITE(SMH_RAM ) + AM_RANGE(0xc00000, 0xc00005) AM_WRITE(SMH_RAM ) + AM_RANGE(0xc80000, 0xc80005) AM_WRITE(SMH_RAM ) + AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_RAM ) AM_RANGE(0xe80000, 0xe80001) AM_WRITE(reg_e80000_w) ADDRESS_MAP_END @@ -358,15 +358,15 @@ static WRITE8_HANDLER( deroon_bankswitch_w ) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xe000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xe000, 0xf7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xf7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END @@ -391,7 +391,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x30, 0x30) AM_WRITE(deroon_bankswitch_w) //AM_RANGE(0x50, 0x50) AM_WRITE(to_main_cpu_latch_w) - AM_RANGE(0x50, 0x50) AM_WRITE(MWA8_NOP) + AM_RANGE(0x50, 0x50) AM_WRITE(SMH_NOP) AM_RANGE(0x60, 0x60) AM_WRITE(YMZ280B_register_0_w) AM_RANGE(0x61, 0x61) AM_WRITE(YMZ280B_data_0_w) diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c index 696d66917e9..d2c9666b763 100644 --- a/src/mame/drivers/tehkanwc.c +++ b/src/mame/drivers/tehkanwc.c @@ -256,7 +256,7 @@ static ADDRESS_MAP_START( main_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf813, 0xf813) AM_READ(input_port_8_r) /* joy1 - button */ AM_RANGE(0xf820, 0xf820) AM_READWRITE(soundlatch2_r, sound_command_w) /* answer from the sound CPU */ AM_RANGE(0xf840, 0xf840) AM_READWRITE(input_port_0_r, sub_cpu_halt_w) /* DSW1 */ - AM_RANGE(0xf850, 0xf850) AM_READWRITE(input_port_1_r, MWA8_NOP) /* DSW2, ?? writes 0x00 or 0xff */ + AM_RANGE(0xf850, 0xf850) AM_READWRITE(input_port_1_r, SMH_NOP) /* DSW2, ?? writes 0x00 or 0xff */ AM_RANGE(0xf860, 0xf860) AM_READWRITE(watchdog_reset_r, tehkanwc_flipscreen_x_w) AM_RANGE(0xf870, 0xf870) AM_READWRITE(input_port_2_r, tehkanwc_flipscreen_y_w) /* DSW3 */ ADDRESS_MAP_END @@ -271,8 +271,8 @@ static ADDRESS_MAP_START( sub_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xde00, 0xdfff) AM_RAM AM_SHARE(5) /* unused part of the palette RAM, I think? Gridiron uses it */ AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE(6) AM_WRITE(tehkanwc_videoram2_w) AM_RANGE(0xe800, 0xebff) AM_RAM AM_SHARE(7) /* sprites */ - AM_RANGE(0xec00, 0xec01) AM_READ(MRA8_RAM) AM_WRITE(tehkanwc_scroll_x_w) - AM_RANGE(0xec02, 0xec02) AM_READ(MRA8_RAM) AM_WRITE(tehkanwc_scroll_y_w) + AM_RANGE(0xec00, 0xec01) AM_READ(SMH_RAM) AM_WRITE(tehkanwc_scroll_x_w) + AM_RANGE(0xec02, 0xec02) AM_READ(SMH_RAM) AM_WRITE(tehkanwc_scroll_y_w) AM_RANGE(0xf860, 0xf860) AM_READ(watchdog_reset_r) ADDRESS_MAP_END @@ -280,8 +280,8 @@ static ADDRESS_MAP_START( sound_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x8001, 0x8001) AM_WRITE(msm_reset_w)/* MSM51xx reset */ - AM_RANGE(0x8002, 0x8002) AM_WRITE(MWA8_NOP) /* ?? written in the IRQ handler */ - AM_RANGE(0x8003, 0x8003) AM_WRITE(MWA8_NOP) /* ?? written in the NMI handler */ + AM_RANGE(0x8002, 0x8002) AM_WRITE(SMH_NOP) /* ?? written in the IRQ handler */ + AM_RANGE(0x8003, 0x8003) AM_WRITE(SMH_NOP) /* ?? written in the NMI handler */ AM_RANGE(0xc000, 0xc000) AM_READWRITE(soundlatch_r, sound_answer_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c index 5865d2a9a3a..8515ef9cf44 100644 --- a/src/mame/drivers/tempest.c +++ b/src/mame/drivers/tempest.c @@ -409,12 +409,12 @@ static WRITE8_HANDLER( tempest_coin_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x0800, 0x080f) AM_WRITE(MWA8_RAM) AM_BASE(&tempest_colorram) + AM_RANGE(0x0800, 0x080f) AM_WRITE(SMH_RAM) AM_BASE(&tempest_colorram) AM_RANGE(0x0c00, 0x0c00) AM_READ(tempest_IN0_r) /* IN0 */ AM_RANGE(0x0d00, 0x0d00) AM_READ(input_port_3_r) /* DSW1 */ AM_RANGE(0x0e00, 0x0e00) AM_READ(input_port_4_r) /* DSW2 */ AM_RANGE(0x2000, 0x2fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION(REGION_CPU1, 0x2000) - AM_RANGE(0x3000, 0x3fff) AM_READ(MRA8_ROM) + AM_RANGE(0x3000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x4000) AM_WRITE(tempest_coin_w) AM_RANGE(0x4800, 0x4800) AM_WRITE(avgdvg_go_w) AM_RANGE(0x5000, 0x5000) AM_WRITE(wdclr_w) diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c index 1a19b1719cb..936f41dfacf 100644 --- a/src/mame/drivers/terracre.c +++ b/src/mame/drivers/terracre.c @@ -248,10 +248,10 @@ ROM_START( boobhack ) ROM_END static ADDRESS_MAP_START( terracre_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x020000, 0x0201ff) AM_READ(MRA16_RAM) - AM_RANGE(0x020200, 0x021fff) AM_READ(MRA16_RAM) - AM_RANGE(0x023000, 0x023fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) + AM_RANGE(0x020000, 0x0201ff) AM_READ(SMH_RAM) + AM_RANGE(0x020200, 0x021fff) AM_READ(SMH_RAM) + AM_RANGE(0x023000, 0x023fff) AM_READ(SMH_RAM) AM_RANGE(0x024000, 0x024001) AM_READ(input_port_0_word_r) AM_RANGE(0x024002, 0x024003) AM_READ(input_port_1_word_r) AM_RANGE(0x024004, 0x024005) AM_READ(input_port_2_word_r) @@ -259,11 +259,11 @@ static ADDRESS_MAP_START( terracre_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( terracre_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x020000, 0x0201ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) - AM_RANGE(0x020200, 0x021fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x020000, 0x0201ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x020200, 0x021fff) AM_WRITE(SMH_RAM) AM_RANGE(0x022000, 0x022fff) AM_WRITE(amazon_background_w) AM_BASE(&amazon_videoram) - AM_RANGE(0x023000, 0x023fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x023000, 0x023fff) AM_WRITE(SMH_RAM) AM_RANGE(0x026000, 0x026001) AM_WRITE(amazon_flipscreen_w) /* flip screen & coin counters */ AM_RANGE(0x026002, 0x026003) AM_WRITE(amazon_scrollx_w) AM_RANGE(0x026004, 0x026005) AM_WRITE(amazon_scrolly_w) @@ -272,8 +272,8 @@ static ADDRESS_MAP_START( terracre_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( amazon_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x040000, 0x040fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) + AM_RANGE(0x040000, 0x040fff) AM_READ(SMH_RAM) AM_RANGE(0x044000, 0x044001) AM_READ(input_port_0_word_r) AM_RANGE(0x044002, 0x044003) AM_READ(input_port_1_word_r) AM_RANGE(0x044004, 0x044005) AM_READ(input_port_2_word_r) @@ -282,9 +282,9 @@ static ADDRESS_MAP_START( amazon_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( amazon_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x040000, 0x0401ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) - AM_RANGE(0x040200, 0x040fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x040000, 0x0401ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) + AM_RANGE(0x040200, 0x040fff) AM_WRITE(SMH_RAM) AM_RANGE(0x042000, 0x042fff) AM_WRITE(amazon_background_w) AM_BASE(&amazon_videoram) AM_RANGE(0x046000, 0x046001) AM_WRITE(amazon_flipscreen_w) /* flip screen & coin counters */ AM_RANGE(0x046002, 0x046003) AM_WRITE(amazon_scrollx_w) @@ -295,13 +295,13 @@ static ADDRESS_MAP_START( amazon_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index ae437e0f5fa..c6b8d573b5d 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -331,22 +331,22 @@ static WRITE16_HANDLER( tetrisp2_coincounter_w ) ***************************************************************************/ static ADDRESS_MAP_START( tetrisp2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM ) // Object RAM - AM_RANGE(0x104000, 0x107fff) AM_READ(MRA16_RAM ) // Spare Object RAM - AM_RANGE(0x108000, 0x10ffff) AM_READ(MRA16_RAM ) // Work RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM ) // Object RAM + AM_RANGE(0x104000, 0x107fff) AM_READ(SMH_RAM ) // Spare Object RAM + AM_RANGE(0x108000, 0x10ffff) AM_READ(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_READ(tetrisp2_priority_r ) // Priority - AM_RANGE(0x300000, 0x31ffff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x400000, 0x403fff) AM_READ(MRA16_RAM ) // Foreground - AM_RANGE(0x404000, 0x407fff) AM_READ(MRA16_RAM ) // Background - AM_RANGE(0x408000, 0x409fff) AM_READ(MRA16_RAM ) // ??? - AM_RANGE(0x500000, 0x50ffff) AM_READ(MRA16_RAM ) // Line - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM ) // Rotation - AM_RANGE(0x650000, 0x651fff) AM_READ(MRA16_RAM ) // Rotation (mirror) + AM_RANGE(0x300000, 0x31ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x400000, 0x403fff) AM_READ(SMH_RAM ) // Foreground + AM_RANGE(0x404000, 0x407fff) AM_READ(SMH_RAM ) // Background + AM_RANGE(0x408000, 0x409fff) AM_READ(SMH_RAM ) // ??? + AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM ) // Line + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM ) // Rotation + AM_RANGE(0x650000, 0x651fff) AM_READ(SMH_RAM ) // Rotation (mirror) AM_RANGE(0x800002, 0x800003) AM_READ(tetrisp2_sound_r ) // Sound AM_RANGE(0x900000, 0x903fff) AM_READ(tetrisp2_nvram_r ) // NVRAM AM_RANGE(0x904000, 0x907fff) AM_READ(tetrisp2_nvram_r ) // NVRAM (mirror) - AM_RANGE(0xbe0000, 0xbe0001) AM_READ(MRA16_NOP ) // INT-level1 dummy read + AM_RANGE(0xbe0000, 0xbe0001) AM_READ(SMH_NOP ) // INT-level1 dummy read AM_RANGE(0xbe0002, 0xbe0003) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xbe0004, 0xbe0005) AM_READ(tetrisp2_ip_1_word_r ) // Inputs & protection AM_RANGE(0xbe0008, 0xbe0009) AM_READ(input_port_2_word_r ) // Inputs @@ -354,49 +354,49 @@ static ADDRESS_MAP_START( tetrisp2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( tetrisp2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Object RAM - AM_RANGE(0x104000, 0x107fff) AM_WRITE(MWA16_RAM ) // Spare Object RAM - AM_RANGE(0x108000, 0x10ffff) AM_WRITE(MWA16_RAM ) // Work RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Object RAM + AM_RANGE(0x104000, 0x107fff) AM_WRITE(SMH_RAM ) // Spare Object RAM + AM_RANGE(0x108000, 0x10ffff) AM_WRITE(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_WRITE(tetrisp2_priority_w) AM_BASE(&tetrisp2_priority ) // Priority AM_RANGE(0x300000, 0x31ffff) AM_WRITE(tetrisp2_palette_w) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0x400000, 0x403fff) AM_WRITE(tetrisp2_vram_fg_w) AM_BASE(&tetrisp2_vram_fg ) // Foreground AM_RANGE(0x404000, 0x407fff) AM_WRITE(tetrisp2_vram_bg_w) AM_BASE(&tetrisp2_vram_bg ) // Background - AM_RANGE(0x408000, 0x409fff) AM_WRITE(MWA16_RAM ) // ??? - AM_RANGE(0x500000, 0x50ffff) AM_WRITE(MWA16_RAM ) // Line + AM_RANGE(0x408000, 0x409fff) AM_WRITE(SMH_RAM ) // ??? + AM_RANGE(0x500000, 0x50ffff) AM_WRITE(SMH_RAM ) // Line AM_RANGE(0x600000, 0x60ffff) AM_WRITE(tetrisp2_vram_rot_w) AM_BASE(&tetrisp2_vram_rot ) // Rotation AM_RANGE(0x650000, 0x651fff) AM_WRITE(tetrisp2_vram_rot_w ) // Rotation (mirror) AM_RANGE(0x800000, 0x800003) AM_WRITE(tetrisp2_sound_w ) // Sound AM_RANGE(0x900000, 0x903fff) AM_WRITE(tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size ) // NVRAM AM_RANGE(0x904000, 0x907fff) AM_WRITE(tetrisp2_nvram_w ) // NVRAM (mirror) AM_RANGE(0xb00000, 0xb00001) AM_WRITE(tetrisp2_coincounter_w ) // Coin Counter - AM_RANGE(0xb20000, 0xb20001) AM_WRITE(MWA16_NOP ) // ??? - AM_RANGE(0xb40000, 0xb4000b) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_scroll_fg ) // Foreground Scrolling - AM_RANGE(0xb40010, 0xb4001b) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_scroll_bg ) // Background Scrolling - AM_RANGE(0xb4003e, 0xb4003f) AM_WRITE(MWA16_NOP ) // scr_size - AM_RANGE(0xb60000, 0xb6002f) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_rotregs ) // Rotation Registers + AM_RANGE(0xb20000, 0xb20001) AM_WRITE(SMH_NOP ) // ??? + AM_RANGE(0xb40000, 0xb4000b) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_scroll_fg ) // Foreground Scrolling + AM_RANGE(0xb40010, 0xb4001b) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_scroll_bg ) // Background Scrolling + AM_RANGE(0xb4003e, 0xb4003f) AM_WRITE(SMH_NOP ) // scr_size + AM_RANGE(0xb60000, 0xb6002f) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_rotregs ) // Rotation Registers AM_RANGE(0xba0000, 0xba001f) AM_WRITE(tetrisp2_systemregs_w ) // system param - AM_RANGE(0xba001a, 0xba001b) AM_WRITE(MWA16_NOP ) // Lev 4 irq ack - AM_RANGE(0xba001e, 0xba001f) AM_WRITE(MWA16_NOP ) // Lev 2 irq ack + AM_RANGE(0xba001a, 0xba001b) AM_WRITE(SMH_NOP ) // Lev 4 irq ack + AM_RANGE(0xba001e, 0xba001f) AM_WRITE(SMH_NOP ) // Lev 2 irq ack ADDRESS_MAP_END static ADDRESS_MAP_START( rockn1_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM ) // Object RAM - AM_RANGE(0x104000, 0x107fff) AM_READ(MRA16_RAM ) // Spare Object RAM - AM_RANGE(0x108000, 0x10ffff) AM_READ(MRA16_RAM ) // Work RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM ) // Object RAM + AM_RANGE(0x104000, 0x107fff) AM_READ(SMH_RAM ) // Spare Object RAM + AM_RANGE(0x108000, 0x10ffff) AM_READ(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_READ(tetrisp2_priority_r ) // Priority - AM_RANGE(0x300000, 0x31ffff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x400000, 0x403fff) AM_READ(MRA16_RAM ) // Foreground - AM_RANGE(0x404000, 0x407fff) AM_READ(MRA16_RAM ) // Background - AM_RANGE(0x408000, 0x409fff) AM_READ(MRA16_RAM ) // ??? - AM_RANGE(0x500000, 0x50ffff) AM_READ(MRA16_RAM ) // Line - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM ) // Rotation + AM_RANGE(0x300000, 0x31ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x400000, 0x403fff) AM_READ(SMH_RAM ) // Foreground + AM_RANGE(0x404000, 0x407fff) AM_READ(SMH_RAM ) // Background + AM_RANGE(0x408000, 0x409fff) AM_READ(SMH_RAM ) // ??? + AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM ) // Line + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM ) // Rotation AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READ(rockn_soundvolume_r ) // Sound Volume AM_RANGE(0xa40002, 0xa40003) AM_READ(tetrisp2_sound_r ) // Sound AM_RANGE(0xa44000, 0xa44001) AM_READ(rockn_adpcmbank_r ) // Sound Bank - AM_RANGE(0xbe0000, 0xbe0001) AM_READ(MRA16_NOP ) // INT-level1 dummy read + AM_RANGE(0xbe0000, 0xbe0001) AM_READ(SMH_NOP ) // INT-level1 dummy read AM_RANGE(0xbe0002, 0xbe0003) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xbe0004, 0xbe0005) AM_READ(input_port_1_word_r ) // Inputs AM_RANGE(0xbe0008, 0xbe0009) AM_READ(input_port_2_word_r ) // Inputs @@ -404,50 +404,50 @@ static ADDRESS_MAP_START( rockn1_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( rockn1_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Object RAM - AM_RANGE(0x104000, 0x107fff) AM_WRITE(MWA16_RAM ) // Spare Object RAM - AM_RANGE(0x108000, 0x10ffff) AM_WRITE(MWA16_RAM ) // Work RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Object RAM + AM_RANGE(0x104000, 0x107fff) AM_WRITE(SMH_RAM ) // Spare Object RAM + AM_RANGE(0x108000, 0x10ffff) AM_WRITE(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_WRITE(rockn_priority_w) AM_BASE(&tetrisp2_priority ) // Priority AM_RANGE(0x300000, 0x31ffff) AM_WRITE(tetrisp2_palette_w) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0x400000, 0x403fff) AM_WRITE(tetrisp2_vram_fg_w) AM_BASE(&tetrisp2_vram_fg ) // Foreground AM_RANGE(0x404000, 0x407fff) AM_WRITE(tetrisp2_vram_bg_w) AM_BASE(&tetrisp2_vram_bg ) // Background - AM_RANGE(0x408000, 0x409fff) AM_WRITE(MWA16_RAM ) // ??? - AM_RANGE(0x500000, 0x50ffff) AM_WRITE(MWA16_RAM ) // Line + AM_RANGE(0x408000, 0x409fff) AM_WRITE(SMH_RAM ) // ??? + AM_RANGE(0x500000, 0x50ffff) AM_WRITE(SMH_RAM ) // Line AM_RANGE(0x600000, 0x60ffff) AM_WRITE(tetrisp2_vram_rot_w) AM_BASE(&tetrisp2_vram_rot ) // Rotation AM_RANGE(0x900000, 0x903fff) AM_WRITE(tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_WRITE(rockn_soundvolume_w ) // Sound Volume AM_RANGE(0xa40000, 0xa40003) AM_WRITE(tetrisp2_sound_w ) // Sound AM_RANGE(0xa44000, 0xa44001) AM_WRITE(rockn_adpcmbank_w ) // Sound Bank - AM_RANGE(0xa48000, 0xa48001) AM_WRITE(MWA16_NOP ) // YMZ280 Reset + AM_RANGE(0xa48000, 0xa48001) AM_WRITE(SMH_NOP ) // YMZ280 Reset AM_RANGE(0xb00000, 0xb00001) AM_WRITE(tetrisp2_coincounter_w ) // Coin Counter - AM_RANGE(0xb20000, 0xb20001) AM_WRITE(MWA16_NOP ) // ??? - AM_RANGE(0xb40000, 0xb4000b) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_scroll_fg ) // Foreground Scrolling - AM_RANGE(0xb40010, 0xb4001b) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_scroll_bg ) // Background Scrolling - AM_RANGE(0xb4003e, 0xb4003f) AM_WRITE(MWA16_NOP ) // scr_size - AM_RANGE(0xb60000, 0xb6002f) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_rotregs ) // Rotation Registers + AM_RANGE(0xb20000, 0xb20001) AM_WRITE(SMH_NOP ) // ??? + AM_RANGE(0xb40000, 0xb4000b) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_scroll_fg ) // Foreground Scrolling + AM_RANGE(0xb40010, 0xb4001b) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_scroll_bg ) // Background Scrolling + AM_RANGE(0xb4003e, 0xb4003f) AM_WRITE(SMH_NOP ) // scr_size + AM_RANGE(0xb60000, 0xb6002f) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_rotregs ) // Rotation Registers AM_RANGE(0xba0000, 0xba001f) AM_WRITE(rockn_systemregs_w ) // system param - AM_RANGE(0xba001a, 0xba001b) AM_WRITE(MWA16_NOP ) // Lev 4 irq ack - AM_RANGE(0xba001e, 0xba001f) AM_WRITE(MWA16_NOP ) // Lev 2 irq ack + AM_RANGE(0xba001a, 0xba001b) AM_WRITE(SMH_NOP ) // Lev 4 irq ack + AM_RANGE(0xba001e, 0xba001f) AM_WRITE(SMH_NOP ) // Lev 2 irq ack ADDRESS_MAP_END static ADDRESS_MAP_START( rockn2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM ) // Object RAM - AM_RANGE(0x104000, 0x107fff) AM_READ(MRA16_RAM ) // Spare Object RAM - AM_RANGE(0x108000, 0x10ffff) AM_READ(MRA16_RAM ) // Work RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM ) // Object RAM + AM_RANGE(0x104000, 0x107fff) AM_READ(SMH_RAM ) // Spare Object RAM + AM_RANGE(0x108000, 0x10ffff) AM_READ(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_READ(tetrisp2_priority_r ) // Priority - AM_RANGE(0x300000, 0x31ffff) AM_READ(MRA16_RAM ) // Palette - AM_RANGE(0x500000, 0x50ffff) AM_READ(MRA16_RAM ) // Line - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM ) // Rotation - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // Foreground - AM_RANGE(0x804000, 0x807fff) AM_READ(MRA16_RAM ) // Background - AM_RANGE(0x808000, 0x809fff) AM_READ(MRA16_RAM ) // ??? + AM_RANGE(0x300000, 0x31ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM ) // Line + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM ) // Rotation + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // Foreground + AM_RANGE(0x804000, 0x807fff) AM_READ(SMH_RAM ) // Background + AM_RANGE(0x808000, 0x809fff) AM_READ(SMH_RAM ) // ??? AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READ(rockn_soundvolume_r ) // Sound Volume AM_RANGE(0xa40002, 0xa40003) AM_READ(tetrisp2_sound_r ) // Sound AM_RANGE(0xa44000, 0xa44001) AM_READ(rockn_adpcmbank_r ) // Sound Bank - AM_RANGE(0xbe0000, 0xbe0001) AM_READ(MRA16_NOP ) // INT-level1 dummy read + AM_RANGE(0xbe0000, 0xbe0001) AM_READ(SMH_NOP ) // INT-level1 dummy read AM_RANGE(0xbe0002, 0xbe0003) AM_READ(input_port_0_word_r ) // Inputs AM_RANGE(0xbe0004, 0xbe0005) AM_READ(input_port_1_word_r ) // Inputs AM_RANGE(0xbe0008, 0xbe0009) AM_READ(input_port_2_word_r ) // Inputs @@ -455,50 +455,50 @@ static ADDRESS_MAP_START( rockn2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( rockn2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Object RAM - AM_RANGE(0x104000, 0x107fff) AM_WRITE(MWA16_RAM ) // Spare Object RAM - AM_RANGE(0x108000, 0x10ffff) AM_WRITE(MWA16_RAM ) // Work RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Object RAM + AM_RANGE(0x104000, 0x107fff) AM_WRITE(SMH_RAM ) // Spare Object RAM + AM_RANGE(0x108000, 0x10ffff) AM_WRITE(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_WRITE(rockn_priority_w) AM_BASE(&tetrisp2_priority ) // Priority AM_RANGE(0x300000, 0x31ffff) AM_WRITE(tetrisp2_palette_w) AM_BASE(&paletteram16 ) // Palette - AM_RANGE(0x500000, 0x50ffff) AM_WRITE(MWA16_RAM ) // Line + AM_RANGE(0x500000, 0x50ffff) AM_WRITE(SMH_RAM ) // Line AM_RANGE(0x600000, 0x60ffff) AM_WRITE(tetrisp2_vram_rot_w) AM_BASE(&tetrisp2_vram_rot ) // Rotation AM_RANGE(0x800000, 0x803fff) AM_WRITE(tetrisp2_vram_fg_w) AM_BASE(&tetrisp2_vram_fg ) // Foreground AM_RANGE(0x804000, 0x807fff) AM_WRITE(tetrisp2_vram_bg_w) AM_BASE(&tetrisp2_vram_bg ) // Background - AM_RANGE(0x808000, 0x809fff) AM_WRITE(MWA16_RAM ) // ??? + AM_RANGE(0x808000, 0x809fff) AM_WRITE(SMH_RAM ) // ??? AM_RANGE(0x900000, 0x903fff) AM_WRITE(tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_WRITE(rockn_soundvolume_w ) // Sound Volume AM_RANGE(0xa40000, 0xa40003) AM_WRITE(tetrisp2_sound_w ) // Sound AM_RANGE(0xa44000, 0xa44001) AM_WRITE(rockn2_adpcmbank_w ) // Sound Bank - AM_RANGE(0xa48000, 0xa48001) AM_WRITE(MWA16_NOP ) // YMZ280 Reset + AM_RANGE(0xa48000, 0xa48001) AM_WRITE(SMH_NOP ) // YMZ280 Reset AM_RANGE(0xb00000, 0xb00001) AM_WRITE(tetrisp2_coincounter_w ) // Coin Counter - AM_RANGE(0xb20000, 0xb20001) AM_WRITE(MWA16_NOP ) // ??? - AM_RANGE(0xb40000, 0xb4000b) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_scroll_fg ) // Foreground Scrolling - AM_RANGE(0xb40010, 0xb4001b) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_scroll_bg ) // Background Scrolling - AM_RANGE(0xb4003e, 0xb4003f) AM_WRITE(MWA16_NOP ) // scr_size - AM_RANGE(0xb60000, 0xb6002f) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_rotregs ) // Rotation Registers + AM_RANGE(0xb20000, 0xb20001) AM_WRITE(SMH_NOP ) // ??? + AM_RANGE(0xb40000, 0xb4000b) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_scroll_fg ) // Foreground Scrolling + AM_RANGE(0xb40010, 0xb4001b) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_scroll_bg ) // Background Scrolling + AM_RANGE(0xb4003e, 0xb4003f) AM_WRITE(SMH_NOP ) // scr_size + AM_RANGE(0xb60000, 0xb6002f) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_rotregs ) // Rotation Registers AM_RANGE(0xba0000, 0xba001f) AM_WRITE(rockn_systemregs_w ) // system param - AM_RANGE(0xba001a, 0xba001b) AM_WRITE(MWA16_NOP ) // Lev 4 irq ack - AM_RANGE(0xba001e, 0xba001f) AM_WRITE(MWA16_NOP ) // Lev 2 irq ack + AM_RANGE(0xba001a, 0xba001b) AM_WRITE(SMH_NOP ) // Lev 4 irq ack + AM_RANGE(0xba001e, 0xba001f) AM_WRITE(SMH_NOP ) // Lev 2 irq ack ADDRESS_MAP_END static ADDRESS_MAP_START( rocknms_main_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM ) // Object RAM - AM_RANGE(0x104000, 0x107fff) AM_READ(MRA16_RAM ) // Spare Object RAM - AM_RANGE(0x108000, 0x10ffff) AM_READ(MRA16_RAM ) // Work RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM ) // Object RAM + AM_RANGE(0x104000, 0x107fff) AM_READ(SMH_RAM ) // Spare Object RAM + AM_RANGE(0x108000, 0x10ffff) AM_READ(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_READ(tetrisp2_priority_r ) // Priority - AM_RANGE(0x300000, 0x31ffff) AM_READ(MRA16_RAM ) // Palette -// AM_RANGE(0x500000, 0x50ffff) AM_READ(MRA16_RAM ) // Line - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM ) // Rotation - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // Foreground - AM_RANGE(0x804000, 0x807fff) AM_READ(MRA16_RAM ) // Background -// AM_RANGE(0x808000, 0x809fff) AM_READ(MRA16_RAM ) // ??? + AM_RANGE(0x300000, 0x31ffff) AM_READ(SMH_RAM ) // Palette +// AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM ) // Line + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM ) // Rotation + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // Foreground + AM_RANGE(0x804000, 0x807fff) AM_READ(SMH_RAM ) // Background +// AM_RANGE(0x808000, 0x809fff) AM_READ(SMH_RAM ) // ??? AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READ(rockn_soundvolume_r ) // Sound Volume AM_RANGE(0xa40002, 0xa40003) AM_READ(tetrisp2_sound_r ) // Sound AM_RANGE(0xa44000, 0xa44001) AM_READ(rockn_adpcmbank_r ) // Sound Bank - AM_RANGE(0xbe0000, 0xbe0001) AM_READ(MRA16_NOP ) // INT-level1 dummy read + AM_RANGE(0xbe0000, 0xbe0001) AM_READ(SMH_NOP ) // INT-level1 dummy read AM_RANGE(0xbe0002, 0xbe0003) AM_READ(rocknms_port_0_r ) // Inputs AM_RANGE(0xbe0004, 0xbe0005) AM_READ(input_port_1_word_r ) // Inputs AM_RANGE(0xbe0008, 0xbe0009) AM_READ(input_port_2_word_r ) // Inputs @@ -506,79 +506,79 @@ static ADDRESS_MAP_START( rocknms_main_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( rocknms_main_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Object RAM - AM_RANGE(0x104000, 0x107fff) AM_WRITE(MWA16_RAM ) // Spare Object RAM - AM_RANGE(0x108000, 0x10ffff) AM_WRITE(MWA16_RAM ) // Work RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Object RAM + AM_RANGE(0x104000, 0x107fff) AM_WRITE(SMH_RAM ) // Spare Object RAM + AM_RANGE(0x108000, 0x10ffff) AM_WRITE(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_WRITE(rockn_priority_w) AM_BASE(&tetrisp2_priority ) // Priority AM_RANGE(0x300000, 0x31ffff) AM_WRITE(tetrisp2_palette_w) AM_BASE(&paletteram16 ) // Palette -// AM_RANGE(0x500000, 0x50ffff) AM_WRITE(MWA16_RAM ) // Line +// AM_RANGE(0x500000, 0x50ffff) AM_WRITE(SMH_RAM ) // Line AM_RANGE(0x600000, 0x60ffff) AM_WRITE(tetrisp2_vram_rot_w) AM_BASE(&tetrisp2_vram_rot ) // Rotation AM_RANGE(0x800000, 0x803fff) AM_WRITE(tetrisp2_vram_fg_w) AM_BASE(&tetrisp2_vram_fg ) // Foreground AM_RANGE(0x804000, 0x807fff) AM_WRITE(tetrisp2_vram_bg_w) AM_BASE(&tetrisp2_vram_bg ) // Background -// AM_RANGE(0x808000, 0x809fff) AM_WRITE(MWA16_RAM ) // ??? +// AM_RANGE(0x808000, 0x809fff) AM_WRITE(SMH_RAM ) // ??? AM_RANGE(0x900000, 0x903fff) AM_WRITE(tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_WRITE(rockn_soundvolume_w ) // Sound Volume AM_RANGE(0xa40000, 0xa40003) AM_WRITE(tetrisp2_sound_w ) // Sound AM_RANGE(0xa44000, 0xa44001) AM_WRITE(rockn_adpcmbank_w ) // Sound Bank - AM_RANGE(0xa48000, 0xa48001) AM_WRITE(MWA16_NOP ) // YMZ280 Reset + AM_RANGE(0xa48000, 0xa48001) AM_WRITE(SMH_NOP ) // YMZ280 Reset AM_RANGE(0xa00000, 0xa00001) AM_WRITE(rocknms_main2sub_w ) // MAIN -> SUB Communication AM_RANGE(0xb00000, 0xb00001) AM_WRITE(tetrisp2_coincounter_w ) // Coin Counter - AM_RANGE(0xb20000, 0xb20001) AM_WRITE(MWA16_NOP ) // ??? - AM_RANGE(0xb40000, 0xb4000b) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_scroll_fg ) // Foreground Scrolling - AM_RANGE(0xb40010, 0xb4001b) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_scroll_bg ) // Background Scrolling - AM_RANGE(0xb4003e, 0xb4003f) AM_WRITE(MWA16_NOP ) // scr_size - AM_RANGE(0xb60000, 0xb6002f) AM_WRITE(MWA16_RAM) AM_BASE(&tetrisp2_rotregs ) // Rotation Registers + AM_RANGE(0xb20000, 0xb20001) AM_WRITE(SMH_NOP ) // ??? + AM_RANGE(0xb40000, 0xb4000b) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_scroll_fg ) // Foreground Scrolling + AM_RANGE(0xb40010, 0xb4001b) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_scroll_bg ) // Background Scrolling + AM_RANGE(0xb4003e, 0xb4003f) AM_WRITE(SMH_NOP ) // scr_size + AM_RANGE(0xb60000, 0xb6002f) AM_WRITE(SMH_RAM) AM_BASE(&tetrisp2_rotregs ) // Rotation Registers AM_RANGE(0xba0000, 0xba001f) AM_WRITE(rockn_systemregs_w ) // system param - AM_RANGE(0xba001a, 0xba001b) AM_WRITE(MWA16_NOP ) // Lev 4 irq ack - AM_RANGE(0xba001e, 0xba001f) AM_WRITE(MWA16_NOP ) // Lev 2 irq ack + AM_RANGE(0xba001a, 0xba001b) AM_WRITE(SMH_NOP ) // Lev 4 irq ack + AM_RANGE(0xba001e, 0xba001f) AM_WRITE(SMH_NOP ) // Lev 2 irq ack ADDRESS_MAP_END static ADDRESS_MAP_START( rocknms_sub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM ) // Object RAM - AM_RANGE(0x104000, 0x107fff) AM_READ(MRA16_RAM ) // Spare Object RAM - AM_RANGE(0x108000, 0x10ffff) AM_READ(MRA16_RAM ) // Work RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM ) // Object RAM + AM_RANGE(0x104000, 0x107fff) AM_READ(SMH_RAM ) // Spare Object RAM + AM_RANGE(0x108000, 0x10ffff) AM_READ(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_READ(rocknms_sub_priority_r ) // Priority - AM_RANGE(0x300000, 0x31ffff) AM_READ(MRA16_RAM ) // Palette -// AM_RANGE(0x500000, 0x50ffff) AM_READ(MRA16_RAM ) // Line - AM_RANGE(0x600000, 0x60ffff) AM_READ(MRA16_RAM ) // Rotation - AM_RANGE(0x800000, 0x803fff) AM_READ(MRA16_RAM ) // Foreground - AM_RANGE(0x804000, 0x807fff) AM_READ(MRA16_RAM ) // Background -// AM_RANGE(0x808000, 0x809fff) AM_READ(MRA16_RAM ) // ??? - AM_RANGE(0x900000, 0x907fff) AM_READ(MRA16_RAM ) // NVRAM -// AM_RANGE(0xbe0000, 0xbe0001) AM_READ(MRA16_NOP ) // INT-level1 dummy read + AM_RANGE(0x300000, 0x31ffff) AM_READ(SMH_RAM ) // Palette +// AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM ) // Line + AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM ) // Rotation + AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // Foreground + AM_RANGE(0x804000, 0x807fff) AM_READ(SMH_RAM ) // Background +// AM_RANGE(0x808000, 0x809fff) AM_READ(SMH_RAM ) // ??? + AM_RANGE(0x900000, 0x907fff) AM_READ(SMH_RAM ) // NVRAM +// AM_RANGE(0xbe0000, 0xbe0001) AM_READ(SMH_NOP ) // INT-level1 dummy read AM_RANGE(0xbe0002, 0xbe0003) AM_READ(rocknms_main2sub_r ) // MAIN -> SUB Communication AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r ) // Watchdog ADDRESS_MAP_END static ADDRESS_MAP_START( rocknms_sub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size ) // Object RAM - AM_RANGE(0x104000, 0x107fff) AM_WRITE(MWA16_RAM ) // Spare Object RAM - AM_RANGE(0x108000, 0x10ffff) AM_WRITE(MWA16_RAM ) // Work RAM + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size ) // Object RAM + AM_RANGE(0x104000, 0x107fff) AM_WRITE(SMH_RAM ) // Spare Object RAM + AM_RANGE(0x108000, 0x10ffff) AM_WRITE(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_WRITE(rocknms_sub_priority_w) AM_BASE(&rocknms_sub_priority ) // Priority AM_RANGE(0x300000, 0x31ffff) AM_WRITE(rocknms_sub_palette_w) AM_BASE(&paletteram16_2 ) // Palette -// AM_RANGE(0x500000, 0x50ffff) AM_WRITE(MWA16_RAM ) // Line +// AM_RANGE(0x500000, 0x50ffff) AM_WRITE(SMH_RAM ) // Line AM_RANGE(0x600000, 0x60ffff) AM_WRITE(rocknms_sub_vram_rot_w) AM_BASE(&rocknms_sub_vram_rot ) // Rotation AM_RANGE(0x800000, 0x803fff) AM_WRITE(rocknms_sub_vram_fg_w) AM_BASE(&rocknms_sub_vram_fg ) // Foreground AM_RANGE(0x804000, 0x807fff) AM_WRITE(rocknms_sub_vram_bg_w) AM_BASE(&rocknms_sub_vram_bg ) // Background -// AM_RANGE(0x808000, 0x809fff) AM_WRITE(MWA16_RAM ) // ??? - AM_RANGE(0x900000, 0x907fff) AM_WRITE(MWA16_RAM ) // NVRAM +// AM_RANGE(0x808000, 0x809fff) AM_WRITE(SMH_RAM ) // ??? + AM_RANGE(0x900000, 0x907fff) AM_WRITE(SMH_RAM ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_WRITE(rockn_soundvolume_w ) // Sound Volume AM_RANGE(0xa40000, 0xa40003) AM_WRITE(tetrisp2_sound_w ) // Sound AM_RANGE(0xa44000, 0xa44001) AM_WRITE(rockn_adpcmbank_w ) // Sound Bank - AM_RANGE(0xa48000, 0xa48001) AM_WRITE(MWA16_NOP ) // YMZ280 Reset + AM_RANGE(0xa48000, 0xa48001) AM_WRITE(SMH_NOP ) // YMZ280 Reset AM_RANGE(0xb00000, 0xb00001) AM_WRITE(rocknms_sub2main_w ) // MAIN <- SUB Communication - AM_RANGE(0xb20000, 0xb20001) AM_WRITE(MWA16_NOP ) // ??? - AM_RANGE(0xb40000, 0xb4000b) AM_WRITE(MWA16_RAM) AM_BASE(&rocknms_sub_scroll_fg ) // Foreground Scrolling - AM_RANGE(0xb40010, 0xb4001b) AM_WRITE(MWA16_RAM) AM_BASE(&rocknms_sub_scroll_bg ) // Background Scrolling - AM_RANGE(0xb4003e, 0xb4003f) AM_WRITE(MWA16_NOP ) // scr_size - AM_RANGE(0xb60000, 0xb6002f) AM_WRITE(MWA16_RAM) AM_BASE(&rocknms_sub_rotregs ) // Rotation Registers + AM_RANGE(0xb20000, 0xb20001) AM_WRITE(SMH_NOP ) // ??? + AM_RANGE(0xb40000, 0xb4000b) AM_WRITE(SMH_RAM) AM_BASE(&rocknms_sub_scroll_fg ) // Foreground Scrolling + AM_RANGE(0xb40010, 0xb4001b) AM_WRITE(SMH_RAM) AM_BASE(&rocknms_sub_scroll_bg ) // Background Scrolling + AM_RANGE(0xb4003e, 0xb4003f) AM_WRITE(SMH_NOP ) // scr_size + AM_RANGE(0xb60000, 0xb6002f) AM_WRITE(SMH_RAM) AM_BASE(&rocknms_sub_rotregs ) // Rotation Registers AM_RANGE(0xba0000, 0xba001f) AM_WRITE(rocknms_sub_systemregs_w ) // system param - AM_RANGE(0xba001a, 0xba001b) AM_WRITE(MWA16_NOP ) // Lev 4 irq ack - AM_RANGE(0xba001e, 0xba001f) AM_WRITE(MWA16_NOP ) // Lev 2 irq ack + AM_RANGE(0xba001a, 0xba001b) AM_WRITE(SMH_NOP ) // Lev 4 irq ack + AM_RANGE(0xba001e, 0xba001f) AM_WRITE(SMH_NOP ) // Lev 2 irq ack AM_RANGE(0xbe0002, 0xbe0003) AM_WRITE(rocknms_sub2main_w ) // MAIN <- SUB Communication (mirror) ADDRESS_MAP_END diff --git a/src/mame/drivers/tetriunk.c b/src/mame/drivers/tetriunk.c index 445a3c6c2f2..2e17d66f652 100644 --- a/src/mame/drivers/tetriunk.c +++ b/src/mame/drivers/tetriunk.c @@ -75,7 +75,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tetriunk_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00000, 0x0ffff) AM_RAM - AM_RANGE(0xb0000, 0xbffff) AM_READ(MRA8_RAM) AM_WRITE(txtram_w) + AM_RANGE(0xb0000, 0xbffff) AM_READ(SMH_RAM) AM_WRITE(txtram_w) AM_RANGE(0xf0000, 0xfffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index 613da801115..99f43ed9407 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -146,38 +146,38 @@ static WRITE8_HANDLER( thedeep_e100_w ) } static ADDRESS_MAP_START( thedeep_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1 ) // ROM (banked) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM ) // RAM - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM ) // RAM (MCU data copied here) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // ROM (banked) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM ) // RAM (MCU data copied here) AM_RANGE(0xe000, 0xe000) AM_READ(thedeep_protection_r ) // From MCU AM_RANGE(0xe004, 0xe004) AM_READ(thedeep_e004_r ) // ? AM_RANGE(0xe008, 0xe008) AM_READ(input_port_0_r ) // P1 (Inputs) AM_RANGE(0xe009, 0xe009) AM_READ(input_port_1_r ) // P2 AM_RANGE(0xe00a, 0xe00a) AM_READ(input_port_2_r ) // DSW1 AM_RANGE(0xe00b, 0xe00b) AM_READ(input_port_3_r ) // DSW2 - AM_RANGE(0xe400, 0xe7ff) AM_READ(MRA8_RAM ) // Sprites - AM_RANGE(0xe800, 0xefff) AM_READ(MRA8_RAM ) // Text Layer - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM ) // Background Layer - AM_RANGE(0xf800, 0xf83f) AM_READ(MRA8_RAM ) // Column Scroll - AM_RANGE(0xf840, 0xffff) AM_READ(MRA8_RAM ) // + AM_RANGE(0xe400, 0xe7ff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xe800, 0xefff) AM_READ(SMH_RAM ) // Text Layer + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM ) // Background Layer + AM_RANGE(0xf800, 0xf83f) AM_READ(SMH_RAM ) // Column Scroll + AM_RANGE(0xf840, 0xffff) AM_READ(SMH_RAM ) // ADDRESS_MAP_END static ADDRESS_MAP_START( thedeep_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM ) // ROM (banked) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM ) // RAM - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM ) // RAM (MCU data copied here) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM ) // ROM (banked) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM ) // RAM (MCU data copied here) AM_RANGE(0xe000, 0xe000) AM_WRITE(thedeep_protection_w ) // To MCU AM_RANGE(0xe004, 0xe004) AM_WRITE(thedeep_nmi_w ) // AM_RANGE(0xe00c, 0xe00c) AM_WRITE(thedeep_sound_w ) // To Sound CPU AM_RANGE(0xe100, 0xe100) AM_WRITE(thedeep_e100_w ) // ? - AM_RANGE(0xe210, 0xe213) AM_WRITE(MWA8_RAM) AM_BASE(&thedeep_scroll ) // Scroll - AM_RANGE(0xe400, 0xe7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0xe210, 0xe213) AM_WRITE(SMH_RAM) AM_BASE(&thedeep_scroll ) // Scroll + AM_RANGE(0xe400, 0xe7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0xe800, 0xefff) AM_WRITE(thedeep_vram_1_w) AM_BASE(&thedeep_vram_1 ) // Text Layer AM_RANGE(0xf000, 0xf7ff) AM_WRITE(thedeep_vram_0_w) AM_BASE(&thedeep_vram_0 ) // Background Layer - AM_RANGE(0xf800, 0xf83f) AM_WRITE(MWA8_RAM) AM_BASE(&thedeep_scroll2 ) // Column Scroll - AM_RANGE(0xf840, 0xffff) AM_WRITE(MWA8_RAM ) // + AM_RANGE(0xf800, 0xf83f) AM_WRITE(SMH_RAM) AM_BASE(&thedeep_scroll2 ) // Column Scroll + AM_RANGE(0xf840, 0xffff) AM_WRITE(SMH_RAM ) // ADDRESS_MAP_END /*************************************************************************** @@ -187,16 +187,16 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( thedeep_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM ) // RAM + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r ) // From Main CPU - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM ) // ROM + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM ) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( thedeep_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM ) // RAM + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM ) // RAM AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w ) // YM2203 AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w ) // - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM ) // ROM + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM ) // ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c index bb5c481a335..ec2c823ad6f 100644 --- a/src/mame/drivers/thepit.c +++ b/src/mame/drivers/thepit.c @@ -163,18 +163,18 @@ static WRITE8_HANDLER( thepit_sound_enable_w ) static ADDRESS_MAP_START( thepit_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x4fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8bff) AM_MIRROR(0x0400) AM_READWRITE(MRA8_RAM, thepit_colorram_w) AM_BASE(&thepit_colorram) - AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_READWRITE(MRA8_RAM, thepit_videoram_w) AM_BASE(&thepit_videoram) + AM_RANGE(0x8800, 0x8bff) AM_MIRROR(0x0400) AM_READWRITE(SMH_RAM, thepit_colorram_w) AM_BASE(&thepit_colorram) + AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_READWRITE(SMH_RAM, thepit_videoram_w) AM_BASE(&thepit_videoram) AM_RANGE(0x9800, 0x983f) AM_MIRROR(0x0700) AM_RAM AM_BASE(&thepit_attributesram) AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(&thepit_spriteram) AM_SIZE(&thepit_spriteram_size) AM_RANGE(0x9860, 0x98ff) AM_RAM - AM_RANGE(0xa000, 0xa000) AM_READWRITE(thepit_input_port_0_r, MWA8_NOP) // Not hooked up according to the schematics + AM_RANGE(0xa000, 0xa000) AM_READWRITE(thepit_input_port_0_r, SMH_NOP) // Not hooked up according to the schematics AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READWRITE(input_port_2_r, interrupt_enable_w) - AM_RANGE(0xb001, 0xb001) AM_WRITE(MWA8_NOP) // Unused, but initialized - AM_RANGE(0xb002, 0xb002) AM_WRITE(MWA8_NOP) // coin_lockout_w + AM_RANGE(0xb001, 0xb001) AM_WRITE(SMH_NOP) // Unused, but initialized + AM_RANGE(0xb002, 0xb002) AM_WRITE(SMH_NOP) // coin_lockout_w AM_RANGE(0xb003, 0xb003) AM_WRITE(thepit_sound_enable_w) - AM_RANGE(0xb004, 0xb005) AM_WRITE(MWA8_NOP) // Unused, but initialized + AM_RANGE(0xb004, 0xb005) AM_WRITE(SMH_NOP) // Unused, but initialized AM_RANGE(0xb006, 0xb006) AM_WRITE(thepit_flip_screen_x_w) AM_RANGE(0xb007, 0xb007) AM_WRITE(thepit_flip_screen_y_w) AM_RANGE(0xb800, 0xb800) AM_READWRITE(watchdog_reset_r, soundlatch_w) @@ -184,18 +184,18 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( intrepid_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x4fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x9000, 0x93ff) AM_READWRITE(MRA8_RAM, thepit_videoram_w) AM_BASE(&thepit_videoram) - AM_RANGE(0x9400, 0x97ff) AM_READWRITE(MRA8_RAM, thepit_colorram_w) AM_BASE(&thepit_colorram) + AM_RANGE(0x9000, 0x93ff) AM_READWRITE(SMH_RAM, thepit_videoram_w) AM_BASE(&thepit_videoram) + AM_RANGE(0x9400, 0x97ff) AM_READWRITE(SMH_RAM, thepit_colorram_w) AM_BASE(&thepit_colorram) AM_RANGE(0x9800, 0x983f) AM_MIRROR(0x0700) AM_RAM AM_BASE(&thepit_attributesram) AM_RANGE(0x9840, 0x985f) AM_RAM AM_BASE(&thepit_spriteram) AM_SIZE(&thepit_spriteram_size) AM_RANGE(0x9860, 0x98ff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_READ(thepit_input_port_0_r) AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) AM_RANGE(0xb000, 0xb000) AM_READWRITE(input_port_2_r, interrupt_enable_w) - AM_RANGE(0xb001, 0xb001) AM_WRITE(MWA8_NOP) // Unused, but initialized - AM_RANGE(0xb002, 0xb002) AM_WRITE(MWA8_NOP) // coin_lockout_w + AM_RANGE(0xb001, 0xb001) AM_WRITE(SMH_NOP) // Unused, but initialized + AM_RANGE(0xb002, 0xb002) AM_WRITE(SMH_NOP) // coin_lockout_w AM_RANGE(0xb003, 0xb003) AM_WRITE(thepit_sound_enable_w) - AM_RANGE(0xb004, 0xb004) AM_WRITE(MWA8_NOP) // Unused, but initialized + AM_RANGE(0xb004, 0xb004) AM_WRITE(SMH_NOP) // Unused, but initialized AM_RANGE(0xb005, 0xb005) AM_WRITE(intrepid_graphics_bank_w) AM_RANGE(0xb006, 0xb006) AM_WRITE(thepit_flip_screen_x_w) AM_RANGE(0xb007, 0xb007) AM_WRITE(thepit_flip_screen_y_w) diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c index 68ff714ec73..11d6b9a15b3 100644 --- a/src/mame/drivers/thief.c +++ b/src/mame/drivers/thief.c @@ -167,41 +167,41 @@ static READ8_HANDLER( thief_io_r ) } static ADDRESS_MAP_START( sharkatt_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) /* 2114 (working RAM) */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) /* 2114 (working RAM) */ AM_RANGE(0xc000, 0xdfff) AM_READ(thief_videoram_r) /* 4116 */ ADDRESS_MAP_END static ADDRESS_MAP_START( sharkatt_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) /* 2114 */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) /* 2114 */ AM_RANGE(0xc000, 0xdfff) AM_WRITE(thief_videoram_w) /* 4116 */ ADDRESS_MAP_END static ADDRESS_MAP_START( thief_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) /* 2114 (working RAM) */ - AM_RANGE(0xa000, 0xafff) AM_READ(MRA8_ROM) /* NATO Defense diagnostic ROM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) /* 2114 (working RAM) */ + AM_RANGE(0xa000, 0xafff) AM_READ(SMH_ROM) /* NATO Defense diagnostic ROM */ AM_RANGE(0xc000, 0xdfff) AM_READ(thief_videoram_r) /* 4116 */ AM_RANGE(0xe000, 0xe008) AM_READ(thief_coprocessor_r) - AM_RANGE(0xe010, 0xe02f) AM_READ(MRA8_ROM) + AM_RANGE(0xe010, 0xe02f) AM_READ(SMH_ROM) AM_RANGE(0xe080, 0xe0bf) AM_READ(thief_context_ram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( thief_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0000) AM_WRITE(thief_blit_w) - AM_RANGE(0x0001, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) /* 2114 */ + AM_RANGE(0x0001, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) /* 2114 */ AM_RANGE(0xc000, 0xdfff) AM_WRITE(thief_videoram_w) /* 4116 */ AM_RANGE(0xe000, 0xe008) AM_WRITE(thief_coprocessor_w) - AM_RANGE(0xe010, 0xe02f) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe010, 0xe02f) AM_WRITE(SMH_ROM) AM_RANGE(0xe080, 0xe0bf) AM_WRITE(thief_context_ram_w) AM_RANGE(0xe0c0, 0xe0c0) AM_WRITE(thief_context_bank_w) ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) /* watchdog */ + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /* watchdog */ AM_RANGE(0x10, 0x10) AM_WRITE(thief_video_control_w) AM_RANGE(0x30, 0x30) AM_WRITE(thief_input_select_w) // 8255 AM_RANGE(0x31, 0x31) AM_READ(thief_io_r) // 8255 diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c index bc0d9d555b0..adb1fb1aa2b 100644 --- a/src/mame/drivers/thoop2.c +++ b/src/mame/drivers/thoop2.c @@ -55,17 +55,17 @@ GFXDECODE_END static ADDRESS_MAP_START( thoop2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* ROM */ - AM_RANGE(0x100000, 0x101fff) AM_READ(MRA16_RAM) /* Video RAM */ - AM_RANGE(0x200000, 0x2007ff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_READ(MRA16_RAM) /* Sprite RAM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x100000, 0x101fff) AM_READ(SMH_RAM) /* Video RAM */ + AM_RANGE(0x200000, 0x2007ff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x440000, 0x440fff) AM_READ(SMH_RAM) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r)/* DIPSW #2 */ AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r)/* DIPSW #1 */ AM_RANGE(0x700004, 0x700005) AM_READ(input_port_2_word_r)/* INPUT #1 */ AM_RANGE(0x700006, 0x700007) AM_READ(input_port_3_word_r)/* INPUT #2 */ AM_RANGE(0x700008, 0x700009) AM_READ(input_port_4_word_r)/* INPUT #3 */ AM_RANGE(0x70000e, 0x70000f) AM_READ(OKIM6295_status_0_lsb_r)/* OKI6295 status register */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) /* Work RAM (partially shared with DS5002FP) */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END static WRITE16_HANDLER( OKIM6295_bankswitch_w ) @@ -97,16 +97,16 @@ static WRITE16_HANDLER( thoop2_coin_w ) } static ADDRESS_MAP_START( thoop2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x100000, 0x101fff) AM_WRITE(thoop2_vram_w) AM_BASE(&thoop2_videoram) /* Video RAM */ - AM_RANGE(0x108000, 0x108007) AM_WRITE(MWA16_RAM) AM_BASE(&thoop2_vregs) /* Video Registers */ + AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&thoop2_vregs) /* Video Registers */ AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset16_w) /* INT 6 ACK/Watchdog timer */ AM_RANGE(0x200000, 0x2007ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)/* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_WRITE(MWA16_RAM) AM_BASE(&thoop2_spriteram) /* Sprite RAM */ + AM_RANGE(0x440000, 0x440fff) AM_WRITE(SMH_RAM) AM_BASE(&thoop2_spriteram) /* Sprite RAM */ AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */ AM_RANGE(0x70000e, 0x70000f) AM_WRITE(OKIM6295_data_0_lsb_w) /* OKI6295 data register */ AM_RANGE(0x70000a, 0x70005b) AM_WRITE(thoop2_coin_w) /* Coin Counters + Coin Lockout */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Work RAM (partially shared with DS5002FP) */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c index a4a5890be2e..49ab029c84f 100644 --- a/src/mame/drivers/thunderj.c +++ b/src/mame/drivers/thunderj.c @@ -194,7 +194,7 @@ static READ16_HANDLER( thunderj_video_control_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x09ffff) AM_ROM AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) - AM_RANGE(0x160000, 0x16ffff) AM_READWRITE(shared_ram_r, MWA16_BANK1) AM_BASE(&shared_ram) + AM_RANGE(0x160000, 0x16ffff) AM_READWRITE(shared_ram_r, SMH_BANK1) AM_BASE(&shared_ram) AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x260000, 0x26000f) AM_READ(input_port_0_word_r) AM_RANGE(0x260010, 0x260011) AM_READ(input_port_1_word_r) @@ -204,15 +204,15 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x360010, 0x360011) AM_WRITE(latch_w) AM_RANGE(0x360020, 0x360021) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0x360030, 0x360031) AM_WRITE(atarigen_sound_w) - AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(MRA16_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(SMH_RAM, atarigen_666_paletteram_w) AM_BASE(&paletteram16) AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(thunderj_video_control_r, atarivc_w) AM_BASE(&atarivc_data) - AM_RANGE(0x3f0000, 0x3f1fff) AM_READWRITE(MRA16_RAM, atarigen_playfield2_latched_msb_w) AM_BASE(&atarigen_playfield2) - AM_RANGE(0x3f2000, 0x3f3fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_latched_lsb_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0x3f4000, 0x3f5fff) AM_READWRITE(MRA16_RAM, atarigen_playfield_dual_upper_w) AM_BASE(&atarigen_playfield_upper) - AM_RANGE(0x3f6000, 0x3f7fff) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0x3f8000, 0x3f8eff) AM_READWRITE(MRA16_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) + AM_RANGE(0x3f0000, 0x3f1fff) AM_READWRITE(SMH_RAM, atarigen_playfield2_latched_msb_w) AM_BASE(&atarigen_playfield2) + AM_RANGE(0x3f2000, 0x3f3fff) AM_READWRITE(SMH_RAM, atarigen_playfield_latched_lsb_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0x3f4000, 0x3f5fff) AM_READWRITE(SMH_RAM, atarigen_playfield_dual_upper_w) AM_BASE(&atarigen_playfield_upper) + AM_RANGE(0x3f6000, 0x3f7fff) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0x3f8000, 0x3f8eff) AM_READWRITE(SMH_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) AM_RANGE(0x3f8f00, 0x3f8f7f) AM_RAM AM_BASE(&atarivc_eof_data) - AM_RANGE(0x3f8f80, 0x3f8fff) AM_READWRITE(MRA16_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) + AM_RANGE(0x3f8f80, 0x3f8fff) AM_READWRITE(SMH_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x3f9000, 0x3fffff) AM_RAM ADDRESS_MAP_END @@ -227,7 +227,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( extra_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x060000, 0x07ffff) AM_ROM - AM_RANGE(0x160000, 0x16ffff) AM_READWRITE(shared_ram_r, MWA16_BANK1) + AM_RANGE(0x160000, 0x16ffff) AM_READWRITE(shared_ram_r, SMH_BANK1) AM_RANGE(0x260000, 0x26000f) AM_READ(input_port_0_word_r) AM_RANGE(0x260010, 0x260011) AM_READ(input_port_1_word_r) AM_RANGE(0x260012, 0x260013) AM_READ(special_port2_r) diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index a8c515431cb..f0b399d1c5f 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -379,10 +379,10 @@ static ADDRESS_MAP_START( scontra_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1f95, 0x1f95) AM_READ(input_port_4_r) /* Dip 2 */ AM_RANGE(0x0000, 0x3fff) AM_READ(K052109_051960_r) - AM_RANGE(0x4000, 0x57ff) AM_READ(MRA8_RAM) + AM_RANGE(0x4000, 0x57ff) AM_READ(SMH_RAM) AM_RANGE(0x5800, 0x5fff) AM_READ(scontra_bankedram_r) /* palette + work RAM */ - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( thunderx_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -395,10 +395,10 @@ static ADDRESS_MAP_START( thunderx_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1f98, 0x1f98) AM_READ(thunderx_1f98_r) /* registers */ AM_RANGE(0x0000, 0x3fff) AM_READ(K052109_051960_r) - AM_RANGE(0x4000, 0x57ff) AM_READ(MRA8_RAM) + AM_RANGE(0x4000, 0x57ff) AM_READ(SMH_RAM) AM_RANGE(0x5800, 0x5fff) AM_READ(thunderx_bankedram_r) /* palette + work RAM + unknown RAM */ - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( scontra_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -409,9 +409,9 @@ static ADDRESS_MAP_START( scontra_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1f98, 0x1f98) AM_WRITE(thunderx_1f98_w) AM_RANGE(0x0000, 0x3fff) AM_WRITE(K052109_051960_w) /* video RAM + sprite RAM */ - AM_RANGE(0x4000, 0x57ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x4000, 0x57ff) AM_WRITE(SMH_RAM) AM_RANGE(0x5800, 0x5fff) AM_WRITE(scontra_bankedram_w) AM_BASE(&ram) /* palette + work RAM */ - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( thunderx_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -422,22 +422,22 @@ static ADDRESS_MAP_START( thunderx_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1f98, 0x1f98) AM_WRITE(thunderx_1f98_w) AM_RANGE(0x0000, 0x3fff) AM_WRITE(K052109_051960_w) - AM_RANGE(0x4000, 0x57ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x4000, 0x57ff) AM_WRITE(SMH_RAM) AM_RANGE(0x5800, 0x5fff) AM_WRITE(thunderx_bankedram_w) AM_BASE(&ram) /* palette + work RAM + unknown RAM */ - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( scontra_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) /* 007232 registers */ AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) /* YM2151 */ ADDRESS_MAP_END static ADDRESS_MAP_START( scontra_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) /* 007232 registers */ AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) /* YM2151 */ AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) /* YM2151 */ @@ -445,15 +445,15 @@ static ADDRESS_MAP_START( scontra_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( thunderx_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( thunderx_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c index b7263643828..012d4a92f39 100644 --- a/src/mame/drivers/tiamc1.c +++ b/src/mame/drivers/tiamc1.c @@ -173,13 +173,13 @@ static WRITE8_HANDLER( tiamc1_control_w ) static ADDRESS_MAP_START( tiamc1_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xdfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( tiamc1_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb000, 0xb7ff) AM_WRITE(tiamc1_videoram_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c index 84c40c81860..e61758a4ed5 100644 --- a/src/mame/drivers/tigeroad.c +++ b/src/mame/drivers/tigeroad.c @@ -174,45 +174,45 @@ static WRITE8_HANDLER( msm5205_w ) /***************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0xfe0800, 0xfe0cff) AM_READ(MRA16_RAM) - AM_RANGE(0xfe0d00, 0xfe1807) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0xfe0800, 0xfe0cff) AM_READ(SMH_RAM) + AM_RANGE(0xfe0d00, 0xfe1807) AM_READ(SMH_RAM) AM_RANGE(0xfe4000, 0xfe4001) AM_READ(input_port_0_word_r) AM_RANGE(0xfe4002, 0xfe4003) AM_READ(input_port_1_word_r) AM_RANGE(0xfe4004, 0xfe4005) AM_READ(input_port_2_word_r) - AM_RANGE(0xfec000, 0xfec7ff) AM_READ(MRA16_RAM) - AM_RANGE(0xff8200, 0xff867f) AM_READ(MRA16_RAM) - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xfec000, 0xfec7ff) AM_READ(SMH_RAM) + AM_RANGE(0xff8200, 0xff867f) AM_READ(SMH_RAM) + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0xfe0800, 0xfe0cff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0xfe0d00, 0xfe1807) AM_WRITE(MWA16_RAM) /* still part of OBJ RAM */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0xfe0800, 0xfe0cff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xfe0d00, 0xfe1807) AM_WRITE(SMH_RAM) /* still part of OBJ RAM */ AM_RANGE(0xfe4000, 0xfe4001) AM_WRITE(tigeroad_videoctrl_w) /* char bank, coin counters, + ? */ /*AM_RANGE(0xfe4002, 0xfe4003) AM_WRITE(tigeroad_soundcmd_w) added by init_tigeroad() */ AM_RANGE(0xfec000, 0xfec7ff) AM_WRITE(tigeroad_videoram_w) AM_BASE(&videoram16) AM_RANGE(0xfe8000, 0xfe8003) AM_WRITE(tigeroad_scroll_w) - AM_RANGE(0xfe800e, 0xfe800f) AM_WRITE(MWA16_RAM) /* fe800e = watchdog or IRQ acknowledge */ + AM_RANGE(0xfe800e, 0xfe800f) AM_WRITE(SMH_RAM) /* fe800e = watchdog or IRQ acknowledge */ AM_RANGE(0xff8200, 0xff867f) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&ram16) + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&ram16) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_1_r) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x8001, 0x8001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_1_w) AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_1_w) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) @@ -221,12 +221,12 @@ static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sample_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END /* yes, no RAM */ static ADDRESS_MAP_START( sample_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sample_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c index e94469e2bc3..17e946fe1bb 100644 --- a/src/mame/drivers/timelimt.c +++ b/src/mame/drivers/timelimt.c @@ -55,31 +55,31 @@ static WRITE8_HANDLER( sound_reset_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* rom */ - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) /* ram */ - AM_RANGE(0x8800, 0x8bff) AM_READ(MRA8_RAM) /* video ram */ - AM_RANGE(0x9000, 0x97ff) AM_READ(MRA8_RAM) /* background ram */ - AM_RANGE(0x9800, 0x98ff) AM_READ(MRA8_RAM) /* sprite ram */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* rom */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) /* ram */ + AM_RANGE(0x8800, 0x8bff) AM_READ(SMH_RAM) /* video ram */ + AM_RANGE(0x9000, 0x97ff) AM_READ(SMH_RAM) /* background ram */ + AM_RANGE(0x9800, 0x98ff) AM_READ(SMH_RAM) /* sprite ram */ AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) /* input port */ AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) /* input port */ AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) /* DSW */ - AM_RANGE(0xb800, 0xb800) AM_READ(MRA8_NOP) /* NMI ack? */ + AM_RANGE(0xb800, 0xb800) AM_READ(SMH_NOP) /* NMI ack? */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* rom */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) /* ram */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* rom */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) /* ram */ AM_RANGE(0x8800, 0x8bff) AM_WRITE(timelimt_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) /* video ram */ AM_RANGE(0x9000, 0x97ff) AM_WRITE(timelimt_bg_videoram_w) AM_BASE(&timelimt_bg_videoram) AM_SIZE(&timelimt_bg_videoram_size)/* background ram */ - AM_RANGE(0x9800, 0x98ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* sprite ram */ + AM_RANGE(0x9800, 0x98ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* sprite ram */ AM_RANGE(0xb000, 0xb000) AM_WRITE(nmi_enable_w) /* nmi enable */ AM_RANGE(0xb003, 0xb003) AM_WRITE(sound_reset_w) /* sound reset ? */ AM_RANGE(0xb800, 0xb800) AM_WRITE(soundlatch_w) /* sound write */ AM_RANGE(0xc800, 0xc800) AM_WRITE(timelimt_scroll_x_lsb_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(timelimt_scroll_x_msb_w) AM_RANGE(0xc802, 0xc802) AM_WRITE(timelimt_scroll_y_w) - AM_RANGE(0xc803, 0xc803) AM_WRITE(MWA8_NOP) /* ???? bit 0 used only */ - AM_RANGE(0xc804, 0xc804) AM_WRITE(MWA8_NOP) /* ???? not used */ + AM_RANGE(0xc803, 0xc803) AM_WRITE(SMH_NOP) /* ???? bit 0 used only */ + AM_RANGE(0xc804, 0xc804) AM_WRITE(SMH_NOP) /* ???? not used */ ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) @@ -88,13 +88,13 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) /* rom */ - AM_RANGE(0x3800, 0x3bff) AM_READ(MRA8_RAM) /* ram */ + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) /* rom */ + AM_RANGE(0x3800, 0x3bff) AM_READ(SMH_RAM) /* ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) /* rom */ - AM_RANGE(0x3800, 0x3bff) AM_WRITE(MWA8_RAM) /* ram */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) /* rom */ + AM_RANGE(0x3800, 0x3bff) AM_WRITE(SMH_RAM) /* ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_sound, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c index ff04dc18659..c51fe537245 100644 --- a/src/mame/drivers/timeplt.c +++ b/src/mame/drivers/timeplt.c @@ -107,8 +107,8 @@ static WRITE8_HANDLER( timeplt_coin_counter_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x5fff) AM_ROM - AM_RANGE(0xa000, 0xa3ff) AM_READWRITE(MRA8_RAM, timeplt_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xa400, 0xa7ff) AM_READWRITE(MRA8_RAM, timeplt_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xa000, 0xa3ff) AM_READWRITE(SMH_RAM, timeplt_colorram_w) AM_BASE(&colorram) + AM_RANGE(0xa400, 0xa7ff) AM_READWRITE(SMH_RAM, timeplt_videoram_w) AM_BASE(&videoram) AM_RANGE(0xa800, 0xafff) AM_RAM AM_RANGE(0xb000, 0xb0ff) AM_MIRROR(0x0b00) AM_RAM AM_BASE(&spriteram) AM_RANGE(0xb400, 0xb4ff) AM_MIRROR(0x0b00) AM_RAM AM_BASE(&spriteram_2) diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 6cd104fe8b4..071ca13bb9e 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -380,9 +380,9 @@ static ADDRESS_MAP_START( tmaster_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x500000, 0x500011 ) AM_WRITE( tmaster_blitter_w ) AM_BASE( &tmaster_regs ) AM_RANGE( 0x500010, 0x500011 ) AM_READ ( tmaster_blitter_r ) - AM_RANGE( 0x580000, 0x580001 ) AM_WRITE(MWA16_NOP) // often + AM_RANGE( 0x580000, 0x580001 ) AM_WRITE(SMH_NOP) // often - AM_RANGE( 0x600000, 0x600fff ) AM_READWRITE( MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w ) AM_BASE(&paletteram16) // looks like palettes, maybe + AM_RANGE( 0x600000, 0x600fff ) AM_READWRITE( SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w ) AM_BASE(&paletteram16) // looks like palettes, maybe AM_RANGE( 0x800000, 0x800001 ) AM_READWRITE( OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w ) @@ -532,9 +532,9 @@ static READ16_HANDLER( dummy_read_01 ) static ADDRESS_MAP_START( galgames_map, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE( 0x000000, 0x03ffff ) AM_READWRITE(MRA16_BANK1, MWA16_BANK2) + AM_RANGE( 0x000000, 0x03ffff ) AM_READWRITE(SMH_BANK1, SMH_BANK2) AM_RANGE( 0x040000, 0x1fffff ) AM_ROM AM_REGION( REGION_CPU1, 0 ) - AM_RANGE( 0x200000, 0x23ffff ) AM_READWRITE(MRA16_BANK3, MWA16_BANK4) + AM_RANGE( 0x200000, 0x23ffff ) AM_READWRITE(SMH_BANK3, SMH_BANK4) AM_RANGE( 0x240000, 0x3fffff ) AM_ROM AM_REGION( REGION_CPU1, 0 ) AM_RANGE( 0x400000, 0x400011 ) AM_WRITE( tmaster_blitter_w ) AM_BASE( &tmaster_regs ) @@ -542,8 +542,8 @@ static ADDRESS_MAP_START( galgames_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x400014, 0x400015 ) AM_WRITE( tmaster_color_w ) AM_RANGE( 0x400020, 0x400021 ) AM_READ ( tmaster_blitter_r ) - AM_RANGE( 0x600000, 0x600001 ) AM_READWRITE( dummy_read_01, MWA16_NOP ) - AM_RANGE( 0x700000, 0x700001 ) AM_READWRITE( dummy_read_01, MWA16_NOP ) + AM_RANGE( 0x600000, 0x600001 ) AM_READWRITE( dummy_read_01, SMH_NOP ) + AM_RANGE( 0x700000, 0x700001 ) AM_READWRITE( dummy_read_01, SMH_NOP ) AM_RANGE( 0x800020, 0x80003f ) AM_NOP // ? AM_RANGE( 0x900000, 0x900001 ) AM_WRITE( watchdog_reset16_w ) @@ -554,13 +554,13 @@ static ADDRESS_MAP_START( galgames_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0xc00002, 0xc00003 ) AM_WRITE( galgames_palette_data_w ) AM_RANGE( 0xd00000, 0xd00001 ) AM_READ ( input_port_0_word_r ) // trackball p1 x - AM_RANGE( 0xd00000, 0xd00001 ) AM_WRITE( MWA16_NOP ) + AM_RANGE( 0xd00000, 0xd00001 ) AM_WRITE( SMH_NOP ) AM_RANGE( 0xd00002, 0xd00003 ) AM_READ ( input_port_1_word_r ) // trackball p1 y AM_RANGE( 0xd00004, 0xd00005 ) AM_READ ( input_port_2_word_r ) // trackball p2 x AM_RANGE( 0xd00006, 0xd00007 ) AM_READ ( input_port_3_word_r ) // trackball p2 y AM_RANGE( 0xd00008, 0xd00009 ) AM_READ ( input_port_4_word_r ) AM_RANGE( 0xd0000a, 0xd0000b ) AM_READ ( input_port_5_word_r ) - AM_RANGE( 0xd0000c, 0xd0000d ) AM_READWRITE( input_port_6_word_r, MWA16_NOP ) + AM_RANGE( 0xd0000c, 0xd0000d ) AM_READWRITE( input_port_6_word_r, SMH_NOP ) AM_RANGE( 0xd0000e, 0xd0000f ) AM_WRITE ( galgames_cart_sel_w ) AM_RANGE( 0xd00010, 0xd00011 ) AM_READWRITE( galgames_eeprom_r, galgames_eeprom_w ) diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 39c3ceeeeb2..7c543249107 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -720,7 +720,7 @@ static ADDRESS_MAP_START( cuebrick_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x040000, 0x043fff) AM_RAM /* main RAM */ AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */ - AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, tmnt_paletteram_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(SMH_RAM, tmnt_paletteram_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0a0000, 0x0a0001) AM_READWRITE(input_port_0_word_r, tmnt_0a0000_w) AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) @@ -741,7 +741,7 @@ static ADDRESS_MAP_START( mia_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x040000, 0x043fff) AM_RAM /* main RAM */ AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */ - AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, tmnt_paletteram_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(SMH_RAM, tmnt_paletteram_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0a0000, 0x0a0001) AM_READWRITE(input_port_0_word_r, tmnt_0a0000_w) AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) @@ -753,7 +753,7 @@ static ADDRESS_MAP_START( mia_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(tmnt_priority_w) #endif AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) -// AM_RANGE(0x10e800, 0x10e801) AM_WRITE(MWA16_NOP) ??? +// AM_RANGE(0x10e800, 0x10e801) AM_WRITE(SMH_NOP) ??? AM_RANGE(0x140000, 0x140007) AM_READWRITE(K051937_word_r, K051937_word_w) AM_RANGE(0x140400, 0x1407ff) AM_READWRITE(K051960_word_r, K051960_word_w) ADDRESS_MAP_END @@ -762,7 +762,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tmnt_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x05ffff) AM_ROM AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */ - AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, tmnt_paletteram_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(SMH_RAM, tmnt_paletteram_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0a0000, 0x0a0001) AM_READWRITE(input_port_0_word_r, tmnt_0a0000_w) AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) @@ -774,7 +774,7 @@ static ADDRESS_MAP_START( tmnt_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0a0018, 0x0a0019) AM_READ(input_port_7_word_r) AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(tmnt_priority_w) AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) -// AM_RANGE(0x10e800, 0x10e801) AM_WRITE(MWA16_NOP) ??? +// AM_RANGE(0x10e800, 0x10e801) AM_WRITE(SMH_NOP) ??? AM_RANGE(0x140000, 0x140007) AM_READWRITE(K051937_word_r, K051937_word_w) AM_RANGE(0x140400, 0x1407ff) AM_READWRITE(K051960_word_r, K051960_word_w) ADDRESS_MAP_END @@ -783,7 +783,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( punkshot_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x080000, 0x083fff) AM_RAM /* main RAM */ - AM_RANGE(0x090000, 0x090fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x090000, 0x090fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0a0000, 0x0a0001) AM_READ(input_port_0_word_r) AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_3_word_r) @@ -802,7 +802,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( lgtnfght_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x080000, 0x080fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x080000, 0x080fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x090000, 0x093fff) AM_RAM /*main RAM */ AM_RANGE(0x0a0000, 0x0a0001) AM_READ(input_port_0_word_r) AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) @@ -832,7 +832,7 @@ static ADDRESS_MAP_START( blswhstl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x180000, 0x183fff) AM_READWRITE(K052109_word_r, K052109_word_w) AM_RANGE(0x204000, 0x207fff) AM_RAM /* main RAM */ AM_RANGE(0x300000, 0x303fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x50003f) AM_READWRITE(K054000_lsb_r, K054000_lsb_w) AM_RANGE(0x680000, 0x68001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r) @@ -853,11 +853,11 @@ static ADDRESS_MAP_START( glfgreat_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */ AM_RANGE(0x104000, 0x107fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) - AM_RANGE(0x108000, 0x108fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x108000, 0x108fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x10c000, 0x10cfff) AM_RAM AM_BASE(&K053936_0_linectrl) /* 053936? */ AM_RANGE(0x110000, 0x11001f) AM_WRITE(K053244_word_noA1_w) /* duplicate! */ AM_RANGE(0x114000, 0x11401f) AM_READWRITE(K053244_lsb_r, K053244_lsb_w) /* duplicate! */ - AM_RANGE(0x118000, 0x11801f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) + AM_RANGE(0x118000, 0x11801f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) AM_RANGE(0x11c000, 0x11c01f) AM_WRITE(K053251_msb_w) AM_RANGE(0x120000, 0x120001) AM_READ(input_port_0_word_r) AM_RANGE(0x120002, 0x120003) AM_READ(input_port_1_word_r) @@ -876,11 +876,11 @@ static ADDRESS_MAP_START( prmrsocr_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */ AM_RANGE(0x104000, 0x107fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) - AM_RANGE(0x108000, 0x108fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x108000, 0x108fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x10c000, 0x10cfff) AM_RAM AM_BASE(&K053936_0_linectrl) AM_RANGE(0x110000, 0x11001f) AM_WRITE(K053244_word_noA1_w) /* duplicate! */ AM_RANGE(0x114000, 0x11401f) AM_READWRITE(K053244_lsb_r, K053244_lsb_w) /* duplicate! */ - AM_RANGE(0x118000, 0x11801f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl) + AM_RANGE(0x118000, 0x11801f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) AM_RANGE(0x11c000, 0x11c01f) AM_WRITE(K053251_msb_w) AM_RANGE(0x120000, 0x120001) AM_READ(prmrsocr_IN0_r) AM_RANGE(0x120002, 0x120003) AM_READ(prmrsocr_eeprom_r) @@ -1128,8 +1128,8 @@ logerror("copy command %04x sprite %08x data %08x: %04x%04x %04x%04x modifiers static ADDRESS_MAP_START( tmnt2_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_BASE(&tmnt2_rom) AM_RANGE(0x104000, 0x107fff) AM_RAM AM_BASE(&sunset_104000) /* main RAM */ - AM_RANGE(0x140000, 0x140fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x180000, 0x183fff) AM_READWRITE(MRA16_RAM, K053245_scattered_word_w) AM_BASE(&spriteram16) // K053245_scattered_word_r + AM_RANGE(0x140000, 0x140fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE(SMH_RAM, K053245_scattered_word_w) AM_BASE(&spriteram16) // K053245_scattered_word_r AM_RANGE(0x1c0000, 0x1c0001) AM_READ(input_port_0_word_r) AM_RANGE(0x1c0002, 0x1c0003) AM_READ(input_port_1_word_r) AM_RANGE(0x1c0004, 0x1c0005) AM_READ(input_port_4_word_r) @@ -1154,7 +1154,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ssriders_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0bffff) AM_ROM AM_RANGE(0x104000, 0x107fff) AM_RAM /* main RAM */ - AM_RANGE(0x140000, 0x140fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x140000, 0x140fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x180000, 0x183fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) AM_RANGE(0x1c0000, 0x1c0001) AM_READ(input_port_0_word_r) AM_RANGE(0x1c0002, 0x1c0003) AM_READ(input_port_1_word_r) @@ -1180,17 +1180,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sunsetbl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0bffff) AM_ROM AM_RANGE(0x104000, 0x107fff) AM_RAM /* main RAM */ - AM_RANGE(0x14c000, 0x14cfff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x14c000, 0x14cfff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x14e700, 0x14e71f) AM_WRITE(K053251_lsb_w) AM_RANGE(0x180000, 0x183fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) AM_RANGE(0x184000, 0x18ffff) AM_RAM AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w) - AM_RANGE(0x1c0400, 0x1c0401) AM_WRITE(MWA16_NOP) + AM_RANGE(0x1c0400, 0x1c0401) AM_WRITE(SMH_NOP) AM_RANGE(0x5a0000, 0x5a001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) AM_RANGE(0x600000, 0x603fff) AM_READWRITE(K052109_word_r, K052109_word_w) - AM_RANGE(0x604020, 0x60402f) AM_WRITE(MWA16_NOP) /* written every frame */ - AM_RANGE(0x604200, 0x604201) AM_WRITE(MWA16_NOP) /* watchdog */ - AM_RANGE(0x6119e2, 0x6119e3) AM_WRITE(MWA16_NOP) /* written a lot in some test menus (PC=18204) */ + AM_RANGE(0x604020, 0x60402f) AM_WRITE(SMH_NOP) /* written every frame */ + AM_RANGE(0x604200, 0x604201) AM_WRITE(SMH_NOP) /* watchdog */ + AM_RANGE(0x6119e2, 0x6119e3) AM_WRITE(SMH_NOP) /* written a lot in some test menus (PC=18204) */ AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r) AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r) AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_4_word_r) @@ -1199,14 +1199,14 @@ static ADDRESS_MAP_START( sunsetbl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00404, 0xc00405) AM_READ(input_port_2_word_r) AM_RANGE(0xc00406, 0xc00407) AM_READ(sunsetbl_eeprom_r) AM_RANGE(0xc00600, 0xc00601) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) - AM_RANGE(0x75d288, 0x75d289) AM_READ(MRA16_NOP) // read repeatedly in some test menus (PC=181f2) + AM_RANGE(0x75d288, 0x75d289) AM_READ(SMH_NOP) // read repeatedly in some test menus (PC=181f2) ADDRESS_MAP_END static ADDRESS_MAP_START( thndrx2_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */ - AM_RANGE(0x200000, 0x200fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x200000, 0x200fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x300000, 0x30001f) AM_WRITE(K053251_lsb_w) AM_RANGE(0x400000, 0x400003) AM_READ(punkshot_sound_r) /* K053260 */ AM_RANGE(0x400000, 0x400001) AM_WRITE(K053260_0_lsb_w) @@ -1214,7 +1214,7 @@ static ADDRESS_MAP_START( thndrx2_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500100, 0x500101) AM_WRITE(thndrx2_eeprom_w) AM_RANGE(0x500200, 0x500201) AM_READ(thndrx2_in0_r) AM_RANGE(0x500202, 0x500203) AM_READ(thndrx2_eeprom_r) - AM_RANGE(0x500300, 0x500301) AM_WRITE(MWA16_NOP) /* watchdog reset? irq enable? */ + AM_RANGE(0x500300, 0x500301) AM_WRITE(SMH_NOP) /* watchdog reset? irq enable? */ AM_RANGE(0x600000, 0x607fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) AM_RANGE(0x700000, 0x700007) AM_READWRITE(K051937_word_r, K051937_word_w) AM_RANGE(0x700400, 0x7007ff) AM_READWRITE(K051960_word_r, K051960_word_w) @@ -1304,7 +1304,7 @@ static WRITE8_HANDLER( K054539_0_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(MRA8_BANK1, MWA8_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK1, SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe0ff) AM_READWRITE(K054539_0_r, K054539_0_w) AM_RANGE(0xe100, 0xe12f) AM_READWRITE(K054539_0_ctrl_r, K054539_0_ctrl_w) diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index 66478cc1b8b..14bb96030dd 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -347,24 +347,24 @@ static WRITE8_HANDLER( kabukiz_sample_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) /* ROM + RAM */ - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) /* ROM + RAM */ + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_READ(tnzs_sharedram_r) /* WORK RAM (shared by the 2 z80's) */ - AM_RANGE(0xf000, 0xf1ff) AM_READ(MRA8_RAM) /* VDC RAM */ - AM_RANGE(0xf600, 0xf600) AM_READ(MRA8_NOP) /* ? */ - AM_RANGE(0xf800, 0xfbff) AM_READ(MRA8_RAM) /* not in extrmatn and arknoid2 (PROMs instead) */ + AM_RANGE(0xf000, 0xf1ff) AM_READ(SMH_RAM) /* VDC RAM */ + AM_RANGE(0xf600, 0xf600) AM_READ(SMH_NOP) /* ? */ + AM_RANGE(0xf800, 0xfbff) AM_READ(SMH_RAM) /* not in extrmatn and arknoid2 (PROMs instead) */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_BANK1) /* ROM + RAM */ - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&tnzs_objram) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_BANK1) /* ROM + RAM */ + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&tnzs_objram) AM_RANGE(0xe000, 0xefff) AM_WRITE(tnzs_sharedram_w) AM_BASE(&tnzs_sharedram) - AM_RANGE(0xf000, 0xf1ff) AM_WRITE(MWA8_RAM) AM_BASE(&tnzs_vdcram) - AM_RANGE(0xf200, 0xf2ff) AM_WRITE(MWA8_RAM) AM_BASE(&tnzs_scrollram) /* scrolling info */ - AM_RANGE(0xf300, 0xf303) AM_MIRROR(0xfc) AM_WRITE(MWA8_RAM) AM_BASE(&tnzs_objctrl) /* control registers (0x80 mirror used by Arkanoid 2) */ - AM_RANGE(0xf400, 0xf400) AM_WRITE(MWA8_RAM) AM_BASE(&tnzs_bg_flag) /* enable / disable background transparency */ + AM_RANGE(0xf000, 0xf1ff) AM_WRITE(SMH_RAM) AM_BASE(&tnzs_vdcram) + AM_RANGE(0xf200, 0xf2ff) AM_WRITE(SMH_RAM) AM_BASE(&tnzs_scrollram) /* scrolling info */ + AM_RANGE(0xf300, 0xf303) AM_MIRROR(0xfc) AM_WRITE(SMH_RAM) AM_BASE(&tnzs_objctrl) /* control registers (0x80 mirror used by Arkanoid 2) */ + AM_RANGE(0xf400, 0xf400) AM_WRITE(SMH_RAM) AM_BASE(&tnzs_bg_flag) /* enable / disable background transparency */ AM_RANGE(0xf600, 0xf600) AM_WRITE(tnzs_bankswitch_w) /* arknoid2, extrmatn, plumppop and drtoppel have PROMs instead of RAM */ /* drtoppel writes here anyway! (maybe leftover from tests during development) */ @@ -378,22 +378,22 @@ static ADDRESS_MAP_START( cpu0_type2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&tnzs_objram) AM_RANGE(0xe000, 0xefff) AM_READWRITE(tnzs_sharedram_r, tnzs_sharedram_w) AM_BASE(&tnzs_sharedram) /* WORK RAM (shared by the 2 z80's) */ AM_RANGE(0xf000, 0xf1ff) AM_RAM AM_BASE(&tnzs_vdcram) - AM_RANGE(0xf200, 0xf2ff) AM_WRITE(MWA8_RAM) AM_BASE(&tnzs_scrollram) /* scrolling info */ - AM_RANGE(0xf300, 0xf303) AM_MIRROR(0xfc) AM_WRITE(MWA8_RAM) AM_BASE(&tnzs_objctrl) /* control registers (0x80 mirror used by Arkanoid 2) */ - AM_RANGE(0xf400, 0xf400) AM_WRITE(MWA8_RAM) AM_BASE(&tnzs_bg_flag) /* enable / disable background transparency */ + AM_RANGE(0xf200, 0xf2ff) AM_WRITE(SMH_RAM) AM_BASE(&tnzs_scrollram) /* scrolling info */ + AM_RANGE(0xf300, 0xf303) AM_MIRROR(0xfc) AM_WRITE(SMH_RAM) AM_BASE(&tnzs_objctrl) /* control registers (0x80 mirror used by Arkanoid 2) */ + AM_RANGE(0xf400, 0xf400) AM_WRITE(SMH_RAM) AM_BASE(&tnzs_bg_flag) /* enable / disable background transparency */ AM_RANGE(0xf600, 0xf600) AM_WRITE(tnzs_bankswitch_w) /* kabukiz still writes here but it's not used (it's paletteram in type1 map) */ AM_RANGE(0xf800, 0xfbff) AM_WRITENOP ADDRESS_MAP_END static ADDRESS_MAP_START( sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK2) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK2) AM_RANGE(0xb000, 0xb000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xb001, 0xb001) AM_READ(YM2203_read_port_0_r) AM_RANGE(0xc000, 0xc001) AM_READ(tnzs_mcu_r) /* plain input ports in insectx (memory handler */ /* changed in insectx_init() ) */ - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_READ(tnzs_sharedram_r) AM_RANGE(0xf000, 0xf003) AM_READ(arknoid2_sh_f000_r) /* paddles in arkanoid2/plumppop. The ports are */ /* read but not used by the other games, and are not read at */ @@ -401,33 +401,33 @@ static ADDRESS_MAP_START( sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(YM2203_write_port_0_w) AM_RANGE(0xc000, 0xc001) AM_WRITE(tnzs_mcu_w) /* not present in insectx */ - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_WRITE(tnzs_sharedram_w) ADDRESS_MAP_END static ADDRESS_MAP_START( kageki_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_BANK2) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK2) AM_RANGE(0xb000, 0xb000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xb001, 0xb001) AM_READ(YM2203_read_port_0_r) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_2_r) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_3_r) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_4_r) - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_READ(tnzs_sharedram_r) ADDRESS_MAP_END static ADDRESS_MAP_START( kageki_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0xb001, 0xb001) AM_WRITE(YM2203_write_port_0_w) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_WRITE(tnzs_sharedram_w) ADDRESS_MAP_END @@ -451,7 +451,7 @@ static ADDRESS_MAP_START( tnzsb_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_4_r) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xefff) AM_READWRITE(tnzs_sharedram_r, tnzs_sharedram_w) - AM_RANGE(0xf000, 0xf003) AM_READ(MRA8_RAM) + AM_RANGE(0xf000, 0xf003) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xf3ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE(&paletteram) ADDRESS_MAP_END @@ -495,13 +495,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( i8742_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_ROM) - AM_RANGE(0x0800, 0x08ff) AM_READ(MRA8_RAM) /* Internal i8742 RAM */ + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_ROM) + AM_RANGE(0x0800, 0x08ff) AM_READ(SMH_RAM) /* Internal i8742 RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( i8742_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x0800, 0x08ff) AM_WRITE(MWA8_RAM) /* Internal i8742 RAM */ + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x0800, 0x08ff) AM_WRITE(SMH_RAM) /* Internal i8742 RAM */ ADDRESS_MAP_END static ADDRESS_MAP_START( i8742_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index b26230ca4dd..b2a6f9912c9 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -457,7 +457,7 @@ static DRIVER_INIT( T2_noZ80 ) static DRIVER_INIT( fixeight ) { - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x28f002, 0x28fbff, 0, 0, MRA16_BANK2, MWA16_BANK2 ); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x28f002, 0x28fbff, 0, 0, SMH_BANK2, SMH_BANK2 ); memory_set_bankptr(2, fixeight_sec_cpu_mem); toaplan2_sub_cpu = CPU_2_V25; @@ -956,11 +956,11 @@ 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(0, ADDRESS_SPACE_PROGRAM, 0x28f002, 0x28fbff, 0, 0, MRA16_BANK2, MWA16_BANK2); + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x28f002, 0x28fbff, 0, 0, SMH_BANK2, SMH_BANK2); memory_set_bankptr(2, fixeight_sec_cpu_mem); - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x28f004, 0x28f005, 0, 0, input_port_5_word_r, MWA16_NOP); /* Dip Switch A - Wrong !!! */ - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x28f006, 0x28f007, 0, 0, input_port_6_word_r, MWA16_NOP); /* Dip Switch B - Wrong !!! */ - memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x28f008, 0x28f009, 0, 0, input_port_7_word_r, MWA16_NOP); /* Territory Jumper block - Wrong !!! */ + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x28f004, 0x28f005, 0, 0, input_port_5_word_r, SMH_NOP); /* Dip Switch A - Wrong !!! */ + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x28f006, 0x28f007, 0, 0, input_port_6_word_r, SMH_NOP); /* Dip Switch B - Wrong !!! */ + memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0x28f008, 0x28f009, 0, 0, input_port_7_word_r, SMH_NOP); /* Territory Jumper block - Wrong !!! */ mcu_data = data; } @@ -1353,7 +1353,7 @@ static ADDRESS_MAP_START( tekipaki_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x020000, 0x03ffff) AM_ROM /* extra for Whoopee */ AM_RANGE(0x080000, 0x082fff) AM_RAM - AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x140000, 0x140001) AM_WRITE(toaplan2_0_voffs_w) AM_RANGE(0x140004, 0x140007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x140008, 0x140009) AM_WRITE(toaplan2_0_scroll_reg_select_w) @@ -1373,7 +1373,7 @@ static ADDRESS_MAP_START( ghox_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x040000, 0x040001) AM_READ(ghox_p2_h_analog_r) /* Paddle 2 */ AM_RANGE(0x080000, 0x083fff) AM_RAM - AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x100000, 0x100001) AM_READ(ghox_p1_h_analog_r) /* Paddle 1 */ AM_RANGE(0x140000, 0x140001) AM_WRITE(toaplan2_0_voffs_w) AM_RANGE(0x140004, 0x140007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ @@ -1414,7 +1414,7 @@ static ADDRESS_MAP_START( dogyuun_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) /***** The following loctions in 0x50000x are for video controller 2 ******/ AM_RANGE(0x500000, 0x500001) AM_WRITE(toaplan2_1_voffs_w) /* VideoRAM selector/offset */ AM_RANGE(0x500004, 0x500007) AM_READWRITE(toaplan2_1_videoram16_r, toaplan2_1_videoram16_w) /* Tile/Sprite VideoRAM */ @@ -1440,7 +1440,7 @@ static ADDRESS_MAP_START( kbash_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x700000, 0x700001) AM_READ(video_count_r) /* test bit 8 */ ADDRESS_MAP_END @@ -1465,7 +1465,7 @@ static ADDRESS_MAP_START( kbash2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) ADDRESS_MAP_END @@ -1476,7 +1476,7 @@ static ADDRESS_MAP_START( truxton2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200004, 0x200007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) AM_RANGE(0x200008, 0x200009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x20000c, 0x20000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x300000, 0x300fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x300000, 0x300fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x400000, 0x401fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) AM_RANGE(0x402000, 0x4021ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) AM_RANGE(0x402200, 0x402fff) AM_RAM @@ -1500,7 +1500,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pipibibs_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x080000, 0x082fff) AM_RAM - AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x140000, 0x140001) AM_WRITE(toaplan2_0_voffs_w) AM_RANGE(0x140004, 0x140007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) AM_RANGE(0x140008, 0x140009) AM_WRITE(toaplan2_0_scroll_reg_select_w) @@ -1521,7 +1521,7 @@ static ADDRESS_MAP_START( pipibibi_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x082fff) AM_RAM AM_RANGE(0x083000, 0x0837ff) AM_READWRITE(pipibibi_spriteram16_r, pipibibi_spriteram16_w) /* SpriteRAM */ AM_RANGE(0x083800, 0x087fff) AM_RAM /* SpriteRAM (unused) */ - AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x0c0000, 0x0c0fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x120000, 0x120fff) AM_RAM /* Copy of SpriteRAM ? */ // AM_RANGE(0x13f000, 0x13f001) AM_WRITENOP /* ??? */ AM_RANGE(0x180000, 0x182fff) AM_READWRITE(pipibibi_videoram16_r, pipibibi_videoram16_w) /* TileRAM */ @@ -1553,18 +1553,18 @@ static ADDRESS_MAP_START( fixeight_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) #else AM_RANGE(0x28e000, 0x28efff) AM_READWRITE(shared_ram_r, shared_ram_w) AM_BASE(&toaplan2_shared_ram16) AM_RANGE(0x28f000, 0x28f001) AM_READWRITE(fixeight_sec_cpu_r, fixeight_sec_cpu_w) AM_BASE(&fixeight_sec_cpu_mem) /* V25+ Command/Status port */ -// AM_RANGE(0x28f002, 0x28f003) AM_READ(MRA16_RAM) /* part of shared ram */ +// AM_RANGE(0x28f002, 0x28f003) AM_READ(SMH_RAM) /* part of shared ram */ // AM_RANGE(0x28f004, 0x28f005) AM_READ_PORT("DSWA") /* Dip Switch A - Wrong !!! */ // AM_RANGE(0x28f006, 0x28f007) AM_READ_PORT("DSWB") /* Dip Switch B - Wrong !!! */ // AM_RANGE(0x28f008, 0x28f009) AM_READ_PORT("JMPR") /* Territory Jumper block - Wrong !!! */ -// AM_RANGE(0x28f00a, 0x28fbff) AM_READ(MRA16_RAM) /* part of shared ram */ +// AM_RANGE(0x28f00a, 0x28fbff) AM_READ(SMH_RAM) /* part of shared ram */ AM_RANGE(0x28fc00, 0x28ffff) AM_READWRITE(V25_sharedram_r, V25_sharedram_w) AM_BASE(&V25_shared_ram) /* 16-bit on 68000 side, 8-bit on V25+ side */ #endif AM_RANGE(0x300000, 0x300001) AM_WRITE(toaplan2_0_voffs_w) /* VideoRAM selector/offset */ AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x501fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) 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) @@ -1588,12 +1588,12 @@ static ADDRESS_MAP_START( fixeighb_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x501fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) 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(MRA16_BANK1) + AM_RANGE(0x800000, 0x87ffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END @@ -1620,7 +1620,7 @@ static ADDRESS_MAP_START( vfive_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x700000, 0x700001) AM_READ(video_count_r) ADDRESS_MAP_END @@ -1649,7 +1649,7 @@ static ADDRESS_MAP_START( batsugun_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) /***** The following in 0x50000x are for video controller 2 ******/ AM_RANGE(0x500000, 0x500001) AM_WRITE(toaplan2_1_voffs_w) /* VideoRAM selector/offset */ AM_RANGE(0x500004, 0x500007) AM_READWRITE(toaplan2_1_videoram16_r, toaplan2_1_videoram16_w) /* Tile/Sprite VideoRAM */ @@ -1666,7 +1666,7 @@ static ADDRESS_MAP_START( snowbro2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x500001) AM_WRITE(YM2151_register_port_0_lsb_w) AM_RANGE(0x500002, 0x500003) AM_READWRITE(YM2151_status_port_0_lsb_r, YM2151_data_port_0_lsb_w) AM_RANGE(0x600000, 0x600001) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) @@ -1699,7 +1699,7 @@ static ADDRESS_MAP_START( mahoudai_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x401000, 0x4017ff) AM_RAM /* Unused PaletteRAM */ AM_RANGE(0x500000, 0x501fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) 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) @@ -1726,7 +1726,7 @@ static ADDRESS_MAP_START( shippumd_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x401000, 0x4017ff) AM_RAM /* Unused PaletteRAM */ AM_RANGE(0x500000, 0x501fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) 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) @@ -1752,7 +1752,7 @@ static ADDRESS_MAP_START( bgaregga_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300004, 0x300007) AM_READWRITE(toaplan2_0_videoram16_r, toaplan2_0_videoram16_w) /* Tile/Sprite VideoRAM */ AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w) AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w) /* VBlank */ - AM_RANGE(0x400000, 0x400fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x400000, 0x400fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x501fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) 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(0x502200, 0x502fff) AM_RAM @@ -1765,7 +1765,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( batrider_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM AM_RANGE(0x200000, 0x201fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) /* Text VideoRAM */ - AM_RANGE(0x202000, 0x202fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_SIZE(&batrider_paletteram16_size) + AM_RANGE(0x202000, 0x202fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_SIZE(&batrider_paletteram16_size) AM_RANGE(0x203000, 0x2031ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) AM_RANGE(0x203200, 0x2033ff) AM_READWRITE(toaplan2_txscrollram16_r, toaplan2_txscrollram16_w) AM_BASE(&toaplan2_txscrollram16) AM_SIZE(&toaplan2_tx_scroll_vram_size) AM_RANGE(0x203400, 0x207fff) AM_READWRITE(raizing_tx_gfxram16_r, raizing_tx_gfxram16_w) /* Main RAM actually */ @@ -1796,7 +1796,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bbakraid_68k_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM AM_RANGE(0x200000, 0x201fff) AM_READWRITE(toaplan2_txvideoram16_r, toaplan2_txvideoram16_w) AM_BASE(&toaplan2_txvideoram16) AM_SIZE(&toaplan2_tx_vram_size) /* Text VideoRAM */ - AM_RANGE(0x202000, 0x202fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_SIZE(&batrider_paletteram16_size) + AM_RANGE(0x202000, 0x202fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_SIZE(&batrider_paletteram16_size) AM_RANGE(0x203000, 0x2031ff) AM_READWRITE(toaplan2_txvideoram16_offs_r, toaplan2_txvideoram16_offs_w) AM_BASE(&toaplan2_txvideoram16_offs) AM_SIZE(&toaplan2_tx_offs_vram_size) AM_RANGE(0x203200, 0x2033ff) AM_READWRITE(toaplan2_txscrollram16_r, toaplan2_txscrollram16_w) AM_BASE(&toaplan2_txscrollram16) AM_SIZE(&toaplan2_tx_scroll_vram_size) AM_RANGE(0x203400, 0x207fff) AM_READWRITE(raizing_tx_gfxram16_r, raizing_tx_gfxram16_w) /* Main RAM actually */ diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c index ae9641f5072..9201ed14d24 100644 --- a/src/mame/drivers/toki.c +++ b/src/mame/drivers/toki.c @@ -110,10 +110,10 @@ static ADDRESS_MAP_START( toki_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x05ffff) AM_ROM AM_RANGE(0x060000, 0x06d7ff) AM_RAM AM_RANGE(0x06d800, 0x06dfff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x06e000, 0x06e7ff) AM_READWRITE(MRA16_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x06e800, 0x06efff) AM_READWRITE(MRA16_RAM, toki_background1_videoram16_w) AM_BASE(&toki_background1_videoram16) - AM_RANGE(0x06f000, 0x06f7ff) AM_READWRITE(MRA16_RAM, toki_background2_videoram16_w) AM_BASE(&toki_background2_videoram16) - AM_RANGE(0x06f800, 0x06ffff) AM_READWRITE(MRA16_RAM, toki_foreground_videoram16_w) AM_BASE(&videoram16) + AM_RANGE(0x06e000, 0x06e7ff) AM_READWRITE(SMH_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x06e800, 0x06efff) AM_READWRITE(SMH_RAM, toki_background1_videoram16_w) AM_BASE(&toki_background1_videoram16) + AM_RANGE(0x06f000, 0x06f7ff) AM_READWRITE(SMH_RAM, toki_background2_videoram16_w) AM_BASE(&toki_background2_videoram16) + AM_RANGE(0x06f800, 0x06ffff) AM_READWRITE(SMH_RAM, toki_foreground_videoram16_w) AM_BASE(&videoram16) AM_RANGE(0x080000, 0x08000d) AM_READWRITE(seibu_main_word_r, seibu_main_word_w) AM_RANGE(0x0a0000, 0x0a005f) AM_WRITE(toki_control_w) AM_BASE(&toki_scrollram16) AM_RANGE(0x0c0000, 0x0c0001) AM_READ(input_port_1_word_r) @@ -125,17 +125,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tokib_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x05ffff) AM_ROM AM_RANGE(0x060000, 0x06dfff) AM_RAM - AM_RANGE(0x06e000, 0x06e7ff) AM_READWRITE(MRA16_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x06e800, 0x06efff) AM_READWRITE(MRA16_RAM, toki_background1_videoram16_w) AM_BASE(&toki_background1_videoram16) - AM_RANGE(0x06f000, 0x06f7ff) AM_READWRITE(MRA16_RAM, toki_background2_videoram16_w) AM_BASE(&toki_background2_videoram16) - AM_RANGE(0x06f800, 0x06ffff) AM_READWRITE(MRA16_RAM, toki_foreground_videoram16_w) AM_BASE(&videoram16) - AM_RANGE(0x071000, 0x071001) AM_WRITE(MWA16_NOP) /* sprite related? seems another scroll register */ + AM_RANGE(0x06e000, 0x06e7ff) AM_READWRITE(SMH_RAM, paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x06e800, 0x06efff) AM_READWRITE(SMH_RAM, toki_background1_videoram16_w) AM_BASE(&toki_background1_videoram16) + AM_RANGE(0x06f000, 0x06f7ff) AM_READWRITE(SMH_RAM, toki_background2_videoram16_w) AM_BASE(&toki_background2_videoram16) + AM_RANGE(0x06f800, 0x06ffff) AM_READWRITE(SMH_RAM, toki_foreground_videoram16_w) AM_BASE(&videoram16) + AM_RANGE(0x071000, 0x071001) AM_WRITE(SMH_NOP) /* sprite related? seems another scroll register */ /* gets written the same value as 75000a (bg2 scrollx) */ - AM_RANGE(0x071804, 0x071807) AM_WRITE(MWA16_NOP) /* sprite related, always 01be0100 */ - AM_RANGE(0x07180e, 0x071e45) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x071804, 0x071807) AM_WRITE(SMH_NOP) /* sprite related, always 01be0100 */ + AM_RANGE(0x07180e, 0x071e45) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x072000, 0x072001) AM_READ(watchdog_reset16_r) /* probably */ AM_RANGE(0x075000, 0x075001) AM_WRITE(tokib_soundcommand16_w) - AM_RANGE(0x075004, 0x07500b) AM_WRITE(MWA16_RAM) AM_BASE(&toki_scrollram16) + AM_RANGE(0x075004, 0x07500b) AM_WRITE(SMH_RAM) AM_BASE(&toki_scrollram16) AM_RANGE(0x0c0000, 0x0c0001) AM_READ(input_port_0_word_r) AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_1_word_r) AM_RANGE(0x0c0004, 0x0c0005) AM_READ(input_port_2_word_r) @@ -147,9 +147,9 @@ ADDRESS_MAP_END /*****************************************************************************/ static ADDRESS_MAP_START( tokib_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xe000, 0xe000) AM_WRITE(toki_adpcm_control_w) /* MSM5205 + ROM bank */ AM_RANGE(0xe400, 0xe400) AM_WRITE(toki_adpcm_data_w) AM_RANGE(0xec00, 0xec00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w) diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c index 77611d33395..3cb6092b68b 100644 --- a/src/mame/drivers/toobin.c +++ b/src/mame/drivers/toobin.c @@ -111,20 +111,20 @@ static READ16_HANDLER( special_port1_r ) *************************************/ static ADDRESS_MAP_START( main_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0xc00000, 0xc09fff) AM_READ(MRA16_RAM) - AM_RANGE(0xc10000, 0xc107ff) AM_READ(MRA16_RAM) - AM_RANGE(0xff6000, 0xff6001) AM_READ(MRA16_NOP) /* who knows? read at controls time */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0xc00000, 0xc09fff) AM_READ(SMH_RAM) + AM_RANGE(0xc10000, 0xc107ff) AM_READ(SMH_RAM) + AM_RANGE(0xff6000, 0xff6001) AM_READ(SMH_NOP) /* who knows? read at controls time */ AM_RANGE(0xff8800, 0xff8801) AM_READ(input_port_0_word_r) AM_RANGE(0xff9000, 0xff9001) AM_READ(special_port1_r) AM_RANGE(0xff9800, 0xff9801) AM_READ(atarigen_sound_r) AM_RANGE(0xffa000, 0xffafff) AM_READ(atarigen_eeprom_r) - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( main_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0xc00000, 0xc07fff) AM_WRITE(atarigen_playfield_large_w) AM_BASE(&atarigen_playfield) AM_RANGE(0xc08000, 0xc097ff) AM_WRITE(atarigen_alpha_w) AM_BASE(&atarigen_alpha) AM_RANGE(0xc09800, 0xc09fff) AM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) @@ -140,7 +140,7 @@ static ADDRESS_MAP_START( main_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff8600, 0xff8601) AM_WRITE(toobin_xscroll_w) AM_BASE(&atarigen_xscroll) AM_RANGE(0xff8700, 0xff8701) AM_WRITE(toobin_yscroll_w) AM_BASE(&atarigen_yscroll) AM_RANGE(0xffa000, 0xffafff) AM_WRITE(atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END diff --git a/src/mame/drivers/topshoot.c b/src/mame/drivers/topshoot.c index 889577bc91d..a73b172d9d4 100644 --- a/src/mame/drivers/topshoot.c +++ b/src/mame/drivers/topshoot.c @@ -191,11 +191,11 @@ static INPUT_PORTS_START( topshoot ) /* Top Shooter Input Ports */ INPUT_PORTS_END static ADDRESS_MAP_START( topshoot_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* Cartridge Program Rom */ -// AM_RANGE(0x200000, 0x20007f) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* Cartridge Program Rom */ +// AM_RANGE(0x200000, 0x20007f) AM_READ(SMH_RAM) // AM_RANGE(0x200040, 0x200041) AM_READ(input_port_0_word_r) // ?? // AM_RANGE(0x200050, 0x200051) AM_READ(input_port_0_word_r) // ?? - AM_RANGE(0x202000, 0x2023ff) AM_READ(MRA16_RAM) + AM_RANGE(0x202000, 0x2023ff) AM_READ(SMH_RAM) AM_RANGE(0x400004, 0x400005) AM_READ(input_port_0_word_r) // ?? AM_RANGE(0xa10000, 0xa1001f) AM_READ(input_port_0_word_r) AM_RANGE(0xa11100, 0xa11101) AM_READ(input_port_0_word_r) // ?? @@ -203,34 +203,34 @@ static ADDRESS_MAP_START( topshoot_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa0ffff) AM_READ(genesis_68k_to_z80_r) AM_RANGE(0xc00000, 0xc0001f) AM_READ(genesis_vdp_r) /* VDP Access */ - AM_RANGE(0xe00000, 0xe1ffff) AM_READ(MRA16_BANK3) - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_BANK4) - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) /* Main Ram */ + AM_RANGE(0xe00000, 0xe1ffff) AM_READ(SMH_BANK3) + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_BANK4) + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) /* Main Ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( topshoot_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* Cartridge Program Rom */ -// AM_RANGE(0x200000, 0x20007f) AM_WRITE(MWA16_RAM) - AM_RANGE(0x200000, 0x2023ff) AM_WRITE(MWA16_RAM) // tested + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* Cartridge Program Rom */ +// AM_RANGE(0x200000, 0x20007f) AM_WRITE(SMH_RAM) + AM_RANGE(0x200000, 0x2023ff) AM_WRITE(SMH_RAM) // tested AM_RANGE(0xa10000, 0xa1001f) AM_WRITE(genesis_io_w) AM_BASE(&genesis_io_ram) /* Genesis Input */ AM_RANGE(0xa11000, 0xa11203) AM_WRITE(genesis_ctrl_w) AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(genesis_68k_to_z80_w) AM_RANGE(0xc00000, 0xc0001f) AM_WRITE(genesis_vdp_w) /* VDP Access */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_BANK4) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) AM_BASE(&genesis_68k_ram)/* Main Ram */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_BANK4) + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) AM_BASE(&genesis_68k_ram)/* Main Ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( genesis_z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_BANK2) /* mirror */ + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_BANK1) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_BANK2) /* mirror */ AM_RANGE(0x4000, 0x7fff) AM_READ(genesis_z80_r) AM_RANGE(0x8000, 0xffff) AM_READ(genesis_z80_bank_r) ADDRESS_MAP_END static ADDRESS_MAP_START( genesis_z80_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_BANK1) AM_BASE(&genesis_z80_ram) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_BANK2) /* mirror */ + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_BANK1) AM_BASE(&genesis_z80_ram) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_BANK2) /* mirror */ AM_RANGE(0x4000, 0x7fff) AM_WRITE(genesis_z80_w) // AM_RANGE(0x8000, 0xffff) AM_WRITE(genesis_z80_bank_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index c51257f7043..4b0b893a428 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -452,28 +452,28 @@ static WRITE8_HANDLER( topspeed_msm5205_stop_w ) static ADDRESS_MAP_START( topspeed_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(sharedram_r) // all shared ?? - AM_RANGE(0x500000, 0x503fff) AM_READ(MRA16_RAM) - AM_RANGE(0x7e0000, 0x7e0001) AM_READ(MRA16_NOP) + AM_RANGE(0x500000, 0x503fff) AM_READ(SMH_RAM) + AM_RANGE(0x7e0000, 0x7e0001) AM_READ(SMH_NOP) AM_RANGE(0x7e0002, 0x7e0003) AM_READ(taitosound_comm16_lsb_r) - AM_RANGE(0x800000, 0x8003ff) AM_READ(MRA16_RAM) /* raster line color control */ - AM_RANGE(0x800400, 0x80ffff) AM_READ(MRA16_RAM) /* unknown or unused */ + AM_RANGE(0x800000, 0x8003ff) AM_READ(SMH_RAM) /* raster line color control */ + AM_RANGE(0x800400, 0x80ffff) AM_READ(SMH_RAM) /* unknown or unused */ AM_RANGE(0xa00000, 0xa0ffff) AM_READ(PC080SN_word_0_r) /* tilemaps */ AM_RANGE(0xb00000, 0xb0ffff) AM_READ(PC080SN_word_1_r) /* tilemaps */ - AM_RANGE(0xd00000, 0xd00fff) AM_READ(MRA16_RAM) /* sprite ram */ - AM_RANGE(0xe00000, 0xe0ffff) AM_READ(MRA16_RAM) /* sprite map */ + AM_RANGE(0xd00000, 0xd00fff) AM_READ(SMH_RAM) /* sprite ram */ + AM_RANGE(0xe00000, 0xe0ffff) AM_READ(SMH_RAM) /* sprite map */ ADDRESS_MAP_END static ADDRESS_MAP_START( topspeed_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_WRITE(sharedram_w) AM_BASE(&sharedram) AM_SIZE(&sharedram_size) AM_RANGE(0x500000, 0x503fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x600002, 0x600003) AM_WRITE(cpua_ctrl_w) AM_RANGE(0x7e0000, 0x7e0001) AM_WRITE(taitosound_port16_lsb_w) AM_RANGE(0x7e0002, 0x7e0003) AM_WRITE(taitosound_comm16_lsb_w) - AM_RANGE(0x800000, 0x8003ff) AM_WRITE(MWA16_RAM) AM_BASE(&topspeed_raster_ctrl) - AM_RANGE(0x800400, 0x80ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x800000, 0x8003ff) AM_WRITE(SMH_RAM) AM_BASE(&topspeed_raster_ctrl) + AM_RANGE(0x800400, 0x80ffff) AM_WRITE(SMH_RAM) AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(PC080SN_word_0_w) AM_RANGE(0xa20000, 0xa20003) AM_WRITE(PC080SN_yscroll_word_0_w) AM_RANGE(0xa40000, 0xa40003) AM_WRITE(PC080SN_xscroll_word_0_w) @@ -482,13 +482,13 @@ static ADDRESS_MAP_START( topspeed_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xb20000, 0xb20003) AM_WRITE(PC080SN_yscroll_word_1_w) AM_RANGE(0xb40000, 0xb40003) AM_WRITE(PC080SN_xscroll_word_1_w) AM_RANGE(0xb50000, 0xb50003) AM_WRITE(PC080SN_ctrl_word_1_w) - AM_RANGE(0xd00000, 0xd00fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xd00000, 0xd00fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0xe00000, 0xe0ffff) AM_WRITE(MWA16_RAM) AM_BASE(&topspeed_spritemap) + AM_RANGE(0xe00000, 0xe0ffff) AM_WRITE(SMH_RAM) AM_BASE(&topspeed_spritemap) ADDRESS_MAP_END static ADDRESS_MAP_START( topspeed_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(sharedram_r) AM_RANGE(0x880000, 0x880001) AM_READ(topspeed_input_bypass_r) AM_RANGE(0x880002, 0x880003) AM_READ(TC0220IOC_halfword_port_r) @@ -496,7 +496,7 @@ static ADDRESS_MAP_START( topspeed_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( topspeed_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x01ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x400000, 0X40ffff) AM_WRITE(sharedram_w) AM_BASE(&sharedram) AM_RANGE(0x880000, 0x880001) AM_WRITE(TC0220IOC_halfword_portreg_w) AM_RANGE(0x880002, 0x880003) AM_WRITE(TC0220IOC_halfword_port_w) @@ -507,16 +507,16 @@ ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK10) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0x9001, 0x9001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c index 84fc1a797a9..d742637bbbb 100644 --- a/src/mame/drivers/tourtabl.c +++ b/src/mame/drivers/tourtabl.c @@ -71,8 +71,8 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0280, 0x029F) AM_READ(r6532_0_r) AM_RANGE(0x0400, 0x047F) AM_READ(r6532_1_ram_r) AM_RANGE(0x0500, 0x051F) AM_READ(r6532_1_r) - AM_RANGE(0x0800, 0x1FFF) AM_READ(MRA8_ROM) - AM_RANGE(0xE800, 0xFFFF) AM_READ(MRA8_ROM) + AM_RANGE(0x0800, 0x1FFF) AM_READ(SMH_ROM) + AM_RANGE(0xE800, 0xFFFF) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -84,8 +84,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0280, 0x029F) AM_WRITE(r6532_0_w) AM_RANGE(0x0400, 0x047F) AM_WRITE(r6532_1_ram_w) AM_BASE(&r6532_1_ram) AM_RANGE(0x0500, 0x051F) AM_WRITE(r6532_1_w) - AM_RANGE(0x0800, 0x1FFF) AM_WRITE(MWA8_ROM) - AM_RANGE(0xE800, 0xFFFF) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0800, 0x1FFF) AM_WRITE(SMH_ROM) + AM_RANGE(0xE800, 0xFFFF) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c index 948651516f8..d00297cb623 100644 --- a/src/mame/drivers/toypop.c +++ b/src/mame/drivers/toypop.c @@ -252,30 +252,30 @@ static WRITE16_HANDLER( toypop_m68000_interrupt_disable_w ) *************************************/ static ADDRESS_MAP_START( readmem_mainCPU_liblrabl, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_RAM) /* RAM everywhere else */ + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_RAM) /* RAM everywhere else */ AM_RANGE(0x6000, 0x63ff) AM_READ(toypop_sound_sharedram_r) /* shared RAM with sound CPU */ AM_RANGE(0x6800, 0x683f) AM_READ(namcoio_r) /* custom I/O */ AM_RANGE(0x7800, 0x7800) AM_READ(watchdog_reset_r) /* not sure; this is NOT irq enable (game crashes otherwise) */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM code */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM code */ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_mainCPU_toypop, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x2fff) AM_READ(MRA8_RAM) /* RAM everywhere else */ + AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_RAM) /* RAM everywhere else */ AM_RANGE(0x6000, 0x603f) AM_READ(namcoio_r) /* custom I/O */ AM_RANGE(0x6800, 0x6bff) AM_READ(toypop_sound_sharedram_r) /* shared RAM with sound CPU */ AM_RANGE(0x7000, 0x7000) AM_READ(toypop_main_interrupt_enable_r) /* enable interrupt?? */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) /* ROM code */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM code */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mainCPU_liblrabl, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(toypop_videoram_w) AM_BASE(&toypop_videoram) /* video RAM */ - AM_RANGE(0x0800, 0x0f7f) AM_WRITE(MWA8_RAM) /* general RAM, area 1 */ - AM_RANGE(0x0f80, 0x0fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) /* sprite RAM, area 1 */ - AM_RANGE(0x1000, 0x177f) AM_WRITE(MWA8_RAM) /* general RAM, area 2 */ - AM_RANGE(0x1780, 0x17ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) /* sprite RAM, area 2 */ - AM_RANGE(0x1800, 0x1f7f) AM_WRITE(MWA8_RAM) /* general RAM, area 3 */ - AM_RANGE(0x1f80, 0x1fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_3) /* sprite RAM, area 3 */ - AM_RANGE(0x2800, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&toypop_m68000_sharedram) /* shared RAM with the 68000 CPU */ + AM_RANGE(0x0800, 0x0f7f) AM_WRITE(SMH_RAM) /* general RAM, area 1 */ + AM_RANGE(0x0f80, 0x0fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) /* sprite RAM, area 1 */ + AM_RANGE(0x1000, 0x177f) AM_WRITE(SMH_RAM) /* general RAM, area 2 */ + AM_RANGE(0x1780, 0x17ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) /* sprite RAM, area 2 */ + AM_RANGE(0x1800, 0x1f7f) AM_WRITE(SMH_RAM) /* general RAM, area 3 */ + AM_RANGE(0x1f80, 0x1fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_3) /* sprite RAM, area 3 */ + AM_RANGE(0x2800, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&toypop_m68000_sharedram) /* shared RAM with the 68000 CPU */ AM_RANGE(0x6000, 0x63ff) AM_WRITE(toypop_sound_sharedram_w) /* shared RAM with sound CPU */ AM_RANGE(0x6800, 0x683f) AM_WRITE(namcoio_w) /* custom I/O */ AM_RANGE(0x7000, 0x7000) AM_WRITE(toypop_main_interrupt_enable_w) /* enable interrupt */ @@ -285,18 +285,18 @@ static ADDRESS_MAP_START( writemem_mainCPU_liblrabl, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x9000) AM_WRITE(toypop_sound_clear_w) /* sound CPU reset */ AM_RANGE(0x9800, 0x9800) AM_WRITE(toypop_sound_assert_w) /* sound CPU reset */ AM_RANGE(0xa000, 0xa001) AM_WRITE(toypop_palettebank_w) /* background image palette */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM code */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM code */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_mainCPU_toypop, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_WRITE(toypop_videoram_w) AM_BASE(&toypop_videoram) /* video RAM */ - AM_RANGE(0x0800, 0x0f7f) AM_WRITE(MWA8_RAM) /* general RAM, area 1 */ - AM_RANGE(0x0f80, 0x0fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) /* sprite RAM, area 1 */ - AM_RANGE(0x1000, 0x177f) AM_WRITE(MWA8_RAM) /* general RAM, area 2 */ - AM_RANGE(0x1780, 0x17ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) /* sprite RAM, area 2 */ - AM_RANGE(0x1800, 0x1f7f) AM_WRITE(MWA8_RAM) /* general RAM, area 3 */ - AM_RANGE(0x1f80, 0x1fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_3) /* sprite RAM, area 3 */ - AM_RANGE(0x2800, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&toypop_m68000_sharedram) /* shared RAM with the 68000 CPU */ + AM_RANGE(0x0800, 0x0f7f) AM_WRITE(SMH_RAM) /* general RAM, area 1 */ + AM_RANGE(0x0f80, 0x0fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) /* sprite RAM, area 1 */ + AM_RANGE(0x1000, 0x177f) AM_WRITE(SMH_RAM) /* general RAM, area 2 */ + AM_RANGE(0x1780, 0x17ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) /* sprite RAM, area 2 */ + AM_RANGE(0x1800, 0x1f7f) AM_WRITE(SMH_RAM) /* general RAM, area 3 */ + AM_RANGE(0x1f80, 0x1fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_3) /* sprite RAM, area 3 */ + AM_RANGE(0x2800, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&toypop_m68000_sharedram) /* shared RAM with the 68000 CPU */ AM_RANGE(0x6000, 0x603f) AM_WRITE(namcoio_w) /* custom I/O */ AM_RANGE(0x6800, 0x6bff) AM_WRITE(toypop_sound_sharedram_w) /* shared RAM with sound CPU */ AM_RANGE(0x7000, 0x7000) AM_WRITE(toypop_main_interrupt_disable_w) /* disable interrupt */ @@ -305,7 +305,7 @@ static ADDRESS_MAP_START( writemem_mainCPU_toypop, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x9000) AM_WRITE(toypop_sound_clear_w) /* sound CPU reset */ AM_RANGE(0x9800, 0x9800) AM_WRITE(toypop_sound_assert_w) /* sound CPU reset */ AM_RANGE(0xa000, 0xa001) AM_WRITE(toypop_palettebank_w) /* background image palette */ - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) /* ROM code */ + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) /* ROM code */ ADDRESS_MAP_END @@ -317,7 +317,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_soundCPU, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_READ(toypop_sound_sharedram_r) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_soundCPU, ADDRESS_SPACE_PROGRAM, 8 ) @@ -325,7 +325,7 @@ static ADDRESS_MAP_START( writemem_soundCPU, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_WRITE(toypop_sound_interrupt_disable_w) /* ??? toypop doesn't write here */ AM_RANGE(0x4000, 0x4000) AM_WRITE(toypop_sound_interrupt_enable_acknowledge_w) AM_RANGE(0x6000, 0x6000) AM_WRITE(watchdog_reset_w) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END @@ -337,20 +337,20 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( readmem_68k, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x007fff) AM_READ(MRA16_ROM) // ROM code - AM_RANGE(0x080000, 0x0bffff) AM_READ(MRA16_RAM) // RAM + AM_RANGE(0x000000, 0x007fff) AM_READ(SMH_ROM) // ROM code + AM_RANGE(0x080000, 0x0bffff) AM_READ(SMH_RAM) // RAM AM_RANGE(0x100000, 0x100fff) AM_READ(toypop_m68000_sharedram_r) // shared RAM with the main CPU AM_RANGE(0x180000, 0x187fff) AM_READ(toypop_merged_background_r) // RAM merged with the background image - AM_RANGE(0x190000, 0x1dffff) AM_READ(MRA16_RAM) // RAM containing the background image + AM_RANGE(0x190000, 0x1dffff) AM_READ(SMH_RAM) // RAM containing the background image ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_68k, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x007fff) AM_WRITE(MWA16_ROM) /* ROM code */ - AM_RANGE(0x080000, 0x0bffff) AM_WRITE(MWA16_RAM) /* RAM */ + AM_RANGE(0x000000, 0x007fff) AM_WRITE(SMH_ROM) /* ROM code */ + AM_RANGE(0x080000, 0x0bffff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x100000, 0x100fff) AM_WRITE(toypop_m68000_sharedram_w) /* shared RAM with the main CPU */ AM_RANGE(0x180000, 0x187fff) AM_WRITE(toypop_merged_background_w) /* RAM that has to be merged with the background image */ AM_RANGE(0x18fffc, 0x18ffff) AM_WRITE(toypop_flipscreen_w) /* flip mode */ - AM_RANGE(0x190000, 0x1dffff) AM_WRITE(MWA16_RAM) AM_BASE(&toypop_bg_image) /* RAM containing the background image */ + AM_RANGE(0x190000, 0x1dffff) AM_WRITE(SMH_RAM) AM_BASE(&toypop_bg_image) /* RAM containing the background image */ AM_RANGE(0x300000, 0x300001) AM_WRITE(toypop_m68000_interrupt_enable_w) /* interrupt enable */ AM_RANGE(0x380000, 0x380001) AM_WRITE(toypop_m68000_interrupt_disable_w) /* interrupt disable */ ADDRESS_MAP_END diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c index 3f421e31f27..c259e0ffd3e 100644 --- a/src/mame/drivers/tp84.c +++ b/src/mame/drivers/tp84.c @@ -136,17 +136,17 @@ static WRITE8_HANDLER( tp84_sh_irqtrigger_w ) static ADDRESS_MAP_START( tp84_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x2800, 0x2800) AM_READWRITE(input_port_0_r, MWA8_RAM) AM_BASE(&tp84_palette_bank) + AM_RANGE(0x2800, 0x2800) AM_READWRITE(input_port_0_r, SMH_RAM) AM_BASE(&tp84_palette_bank) AM_RANGE(0x2820, 0x2820) AM_READ(input_port_1_r) AM_RANGE(0x2840, 0x2840) AM_READ(input_port_2_r) AM_RANGE(0x2860, 0x2860) AM_READ(input_port_3_r) - AM_RANGE(0x3000, 0x3000) AM_READWRITE(input_port_4_r, MWA8_RAM) - AM_RANGE(0x3004, 0x3004) AM_WRITE(MWA8_RAM) AM_BASE(&tp84_flipscreen_x) - AM_RANGE(0x3005, 0x3005) AM_WRITE(MWA8_RAM) AM_BASE(&tp84_flipscreen_y) + AM_RANGE(0x3000, 0x3000) AM_READWRITE(input_port_4_r, SMH_RAM) + AM_RANGE(0x3004, 0x3004) AM_WRITE(SMH_RAM) AM_BASE(&tp84_flipscreen_x) + AM_RANGE(0x3005, 0x3005) AM_WRITE(SMH_RAM) AM_BASE(&tp84_flipscreen_y) AM_RANGE(0x3800, 0x3800) AM_WRITE(tp84_sh_irqtrigger_w) AM_RANGE(0x3a00, 0x3a00) AM_WRITE(soundlatch_w) - AM_RANGE(0x3c00, 0x3c00) AM_WRITE(MWA8_RAM) AM_BASE(&tp84_scroll_x) - AM_RANGE(0x3e00, 0x3e00) AM_WRITE(MWA8_RAM) AM_BASE(&tp84_scroll_y) + AM_RANGE(0x3c00, 0x3c00) AM_WRITE(SMH_RAM) AM_BASE(&tp84_scroll_x) + AM_RANGE(0x3e00, 0x3e00) AM_WRITE(SMH_RAM) AM_BASE(&tp84_scroll_y) AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE(&tp84_bg_videoram) AM_RANGE(0x4400, 0x47ff) AM_RAM AM_BASE(&tp84_fg_videoram) AM_RANGE(0x4800, 0x4bff) AM_RAM AM_BASE(&tp84_bg_colorram) @@ -162,17 +162,17 @@ static ADDRESS_MAP_START( tp84b_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0c00, 0x0fff) AM_RAM AM_BASE(&tp84_fg_colorram) AM_RANGE(0x1000, 0x17ff) AM_RAM AM_SHARE(1) AM_RANGE(0x1800, 0x1800) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x1a00, 0x1a00) AM_READWRITE(input_port_0_r, MWA8_RAM) AM_BASE(&tp84_palette_bank) + AM_RANGE(0x1a00, 0x1a00) AM_READWRITE(input_port_0_r, SMH_RAM) AM_BASE(&tp84_palette_bank) AM_RANGE(0x1a20, 0x1a20) AM_READ(input_port_1_r) AM_RANGE(0x1a40, 0x1a40) AM_READ(input_port_2_r) AM_RANGE(0x1a60, 0x1a60) AM_READ(input_port_3_r) - AM_RANGE(0x1c00, 0x1c00) AM_READWRITE(input_port_4_r, MWA8_NOP) - AM_RANGE(0x1c04, 0x1c04) AM_WRITE(MWA8_RAM) AM_BASE(&tp84_flipscreen_x) - AM_RANGE(0x1c05, 0x1c05) AM_WRITE(MWA8_RAM) AM_BASE(&tp84_flipscreen_y) + AM_RANGE(0x1c00, 0x1c00) AM_READWRITE(input_port_4_r, SMH_NOP) + AM_RANGE(0x1c04, 0x1c04) AM_WRITE(SMH_RAM) AM_BASE(&tp84_flipscreen_x) + AM_RANGE(0x1c05, 0x1c05) AM_WRITE(SMH_RAM) AM_BASE(&tp84_flipscreen_y) AM_RANGE(0x1e00, 0x1e00) AM_WRITE(tp84_sh_irqtrigger_w) AM_RANGE(0x1e80, 0x1e80) AM_WRITE(soundlatch_w) - AM_RANGE(0x1f00, 0x1f00) AM_WRITE(MWA8_RAM) AM_BASE(&tp84_scroll_x) - AM_RANGE(0x1f80, 0x1f80) AM_WRITE(MWA8_RAM) AM_BASE(&tp84_scroll_y) + AM_RANGE(0x1f00, 0x1f00) AM_WRITE(SMH_RAM) AM_BASE(&tp84_scroll_x) + AM_RANGE(0x1f80, 0x1f80) AM_WRITE(SMH_RAM) AM_BASE(&tp84_scroll_y) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -182,7 +182,7 @@ static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x2000) AM_READ(tp84_scanline_r) /* beam position */ AM_RANGE(0x4000, 0x4000) AM_WRITE(interrupt_enable_w) AM_RANGE(0x6000, 0x679f) AM_RAM - AM_RANGE(0x67a0, 0x67ff) AM_READWRITE(MRA8_RAM, tp84_spriteram_w) AM_BASE(&tp84_spriteram) + AM_RANGE(0x67a0, 0x67ff) AM_READWRITE(SMH_RAM, tp84_spriteram_w) AM_BASE(&tp84_spriteram) AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE(1) AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -194,7 +194,7 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0x8000) AM_READ(tp84_sh_timer_r) AM_RANGE(0xa000, 0xa1ff) AM_WRITE(tp84_filter_w) - AM_RANGE(0xc000, 0xc000) AM_WRITE(MWA8_NOP) + AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_NOP) AM_RANGE(0xc001, 0xc001) AM_WRITE(SN76496_0_w) AM_RANGE(0xc003, 0xc003) AM_WRITE(SN76496_1_w) AM_RANGE(0xc004, 0xc004) AM_WRITE(SN76496_2_w) diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index 019eaedc497..e331fd8e1ed 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -182,11 +182,11 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1281, 0x1281) AM_READ(input_port_1_r) /* P1 IO */ AM_RANGE(0x1282, 0x1282) AM_READ(input_port_2_r) /* P2 IO */ AM_RANGE(0x1283, 0x1283) AM_READ(input_port_3_r) /* DIP 1 */ - AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) - AM_RANGE(0x2800, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_RAM) + AM_RANGE(0x2800, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) /* for atlantol (everything not mapped is read from rom) */ + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) /* for atlantol (everything not mapped is read from rom) */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -197,33 +197,33 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1083, 0x1084) AM_WRITE(coin_w) AM_RANGE(0x1087, 0x1087) AM_WRITE(interrupt_enable_w) AM_RANGE(0x1100, 0x1100) AM_WRITE(soundlatch_w) - AM_RANGE(0x1800, 0x183f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x1840, 0x185f) AM_WRITE(MWA8_RAM) AM_BASE(&trackfld_scroll) - AM_RANGE(0x1860, 0x1bff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1c00, 0x1c3f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x1c40, 0x1c5f) AM_WRITE(MWA8_RAM) AM_BASE(&trackfld_scroll2) - AM_RANGE(0x1c60, 0x1fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x2800, 0x2bff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x2c00, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&nvram) AM_SIZE(&nvram_size) + AM_RANGE(0x1800, 0x183f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x1840, 0x185f) AM_WRITE(SMH_RAM) AM_BASE(&trackfld_scroll) + AM_RANGE(0x1860, 0x1bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1c00, 0x1c3f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x1c40, 0x1c5f) AM_WRITE(SMH_RAM) AM_BASE(&trackfld_scroll2) + AM_RANGE(0x1c60, 0x1fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x2800, 0x2bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x2c00, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&nvram) AM_SIZE(&nvram_size) AM_RANGE(0x3000, 0x37ff) AM_WRITE(trackfld_videoram_w) AM_BASE(&videoram) AM_RANGE(0x3800, 0x3fff) AM_WRITE(trackfld_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( reaktor_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* all usual addresses +0x8000 */ AM_RANGE(0x9200, 0x9200) AM_READ(input_port_4_r) /* DIP 2 */ AM_RANGE(0x9280, 0x9280) AM_READ(input_port_0_r) /* IO Coin */ AM_RANGE(0x9281, 0x9281) AM_READ(input_port_1_r) /* P1 IO */ AM_RANGE(0x9282, 0x9282) AM_READ(input_port_2_r) /* P2 IO */ AM_RANGE(0x9283, 0x9283) AM_READ(input_port_3_r) /* DIP 1 */ - AM_RANGE(0x9800, 0x9fff) AM_READ(MRA8_RAM) - AM_RANGE(0xa800, 0xbfff) AM_READ(MRA8_RAM) + AM_RANGE(0x9800, 0x9fff) AM_READ(SMH_RAM) + AM_RANGE(0xa800, 0xbfff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( reaktor_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* all usual addresses +0x8000 */ AM_RANGE(0x9000, 0x9000) AM_WRITE(watchdog_reset_w) AM_RANGE(0x9080, 0x9080) AM_WRITE(trackfld_flipscreen_w) @@ -231,14 +231,14 @@ static ADDRESS_MAP_START( reaktor_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9083, 0x9084) AM_WRITE(coin_w) AM_RANGE(0x9087, 0x9087) AM_WRITE(interrupt_enable_w) AM_RANGE(0x9100, 0x9100) AM_WRITE(soundlatch_w) - AM_RANGE(0x9800, 0x983f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x9840, 0x985f) AM_WRITE(MWA8_RAM) AM_BASE(&trackfld_scroll) - AM_RANGE(0x9860, 0x9bff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x9c00, 0x9c3f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x9c40, 0x9c5f) AM_WRITE(MWA8_RAM) AM_BASE(&trackfld_scroll2) - AM_RANGE(0x9c60, 0x9fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xa800, 0xabff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xac00, 0xafff) AM_WRITE(MWA8_RAM) AM_BASE(&nvram) AM_SIZE(&nvram_size) + AM_RANGE(0x9800, 0x983f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x9840, 0x985f) AM_WRITE(SMH_RAM) AM_BASE(&trackfld_scroll) + AM_RANGE(0x9860, 0x9bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x9c00, 0x9c3f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x9c40, 0x9c5f) AM_WRITE(SMH_RAM) AM_BASE(&trackfld_scroll2) + AM_RANGE(0x9c60, 0x9fff) AM_WRITE(SMH_RAM) + AM_RANGE(0xa800, 0xabff) AM_WRITE(SMH_RAM) + AM_RANGE(0xac00, 0xafff) AM_WRITE(SMH_RAM) AM_BASE(&nvram) AM_SIZE(&nvram_size) AM_RANGE(0xb000, 0xb7ff) AM_WRITE(trackfld_videoram_w) AM_BASE(&videoram) AM_RANGE(0xb800, 0xbfff) AM_WRITE(trackfld_colorram_w) AM_BASE(&colorram) ADDRESS_MAP_END @@ -246,15 +246,15 @@ ADDRESS_MAP_END /* Reaktor reads / writes some I/O ports, no idea what they're connected to, if anything */ static ADDRESS_MAP_START( reaktor_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_READ(MRA8_NOP) + AM_RANGE(0x01, 0x01) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( reaktor_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) - AM_RANGE(0x01, 0x01) AM_WRITE(MWA8_NOP) - AM_RANGE(0x02, 0x02) AM_WRITE(MWA8_NOP) - AM_RANGE(0x03, 0x03) AM_WRITE(MWA8_NOP) + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) + AM_RANGE(0x01, 0x01) AM_WRITE(SMH_NOP) + AM_RANGE(0x02, 0x02) AM_WRITE(SMH_NOP) + AM_RANGE(0x03, 0x03) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( mastkin_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -263,9 +263,9 @@ static ADDRESS_MAP_START( mastkin_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1281, 0x1281) AM_READ(input_port_1_r) /* P1 IO */ // AM_RANGE(0x1282, 0x1282) AM_READ(input_port_2_r) /* unused */ AM_RANGE(0x1283, 0x1283) AM_READ(input_port_3_r) /* DIP 1 */ - AM_RANGE(0x1800, 0x1fff) AM_READ(MRA8_RAM) - AM_RANGE(0x2800, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x6000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_RAM) + AM_RANGE(0x2800, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( mastkin_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -275,17 +275,17 @@ static ADDRESS_MAP_START( mastkin_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1083, 0x1084) AM_WRITE(coin_w) AM_RANGE(0x1087, 0x1087) AM_WRITE(interrupt_enable_w) AM_RANGE(0x1100, 0x1100) AM_WRITE(soundlatch_w) - AM_RANGE(0x1800, 0x183f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) - AM_RANGE(0x1840, 0x185f) AM_WRITE(MWA8_RAM) AM_BASE(&trackfld_scroll) - AM_RANGE(0x1860, 0x1bff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1c00, 0x1c3f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x1c40, 0x1c5f) AM_WRITE(MWA8_RAM) AM_BASE(&trackfld_scroll2) - AM_RANGE(0x1c60, 0x1fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x2800, 0x2bff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x2c00, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&nvram) AM_SIZE(&nvram_size) + AM_RANGE(0x1800, 0x183f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) + AM_RANGE(0x1840, 0x185f) AM_WRITE(SMH_RAM) AM_BASE(&trackfld_scroll) + AM_RANGE(0x1860, 0x1bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1c00, 0x1c3f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x1c40, 0x1c5f) AM_WRITE(SMH_RAM) AM_BASE(&trackfld_scroll2) + AM_RANGE(0x1c60, 0x1fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x2800, 0x2bff) AM_WRITE(SMH_RAM) + AM_RANGE(0x2c00, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&nvram) AM_SIZE(&nvram_size) AM_RANGE(0x3000, 0x37ff) AM_WRITE(trackfld_videoram_w) AM_BASE(&videoram) AM_RANGE(0x3800, 0x3fff) AM_WRITE(trackfld_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x6000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( wizzquiz_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -309,61 +309,61 @@ static ADDRESS_MAP_START( wizzquiz_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1c60, 0x1fff) AM_RAM AM_RANGE(0x2800, 0x2bff) AM_RAM AM_RANGE(0x2c00, 0x2fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_RAM) AM_WRITE(trackfld_videoram_w) AM_BASE(&videoram) - AM_RANGE(0x3800, 0x3fff) AM_READ(MRA8_RAM) AM_WRITE(trackfld_colorram_w) AM_BASE(&colorram) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM) AM_WRITE(trackfld_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x3800, 0x3fff) AM_READ(SMH_RAM) AM_WRITE(trackfld_colorram_w) AM_BASE(&colorram) AM_RANGE(0xc000, 0xc000) AM_WRITE(questions_bank_w) - AM_RANGE(0x6000, 0xdfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x6000, 0xdfff) AM_READ(SMH_BANK1) AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0x8000) AM_READ(trackfld_sh_timer_r) - AM_RANGE(0xc000, 0xc000) AM_READ(MRA8_NOP) // reaktor reads here - AM_RANGE(0xe001, 0xe001) AM_READ(MRA8_NOP) // reaktor reads here + AM_RANGE(0xc000, 0xc000) AM_READ(SMH_NOP) // reaktor reads here + AM_RANGE(0xe001, 0xe001) AM_READ(SMH_NOP) // reaktor reads here AM_RANGE(0xe002, 0xe002) AM_READ(trackfld_speech_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(SN76496_0_w) /* Loads the snd command into the snd latch */ - AM_RANGE(0xc000, 0xc000) AM_WRITE(MWA8_NOP) /* This address triggers the SN chip to read the data port. */ + AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_NOP) /* This address triggers the SN chip to read the data port. */ AM_RANGE(0xe000, 0xe000) AM_WRITE(DAC_0_data_w) /* There are lots more addresses which are used for setting a two bit volume controls for speech and music Currently these are un-supported by Mame */ - AM_RANGE(0xe001, 0xe001) AM_WRITE(MWA8_NOP) /* watch dog ? */ + AM_RANGE(0xe001, 0xe001) AM_WRITE(SMH_NOP) /* watch dog ? */ AM_RANGE(0xe004, 0xe004) AM_WRITE(VLM5030_data_w) AM_RANGE(0xe000, 0xefff) AM_WRITE(trackfld_sound_w) /* e003 speech control */ ADDRESS_MAP_END static ADDRESS_MAP_START( hyprolyb_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) AM_RANGE(0x8000, 0x8000) AM_READ(trackfld_sh_timer_r) AM_RANGE(0xe002, 0xe002) AM_READ(hyprolyb_speech_r) ADDRESS_MAP_END static ADDRESS_MAP_START( hyprolyb_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(SN76496_0_w) /* Loads the snd command into the snd latch */ - AM_RANGE(0xc000, 0xc000) AM_WRITE(MWA8_NOP) /* This address triggers the SN chip to read the data port. */ + AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_NOP) /* This address triggers the SN chip to read the data port. */ AM_RANGE(0xe000, 0xe000) AM_WRITE(DAC_0_data_w) /* There are lots more addresses which are used for setting a two bit volume controls for speech and music Currently these are un-supported by Mame */ - AM_RANGE(0xe001, 0xe001) AM_WRITE(MWA8_NOP) /* watch dog ? */ + AM_RANGE(0xe001, 0xe001) AM_WRITE(SMH_NOP) /* watch dog ? */ AM_RANGE(0xe004, 0xe004) AM_WRITE(hyprolyb_ADPCM_data_w) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_NOP) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -1329,7 +1329,7 @@ static DRIVER_INIT( atlantol ) for (A = 0x6000;A < size;A++) decrypt[A] = konami1_decodebyte(rom[A],A); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1000, 0x1000, 0, 0, MWA8_NOP ); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x1000, 0x1000, 0, 0, SMH_NOP ); } static DRIVER_INIT( mastkin ) diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c index 317829e521b..8c427dc8e37 100644 --- a/src/mame/drivers/travrusa.c +++ b/src/mame/drivers/travrusa.c @@ -67,10 +67,10 @@ VIDEO_UPDATE( shtrider ); static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x8fff) AM_READWRITE(MRA8_RAM, travrusa_videoram_w) AM_BASE(&travrusa_videoram) + AM_RANGE(0x8000, 0x8fff) AM_READWRITE(SMH_RAM, travrusa_videoram_w) AM_BASE(&travrusa_videoram) AM_RANGE(0x9000, 0x9000) AM_WRITE(travrusa_scroll_x_low_w) AM_RANGE(0xa000, 0xa000) AM_WRITE(travrusa_scroll_x_high_w) - AM_RANGE(0xc800, 0xc9ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc800, 0xc9ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xd000) AM_WRITE(irem_sound_cmd_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(travrusa_flipscreen_w) /* + coin counters - not written by shtrider */ AM_RANGE(0xd000, 0xd000) AM_READ(input_port_0_r) /* IN0 */ diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c index cb2a10413f7..54a353370cf 100644 --- a/src/mame/drivers/triplhnt.c +++ b/src/mame/drivers/triplhnt.c @@ -133,7 +133,7 @@ static READ8_HANDLER( triplhnt_da_latch_r ) static ADDRESS_MAP_START( triplhnt_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_READ(MRA8_RAM) AM_MIRROR(0x300) + AM_RANGE(0x0000, 0x00ff) AM_READ(SMH_RAM) AM_MIRROR(0x300) AM_RANGE(0x0c00, 0x0c00) AM_READ(input_port_0_r) AM_RANGE(0x0c08, 0x0c08) AM_READ(input_port_1_r) AM_RANGE(0x0c09, 0x0c09) AM_READ(input_port_2_r) @@ -144,20 +144,20 @@ static ADDRESS_MAP_START( triplhnt_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0c30, 0x0c3f) AM_READ(triplhnt_misc_r) AM_RANGE(0x0c40, 0x0c40) AM_READ(input_port_5_r) AM_RANGE(0x0c48, 0x0c48) AM_READ(input_port_6_r) - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_ROM) /* program */ - AM_RANGE(0xf800, 0xffff) AM_READ(MRA8_ROM) /* program mirror */ + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM) /* program */ + AM_RANGE(0xf800, 0xffff) AM_READ(SMH_ROM) /* program mirror */ ADDRESS_MAP_END static ADDRESS_MAP_START( triplhnt_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_WRITE(MWA8_RAM) AM_MIRROR(0x300) - AM_RANGE(0x0400, 0x04ff) AM_WRITE(MWA8_RAM) AM_BASE(&triplhnt_playfield_ram) - AM_RANGE(0x0800, 0x080f) AM_WRITE(MWA8_RAM) AM_BASE(&triplhnt_vpos_ram) - AM_RANGE(0x0810, 0x081f) AM_WRITE(MWA8_RAM) AM_BASE(&triplhnt_hpos_ram) - AM_RANGE(0x0820, 0x082f) AM_WRITE(MWA8_RAM) AM_BASE(&triplhnt_orga_ram) - AM_RANGE(0x0830, 0x083f) AM_WRITE(MWA8_RAM) AM_BASE(&triplhnt_code_ram) + AM_RANGE(0x0000, 0x00ff) AM_WRITE(SMH_RAM) AM_MIRROR(0x300) + AM_RANGE(0x0400, 0x04ff) AM_WRITE(SMH_RAM) AM_BASE(&triplhnt_playfield_ram) + AM_RANGE(0x0800, 0x080f) AM_WRITE(SMH_RAM) AM_BASE(&triplhnt_vpos_ram) + AM_RANGE(0x0810, 0x081f) AM_WRITE(SMH_RAM) AM_BASE(&triplhnt_hpos_ram) + AM_RANGE(0x0820, 0x082f) AM_WRITE(SMH_RAM) AM_BASE(&triplhnt_orga_ram) + AM_RANGE(0x0830, 0x083f) AM_WRITE(SMH_RAM) AM_BASE(&triplhnt_code_ram) AM_RANGE(0x0c30, 0x0c3f) AM_WRITE(triplhnt_misc_w) - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_ROM) /* program */ - AM_RANGE(0xf800, 0xffff) AM_WRITE(MWA8_ROM) /* program mirror */ + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_ROM) /* program */ + AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_ROM) /* program mirror */ ADDRESS_MAP_END diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c index 30f922bc900..ccb9eefb347 100644 --- a/src/mame/drivers/truco.c +++ b/src/mame/drivers/truco.c @@ -30,24 +30,24 @@ PALETTE_INIT( truco ); static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_READ(MRA8_RAM) /* general purpose ram */ - AM_RANGE(0x1800, 0x7bff) AM_READ(MRA8_RAM) /* video ram */ - AM_RANGE(0x7c00, 0x7fff) AM_READ(MRA8_RAM) /* battery backed ram */ + AM_RANGE(0x0000, 0x17ff) AM_READ(SMH_RAM) /* general purpose ram */ + AM_RANGE(0x1800, 0x7bff) AM_READ(SMH_RAM) /* video ram */ + AM_RANGE(0x7c00, 0x7fff) AM_READ(SMH_RAM) /* battery backed ram */ AM_RANGE(0x8000, 0x8000) AM_READ(input_port_0_r) /* controls (and irq ack?) */ - AM_RANGE(0x8001, 0x8001) AM_READ(MRA8_NOP) /* unknown */ + AM_RANGE(0x8001, 0x8001) AM_READ(SMH_NOP) /* unknown */ AM_RANGE(0x8002, 0x8002) AM_READ(input_port_1_r) /* dipswitches */ - AM_RANGE(0x8003, 0x8007) AM_READ(MRA8_NOP) /* unknown */ - AM_RANGE(0x8008, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8003, 0x8007) AM_READ(SMH_NOP) /* unknown */ + AM_RANGE(0x8008, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_WRITE(MWA8_RAM) /* general purpose ram */ - AM_RANGE(0x1800, 0x7bff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) /* video ram */ - AM_RANGE(0x7c00, 0x7fff) AM_WRITE(MWA8_RAM) AM_BASE(&battery_ram) /* battery backed ram */ - AM_RANGE(0x8000, 0x8001) AM_WRITE(MWA8_NOP) /* unknown */ + AM_RANGE(0x0000, 0x17ff) AM_WRITE(SMH_RAM) /* general purpose ram */ + AM_RANGE(0x1800, 0x7bff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) /* video ram */ + AM_RANGE(0x7c00, 0x7fff) AM_WRITE(SMH_RAM) AM_BASE(&battery_ram) /* battery backed ram */ + AM_RANGE(0x8000, 0x8001) AM_WRITE(SMH_NOP) /* unknown */ AM_RANGE(0x8002, 0x8002) AM_WRITE(DAC_0_data_w) - AM_RANGE(0x8003, 0x8007) AM_WRITE(MWA8_NOP) /* unknown */ - AM_RANGE(0x8008, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8003, 0x8007) AM_WRITE(SMH_NOP) /* unknown */ + AM_RANGE(0x8008, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static INPUT_PORTS_START( truco ) diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c index e889cf378d3..a5381aa5378 100644 --- a/src/mame/drivers/trucocl.c +++ b/src/mame/drivers/trucocl.c @@ -86,23 +86,23 @@ static WRITE8_HANDLER( audio_dac_w) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x43ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4400, 0x47ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4c00, 0x4fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) + AM_RANGE(0x4400, 0x47ff) AM_READ(SMH_RAM) + AM_RANGE(0x4c00, 0x4fff) AM_READ(SMH_RAM) AM_RANGE(0x5000, 0x503f) AM_READ(input_port_0_r) /* IN0 */ - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x43ff) AM_WRITE(trucocl_videoram_w) AM_BASE(&videoram) AM_RANGE(0x4400, 0x47ff) AM_WRITE(trucocl_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x4c00, 0x4fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x4c00, 0x4fff) AM_WRITE(SMH_RAM) AM_RANGE(0x5000, 0x5000) AM_WRITE(irq_enable_w) AM_RANGE(0x5080, 0x5080) AM_WRITE(audio_dac_w) AM_RANGE(0x50c0, 0x50c0) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static INPUT_PORTS_START( trucocl ) diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index 31a9b1743b4..3f9e8ad02cd 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -199,8 +199,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(MRA8_BANK1) - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_BANK2) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_BANK1) + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_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 AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_le_w) AM_BASE(&paletteram) diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c index f1566ae75ca..b828796c8bc 100644 --- a/src/mame/drivers/trvquest.c +++ b/src/mame/drivers/trvquest.c @@ -69,7 +69,7 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3841, 0x3841) AM_WRITE(AY8910_write_port_1_w) AM_RANGE(0x3850, 0x3850) AM_READNOP //watchdog_reset_r ? AM_RANGE(0x8000, 0x9fff) AM_READ(trvquest_question_r) - AM_RANGE(0xa000, 0xa000) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(gameplan_state, trvquest_question) + AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(gameplan_state, trvquest_question) AM_RANGE(0xa000, 0xa000) AM_READNOP // bogus read from the game code when reads question roms AM_RANGE(0xb000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c index ea918f339db..0fc09475efe 100644 --- a/src/mame/drivers/tryout.c +++ b/src/mame/drivers/tryout.c @@ -68,7 +68,7 @@ static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe301, 0xe301) AM_WRITE(tryout_flipscreen_w) AM_RANGE(0xe302, 0xe302) AM_WRITE(tryout_bankswitch_w) AM_RANGE(0xe401, 0xe401) AM_WRITE(tryout_vram_bankswitch_w) - AM_RANGE(0xe402, 0xe404) AM_WRITE(MWA8_RAM) AM_BASE(&tryout_gfx_control) + AM_RANGE(0xe402, 0xe404) AM_WRITE(SMH_RAM) AM_BASE(&tryout_gfx_control) AM_RANGE(0xe414, 0xe414) AM_WRITE(tryout_sound_w) AM_RANGE(0xe417, 0xe417) AM_WRITE(tryout_nmi_ack_w) AM_RANGE(0xfff0, 0xffff) AM_ROM AM_REGION(REGION_CPU1, 0xbff0) /* resect vectors */ diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c index 66695d6977a..438089027e2 100644 --- a/src/mame/drivers/tsamurai.c +++ b/src/mame/drivers/tsamurai.c @@ -131,8 +131,8 @@ static WRITE8_HANDLER( tsamurai_coin_counter_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) /* protection? - there are writes as well...*/ AM_RANGE(0xd803, 0xd803) AM_READ(unknown_d803_r) @@ -140,10 +140,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd900, 0xd900) AM_READ(unknown_d900_r) AM_RANGE(0xd938, 0xd938) AM_READ(unknown_d938_r) - AM_RANGE(0xe000, 0xe3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe400, 0xe7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe800, 0xefff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf3ff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xe3ff) AM_READ(SMH_RAM) + AM_RANGE(0xe400, 0xe7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe800, 0xefff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf3ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_0_r) AM_RANGE(0xf801, 0xf801) AM_READ(input_port_1_r) @@ -153,16 +153,16 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe3ff) AM_WRITE(tsamurai_fg_videoram_w) AM_BASE(&videoram) AM_RANGE(0xe400, 0xe43f) AM_WRITE(tsamurai_fg_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe440, 0xe7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe440, 0xe7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe800, 0xefff) AM_WRITE(tsamurai_bg_videoram_w) AM_BASE(&tsamurai_videoram) - AM_RANGE(0xf000, 0xf3ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) + AM_RANGE(0xf000, 0xf3ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) - AM_RANGE(0xf400, 0xf400) AM_WRITE(MWA8_NOP) + AM_RANGE(0xf400, 0xf400) AM_WRITE(SMH_NOP) AM_RANGE(0xf401, 0xf401) AM_WRITE(sound_command1_w) AM_RANGE(0xf402, 0xf402) AM_WRITE(sound_command2_w) @@ -177,8 +177,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_m660, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) /* protection? - there are writes as well...*/ AM_RANGE(0xd803, 0xd803) AM_READ(unknown_d803_m660_r) @@ -186,10 +186,10 @@ static ADDRESS_MAP_START( readmem_m660, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd900, 0xd900) AM_READ(unknown_d900_r) AM_RANGE(0xd938, 0xd938) AM_READ(unknown_d938_r) - AM_RANGE(0xe000, 0xe3ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe400, 0xe7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe800, 0xefff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf3ff) AM_READ(MRA8_RAM) + AM_RANGE(0xe000, 0xe3ff) AM_READ(SMH_RAM) + AM_RANGE(0xe400, 0xe7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe800, 0xefff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf3ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_0_r) AM_RANGE(0xf801, 0xf801) AM_READ(input_port_1_r) @@ -199,16 +199,16 @@ static ADDRESS_MAP_START( readmem_m660, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_m660, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe3ff) AM_WRITE(tsamurai_fg_videoram_w) AM_BASE(&videoram) AM_RANGE(0xe400, 0xe43f) AM_WRITE(tsamurai_fg_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xe440, 0xe7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe440, 0xe7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xe800, 0xefff) AM_WRITE(tsamurai_bg_videoram_w) AM_BASE(&tsamurai_videoram) - AM_RANGE(0xf000, 0xf3ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) + AM_RANGE(0xf000, 0xf3ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) - AM_RANGE(0xf400, 0xf400) AM_WRITE(MWA8_NOP)/* This is always written with F401, F402 & F403 data */ + AM_RANGE(0xf400, 0xf400) AM_WRITE(SMH_NOP)/* This is always written with F401, F402 & F403 data */ AM_RANGE(0xf401, 0xf401) AM_WRITE(sound_command3_w) AM_RANGE(0xf402, 0xf402) AM_WRITE(sound_command2_w) AM_RANGE(0xf403, 0xf403) AM_WRITE(sound_command1_w) @@ -237,9 +237,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_writeport_m660, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0x01, 0x01) AM_WRITE(MWA8_NOP) /* Written continuously. Increments with level. */ - AM_RANGE(0x02, 0x02) AM_WRITE(MWA8_NOP) /* Always follows above with 0x01 data */ + AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0x01, 0x01) AM_WRITE(SMH_NOP) /* Written continuously. Increments with level. */ + AM_RANGE(0x02, 0x02) AM_WRITE(SMH_NOP) /* Always follows above with 0x01 data */ ADDRESS_MAP_END static READ8_HANDLER( sound_command1_r ) @@ -267,61 +267,61 @@ static READ8_HANDLER( sound_command3_r ){ /*******************************************************************************/ static ADDRESS_MAP_START( readmem_sound1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x6000, 0x6000) AM_READ(sound_command1_r) - AM_RANGE(0x7f00, 0x7fff) AM_READ(MRA8_RAM) + AM_RANGE(0x7f00, 0x7fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6001, 0x6001) AM_WRITE(MWA8_NOP) /* ? - probably clear IRQ */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6001, 0x6001) AM_WRITE(SMH_NOP) /* ? - probably clear IRQ */ AM_RANGE(0x6002, 0x6002) AM_WRITE(sound_out1_w) - AM_RANGE(0x7f00, 0x7fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x7f00, 0x7fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /*******************************************************************************/ static ADDRESS_MAP_START( readmem_sound2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x6000, 0x6000) AM_READ(sound_command2_r) - AM_RANGE(0x7f00, 0x7fff) AM_READ(MRA8_RAM) + AM_RANGE(0x7f00, 0x7fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6001, 0x6001) AM_WRITE(MWA8_NOP) /* ? - probably clear IRQ */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6001, 0x6001) AM_WRITE(SMH_NOP) /* ? - probably clear IRQ */ AM_RANGE(0x6002, 0x6002) AM_WRITE(sound_out2_w) - AM_RANGE(0x7f00, 0x7fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x7f00, 0x7fff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /*******************************************************************************/ static ADDRESS_MAP_START( readmem_sound1_m660, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_READ(sound_command1_r) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound1_m660, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc001, 0xc001) AM_WRITE(MWA8_NOP) /* ? - probably clear IRQ */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc001, 0xc001) AM_WRITE(SMH_NOP) /* ? - probably clear IRQ */ AM_RANGE(0xc002, 0xc002) AM_WRITE(sound_out1_w) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /*******************************************************************************/ static ADDRESS_MAP_START( readmem_sound2_m660, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_READ(sound_command2_r) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound2_m660, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc001, 0xc001) AM_WRITE(MWA8_NOP) /* ? - probably clear IRQ */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc001, 0xc001) AM_WRITE(SMH_NOP) /* ? - probably clear IRQ */ AM_RANGE(0xc002, 0xc002) AM_WRITE(sound_out2_w) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /*******************************************************************************/ @@ -337,17 +337,17 @@ static ADDRESS_MAP_START( writeport_sound3_m660, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound3_m660, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_READ(sound_command3_r) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) - AM_RANGE(0xfffc, 0xffff) AM_READ(MRA8_RAM) /* CPU reads here - music data */ + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) + AM_RANGE(0xfffc, 0xffff) AM_READ(SMH_RAM) /* CPU reads here - music data */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound3_m660, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc001, 0xc001) AM_WRITE(MWA8_NOP) /* ? - probably clear IRQ */ - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xfffc, 0xffff) AM_WRITE(MWA8_RAM) /* CPU writes here - music data */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc001, 0xc001) AM_WRITE(SMH_NOP) /* ? - probably clear IRQ */ + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xfffc, 0xffff) AM_WRITE(SMH_RAM) /* CPU writes here - music data */ ADDRESS_MAP_END /*******************************************************************************/ @@ -389,48 +389,48 @@ static WRITE8_HANDLER( vsgongf_sound_command_w ){ } static ADDRESS_MAP_START( readmem_vsgongf, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xa003, 0xa003) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xa003, 0xa003) AM_READ(SMH_RAM) AM_RANGE(0xa006, 0xa006) AM_READ(vsgongf_a006_r) /* protection */ AM_RANGE(0xa100, 0xa100) AM_READ(vsgongf_a100_r) /* protection */ - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) /* work ram */ - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) /* work ram */ + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_0_r) /* joy1 */ AM_RANGE(0xf801, 0xf801) AM_READ(input_port_1_r) /* joy2 */ AM_RANGE(0xf802, 0xf802) AM_READ(input_port_2_r) /* coin */ AM_RANGE(0xf804, 0xf804) AM_READ(input_port_3_r) /* dsw1 */ AM_RANGE(0xf805, 0xf805) AM_READ(input_port_4_r) /* dsw2 */ - AM_RANGE(0xfc00, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xfc00, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_vsgongf, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) /* work ram */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) /* work ram */ AM_RANGE(0xe000, 0xe3ff) AM_WRITE(tsamurai_fg_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xe400, 0xe43f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) - AM_RANGE(0xe440, 0xe47b) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe400, 0xe43f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) + AM_RANGE(0xe440, 0xe47b) AM_WRITE(SMH_RAM) AM_RANGE(0xe800, 0xe800) AM_WRITE(vsgongf_sound_command_w) - AM_RANGE(0xec00, 0xec06) AM_WRITE(MWA8_RAM) + AM_RANGE(0xec00, 0xec06) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(vsgongf_color_w) - AM_RANGE(0xf400, 0xf400) AM_WRITE(MWA8_RAM) /* vreg? always 0 */ - AM_RANGE(0xf800, 0xf800) AM_WRITE(MWA8_RAM) - AM_RANGE(0xf801, 0xf801) AM_WRITE(MWA8_RAM) /* vreg? always 0 */ - AM_RANGE(0xf803, 0xf803) AM_WRITE(MWA8_RAM) /* vreg? always 0 */ - AM_RANGE(0xfc00, 0xfc00) AM_WRITE(MWA8_RAM) /* vreg? always 0 */ + AM_RANGE(0xf400, 0xf400) AM_WRITE(SMH_RAM) /* vreg? always 0 */ + AM_RANGE(0xf800, 0xf800) AM_WRITE(SMH_RAM) + AM_RANGE(0xf801, 0xf801) AM_WRITE(SMH_RAM) /* vreg? always 0 */ + AM_RANGE(0xf803, 0xf803) AM_WRITE(SMH_RAM) /* vreg? always 0 */ + AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_RAM) /* vreg? always 0 */ AM_RANGE(0xfc01, 0xfc01) AM_WRITE(nmi_enable_w) AM_RANGE(0xfc02, 0xfc03) AM_WRITE(tsamurai_coin_counter_w) AM_RANGE(0xfc04, 0xfc04) AM_WRITE(tsamurai_textbank1_w) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound_vsgongf, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x63ff) AM_READ(MRA8_RAM) /* work RAM */ + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x63ff) AM_READ(SMH_RAM) /* work RAM */ AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound_vsgongf, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x6000, 0x63ff) AM_WRITE(MWA8_RAM) /* work RAM */ + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x6000, 0x63ff) AM_WRITE(SMH_RAM) /* work RAM */ AM_RANGE(0x8000, 0x8000) AM_WRITE(vsgongf_sound_nmi_enable_w) /* NMI enable */ AM_RANGE(0xa000, 0xa000) AM_WRITE(sound_out1_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c index 97ebe902cb0..53dfedc2c3d 100644 --- a/src/mame/drivers/ttchamp.c +++ b/src/mame/drivers/ttchamp.c @@ -123,12 +123,12 @@ 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(MRA16_BANK1) // ? - AM_RANGE(0x80000, 0xfffff) AM_READ(MRA16_BANK2) // ? + AM_RANGE(0x20000, 0x7ffff) AM_READ(SMH_BANK1) // ? + AM_RANGE(0x80000, 0xfffff) AM_READ(SMH_BANK2) // ? ADDRESS_MAP_END static ADDRESS_MAP_START( ttchamp_io, ADDRESS_SPACE_IO, 16 ) - AM_RANGE(0x0000, 0x0001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x0000, 0x0001) AM_WRITE(SMH_NOP) AM_RANGE(0x0002, 0x0003) AM_READ(input_port_0_word_r) AM_RANGE(0x0004, 0x0005) AM_READ(input_port_1_word_r) @@ -140,11 +140,11 @@ static ADDRESS_MAP_START( ttchamp_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x000a, 0x000b) AM_WRITE(paloff_w) // AM_RANGE(0x0010, 0x0010) AM_WRITE(pcup_prgbank_w) - AM_RANGE(0x0010, 0x0011) AM_WRITE(MWA16_NOP) + AM_RANGE(0x0010, 0x0011) AM_WRITE(SMH_NOP) - AM_RANGE(0x0020, 0x0021) AM_WRITE(MWA16_NOP) + AM_RANGE(0x0020, 0x0021) AM_WRITE(SMH_NOP) - AM_RANGE(0x0034, 0x0035) AM_READ(peno_rand) AM_WRITE(MWA16_NOP) + AM_RANGE(0x0034, 0x0035) AM_READ(peno_rand) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c index 3ca4ba32746..657964b0021 100644 --- a/src/mame/drivers/tubep.c +++ b/src/mame/drivers/tubep.c @@ -161,8 +161,8 @@ static ADDRESS_MAP_START( tubep_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_RANGE(0xc000, 0xc7ff) AM_WRITE(tubep_textram_w) AM_BASE(&tubep_textram) /* RAM on GFX PCB @B13 */ - AM_RANGE(0xe000, 0xe7ff) AM_WRITE(MWA8_RAM) AM_SHARE(1) - AM_RANGE(0xe800, 0xebff) AM_WRITE(MWA8_RAM) AM_SHARE(4) /* row of 8 x 2147 RAMs on main PCB */ + AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM) AM_SHARE(1) + AM_RANGE(0xe800, 0xebff) AM_WRITE(SMH_RAM) AM_SHARE(4) /* row of 8 x 2147 RAMs on main PCB */ ADDRESS_MAP_END @@ -215,8 +215,8 @@ static ADDRESS_MAP_START( tubep_second_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xa000) AM_WRITE(tubep_background_a000_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(tubep_background_c000_w) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE(1) /* 6116 #1 */ - AM_RANGE(0xe800, 0xebff) AM_WRITE(MWA8_RAM) AM_SHARE(4) AM_BASE(&tubep_backgroundram) /* row of 8 x 2147 RAMs on main PCB */ - AM_RANGE(0xf000, 0xf3ff) AM_WRITE(MWA8_RAM) AM_SHARE(3) /* sprites color lookup table */ + AM_RANGE(0xe800, 0xebff) AM_WRITE(SMH_RAM) AM_SHARE(4) AM_BASE(&tubep_backgroundram) /* row of 8 x 2147 RAMs on main PCB */ + AM_RANGE(0xf000, 0xf3ff) AM_WRITE(SMH_RAM) AM_SHARE(3) /* sprites color lookup table */ AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE(2) /* program copies here part of shared ram ?? */ ADDRESS_MAP_END @@ -377,7 +377,7 @@ static ADDRESS_MAP_START( nsc_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE(3) AM_BASE(&tubep_sprite_colorsharedram) AM_RANGE(0x0800, 0x0fff) AM_RAM AM_SHARE(2) AM_RANGE(0x2000, 0x2009) AM_WRITE(tubep_sprite_control_w) - AM_RANGE(0x200a, 0x200b) AM_WRITE(MWA8_NOP) /* not used by the games - perhaps designed for debugging */ + AM_RANGE(0x200a, 0x200b) AM_WRITE(SMH_NOP) /* not used by the games - perhaps designed for debugging */ AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index b4763ece653..fc7554c37a6 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -185,27 +185,27 @@ static MACHINE_RESET( tugboat ) static ADDRESS_MAP_START( tugboat_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM) AM_RANGE(0x11e4, 0x11e7) AM_READ(pia_0_r) AM_RANGE(0x11e8, 0x11eb) AM_READ(pia_1_r) - //AM_RANGE(0x1700, 0x1fff) AM_READ(MRA8_RAM) - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xfff0, 0xffff) AM_READ(MRA8_ROM) /* vectors */ + //AM_RANGE(0x1700, 0x1fff) AM_READ(SMH_RAM) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xfff0, 0xffff) AM_READ(SMH_ROM) /* vectors */ ADDRESS_MAP_END static ADDRESS_MAP_START( tugboat_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM) AM_BASE(&tugboat_ram) + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) AM_BASE(&tugboat_ram) AM_RANGE(0x1060, 0x1060) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x1061, 0x1061) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0x10a0, 0x10a1) AM_WRITE(tugboat_hd46505_0_w) // scrolling is performed changing the start_addr register (0C/0D) AM_RANGE(0x10c0, 0x10c1) AM_WRITE(tugboat_hd46505_1_w) AM_RANGE(0x11e4, 0x11e7) AM_WRITE(pia_0_w) AM_RANGE(0x11e8, 0x11eb) AM_WRITE(pia_1_w) - //AM_RANGE(0x1700, 0x1fff) AM_WRITE(MWA8_RAM) + //AM_RANGE(0x1700, 0x1fff) AM_WRITE(SMH_RAM) AM_RANGE(0x18e0, 0x18ef) AM_WRITE(tugboat_score_w) - AM_RANGE(0x2000, 0x2fff) AM_WRITE(MWA8_RAM) /* tilemap RAM */ - AM_RANGE(0x5000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_RAM) /* tilemap RAM */ + AM_RANGE(0x5000, 0x7fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index 2df26c5c3d4..77189a9a6e3 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -647,73 +647,73 @@ static WRITE16_HANDLER(tumbleb2_soundmcu_w) /******************************************************************************/ static ADDRESS_MAP_START( tumblepopb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(tumblepb_prot_r) - AM_RANGE(0x120000, 0x123fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x160000, 0x1607ff) AM_READ(MRA16_RAM) + AM_RANGE(0x120000, 0x123fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r) - AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(MRA16_RAM) + AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( tumblepopb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) #if TUMBLEP_HACK - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_RAM) // To write levels modifications + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_RAM) // To write levels modifications #else - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) #endif AM_RANGE(0x100000, 0x100001) AM_WRITE(tumblepb_oki_w) - AM_RANGE(0x120000, 0x123fff) AM_WRITE(MWA16_RAM) AM_BASE(&tumblepb_mainram) + AM_RANGE(0x120000, 0x123fff) AM_WRITE(SMH_RAM) AM_BASE(&tumblepb_mainram) AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x160000, 0x1607ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ - AM_RANGE(0x160800, 0x160807) AM_WRITE(MWA16_RAM) // writes past the end of spriteram - AM_RANGE(0x18000c, 0x18000d) AM_WRITE(MWA16_NOP) - AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ + AM_RANGE(0x160800, 0x160807) AM_WRITE(SMH_RAM) // writes past the end of spriteram + AM_RANGE(0x18000c, 0x18000d) AM_WRITE(SMH_NOP) + AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_WRITE(tumblepb_control_0_w) AM_RANGE(0x320000, 0x320fff) AM_WRITE(tumblepb_pf1_data_w) AM_BASE(&tumblepb_pf1_data) AM_RANGE(0x322000, 0x322fff) AM_WRITE(tumblepb_pf2_data_w) AM_BASE(&tumblepb_pf2_data) - AM_RANGE(0x340000, 0x3401ff) AM_WRITE(MWA16_NOP) /* Unused row scroll */ - AM_RANGE(0x340400, 0x34047f) AM_WRITE(MWA16_NOP) /* Unused col scroll */ - AM_RANGE(0x342000, 0x3421ff) AM_WRITE(MWA16_NOP) - AM_RANGE(0x342400, 0x34247f) AM_WRITE(MWA16_NOP) + AM_RANGE(0x340000, 0x3401ff) AM_WRITE(SMH_NOP) /* Unused row scroll */ + AM_RANGE(0x340400, 0x34047f) AM_WRITE(SMH_NOP) /* Unused col scroll */ + AM_RANGE(0x342000, 0x3421ff) AM_WRITE(SMH_NOP) + AM_RANGE(0x342400, 0x34247f) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( fncywld_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(YM2151_status_port_0_lsb_r) - AM_RANGE(0x100002, 0x100003) AM_READ(MRA16_NOP) // ym? + AM_RANGE(0x100002, 0x100003) AM_READ(SMH_NOP) // ym? AM_RANGE(0x100004, 0x100005) AM_READ(OKIM6295_status_0_lsb_r) - AM_RANGE(0x140000, 0x140fff) AM_READ(MRA16_RAM) - AM_RANGE(0x160000, 0x1607ff) AM_READ(MRA16_RAM) + AM_RANGE(0x140000, 0x140fff) AM_READ(SMH_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r) - AM_RANGE(0x320000, 0x321fff) AM_READ(MRA16_RAM) - AM_RANGE(0x322000, 0x323fff) AM_READ(MRA16_RAM) - AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(MRA16_RAM) - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM) // RAM + AM_RANGE(0x320000, 0x321fff) AM_READ(SMH_RAM) + AM_RANGE(0x322000, 0x323fff) AM_READ(SMH_RAM) + AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(SMH_RAM) + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( fncywld_writemem, ADDRESS_SPACE_PROGRAM, 16 ) #if FNCYWLD_HACK - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_RAM) // To write levels modifications + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_RAM) // To write levels modifications #else - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) #endif AM_RANGE(0x100000, 0x100001) AM_WRITE(YM2151_register_port_0_lsb_w) AM_RANGE(0x100002, 0x100003) AM_WRITE(YM2151_data_port_0_lsb_w) AM_RANGE(0x100004, 0x100005) AM_WRITE(OKIM6295_data_0_lsb_w) AM_RANGE(0x140000, 0x140fff) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x160000, 0x1607ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* sprites */ - AM_RANGE(0x160800, 0x16080f) AM_WRITE(MWA16_RAM) /* goes slightly past the end of spriteram? */ - AM_RANGE(0x18000c, 0x18000d) AM_WRITE(MWA16_NOP) - AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* sprites */ + AM_RANGE(0x160800, 0x16080f) AM_WRITE(SMH_RAM) /* goes slightly past the end of spriteram? */ + AM_RANGE(0x18000c, 0x18000d) AM_WRITE(SMH_NOP) + AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_WRITE(tumblepb_control_0_w) AM_RANGE(0x320000, 0x321fff) AM_WRITE(fncywld_pf1_data_w) AM_BASE(&tumblepb_pf1_data) AM_RANGE(0x322000, 0x323fff) AM_WRITE(fncywld_pf2_data_w) AM_BASE(&tumblepb_pf2_data) - AM_RANGE(0x340000, 0x3401ff) AM_WRITE(MWA16_NOP) /* Unused row scroll */ - AM_RANGE(0x340400, 0x34047f) AM_WRITE(MWA16_NOP) /* Unused col scroll */ - AM_RANGE(0x342000, 0x3421ff) AM_WRITE(MWA16_NOP) - AM_RANGE(0x342400, 0x34247f) AM_WRITE(MWA16_NOP) - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM) // RAM + AM_RANGE(0x340000, 0x3401ff) AM_WRITE(SMH_NOP) /* Unused row scroll */ + AM_RANGE(0x340400, 0x34047f) AM_WRITE(SMH_NOP) /* Unused col scroll */ + AM_RANGE(0x342000, 0x3421ff) AM_WRITE(SMH_NOP) + AM_RANGE(0x342400, 0x34247f) AM_WRITE(SMH_NOP) + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM) // RAM ADDRESS_MAP_END @@ -722,46 +722,46 @@ static READ16_HANDLER( semibase_unknown_r ) return mame_rand(Machine); } static ADDRESS_MAP_START( htchctch_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x10000f) AM_READ(semibase_unknown_r) - AM_RANGE(0x120000, 0x123fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x160000, 0x160fff) AM_READ(MRA16_RAM) + AM_RANGE(0x120000, 0x123fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) + AM_RANGE(0x160000, 0x160fff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r) - AM_RANGE(0x1a0000, 0x1a0fff) AM_READ(MRA16_RAM) - AM_RANGE(0x341000, 0x342fff) AM_READ(MRA16_RAM) + AM_RANGE(0x1a0000, 0x1a0fff) AM_READ(SMH_RAM) + AM_RANGE(0x341000, 0x342fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( htchctch_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(semicom_soundcmd_w) AM_RANGE(0x100002, 0x100003) AM_WRITE(bcstory_tilebank_w) - AM_RANGE(0x120000, 0x123fff) AM_WRITE(MWA16_RAM) AM_BASE(&tumblepb_mainram) + AM_RANGE(0x120000, 0x123fff) AM_WRITE(SMH_RAM) AM_BASE(&tumblepb_mainram) AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x160000, 0x160fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ - AM_RANGE(0x18000c, 0x18000d) AM_WRITE(MWA16_NOP) - AM_RANGE(0x1a0000, 0x1a0fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x160000, 0x160fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ + AM_RANGE(0x18000c, 0x18000d) AM_WRITE(SMH_NOP) + AM_RANGE(0x1a0000, 0x1a0fff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_WRITE(tumblepb_control_0_w) AM_RANGE(0x320000, 0x321fff) AM_WRITE(tumblepb_pf1_data_w) AM_BASE(&tumblepb_pf1_data) AM_RANGE(0x322000, 0x322fff) AM_WRITE(tumblepb_pf2_data_w) AM_BASE(&tumblepb_pf2_data) - AM_RANGE(0x341000, 0x342fff) AM_WRITE(MWA16_RAM) // extra ram? + AM_RANGE(0x341000, 0x342fff) AM_WRITE(SMH_RAM) // extra ram? ADDRESS_MAP_END static ADDRESS_MAP_START( jumppop_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x120000, 0x123fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x160000, 0x160fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x120000, 0x123fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) + AM_RANGE(0x160000, 0x160fff) AM_READ(SMH_RAM) AM_RANGE(0x180002, 0x180003) AM_READ(input_port_0_word_r) AM_RANGE(0x180004, 0x180005) AM_READ(input_port_1_word_r) AM_RANGE(0x180006, 0x180007) AM_READ(input_port_2_word_r) - AM_RANGE(0x1a0000, 0x1a7fff) AM_READ(MRA16_RAM) + AM_RANGE(0x1a0000, 0x1a7fff) AM_READ(SMH_RAM) - AM_RANGE(0x300000, 0x303fff) AM_READ(MRA16_RAM) - AM_RANGE(0x320000, 0x323fff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x303fff) AM_READ(SMH_RAM) + AM_RANGE(0x320000, 0x323fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static WRITE16_HANDLER( jumpkids_sound_w ) @@ -772,19 +772,19 @@ static WRITE16_HANDLER( jumpkids_sound_w ) static ADDRESS_MAP_START( jumppop_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x120000, 0x123fff) AM_WRITE(MWA16_RAM) AM_BASE(&tumblepb_mainram) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x120000, 0x123fff) AM_WRITE(SMH_RAM) AM_BASE(&tumblepb_mainram) AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x160000, 0x160fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ + AM_RANGE(0x160000, 0x160fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ AM_RANGE(0x180000, 0x180001) AM_NOP /* IRQ ack? */ AM_RANGE(0x18000c, 0x18000d) AM_WRITE(jumppop_sound_w) - AM_RANGE(0x1a0000, 0x1a7fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1a0000, 0x1a7fff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x303fff) AM_WRITE(tumblepb_pf2_data_w) AM_BASE(&tumblepb_pf2_data) AM_RANGE(0x320000, 0x323fff) AM_WRITE(tumblepb_pf1_data_w) AM_BASE(&tumblepb_pf1_data) -// AM_RANGE(0x300000, 0x303fff) AM_WRITE(MWA16_RAM) -// AM_RANGE(0x320000, 0x323fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x380000, 0x38000f) AM_WRITE(MWA16_RAM) AM_BASE(&jumppop_control) +// AM_RANGE(0x300000, 0x303fff) AM_WRITE(SMH_RAM) +// AM_RANGE(0x320000, 0x323fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x380000, 0x38000f) AM_WRITE(SMH_RAM) AM_BASE(&jumppop_control) ADDRESS_MAP_END @@ -806,23 +806,23 @@ static ADDRESS_MAP_START( suprtrio_main_cpu, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( pangpang_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x120000, 0x123fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x160000, 0x1607ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x120000, 0x123fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r) - AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(MRA16_RAM) - AM_RANGE(0x320000, 0x321fff) AM_READ(MRA16_RAM) - AM_RANGE(0x340000, 0x341fff) AM_READ(MRA16_RAM) + AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(SMH_RAM) + AM_RANGE(0x320000, 0x321fff) AM_READ(SMH_RAM) + AM_RANGE(0x340000, 0x341fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( pangpang_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x120000, 0x123fff) AM_WRITE(MWA16_RAM) AM_BASE(&tumblepb_mainram) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x120000, 0x123fff) AM_WRITE(SMH_RAM) AM_BASE(&tumblepb_mainram) AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x160000, 0x1607ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ - AM_RANGE(0x160800, 0x160807) AM_WRITE(MWA16_RAM) // writes past the end of spriteram - AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ + AM_RANGE(0x160800, 0x160807) AM_WRITE(SMH_RAM) // writes past the end of spriteram + AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_WRITE(tumblepb_control_0_w) AM_RANGE(0x320000, 0x321fff) AM_WRITE(pangpang_pf1_data_w) AM_BASE(&tumblepb_pf1_data) AM_RANGE(0x340000, 0x341fff) AM_WRITE(pangpang_pf2_data_w) AM_BASE(&tumblepb_pf2_data) @@ -864,16 +864,16 @@ static WRITE8_HANDLER( oki_sound_bank_w ) } static ADDRESS_MAP_START( semicom_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xcfff) AM_READ(MRA8_ROM) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xcfff) AM_READ(SMH_ROM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) AM_RANGE(0xf001, 0xf001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xf002, 0xf002) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( semicom_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xcfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xcfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xf002, 0xf002) AM_WRITE(OKIM6295_data_0_w) @@ -888,7 +888,7 @@ static WRITE8_HANDLER(jumppop_z80_bank_w) static ADDRESS_MAP_START( jumppop_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x2fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -912,30 +912,30 @@ ADDRESS_MAP_END /* Jump Kids */ static ADDRESS_MAP_START( jumpkids_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x120000, 0x123fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) - AM_RANGE(0x160000, 0x1607ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x120000, 0x123fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepopb_controls_r) - AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(MRA16_RAM) + AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( jumpkids_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(jumpkids_sound_w) - AM_RANGE(0x120000, 0x123fff) AM_WRITE(MWA16_RAM) AM_BASE(&tumblepb_mainram) + AM_RANGE(0x120000, 0x123fff) AM_WRITE(SMH_RAM) AM_BASE(&tumblepb_mainram) AM_RANGE(0x140000, 0x1407ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x160000, 0x1607ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ - AM_RANGE(0x160800, 0x160807) AM_WRITE(MWA16_RAM) // writes past the end of spriteram - AM_RANGE(0x18000c, 0x18000d) AM_WRITE(MWA16_NOP) - AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x160000, 0x1607ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* Bootleg sprite buffer */ + AM_RANGE(0x160800, 0x160807) AM_WRITE(SMH_RAM) // writes past the end of spriteram + AM_RANGE(0x18000c, 0x18000d) AM_WRITE(SMH_NOP) + AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x30000f) AM_WRITE(tumblepb_control_0_w) AM_RANGE(0x320000, 0x320fff) AM_WRITE(tumblepb_pf1_data_w) AM_BASE(&tumblepb_pf1_data) AM_RANGE(0x322000, 0x322fff) AM_WRITE(tumblepb_pf2_data_w) AM_BASE(&tumblepb_pf2_data) - AM_RANGE(0x340000, 0x3401ff) AM_WRITE(MWA16_NOP) /* Unused row scroll */ - AM_RANGE(0x340400, 0x34047f) AM_WRITE(MWA16_NOP) /* Unused col scroll */ - AM_RANGE(0x342000, 0x3421ff) AM_WRITE(MWA16_NOP) - AM_RANGE(0x342400, 0x34247f) AM_WRITE(MWA16_NOP) + AM_RANGE(0x340000, 0x3401ff) AM_WRITE(SMH_NOP) /* Unused row scroll */ + AM_RANGE(0x340400, 0x34047f) AM_WRITE(SMH_NOP) /* Unused col scroll */ + AM_RANGE(0x342000, 0x3421ff) AM_WRITE(SMH_NOP) + AM_RANGE(0x342400, 0x34247f) AM_WRITE(SMH_NOP) ADDRESS_MAP_END static WRITE8_HANDLER( jumpkids_oki_bank_w ) @@ -3608,7 +3608,7 @@ static DRIVER_INIT( htchctch ) HCROM[0x1e228/2] = 0x4e75; - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x140000, 0x1407ff, 0, 0, MWA16_NOP ); // kill palette writes as the interrupt code we don't have controls them + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x140000, 0x1407ff, 0, 0, SMH_NOP ); // kill palette writes as the interrupt code we don't have controls them { diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 021d7753609..56487eddd2b 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -107,31 +107,31 @@ static READ16_HANDLER( tumblepop_controls_r ) /******************************************************************************/ static ADDRESS_MAP_START( tumblepop_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x120000, 0x123fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) + AM_RANGE(0x120000, 0x123fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(tumblepop_controls_r) - AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(MRA16_RAM) - AM_RANGE(0x320000, 0x320fff) AM_READ(MRA16_RAM) - AM_RANGE(0x322000, 0x322fff) AM_READ(MRA16_RAM) + AM_RANGE(0x1a0000, 0x1a07ff) AM_READ(SMH_RAM) + AM_RANGE(0x320000, 0x320fff) AM_READ(SMH_RAM) + AM_RANGE(0x322000, 0x322fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( tumblepop_writemem, ADDRESS_SPACE_PROGRAM, 16 ) #if TUMBLEP_HACK - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_RAM) // To write levels modifications + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_RAM) // To write levels modifications #else - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) #endif AM_RANGE(0x100000, 0x100001) AM_WRITE(tumblep_sound_w) - AM_RANGE(0x120000, 0x123fff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x140000, 0x1407ff) AM_READ(MRA16_RAM) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x18000c, 0x18000d) AM_WRITE(MWA16_NOP) - AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x300000, 0x30000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x120000, 0x123fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x18000c, 0x18000d) AM_WRITE(SMH_NOP) + AM_RANGE(0x1a0000, 0x1a07ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x300000, 0x30000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x320000, 0x320fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x322000, 0x322fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x340000, 0x3407ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf1_rowscroll) // unused - AM_RANGE(0x342000, 0x3427ff) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf2_rowscroll) // unused + AM_RANGE(0x340000, 0x3407ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf1_rowscroll) // unused + AM_RANGE(0x342000, 0x3427ff) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll) // unused ADDRESS_MAP_END /******************************************************************************/ @@ -150,22 +150,22 @@ static WRITE8_HANDLER( YM2151_w ) /* Physical memory map (21 bits) */ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_READ(MRA8_NOP) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) - AM_RANGE(0x130000, 0x130001) AM_READ(MRA8_NOP) /* This board only has 1 oki chip */ + AM_RANGE(0x130000, 0x130001) AM_READ(SMH_NOP) /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x100000, 0x100001) AM_WRITE(MWA8_NOP) /* YM2203 - this board doesn't have one */ + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) /* YM2203 - this board doesn't have one */ AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) - AM_RANGE(0x130000, 0x130001) AM_WRITE(MWA8_NOP) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x130000, 0x130001) AM_WRITE(SMH_NOP) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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/tunhunt.c b/src/mame/drivers/tunhunt.c index 7885cf14489..8f173759a41 100644 --- a/src/mame/drivers/tunhunt.c +++ b/src/mame/drivers/tunhunt.c @@ -146,32 +146,32 @@ static READ8_HANDLER( dsw2_4r ) *************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_READ(MRA8_RAM) /* Work RAM */ + AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_RAM) /* Work RAM */ AM_RANGE(0x2000, 0x2007) AM_READ(tunhunt_button_r) AM_RANGE(0x3000, 0x300f) AM_READ(pokey1_r) AM_RANGE(0x4000, 0x400f) AM_READ(pokey2_r) - AM_RANGE(0x5000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0xfffa, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x5000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0xfffa, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x03ff) AM_WRITE(MWA8_RAM) AM_BASE(&tunhunt_ram) /* Work RAM */ - AM_RANGE(0x1080, 0x10ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1200, 0x12ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1400, 0x14ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x1600, 0x160f) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) /* COLRAM (D7-D4 SHADE; D3-D0 COLOR) */ - AM_RANGE(0x1800, 0x1800) AM_WRITE(MWA8_RAM) /* SHEL0H */ - AM_RANGE(0x1a00, 0x1a00) AM_WRITE(MWA8_RAM) /* SHEL1H */ - AM_RANGE(0x1c00, 0x1c00) AM_WRITE(MWA8_RAM) /* MOBJV */ + AM_RANGE(0x0000, 0x03ff) AM_WRITE(SMH_RAM) AM_BASE(&tunhunt_ram) /* Work RAM */ + AM_RANGE(0x1080, 0x10ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1200, 0x12ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1400, 0x14ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1600, 0x160f) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) /* COLRAM (D7-D4 SHADE; D3-D0 COLOR) */ + AM_RANGE(0x1800, 0x1800) AM_WRITE(SMH_RAM) /* SHEL0H */ + AM_RANGE(0x1a00, 0x1a00) AM_WRITE(SMH_RAM) /* SHEL1H */ + AM_RANGE(0x1c00, 0x1c00) AM_WRITE(SMH_RAM) /* MOBJV */ AM_RANGE(0x1e00, 0x1eff) AM_WRITE(tunhunt_videoram_w) AM_BASE(&videoram) /* ALPHA */ - AM_RANGE(0x2c00, 0x2fff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) - AM_RANGE(0x2000, 0x2000) AM_WRITE(MWA8_NOP) /* watchdog */ - AM_RANGE(0x2400, 0x2400) AM_WRITE(MWA8_NOP) /* INT ACK */ + AM_RANGE(0x2c00, 0x2fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) + AM_RANGE(0x2000, 0x2000) AM_WRITE(SMH_NOP) /* watchdog */ + AM_RANGE(0x2400, 0x2400) AM_WRITE(SMH_NOP) /* INT ACK */ AM_RANGE(0x2800, 0x2800) AM_WRITE(tunhunt_control_w) AM_RANGE(0x3000, 0x300f) AM_WRITE(pokey1_w) AM_RANGE(0x4000, 0x400f) AM_WRITE(pokey2_w) - AM_RANGE(0x5000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x5000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c index af5634c662a..f17b58d9f68 100644 --- a/src/mame/drivers/turbo.c +++ b/src/mame/drivers/turbo.c @@ -664,7 +664,7 @@ static ADDRESS_MAP_START( turbo_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa800, 0xa807) AM_MIRROR(0x07f8) AM_WRITE(turbo_coin_and_lamp_w) AM_RANGE(0xb000, 0xb3ff) AM_MIRROR(0x0400) AM_RAM AM_BASE_MEMBER(turbo_state, sprite_position) AM_RANGE(0xb800, 0xbfff) AM_WRITE(turbo_analog_reset_w) - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, turbo_videoram_w) AM_BASE_MEMBER(turbo_state, videoram) + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(SMH_RAM, turbo_videoram_w) AM_BASE_MEMBER(turbo_state, videoram) AM_RANGE(0xe800, 0xefff) AM_WRITE(turbo_collision_clear_w) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf803) AM_MIRROR(0x00fc) AM_READWRITE(ppi8255_0_r, ppi8255_0_w) @@ -694,7 +694,7 @@ static ADDRESS_MAP_START( subroc3d_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa803, 0xa803) AM_MIRROR(0x07fc) AM_READ(input_port_3_r) // INPUT 253 AM_RANGE(0xb000, 0xb7ff) AM_RAM // SCRATCH AM_RANGE(0xb800, 0xbfff) // HANDLE CL - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, turbo_videoram_w) AM_BASE_MEMBER(turbo_state, videoram) // FIX PAGE + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(SMH_RAM, turbo_videoram_w) AM_BASE_MEMBER(turbo_state, videoram) // FIX PAGE AM_RANGE(0xe800, 0xe803) AM_MIRROR(0x07fc) AM_READWRITE(ppi8255_0_r, ppi8255_0_w) AM_RANGE(0xf000, 0xf003) AM_MIRROR(0x07fc) AM_READWRITE(ppi8255_1_r, ppi8255_1_w) AM_RANGE(0xf800, 0xf801) AM_MIRROR(0x07fe) AM_READWRITE(turbo_8279_r, turbo_8279_w) @@ -711,7 +711,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( buckrog_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(MRA8_RAM, turbo_videoram_w) AM_BASE_MEMBER(turbo_state, videoram) // FIX PAGE + AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(SMH_RAM, turbo_videoram_w) AM_BASE_MEMBER(turbo_state, videoram) // FIX PAGE AM_RANGE(0xc800, 0xc803) AM_MIRROR(0x07fc) AM_READWRITE(ppi8255_0_r, buckrog_ppi8255_0_w) // 8255 AM_RANGE(0xd000, 0xd003) AM_MIRROR(0x07fc) AM_READWRITE(ppi8255_1_r, ppi8255_1_w) // 8255 AM_RANGE(0xd800, 0xd801) AM_MIRROR(0x07fe) AM_READWRITE(turbo_8279_r, turbo_8279_w) // 8279 diff --git a/src/mame/drivers/turbosub.c b/src/mame/drivers/turbosub.c index 8527fefb4a9..00c1aed4e0b 100644 --- a/src/mame/drivers/turbosub.c +++ b/src/mame/drivers/turbosub.c @@ -265,7 +265,7 @@ static ADDRESS_MAP_START( game_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x5000) AM_RAM /* Write - related to 4C00. Bit 8 = ? bits0..3 =???? */ AM_RANGE(0x5400, 0x54ff) AM_RAM /* UART buffer? */ AM_RANGE(0x5c00, 0x5c01) AM_READWRITE(UART_R, UART_W) /* i8251A USART */ - AM_RANGE(0x6000, 0xdfff) AM_READWRITE(MRA8_BANK1, MWA8_ROM) /* Bank switched ROMs */ + AM_RANGE(0x6000, 0xdfff) AM_READWRITE(SMH_BANK1, SMH_ROM) /* Bank switched ROMs */ AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c index 8652e25a85b..e177ee35d0f 100644 --- a/src/mame/drivers/tutankhm.c +++ b/src/mame/drivers/tutankhm.c @@ -105,7 +105,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x81a0, 0x81a0) AM_MIRROR(0x000f) AM_READ_PORT("IN1") /* IN1: Player 1 I/O */ AM_RANGE(0x81c0, 0x81c0) AM_MIRROR(0x000f) AM_READ_PORT("IN2") /* IN2: Player 2 I/O */ AM_RANGE(0x81e0, 0x81e0) AM_MIRROR(0x000f) AM_READ_PORT("DSW1") /* DSW1 (inverted bits) */ - AM_RANGE(0x8200, 0x8200) AM_MIRROR(0x00f8) AM_READWRITE(MRA8_NOP, irq_enable_w) + AM_RANGE(0x8200, 0x8200) AM_MIRROR(0x00f8) AM_READWRITE(SMH_NOP, irq_enable_w) AM_RANGE(0x8202, 0x8203) AM_MIRROR(0x00f8) AM_WRITE(tutankhm_coin_counter_w) AM_RANGE(0x8205, 0x8205) AM_MIRROR(0x00f8) AM_WRITE(sound_mute_w) AM_RANGE(0x8206, 0x8206) AM_MIRROR(0x00f8) AM_WRITE(tutankhm_flip_screen_x_w) diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index cc163492b60..aee99394054 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -106,8 +106,8 @@ enum /******************************************************************************************/ -#define COMRAM_r MRA16_BANK1 -#define COMRAM_w MWA16_BANK1 +#define COMRAM_r SMH_BANK1 +#define COMRAM_w SMH_BANK1 /* Read/Write Handlers */ @@ -259,8 +259,8 @@ static WRITE16_HANDLER( cuebrckj_nvram_bank_w ) /* Memory Maps */ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_READ(twin16_sres_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) @@ -269,38 +269,38 @@ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x8fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x9000) AM_WRITE(twin16_sres_w) AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(upd7759_0_port_w) AM_RANGE(0xe000, 0xe000) AM_WRITE(upd7759_0_start_w) - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) // ??? + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) // ??? ADDRESS_MAP_END static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x040000, 0x043fff) AM_READ(COMRAM_r) - AM_RANGE(0x044000, 0x04ffff) AM_READ(MRA16_RAM) // miaj - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) + AM_RANGE(0x044000, 0x04ffff) AM_READ(SMH_RAM) // miaj + AM_RANGE(0x060000, 0x063fff) AM_READ(SMH_RAM) + AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) AM_RANGE(0x0a0000, 0x0a001b) AM_READ(twin16_input_r) AM_RANGE(0x0b0000, 0x0b03ff) AM_READ(cuebrckj_nvram_r) AM_RANGE(0x0c000e, 0x0c000f) AM_READ(twin16_sprite_status_r) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x104000, 0x105fff) AM_READ(MRA16_RAM) // miaj - AM_RANGE(0x120000, 0x123fff) AM_READ(MRA16_RAM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x104000, 0x105fff) AM_READ(SMH_RAM) // miaj + AM_RANGE(0x120000, 0x123fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x040000, 0x043fff) AM_WRITE(COMRAM_w) - AM_RANGE(0x044000, 0x04ffff) AM_WRITE(MWA16_RAM) // miaj - AM_RANGE(0x060000, 0x063fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x044000, 0x04ffff) AM_WRITE(SMH_RAM) // miaj + AM_RANGE(0x060000, 0x063fff) AM_WRITE(SMH_RAM) AM_RANGE(0x080000, 0x080fff) AM_WRITE(twin16_paletteram_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x081000, 0x081fff) AM_WRITE(MWA16_NOP) + AM_RANGE(0x081000, 0x081fff) AM_WRITE(SMH_NOP) AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(twin16_CPUA_register_w) AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(sound_command_w) AM_RANGE(0x0a0010, 0x0a0011) AM_WRITE(watchdog_reset16_w) @@ -308,53 +308,53 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0b0400, 0x0b0401) AM_WRITE(cuebrckj_nvram_bank_w) AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(twin16_video_register_w) AM_RANGE(0x100000, 0x103fff) AM_WRITE(twin16_videoram2_w) AM_BASE(&twin16_videoram2) - AM_RANGE(0x104000, 0x105fff) AM_WRITE(MWA16_RAM) // miaj - AM_RANGE(0x120000, 0x123fff) AM_WRITE(MWA16_RAM) AM_BASE(&videoram16) + AM_RANGE(0x104000, 0x105fff) AM_WRITE(SMH_RAM) // miaj + AM_RANGE(0x120000, 0x123fff) AM_WRITE(SMH_RAM) AM_BASE(&videoram16) AM_RANGE(0x140000, 0x143fff) AM_RAM AM_SHARE(1) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sub, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x040000, 0x043fff) AM_READ(COMRAM_r) - AM_RANGE(0x044000, 0x04ffff) AM_READ(MRA16_RAM) // miaj - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) + AM_RANGE(0x044000, 0x04ffff) AM_READ(SMH_RAM) // miaj + AM_RANGE(0x060000, 0x063fff) AM_READ(SMH_RAM) AM_RANGE(0x080000, 0x09ffff) AM_READ(extra_rom_r) AM_RANGE(0x480000, 0x483fff) AM_READ(videoram16_r) - AM_RANGE(0x500000, 0x53ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x500000, 0x53ffff) AM_READ(SMH_RAM) AM_RANGE(0x600000, 0x6fffff) AM_READ(twin16_gfx_rom1_r) AM_RANGE(0x700000, 0x77ffff) AM_READ(twin16_gfx_rom2_r) - AM_RANGE(0x780000, 0x79ffff) AM_READ(MRA16_RAM) + AM_RANGE(0x780000, 0x79ffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sub, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x040000, 0x043fff) AM_WRITE(COMRAM_w) - AM_RANGE(0x044000, 0x04ffff) AM_WRITE(MWA16_RAM) // miaj - AM_RANGE(0x060000, 0x063fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x044000, 0x04ffff) AM_WRITE(SMH_RAM) // miaj + AM_RANGE(0x060000, 0x063fff) AM_WRITE(SMH_RAM) AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(twin16_CPUB_register_w) AM_RANGE(0x400000, 0x403fff) AM_RAM AM_SHARE(1) AM_RANGE(0x480000, 0x483fff) AM_WRITE(videoram16_w) - AM_RANGE(0x500000, 0x53ffff) AM_WRITE(MWA16_RAM) AM_BASE(&twin16_tile_gfx_ram) - AM_RANGE(0x780000, 0x79ffff) AM_WRITE(MWA16_RAM) AM_BASE(&twin16_sprite_gfx_ram) + AM_RANGE(0x500000, 0x53ffff) AM_WRITE(SMH_RAM) AM_BASE(&twin16_tile_gfx_ram) + AM_RANGE(0x780000, 0x79ffff) AM_WRITE(SMH_RAM) AM_BASE(&twin16_sprite_gfx_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( fround_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x040000, 0x043fff) AM_READ(COMRAM_r) - AM_RANGE(0x060000, 0x063fff) AM_READ(MRA16_RAM) - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) + AM_RANGE(0x060000, 0x063fff) AM_READ(SMH_RAM) + AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) AM_RANGE(0x0a0000, 0x0a001b) AM_READ(twin16_input_r) AM_RANGE(0x0c000e, 0x0c000f) AM_READ(twin16_sprite_status_r) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) - AM_RANGE(0x120000, 0x123fff) AM_READ(MRA16_RAM) - AM_RANGE(0x140000, 0x143fff) AM_READ(MRA16_RAM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) + AM_RANGE(0x120000, 0x123fff) AM_READ(SMH_RAM) + AM_RANGE(0x140000, 0x143fff) AM_READ(SMH_RAM) AM_RANGE(0x500000, 0x6fffff) AM_READ(twin16_gfx_rom1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( fround_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x040000, 0x043fff) AM_WRITE(COMRAM_w) - AM_RANGE(0x060000, 0x063fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x060000, 0x063fff) AM_WRITE(SMH_RAM) AM_RANGE(0x080000, 0x080fff) AM_WRITE(twin16_paletteram_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(fround_CPU_register_w) AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(sound_command_w) @@ -362,8 +362,8 @@ static ADDRESS_MAP_START( fround_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0000, 0x0c000f) AM_WRITE(twin16_video_register_w) AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE(fround_gfx_bank_w) AM_RANGE(0x100000, 0x103fff) AM_WRITE(twin16_videoram2_w) AM_BASE(&twin16_videoram2) - AM_RANGE(0x120000, 0x123fff) AM_WRITE(MWA16_RAM) AM_BASE(&videoram16) - AM_RANGE(0x140000, 0x143fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x120000, 0x123fff) AM_WRITE(SMH_RAM) AM_BASE(&videoram16) + AM_RANGE(0x140000, 0x143fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) ADDRESS_MAP_END /* Input Ports */ diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c index d7a39fa6567..77426253cee 100644 --- a/src/mame/drivers/twincobr.c +++ b/src/mame/drivers/twincobr.c @@ -204,7 +204,7 @@ static ADDRESS_MAP_START( main_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x02ffff) AM_ROM AM_RANGE(0x030000, 0x033fff) AM_RAM /* 68K and DSP shared RAM */ AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0x050000, 0x050dff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x050000, 0x050dff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x060000, 0x060001) AM_WRITE(twincobr_crtc_reg_sel_w) /* 6845 CRT controller */ AM_RANGE(0x060002, 0x060003) AM_WRITE(twincobr_crtc_data_w) /* 6845 CRT controller */ AM_RANGE(0x070000, 0x070003) AM_WRITE(twincobr_txscroll_w) /* text layer scroll */ diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c index f8d9736f1e0..3212d45ee86 100644 --- a/src/mame/drivers/tx1.c +++ b/src/mame/drivers/tx1.c @@ -419,7 +419,7 @@ static ADDRESS_MAP_START( tx1_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x02000, 0x02fff) AM_MIRROR(0x1000) AM_RAM AM_RANGE(0x04000, 0x04fff) AM_MIRROR(0x1000) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x06000, 0x06fff) AM_READWRITE(tx1_crtc_r, tx1_crtc_w) - AM_RANGE(0x08000, 0x09fff) AM_READWRITE(MRA16_RAM, tx1_vram_w) AM_BASE(&tx1_vram) + AM_RANGE(0x08000, 0x09fff) AM_READWRITE(SMH_RAM, tx1_vram_w) AM_BASE(&tx1_vram) AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE(1) AM_BASE(&tx1_rcram) AM_RANGE(0x0b000, 0x0b001) AM_READWRITE(dipswitches_r, z80_busreq_w) AM_RANGE(0x0c000, 0x0c001) AM_WRITE(tx1_scolst_w) @@ -488,7 +488,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( buggyboy_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x03fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x04000, 0x04fff) AM_READWRITE(tx1_crtc_r, tx1_crtc_w) - AM_RANGE(0x08000, 0x09fff) AM_READWRITE(MRA16_RAM, buggyboy_vram_w) AM_BASE(&buggyboy_vram) + AM_RANGE(0x08000, 0x09fff) AM_READWRITE(SMH_RAM, buggyboy_vram_w) AM_BASE(&buggyboy_vram) AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE(1) AM_BASE(&buggyboy_rcram) AM_SIZE(&buggyboy_rcram_size) AM_RANGE(0x0b000, 0x0b001) AM_READWRITE(dipswitches_r, z80_busreq_w) AM_RANGE(0x0c000, 0x0c001) AM_WRITE(buggyboy_scolst_w) diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index 2cd980759bd..fd1c4aaa621 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -111,9 +111,9 @@ static WRITE16_HANDLER( sound_irq_trigger_w ) static ADDRESS_MAP_START( ultraman_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) /* ROM */ - AM_RANGE(0x080000, 0x08ffff) AM_READ(MRA16_RAM) /* RAM */ - AM_RANGE(0x180000, 0x183fff) AM_READ(MRA16_RAM) /* Palette */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x080000, 0x08ffff) AM_READ(SMH_RAM) /* RAM */ + AM_RANGE(0x180000, 0x183fff) AM_READ(SMH_RAM) /* Palette */ AM_RANGE(0x1c0000, 0x1c0001) AM_READ(input_port_0_word_r) /* Coins + Service */ AM_RANGE(0x1c0002, 0x1c0003) AM_READ(input_port_1_word_r) /* 1P controls */ AM_RANGE(0x1c0004, 0x1c0005) AM_READ(input_port_2_word_r) /* 2P controls */ @@ -127,8 +127,8 @@ static ADDRESS_MAP_START( ultraman_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ultraman_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) /* ROM */ - AM_RANGE(0x080000, 0x08ffff) AM_WRITE(MWA16_RAM) /* RAM */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x080000, 0x08ffff) AM_WRITE(SMH_RAM) /* RAM */ AM_RANGE(0x180000, 0x183fff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)/* Palette */ AM_RANGE(0x1c0018, 0x1c0019) AM_WRITE(ultraman_gfxctrl_w) /* counters + gfx ctrl */ AM_RANGE(0x1c0020, 0x1c0021) AM_WRITE(sound_cmd_w) @@ -145,17 +145,17 @@ static ADDRESS_MAP_START( ultraman_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ultraman_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_RAM) /* RAM */ + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_RAM) /* RAM */ AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) /* Sound latch read */ AM_RANGE(0xe000, 0xe000) AM_READ(OKIM6295_status_0_r) /* M6295 */ AM_RANGE(0xf001, 0xf001) AM_READ(YM2151_status_port_0_r) /* YM2151 */ ADDRESS_MAP_END static ADDRESS_MAP_START( ultraman_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) /* ROM */ - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_RAM) /* RAM */ -// AM_RANGE(0xd000, 0xd000) AM_WRITE(MWA8_NOP) /* ??? */ + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) /* ROM */ + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_RAM) /* RAM */ +// AM_RANGE(0xd000, 0xd000) AM_WRITE(SMH_NOP) /* ??? */ AM_RANGE(0xe000, 0xe000) AM_WRITE(OKIM6295_data_0_w) /* M6295 */ AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2151_register_port_0_w) /* YM2151 */ AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2151_data_port_0_w) /* YM2151 */ @@ -163,7 +163,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ultraman_writeport_sound, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) -// AM_RANGE(0x00, 0x00) AM_WRITE(MWA8_NOP) /* ??? */ +// AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /* ??? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c index d04c103c123..44e3713e178 100644 --- a/src/mame/drivers/ultratnk.c +++ b/src/mame/drivers/ultratnk.c @@ -151,7 +151,7 @@ static ADDRESS_MAP_START( ultratnk_cpu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x700) AM_RAM AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x700) AM_READWRITE(ultratnk_wram_r, ultratnk_wram_w) - AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x400) AM_READWRITE(MRA8_RAM, ultratnk_video_ram_w) AM_BASE(&videoram) + AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x400) AM_READWRITE(SMH_RAM, ultratnk_video_ram_w) AM_BASE(&videoram) AM_RANGE(0x1000, 0x17ff) AM_READ(input_port_0_r) AM_RANGE(0x1800, 0x1fff) AM_READ(input_port_1_r) diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index 1cf0eec5663..b51bf60cfa3 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -120,7 +120,7 @@ static ADDRESS_MAP_START( ultrsprt_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x70000088, 0x7000008f) AM_MIRROR(0x80000000) AM_READ(K056800_host_r) AM_RANGE(0x700000e0, 0x700000e3) AM_MIRROR(0x80000000) AM_WRITE(int_ack_w) AM_RANGE(0x7f000000, 0x7f01ffff) AM_MIRROR(0x80000000) AM_RAM - AM_RANGE(0x7f700000, 0x7f703fff) AM_MIRROR(0x80000000) AM_READWRITE(MRA32_RAM, palette_w) AM_BASE(&paletteram32) + AM_RANGE(0x7f700000, 0x7f703fff) AM_MIRROR(0x80000000) AM_READWRITE(SMH_RAM, palette_w) AM_BASE(&paletteram32) AM_RANGE(0x7fa00000, 0x7fbfffff) AM_MIRROR(0x80000000) AM_ROM AM_SHARE(1) AM_RANGE(0x7fc00000, 0x7fdfffff) AM_MIRROR(0x80000000) AM_ROM AM_SHARE(1) AM_RANGE(0x7fe00000, 0x7fffffff) AM_MIRROR(0x80000000) AM_ROM AM_REGION(REGION_USER1, 0) AM_SHARE(1) @@ -190,7 +190,7 @@ static WRITE16_HANDLER(K056800_68k_w) } static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x00000000, 0x0001ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x00000000, 0x0001ffff) AM_READ(SMH_ROM) AM_RANGE(0x00100000, 0x00101fff) AM_RAM AM_RANGE(0x00200000, 0x00200007) AM_WRITE(K056800_68k_w) AM_RANGE(0x00200008, 0x0020000f) AM_READ(K056800_68k_r) diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c index c3f48e8f2f6..0f14184214e 100644 --- a/src/mame/drivers/undrfire.c +++ b/src/mame/drivers/undrfire.c @@ -373,39 +373,39 @@ static WRITE32_HANDLER( motor_control_w ) ***********************************************************/ static ADDRESS_MAP_START( undrfire_readmem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA32_ROM) - AM_RANGE(0x200000, 0x21ffff) AM_READ(MRA32_RAM) /* main CPUA ram */ - AM_RANGE(0x300000, 0x303fff) AM_READ(MRA32_RAM) /* sprite ram */ -// AM_RANGE(0x304000, 0x304003) AM_READ(MRA32_RAM) // debugging -// AM_RANGE(0x304400, 0x304403) AM_READ(MRA32_RAM) // debugging + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x21ffff) AM_READ(SMH_RAM) /* main CPUA ram */ + AM_RANGE(0x300000, 0x303fff) AM_READ(SMH_RAM) /* sprite ram */ +// AM_RANGE(0x304000, 0x304003) AM_READ(SMH_RAM) // debugging +// AM_RANGE(0x304400, 0x304403) AM_READ(SMH_RAM) // debugging AM_RANGE(0x500000, 0x500007) AM_READ(undrfire_input_r) AM_RANGE(0x600000, 0x600007) AM_READ(unknown_hardware_r) /* unknown byte reads at $156e */ - AM_RANGE(0x700000, 0x7007ff) AM_READ(MRA32_RAM) + AM_RANGE(0x700000, 0x7007ff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0480SCP_long_r) /* tilemaps */ AM_RANGE(0x830000, 0x83002f) AM_READ(TC0480SCP_ctrl_long_r) // debugging AM_RANGE(0x900000, 0x90ffff) AM_READ(TC0100SCN_long_r) /* piv tilemaps */ AM_RANGE(0x920000, 0x92000f) AM_READ(TC0100SCN_ctrl_long_r) - AM_RANGE(0xa00000, 0xa0ffff) AM_READ(MRA32_RAM) /* palette ram */ - AM_RANGE(0xb00000, 0xb003ff) AM_READ(MRA32_RAM) // ?? single bytes + AM_RANGE(0xa00000, 0xa0ffff) AM_READ(SMH_RAM) /* palette ram */ + AM_RANGE(0xb00000, 0xb003ff) AM_READ(SMH_RAM) // ?? single bytes AM_RANGE(0xf00000, 0xf00007) AM_READ(undrfire_lightgun_r) /* stick coords read at $11b2-bc */ ADDRESS_MAP_END static ADDRESS_MAP_START( undrfire_writemem, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA32_ROM) - AM_RANGE(0x200000, 0x21ffff) AM_WRITE(MWA32_RAM) AM_BASE(&undrfire_ram) - AM_RANGE(0x300000, 0x303fff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) -// AM_RANGE(0x304000, 0x304003) AM_WRITE(MWA32_RAM) // ??? doesn't change -// AM_RANGE(0x304400, 0x304403) AM_WRITE(MWA32_RAM) // ??? doesn't change + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x21ffff) AM_WRITE(SMH_RAM) AM_BASE(&undrfire_ram) + AM_RANGE(0x300000, 0x303fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size) +// AM_RANGE(0x304000, 0x304003) AM_WRITE(SMH_RAM) // ??? doesn't change +// AM_RANGE(0x304400, 0x304403) AM_WRITE(SMH_RAM) // ??? doesn't change AM_RANGE(0x400000, 0x400003) AM_WRITE(motor_control_w) /* gun vibration */ AM_RANGE(0x500000, 0x500007) AM_WRITE(undrfire_input_w) /* eerom etc. */ AM_RANGE(0x600000, 0x600007) AM_WRITE(unknown_int_req_w) /* int request for unknown hardware */ - AM_RANGE(0x700000, 0x7007ff) AM_WRITE(MWA32_RAM) AM_BASE(&f3_shared_ram) + AM_RANGE(0x700000, 0x7007ff) AM_WRITE(SMH_RAM) AM_BASE(&f3_shared_ram) AM_RANGE(0x800000, 0x80ffff) AM_WRITE(TC0480SCP_long_w) /* tilemaps */ AM_RANGE(0x830000, 0x83002f) AM_WRITE(TC0480SCP_ctrl_long_w) AM_RANGE(0x900000, 0x90ffff) AM_WRITE(TC0100SCN_long_w) /* piv tilemaps */ AM_RANGE(0x920000, 0x92000f) AM_WRITE(TC0100SCN_ctrl_long_w) AM_RANGE(0xa00000, 0xa0ffff) AM_WRITE(color_ram_w) AM_BASE(&paletteram32) - AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(MWA32_RAM) // single bytes, blending ?? + AM_RANGE(0xb00000, 0xb003ff) AM_WRITE(SMH_RAM) // single bytes, blending ?? AM_RANGE(0xd00000, 0xd00003) AM_WRITE(rotate_control_w) /* perhaps port based rotate control? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index cfd242ec863..b8558d25627 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -62,42 +62,42 @@ static WRITE16_HANDLER( burglarx_sound_bank_w ) } static ADDRESS_MAP_START( readmem_burglarx, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r ) // P1 + P2 AM_RANGE(0x800018, 0x800019) AM_READ(input_port_1_word_r ) // Buttons AM_RANGE(0x80001a, 0x80001b) AM_READ(input_port_2_word_r ) // DSW AM_RANGE(0x80001c, 0x80001d) AM_READ(input_port_3_word_r ) // DSW AM_RANGE(0x800188, 0x800189) AM_READ(OKIM6295_status_0_lsb_r ) // Sound AM_RANGE(0x80018c, 0x80018d) AM_READ(YM3812_status_port_0_msb_r ) // -/**/AM_RANGE(0x904000, 0x907fff) AM_READ(MRA16_RAM ) // Layers -/**/AM_RANGE(0x908000, 0x90bfff) AM_READ(MRA16_RAM ) // -/**/AM_RANGE(0x90c000, 0x90ffff) AM_READ(MRA16_RAM ) // -/**/AM_RANGE(0x920000, 0x923fff) AM_READ(MRA16_RAM ) // ? 0 -/**/AM_RANGE(0x930000, 0x9307ff) AM_READ(MRA16_RAM ) // Sprites -/**/AM_RANGE(0x940000, 0x947fff) AM_READ(MRA16_RAM ) // Palette +/**/AM_RANGE(0x904000, 0x907fff) AM_READ(SMH_RAM ) // Layers +/**/AM_RANGE(0x908000, 0x90bfff) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x90c000, 0x90ffff) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x920000, 0x923fff) AM_READ(SMH_RAM ) // ? 0 +/**/AM_RANGE(0x930000, 0x9307ff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0x940000, 0x947fff) AM_READ(SMH_RAM ) // Palette ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_burglarx, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xff0000, 0xffffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x800030, 0x800031) AM_WRITE(MWA16_NOP ) // ? 0 - AM_RANGE(0x80010c, 0x80010d) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrollx_0 ) // Scroll - AM_RANGE(0x80010e, 0x80010f) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrolly_0 ) // - AM_RANGE(0x800110, 0x800111) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrolly_2 ) // - AM_RANGE(0x800114, 0x800115) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrollx_2 ) // - AM_RANGE(0x800116, 0x800117) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrollx_1 ) // - AM_RANGE(0x800120, 0x800121) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrolly_1 ) // + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x800030, 0x800031) AM_WRITE(SMH_NOP ) // ? 0 + AM_RANGE(0x80010c, 0x80010d) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_0 ) // Scroll + AM_RANGE(0x80010e, 0x80010f) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrolly_0 ) // + AM_RANGE(0x800110, 0x800111) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrolly_2 ) // + AM_RANGE(0x800114, 0x800115) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_2 ) // + AM_RANGE(0x800116, 0x800117) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_1 ) // + AM_RANGE(0x800120, 0x800121) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrolly_1 ) // AM_RANGE(0x800188, 0x800189) AM_WRITE(OKIM6295_data_0_lsb_w ) // Sound AM_RANGE(0x80018a, 0x80018b) AM_WRITE(YM3812_data_port_0_msb_w ) // AM_RANGE(0x80018c, 0x80018d) AM_WRITE(YM3812_register_port_0_msb_w ) // AM_RANGE(0x80018e, 0x80018f) AM_WRITE(burglarx_sound_bank_w ) // - AM_RANGE(0x8001e0, 0x8001e1) AM_WRITE(MWA16_RAM ) // ? IRQ Ack + AM_RANGE(0x8001e0, 0x8001e1) AM_WRITE(SMH_RAM ) // ? IRQ Ack AM_RANGE(0x904000, 0x907fff) AM_WRITE(unico_vram_1_w) AM_BASE(&unico_vram_1 ) // Layers AM_RANGE(0x908000, 0x90bfff) AM_WRITE(unico_vram_2_w) AM_BASE(&unico_vram_2 ) // AM_RANGE(0x90c000, 0x90ffff) AM_WRITE(unico_vram_0_w) AM_BASE(&unico_vram_0 ) // - AM_RANGE(0x920000, 0x923fff) AM_WRITE(MWA16_RAM ) // ? 0 - AM_RANGE(0x930000, 0x9307ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x920000, 0x923fff) AM_WRITE(SMH_RAM ) // ? 0 + AM_RANGE(0x930000, 0x9307ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x940000, 0x947fff) AM_WRITE(unico_palette_w) AM_BASE(&paletteram16 ) // Palette ADDRESS_MAP_END @@ -167,8 +167,8 @@ static READ16_HANDLER( unico_guny_1_msb_r ) } static ADDRESS_MAP_START( readmem_zeropnt, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM ) // ROM - AM_RANGE(0xef0000, 0xefffff) AM_READ(MRA16_RAM ) // RAM + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0xef0000, 0xefffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x800018, 0x800019) AM_READ(input_port_0_word_r ) // Buttons AM_RANGE(0x80001a, 0x80001b) AM_READ(input_port_1_word_r ) // DSW AM_RANGE(0x80001c, 0x80001d) AM_READ(input_port_2_word_r ) // DSW @@ -178,34 +178,34 @@ static ADDRESS_MAP_START( readmem_zeropnt, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x80017c, 0x80017d) AM_READ(unico_gunx_1_msb_r ) // AM_RANGE(0x800188, 0x800189) AM_READ(OKIM6295_status_0_lsb_r ) // Sound AM_RANGE(0x80018c, 0x80018d) AM_READ(YM3812_status_port_0_msb_r ) // -/**/AM_RANGE(0x904000, 0x907fff) AM_READ(MRA16_RAM ) // Layers -/**/AM_RANGE(0x908000, 0x90bfff) AM_READ(MRA16_RAM ) // -/**/AM_RANGE(0x90c000, 0x90ffff) AM_READ(MRA16_RAM ) // -/**/AM_RANGE(0x920000, 0x923fff) AM_READ(MRA16_RAM ) // ? 0 -/**/AM_RANGE(0x930000, 0x9307ff) AM_READ(MRA16_RAM ) // Sprites -/**/AM_RANGE(0x940000, 0x947fff) AM_READ(MRA16_RAM ) // Palette +/**/AM_RANGE(0x904000, 0x907fff) AM_READ(SMH_RAM ) // Layers +/**/AM_RANGE(0x908000, 0x90bfff) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x90c000, 0x90ffff) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x920000, 0x923fff) AM_READ(SMH_RAM ) // ? 0 +/**/AM_RANGE(0x930000, 0x9307ff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0x940000, 0x947fff) AM_READ(SMH_RAM ) // Palette ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_zeropnt, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM ) // ROM - AM_RANGE(0xef0000, 0xefffff) AM_WRITE(MWA16_RAM ) // RAM - AM_RANGE(0x800030, 0x800031) AM_WRITE(MWA16_NOP ) // ? 0 - AM_RANGE(0x80010c, 0x80010d) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrollx_0 ) // Scroll - AM_RANGE(0x80010e, 0x80010f) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrolly_0 ) // - AM_RANGE(0x800110, 0x800111) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrolly_2 ) // - AM_RANGE(0x800114, 0x800115) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrollx_2 ) // - AM_RANGE(0x800116, 0x800117) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrollx_1 ) // - AM_RANGE(0x800120, 0x800121) AM_WRITE(MWA16_RAM) AM_BASE(&unico_scrolly_1 ) // + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM ) // ROM + AM_RANGE(0xef0000, 0xefffff) AM_WRITE(SMH_RAM ) // RAM + AM_RANGE(0x800030, 0x800031) AM_WRITE(SMH_NOP ) // ? 0 + AM_RANGE(0x80010c, 0x80010d) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_0 ) // Scroll + AM_RANGE(0x80010e, 0x80010f) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrolly_0 ) // + AM_RANGE(0x800110, 0x800111) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrolly_2 ) // + AM_RANGE(0x800114, 0x800115) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_2 ) // + AM_RANGE(0x800116, 0x800117) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_1 ) // + AM_RANGE(0x800120, 0x800121) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrolly_1 ) // AM_RANGE(0x800188, 0x800189) AM_WRITE(OKIM6295_data_0_lsb_w ) // Sound AM_RANGE(0x80018a, 0x80018b) AM_WRITE(YM3812_data_port_0_msb_w ) // AM_RANGE(0x80018c, 0x80018d) AM_WRITE(YM3812_register_port_0_msb_w ) // AM_RANGE(0x80018e, 0x80018f) AM_WRITE(zeropnt_sound_bank_w ) // - AM_RANGE(0x8001e0, 0x8001e1) AM_WRITE(MWA16_RAM ) // ? IRQ Ack + AM_RANGE(0x8001e0, 0x8001e1) AM_WRITE(SMH_RAM ) // ? IRQ Ack AM_RANGE(0x904000, 0x907fff) AM_WRITE(unico_vram_1_w) AM_BASE(&unico_vram_1 ) // Layers AM_RANGE(0x908000, 0x90bfff) AM_WRITE(unico_vram_2_w) AM_BASE(&unico_vram_2 ) // AM_RANGE(0x90c000, 0x90ffff) AM_WRITE(unico_vram_0_w) AM_BASE(&unico_vram_0 ) // - AM_RANGE(0x920000, 0x923fff) AM_WRITE(MWA16_RAM ) // ? 0 - AM_RANGE(0x930000, 0x9307ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x920000, 0x923fff) AM_WRITE(SMH_RAM ) // ? 0 + AM_RANGE(0x930000, 0x9307ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x940000, 0x947fff) AM_WRITE(unico_palette_w) AM_BASE(&paletteram16 ) // Palette ADDRESS_MAP_END @@ -273,7 +273,7 @@ static WRITE32_HANDLER( zeropnt2_eeprom_w ) } static ADDRESS_MAP_START( readmem_zeropnt2, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA32_ROM ) // ROM + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x800018, 0x80001b) AM_READ(zeropnt2_coins_r ) // Coins AM_RANGE(0x800024, 0x800027) AM_READ(zeropnt2_oki0_r ) // Sound AM_RANGE(0x80002c, 0x80002f) AM_READ(zeropnt2_ym2151_status_r ) // @@ -285,33 +285,33 @@ static ADDRESS_MAP_START( readmem_zeropnt2, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x800150, 0x800153) AM_READ(zeropnt2_dsw1_r ) // DSW AM_RANGE(0x800154, 0x800157) AM_READ(zeropnt2_dsw2_r ) // DSW AM_RANGE(0x80015c, 0x80015f) AM_READ(zeropnt2_buttons_r ) // Buttons -/**/AM_RANGE(0x904000, 0x907fff) AM_READ(MRA32_RAM ) // Layers -/**/AM_RANGE(0x908000, 0x90bfff) AM_READ(MRA32_RAM ) // -/**/AM_RANGE(0x90c000, 0x90ffff) AM_READ(MRA32_RAM ) // -/**/AM_RANGE(0x920000, 0x923fff) AM_READ(MRA32_RAM ) // ? 0 -/**/AM_RANGE(0x930000, 0x9307ff) AM_READ(MRA32_RAM ) // Sprites -/**/AM_RANGE(0x940000, 0x947fff) AM_READ(MRA32_RAM ) // Palette - AM_RANGE(0xfe0000, 0xffffff) AM_READ(MRA32_RAM ) // RAM +/**/AM_RANGE(0x904000, 0x907fff) AM_READ(SMH_RAM ) // Layers +/**/AM_RANGE(0x908000, 0x90bfff) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x90c000, 0x90ffff) AM_READ(SMH_RAM ) // +/**/AM_RANGE(0x920000, 0x923fff) AM_READ(SMH_RAM ) // ? 0 +/**/AM_RANGE(0x930000, 0x9307ff) AM_READ(SMH_RAM ) // Sprites +/**/AM_RANGE(0x940000, 0x947fff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM ) // RAM ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_zeropnt2, ADDRESS_SPACE_PROGRAM, 32 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA32_ROM ) // ROM + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x800024, 0x800027) AM_WRITE(zeropnt2_oki0_w ) // Sound AM_RANGE(0x800028, 0x80002b) AM_WRITE(zeropnt2_ym2151_reg_w ) // AM_RANGE(0x80002c, 0x80002f) AM_WRITE(zeropnt2_ym2151_data_w ) // AM_RANGE(0x800030, 0x800033) AM_WRITE(zeropnt2_oki1_w ) // AM_RANGE(0x800034, 0x800037) AM_WRITE(zeropnt2_sound_bank_w ) // AM_RANGE(0x800038, 0x80003b) AM_WRITE(zeropnt2_leds_w ) // ? - AM_RANGE(0x80010c, 0x800123) AM_WRITE(MWA32_RAM) AM_BASE(&unico_scroll32 ) // Scroll - AM_RANGE(0x8001e0, 0x8001e3) AM_WRITE(MWA32_RAM ) // ? IRQ Ack + AM_RANGE(0x80010c, 0x800123) AM_WRITE(SMH_RAM) AM_BASE(&unico_scroll32 ) // Scroll + AM_RANGE(0x8001e0, 0x8001e3) AM_WRITE(SMH_RAM ) // ? IRQ Ack AM_RANGE(0x8001f0, 0x8001f3) AM_WRITE(zeropnt2_eeprom_w ) // EEPROM AM_RANGE(0x904000, 0x907fff) AM_WRITE(unico_vram32_1_w) AM_BASE(&unico_vram32_1 ) // Layers AM_RANGE(0x908000, 0x90bfff) AM_WRITE(unico_vram32_2_w) AM_BASE(&unico_vram32_2 ) // AM_RANGE(0x90c000, 0x90ffff) AM_WRITE(unico_vram32_0_w) AM_BASE(&unico_vram32_0 ) // - AM_RANGE(0x920000, 0x923fff) AM_WRITE(MWA32_RAM ) // ? 0 - AM_RANGE(0x930000, 0x9307ff) AM_WRITE(MWA32_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size ) // Sprites + AM_RANGE(0x920000, 0x923fff) AM_WRITE(SMH_RAM ) // ? 0 + AM_RANGE(0x930000, 0x9307ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram32) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0x940000, 0x947fff) AM_WRITE(unico_palette32_w) AM_BASE(&paletteram32 ) // Palette - AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(MWA32_RAM ) // RAM + AM_RANGE(0xfe0000, 0xffffff) AM_WRITE(SMH_RAM ) // RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c index c725619c886..73fa59256c8 100644 --- a/src/mame/drivers/upscope.c +++ b/src/mame/drivers/upscope.c @@ -87,11 +87,11 @@ static void upscope_cia_0_porta_w(UINT8 data) /* 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(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, MWA16_BANK1); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, SMH_BANK1); else /* overlay enabled, map Amiga system ROM on 0x000000 */ - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, MWA16_UNMAP); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, SMH_UNMAP); } diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c index 1c301e0a957..2b809a79af5 100644 --- a/src/mame/drivers/usgames.c +++ b/src/mame/drivers/usgames.c @@ -69,35 +69,35 @@ static WRITE8_HANDLER( lamps2_w ) static ADDRESS_MAP_START( usgames_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x2000) AM_READ(input_port_1_r) AM_RANGE(0x2010, 0x2010) AM_READ(input_port_0_r) AM_RANGE(0x2041, 0x2041) AM_READ(input_port_2_r) AM_RANGE(0x2070, 0x2070) AM_READ(input_port_3_r) - AM_RANGE(0x2800, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x2800, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( usg185_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_RAM) AM_RANGE(0x2400, 0x2400) AM_READ(input_port_1_r) AM_RANGE(0x2410, 0x2410) AM_READ(input_port_0_r) AM_RANGE(0x2441, 0x2441) AM_READ(input_port_2_r) AM_RANGE(0x2470, 0x2470) AM_READ(input_port_3_r) - AM_RANGE(0x2800, 0x2fff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x3fff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x2800, 0x2fff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x3fff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( usgames_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x2020, 0x2020) AM_WRITE(lamps1_w) AM_RANGE(0x2030, 0x2030) AM_WRITE(lamps2_w) @@ -112,12 +112,12 @@ static ADDRESS_MAP_START( usgames_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2fff) AM_WRITE(usgames_charram_w) AM_BASE(&usgames_charram) AM_RANGE(0x3000, 0x3fff) AM_WRITE(usgames_videoram_w) AM_BASE(&usgames_videoram) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( usg185_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x2420, 0x2420) AM_WRITE(lamps1_w) AM_RANGE(0x2430, 0x2430) AM_WRITE(lamps2_w) @@ -132,8 +132,8 @@ static ADDRESS_MAP_START( usg185_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2800, 0x2fff) AM_WRITE(usgames_charram_w) AM_BASE(&usgames_charram) AM_RANGE(0x3000, 0x3fff) AM_WRITE(usgames_videoram_w) AM_BASE(&usgames_videoram) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END #define USGIN0\ diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index ec85bedcebe..b6c0001759e 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -52,41 +52,41 @@ static READ16_HANDLER( vaportra_control_r ) /******************************************************************************/ static ADDRESS_MAP_START( vaportra_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x10000f) AM_READ(vaportra_control_r) - AM_RANGE(0x200000, 0x201fff) AM_READ(MRA16_RAM) - AM_RANGE(0x202000, 0x203fff) AM_READ(MRA16_RAM) - AM_RANGE(0x280000, 0x281fff) AM_READ(MRA16_RAM) - AM_RANGE(0x282000, 0x283fff) AM_READ(MRA16_RAM) + AM_RANGE(0x200000, 0x201fff) AM_READ(SMH_RAM) + AM_RANGE(0x202000, 0x203fff) AM_READ(SMH_RAM) + AM_RANGE(0x280000, 0x281fff) AM_READ(SMH_RAM) + AM_RANGE(0x282000, 0x283fff) AM_READ(SMH_RAM) - AM_RANGE(0x300000, 0x300fff) AM_READ(MRA16_RAM) - AM_RANGE(0x304000, 0x304fff) AM_READ(MRA16_RAM) - AM_RANGE(0x308000, 0x308001) AM_READ(MRA16_NOP) - AM_RANGE(0xff8000, 0xff87ff) AM_READ(MRA16_RAM) - AM_RANGE(0xffc000, 0xffffff) AM_READ(MRA16_RAM) + AM_RANGE(0x300000, 0x300fff) AM_READ(SMH_RAM) + AM_RANGE(0x304000, 0x304fff) AM_READ(SMH_RAM) + AM_RANGE(0x308000, 0x308001) AM_READ(SMH_NOP) + AM_RANGE(0xff8000, 0xff87ff) AM_READ(SMH_RAM) + AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( vaportra_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100003) AM_WRITE(vaportra_priority_w) AM_RANGE(0x100006, 0x100007) AM_WRITE(vaportra_sound_w) AM_RANGE(0x200000, 0x201fff) AM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x202000, 0x203fff) AM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) - AM_RANGE(0x240000, 0x24000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x240000, 0x24000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) AM_RANGE(0x280000, 0x281fff) AM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x282000, 0x283fff) AM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) - AM_RANGE(0x2c0000, 0x2c000f) AM_WRITE(MWA16_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x2c0000, 0x2c000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) AM_RANGE(0x300000, 0x3009ff) AM_WRITE(vaportra_palette_24bit_rg_w) AM_BASE(&paletteram16) AM_RANGE(0x304000, 0x3049ff) AM_WRITE(vaportra_palette_24bit_b_w) AM_BASE(&paletteram16_2) - AM_RANGE(0x308000, 0x308001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x308000, 0x308001) AM_WRITE(SMH_NOP) AM_RANGE(0x30c000, 0x30c001) AM_WRITE(buffer_spriteram16_w) - AM_RANGE(0xff8000, 0xff87ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) - AM_RANGE(0xffc000, 0xffffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0xff8000, 0xff87ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END /******************************************************************************/ @@ -122,22 +122,22 @@ static WRITE8_HANDLER( YM2203_w ) } static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_READ(MRA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x120000, 0x120001) AM_READ(OKIM6295_status_0_r) AM_RANGE(0x130000, 0x130001) AM_READ(OKIM6295_status_1_r) AM_RANGE(0x140000, 0x140001) AM_READ(vaportra_soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(MRA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x000000, 0x00ffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x100000, 0x100001) AM_WRITE(YM2203_w) AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_w) AM_RANGE(0x120000, 0x120001) AM_WRITE(OKIM6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(OKIM6295_data_1_w) - AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(MWA8_BANK8) + AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_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/vastar.c b/src/mame/drivers/vastar.c index d73d648a832..0ba1609c893 100644 --- a/src/mame/drivers/vastar.c +++ b/src/mame/drivers/vastar.c @@ -115,35 +115,35 @@ static WRITE8_HANDLER( flip_screen_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_READ(vastar_bg2videoram_r) AM_RANGE(0x9000, 0x9fff) AM_READ(vastar_bg1videoram_r) AM_RANGE(0xa000, 0xafff) AM_READ(vastar_bg2videoram_r) /* mirror address */ AM_RANGE(0xb000, 0xbfff) AM_READ(vastar_bg1videoram_r) /* mirror address */ - AM_RANGE(0xc400, 0xcfff) AM_READ(MRA8_RAM) + AM_RANGE(0xc400, 0xcfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(watchdog_reset_r) AM_RANGE(0xf000, 0xf0ff) AM_READ(vastar_sharedram_r) - AM_RANGE(0xf100, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xf100, 0xf7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) AM_RANGE(0x8000, 0x8fff) AM_WRITE(vastar_bg2videoram_w) AM_BASE(&vastar_bg2videoram) AM_RANGE(0x9000, 0x9fff) AM_WRITE(vastar_bg1videoram_w) AM_BASE(&vastar_bg1videoram) AM_RANGE(0xa000, 0xafff) AM_WRITE(vastar_bg2videoram_w) /* mirror address */ AM_RANGE(0xb000, 0xbfff) AM_WRITE(vastar_bg1videoram_w) /* mirror address */ - AM_RANGE(0xc000, 0xc000) AM_WRITE(MWA8_RAM) AM_BASE(&vastar_sprite_priority) /* sprite/BG priority */ + AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_RAM) AM_BASE(&vastar_sprite_priority) /* sprite/BG priority */ AM_RANGE(0xc400, 0xcfff) AM_WRITE(vastar_fgvideoram_w) AM_BASE(&vastar_fgvideoram) AM_RANGE(0xe000, 0xe000) AM_WRITE(watchdog_reset_w) AM_RANGE(0xf000, 0xf0ff) AM_WRITE(vastar_sharedram_w) AM_BASE(&vastar_sharedram) - AM_RANGE(0xf100, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xf100, 0xf7ff) AM_WRITE(SMH_RAM) /* in hidden portions of video RAM: */ - AM_RANGE(0xc400, 0xc43f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* actually c410-c41f and c430-c43f */ - AM_RANGE(0xc7c0, 0xc7df) AM_WRITE(MWA8_RAM) AM_BASE(&vastar_bg1_scroll) - AM_RANGE(0xc7e0, 0xc7ff) AM_WRITE(MWA8_RAM) AM_BASE(&vastar_bg2_scroll) - AM_RANGE(0xc800, 0xc83f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) /* actually c810-c81f and c830-c83f */ - AM_RANGE(0xcc00, 0xcc3f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_3) /* actually cc10-cc1f and cc30-cc3f */ + AM_RANGE(0xc400, 0xc43f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* actually c410-c41f and c430-c43f */ + AM_RANGE(0xc7c0, 0xc7df) AM_WRITE(SMH_RAM) AM_BASE(&vastar_bg1_scroll) + AM_RANGE(0xc7e0, 0xc7ff) AM_WRITE(SMH_RAM) AM_BASE(&vastar_bg2_scroll) + AM_RANGE(0xc800, 0xc83f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) /* actually c810-c81f and c830-c83f */ + AM_RANGE(0xcc00, 0xcc3f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_3) /* actually cc10-cc1f and cc30-cc3f */ ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) @@ -154,7 +154,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x40ff) AM_READ(vastar_sharedram_r) AM_RANGE(0x8000, 0x8000) AM_READ(input_port_1_r) AM_RANGE(0x8040, 0x8040) AM_READ(input_port_0_r) @@ -162,7 +162,7 @@ static ADDRESS_MAP_START( cpu2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x40ff) AM_WRITE(vastar_sharedram_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index 90e9d0e47b9..5380915ee1b 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -167,7 +167,7 @@ static WRITE8_HANDLER( vb_scrollx_hi_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_READ(input_port_0_r) AM_RANGE(0x1001, 0x1001) AM_READ(input_port_1_r) AM_RANGE(0x1002, 0x1002) AM_READ(input_port_2_r) @@ -175,21 +175,21 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1004, 0x1004) AM_READ(input_port_4_r) AM_RANGE(0x1005, 0x1005) AM_READ(input_port_5_r) AM_RANGE(0x1006, 0x1006) AM_READ(input_port_6_r) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( vball2pj_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_RANGE(0x1000, 0x1000) AM_READ(input_port_0_r) AM_RANGE(0x1001, 0x1001) AM_READ(input_port_1_r) AM_RANGE(0x1002, 0x1002) AM_READ(input_port_2_r) AM_RANGE(0x1003, 0x1003) AM_READ(input_port_3_r) AM_RANGE(0x1004, 0x1004) AM_READ(input_port_4_r) - AM_RANGE(0x1005, 0x1005) AM_READ(MRA8_RAM) //Strange, that these are read! - AM_RANGE(0x1006, 0x1006) AM_READ(MRA8_RAM) //Strange, that these are read! - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x1005, 0x1005) AM_READ(SMH_RAM) //Strange, that these are read! + AM_RANGE(0x1006, 0x1006) AM_READ(SMH_RAM) //Strange, that these are read! + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static WRITE8_HANDLER(vb_scrollx_lo_w) @@ -200,31 +200,31 @@ static WRITE8_HANDLER(vb_scrollx_lo_w) //Cheaters note: Scores are stored in ram @ 0x57-0x58 (though the space is used for other things between matches) static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x0800, 0x08ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x0800, 0x08ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x1008, 0x1008) AM_WRITE(vb_scrollx_hi_w) AM_RANGE(0x1009, 0x1009) AM_WRITE(vb_bankswitch_w) - AM_RANGE(0x100a, 0x100a) AM_WRITE(MWA8_RAM) - AM_RANGE(0x100b, 0x100b) AM_WRITE(MWA8_RAM) //Counts from 0 to 7 continuously + AM_RANGE(0x100a, 0x100a) AM_WRITE(SMH_RAM) + AM_RANGE(0x100b, 0x100b) AM_WRITE(SMH_RAM) //Counts from 0 to 7 continuously AM_RANGE(0x100c, 0x100c) AM_WRITE(vb_scrollx_lo_w) AM_RANGE(0x100d, 0x100d) AM_WRITE(cpu_sound_command_w) - AM_RANGE(0x100e, 0x100e) AM_WRITE(MWA8_RAM) AM_BASE(&vb_scrolly_lo) + 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, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8801, 0x8801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x9800, 0x9803) AM_WRITE(OKIM6295_data_0_w) diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c index db1a2aafce0..65a82e74c8a 100644 --- a/src/mame/drivers/vegas.c +++ b/src/mame/drivers/vegas.c @@ -1559,8 +1559,8 @@ static void remap_dynamic_addresses(void) /* unmap everything we know about */ for (addr = 0; addr < dynamic_count; addr++) { - memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, dynamic[addr].start, dynamic[addr].end, 0, 0, MRA32_NOP); - memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, dynamic[addr].start, dynamic[addr].end, 0, 0, MWA32_NOP); + memory_install_read32_handler(0, ADDRESS_SPACE_PROGRAM, dynamic[addr].start, dynamic[addr].end, 0, 0, SMH_NOP); + memory_install_write32_handler(0, ADDRESS_SPACE_PROGRAM, dynamic[addr].start, dynamic[addr].end, 0, 0, SMH_NOP); } /* the build the list of stuff */ @@ -1575,7 +1575,7 @@ static void remap_dynamic_addresses(void) add_dynamic_address(base + 0x2000, base + 0x2003, sio_irq_cause_r, NULL); add_dynamic_address(base + 0x3000, base + 0x3003, sio_irq_status_r, NULL); add_dynamic_address(base + 0x4000, base + 0x4003, sio_led_r, sio_led_w); - add_dynamic_address(base + 0x5000, base + 0x5007, MRA32_NOP, NULL); + add_dynamic_address(base + 0x5000, base + 0x5007, SMH_NOP, NULL); add_dynamic_address(base + 0x6000, base + 0x6003, NULL, cmos_unlock_w); add_dynamic_address(base + 0x7000, base + 0x7003, NULL, vegas_watchdog_w); } diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index 885754163fd..de534c162f3 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -205,7 +205,7 @@ static void vendetta_video_banking( int select ) { if ( select & 1 ) { - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, MRA8_BANK4, paletteram_xBBBBBGGGGGRRRRR_be_w ); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, video_banking_base + 0x2000, video_banking_base + 0x2fff, 0, 0, SMH_BANK4, paletteram_xBBBBBGGGGGRRRRR_be_w ); memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, video_banking_base + 0x0000, video_banking_base + 0x0fff, 0, 0, K053247_r, K053247_w ); memory_set_bankptr(4, paletteram); } @@ -264,8 +264,8 @@ static READ8_HANDLER( vendetta_sound_r ) /********************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_BANK1 ) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_BANK1 ) + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_RAM) AM_RANGE(0x5f80, 0x5f9f) AM_READ(K054000_r) AM_RANGE(0x5fc0, 0x5fc0) AM_READ(input_port_0_r) AM_RANGE(0x5fc1, 0x5fc1) AM_READ(input_port_1_r) @@ -278,15 +278,15 @@ static ADDRESS_MAP_START( readmem, 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_READ(MRA8_BANK3) - AM_RANGE(0x6000, 0x6fff) AM_READ(MRA8_BANK2) + AM_RANGE(0x4000, 0x4fff) AM_READ(SMH_BANK3) + AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_BANK2) AM_RANGE(0x4000, 0x7fff) AM_READ(K052109_r) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_RAM) AM_RANGE(0x5f80, 0x5f9f) AM_WRITE(K054000_w) AM_RANGE(0x5fa0, 0x5faf) AM_WRITE(K053251_w) AM_RANGE(0x5fb0, 0x5fb7) AM_WRITE(K053246_w) @@ -295,14 +295,14 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5fe4, 0x5fe4) AM_WRITE(z80_irq_w) AM_RANGE(0x5fe6, 0x5fe7) AM_WRITE(K053260_0_w) /* what is the desired effect of overlapping these memory regions anyway? */ - AM_RANGE(0x4000, 0x4fff) AM_WRITE(MWA8_BANK3) - AM_RANGE(0x6000, 0x6fff) AM_WRITE(MWA8_BANK2) + AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_BANK3) + AM_RANGE(0x6000, 0x6fff) AM_WRITE(SMH_BANK2) AM_RANGE(0x4000, 0x7fff) AM_WRITE(K052109_w) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( esckids_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_RAM) // 053248 64K SRAM + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_RAM) // 053248 64K SRAM AM_RANGE(0x3f80, 0x3f80) AM_READ(input_port_0_r) // Player 1 Control AM_RANGE(0x3f81, 0x3f81) AM_READ(input_port_1_r) // Player 2 Control AM_RANGE(0x3f82, 0x3f82) AM_READ(input_port_4_r) // Player 3 Control ??? (But not used) @@ -313,42 +313,42 @@ static ADDRESS_MAP_START( esckids_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3fd6, 0x3fd7) AM_READ(vendetta_sound_r) // Sound AM_RANGE(0x3fd8, 0x3fd9) AM_READ(K053246_r) // 053246 (Sprite) /* what is the desired effect of overlapping these memory regions anyway? */ - AM_RANGE(0x2000, 0x2fff) AM_READ(MRA8_BANK3) // 052109 (Tilemap) 0x0000-0x0fff - AM_RANGE(0x4000, 0x4fff) AM_READ(MRA8_BANK2) // 052109 (Tilemap) 0x2000-0x3fff, Tilemap MASK-ROM bank selector (MASK-ROM Test) + AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_BANK3) // 052109 (Tilemap) 0x0000-0x0fff + AM_RANGE(0x4000, 0x4fff) AM_READ(SMH_BANK2) // 052109 (Tilemap) 0x2000-0x3fff, Tilemap MASK-ROM bank selector (MASK-ROM Test) AM_RANGE(0x2000, 0x5fff) AM_READ(K052109_r) // 052109 (Tilemap) - AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_BANK1) // 053248 '975r01' 1M ROM (Banked) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) // 053248 '975r01' 1M ROM (0x18000-0x1ffff) + AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) // 053248 '975r01' 1M ROM (Banked) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) // 053248 '975r01' 1M ROM (0x18000-0x1ffff) ADDRESS_MAP_END static ADDRESS_MAP_START( esckids_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_RAM) // 053248 64K SRAM + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_RAM) // 053248 64K SRAM AM_RANGE(0x3fa0, 0x3fa7) AM_WRITE(K053246_w) // 053246 (Sprite) AM_RANGE(0x3fb0, 0x3fbf) AM_WRITE(K053251_w) // 053251 (Priority Encoder) - AM_RANGE(0x3fc0, 0x3fcf) AM_WRITE(MWA8_NOP) // Not Emulated (053252 ???) + AM_RANGE(0x3fc0, 0x3fcf) AM_WRITE(SMH_NOP) // Not Emulated (053252 ???) AM_RANGE(0x3fd0, 0x3fd0) AM_WRITE(vendetta_5fe0_w) // Coin Counter, 052109 RMRD, 053246 OBJCHA AM_RANGE(0x3fd2, 0x3fd2) AM_WRITE(vendetta_eeprom_w) // EEPROM, Video banking AM_RANGE(0x3fd4, 0x3fd4) AM_WRITE(z80_irq_w) // Sound AM_RANGE(0x3fd6, 0x3fd7) AM_WRITE(K053260_0_w) // Sound - AM_RANGE(0x3fda, 0x3fda) AM_WRITE(MWA8_NOP) // Not Emulated (Watchdog ???) + AM_RANGE(0x3fda, 0x3fda) AM_WRITE(SMH_NOP) // Not Emulated (Watchdog ???) /* what is the desired effect of overlapping these memory regions anyway? */ - AM_RANGE(0x2000, 0x2fff) AM_WRITE(MWA8_BANK3) // 052109 (Tilemap) 0x0000-0x0fff - AM_RANGE(0x4000, 0x4fff) AM_WRITE(MWA8_BANK2) // 052109 (Tilemap) 0x2000-0x3fff, Tilemap MASK-ROM bank selector (MASK-ROM Test) + AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_BANK3) // 052109 (Tilemap) 0x0000-0x0fff + AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_BANK2) // 052109 (Tilemap) 0x2000-0x3fff, Tilemap MASK-ROM bank selector (MASK-ROM Test) AM_RANGE(0x2000, 0x5fff) AM_WRITE(K052109_w) // 052109 (Tilemap) - AM_RANGE(0x6000, 0x7fff) AM_WRITE(MWA8_ROM) // 053248 '975r01' 1M ROM (Banked) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) // 053248 '975r01' 1M ROM (0x18000-0x1ffff) + AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_ROM) // 053248 '975r01' 1M ROM (Banked) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) // 053248 '975r01' 1M ROM (0x18000-0x1ffff) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xfc00, 0xfc2f) AM_READ(K053260_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xfa00, 0xfa00) AM_WRITE(z80_arm_nmi_w) diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c index aabf258e017..463652a6ff9 100644 --- a/src/mame/drivers/vicdual.c +++ b/src/mame/drivers/vicdual.c @@ -287,9 +287,9 @@ static WRITE8_HANDLER( depthch_io_w ) static ADDRESS_MAP_START( depthch_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM - AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_READWRITE(MRA8_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) + AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_READWRITE(SMH_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) AM_RANGE(0x8400, 0x87ff) AM_MIRROR(0x7000) AM_RAM - AM_RANGE(0x8800, 0x8fff) AM_MIRROR(0x7000) AM_READWRITE(MRA8_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) + AM_RANGE(0x8800, 0x8fff) AM_MIRROR(0x7000) AM_READWRITE(SMH_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) ADDRESS_MAP_END @@ -371,9 +371,9 @@ static ADDRESS_MAP_START( safari_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_NOP /* unused */ AM_RANGE(0x8000, 0x8fff) AM_MIRROR(0x3000) AM_RAM - AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_READWRITE(MRA8_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) + AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_READWRITE(SMH_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) AM_RANGE(0xc400, 0xc7ff) AM_MIRROR(0x3000) AM_RAM - AM_RANGE(0xc800, 0xcfff) AM_MIRROR(0x3000) AM_READWRITE(MRA8_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) + AM_RANGE(0xc800, 0xcfff) AM_MIRROR(0x3000) AM_READWRITE(SMH_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) ADDRESS_MAP_END @@ -453,9 +453,9 @@ static WRITE8_HANDLER( frogs_io_w ) static ADDRESS_MAP_START( frogs_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM - AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_READWRITE(MRA8_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) + AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_READWRITE(SMH_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) AM_RANGE(0x8400, 0x87ff) AM_MIRROR(0x7000) AM_RAM - AM_RANGE(0x8800, 0x8fff) AM_MIRROR(0x7000) AM_READWRITE(MRA8_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) + AM_RANGE(0x8800, 0x8fff) AM_MIRROR(0x7000) AM_READWRITE(SMH_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) ADDRESS_MAP_END @@ -575,9 +575,9 @@ static WRITE8_HANDLER( headon_io_w ) static ADDRESS_MAP_START( headon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x6000) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_NOP /* unused */ - AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_READWRITE(MRA8_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) + AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_READWRITE(SMH_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) AM_RANGE(0xc400, 0xc7ff) AM_MIRROR(0x3000) AM_RAM - AM_RANGE(0xc800, 0xcfff) AM_MIRROR(0x3000) AM_READWRITE(MRA8_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) + AM_RANGE(0xc800, 0xcfff) AM_MIRROR(0x3000) AM_READWRITE(SMH_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) ADDRESS_MAP_END @@ -785,9 +785,9 @@ static WRITE8_HANDLER( digger_io_w ) static ADDRESS_MAP_START( headon2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x6000) AM_ROM /* AM_RANGE(0x8000, 0x80ff) AM_MIRROR(0x3f00) */ /* schematics show this as battery backed RAM, but doesn't appear to be used */ - AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_READWRITE(MRA8_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) + AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_READWRITE(SMH_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) AM_RANGE(0xc400, 0xc7ff) AM_MIRROR(0x3000) AM_RAM - AM_RANGE(0xc800, 0xcfff) AM_MIRROR(0x3000) AM_READWRITE(MRA8_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) + AM_RANGE(0xc800, 0xcfff) AM_MIRROR(0x3000) AM_READWRITE(SMH_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) ADDRESS_MAP_END @@ -1056,9 +1056,9 @@ static WRITE8_HANDLER( alphaho_io_w ) static ADDRESS_MAP_START( vicdual_dualgame_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM - AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_READWRITE(MRA8_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) + AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_READWRITE(SMH_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) AM_RANGE(0x8400, 0x87ff) AM_MIRROR(0x7000) AM_RAM - AM_RANGE(0x8800, 0x8fff) AM_MIRROR(0x7000) AM_READWRITE(MRA8_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) + AM_RANGE(0x8800, 0x8fff) AM_MIRROR(0x7000) AM_READWRITE(SMH_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) ADDRESS_MAP_END @@ -1998,10 +1998,10 @@ static WRITE8_HANDLER( samurai_io_w ) /* dual game hardware */ static ADDRESS_MAP_START( samurai_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_READWRITE(MRA8_ROM, samurai_protection_w) - AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_READWRITE(MRA8_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) + AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_READWRITE(SMH_ROM, samurai_protection_w) + AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_READWRITE(SMH_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) AM_RANGE(0x8400, 0x87ff) AM_MIRROR(0x7000) AM_RAM - AM_RANGE(0x8800, 0x8fff) AM_MIRROR(0x7000) AM_READWRITE(MRA8_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) + AM_RANGE(0x8800, 0x8fff) AM_MIRROR(0x7000) AM_READWRITE(SMH_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) ADDRESS_MAP_END @@ -2117,9 +2117,9 @@ static WRITE8_HANDLER( nsub_io_w ) static ADDRESS_MAP_START( nsub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_NOP /* unused */ - AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_READWRITE(MRA8_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) + AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_READWRITE(SMH_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) AM_RANGE(0xc400, 0xc7ff) AM_MIRROR(0x3000) AM_RAM - AM_RANGE(0xc800, 0xcfff) AM_MIRROR(0x3000) AM_READWRITE(MRA8_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) + AM_RANGE(0xc800, 0xcfff) AM_MIRROR(0x3000) AM_READWRITE(SMH_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) ADDRESS_MAP_END @@ -2213,9 +2213,9 @@ static WRITE8_HANDLER( invinco_io_w ) static ADDRESS_MAP_START( invinco_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_NOP /* unused */ - AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_READWRITE(MRA8_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) + AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_READWRITE(SMH_RAM, vicdual_videoram_w) AM_BASE(&vicdual_videoram) AM_RANGE(0xc400, 0xc7ff) AM_MIRROR(0x3000) AM_RAM - AM_RANGE(0xc800, 0xcfff) AM_MIRROR(0x3000) AM_READWRITE(MRA8_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) + AM_RANGE(0xc800, 0xcfff) AM_MIRROR(0x3000) AM_READWRITE(SMH_RAM, vicdual_characterram_w) AM_BASE(&vicdual_characterram) ADDRESS_MAP_END diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c index 826a15c2133..8db1f7cecd4 100644 --- a/src/mame/drivers/videopin.c +++ b/src/mame/drivers/videopin.c @@ -193,17 +193,17 @@ static WRITE8_HANDLER( videopin_note_dvsr_w ) *************************************/ static ADDRESS_MAP_START( videopin_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x0800, 0x0800) AM_READ(videopin_misc_r) AM_RANGE(0x1000, 0x1000) AM_READ(input_port_0_r) AM_RANGE(0x1800, 0x1800) AM_READ(input_port_1_r) - AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) /* mirror for 6502 vectors */ + AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) /* mirror for 6502 vectors */ ADDRESS_MAP_END static ADDRESS_MAP_START( videopin_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x01ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM) AM_RANGE(0x0200, 0x07ff) AM_WRITE(videopin_video_ram_w) AM_BASE(&videopin_video_ram) AM_RANGE(0x0800, 0x0800) AM_WRITE(videopin_note_dvsr_w) AM_RANGE(0x0801, 0x0801) AM_WRITE(videopin_led_w) @@ -211,7 +211,7 @@ static ADDRESS_MAP_START( videopin_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0804, 0x0804) AM_WRITE(videopin_ball_w) AM_RANGE(0x0805, 0x0805) AM_WRITE(videopin_out1_w) AM_RANGE(0x0806, 0x0806) AM_WRITE(videopin_out2_w) - AM_RANGE(0x2000, 0x3fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x2000, 0x3fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c index 7f284bfab5f..4a2800ad64d 100644 --- a/src/mame/drivers/vigilant.c +++ b/src/mame/drivers/vigilant.c @@ -71,20 +71,20 @@ static WRITE8_HANDLER( kikcubic_coin_w ) static ADDRESS_MAP_START( vigilant_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc020, 0xc0df) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc020, 0xc0df) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( vigilant_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc020, 0xc0df) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc020, 0xc0df) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc800, 0xcfff) AM_WRITE(vigilant_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( vigilant_readport, ADDRESS_SPACE_IO, 8 ) @@ -107,20 +107,20 @@ static ADDRESS_MAP_START( vigilant_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( kikcubic_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK1) - AM_RANGE(0xc000, 0xc0ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc800, 0xcaff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) + AM_RANGE(0xc000, 0xc0ff) AM_READ(SMH_RAM) + AM_RANGE(0xc800, 0xcaff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( kikcubic_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc0ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc0ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc800, 0xcaff) AM_WRITE(vigilant_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( kikcubic_readport, ADDRESS_SPACE_IO, 8 ) @@ -137,17 +137,17 @@ static ADDRESS_MAP_START( kikcubic_writeport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_WRITE(kikcubic_coin_w) /* also flip screen, and...? */ AM_RANGE(0x04, 0x04) AM_WRITE(vigilant_bank_select_w) AM_RANGE(0x06, 0x06) AM_WRITE(m72_sound_command_byte_w) -// AM_RANGE(0x07, 0x07) AM_WRITE(MWA8_NOP) /* ?? */ +// AM_RANGE(0x07, 0x07) AM_WRITE(SMH_NOP) /* ?? */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) @@ -168,13 +168,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( buccanrs_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( buccanrs_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( buccanrs_sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c index 510a53d3c8c..02a178a8fd8 100644 --- a/src/mame/drivers/vindictr.c +++ b/src/mame/drivers/vindictr.c @@ -91,14 +91,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x260030, 0x260031) AM_READ(atarigen_sound_r) AM_RANGE(0x2e0000, 0x2e0001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x360000, 0x360001) AM_WRITE(atarigen_scanline_int_ack_w) - AM_RANGE(0x360010, 0x360011) AM_WRITE(MWA16_NOP) + AM_RANGE(0x360010, 0x360011) AM_WRITE(SMH_NOP) AM_RANGE(0x360020, 0x360021) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0x360030, 0x360031) AM_WRITE(atarigen_sound_w) - AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(MRA16_RAM, vindictr_paletteram_w) AM_BASE(&paletteram16) - AM_RANGE(0x3f0000, 0x3f1fff) AM_MIRROR(0x8000) AM_READWRITE(MRA16_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0x3f2000, 0x3f3fff) AM_MIRROR(0x8000) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0x3f4000, 0x3f4f7f) AM_MIRROR(0x8000) AM_READWRITE(MRA16_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) - AM_RANGE(0x3f4f80, 0x3f4fff) AM_MIRROR(0x8000) AM_READWRITE(MRA16_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) + AM_RANGE(0x3e0000, 0x3e0fff) AM_READWRITE(SMH_RAM, vindictr_paletteram_w) AM_BASE(&paletteram16) + AM_RANGE(0x3f0000, 0x3f1fff) AM_MIRROR(0x8000) AM_READWRITE(SMH_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0x3f2000, 0x3f3fff) AM_MIRROR(0x8000) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0x3f4000, 0x3f4f7f) AM_MIRROR(0x8000) AM_READWRITE(SMH_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) + AM_RANGE(0x3f4f80, 0x3f4fff) AM_MIRROR(0x8000) AM_READWRITE(SMH_RAM, atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x3f5000, 0x3f7fff) AM_MIRROR(0x8000) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index a5e4015ec77..764317a4867 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -215,18 +215,18 @@ static WRITE16_HANDLER( vmetal_es8712_w ) static ADDRESS_MAP_START( varia_program_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM - AM_RANGE(0x100000, 0x11ffff) AM_READWRITE(MRA16_RAM, vmetal_texttileram_w) AM_BASE(&vmetal_texttileram) - AM_RANGE(0x120000, 0x13ffff) AM_READWRITE(MRA16_RAM, vmetal_mid1tileram_w) AM_BASE(&vmetal_mid1tileram) - AM_RANGE(0x140000, 0x15ffff) AM_READWRITE(MRA16_RAM, vmetal_mid2tileram_w) AM_BASE(&vmetal_mid2tileram) + AM_RANGE(0x100000, 0x11ffff) AM_READWRITE(SMH_RAM, vmetal_texttileram_w) AM_BASE(&vmetal_texttileram) + AM_RANGE(0x120000, 0x13ffff) AM_READWRITE(SMH_RAM, vmetal_mid1tileram_w) AM_BASE(&vmetal_mid1tileram) + AM_RANGE(0x140000, 0x15ffff) AM_READWRITE(SMH_RAM, vmetal_mid2tileram_w) AM_BASE(&vmetal_mid2tileram) AM_RANGE(0x160000, 0x16ffff) AM_READ(varia_crom_read) // cgrom read window .. - AM_RANGE(0x170000, 0x173fff) AM_READWRITE(MRA16_RAM,metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette + AM_RANGE(0x170000, 0x173fff) AM_READWRITE(SMH_RAM,metro_paletteram_w) AM_BASE(&paletteram16 ) // Palette AM_RANGE(0x174000, 0x174fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x175000, 0x177fff) AM_RAM AM_RANGE(0x178000, 0x1787ff) AM_RAM AM_BASE(&vmetal_tlookup) AM_RANGE(0x178800, 0x1796ff) AM_RAM AM_BASE(&vmetal_videoregs) - AM_RANGE(0x179700, 0x179713) AM_WRITE(MWA16_RAM) AM_BASE(&metro_videoregs ) // Video Registers + AM_RANGE(0x179700, 0x179713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs ) // Video Registers AM_RANGE(0x200000, 0x200001) AM_READWRITE(input_port_0_word_r, vmetal_control_w) AM_RANGE(0x200002, 0x200003) AM_READ(input_port_1_word_r ) diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c index d1edd238764..9110dd7ddb7 100644 --- a/src/mame/drivers/volfied.c +++ b/src/mame/drivers/volfied.c @@ -69,12 +69,12 @@ VIDEO_START( volfied ); ***********************************************************/ static ADDRESS_MAP_START( volfied_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) /* program */ - AM_RANGE(0x080000, 0x0fffff) AM_READ(MRA16_ROM) /* tiles */ - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* main */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) /* program */ + AM_RANGE(0x080000, 0x0fffff) AM_READ(SMH_ROM) /* tiles */ + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) /* main */ AM_RANGE(0x200000, 0x203fff) AM_READ(PC090OJ_word_0_r) AM_RANGE(0x400000, 0x47ffff) AM_READ(volfied_video_ram_r) - AM_RANGE(0x500000, 0x503fff) AM_READ(MRA16_RAM) + AM_RANGE(0x500000, 0x503fff) AM_READ(SMH_RAM) AM_RANGE(0xd00000, 0xd00001) AM_READ(volfied_video_ctrl_r) AM_RANGE(0xe00002, 0xe00003) AM_READ(taitosound_comm16_lsb_r) AM_RANGE(0xf00000, 0xf007ff) AM_READ(volfied_cchip_ram_r) @@ -82,9 +82,9 @@ static ADDRESS_MAP_START( volfied_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( volfied_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) /* program */ - AM_RANGE(0x080000, 0x0fffff) AM_WRITE(MWA16_ROM) /* tiles */ - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) /* main */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) /* program */ + AM_RANGE(0x080000, 0x0fffff) AM_WRITE(SMH_ROM) /* tiles */ + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) /* main */ AM_RANGE(0x200000, 0x203fff) AM_WRITE(PC090OJ_word_0_w) AM_RANGE(0x400000, 0x47ffff) AM_WRITE(volfied_video_ram_w) AM_RANGE(0x500000, 0x503fff) AM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) @@ -99,21 +99,21 @@ static ADDRESS_MAP_START( volfied_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8801, 0x8801) AM_READ(taitosound_slave_comm_r) AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x9001, 0x9001) AM_READ(YM2203_read_port_0_r) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0x8801, 0x8801) AM_WRITE(taitosound_slave_comm_w) AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w) AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w) - AM_RANGE(0x9800, 0x9800) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0x9800, 0x9800) AM_WRITE(SMH_NOP) /* ? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c index 696c1d036bb..2ccafc227c2 100644 --- a/src/mame/drivers/vulgus.c +++ b/src/mame/drivers/vulgus.c @@ -69,38 +69,38 @@ static INTERRUPT_GEN( vulgus_interrupt ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x9fff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r) AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r) AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r) AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r) AM_RANGE(0xc004, 0xc004) AM_READ(input_port_4_r) - AM_RANGE(0xd000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0xd000, 0xefff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x9fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w) - AM_RANGE(0xc802, 0xc803) AM_WRITE(MWA8_RAM) AM_BASE(&vulgus_scroll_low) + AM_RANGE(0xc802, 0xc803) AM_WRITE(SMH_RAM) AM_BASE(&vulgus_scroll_low) AM_RANGE(0xc804, 0xc804) AM_WRITE(vulgus_c804_w) AM_RANGE(0xc805, 0xc805) AM_WRITE(vulgus_palette_bank_w) - AM_RANGE(0xc902, 0xc903) AM_WRITE(MWA8_RAM) AM_BASE(&vulgus_scroll_high) - AM_RANGE(0xcc00, 0xcc7f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xc902, 0xc903) AM_WRITE(SMH_RAM) AM_BASE(&vulgus_scroll_high) + AM_RANGE(0xcc00, 0xcc7f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xd7ff) AM_WRITE(vulgus_fgvideoram_w) AM_BASE(&vulgus_fgvideoram) AM_RANGE(0xd800, 0xdfff) AM_WRITE(vulgus_bgvideoram_w) AM_BASE(&vulgus_bgvideoram) - AM_RANGE(0xe000, 0xefff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x47ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_0_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(AY8910_control_port_1_w) diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index ea49aad3d39..0cdc5879856 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -144,7 +144,7 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw ) if (data) { - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, MRA8_BANK1); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, SMH_BANK1); switch (data) { case 2: bankaddress = 0x10000; break; @@ -161,9 +161,9 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw ) else { memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x8fff, 0, 0, wardner_sprite_r); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xadff, 0, 0, MRA8_BANK4); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xae00, 0xafff, 0, 0, MRA8_BANK2); - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xc7ff, 0, 0, MRA8_BANK3); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xadff, 0, 0, SMH_BANK4); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xae00, 0xafff, 0, 0, SMH_BANK2); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xc7ff, 0, 0, SMH_BANK3); memory_set_bankptr(1, &RAM[0x0000]); memory_set_bankptr(2, rambase_ae00); memory_set_bankptr(3, rambase_c000); @@ -185,7 +185,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(MRA8_BANK1) /* Overlapped RAM/Banked ROM - See below */ + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) /* Overlapped RAM/Banked ROM - See below */ AM_RANGE(0x8000, 0x8fff) AM_WRITE(wardner_sprite_w) AM_BASE((void *)&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x9000, 0x9fff) AM_ROM diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c index 3000e9851b8..76404c3b169 100644 --- a/src/mame/drivers/warpwarp.c +++ b/src/mame/drivers/warpwarp.c @@ -300,19 +300,19 @@ static WRITE8_HANDLER( warpwarp_out3_w ) static ADDRESS_MAP_START( readmem_geebee, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_READ(MRA8_RAM) - AM_RANGE(0x3000, 0x37ff) AM_READ(MRA8_ROM) /* 3000-33ff in GeeBee */ - AM_RANGE(0x4000, 0x40ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_READ(SMH_RAM) + AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_ROM) /* 3000-33ff in GeeBee */ + AM_RANGE(0x4000, 0x40ff) AM_READ(SMH_RAM) AM_RANGE(0x5000, 0x53ff) AM_READ(geebee_in_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_geebee, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x2000, 0x23ff) AM_WRITE(geebee_videoram_w) AM_BASE(&geebee_videoram) AM_RANGE(0x2400, 0x27ff) AM_WRITE(geebee_videoram_w) /* mirror used by kaiteik due to a bug */ - AM_RANGE(0x3000, 0x37ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x4000, 0x40ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x3000, 0x37ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x4000, 0x40ff) AM_WRITE(SMH_RAM) AM_RANGE(0x6000, 0x6fff) AM_WRITE(geebee_out6_w) AM_RANGE(0x7000, 0x7fff) AM_WRITE(geebee_out7_w) ADDRESS_MAP_END @@ -328,30 +328,30 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_bombbee, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4800, 0x4fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) + AM_RANGE(0x4800, 0x4fff) AM_READ(SMH_ROM) AM_RANGE(0x6000, 0x600f) AM_READ(warpwarp_sw_r) AM_RANGE(0x6010, 0x601f) AM_READ(warpwarp_vol_r) AM_RANGE(0x6020, 0x602f) AM_READ(warpwarp_dsw1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_warpwarp, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4000, 0x47ff) AM_READ(MRA8_RAM) - AM_RANGE(0x4800, 0x4fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) + AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM) + AM_RANGE(0x4800, 0x4fff) AM_READ(SMH_ROM) AM_RANGE(0xc000, 0xc00f) AM_READ(warpwarp_sw_r) AM_RANGE(0xc010, 0xc01f) AM_READ(warpwarp_vol_r) AM_RANGE(0xc020, 0xc02f) AM_READ(warpwarp_dsw1_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_bombbee, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4000, 0x47ff) AM_WRITE(warpwarp_videoram_w) AM_BASE(&warpwarp_videoram) - AM_RANGE(0x4800, 0x4fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4800, 0x4fff) AM_WRITE(SMH_ROM) AM_RANGE(0x6000, 0x600f) AM_WRITE(warpwarp_out0_w) AM_RANGE(0x6010, 0x601f) AM_WRITE(warpwarp_music1_w) AM_RANGE(0x6020, 0x602f) AM_WRITE(warpwarp_music2_w) @@ -359,10 +359,10 @@ static ADDRESS_MAP_START( writemem_bombbee, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_warpwarp, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_RANGE(0x4000, 0x47ff) AM_WRITE(warpwarp_videoram_w) AM_BASE(&warpwarp_videoram) - AM_RANGE(0x4800, 0x4fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x4800, 0x4fff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xc00f) AM_WRITE(warpwarp_out0_w) AM_RANGE(0xc010, 0xc01f) AM_WRITE(warpwarp_music1_w) AM_RANGE(0xc020, 0xc02f) AM_WRITE(warpwarp_music2_w) diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index ee00bb3aaa3..0f33662d2ee 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -213,62 +213,62 @@ static WRITE8_HANDLER( warriorb_pancontrol ) ***********************************************************/ static ADDRESS_MAP_START( darius2d_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) /* main ram */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) /* main ram */ AM_RANGE(0x200000, 0x213fff) AM_READ(TC0100SCN_word_0_r) /* tilemaps (1st screen) */ AM_RANGE(0x220000, 0x22000f) AM_READ(TC0100SCN_ctrl_word_0_r) AM_RANGE(0x240000, 0x253fff) AM_READ(TC0100SCN_word_1_r) /* tilemaps (2nd screen) */ AM_RANGE(0x260000, 0x26000f) AM_READ(TC0100SCN_ctrl_word_1_r) AM_RANGE(0x400000, 0x400007) AM_READ(TC0110PCR_word_r) /* palette (1st screen) */ AM_RANGE(0x420000, 0x420007) AM_READ(TC0110PCR_word_1_r) /* palette (2nd screen) */ - AM_RANGE(0x600000, 0x6013ff) AM_READ(MRA16_RAM) /* sprite ram */ + AM_RANGE(0x600000, 0x6013ff) AM_READ(SMH_RAM) /* sprite ram */ AM_RANGE(0x800000, 0x80000f) AM_READ(TC0220IOC_halfword_r) AM_RANGE(0x830000, 0x830003) AM_READ(warriorb_sound_r) ADDRESS_MAP_END static ADDRESS_MAP_START( darius2d_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) AM_RANGE(0x200000, 0x213fff) AM_WRITE(TC0100SCN_dual_screen_w) /* tilemaps (all screens) */ - AM_RANGE(0x214000, 0x2141ff) AM_WRITE(MWA16_NOP) /* error in screen clearing code ? */ + AM_RANGE(0x214000, 0x2141ff) AM_WRITE(SMH_NOP) /* error in screen clearing code ? */ AM_RANGE(0x220000, 0x22000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) AM_RANGE(0x240000, 0x253fff) AM_WRITE(TC0100SCN_word_1_w) /* tilemaps (2nd screen) */ AM_RANGE(0x260000, 0x26000f) AM_WRITE(TC0100SCN_ctrl_word_1_w) AM_RANGE(0x400000, 0x400007) AM_WRITE(TC0110PCR_step1_word_w) /* palette (1st screen) */ AM_RANGE(0x420000, 0x420007) AM_WRITE(TC0110PCR_step1_word_1_w) /* palette (2nd screen) */ - AM_RANGE(0x600000, 0x6013ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x600000, 0x6013ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x800000, 0x80000f) AM_WRITE(TC0220IOC_halfword_w) -// AM_RANGE(0x820000, 0x820001) AM_WRITE(MWA16_NOP) // ??? +// AM_RANGE(0x820000, 0x820001) AM_WRITE(SMH_NOP) // ??? AM_RANGE(0x830000, 0x830003) AM_WRITE(warriorb_sound_w) ADDRESS_MAP_END static ADDRESS_MAP_START( warriorb_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x200000, 0x213fff) AM_READ(MRA16_RAM) /* main ram */ + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM) + AM_RANGE(0x200000, 0x213fff) AM_READ(SMH_RAM) /* main ram */ AM_RANGE(0x300000, 0x313fff) AM_READ(TC0100SCN_word_0_r) /* tilemaps (1st screen) */ AM_RANGE(0x320000, 0x32000f) AM_READ(TC0100SCN_ctrl_word_0_r) AM_RANGE(0x340000, 0x353fff) AM_READ(TC0100SCN_word_1_r) /* tilemaps (2nd screen) */ AM_RANGE(0x360000, 0x36000f) AM_READ(TC0100SCN_ctrl_word_1_r) AM_RANGE(0x400000, 0x400007) AM_READ(TC0110PCR_word_r) /* palette (1st screen) */ AM_RANGE(0x420000, 0x420007) AM_READ(TC0110PCR_word_1_r) /* palette (2nd screen) */ - AM_RANGE(0x600000, 0x6013ff) AM_READ(MRA16_RAM) /* sprite ram */ + AM_RANGE(0x600000, 0x6013ff) AM_READ(SMH_RAM) /* sprite ram */ AM_RANGE(0x800000, 0x80000f) AM_READ(TC0510NIO_halfword_r) AM_RANGE(0x830000, 0x830003) AM_READ(warriorb_sound_r) ADDRESS_MAP_END static ADDRESS_MAP_START( warriorb_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x200000, 0x213fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x1fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x200000, 0x213fff) AM_WRITE(SMH_RAM) AM_RANGE(0x300000, 0x313fff) AM_WRITE(TC0100SCN_dual_screen_w) /* tilemaps (all screens) */ AM_RANGE(0x320000, 0x32000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) AM_RANGE(0x340000, 0x353fff) AM_WRITE(TC0100SCN_word_1_w) /* tilemaps (2nd screen) */ AM_RANGE(0x360000, 0x36000f) AM_WRITE(TC0100SCN_ctrl_word_1_w) AM_RANGE(0x400000, 0x400007) AM_WRITE(TC0110PCR_step1_word_w) /* palette (1st screen) */ AM_RANGE(0x420000, 0x420007) AM_WRITE(TC0110PCR_step1_word_1_w) /* palette (2nd screen) */ - AM_RANGE(0x600000, 0x6013ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) + AM_RANGE(0x600000, 0x6013ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x800000, 0x80000f) AM_WRITE(TC0510NIO_halfword_w) -// AM_RANGE(0x820000, 0x820001) AM_WRITE(MWA16_NOP) // ? uses bits 0,2,3 +// AM_RANGE(0x820000, 0x820001) AM_WRITE(SMH_NOP) // ? uses bits 0,2,3 AM_RANGE(0x830000, 0x830003) AM_WRITE(warriorb_sound_w) ADDRESS_MAP_END @@ -276,20 +276,20 @@ ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK10) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) @@ -297,8 +297,8 @@ static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITE(warriorb_pancontrol) /* pan */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c index c5b7ba1ee52..9721e4a43f1 100644 --- a/src/mame/drivers/wc90.c +++ b/src/mame/drivers/wc90.c @@ -117,14 +117,14 @@ static WRITE8_HANDLER( wc90_sound_command_w ) static ADDRESS_MAP_START( wc90_readmem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) /* Main RAM */ - AM_RANGE(0xa000, 0xafff) AM_READ(MRA8_RAM) /* fg video ram */ - AM_RANGE(0xb000, 0xbfff) AM_READ(MRA8_RAM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) /* bg video ram */ - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) /* tx video ram */ - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) /* Main RAM */ + AM_RANGE(0xa000, 0xafff) AM_READ(SMH_RAM) /* fg video ram */ + AM_RANGE(0xb000, 0xbfff) AM_READ(SMH_RAM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) /* bg video ram */ + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) /* tx video ram */ + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_BANK1) AM_RANGE(0xf800, 0xfbff) AM_READ(wc90_shared_r) AM_RANGE(0xfc00, 0xfc00) AM_READ(input_port_0_r) /* Stick 1 */ AM_RANGE(0xfc02, 0xfc02) AM_READ(input_port_1_r) /* Stick 2 */ @@ -134,66 +134,66 @@ static ADDRESS_MAP_START( wc90_readmem1, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( wc90_readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd800, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_BANK2) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_BANK2) AM_RANGE(0xf800, 0xfbff) AM_READ(wc90_shared_r) ADDRESS_MAP_END static ADDRESS_MAP_START( wc90_writemem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xafff) AM_WRITE(wc90_fgvideoram_w) AM_BASE(&wc90_fgvideoram) - AM_RANGE(0xb000, 0xbfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xb000, 0xbfff) AM_WRITE(SMH_RAM) AM_RANGE(0xc000, 0xcfff) AM_WRITE(wc90_bgvideoram_w) AM_BASE(&wc90_bgvideoram) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_WRITE(wc90_txvideoram_w) AM_BASE(&wc90_txvideoram) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf800, 0xfbff) AM_WRITE(wc90_shared_w) AM_BASE(&wc90_shared) - AM_RANGE(0xfc02, 0xfc02) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll0ylo) - AM_RANGE(0xfc03, 0xfc03) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll0yhi) - AM_RANGE(0xfc06, 0xfc06) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll0xlo) - AM_RANGE(0xfc07, 0xfc07) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll0xhi) - AM_RANGE(0xfc22, 0xfc22) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll1ylo) - AM_RANGE(0xfc23, 0xfc23) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll1yhi) - AM_RANGE(0xfc26, 0xfc26) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll1xlo) - AM_RANGE(0xfc27, 0xfc27) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll1xhi) - AM_RANGE(0xfc42, 0xfc42) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll2ylo) - AM_RANGE(0xfc43, 0xfc43) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll2yhi) - AM_RANGE(0xfc46, 0xfc46) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll2xlo) - AM_RANGE(0xfc47, 0xfc47) AM_WRITE(MWA8_RAM) AM_BASE(&wc90_scroll2xhi) + AM_RANGE(0xfc02, 0xfc02) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll0ylo) + AM_RANGE(0xfc03, 0xfc03) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll0yhi) + AM_RANGE(0xfc06, 0xfc06) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll0xlo) + AM_RANGE(0xfc07, 0xfc07) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll0xhi) + AM_RANGE(0xfc22, 0xfc22) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll1ylo) + AM_RANGE(0xfc23, 0xfc23) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll1yhi) + AM_RANGE(0xfc26, 0xfc26) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll1xlo) + AM_RANGE(0xfc27, 0xfc27) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll1xhi) + AM_RANGE(0xfc42, 0xfc42) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll2ylo) + AM_RANGE(0xfc43, 0xfc43) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll2yhi) + AM_RANGE(0xfc46, 0xfc46) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll2xlo) + AM_RANGE(0xfc47, 0xfc47) AM_WRITE(SMH_RAM) AM_BASE(&wc90_scroll2xhi) AM_RANGE(0xfcc0, 0xfcc0) AM_WRITE(wc90_sound_command_w) AM_RANGE(0xfcd0, 0xfcd0) AM_WRITE(watchdog_reset_w) AM_RANGE(0xfce0, 0xfce0) AM_WRITE(wc90_bankswitch_w) ADDRESS_MAP_END static ADDRESS_MAP_START( wc90_writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd800, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd800, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(paletteram_xxxxBBBBRRRRGGGG_be_w) AM_BASE(&paletteram) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf800, 0xfbff) AM_WRITE(wc90_shared_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(wc90_bankswitch1_w) AM_RANGE(0xfc01, 0xfc01) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(YM2608_status_port_0_A_r) AM_RANGE(0xf802, 0xf802) AM_READ(YM2608_status_port_0_B_r) - AM_RANGE(0xfc00, 0xfc00) AM_READ(MRA8_NOP) /* ??? adpcm ??? */ + AM_RANGE(0xfc00, 0xfc00) AM_READ(SMH_NOP) /* ??? adpcm ??? */ AM_RANGE(0xfc10, 0xfc10) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2608_control_port_0_A_w) AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2608_data_port_0_A_w) AM_RANGE(0xf802, 0xf802) AM_WRITE(YM2608_control_port_0_B_w) diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c index f72219a5aa4..c343e0c6ed9 100644 --- a/src/mame/drivers/wc90b.c +++ b/src/mame/drivers/wc90b.c @@ -152,54 +152,54 @@ static WRITE8_HANDLER( adpcm_data_w ) static ADDRESS_MAP_START( wc90b_readmem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_READ(MRA8_RAM) /* Main RAM */ - AM_RANGE(0xa000, 0xafff) AM_READ(MRA8_RAM) /* fg video ram */ - AM_RANGE(0xc000, 0xcfff) AM_READ(MRA8_RAM) /* bg video ram */ - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) /* tx video ram */ - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) /* Main RAM */ + AM_RANGE(0xa000, 0xafff) AM_READ(SMH_RAM) /* fg video ram */ + AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM) /* bg video ram */ + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) /* tx video ram */ + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_BANK1) AM_RANGE(0xf800, 0xfbff) AM_READ(wc90b_shared_r) AM_RANGE(0xfd00, 0xfd00) AM_READ(input_port_0_r) /* Stick 1, Coin 1 & Start 1 */ AM_RANGE(0xfd02, 0xfd02) AM_READ(input_port_1_r) /* Stick 2, Coin 2 & Start 2 */ AM_RANGE(0xfd06, 0xfd06) AM_READ(input_port_2_r) /* DIP Switch A */ AM_RANGE(0xfd08, 0xfd08) AM_READ(input_port_3_r) /* DIP Switch B */ - AM_RANGE(0xfd00, 0xffff) AM_READ(MRA8_RAM) + AM_RANGE(0xfd00, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( wc90b_readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc1ff) AM_READ(MRA8_RAM) - AM_RANGE(0xc200, 0xe1ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xe800, 0xefff) AM_READ(MRA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_READ(MRA8_BANK2) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc1ff) AM_READ(SMH_RAM) + AM_RANGE(0xc200, 0xe1ff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) + AM_RANGE(0xe800, 0xefff) AM_READ(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_BANK2) AM_RANGE(0xf800, 0xfbff) AM_READ(wc90b_shared_r) ADDRESS_MAP_END static ADDRESS_MAP_START( wc90b_writemem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x9fff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM) AM_RANGE(0xa000, 0xafff) AM_WRITE(wc90b_fgvideoram_w) AM_BASE(&wc90b_fgvideoram) AM_RANGE(0xc000, 0xcfff) AM_WRITE(wc90b_bgvideoram_w) AM_BASE(&wc90b_bgvideoram) AM_RANGE(0xe000, 0xefff) AM_WRITE(wc90b_txvideoram_w) AM_BASE(&wc90b_txvideoram) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf800, 0xfbff) AM_WRITE(wc90b_shared_w) AM_BASE(&wc90b_shared) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(wc90b_bankswitch_w) AM_RANGE(0xfd00, 0xfd00) AM_WRITE(wc90b_sound_command_w) - AM_RANGE(0xfd04, 0xfd04) AM_WRITE(MWA8_RAM) AM_BASE(&wc90b_scroll1y) - AM_RANGE(0xfd06, 0xfd06) AM_WRITE(MWA8_RAM) AM_BASE(&wc90b_scroll1x) - AM_RANGE(0xfd08, 0xfd08) AM_WRITE(MWA8_RAM) AM_BASE(&wc90b_scroll2y) - AM_RANGE(0xfd0a, 0xfd0a) AM_WRITE(MWA8_RAM) AM_BASE(&wc90b_scroll2x) + AM_RANGE(0xfd04, 0xfd04) AM_WRITE(SMH_RAM) AM_BASE(&wc90b_scroll1y) + AM_RANGE(0xfd06, 0xfd06) AM_WRITE(SMH_RAM) AM_BASE(&wc90b_scroll1x) + AM_RANGE(0xfd08, 0xfd08) AM_WRITE(SMH_RAM) AM_BASE(&wc90b_scroll2y) + AM_RANGE(0xfd0a, 0xfd0a) AM_WRITE(SMH_RAM) AM_BASE(&wc90b_scroll2x) ADDRESS_MAP_END static ADDRESS_MAP_START( wc90b_writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xcfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xd000, 0xd7ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xd800, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xcfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd800, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe7ff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_be_w) AM_BASE(&paletteram) - AM_RANGE(0xe800, 0xefff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xf7ff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xe800, 0xefff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_ROM) AM_RANGE(0xf800, 0xfbff) AM_WRITE(wc90b_shared_w) AM_RANGE(0xfc00, 0xfc00) AM_WRITE(wc90b_bankswitch1_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index a4ad904efea..03ee7c5b03a 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -537,23 +537,23 @@ static ADDRESS_MAP_START( wecleman_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x040000, 0x043fff) AM_RAM // RAM AM_RANGE(0x060000, 0x060005) AM_WRITE(wecleman_protection_w) AM_BASE(&wecleman_protection_ram) AM_RANGE(0x060006, 0x060007) AM_READ(wecleman_protection_r) // MCU read - AM_RANGE(0x080000, 0x080011) AM_READWRITE(MRA16_RAM, blitter_w) AM_BASE(&blitter_regs) // Blitter - AM_RANGE(0x100000, 0x103fff) AM_READWRITE(MRA16_RAM, wecleman_pageram_w) AM_BASE(&wecleman_pageram) // Background Layers - AM_RANGE(0x108000, 0x108fff) AM_READWRITE(MRA16_RAM, wecleman_txtram_w) AM_BASE(&wecleman_txtram) // Text Layer - AM_RANGE(0x110000, 0x110fff) AM_READWRITE(MRA16_RAM, wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x080000, 0x080011) AM_READWRITE(SMH_RAM, blitter_w) AM_BASE(&blitter_regs) // Blitter + AM_RANGE(0x100000, 0x103fff) AM_READWRITE(SMH_RAM, wecleman_pageram_w) AM_BASE(&wecleman_pageram) // Background Layers + AM_RANGE(0x108000, 0x108fff) AM_READWRITE(SMH_RAM, wecleman_txtram_w) AM_BASE(&wecleman_txtram) // Text Layer + AM_RANGE(0x110000, 0x110fff) AM_READWRITE(SMH_RAM, wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x124000, 0x127fff) AM_RAM AM_SHARE(1) // Shared with main CPU AM_RANGE(0x130000, 0x130fff) AM_RAM AM_BASE(&spriteram16) // Sprites AM_RANGE(0x140000, 0x140001) AM_WRITE(wecleman_soundlatch_w) // To sound CPU AM_RANGE(0x140002, 0x140003) AM_WRITE(selected_ip_w) // Selects accelerator / wheel / .. AM_RANGE(0x140004, 0x140005) AM_WRITE(irqctrl_w) // Main CPU controls the other CPUs - AM_RANGE(0x140006, 0x140007) AM_WRITE(MWA16_NOP) // Watchdog reset + AM_RANGE(0x140006, 0x140007) AM_WRITE(SMH_NOP) // Watchdog reset AM_RANGE(0x140010, 0x140011) AM_READ(input_port_0_word_r) // Coins + brake + gear AM_RANGE(0x140012, 0x140013) AM_READ(input_port_1_word_r) // ?? AM_RANGE(0x140014, 0x140015) AM_READ(input_port_2_word_r) // DSW AM_RANGE(0x140016, 0x140017) AM_READ(input_port_3_word_r) // DSW - AM_RANGE(0x140020, 0x140021) AM_WRITE(MWA16_RAM) // Paired with writes to $140003 + AM_RANGE(0x140020, 0x140021) AM_WRITE(SMH_RAM) // Paired with writes to $140003 AM_RANGE(0x140020, 0x140021) AM_READ(selected_ip_r) // Accelerator or Wheel or .. - AM_RANGE(0x140030, 0x140031) AM_WRITE(MWA16_NOP) // toggles between 0 & 1 on hitting bumps and crashes (vibration?) + AM_RANGE(0x140030, 0x140031) AM_WRITE(SMH_NOP) // toggles between 0 & 1 on hitting bumps and crashes (vibration?) ADDRESS_MAP_END @@ -596,26 +596,26 @@ static WRITE16_HANDLER( hotchase_soundlatch_w ); static ADDRESS_MAP_START( hotchase_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x040000, 0x063fff) AM_RAM // RAM (weird size!?) - AM_RANGE(0x080000, 0x080011) AM_READWRITE(MRA16_RAM, blitter_w) AM_BASE(&blitter_regs) // Blitter + AM_RANGE(0x080000, 0x080011) AM_READWRITE(SMH_RAM, blitter_w) AM_BASE(&blitter_regs) // Blitter AM_RANGE(0x100000, 0x100fff) AM_READWRITE(hotchase_K051316_0_r, hotchase_K051316_0_w) // Background AM_RANGE(0x101000, 0x10101f) AM_WRITE(hotchase_K051316_ctrl_0_w) // Background Ctrl AM_RANGE(0x102000, 0x102fff) AM_READWRITE(hotchase_K051316_1_r, hotchase_K051316_1_w) // Foreground AM_RANGE(0x103000, 0x10301f) AM_WRITE(hotchase_K051316_ctrl_1_w) // Foreground Ctrl - AM_RANGE(0x110000, 0x111fff) AM_READWRITE(MRA16_RAM, hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x110000, 0x111fff) AM_READWRITE(SMH_RAM, hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x120000, 0x123fff) AM_RAM AM_SHARE(1) // Shared with sub CPU AM_RANGE(0x130000, 0x130fff) AM_RAM AM_BASE(&spriteram16) // Sprites // Input Ports: AM_RANGE(0x140000, 0x140001) AM_WRITE(hotchase_soundlatch_w) // To sound CPU AM_RANGE(0x140002, 0x140003) AM_WRITE(selected_ip_w) // Selects accelerator / wheel / AM_RANGE(0x140004, 0x140005) AM_WRITE(irqctrl_w) // Main CPU controls the other CPUs - AM_RANGE(0x140006, 0x140007) AM_READ(MRA16_NOP) // Watchdog reset + AM_RANGE(0x140006, 0x140007) AM_READ(SMH_NOP) // Watchdog reset AM_RANGE(0x140010, 0x140011) AM_READ(input_port_0_word_r) // Coins + brake + gear AM_RANGE(0x140012, 0x140013) AM_READ(input_port_1_word_r) // ?? bit 4 from sound cpu AM_RANGE(0x140014, 0x140015) AM_READ(input_port_2_word_r) // DSW 2 AM_RANGE(0x140016, 0x140017) AM_READ(input_port_3_word_r) // DSW 1 - AM_RANGE(0x140020, 0x140021) AM_READWRITE(selected_ip_r, MWA16_NOP) // Paired with writes to $140003 - AM_RANGE(0x140022, 0x140023) AM_READ(MRA16_NOP) // ?? - AM_RANGE(0x140030, 0x140031) AM_WRITE(MWA16_NOP) // signal to cabinet vibration motors? + AM_RANGE(0x140020, 0x140021) AM_READWRITE(selected_ip_r, SMH_NOP) // Paired with writes to $140003 + AM_RANGE(0x140022, 0x140023) AM_READ(SMH_NOP) // ?? + AM_RANGE(0x140030, 0x140031) AM_WRITE(SMH_NOP) // signal to cabinet vibration motors? ADDRESS_MAP_END @@ -689,8 +689,8 @@ static WRITE8_HANDLER( wecleman_K00723216_bank_w ) } static ADDRESS_MAP_START( wecleman_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) // ROM - AM_RANGE(0x8000, 0x83ff) AM_READ(MRA8_RAM) // RAM + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) // ROM + AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM) // RAM AM_RANGE(0x9000, 0x9000) AM_READ(multiply_r) // Protection AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) // From main CPU AM_RANGE(0xb000, 0xb00d) AM_READ(K007232_read_port_0_r) // K007232 (Reading offset 5/b triggers the sample) @@ -698,11 +698,11 @@ static ADDRESS_MAP_START( wecleman_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( wecleman_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) // ROM - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) // RAM - AM_RANGE(0x8500, 0x8500) AM_WRITE(MWA8_NOP) // incresed with speed (global volume)? + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) // ROM + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) // RAM + AM_RANGE(0x8500, 0x8500) AM_WRITE(SMH_NOP) // incresed with speed (global volume)? AM_RANGE(0x9000, 0x9001) AM_WRITE(multiply_w) // Protection - AM_RANGE(0x9006, 0x9006) AM_WRITE(MWA8_NOP) // ? + AM_RANGE(0x9006, 0x9006) AM_WRITE(SMH_NOP) // ? AM_RANGE(0xb000, 0xb00d) AM_WRITE(K007232_write_port_0_w) // K007232 AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w) // YM2151 AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w) @@ -804,23 +804,23 @@ HOTCHASE_K007232_RW(1) HOTCHASE_K007232_RW(2) static ADDRESS_MAP_START( hotchase_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_READ(MRA8_RAM) // RAM + AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) // RAM AM_RANGE(0x1000, 0x100d) AM_READ(hotchase_K007232_0_r) // 3 x K007232 AM_RANGE(0x2000, 0x200d) AM_READ(hotchase_K007232_1_r) AM_RANGE(0x3000, 0x300d) AM_READ(hotchase_K007232_2_r) AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) // From main CPU (Read on IRQ) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_ROM) // ROM + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) // ROM ADDRESS_MAP_END static ADDRESS_MAP_START( hotchase_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x07ff) AM_WRITE(MWA8_RAM) // RAM + AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) // RAM AM_RANGE(0x1000, 0x100d) AM_WRITE(hotchase_K007232_0_w) // 3 x K007232 AM_RANGE(0x2000, 0x200d) AM_WRITE(hotchase_K007232_1_w) AM_RANGE(0x3000, 0x300d) AM_WRITE(hotchase_K007232_2_w) AM_RANGE(0x4000, 0x4007) AM_WRITE(hotchase_sound_control_w) // Sound volume, banking, etc. - AM_RANGE(0x5000, 0x5000) AM_WRITE(MWA8_NOP) // ? (written with 0 on IRQ, 1 on FIRQ) - AM_RANGE(0x7000, 0x7000) AM_WRITE(MWA8_NOP) // Command acknowledge ? - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) // ROM + AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_NOP) // ? (written with 0 on IRQ, 1 on FIRQ) + AM_RANGE(0x7000, 0x7000) AM_WRITE(SMH_NOP) // Command acknowledge ? + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) // ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index 2e7bb9e0618..f68f5aca63d 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -364,13 +364,13 @@ static WRITE8_HANDLER( pending_command_clear_w ) static ADDRESS_MAP_START( welltris_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x17ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x800000, 0x81ffff) AM_READ(MRA16_RAM) /* Graph_1 & 2*/ - AM_RANGE(0xff8000, 0xffbfff) AM_READ(MRA16_RAM) /* Work */ - AM_RANGE(0xffc000, 0xffc3ff) AM_READ(MRA16_RAM) /* Sprite */ - AM_RANGE(0xffd000, 0xffdfff) AM_READ(MRA16_RAM) /* Char */ - AM_RANGE(0xffe000, 0xffefff) AM_READ(MRA16_RAM) /* Palette */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x17ffff) AM_READ(SMH_ROM) + AM_RANGE(0x800000, 0x81ffff) AM_READ(SMH_RAM) /* Graph_1 & 2*/ + AM_RANGE(0xff8000, 0xffbfff) AM_READ(SMH_RAM) /* Work */ + AM_RANGE(0xffc000, 0xffc3ff) AM_READ(SMH_RAM) /* Sprite */ + AM_RANGE(0xffd000, 0xffdfff) AM_READ(SMH_RAM) /* Char */ + AM_RANGE(0xffe000, 0xffefff) AM_READ(SMH_RAM) /* Palette */ AM_RANGE(0xfff000, 0xfff001) AM_READ(input_port_1_word_r) /* Bottom Controls */ AM_RANGE(0xfff002, 0xfff003) AM_READ(input_port_2_word_r) /* Top Controls */ @@ -384,10 +384,10 @@ static ADDRESS_MAP_START( welltris_readmem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( welltris_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x17ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x800000, 0x81ffff) AM_WRITE(MWA16_RAM) AM_BASE(&welltris_pixelram) - AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x17ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x800000, 0x81ffff) AM_WRITE(SMH_RAM) AM_BASE(&welltris_pixelram) + AM_RANGE(0xff8000, 0xffbfff) AM_WRITE(SMH_RAM) AM_RANGE(0xffc000, 0xffc3ff) AM_WRITE(welltris_spriteram_w) AM_BASE(&welltris_spriteram) AM_RANGE(0xffd000, 0xffdfff) AM_WRITE(welltris_charvideoram_w) AM_BASE(&welltris_charvideoram) @@ -397,20 +397,20 @@ static ADDRESS_MAP_START( welltris_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfff002, 0xfff003) AM_WRITE(welltris_gfxbank_w) AM_RANGE(0xfff004, 0xfff007) AM_WRITE(welltris_scrollreg_w) AM_RANGE(0xfff008, 0xfff009) AM_WRITE(sound_command_w) - AM_RANGE(0xfff00c, 0xfff00d) AM_WRITE(MWA16_NOP) // ?? - AM_RANGE(0xfff00e, 0xfff00f) AM_WRITE(MWA16_NOP) // ?? + AM_RANGE(0xfff00c, 0xfff00d) AM_WRITE(SMH_NOP) // ?? + AM_RANGE(0xfff00e, 0xfff00f) AM_WRITE(SMH_NOP) // ?? ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_READ(MRA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_READ(MRA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_READ(MRA8_BANK1) + AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_READ(SMH_BANK1) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x77ff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x7800, 0x7fff) AM_WRITE(MWA8_RAM) - AM_RANGE(0x8000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM) + AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) + AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 9ea63643593..0ad876aa1ff 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -654,34 +654,34 @@ static READ16_HANDLER( wgp_sound_r ) *****************************************************************/ static ADDRESS_MAP_START( wgp_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_READ(MRA16_RAM) /* main CPUA ram */ - AM_RANGE(0x140000, 0x143fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM) /* main CPUA ram */ + AM_RANGE(0x140000, 0x143fff) AM_READ(SMH_RAM) AM_RANGE(0x180000, 0x18000f) AM_READ(TC0220IOC_halfword_byteswap_r) AM_RANGE(0x200000, 0x20000f) AM_READ(wgp_adinput_r) AM_RANGE(0x300000, 0x30ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x320000, 0x32000f) AM_READ(TC0100SCN_ctrl_word_0_r) - AM_RANGE(0x400000, 0x40bfff) AM_READ(MRA16_RAM) /* sprite tilemaps */ - AM_RANGE(0x40c000, 0x40dfff) AM_READ(MRA16_RAM) /* sprite ram */ - AM_RANGE(0x500000, 0x501fff) AM_READ(MRA16_RAM) /* unknown/unused */ + AM_RANGE(0x400000, 0x40bfff) AM_READ(SMH_RAM) /* sprite tilemaps */ + AM_RANGE(0x40c000, 0x40dfff) AM_READ(SMH_RAM) /* sprite ram */ + AM_RANGE(0x500000, 0x501fff) AM_READ(SMH_RAM) /* unknown/unused */ AM_RANGE(0x502000, 0x517fff) AM_READ(wgp_pivram_word_r) /* piv tilemaps */ AM_RANGE(0x520000, 0x52001f) AM_READ(wgp_piv_ctrl_word_r) - AM_RANGE(0x700000, 0x701fff) AM_READ(MRA16_RAM) + AM_RANGE(0x700000, 0x701fff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( wgp_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x10ffff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x140000, 0x143fff) AM_WRITE(MWA16_RAM) AM_BASE(&sharedram) AM_SIZE(&sharedram_size) + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x10ffff) AM_WRITE(SMH_RAM) + AM_RANGE(0x140000, 0x143fff) AM_WRITE(SMH_RAM) AM_BASE(&sharedram) AM_SIZE(&sharedram_size) AM_RANGE(0x180000, 0x18000f) AM_WRITE(TC0220IOC_halfword_byteswap_w) AM_RANGE(0x1c0000, 0x1c0001) AM_WRITE(cpua_ctrl_w) AM_RANGE(0x200000, 0x20000f) AM_WRITE(wgp_adinput_w) AM_RANGE(0x300000, 0x30ffff) AM_WRITE(TC0100SCN_word_0_w) /* tilemaps */ AM_RANGE(0x320000, 0x32000f) AM_WRITE(TC0100SCN_ctrl_word_0_w) - AM_RANGE(0x400000, 0x40bfff) AM_WRITE(MWA16_RAM) AM_BASE(&wgp_spritemap) AM_SIZE(&wgp_spritemap_size) - AM_RANGE(0x40c000, 0x40dfff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* sprite ram */ - AM_RANGE(0x40fff0, 0x40fff1) AM_WRITE(MWA16_NOP) // ?? (writes 0x8000 and 0 alternately - Wgp2 just 0) - AM_RANGE(0x500000, 0x501fff) AM_WRITE(MWA16_RAM) /* unknown/unused */ + AM_RANGE(0x400000, 0x40bfff) AM_WRITE(SMH_RAM) AM_BASE(&wgp_spritemap) AM_SIZE(&wgp_spritemap_size) + AM_RANGE(0x40c000, 0x40dfff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* sprite ram */ + AM_RANGE(0x40fff0, 0x40fff1) AM_WRITE(SMH_NOP) // ?? (writes 0x8000 and 0 alternately - Wgp2 just 0) + AM_RANGE(0x500000, 0x501fff) AM_WRITE(SMH_RAM) /* unknown/unused */ AM_RANGE(0x502000, 0x517fff) AM_WRITE(wgp_pivram_word_w) AM_BASE(&wgp_pivram) /* piv tilemaps */ AM_RANGE(0x520000, 0x52001f) AM_WRITE(wgp_piv_ctrl_word_w) AM_BASE(&wgp_piv_ctrlram) AM_RANGE(0x600000, 0x600003) AM_WRITE(rotate_port_w) /* rotation control ? */ @@ -689,51 +689,51 @@ static ADDRESS_MAP_START( wgp_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static ADDRESS_MAP_START( wgp_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) /* LAN areas not mapped... */ - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) AM_RANGE(0x140000, 0x143fff) AM_READ(sharedram_r) AM_RANGE(0x200000, 0x200003) AM_READ(wgp_sound_r) -// AM_RANGE(0x380000, 0x383fff) AM_READ(MRA16_RAM) // LAN RAM +// AM_RANGE(0x380000, 0x383fff) AM_READ(SMH_RAM) // LAN RAM AM_RANGE(0x380000, 0x380001) AM_READ(lan_status_r) // ?? // a lan input area is read somewhere above the status // (make the status return 0 and log)... ADDRESS_MAP_END static ADDRESS_MAP_START( wgp_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) - AM_RANGE(0x100000, 0x103fff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) + AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM) AM_RANGE(0x140000, 0x143fff) AM_WRITE(sharedram_w) AM_RANGE(0x200000, 0x200003) AM_WRITE(wgp_sound_w) -// AM_RANGE(0x380000, 0x383fff) AM_WRITE(MWA16_RAM) // LAN RAM +// AM_RANGE(0x380000, 0x383fff) AM_WRITE(SMH_RAM) // LAN RAM ADDRESS_MAP_END /***************************************************************************/ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK10) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c index ddc87bcb097..84b3dad0104 100644 --- a/src/mame/drivers/wheelfir.c +++ b/src/mame/drivers/wheelfir.c @@ -384,13 +384,13 @@ static ADDRESS_MAP_START( wheelfir_main, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700000, 0x70001f) AM_WRITE(wheelfir_blit_w) // blitter stuff AM_RANGE(0x720000, 0x720001) AM_WRITE(pal_reset_pos_w) // always 0? AM_RANGE(0x720002, 0x720003) AM_WRITE(pal_data_w) // lots of different values.. also blitter? palette? -// AM_RANGE(0x720004, 0x720005) AM_WRITE(MWA16_NOP) // always ffff? +// AM_RANGE(0x720004, 0x720005) AM_WRITE(SMH_NOP) // always ffff? -// AM_RANGE(0x740000, 0x740001) AM_WRITE(MWA16_NOP) -// AM_RANGE(0x760000, 0x760001) AM_WRITE(MWA16_NOP) -// AM_RANGE(0x740000, 0x740001) AM_WRITE(MWA16_NOP) -// AM_RANGE(0x7a0000, 0x7a0001) AM_WRITE(MWA16_NOP) -// AM_RANGE(0x7c0000, 0x7c0001) AM_WRITE(MWA16_NOP) +// AM_RANGE(0x740000, 0x740001) AM_WRITE(SMH_NOP) +// AM_RANGE(0x760000, 0x760001) AM_WRITE(SMH_NOP) +// AM_RANGE(0x740000, 0x740001) AM_WRITE(SMH_NOP) +// AM_RANGE(0x7a0000, 0x7a0001) AM_WRITE(SMH_NOP) +// AM_RANGE(0x7c0000, 0x7c0001) AM_WRITE(SMH_NOP) ADDRESS_MAP_END @@ -401,8 +401,8 @@ static ADDRESS_MAP_START( wheelfir_sub, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_RANGE(0x780000, 0x780001) AM_READ(wheelfir_rand4) - AM_RANGE(0x700000, 0x700001) AM_WRITE(MWA16_NOP) - AM_RANGE(0x740000, 0x740001) AM_WRITE(MWA16_NOP) + AM_RANGE(0x700000, 0x700001) AM_WRITE(SMH_NOP) + AM_RANGE(0x740000, 0x740001) AM_WRITE(SMH_NOP) ADDRESS_MAP_END diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c index c47801f8712..9e2e018d37c 100644 --- a/src/mame/drivers/williams.c +++ b/src/mame/drivers/williams.c @@ -523,10 +523,10 @@ ADDRESS_MAP_END void defender_install_io_space(void) { /* this routine dynamically installs the memory mapped above from c000-cfff */ - memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xc00f, 0, 0x03e0, MWA8_BANK4); + memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xc00f, 0, 0x03e0, SMH_BANK4); memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0xc010, 0xc01f, 0, 0x03e0, defender_video_control_w); memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0xc3ff, 0xc3ff, 0, 0, williams_watchdog_reset_w); - memory_install_readwrite8_handler (0, ADDRESS_SPACE_PROGRAM, 0xc400, 0xc4ff, 0, 0x0300, MRA8_BANK3, williams_cmos_w); + memory_install_readwrite8_handler (0, ADDRESS_SPACE_PROGRAM, 0xc400, 0xc4ff, 0, 0x0300, SMH_BANK3, williams_cmos_w); memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0xc800, 0xcbff, 0, 0x03e0, williams_video_counter_r); memory_install_readwrite8_handler (0, ADDRESS_SPACE_PROGRAM, 0xcc00, 0xcc03, 0, 0x03e0, pia_1_r, pia_1_w); memory_install_readwrite8_handler (0, ADDRESS_SPACE_PROGRAM, 0xcc04, 0xcc07, 0, 0x03e0, pia_0_r, pia_0_w); @@ -543,31 +543,31 @@ void defender_install_io_space(void) *************************************/ static ADDRESS_MAP_START( williams_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x8fff) AM_READWRITE(MRA8_BANK1, MWA8_RAM) AM_BASE(&williams_videoram) + AM_RANGE(0x0000, 0x8fff) AM_READWRITE(SMH_BANK1, SMH_RAM) AM_BASE(&williams_videoram) AM_RANGE(0x9000, 0xbfff) AM_RAM - AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) + AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_READWRITE(pia_0_r, pia_0_w) AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_READWRITE(pia_1_r, pia_1_w) AM_RANGE(0xc900, 0xc9ff) AM_WRITE(williams_vram_select_w) AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE(williams_blitter_w) AM_RANGE(0xcb00, 0xcbff) AM_READ(williams_video_counter_r) AM_RANGE(0xcbff, 0xcbff) AM_WRITE(williams_watchdog_reset_w) - AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(MRA8_RAM, williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(SMH_RAM, williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xd000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( williams_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x8fff) AM_READWRITE(MRA8_BANK1, MWA8_RAM) AM_BASE(&williams_videoram) + AM_RANGE(0x0000, 0x8fff) AM_READWRITE(SMH_BANK1, SMH_RAM) AM_BASE(&williams_videoram) AM_RANGE(0x9000, 0xbfff) AM_RAM - AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) + AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_READWRITE(pia_0_r, pia_0_w) AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_READWRITE(pia_1_r, pia_1_w) AM_RANGE(0xc900, 0xc9ff) AM_WRITE(sinistar_vram_select_w) AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE(williams_blitter_w) AM_RANGE(0xcb00, 0xcbff) AM_READ(williams_video_counter_r) AM_RANGE(0xcbff, 0xcbff) AM_WRITE(williams_watchdog_reset_w) - AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(MRA8_RAM, williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(SMH_RAM, williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -581,12 +581,12 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( blaster_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READWRITE(MRA8_BANK1, MWA8_RAM) AM_BASE(&williams_videoram) - AM_RANGE(0x4000, 0x8fff) AM_READWRITE(MRA8_BANK2, MWA8_RAM) - AM_RANGE(0xbb00, 0xbbff) AM_WRITE(MWA8_RAM) AM_BASE(&blaster_palette_0) - AM_RANGE(0xbc00, 0xbcff) AM_WRITE(MWA8_RAM) AM_BASE(&blaster_scanline_control) + AM_RANGE(0x0000, 0x3fff) AM_READWRITE(SMH_BANK1, SMH_RAM) AM_BASE(&williams_videoram) + AM_RANGE(0x4000, 0x8fff) AM_READWRITE(SMH_BANK2, 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 - AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITE(MWA8_RAM) AM_BASE(&paletteram) + AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITE(SMH_RAM) AM_BASE(&paletteram) AM_RANGE(0xc804, 0xc807) AM_MIRROR(0x00f0) AM_READWRITE(pia_0_r, pia_0_w) AM_RANGE(0xc80c, 0xc80f) AM_MIRROR(0x00f0) AM_READWRITE(pia_1_r, pia_1_w) AM_RANGE(0xc900, 0xc93f) AM_WRITE(blaster_vram_select_w) @@ -596,7 +596,7 @@ static ADDRESS_MAP_START( blaster_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xca00, 0xca07) AM_MIRROR(0x00f8) AM_WRITE(williams_blitter_w) AM_RANGE(0xcb00, 0xcbff) AM_READ(williams_video_counter_r) AM_RANGE(0xcbff, 0xcbff) AM_WRITE(williams_watchdog_reset_w) - AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(MRA8_RAM, williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(SMH_RAM, williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xd000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -609,9 +609,9 @@ ADDRESS_MAP_END *************************************/ static ADDRESS_MAP_START( williams2_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READWRITE(MRA8_BANK1, MWA8_RAM) AM_BASE(&williams_videoram) + AM_RANGE(0x0000, 0x7fff) AM_READWRITE(SMH_BANK1, SMH_RAM) AM_BASE(&williams_videoram) AM_RANGE(0x8000, 0xbfff) AM_RAM - AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(MRA8_RAM, williams2_tileram_w) AM_BASE(&williams2_tileram) + AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(SMH_RAM, williams2_tileram_w) AM_BASE(&williams2_tileram) AM_RANGE(0xc800, 0xc87f) AM_WRITE(williams2_bank_select_w) AM_RANGE(0xc880, 0xc887) AM_MIRROR(0x0078) AM_WRITE(williams_blitter_w) AM_RANGE(0xc900, 0xc97f) AM_WRITE(williams2_watchdog_reset_w) @@ -625,15 +625,15 @@ static ADDRESS_MAP_START( williams2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xcb80, 0xcb9f) AM_WRITE(defender_video_control_w) AM_RANGE(0xcba0, 0xcbbf) AM_WRITE(williams2_blit_window_enable_w) AM_RANGE(0xcbe0, 0xcbef) AM_READ(williams2_video_counter_r) - AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(MRA8_RAM, williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(SMH_RAM, williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xd000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( williams2_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READWRITE(MRA8_BANK1, MWA8_RAM) AM_BASE(&williams_videoram) + AM_RANGE(0x0000, 0x7fff) AM_READWRITE(SMH_BANK1, SMH_RAM) AM_BASE(&williams_videoram) AM_RANGE(0x8000, 0xbfff) AM_RAM - AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(MRA8_RAM, williams2_tileram_w) AM_BASE(&williams2_tileram) + AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(SMH_RAM, williams2_tileram_w) AM_BASE(&williams2_tileram) AM_RANGE(0xc800, 0xc87f) AM_WRITE(williams2_bank_select_w) AM_RANGE(0xc880, 0xc887) AM_MIRROR(0x0078) AM_WRITE(williams_blitter_w) AM_RANGE(0xc900, 0xc97f) AM_WRITE(williams2_watchdog_reset_w) @@ -647,7 +647,7 @@ static ADDRESS_MAP_START( williams2_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xcb80, 0xcb9f) AM_WRITE(defender_video_control_w) AM_RANGE(0xcba0, 0xcbbf) AM_WRITE(williams2_blit_window_enable_w) AM_RANGE(0xcbe0, 0xcbef) AM_READ(williams2_video_counter_r) - AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(MRA8_RAM, williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) + AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(SMH_RAM, williams_cmos_w) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -2701,7 +2701,7 @@ static DRIVER_INIT( alienar ) { CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000); CONFIGURE_PIAS(williams_muxed_pia_0_intf, williams_pia_1_intf, williams_snd_pia_intf); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xcbff, 0xcbff, 0, 0, MWA8_NOP); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xcbff, 0xcbff, 0, 0, SMH_NOP); } @@ -2709,7 +2709,7 @@ static DRIVER_INIT( alienaru ) { CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000); CONFIGURE_PIAS(williams_muxed_pia_0_intf, williams_pia_1_intf, williams_snd_pia_intf); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xcbff, 0xcbff, 0, 0, MWA8_NOP); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xcbff, 0xcbff, 0, 0, SMH_NOP); } diff --git a/src/mame/drivers/wilytowr.c b/src/mame/drivers/wilytowr.c index 000f82fc3dc..c5e971e65fd 100644 --- a/src/mame/drivers/wilytowr.c +++ b/src/mame/drivers/wilytowr.c @@ -253,9 +253,9 @@ static WRITE8_HANDLER( p2_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xd000, 0xdfff) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xefff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) AM_RANGE(0xf800, 0xf800) AM_READ(input_port_0_r) AM_RANGE(0xf801, 0xf801) AM_READ(input_port_1_r) AM_RANGE(0xf802, 0xf802) AM_READ(input_port_2_r) @@ -263,11 +263,11 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xd000, 0xdfff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe000, 0xe1ff) AM_WRITE(MWA8_RAM) - AM_RANGE(0xe200, 0xe2ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0xe300, 0xe3ff) AM_WRITE(MWA8_RAM) AM_BASE(&wilytowr_scrollram) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM) + AM_RANGE(0xe000, 0xe1ff) AM_WRITE(SMH_RAM) + AM_RANGE(0xe200, 0xe2ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xe300, 0xe3ff) AM_WRITE(SMH_RAM) AM_BASE(&wilytowr_scrollram) AM_RANGE(0xe400, 0xe7ff) AM_WRITE(wilytowr_videoram2_w) AM_BASE(&wilytowr_videoram2) AM_RANGE(0xe800, 0xebff) AM_WRITE(wilytowr_videoram_w) AM_BASE(&videoram) AM_RANGE(0xec00, 0xefff) AM_WRITE(wilytowr_colorram_w) AM_BASE(&colorram) @@ -287,9 +287,9 @@ static ADDRESS_MAP_START( fghtbskt_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xd1ff) AM_RAM AM_RANGE(0xd200, 0xd2ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd300, 0xd3ff) AM_RAM AM_BASE(&wilytowr_scrollram) - AM_RANGE(0xd400, 0xd7ff) AM_READWRITE(MRA8_RAM, wilytowr_videoram2_w) AM_BASE(&wilytowr_videoram2) - AM_RANGE(0xd800, 0xdbff) AM_READWRITE(MRA8_RAM, wilytowr_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xdc00, 0xdfff) AM_READWRITE(MRA8_RAM, wilytowr_colorram_w) AM_BASE(&colorram) + AM_RANGE(0xd400, 0xd7ff) AM_READWRITE(SMH_RAM, wilytowr_videoram2_w) AM_BASE(&wilytowr_videoram2) + AM_RANGE(0xd800, 0xdbff) AM_READWRITE(SMH_RAM, wilytowr_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xdc00, 0xdfff) AM_READWRITE(SMH_RAM, wilytowr_colorram_w) AM_BASE(&colorram) AM_RANGE(0xf000, 0xf000) AM_READNOP //sound status AM_RANGE(0xf001, 0xf001) AM_READ(input_port_0_r) AM_RANGE(0xf002, 0xf002) AM_READ(input_port_1_r) @@ -308,11 +308,11 @@ static ADDRESS_MAP_START( fghtbskt_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x0fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( i8039_readport, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c index dd522f49d79..741b1175e0e 100644 --- a/src/mame/drivers/wiping.c +++ b/src/mame/drivers/wiping.c @@ -95,39 +95,39 @@ static WRITE8_HANDLER( subcpu_reset_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x8bff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x8bff) AM_READ(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_READ(shared1_r) AM_RANGE(0x9800, 0x9bff) AM_READ(shared2_r) AM_RANGE(0xa800, 0xa807) AM_READ(ports_r) - AM_RANGE(0xb000, 0xb7ff) AM_READ(MRA8_RAM) + AM_RANGE(0xb000, 0xb7ff) AM_READ(SMH_RAM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x8400, 0x87ff) AM_WRITE(MWA8_RAM) AM_BASE(&colorram) - AM_RANGE(0x8800, 0x88ff) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x8900, 0x8bff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x8400, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&colorram) + AM_RANGE(0x8800, 0x88ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x8900, 0x8bff) AM_WRITE(SMH_RAM) AM_RANGE(0x9000, 0x93ff) AM_WRITE(shared1_w) AM_BASE(&sharedram1) AM_RANGE(0x9800, 0x9bff) AM_WRITE(shared2_w) AM_BASE(&sharedram2) AM_RANGE(0xa000, 0xa000) AM_WRITE(interrupt_enable_w) AM_RANGE(0xa002, 0xa002) AM_WRITE(wiping_flipscreen_w) AM_RANGE(0xa003, 0xa003) AM_WRITE(subcpu_reset_w) - AM_RANGE(0xb000, 0xb7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0xb000, 0xb7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xb800, 0xb800) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END /* Sound cpu data */ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0x9000, 0x93ff) AM_READ(shared1_r) AM_RANGE(0x9800, 0x9bff) AM_READ(shared2_r) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM) AM_RANGE(0x4000, 0x7fff) AM_WRITE(wiping_sound_w) AM_BASE(&wiping_soundregs) AM_RANGE(0x9000, 0x93ff) AM_WRITE(shared1_w) AM_RANGE(0x9800, 0x9bff) AM_WRITE(shared2_w) diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 5a42eca796f..0f42d20a8fa 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -432,7 +432,7 @@ static const struct YM2203interface 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(MRA8_BANK1) + AM_RANGE(UNBANKED_SIZE, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0x8000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w) AM_RANGE(0x8001, 0x8001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w) AM_RANGE(0x8008, 0x8008) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w) @@ -443,8 +443,8 @@ static ADDRESS_MAP_START( map_main, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc800, 0xcbff) AM_READWRITE(gfx1_vram_r, gfx1_vram_w) AM_BASE(&gfx1_vram) AM_RANGE(0xcc00, 0xcfff) AM_READWRITE(gfx1_cram_r, gfx1_cram_w) AM_BASE(&gfx1_cram) AM_RANGE(0xd000, 0xdfff) AM_RAM AM_BASE(&sprite_ram) - AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(MRA8_RAM, paletteram_xBBBBBGGGGGRRRRR_split1_w) AM_BASE(&paletteram) - AM_RANGE(0xe800, 0xefff) AM_READWRITE(MRA8_RAM, paletteram_xBBBBBGGGGGRRRRR_split2_w) AM_BASE(&paletteram_2) + AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(SMH_RAM, paletteram_xBBBBBGGGGGRRRRR_split1_w) AM_BASE(&paletteram) + AM_RANGE(0xe800, 0xefff) AM_READWRITE(SMH_RAM, paletteram_xBBBBBGGGGGRRRRR_split2_w) AM_BASE(&paletteram_2) AM_RANGE(0xf000, 0xf0ff) AM_RAM AM_SHARE(1) AM_RANGE(0xf100, 0xf17f) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0xf180, 0xffff) AM_RAM AM_SHARE(2) diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index a4a153bdb2d..2a7fa30d667 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -226,10 +226,10 @@ static WRITE8_HANDLER( wiz_coin_counter_w ) } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) - AM_RANGE(0xd000, 0xd85f) AM_READ(MRA8_RAM) - AM_RANGE(0xe000, 0xe85f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) + AM_RANGE(0xd000, 0xd85f) AM_READ(SMH_RAM) + AM_RANGE(0xe000, 0xe85f) AM_READ(SMH_RAM) AM_RANGE(0xf000, 0xf000) AM_READ(input_port_2_r) /* DSW0 */ AM_RANGE(0xf008, 0xf008) AM_READ(input_port_3_r) /* DSW1 */ AM_RANGE(0xf010, 0xf010) AM_READ(input_port_0_r) /* IN0 */ @@ -238,38 +238,38 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc800, 0xc801) AM_WRITE(wiz_coin_counter_w) - AM_RANGE(0xd000, 0xd3ff) AM_WRITE(MWA8_RAM) AM_BASE(&wiz_videoram2) - AM_RANGE(0xd400, 0xd7ff) AM_WRITE(MWA8_RAM) AM_BASE(&wiz_colorram2) - AM_RANGE(0xd800, 0xd83f) AM_WRITE(MWA8_RAM) AM_BASE(&wiz_attributesram2) - AM_RANGE(0xd840, 0xd85f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_size) - AM_RANGE(0xe000, 0xe3ff) AM_WRITE(MWA8_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xe400, 0xe7ff) AM_WRITE(MWA8_RAM) AM_BASE(&colorram) - AM_RANGE(0xe800, 0xe83f) AM_WRITE(MWA8_RAM) AM_BASE(&wiz_attributesram) - AM_RANGE(0xe840, 0xe85f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_RAM) AM_BASE(&wiz_sprite_bank) + AM_RANGE(0xd000, 0xd3ff) AM_WRITE(SMH_RAM) AM_BASE(&wiz_videoram2) + AM_RANGE(0xd400, 0xd7ff) AM_WRITE(SMH_RAM) AM_BASE(&wiz_colorram2) + AM_RANGE(0xd800, 0xd83f) AM_WRITE(SMH_RAM) AM_BASE(&wiz_attributesram2) + AM_RANGE(0xd840, 0xd85f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_size) + AM_RANGE(0xe000, 0xe3ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xe400, 0xe7ff) AM_WRITE(SMH_RAM) AM_BASE(&colorram) + AM_RANGE(0xe800, 0xe83f) AM_WRITE(SMH_RAM) AM_BASE(&wiz_attributesram) + AM_RANGE(0xe840, 0xe85f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_RAM) AM_BASE(&wiz_sprite_bank) AM_RANGE(0xf001, 0xf001) AM_WRITE(interrupt_enable_w) AM_RANGE(0xf002, 0xf003) AM_WRITE(wiz_palettebank_w) AM_RANGE(0xf004, 0xf005) AM_WRITE(wiz_char_bank_select_w) AM_RANGE(0xf006, 0xf006) AM_WRITE(wiz_flipx_w) AM_RANGE(0xf007, 0xf007) AM_WRITE(wiz_flipy_w) - AM_RANGE(0xf008, 0xf00f) AM_WRITE(MWA8_NOP) // initialized by Stinger/Scion + AM_RANGE(0xf008, 0xf00f) AM_WRITE(SMH_NOP) // initialized by Stinger/Scion AM_RANGE(0xf800, 0xf80f) AM_WRITE(sound_command_w) // sound registers AM_RANGE(0xf818, 0xf818) AM_WRITE(wiz_bgcolor_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x1fff) AM_READ(MRA8_ROM) - AM_RANGE(0x2000, 0x23ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) + AM_RANGE(0x2000, 0x23ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) /* Stinger/Scion */ AM_RANGE(0x7000, 0x7000) AM_READ(soundlatch_r) /* Wiz */ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x2000, 0x23ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_WRITE(interrupt_enable_w) /* Stinger/Scion */ AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_2_w) AM_RANGE(0x4001, 0x4001) AM_WRITE(AY8910_write_port_2_w) @@ -1058,7 +1058,7 @@ static DRIVER_INIT( stinger ) static DRIVER_INIT( scion ) { - memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x4000, 0x4001, 0, 0, MWA8_NOP); + memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x4000, 0x4001, 0, 0, SMH_NOP); } diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c index 168faef9020..6a30395dff0 100644 --- a/src/mame/drivers/wolfpack.c +++ b/src/mame/drivers/wolfpack.c @@ -143,19 +143,19 @@ static WRITE8_HANDLER( wolfpack_coldetres_w ) static ADDRESS_MAP_START( wolfpack_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_READ(MRA8_RAM) AM_MIRROR(0x100) + AM_RANGE(0x0000, 0x00ff) AM_READ(SMH_RAM) AM_MIRROR(0x100) AM_RANGE(0x1000, 0x1000) AM_READ(wolfpack_input_r) AM_RANGE(0x2000, 0x2000) AM_READ(wolfpack_misc_r) AM_RANGE(0x3000, 0x3000) AM_READ(input_port_1_r) - AM_RANGE(0x7000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x9000, 0x9000) AM_READ(MRA8_NOP) /* debugger ROM location? */ - AM_RANGE(0xf000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x9000, 0x9000) AM_READ(SMH_NOP) /* debugger ROM location? */ + AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( wolfpack_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x00ff) AM_WRITE(MWA8_RAM) AM_MIRROR(0x100) - AM_RANGE(0x1000, 0x10ff) AM_WRITE(MWA8_RAM) AM_BASE(&wolfpack_alpha_num_ram) + AM_RANGE(0x0000, 0x00ff) AM_WRITE(SMH_RAM) AM_MIRROR(0x100) + AM_RANGE(0x1000, 0x10ff) AM_WRITE(SMH_RAM) AM_BASE(&wolfpack_alpha_num_ram) AM_RANGE(0x2000, 0x2000) AM_WRITE(wolfpack_high_explo_w) AM_RANGE(0x2001, 0x2001) AM_WRITE(wolfpack_sonar_ping_w) AM_RANGE(0x2002, 0x2002) AM_WRITE(wolfpack_sirlat_w) @@ -184,8 +184,8 @@ static ADDRESS_MAP_START( wolfpack_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4005, 0x4005) AM_WRITE(wolfpack_torpedo_h_w) AM_RANGE(0x4006, 0x4006) AM_WRITE(wolfpack_torpedo_v_w) AM_RANGE(0x5000, 0x5fff) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x7000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xf000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x7000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c index cfb55cbf943..d71c9e3a370 100644 --- a/src/mame/drivers/wrally.c +++ b/src/mame/drivers/wrally.c @@ -98,16 +98,16 @@ WRITE16_HANDLER( wrally_coin_lockout_w ); static ADDRESS_MAP_START( wrally_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(MRA16_ROM) /* ROM */ - AM_RANGE(0x100000, 0x103fff) AM_READ(MRA16_RAM) /* encrypted Video RAM */ - AM_RANGE(0x200000, 0x203fff) AM_READ(MRA16_RAM) /* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_READ(MRA16_RAM) /* Sprite RAM */ + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x100000, 0x103fff) AM_READ(SMH_RAM) /* encrypted Video RAM */ + AM_RANGE(0x200000, 0x203fff) AM_READ(SMH_RAM) /* Palette */ + AM_RANGE(0x440000, 0x440fff) AM_READ(SMH_RAM) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r)/* DSW #1 & #2 */ AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r)/* INPUT 1P & 2P, COINSW, STARTSW */ AM_RANGE(0x700004, 0x700005) AM_READ(input_port_2_word_r)/* Wheel */ AM_RANGE(0x700008, 0x700009) AM_READ(input_port_3_word_r)/* TESTSW & SERVICESW */ AM_RANGE(0x70000e, 0x70000f) AM_READ(OKIM6295_status_0_lsb_r)/* OKI6295 status register */ - AM_RANGE(0xfe0000, 0xfeffff) AM_READ(MRA16_RAM) /* Work RAM (partially shared with DS5002FP) */ + AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END static WRITE16_HANDLER( unknown_w ) @@ -116,20 +116,20 @@ static WRITE16_HANDLER( unknown_w ) } static ADDRESS_MAP_START( wrally_writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_WRITE(MWA16_ROM) /* ROM */ + AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM) /* ROM */ AM_RANGE(0x100000, 0x103fff) AM_WRITE(wrally_vram_w) AM_BASE(&wrally_videoram) /* encrypted Video RAM */ - AM_RANGE(0x108000, 0x108007) AM_WRITE(MWA16_RAM) AM_BASE(&wrally_vregs) /* Video Registers */ - AM_RANGE(0x10800c, 0x10800d) AM_WRITE(MWA16_NOP) /* CLR INT Video */ + AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&wrally_vregs) /* Video Registers */ + AM_RANGE(0x10800c, 0x10800d) AM_WRITE(SMH_NOP) /* CLR INT Video */ AM_RANGE(0x200000, 0x203fff) AM_WRITE(paletteram16_xxxxBBBBRRRRGGGG_word_w) AM_BASE(&paletteram16)/* Palette */ - AM_RANGE(0x440000, 0x440fff) AM_WRITE(MWA16_RAM) AM_BASE(&wrally_spriteram) /* Sprite RAM */ + AM_RANGE(0x440000, 0x440fff) AM_WRITE(SMH_RAM) AM_BASE(&wrally_spriteram) /* Sprite RAM */ AM_RANGE(0x70000c, 0x70000d) AM_WRITE(OKIM6295_bankswitch_w) /* OKI6295 bankswitch */ AM_RANGE(0x70000e, 0x70000f) AM_WRITE(OKIM6295_data_0_lsb_w) /* OKI6295 data register */ AM_RANGE(0x70000a, 0x70001b) AM_WRITE(wrally_coin_lockout_w) /* Coin lockouts */ AM_RANGE(0x70002a, 0x70003b) AM_WRITE(wrally_coin_counter_w) /* Coin counters */ - AM_RANGE(0x70004a, 0x70004b) AM_WRITE(MWA16_NOP) /* sound muting */ - AM_RANGE(0x70005a, 0x70005b) AM_WRITE(MWA16_NOP) /* flip screen */ + AM_RANGE(0x70004a, 0x70004b) AM_WRITE(SMH_NOP) /* sound muting */ + AM_RANGE(0x70005a, 0x70005b) AM_WRITE(SMH_NOP) /* flip screen */ AM_RANGE(0x70006a, 0x70007b) AM_WRITE(unknown_w) /* ??? */ - AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(MWA16_RAM) /* Work RAM (partially shared with DS5002FP) */ + AM_RANGE(0xfe0000, 0xfeffff) AM_WRITE(SMH_RAM) /* Work RAM (partially shared with DS5002FP) */ ADDRESS_MAP_END diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c index 90faf4809b2..81b6f200b52 100644 --- a/src/mame/drivers/wwfsstar.c +++ b/src/mame/drivers/wwfsstar.c @@ -79,42 +79,42 @@ static int vblank; *******************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_READ(MRA16_ROM) /* Rom */ - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) /* FG0 Ram */ - AM_RANGE(0x0c0000, 0x0c0fff) AM_READ(MRA16_RAM) /* BG0 Ram */ - AM_RANGE(0x100000, 0x1003ff) AM_READ(MRA16_RAM) /* SPR Ram */ + AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) /* Rom */ + AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) /* FG0 Ram */ + AM_RANGE(0x0c0000, 0x0c0fff) AM_READ(SMH_RAM) /* BG0 Ram */ + AM_RANGE(0x100000, 0x1003ff) AM_READ(SMH_RAM) /* SPR Ram */ AM_RANGE(0x180000, 0x180001) AM_READ(input_port_3_word_r) /* DSW0 */ AM_RANGE(0x180002, 0x180003) AM_READ(input_port_4_word_r) /* DSW1 */ AM_RANGE(0x180004, 0x180005) AM_READ(input_port_0_word_r) /* CTRLS0 */ AM_RANGE(0x180006, 0x180007) AM_READ(input_port_1_word_r) /* CTRLS1 */ AM_RANGE(0x180008, 0x180009) AM_READ(input_port_2_word_r_cust) /* MISC */ - AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(MRA16_RAM) /* Work Ram */ + AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(SMH_RAM) /* Work Ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x03ffff) AM_WRITE(MWA16_ROM) /* Rom */ + AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM) /* Rom */ AM_RANGE(0x080000, 0x080fff) AM_WRITE(wwfsstar_fg0_videoram_w) AM_BASE(&wwfsstar_fg0_videoram) /* FG0 Ram */ AM_RANGE(0x0c0000, 0x0c0fff) AM_WRITE(wwfsstar_bg0_videoram_w) AM_BASE(&wwfsstar_bg0_videoram) /* BG0 Ram */ - AM_RANGE(0x100000, 0x1003ff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) /* SPR Ram */ + AM_RANGE(0x100000, 0x1003ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) /* SPR Ram */ AM_RANGE(0x140000, 0x140fff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x180000, 0x180003) AM_WRITE(wwfsstar_irqack_w) AM_RANGE(0x180004, 0x180007) AM_WRITE(wwfsstar_scrollwrite) AM_RANGE(0x180008, 0x180009) AM_WRITE(wwfsstar_soundwrite) AM_RANGE(0x18000a, 0x18000b) AM_WRITE(wwfsstar_flipscreen_w) - AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(MWA16_RAM) /* Work Ram */ + AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(SMH_RAM) /* Work Ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(MRA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM) AM_RANGE(0x8801, 0x8801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0x9800, 0x9800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0x9800, 0x9800) AM_WRITE(OKIM6295_data_0_w) diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c index 70a67e3da0d..bc07702bc5f 100644 --- a/src/mame/drivers/wwfwfest.c +++ b/src/mame/drivers/wwfwfest.c @@ -68,43 +68,43 @@ static WRITE16_HANDLER( wwfwfest_flipscreen_w ) *******************************************************************************/ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_READ(MRA16_ROM) /* Rom */ - AM_RANGE(0x0c0000, 0x0c1fff) AM_READ(MRA16_RAM) /* FG0 Ram */ - AM_RANGE(0x0c2000, 0x0c3fff) AM_READ(MRA16_RAM) /* SPR Ram */ - AM_RANGE(0x080000, 0x080fff) AM_READ(MRA16_RAM) /* BG0 Ram */ - AM_RANGE(0x082000, 0x082fff) AM_READ(MRA16_RAM) /* BG1 Ram */ + AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) /* Rom */ + AM_RANGE(0x0c0000, 0x0c1fff) AM_READ(SMH_RAM) /* FG0 Ram */ + AM_RANGE(0x0c2000, 0x0c3fff) AM_READ(SMH_RAM) /* SPR Ram */ + AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) /* BG0 Ram */ + AM_RANGE(0x082000, 0x082fff) AM_READ(SMH_RAM) /* BG1 Ram */ AM_RANGE(0x140020, 0x140027) AM_READ(wwfwfest_inputs_read) /* Inputs */ AM_RANGE(0x180000, 0x18ffff) AM_READ(wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_r) /* BG0 Ram */ - AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(MRA16_RAM) /* Work Ram */ + AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(SMH_RAM) /* Work Ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x07ffff) AM_WRITE(MWA16_ROM) /* Rom */ + AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) /* Rom */ AM_RANGE(0x0c0000, 0x0c1fff) AM_WRITE(wwfwfest_fg0_videoram_w) AM_BASE(&wwfwfest_fg0_videoram) /* FG0 Ram - 4 bytes per tile */ - AM_RANGE(0x0c2000, 0x0c3fff) AM_WRITE(MWA16_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* SPR Ram */ + AM_RANGE(0x0c2000, 0x0c3fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* SPR Ram */ AM_RANGE(0x080000, 0x080fff) AM_WRITE(wwfwfest_bg0_videoram_w) AM_BASE(&wwfwfest_bg0_videoram) /* BG0 Ram - 4 bytes per tile */ AM_RANGE(0x082000, 0x082fff) AM_WRITE(wwfwfest_bg1_videoram_w) AM_BASE(&wwfwfest_bg1_videoram) /* BG1 Ram - 2 bytes per tile */ AM_RANGE(0x100000, 0x100007) AM_WRITE(wwfwfest_scroll_write) AM_RANGE(0x10000a, 0x10000b) AM_WRITE(wwfwfest_flipscreen_w) - AM_RANGE(0x140000, 0x140001) AM_WRITE(MWA16_NOP) /* Irq 3 ack */ - AM_RANGE(0x140002, 0x140003) AM_WRITE(MWA16_NOP) /* Irq 2 ack */ + AM_RANGE(0x140000, 0x140001) AM_WRITE(SMH_NOP) /* Irq 3 ack */ + AM_RANGE(0x140002, 0x140003) AM_WRITE(SMH_NOP) /* Irq 2 ack */ AM_RANGE(0x14000C, 0x14000D) AM_WRITE(wwfwfest_soundwrite) AM_RANGE(0x140010, 0x140011) AM_WRITE(wwfwfest_1410_write) AM_RANGE(0x180000, 0x18ffff) AM_WRITE(wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(MWA16_RAM) /* Work Ram */ + AM_RANGE(0x1c0000, 0x1c3fff) AM_WRITE(SMH_RAM) /* Work Ram */ ADDRESS_MAP_END static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM) AM_RANGE(0xc801, 0xc801) AM_READ(YM2151_status_port_0_r) AM_RANGE(0xd800, 0xd800) AM_READ(OKIM6295_status_0_r) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xc7ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM) AM_RANGE(0xc800, 0xc800) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xc801, 0xc801) AM_WRITE(YM2151_data_port_0_w) AM_RANGE(0xd800, 0xd800) AM_WRITE(OKIM6295_data_0_w) diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c index e45a49358e5..c247d901b90 100644 --- a/src/mame/drivers/xain.c +++ b/src/mame/drivers/xain.c @@ -269,7 +269,7 @@ static INTERRUPT_GEN( xain_interrupt ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READWRITE(xain_sharedram_r, xain_sharedram_w) AM_BASE(&xain_sharedram) - AM_RANGE(0x2000, 0x37ff) AM_READ(MRA8_RAM) + AM_RANGE(0x2000, 0x37ff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x27ff) AM_WRITE(xain_charram_w) AM_BASE(&xain_charram) AM_RANGE(0x2800, 0x2fff) AM_WRITE(xain_bgram1_w) AM_BASE(&xain_bgram1) AM_RANGE(0x3000, 0x37ff) AM_WRITE(xain_bgram0_w) AM_BASE(&xain_bgram0) @@ -283,7 +283,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3a04, 0x3a04) AM_READ(xain_68705_r) /* from the 68705 */ AM_RANGE(0x3a04, 0x3a05) AM_WRITE(xain_scrollxP0_w) AM_RANGE(0x3a05, 0x3a05) AM_READ(xain_input_port_4_r) -// AM_RANGE(0x3a06, 0x3a06) AM_READ(MRA8_NOP) /* ?? read (and discarded) on startup. Maybe reset the 68705 */ +// AM_RANGE(0x3a06, 0x3a06) AM_READ(SMH_NOP) /* ?? read (and discarded) on startup. Maybe reset the 68705 */ AM_RANGE(0x3a06, 0x3a07) AM_WRITE(xain_scrollyP0_w) AM_RANGE(0x3a08, 0x3a08) AM_WRITE(xain_sound_command_w) AM_RANGE(0x3a09, 0x3a0c) AM_WRITE(xain_main_irq_w) @@ -292,7 +292,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(&paletteram) AM_RANGE(0x3e00, 0x3fff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK1) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -301,7 +301,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_READ(MRA8_BANK2) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2) AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 565c0e482e8..290ae6372af 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -375,9 +375,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x17ffff) AM_ROM AM_RANGE(0x180000, 0x181fff) AM_READWRITE(K056832_ram_word_r, K056832_ram_word_w) AM_RANGE(0x182000, 0x183fff) AM_READWRITE(K056832_ram_word_r, K056832_ram_word_w) - AM_RANGE(0x190000, 0x191fff) AM_READWRITE(K056832_rom_word_r, MWA16_ROM) // Passthrough to tile roms + AM_RANGE(0x190000, 0x191fff) AM_READWRITE(K056832_rom_word_r, SMH_ROM) // Passthrough to tile roms AM_RANGE(0x1a0000, 0x1a1fff) AM_READ(K053250_0_rom_r) - AM_RANGE(0x1b0000, 0x1b1fff) AM_READWRITE(MRA16_RAM, paletteram16_xrgb_word_be_w) AM_BASE(&paletteram16) + AM_RANGE(0x1b0000, 0x1b1fff) AM_READWRITE(SMH_RAM, paletteram16_xrgb_word_be_w) AM_BASE(&paletteram16) #if XE_DEBUG AM_RANGE(0x0c0000, 0x0c003f) AM_READ(K056832_word_r) @@ -392,7 +392,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x8000, 0xbfff) AM_READ(MRA8_BANK2) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_READWRITE(K054539_0_r, K054539_0_w) diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index f0304811678..cdb350c2c86 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -175,7 +175,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_RANGE(0x100000, 0x100fff) AM_READWRITE(K053247_word_r, K053247_word_w) AM_RANGE(0x101000, 0x101fff) AM_RAM - AM_RANGE(0x104000, 0x104fff) AM_READWRITE(MRA16_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x104000, 0x104fff) AM_READWRITE(SMH_RAM, paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x108000, 0x108001) AM_WRITE(eeprom_w) AM_RANGE(0x108020, 0x108027) AM_WRITE(K053246_word_w) AM_RANGE(0x10804c, 0x10804d) AM_WRITE(sound_cmd_w) @@ -193,8 +193,8 @@ 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(MRA8_BANK4) - AM_RANGE(0x8000, 0xbfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK4) + AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe22f) AM_READWRITE(K054539_0_r, K054539_0_w) AM_RANGE(0xe800, 0xe800) AM_WRITE(YM2151_register_port_0_w) @@ -218,7 +218,7 @@ static ADDRESS_MAP_START( 6p_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x101000, 0x101fff) AM_RAM AM_RANGE(0x102000, 0x102fff) AM_RAM AM_BASE(&xmen6p_spriteramright) /* sprites (screen 2) */ AM_RANGE(0x103000, 0x103fff) AM_RAM /* 6p - a buffer? */ - AM_RANGE(0x104000, 0x104fff) AM_READWRITE(MRA16_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x104000, 0x104fff) AM_READWRITE(SMH_RAM,paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x108000, 0x108001) AM_WRITE(eeprom_w) AM_RANGE(0x108020, 0x108027) AM_WRITE(K053246_word_w) /* sprites */ AM_RANGE(0x10804c, 0x10804d) AM_WRITE(sound_cmd_w) @@ -235,35 +235,35 @@ static ADDRESS_MAP_START( 6p_main_map, ADDRESS_SPACE_PROGRAM, 16 ) /* AM_RANGE(0x18c000, 0x197fff) AM_WRITE(K052109_lsb_w) AM_BASE(&xmen6p_tilemapleft) */ AM_RANGE(0x18c000, 0x197fff) AM_RAM AM_BASE(&xmen6p_tilemapleft) /* left tilemap (p1,p2,p3 counters) */ /* - AM_RANGE(0x1ac000, 0x1af7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x1ac000, 0x1af7ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1ac000, 0x1af7ff) AM_READ(SMH_RAM) + AM_RANGE(0x1ac000, 0x1af7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x1b0000, 0x1b37ff) AM_READ(MRA16_RAM) - AM_RANGE(0x1b0000, 0x1b37ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1b0000, 0x1b37ff) AM_READ(SMH_RAM) + AM_RANGE(0x1b0000, 0x1b37ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x1b4000, 0x1b77ff) AM_READ(MRA16_RAM) - AM_RANGE(0x1b4000, 0x1b77ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1b4000, 0x1b77ff) AM_READ(SMH_RAM) + AM_RANGE(0x1b4000, 0x1b77ff) AM_WRITE(SMH_RAM) */ AM_RANGE(0x1ac000, 0x1b7fff) AM_RAM AM_BASE(&xmen6p_tilemapright) /* right tilemap */ /* what are the regions below buffers? (used by hw or software?) */ /* - AM_RANGE(0x1cc000, 0x1cf7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x1cc000, 0x1cf7ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1cc000, 0x1cf7ff) AM_READ(SMH_RAM) + AM_RANGE(0x1cc000, 0x1cf7ff) AM_WRITE(SMH_RAM) - AM_RANGE(0x1d0000, 0x1d37ff) AM_READ(MRA16_RAM) - AM_RANGE(0x1d0000, 0x1d37ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1d0000, 0x1d37ff) AM_READ(SMH_RAM) + AM_RANGE(0x1d0000, 0x1d37ff) AM_WRITE(SMH_RAM) */ AM_RANGE(0x1cc000, 0x1d7fff) AM_RAM /* tilemap ? */ /* whats the stuff below, buffers? */ /* - AM_RANGE(0x1ec000, 0x1ef7ff) AM_READ(MRA16_RAM) - AM_RANGE(0x1ec000, 0x1ef7ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x1f0000, 0x1f37ff) AM_READ(MRA16_RAM) - AM_RANGE(0x1f0000, 0x1f37ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x1f4000, 0x1f77ff) AM_READ(MRA16_RAM) - AM_RANGE(0x1f4000, 0x1f77ff) AM_WRITE(MWA16_RAM) + AM_RANGE(0x1ec000, 0x1ef7ff) AM_READ(SMH_RAM) + AM_RANGE(0x1ec000, 0x1ef7ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1f0000, 0x1f37ff) AM_READ(SMH_RAM) + AM_RANGE(0x1f0000, 0x1f37ff) AM_WRITE(SMH_RAM) + AM_RANGE(0x1f4000, 0x1f77ff) AM_READ(SMH_RAM) + AM_RANGE(0x1f4000, 0x1f77ff) AM_WRITE(SMH_RAM) */ AM_RANGE(0x1ec000, 0x1f7fff) AM_RAM /* tilemap ? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c index 5583e1a1957..5ec1516eef9 100644 --- a/src/mame/drivers/xxmissio.c +++ b/src/mame/drivers/xxmissio.c @@ -118,7 +118,7 @@ static ADDRESS_MAP_START( map1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc800, 0xcfff) AM_SHARE(2) AM_READWRITE(xxmissio_bgram_r, xxmissio_bgram_w) AM_BASE(&xxmissio_bgram) AM_RANGE(0xd000, 0xd7ff) AM_SHARE(3) AM_RAM AM_BASE(&xxmissio_spriteram) - AM_RANGE(0xd800, 0xdaff) AM_SHARE(4) AM_READWRITE(MRA8_RAM, xxmissio_paletteram_w) AM_BASE(&paletteram) + AM_RANGE(0xd800, 0xdaff) AM_SHARE(4) AM_READWRITE(SMH_RAM, xxmissio_paletteram_w) AM_BASE(&paletteram) AM_RANGE(0xe000, 0xefff) AM_SHARE(5) AM_RAM AM_RANGE(0xf000, 0xffff) AM_SHARE(6) AM_RAM @@ -145,7 +145,7 @@ static ADDRESS_MAP_START( map2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc800, 0xcfff) AM_SHARE(2) AM_READWRITE(xxmissio_bgram_r, xxmissio_bgram_w) AM_RANGE(0xd000, 0xd7ff) AM_SHARE(3) AM_RAM - AM_RANGE(0xd800, 0xdaff) AM_SHARE(4) AM_READWRITE(MRA8_RAM, xxmissio_paletteram_w) + AM_RANGE(0xd800, 0xdaff) AM_SHARE(4) AM_READWRITE(SMH_RAM, xxmissio_paletteram_w) AM_RANGE(0xe000, 0xefff) AM_SHARE(6) AM_RAM AM_RANGE(0xf000, 0xffff) AM_SHARE(5) AM_RAM diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c index 6b44e189580..94a7e36266f 100644 --- a/src/mame/drivers/xybots.c +++ b/src/mame/drivers/xybots.c @@ -85,11 +85,11 @@ static READ16_HANDLER( special_port1_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0x7c0000) AM_ROM - AM_RANGE(0xff8000, 0xff8fff) AM_MIRROR(0x7f8000) AM_READWRITE(MRA16_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) + AM_RANGE(0xff8000, 0xff8fff) AM_MIRROR(0x7f8000) AM_READWRITE(SMH_RAM, atarigen_alpha_w) AM_BASE(&atarigen_alpha) AM_RANGE(0xff9000, 0xffadff) AM_MIRROR(0x7f8000) AM_RAM - AM_RANGE(0xffae00, 0xffafff) AM_MIRROR(0x7f8000) AM_READWRITE(MRA16_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0xffb000, 0xffbfff) AM_MIRROR(0x7f8000) AM_READWRITE(MRA16_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) - AM_RANGE(0xffc000, 0xffc7ff) AM_MIRROR(0x7f8800) AM_READWRITE(MRA16_RAM, paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0xffae00, 0xffafff) AM_MIRROR(0x7f8000) AM_READWRITE(SMH_RAM, atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) + AM_RANGE(0xffb000, 0xffbfff) AM_MIRROR(0x7f8000) AM_READWRITE(SMH_RAM, atarigen_playfield_w) AM_BASE(&atarigen_playfield) + AM_RANGE(0xffc000, 0xffc7ff) AM_MIRROR(0x7f8800) AM_READWRITE(SMH_RAM, paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0xffd000, 0xffdfff) AM_MIRROR(0x7f8000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) AM_RANGE(0xffe000, 0xffe0ff) AM_MIRROR(0x7f8000) AM_READ(atarigen_sound_r) AM_RANGE(0xffe100, 0xffe1ff) AM_MIRROR(0x7f8000) AM_READ(input_port_0_word_r) diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c index 9f7126dfb72..4b61993a594 100644 --- a/src/mame/drivers/xyonix.c +++ b/src/mame/drivers/xyonix.c @@ -152,16 +152,16 @@ static WRITE8_HANDLER ( xyonix_io_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xdfff) AM_RAM - AM_RANGE(0xe000, 0xffff) AM_READWRITE(MRA8_RAM, xyonix_vidram_w) AM_BASE(&xyonix_vidram) + AM_RANGE(0xe000, 0xffff) AM_READWRITE(SMH_RAM, xyonix_vidram_w) AM_BASE(&xyonix_vidram) ADDRESS_MAP_END static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x20, 0x20) AM_READWRITE(MRA8_NOP, SN76496_0_w) /* SN76496 ready signal */ - AM_RANGE(0x21, 0x21) AM_READWRITE(MRA8_NOP, SN76496_1_w) - AM_RANGE(0x40, 0x40) AM_WRITE(MWA8_NOP) /* NMI ack? */ + AM_RANGE(0x20, 0x20) AM_READWRITE(SMH_NOP, SN76496_0_w) /* SN76496 ready signal */ + AM_RANGE(0x21, 0x21) AM_READWRITE(SMH_NOP, SN76496_1_w) + AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP) /* NMI ack? */ AM_RANGE(0x50, 0x50) AM_WRITE(xyonix_irqack_w) - AM_RANGE(0x60, 0x61) AM_WRITE(MWA8_NOP) /* mc6845 */ + AM_RANGE(0x60, 0x61) AM_WRITE(SMH_NOP) /* mc6845 */ AM_RANGE(0xe0, 0xe0) AM_READWRITE(xyonix_io_r, xyonix_io_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c index 44c345110f3..c5ebe916d9d 100644 --- a/src/mame/drivers/yumefuda.c +++ b/src/mame/drivers/yumefuda.c @@ -200,13 +200,13 @@ static WRITE8_HANDLER( mux_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_READWRITE(MRA8_BANK1, MWA8_ROM) + AM_RANGE(0x8000, 0x9fff) AM_READWRITE(SMH_BANK1, SMH_ROM) AM_RANGE(0xa7fc, 0xa7fc) AM_WRITE(prot_lock_w) AM_RANGE(0xa7ff, 0xa7ff) AM_WRITE(eeprom_w) AM_RANGE(0xaf80, 0xafff) AM_READWRITE(custom_ram_r, custom_ram_w) AM_BASE(&cus_ram) /*260d - 2626*/ - AM_RANGE(0xb000, 0xb0ff) AM_READWRITE(MRA8_RAM, paletteram_RRRGGGBB_w) AM_BASE(&paletteram) /*Wrong format*/ - AM_RANGE(0xc000, 0xc3ff) AM_READWRITE(MRA8_RAM, yumefuda_vram_w) AM_BASE(&videoram) - AM_RANGE(0xd000, 0xd3ff) AM_READWRITE(MRA8_RAM, yumefuda_cram_w) AM_BASE(&colorram) + AM_RANGE(0xb000, 0xb0ff) AM_READWRITE(SMH_RAM, paletteram_RRRGGGBB_w) AM_BASE(&paletteram) /*Wrong format*/ + AM_RANGE(0xc000, 0xc3ff) AM_READWRITE(SMH_RAM, yumefuda_vram_w) AM_BASE(&videoram) + AM_RANGE(0xd000, 0xd3ff) AM_READWRITE(SMH_RAM, yumefuda_cram_w) AM_BASE(&colorram) AM_RANGE(0xe000, 0xffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index a2bc5b66e86..2f3f5c916e0 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -129,20 +129,20 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800018, 0x800019) AM_READ(input_port_1_word_r ) // Coins AM_RANGE(0x80001a, 0x80001b) AM_READ(input_port_2_word_r ) // DSW1 AM_RANGE(0x80001c, 0x80001d) AM_READ(input_port_3_word_r ) // DSW2 - AM_RANGE(0x800030, 0x800031) AM_WRITE(MWA16_NOP ) // ? (value: don't care) - AM_RANGE(0x800100, 0x800101) AM_WRITE(MWA16_NOP ) // ? $9100 - AM_RANGE(0x800102, 0x800103) AM_WRITE(MWA16_NOP ) // ? $9080 - AM_RANGE(0x800104, 0x800105) AM_WRITE(MWA16_NOP ) // ? $90c0 - AM_RANGE(0x80010a, 0x80010b) AM_WRITE(MWA16_NOP ) // ? $9000 - AM_RANGE(0x80010c, 0x80010f) AM_WRITE(MWA16_RAM) AM_BASE(&yunsun16_scroll_1 ) // Scrolling - AM_RANGE(0x800114, 0x800117) AM_WRITE(MWA16_RAM) AM_BASE(&yunsun16_scroll_0 ) // Scrolling - AM_RANGE(0x800154, 0x800155) AM_WRITE(MWA16_RAM) AM_BASE(&yunsun16_priority ) // Priority + AM_RANGE(0x800030, 0x800031) AM_WRITE(SMH_NOP ) // ? (value: don't care) + AM_RANGE(0x800100, 0x800101) AM_WRITE(SMH_NOP ) // ? $9100 + AM_RANGE(0x800102, 0x800103) AM_WRITE(SMH_NOP ) // ? $9080 + AM_RANGE(0x800104, 0x800105) AM_WRITE(SMH_NOP ) // ? $90c0 + AM_RANGE(0x80010a, 0x80010b) AM_WRITE(SMH_NOP ) // ? $9000 + AM_RANGE(0x80010c, 0x80010f) AM_WRITE(SMH_RAM) AM_BASE(&yunsun16_scroll_1 ) // Scrolling + AM_RANGE(0x800114, 0x800117) AM_WRITE(SMH_RAM) AM_BASE(&yunsun16_scroll_0 ) // Scrolling + AM_RANGE(0x800154, 0x800155) AM_WRITE(SMH_RAM) AM_BASE(&yunsun16_priority ) // Priority AM_RANGE(0x800180, 0x800181) AM_WRITE(yunsun16_sound_bank_w ) // Sound AM_RANGE(0x800188, 0x800189) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w ) // Sound - AM_RANGE(0x8001fe, 0x8001ff) AM_WRITE(MWA16_NOP ) // ? 0 (during int) - AM_RANGE(0x900000, 0x903fff) AM_READWRITE(MRA16_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette - AM_RANGE(0x908000, 0x90bfff) AM_READWRITE(MRA16_RAM, yunsun16_vram_1_w) AM_BASE(&yunsun16_vram_1 ) // Layer 1 - AM_RANGE(0x90c000, 0x90ffff) AM_READWRITE(MRA16_RAM, yunsun16_vram_0_w) AM_BASE(&yunsun16_vram_0 ) // Layer 0 + AM_RANGE(0x8001fe, 0x8001ff) AM_WRITE(SMH_NOP ) // ? 0 (during int) + AM_RANGE(0x900000, 0x903fff) AM_READWRITE(SMH_RAM, paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette + AM_RANGE(0x908000, 0x90bfff) AM_READWRITE(SMH_RAM, yunsun16_vram_1_w) AM_BASE(&yunsun16_vram_1 ) // Layer 1 + AM_RANGE(0x90c000, 0x90ffff) AM_READWRITE(SMH_RAM, yunsun16_vram_0_w) AM_BASE(&yunsun16_vram_0 ) // Layer 0 AM_RANGE(0x910000, 0x910fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index 8be86ae0ae9..0211d34934e 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -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(MRA8_BANK1 ) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_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 @@ -114,7 +114,7 @@ static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x03, 0x03) AM_READ(input_port_3_r ) // DSW 1 AM_RANGE(0x04, 0x04) AM_READ(input_port_4_r ) // DSW 2 AM_RANGE(0x06, 0x06) AM_WRITE(yunsung8_flipscreen_w ) // Flip Screen - AM_RANGE(0x07, 0x07) AM_WRITE(MWA8_NOP ) // ? (end of IRQ, random value) + AM_RANGE(0x07, 0x07) AM_WRITE(SMH_NOP ) // ? (end of IRQ, random value) ADDRESS_MAP_END @@ -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(MRA8_BANK2,MWA8_ROM ) // Banked ROM + AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK2,SMH_ROM ) // Banked ROM AM_RANGE(0xe000, 0xe000) AM_WRITE(yunsung8_sound_bankswitch_w ) // ROM Bank AM_RANGE(0xe400, 0xe400) AM_WRITE(yunsung8_adpcm_w ) AM_RANGE(0xec00, 0xec00) AM_WRITE(YM3812_control_port_0_w ) // YM3812 diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c index a6c97ddddae..7883911e5a0 100644 --- a/src/mame/drivers/zac2650.c +++ b/src/mame/drivers/zac2650.c @@ -25,15 +25,15 @@ VIDEO_UPDATE( tinvader ); static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x17ff) AM_ROM - AM_RANGE(0x1800, 0x1bff) AM_READWRITE(MRA8_RAM, tinvader_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x1800, 0x1bff) AM_READWRITE(SMH_RAM, tinvader_videoram_w) AM_BASE(&videoram) AM_RANGE(0x1c00, 0x1cff) AM_RAM AM_RANGE(0x1d00, 0x1dff) AM_RAM AM_RANGE(0x1e80, 0x1e80) AM_READWRITE(tinvader_port_0_r, tinvader_sound_w) AM_RANGE(0x1e81, 0x1e81) AM_READ(input_port_1_r) AM_RANGE(0x1e82, 0x1e82) AM_READ(input_port_2_r) AM_RANGE(0x1e85, 0x1e85) AM_READ(input_port_4_r) /* Dodgem Only */ - AM_RANGE(0x1e86, 0x1e86) AM_READWRITE(input_port_5_r, MWA8_NOP) /* Dodgem Only */ - AM_RANGE(0x1f00, 0x1fff) AM_READWRITE(zac_s2636_r, MWA8_RAM) AM_BASE(&zac2650_s2636_0_ram) + AM_RANGE(0x1e86, 0x1e86) AM_READWRITE(input_port_5_r, SMH_NOP) /* Dodgem Only */ + AM_RANGE(0x1f00, 0x1fff) AM_READWRITE(zac_s2636_r, SMH_RAM) AM_BASE(&zac2650_s2636_0_ram) ADDRESS_MAP_END static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c index ee5c59a13a0..414b3972b1c 100644 --- a/src/mame/drivers/zaccaria.c +++ b/src/mame/drivers/zaccaria.c @@ -330,63 +330,63 @@ static WRITE8_HANDLER( nmienable_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_READ(MRA8_ROM) - AM_RANGE(0x6000, 0x63ff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) + AM_RANGE(0x6000, 0x63ff) AM_READ(SMH_RAM) AM_RANGE(0x6400, 0x6407) AM_READ(zaccaria_prot1_r) AM_RANGE(0x6c00, 0x6c07) AM_READ(zaccaria_prot2_r) AM_RANGE(0x6e00, 0x6e00) AM_READ(zaccaria_dsw_r) - AM_RANGE(0x7000, 0x77ff) AM_READ(MRA8_RAM) + AM_RANGE(0x7000, 0x77ff) AM_READ(SMH_RAM) AM_RANGE(0x7800, 0x7803) AM_READ(ppi8255_0_r) AM_RANGE(0x7c00, 0x7c00) AM_READ(watchdog_reset_r) - AM_RANGE(0x8000, 0xdfff) AM_READ(MRA8_ROM) + AM_RANGE(0x8000, 0xdfff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x5fff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x0000, 0x5fff) AM_WRITE(SMH_ROM) AM_RANGE(0x6000, 0x67ff) AM_WRITE(zaccaria_videoram_w) AM_BASE(&zaccaria_videoram) /* 6400-67ff is 4 bits wide */ AM_RANGE(0x6800, 0x683f) AM_WRITE(zaccaria_attributes_w) AM_BASE(&zaccaria_attributesram) - AM_RANGE(0x6840, 0x685f) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x6881, 0x68bc) AM_WRITE(MWA8_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_2_size) + AM_RANGE(0x6840, 0x685f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x6881, 0x68bc) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_2_size) AM_RANGE(0x6c00, 0x6c00) AM_WRITE(zaccaria_flip_screen_x_w) AM_RANGE(0x6c01, 0x6c01) AM_WRITE(zaccaria_flip_screen_y_w) - AM_RANGE(0x6c02, 0x6c02) AM_WRITE(MWA8_NOP) /* sound reset */ + AM_RANGE(0x6c02, 0x6c02) AM_WRITE(SMH_NOP) /* sound reset */ AM_RANGE(0x6e00, 0x6e00) AM_WRITE(sound_command_w) AM_RANGE(0x6c06, 0x6c06) AM_WRITE(coin_w) AM_RANGE(0x6c07, 0x6c07) AM_WRITE(nmienable_w) - AM_RANGE(0x7000, 0x77ff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x7000, 0x77ff) AM_WRITE(SMH_RAM) AM_RANGE(0x7800, 0x7803) AM_WRITE(ppi8255_0_w) - AM_RANGE(0x8000, 0xdfff) AM_WRITE(MWA8_ROM) + AM_RANGE(0x8000, 0xdfff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x007f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x007f) AM_READ(SMH_RAM) AM_RANGE(0x500c, 0x500f) AM_READ(pia_0_r) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem1, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x007f) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x007f) AM_WRITE(SMH_RAM) AM_RANGE(0x500c, 0x500f) AM_WRITE(pia_0_w) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x007f) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x007f) AM_READ(SMH_RAM) AM_RANGE(0x0090, 0x0093) AM_READ(pia_1_r) AM_RANGE(0x1800, 0x1800) AM_READ(soundlatch_r) - AM_RANGE(0xa000, 0xbfff) AM_READ(MRA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_READ(MRA8_ROM) + AM_RANGE(0xa000, 0xbfff) AM_READ(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_writemem2, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x007f) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x007f) AM_WRITE(SMH_RAM) AM_RANGE(0x0090, 0x0093) AM_WRITE(pia_1_w) AM_RANGE(0x1000, 0x1000) AM_WRITE(mc1408_data_w) /* MC1408 */ AM_RANGE(0x1400, 0x1400) AM_WRITE(sound1_command_w) - AM_RANGE(0xa000, 0xbfff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xe000, 0xffff) AM_WRITE(MWA8_ROM) + AM_RANGE(0xa000, 0xbfff) AM_WRITE(SMH_ROM) + AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) ADDRESS_MAP_END diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index b0bf2802a01..be253a00f46 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -475,7 +475,7 @@ static WRITE8_HANDLER( zaxxon_coin_lockout_w ) static ADDRESS_MAP_START( zaxxon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6fff) AM_RAM - AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x1c00) AM_READWRITE(MRA8_RAM, zaxxon_videoram_w) AM_BASE(&videoram) + AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x1c00) AM_READWRITE(SMH_RAM, zaxxon_videoram_w) AM_BASE(&videoram) AM_RANGE(0xa000, 0xa0ff) AM_MIRROR(0x1f00) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x18fc) AM_READ_PORT("SW00") AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x18fc) AM_READ_PORT("SW01") @@ -498,8 +498,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( congo_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8fff) AM_RAM - AM_RANGE(0xa000, 0xa3ff) AM_MIRROR(0x1800) AM_READWRITE(MRA8_RAM, zaxxon_videoram_w) AM_BASE(&videoram) - AM_RANGE(0xa400, 0xa7ff) AM_MIRROR(0x1800) AM_READWRITE(MRA8_RAM, congo_colorram_w) AM_BASE(&colorram) + AM_RANGE(0xa000, 0xa3ff) AM_MIRROR(0x1800) AM_READWRITE(SMH_RAM, zaxxon_videoram_w) AM_BASE(&videoram) + AM_RANGE(0xa400, 0xa7ff) AM_MIRROR(0x1800) AM_READWRITE(SMH_RAM, congo_colorram_w) AM_BASE(&colorram) AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fc4) AM_READ_PORT("SW00") AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x1fc4) AM_READ_PORT("SW01") AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x1fc4) AM_READ_PORT("DSW02") diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c index 66d993bc73a..8d24aece050 100644 --- a/src/mame/drivers/zerozone.c +++ b/src/mame/drivers/zerozone.c @@ -70,9 +70,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x080000, 0x08000f) AM_READ(zerozone_input_r) AM_RANGE(0x084000, 0x084001) AM_WRITE(zerozone_sound_w) - AM_RANGE(0x088000, 0x0881ff) AM_READWRITE(MRA16_RAM, paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x088000, 0x0881ff) AM_READWRITE(SMH_RAM, paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x098000, 0x098001) AM_RAM /* Watchdog? */ - AM_RANGE(0x09ce00, 0x09ffff) AM_READWRITE(MRA16_RAM, zerozone_tilemap_w) AM_BASE(&zerozone_videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x09ce00, 0x09ffff) AM_READWRITE(SMH_RAM, zerozone_tilemap_w) AM_BASE(&zerozone_videoram) AM_SIZE(&videoram_size) AM_RANGE(0x0b4000, 0x0b4001) AM_WRITE(zerozone_tilebank_w) AM_RANGE(0x0c0000, 0x0cffff) AM_RAM AM_RANGE(0x0f8000, 0x0f87ff) AM_RAM /* Never read from */ diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 64c3ec6bf39..ccb419c9258 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -630,12 +630,12 @@ static WRITE32_HANDLER( zn_qsound_w ) static DRIVER_INIT( coh1000c ) { - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f3fffff, 0, 0, MRA32_BANK1 ); /* fixed game rom */ - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f400000, 0x1f7fffff, 0, 0, MRA32_BANK2 ); /* banked game rom */ + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f3fffff, 0, 0, SMH_BANK1 ); /* fixed game rom */ + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f400000, 0x1f7fffff, 0, 0, SMH_BANK2 ); /* banked game rom */ memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00003, 0, 0, bank_coh1000c_w ); /* bankswitch */ memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb40010, 0x1fb40013, 0, 0, capcom_kickharness_r ); memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb40020, 0x1fb40023, 0, 0, capcom_kickharness_r ); - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb80000, 0x1fbfffff, 0, 0, MRA32_BANK3 ); /* country rom */ + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb80000, 0x1fbfffff, 0, 0, SMH_BANK3 ); /* country rom */ memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb60000, 0x1fb60003, 0, 0, zn_qsound_w ); zn_driver_init(); @@ -862,12 +862,12 @@ static WRITE32_HANDLER( bank_coh3002c_w ) static DRIVER_INIT( coh3002c ) { - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f3fffff, 0, 0, MRA32_BANK1 ); /* fixed game rom */ - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f400000, 0x1f7fffff, 0, 0, MRA32_BANK2 ); /* banked game rom */ + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f3fffff, 0, 0, SMH_BANK1 ); /* fixed game rom */ + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f400000, 0x1f7fffff, 0, 0, SMH_BANK2 ); /* banked game rom */ memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb40010, 0x1fb40013, 0, 0, capcom_kickharness_r ); memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb40020, 0x1fb40023, 0, 0, capcom_kickharness_r ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00003, 0, 0, bank_coh3002c_w ); /* bankswitch */ - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb80000, 0x1fbfffff, 0, 0, MRA32_BANK3 ); /* country rom */ + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb80000, 0x1fbfffff, 0, 0, SMH_BANK3 ); /* country rom */ memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb60000, 0x1fb60003, 0, 0, zn_qsound_w ); zn_driver_init(); @@ -1211,12 +1211,12 @@ static DRIVER_INIT( coh1000ta ) { taitofx1_eeprom_size1 = 0x200; taitofx1_eeprom1 = auto_malloc( taitofx1_eeprom_size1 ); - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f7fffff, 0, 0, MRA32_BANK1 ); /* banked game rom */ + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f7fffff, 0, 0, SMH_BANK1 ); /* banked game rom */ memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb40000, 0x1fb40003, 0, 0, bank_coh1000t_w ); /* bankswitch */ memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb80000, 0x1fb80003, 0, 0, taitofx1a_ymsound_r ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb80000, 0x1fb80003, 0, 0, taitofx1a_ymsound_w ); - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, MRA32_BANK2 ); - memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, MWA32_BANK2 ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, SMH_BANK2 ); + memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, SMH_BANK2 ); zn_driver_init(); mb3773_init(); @@ -1258,29 +1258,29 @@ static NVRAM_HANDLER( coh1000ta ) } static ADDRESS_MAP_START( fx1a_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(MRA8_ROM) - AM_RANGE(0x4000, 0x7fff) AM_READ(MRA8_BANK10) - AM_RANGE(0xc000, 0xdfff) AM_READ(MRA8_RAM) + AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) + AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10) + AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r) AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r) AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r) - AM_RANGE(0xe200, 0xe200) AM_READ(MRA8_NOP) + AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP) AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r) - AM_RANGE(0xea00, 0xea00) AM_READ(MRA8_NOP) + AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP) ADDRESS_MAP_END static ADDRESS_MAP_START( fx1a_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_WRITE(MWA8_ROM) - AM_RANGE(0xc000, 0xdfff) AM_WRITE(MWA8_RAM) + AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM) AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w) AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w) AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w) AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w) - AM_RANGE(0xe400, 0xe403) AM_WRITE(MWA8_NOP) /* pan */ - AM_RANGE(0xee00, 0xee00) AM_WRITE(MWA8_NOP) /* ? */ - AM_RANGE(0xf000, 0xf000) AM_WRITE(MWA8_NOP) /* ? */ + AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */ + AM_RANGE(0xee00, 0xee00) AM_WRITE(SMH_NOP) /* ? */ + AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP) /* ? */ AM_RANGE(0xf200, 0xf200) AM_WRITE(fx1a_sound_bankswitch_w) ADDRESS_MAP_END @@ -1339,15 +1339,15 @@ static DRIVER_INIT( coh1000tb ) taitofx1_eeprom_size1 = 0x400; taitofx1_eeprom1 = auto_malloc( taitofx1_eeprom_size1 ); taitofx1_eeprom_size2 = 0x200; taitofx1_eeprom2 = auto_malloc( taitofx1_eeprom_size2 ); - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f7fffff, 0, 0, MRA32_BANK1 ); /* banked game rom */ - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, MRA32_BANK2 ); - memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, MWA32_BANK2 ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f7fffff, 0, 0, SMH_BANK1 ); /* banked game rom */ + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, SMH_BANK2 ); + memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00000 + ( taitofx1_eeprom_size1 - 1 ), 0, 0, SMH_BANK2 ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb40000, 0x1fb40003, 0, 0, bank_coh1000t_w ); /* bankswitch */ memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb80000, 0x1fb80003, 0, 0, taitofx1b_volume_w ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fba0000, 0x1fba0003, 0, 0, taitofx1b_sound_w ); memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fbc0000, 0x1fbc0003, 0, 0, taitofx1b_sound_r ); - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size2 - 1 ), 0, 0, MRA32_BANK3 ); - memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size2 - 1 ), 0, 0, MWA32_BANK3 ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size2 - 1 ), 0, 0, SMH_BANK3 ); + memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fbe0000, 0x1fbe0000 + ( taitofx1_eeprom_size2 - 1 ), 0, 0, SMH_BANK3 ); zn_driver_init(); mb3773_init(); @@ -1536,7 +1536,7 @@ static READ32_HANDLER( coh3002t_unknown_r ) static DRIVER_INIT( coh3002t ) { - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f1fffff, 0, 0, MRA32_BANK1 ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f1fffff, 0, 0, SMH_BANK1 ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb40000, 0x1fb40003, 0, 0, coh3002t_unknown_w ); memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb40000, 0x1fb40003, 0, 0, coh3002t_unknown_r ); @@ -1713,12 +1713,12 @@ static void atpsx_dma_write( UINT32 n_address, INT32 n_size ) static DRIVER_INIT( coh1000w ) { - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f1fffff, 0, 0, MRA32_BANK1 ); - memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f000003, 0, 0, MWA32_NOP ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f1fffff, 0, 0, SMH_BANK1 ); + memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f000003, 0, 0, SMH_NOP ); memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f7e4000, 0x1f7e4fff, 0, 0, ide_controller32_0_r ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f7e4000, 0x1f7e4fff, 0, 0, ide_controller32_0_w ); - memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f7e8000, 0x1f7e8003, 0, 0, MWA32_NOP ); - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f7e8000, 0x1f7e8003, 0, 0, MRA32_NOP ); + memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f7e8000, 0x1f7e8003, 0, 0, SMH_NOP ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f7e8000, 0x1f7e8003, 0, 0, SMH_NOP ); memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f7f4000, 0x1f7f4fff, 0, 0, ide_controller32_0_r ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f7f4000, 0x1f7f4fff, 0, 0, ide_controller32_0_w ); @@ -1909,7 +1909,7 @@ static WRITE32_HANDLER( coh1002e_latch_w ) static DRIVER_INIT( coh1002e ) { - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f7fffff, 0, 0, MRA32_BANK1 ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f7fffff, 0, 0, SMH_BANK1 ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fa10300, 0x1fa10303, 0, 0, coh1002e_bank_w ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00007, 0, 0, coh1002e_latch_w ); @@ -2229,7 +2229,7 @@ static READ32_HANDLER( nbajamex_80_r ) static DRIVER_INIT( coh1000a ) { - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f1fffff, 0, 0, MRA32_BANK1 ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f1fffff, 0, 0, SMH_BANK1 ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fbfff00, 0x1fbfff03, 0, 0, acpsx_00_w ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fbfff10, 0x1fbfff13, 0, 0, acpsx_10_w ); @@ -2237,8 +2237,8 @@ static DRIVER_INIT( coh1000a ) { nbajamex_eeprom_size = 0x8000; nbajamex_eeprom = auto_malloc( nbajamex_eeprom_size ); - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f200000, 0x1f200000 + ( nbajamex_eeprom_size - 1 ), 0, 0, MRA32_BANK2 ); - memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f200000, 0x1f200000 + ( nbajamex_eeprom_size - 1 ), 0, 0, MWA32_BANK2 ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f200000, 0x1f200000 + ( nbajamex_eeprom_size - 1 ), 0, 0, SMH_BANK2 ); + memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1f200000, 0x1f200000 + ( nbajamex_eeprom_size - 1 ), 0, 0, SMH_BANK2 ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fbfff80, 0x1fbfff83, 0, 0, nbajamex_80_w ); memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fbfff08, 0x1fbfff0b, 0, 0, nbajamex_08_r ); memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fbfff80, 0x1fbfff83, 0, 0, nbajamex_80_r ); @@ -2250,7 +2250,7 @@ static DRIVER_INIT( coh1000a ) ( !strcmp( machine->gamedrv->name, "jdreddb" ) ) ) { memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fbfff8c, 0x1fbfff8f, 0, 0, jdredd_idestat_r ); - memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fbfff8c, 0x1fbfff8f, 0, 0, MWA32_NOP ); + memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fbfff8c, 0x1fbfff8f, 0, 0, SMH_NOP ); memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fbfff90, 0x1fbfff9f, 0, 0, jdredd_ide_r ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fbfff90, 0x1fbfff9f, 0, 0, jdredd_ide_w ); @@ -2401,7 +2401,7 @@ static WRITE32_HANDLER( coh1001l_bnk_w ) static DRIVER_INIT( coh1001l ) { - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f7fffff, 0, 0, MRA32_BANK1 ); /* banked rom */ + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f7fffff, 0, 0, SMH_BANK1 ); /* banked rom */ memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00003, 0, 0, coh1001l_bnk_w ); zn_driver_init(); @@ -2446,8 +2446,8 @@ static WRITE32_HANDLER( coh1002v_bnk_w ) static DRIVER_INIT( coh1002v ) { - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f27ffff, 0, 0, MRA32_BANK1 ); - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fbfffff, 0, 0, MRA32_BANK2 ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f27ffff, 0, 0, SMH_BANK1 ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fbfffff, 0, 0, SMH_BANK2 ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00003, 0, 0, coh1002v_bnk_w ); zn_driver_init(); @@ -2670,7 +2670,7 @@ static WRITE32_HANDLER( cbaj_z80_w ) static DRIVER_INIT( coh1002m ) { - memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f7fffff, 0, 0, MRA32_BANK1 ); + memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1f000000, 0x1f7fffff, 0, 0, SMH_BANK1 ); memory_install_read32_handler ( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00003, 0, 0, cbaj_z80_r ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00000, 0x1fb00003, 0, 0, cbaj_z80_w ); memory_install_write32_handler( 0, ADDRESS_SPACE_PROGRAM, 0x1fb00004, 0x1fb00007, 0, 0, coh1002m_bank_w ); diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c index fa9ab0319c3..8debf188ecb 100644 --- a/src/mame/drivers/zodiack.c +++ b/src/mame/drivers/zodiack.c @@ -58,15 +58,15 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6083, 0x6083) AM_READ(input_port_2_r) AM_RANGE(0x6084, 0x6084) AM_READ(input_port_3_r) AM_RANGE(0x6090, 0x6090) AM_READWRITE(soundlatch_r, zodiac_master_soundlatch_w) - AM_RANGE(0x7000, 0x7000) AM_READWRITE(MRA8_NOP,watchdog_reset_w) /* NOP??? */ + AM_RANGE(0x7000, 0x7000) AM_READWRITE(SMH_NOP,watchdog_reset_w) /* NOP??? */ AM_RANGE(0x7100, 0x7100) AM_WRITE(zodiac_master_interrupt_enable_w) AM_RANGE(0x7200, 0x7200) AM_WRITE(zodiack_flipscreen_w) - AM_RANGE(0x9000, 0x903f) AM_READWRITE(MRA8_RAM, zodiack_attributes_w) AM_BASE(&zodiack_attributesram) + AM_RANGE(0x9000, 0x903f) AM_READWRITE(SMH_RAM, zodiack_attributes_w) AM_BASE(&zodiack_attributesram) AM_RANGE(0x9040, 0x905f) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x9060, 0x907f) AM_RAM AM_BASE(&zodiack_bulletsram) AM_SIZE(&zodiack_bulletsram_size) AM_RANGE(0x9080, 0x93ff) AM_RAM - AM_RANGE(0xa000, 0xa3ff) AM_READWRITE(MRA8_RAM, zodiack_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0xb000, 0xb3ff) AM_READWRITE(MRA8_RAM, zodiack_videoram2_w) AM_BASE(&zodiack_videoram2) + AM_RANGE(0xa000, 0xa3ff) AM_READWRITE(SMH_RAM, zodiack_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0xb000, 0xb3ff) AM_READWRITE(SMH_RAM, zodiack_videoram2_w) AM_BASE(&zodiack_videoram2) AM_RANGE(0xc000, 0xcfff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 884061ba1b8..08fab9f278e 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -305,7 +305,7 @@ static ADDRESS_MAP_START( zr107_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x74000000, 0x74003fff) AM_MIRROR(0x80000000) AM_READWRITE(K056832_ram_long_r, K056832_ram_long_w) AM_RANGE(0x74020000, 0x7402003f) AM_MIRROR(0x80000000) AM_READWRITE(K056832_long_r, K056832_long_w) AM_RANGE(0x74060000, 0x7406003f) AM_MIRROR(0x80000000) AM_READWRITE(ccu_r, ccu_w) - AM_RANGE(0x74080000, 0x74081fff) AM_MIRROR(0x80000000) AM_READWRITE(MRA32_RAM, paletteram32_w) AM_BASE(&paletteram32) + AM_RANGE(0x74080000, 0x74081fff) AM_MIRROR(0x80000000) AM_READWRITE(SMH_RAM, paletteram32_w) AM_BASE(&paletteram32) AM_RANGE(0x740a0000, 0x740a3fff) AM_MIRROR(0x80000000) AM_READ(K056832_rom_long_r) AM_RANGE(0x78000000, 0x7800ffff) AM_MIRROR(0x80000000) AM_READWRITE(cgboard_dsp_shared_r_ppc, cgboard_dsp_shared_w_ppc) /* 21N 21K 23N 23K */ AM_RANGE(0x78010000, 0x7801ffff) AM_MIRROR(0x80000000) AM_WRITE(cgboard_dsp_shared_w_ppc) @@ -331,7 +331,7 @@ static WRITE32_HANDLER( jetwave_palette_w ) static ADDRESS_MAP_START( jetwave_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x00000000, 0x000fffff) AM_MIRROR(0x80000000) AM_RAM /* Work RAM */ AM_RANGE(0x74000000, 0x740000ff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_reg_r, K001604_reg_w) - AM_RANGE(0x74010000, 0x7401ffff) AM_MIRROR(0x80000000) AM_READWRITE(MRA32_RAM, jetwave_palette_w) AM_BASE(&paletteram32) + AM_RANGE(0x74010000, 0x7401ffff) AM_MIRROR(0x80000000) AM_READWRITE(SMH_RAM, jetwave_palette_w) AM_BASE(&paletteram32) AM_RANGE(0x74020000, 0x7403ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_tile_r, K001604_tile_w) AM_RANGE(0x74040000, 0x7407ffff) AM_MIRROR(0x80000000) AM_READWRITE(K001604_char_r, K001604_char_w) AM_RANGE(0x78000000, 0x7800ffff) AM_MIRROR(0x80000000) AM_READWRITE(cgboard_dsp_shared_r_ppc, cgboard_dsp_shared_w_ppc) /* 21N 21K 23N 23K */ diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index dae41006e1b..a586672ba92 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -206,20 +206,20 @@ INTERRUPT_GEN( namcos2_68k_gpu_vblank ); /* MASTER CPU RAM MEMORY */ /**************************************************************/ -#define NAMCOS2_68K_MASTER_RAM_W MWA16_BANK3 -#define NAMCOS2_68K_MASTER_RAM_R MRA16_BANK3 +#define NAMCOS2_68K_MASTER_RAM_W SMH_BANK3 +#define NAMCOS2_68K_MASTER_RAM_R SMH_BANK3 /**************************************************************/ /* SLAVE CPU RAM MEMORY */ /**************************************************************/ -#define NAMCOS2_68K_SLAVE_RAM_W MWA16_BANK4 -#define NAMCOS2_68K_SLAVE_RAM_R MRA16_BANK4 +#define NAMCOS2_68K_SLAVE_RAM_W SMH_BANK4 +#define NAMCOS2_68K_SLAVE_RAM_R SMH_BANK4 /**************************************************************/ /* */ /**************************************************************/ -#define BANKED_SOUND_ROM_R MRA8_BANK6 +#define BANKED_SOUND_ROM_R SMH_BANK6 #define CPU3_ROM1 6 /* Bank number */ /**************************************************************/ diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index 00ee9e646b1..770fe0e8e98 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -97,18 +97,18 @@ extern int sys18_sound_info[4*2]; extern void sys16_patch_code( int offset, int data ); #define SYS16_MWA16_PALETTERAM sys16_paletteram_w -#define SYS16_MRA16_PALETTERAM MRA16_RAM +#define SYS16_MRA16_PALETTERAM SMH_RAM -#define SYS16_MRA16_WORKINGRAM MRA16_RAM -#define SYS16_MWA16_WORKINGRAM MWA16_RAM +#define SYS16_MRA16_WORKINGRAM SMH_RAM +#define SYS16_MWA16_WORKINGRAM SMH_RAM -#define SYS16_MRA16_WORKINGRAM2 MRA16_RAM -#define SYS16_MWA16_WORKINGRAM2 MWA16_RAM +#define SYS16_MRA16_WORKINGRAM2 SMH_RAM +#define SYS16_MWA16_WORKINGRAM2 SMH_RAM extern MACHINE_RESET( sys16_onetime ); -#define SYS16_MRA16_SPRITERAM MRA16_RAM -#define SYS16_MWA16_SPRITERAM MWA16_RAM +#define SYS16_MRA16_SPRITERAM SMH_RAM +#define SYS16_MWA16_SPRITERAM SMH_RAM #define SYS16_MRA16_TILERAM sys16_tileram_r #define SYS16_MWA16_TILERAM sys16_tileram_w @@ -116,20 +116,20 @@ extern MACHINE_RESET( sys16_onetime ); #define SYS16_MRA16_TEXTRAM sys16_textram_r #define SYS16_MWA16_TEXTRAM sys16_textram_w -#define SYS16_MRA16_EXTRAM MRA16_RAM -#define SYS16_MWA16_EXTRAM MWA16_RAM +#define SYS16_MRA16_EXTRAM SMH_RAM +#define SYS16_MWA16_EXTRAM SMH_RAM -#define SYS16_MRA16_EXTRAM2 MRA16_RAM -#define SYS16_MWA16_EXTRAM2 MWA16_RAM +#define SYS16_MRA16_EXTRAM2 SMH_RAM +#define SYS16_MWA16_EXTRAM2 SMH_RAM -#define SYS16_MRA16_EXTRAM3 MRA16_RAM -#define SYS16_MWA16_EXTRAM3 MWA16_RAM +#define SYS16_MRA16_EXTRAM3 SMH_RAM +#define SYS16_MWA16_EXTRAM3 SMH_RAM -#define SYS16_MRA16_EXTRAM4 MRA16_RAM -#define SYS16_MWA16_EXTRAM4 MWA16_RAM +#define SYS16_MRA16_EXTRAM4 SMH_RAM +#define SYS16_MWA16_EXTRAM4 SMH_RAM -#define SYS16_MRA16_ROADRAM MRA16_RAM -#define SYS16_MWA16_ROADRAM MWA16_RAM +#define SYS16_MRA16_ROADRAM SMH_RAM +#define SYS16_MWA16_ROADRAM SMH_RAM GFXDECODE_EXTERN( sys16 ); diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c index d3023e57c65..ff1079bb20c 100644 --- a/src/mame/machine/atari.c +++ b/src/mame/machine/atari.c @@ -136,18 +136,18 @@ void a600xl_mmu(UINT8 new_mmu) if ( new_mmu & 0x80 ) { logerror("%s MMU SELFTEST RAM\n", Machine->gamedrv->name); - rbank2 = MRA8_NOP; - wbank2 = MWA8_NOP; + rbank2 = SMH_NOP; + wbank2 = SMH_NOP; } else { logerror("%s MMU SELFTEST ROM\n", Machine->gamedrv->name); - rbank2 = MRA8_BANK2; - wbank2 = MWA8_UNMAP; + rbank2 = SMH_BANK2; + wbank2 = SMH_UNMAP; } memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5000, 0x57ff, 0, 0, rbank2); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5000, 0x57ff, 0, 0, wbank2); - if (rbank2 == MRA8_BANK2) + if (rbank2 == SMH_BANK2) memory_set_bankptr(2, memory_region(REGION_CPU1)+0x5000); } @@ -161,21 +161,21 @@ void a800xl_mmu(UINT8 new_mmu) if( new_mmu & 0x01 ) { logerror("%s MMU BIOS ROM\n", Machine->gamedrv->name); - rbank3 = MRA8_BANK3; - wbank3 = MWA8_UNMAP; + rbank3 = SMH_BANK3; + wbank3 = SMH_UNMAP; base3 = memory_region(REGION_CPU1)+0x14000; /* 8K lo BIOS */ - rbank4 = MRA8_BANK4; - wbank4 = MWA8_UNMAP; + rbank4 = SMH_BANK4; + wbank4 = SMH_UNMAP; base4 = memory_region(REGION_CPU1)+0x15800; /* 4K FP ROM + 8K hi BIOS */ } else { logerror("%s MMU BIOS RAM\n", Machine->gamedrv->name); - rbank3 = MRA8_BANK3; - wbank3 = MWA8_BANK3; + rbank3 = SMH_BANK3; + wbank3 = SMH_BANK3; base3 = memory_region(REGION_CPU1)+0x0c000; /* 8K RAM */ - rbank4 = MRA8_BANK4; - wbank4 = MWA8_BANK4; + rbank4 = SMH_BANK4; + wbank4 = SMH_BANK4; base4 = memory_region(REGION_CPU1)+0x0d800; /* 4K RAM + 8K RAM */ } memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, rbank3); @@ -189,15 +189,15 @@ void a800xl_mmu(UINT8 new_mmu) if( new_mmu & 0x02 ) { logerror("%s MMU BASIC RAM\n", Machine->gamedrv->name); - rbank1 = MRA8_BANK1; - wbank1 = MWA8_BANK1; + rbank1 = SMH_BANK1; + wbank1 = SMH_BANK1; base1 = memory_region(REGION_CPU1)+0x0a000; /* 8K RAM */ } else { logerror("%s MMU BASIC ROM\n", Machine->gamedrv->name); - rbank1 = MRA8_BANK1; - wbank1 = MWA8_UNMAP; + rbank1 = SMH_BANK1; + wbank1 = SMH_UNMAP; base1 = memory_region(REGION_CPU1)+0x10000; /* 8K BASIC */ } memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xbfff, 0, 0, rbank1); @@ -208,15 +208,15 @@ void a800xl_mmu(UINT8 new_mmu) if( new_mmu & 0x80 ) { logerror("%s MMU SELFTEST RAM\n", Machine->gamedrv->name); - rbank2 = MRA8_BANK2; - wbank2 = MWA8_BANK2; + rbank2 = SMH_BANK2; + wbank2 = SMH_BANK2; base2 = memory_region(REGION_CPU1)+0x05000; /* 0x0800 bytes */ } else { logerror("%s MMU SELFTEST ROM\n", Machine->gamedrv->name); - rbank2 = MRA8_BANK2; - wbank2 = MWA8_UNMAP; + rbank2 = SMH_BANK2; + wbank2 = SMH_UNMAP; base2 = memory_region(REGION_CPU1)+0x15000; /* 0x0800 bytes */ } memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5000, 0x57ff, 0, 0, rbank2); @@ -639,9 +639,9 @@ DRIVER_INIT( atari ) /* install RAM */ ram_top = MIN(mess_ram_size, ram_size) - 1; memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, - 0x0000, ram_top, 0, 0, MRA8_BANK2); + 0x0000, ram_top, 0, 0, SMH_BANK2); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, - 0x0000, ram_top, 0, 0, MWA8_BANK2); + 0x0000, ram_top, 0, 0, SMH_BANK2); memory_set_bankptr(2, mess_ram); } #endif @@ -683,9 +683,9 @@ static void a800_setbank(int n) } memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xbfff, 0, 0, - read_addr ? MRA8_BANK1 : MRA8_NOP); + read_addr ? SMH_BANK1 : SMH_NOP); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xbfff, 0, 0, - write_addr ? MWA8_BANK1 : MWA8_NOP); + write_addr ? SMH_BANK1 : SMH_NOP); if (read_addr) memory_set_bankptr(1, read_addr); if (write_addr) @@ -791,9 +791,9 @@ static void atari_machine_start(int type, const pia6821_interface *pia_intf, int /* install RAM */ ram_top = MIN(mess_ram_size, ram_size) - 1; memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, - 0x0000, ram_top, 0, 0, MRA8_BANK2); + 0x0000, ram_top, 0, 0, SMH_BANK2); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, - 0x0000, ram_top, 0, 0, MWA8_BANK2); + 0x0000, ram_top, 0, 0, SMH_BANK2); memory_set_bankptr(2, mess_ram); } #endif /* MESS */ diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c index 30ef0c206d3..25cb75219ad 100644 --- a/src/mame/machine/beezer.c +++ b/src/mame/machine/beezer.c @@ -135,8 +135,8 @@ WRITE8_HANDLER( beezer_bankswitch_w ) else { UINT8 *rom = memory_region(REGION_CPU1) + 0x10000; - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, MRA8_BANK1); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, MWA8_BANK1); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, SMH_BANK1); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, SMH_BANK1); memory_set_bankptr(1, rom + (data & 0x07) * 0x2000 + ((data & 0x08) ? 0x1000: 0)); } } diff --git a/src/mame/machine/drakton.c b/src/mame/machine/drakton.c index 61df996fcf1..90bb9b4f8e7 100644 --- a/src/mame/machine/drakton.c +++ b/src/mame/machine/drakton.c @@ -104,7 +104,7 @@ static void drakton_decrypt_rom_B(void) DRIVER_INIT( drakton ) { - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, MRA8_BANK1 ); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, SMH_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/machine/midtunit.c b/src/mame/machine/midtunit.c index 4577d4b3d0e..7b984b9679c 100644 --- a/src/mame/machine/midtunit.c +++ b/src/mame/machine/midtunit.c @@ -449,7 +449,7 @@ DRIVER_INIT( mktunit ) memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x1b00000, 0x1b6ffff, 0, 0, mk_prot_w); /* sound chip protection (hidden RAM) */ - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0xfb9c, 0xfbc6, 0, 0, MRA8_BANK9, MWA8_BANK9); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0xfb9c, 0xfbc6, 0, 0, SMH_BANK9, SMH_BANK9); memory_set_bankptr(9, auto_malloc(0x80)); } @@ -476,9 +476,9 @@ static void init_nbajam_common(int te_protection) /* sound chip protection (hidden RAM) */ if (!te_protection) - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0xfbaa, 0xfbd4, 0, 0, MRA8_BANK9, MWA8_BANK9); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0xfbaa, 0xfbd4, 0, 0, SMH_BANK9, SMH_BANK9); else - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0xfbec, 0xfc16, 0, 0, MRA8_BANK9, MWA8_BANK9); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0xfbec, 0xfc16, 0, 0, SMH_BANK9, SMH_BANK9); memory_set_bankptr(9, auto_malloc(0x80)); } @@ -498,14 +498,14 @@ DRIVER_INIT( jdreddp ) init_tunit_generic(SOUND_ADPCM_LARGE); /* looks like the watchdog needs to be disabled */ - memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x01d81060, 0x01d8107f, 0, 0, MWA16_NOP); + memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x01d81060, 0x01d8107f, 0, 0, SMH_NOP); /* protection */ memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x1b00000, 0x1bfffff, 0, 0, jdredd_prot_r); memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x1b00000, 0x1bfffff, 0, 0, jdredd_prot_w); /* sound chip protection (hidden RAM) */ - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0xfbcf, 0xfbf9, 0, 0, MRA8_BANK7, MWA8_BANK9); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0xfbcf, 0xfbf9, 0, 0, SMH_BANK7, SMH_BANK9); memory_set_bankptr(9, auto_malloc(0x80)); #if ENABLE_ALL_JDREDD_LEVELS diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c index a7b3d138de9..5cf2502b827 100644 --- a/src/mame/machine/midyunit.c +++ b/src/mame/machine/midyunit.c @@ -296,19 +296,19 @@ static void init_generic(int bpp, int sound, int prot_start, int prot_end) case SOUND_CVSD: williams_cvsd_init(0); - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, prot_start, prot_end, 0, 0, MRA8_BANK9, MWA8_BANK9); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, prot_start, prot_end, 0, 0, SMH_BANK9, SMH_BANK9); memory_set_bankptr(9, auto_malloc(0x80)); break; case SOUND_ADPCM: williams_adpcm_init(); - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, prot_start, prot_end, 0, 0, MRA8_BANK9, MWA8_BANK9); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, prot_start, prot_end, 0, 0, SMH_BANK9, SMH_BANK9); memory_set_bankptr(9, auto_malloc(0x80)); break; case SOUND_NARC: williams_narc_init(); - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, prot_start, prot_end, 0, 0, MRA8_BANK9, MWA8_BANK9); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, prot_start, prot_end, 0, 0, SMH_BANK9, SMH_BANK9); memory_set_bankptr(9, auto_malloc(0x80)); break; diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c index 055c54d3a40..d3f8dabe3f8 100644 --- a/src/mame/machine/namcos1.c +++ b/src/mame/machine/namcos1.c @@ -78,18 +78,18 @@ static WRITE8_HANDLER( bank16_w ) { (*namcos1_active_bank[15].bank_handler_w)(ma static const read8_machine_func ram_bank_handler_r[16] = { - MRA8_BANK1 ,MRA8_BANK2 ,MRA8_BANK3 ,MRA8_BANK4 , - MRA8_BANK5 ,MRA8_BANK6 ,MRA8_BANK7 ,MRA8_BANK8 , - MRA8_BANK9 ,MRA8_BANK10,MRA8_BANK11,MRA8_BANK12, - MRA8_BANK13,MRA8_BANK14,MRA8_BANK15,MRA8_BANK16 + SMH_BANK1 ,SMH_BANK2 ,SMH_BANK3 ,SMH_BANK4 , + SMH_BANK5 ,SMH_BANK6 ,SMH_BANK7 ,SMH_BANK8 , + SMH_BANK9 ,SMH_BANK10,SMH_BANK11,SMH_BANK12, + SMH_BANK13,SMH_BANK14,SMH_BANK15,SMH_BANK16 }; static const write8_machine_func ram_bank_handler_w[16] = { - MWA8_BANK1 ,MWA8_BANK2 ,MWA8_BANK3 ,MWA8_BANK4 , - MWA8_BANK5 ,MWA8_BANK6 ,MWA8_BANK7 ,MWA8_BANK8 , - MWA8_BANK9 ,MWA8_BANK10,MWA8_BANK11,MWA8_BANK12, - MWA8_BANK13,MWA8_BANK14,MWA8_BANK15,MWA8_BANK16 + SMH_BANK1 ,SMH_BANK2 ,SMH_BANK3 ,SMH_BANK4 , + SMH_BANK5 ,SMH_BANK6 ,SMH_BANK7 ,SMH_BANK8 , + SMH_BANK9 ,SMH_BANK10,SMH_BANK11,SMH_BANK12, + SMH_BANK13,SMH_BANK14,SMH_BANK15,SMH_BANK16 }; static const read8_machine_func io_bank_handler_r[16] = diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c index 757d6b03625..cf8c71a2a8c 100644 --- a/src/mame/machine/playch10.c +++ b/src/mame/machine/playch10.c @@ -513,7 +513,7 @@ DRIVER_INIT( pcdboard ) DRIVER_INIT( pcdboard_2 ) { /* extra ram at $6000-$7fff */ - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_BANK1 ); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0x2000)); /* common init */ @@ -605,7 +605,7 @@ DRIVER_INIT( pceboard ) ppu_latch = mapper9_latch; /* nvram at $6000-$6fff */ - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x6fff, 0, 0, MRA8_BANK1, MWA8_BANK1 ); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x6fff, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0x1000)); /* common init */ @@ -636,7 +636,7 @@ DRIVER_INIT( pcfboard ) DRIVER_INIT( pcfboard_2 ) { /* extra ram at $6000-$6fff */ - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x6fff, 0, 0, MRA8_BANK1, MWA8_BANK1 ); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x6fff, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0x1000)); /* common init */ @@ -805,7 +805,7 @@ DRIVER_INIT( pcgboard ) memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, gboard_rom_switch_w ); /* extra ram at $6000-$7fff */ - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_BANK1 ); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0x2000)); gboard_banks[0] = 0x1e; @@ -869,7 +869,7 @@ DRIVER_INIT( pchboard ) memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, gboard_rom_switch_w ); /* extra ram at $6000-$7fff */ - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_BANK1 ); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0x2000)); gboard_banks[0] = 0x1e; @@ -894,7 +894,7 @@ DRIVER_INIT( pckboard ) mmc1_rom_mask = 0x0f; /* extra ram at $6000-$7fff */ - memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_BANK1 ); + memory_install_readwrite8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0x2000)); /* Roms are banked at $8000 to $bfff */ diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c index f2bcf845c43..bd5284d2d95 100644 --- a/src/mame/machine/scramble.c +++ b/src/mame/machine/scramble.c @@ -407,14 +407,14 @@ DRIVER_INIT( mariner ) DRIVER_INIT_CALL(scramble_ppi); /* extra ROM */ - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5800, 0x67ff, 0, 0, MRA8_BANK1, MWA8_UNMAP); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5800, 0x67ff, 0, 0, SMH_BANK1, SMH_UNMAP); memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x5800); memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x9008, 0x9008, 0, 0, mariner_protection_2_r); memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xb401, 0xb401, 0, 0, mariner_protection_1_r); /* ??? (it's NOT a background enable) */ - /*memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6803, 0x6803, 0, 0, MWA8_NOP);*/ + /*memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6803, 0x6803, 0, 0, SMH_NOP);*/ } DRIVER_INIT( frogger ) @@ -506,7 +506,7 @@ DRIVER_INIT( cavelon ) DRIVER_INIT_CALL(scramble_ppi); /* banked ROM */ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, MRA8_BANK1); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, SMH_BANK1); memory_configure_bank(1, 0, 2, &ROM[0x00000], 0x10000); cavelon_banksw(); @@ -514,8 +514,8 @@ DRIVER_INIT( cavelon ) memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, cavelon_banksw_r); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, cavelon_banksw_w); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x2000, 0x2000, 0, 0, MWA8_NOP); /* ??? */ - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x3800, 0x3801, 0, 0, MWA8_NOP); /* looks suspicously like + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x2000, 0x2000, 0, 0, SMH_NOP); /* ??? */ + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x3800, 0x3801, 0, 0, SMH_NOP); /* looks suspicously like an AY8910, but not sure */ state_save_register_global(cavelon_bank); } @@ -898,7 +898,7 @@ DRIVER_INIT( monsterz ) ppi8255_init(&monsterz_ppi8255_intf); /* extra ROM */ - memory_install_read8_handler(1, ADDRESS_SPACE_PROGRAM, 0x3000, 0x3fff, 0, 0, MRA8_BANK1); + memory_install_read8_handler(1, ADDRESS_SPACE_PROGRAM, 0x3000, 0x3fff, 0, 0, SMH_BANK1); memory_set_bankptr(1, memory_region(REGION_CPU2) + 0x3000); } @@ -920,11 +920,11 @@ DRIVER_INIT( scorpion ) ppi8255_set_portCread(1, scorpion_prot_r); /* extra ROM */ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5800, 0x67ff, 0, 0, MRA8_BANK1); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5800, 0x67ff, 0, 0, SMH_BANK1); memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x5800); /* no background related */ - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6803, 0x6803, 0, 0, MWA8_NOP); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6803, 0x6803, 0, 0, SMH_NOP); memory_install_read8_handler(1, ADDRESS_SPACE_PROGRAM, 0x3000, 0x3000, 0, 0, scorpion_sound_status_r); } diff --git a/src/mame/machine/strtheat.c b/src/mame/machine/strtheat.c index 0b9fd32df1a..bd4a13b0b6e 100644 --- a/src/mame/machine/strtheat.c +++ b/src/mame/machine/strtheat.c @@ -181,7 +181,7 @@ static READ8_HANDLER( strtheat_inputport_1_r ) DRIVER_INIT( strtheat ) { - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, MRA8_BANK1 ); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, SMH_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/machine/tnzs.c b/src/mame/machine/tnzs.c index dd81affc68d..e7f346e9097 100644 --- a/src/mame/machine/tnzs.c +++ b/src/mame/machine/tnzs.c @@ -552,7 +552,7 @@ DRIVER_INIT( drtoppel ) memcpy(&RAM[0x08000],&RAM[0x18000],0x4000); /* drtoppel writes to the palette RAM area even if it has PROMs! We have to patch it out. */ - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xf800, 0xfbff, 0, 0, MWA8_NOP); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xf800, 0xfbff, 0, 0, SMH_NOP); } DRIVER_INIT( chukatai ) diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c index 7220e9f9dd4..1b19c1dc8af 100644 --- a/src/mame/machine/vsnes.c +++ b/src/mame/machine/vsnes.c @@ -317,7 +317,7 @@ DRIVER_INIT( suprmrio ) DRIVER_INIT_CALL(vsnormal); /* extra ram at $6000 is enabled with bit 1 of $4016 */ - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_BANK1 ); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0x2000)); /* now override the vidaccess callback */ @@ -966,7 +966,7 @@ DRIVER_INIT( MMC3 ) memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0xffff, 0, 0, mapper4_w ); /* extra ram at $6000-$7fff */ - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_BANK1 ); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0x2000)); /* common init */ @@ -1191,7 +1191,7 @@ DRIVER_INIT( bnglngby ) memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0231, 0x0231, 0, 0, set_bnglngby_irq_w ); /* extra ram */ - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_BANK1 ); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0x2000)); ret = 0; @@ -1278,10 +1278,10 @@ DRIVER_INIT( vstennis ) memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x4016, 0x4016, 0, 0, vstennis_vrom_banking ); /* shared ram at $6000 */ - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1 ); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MWA8_BANK1 ); - memory_install_read8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1 ); - memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MWA8_BANK1 ); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1 ); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1 ); + memory_install_read8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1 ); + memory_install_write8_handler(1, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1 ); memory_set_bankptr(1, &memory_region(REGION_CPU1)[0x6000]); } @@ -1351,7 +1351,7 @@ DRIVER_INIT( btlecity ) DRIVER_INIT( vstetris ) { /* extra ram at $6000 is enabled with bit 1 of $4016 */ - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_BANK1 ); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, SMH_BANK1, SMH_BANK1 ); memory_set_bankptr(1, auto_malloc(0x2000)); init_vsnes(machine); diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c index 2f5379446fb..dfd0542a20f 100644 --- a/src/mame/machine/williams.c +++ b/src/mame/machine/williams.c @@ -491,8 +491,8 @@ WRITE8_HANDLER( williams2_bank_select_w ) { /* page 0 is video ram */ case 0: - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x8fff, 0, 0, MRA8_BANK1); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x87ff, 0, 0, MWA8_BANK4); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x8fff, 0, 0, SMH_BANK1); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x87ff, 0, 0, SMH_BANK4); memory_set_bank(1, 0); memory_set_bankptr(4, &williams_videoram[0x8000]); break; @@ -500,15 +500,15 @@ WRITE8_HANDLER( williams2_bank_select_w ) /* pages 1 and 2 are ROM */ case 1: case 2: - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x8fff, 0, 0, MRA8_BANK1); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x87ff, 0, 0, MWA8_BANK4); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x8fff, 0, 0, SMH_BANK1); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x87ff, 0, 0, SMH_BANK4); memory_set_bank(1, 1 + ((vram_bank & 6) >> 1)); memory_set_bankptr(4, &williams_videoram[0x8000]); break; /* page 3 accesses palette RAM; the remaining areas are as if page 1 ROM was selected */ case 3: - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x87ff, 0, 0, MRA8_BANK4); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x87ff, 0, 0, SMH_BANK4); memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x8000, 0x87ff, 0, 0, williams2_paletteram_w); memory_set_bank(1, 1 + ((vram_bank & 4) >> 1)); memory_set_bankptr(4, paletteram); @@ -757,15 +757,15 @@ WRITE8_HANDLER( defender_bank_select_w ) case 7: case 8: case 9: - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, MRA8_BANK1); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, MWA8_UNMAP); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, SMH_BANK1); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, SMH_UNMAP); memory_set_bank(1, vram_bank - 1); break; /* pages A-F are not connected */ default: - memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, MRA8_NOP); - memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, MWA8_NOP); + memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, SMH_NOP); + memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xcfff, 0, 0, SMH_NOP); break; } } diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c index df80e3a603f..945262b1534 100644 --- a/src/mame/video/bfm_adr2.c +++ b/src/mame/video/bfm_adr2.c @@ -472,7 +472,7 @@ void adder2_decode_char_roms(void) 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(MRA8_BANK2) // 8k paged ROM (4 pages) + AM_RANGE(0x0000, 0x7FFF) AM_READ(SMH_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/combatsc.c b/src/mame/video/combatsc.c index ebe560d5d42..682303273d3 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -421,7 +421,7 @@ WRITE8_HANDLER( combascb_bankselect_w ) } else { - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, MRA8_BANK1, MWA8_UNMAP); /* banked ROM */ + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x7fff, 0, 0, SMH_BANK1, SMH_UNMAP); /* banked ROM */ } } } diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c index efa06fc33d0..f2ce9d068bd 100644 --- a/src/mame/video/qix.c +++ b/src/mame/video/qix.c @@ -372,10 +372,10 @@ static ADDRESS_MAP_START( qix_video_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_WRITE(qix_palettebank_w) AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE(qix_data_firq_r, qix_data_firq_w) AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE(qix_video_firq_ack_r, qix_video_firq_ack_w) - AM_RANGE(0x9000, 0x93ff) AM_READWRITE(MRA8_RAM, qix_paletteram_w) AM_BASE_MEMBER(qix_state, paletteram) + AM_RANGE(0x9000, 0x93ff) AM_READWRITE(SMH_RAM, qix_paletteram_w) AM_BASE_MEMBER(qix_state, paletteram) AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE(qix_addresslatch_r, qix_addresslatch_w) - AM_RANGE(0x9402, 0x9403) AM_MIRROR(0x03fc) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(qix_state, videoram_address) - AM_RANGE(0x9800, 0x9800) AM_MIRROR(0x03ff) AM_READ(MRA8_RAM) AM_BASE_MEMBER(qix_state, scanline_latch) + AM_RANGE(0x9402, 0x9403) AM_MIRROR(0x03fc) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(qix_state, videoram_address) + 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(MC6845, "vid-u18", mc6845_address_w) AM_RANGE(0x9c01, 0x9c01) AM_MIRROR(0x03fe) AM_DEVREADWRITE(MC6845, "vid-u18", mc6845_register_r, mc6845_register_w) AM_RANGE(0xa000, 0xffff) AM_ROM @@ -390,10 +390,10 @@ static ADDRESS_MAP_START( zookeep_video_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8801, 0x8801) AM_MIRROR(0x03fe) AM_WRITE(zookeep_bankswitch_w) AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE(qix_data_firq_r, qix_data_firq_w) AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE(qix_video_firq_ack_r, qix_video_firq_ack_w) - AM_RANGE(0x9000, 0x93ff) AM_READWRITE(MRA8_RAM, qix_paletteram_w) AM_BASE_MEMBER(qix_state, paletteram) + AM_RANGE(0x9000, 0x93ff) AM_READWRITE(SMH_RAM, qix_paletteram_w) AM_BASE_MEMBER(qix_state, paletteram) AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE(qix_addresslatch_r, qix_addresslatch_w) - AM_RANGE(0x9402, 0x9403) AM_MIRROR(0x03fc) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(qix_state, videoram_address) - AM_RANGE(0x9800, 0x9800) AM_MIRROR(0x03ff) AM_READ(MRA8_RAM) AM_BASE_MEMBER(qix_state, scanline_latch) + AM_RANGE(0x9402, 0x9403) AM_MIRROR(0x03fc) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(qix_state, videoram_address) + 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(MC6845, "vid-u18", mc6845_address_w) AM_RANGE(0x9c01, 0x9c01) AM_MIRROR(0x03fe) AM_DEVREADWRITE(MC6845, "vid-u18", mc6845_register_r, mc6845_register_w) AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) @@ -408,11 +408,11 @@ static ADDRESS_MAP_START( slither_video_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8800, 0x8800) AM_MIRROR(0x03ff) AM_WRITE(qix_palettebank_w) AM_RANGE(0x8c00, 0x8c00) AM_MIRROR(0x03fe) AM_READWRITE(qix_data_firq_r, qix_data_firq_w) AM_RANGE(0x8c01, 0x8c01) AM_MIRROR(0x03fe) AM_READWRITE(qix_video_firq_ack_r, qix_video_firq_ack_w) - AM_RANGE(0x9000, 0x93ff) AM_READWRITE(MRA8_RAM, qix_paletteram_w) AM_BASE_MEMBER(qix_state, paletteram) + AM_RANGE(0x9000, 0x93ff) AM_READWRITE(SMH_RAM, qix_paletteram_w) AM_BASE_MEMBER(qix_state, paletteram) AM_RANGE(0x9400, 0x9400) AM_MIRROR(0x03fc) AM_READWRITE(qix_addresslatch_r, slither_addresslatch_w) - AM_RANGE(0x9401, 0x9401) AM_MIRROR(0x03fc) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(qix_state, videoram_mask) - AM_RANGE(0x9402, 0x9403) AM_MIRROR(0x03fc) AM_WRITE(MWA8_RAM) AM_BASE_MEMBER(qix_state, videoram_address) - AM_RANGE(0x9800, 0x9800) AM_MIRROR(0x03ff) AM_READ(MRA8_RAM) AM_BASE_MEMBER(qix_state, scanline_latch) + AM_RANGE(0x9401, 0x9401) AM_MIRROR(0x03fc) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(qix_state, videoram_mask) + AM_RANGE(0x9402, 0x9403) AM_MIRROR(0x03fc) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(qix_state, videoram_address) + 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(MC6845, "vid-u18", mc6845_address_w) AM_RANGE(0x9c01, 0x9c01) AM_MIRROR(0x03fe) AM_DEVREADWRITE(MC6845, "vid-u18", mc6845_register_r, mc6845_register_w) AM_RANGE(0xa000, 0xffff) AM_ROM diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c index 4db307e3b9f..85f3eaa91a2 100644 --- a/src/mame/video/simpsons.c +++ b/src/mame/video/simpsons.c @@ -103,7 +103,7 @@ void simpsons_video_banking(int bank) { if (bank & 1) { - memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x0fff, 0, 0, MRA8_BANK5, paletteram_xBBBBBGGGGGRRRRR_be_w); + memory_install_readwrite8_handler(0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x0fff, 0, 0, SMH_BANK5, paletteram_xBBBBBGGGGGRRRRR_be_w); memory_set_bankptr(5, paletteram); } else